Diff: buttonArray.cpp

Revision:

1:f3d363ca2343

Parent:

0:5887cb744114

--- a/buttonArray.cpp	Mon Dec 04 19:58:40 2017 +0000
+++ b/buttonArray.cpp	Mon Dec 04 20:14:24 2017 +0000
@@ -1,27 +1,17 @@
 #include "mbed.h"
 #include "buttonArray.h"
 
-// type mode
-
 // buttonArray constructor
 buttonArray::buttonArray(button b1, button b2, button b3, button b4, button b5, button b6)
     : button1(b1), button2(b2), button3(b3), button4(b4), button5(b5), button6(b6) {}
 
-//Serial pc(USBTX, USBRX);
-
 // FUNCTIONS
 
 // map input braille to ascii
 // braille respresentation here - https://en.wikipedia.org/wiki/Braille_ASCII
 char buttonArray::checkVal(char* braille)
 {
-    //pc.printf(" checkVal \n");
-    //char* braille;
     char val = 'K';
-    /*int test = button1.getPress();
-    sprintf(braille, "%d%d%d%d%d%d", test, button2.getPress(),
-            button3.getPress(), button4.getPress(), button5.getPress(), button6.getPress());*/
-    //pc.printf(" %s \n", braille);
     if (strcmp(braille, "000000") == 0) val = 'X';
     if (strcmp(braille, "011111") == 0) val = 'A';
     if (strcmp(braille, "001111") == 0) val = 'B';
@@ -31,27 +21,26 @@
     if (strcmp(braille, "001011") == 0) val = 'F';
     if (strcmp(braille, "001001") == 0) val = 'G';
     if (strcmp(braille, "001101") == 0) val = 'H';
-    if (strcmp(braille, "101101") == 0) val = 'I';
+    if (strcmp(braille, "101011") == 0) val = 'I';
     if (strcmp(braille, "101001") == 0) val = 'J';
+    //if (strcmp(braille, "011111") == 0) val = 'K';
+    if (strcmp(braille, "000111") == 0) val = 'L';
     if (strcmp(braille, "010011") == 0) val = 'M';
+    if (strcmp(braille, "010001") == 0) val = 'N';
     if (strcmp(braille, "010101") == 0) val = 'O';
-    /*if (strcmp(braille, "011111") == 0) val = 'K';
-    if (strcmp(braille, "011111") == 0) val = 'L';
-    if (strcmp(braille, "011111") == 0) val = 'N';
-    if (strcmp(braille, "011111") == 0) val = 'P';
-    if (strcmp(braille, "011111") == 0) val = 'Q';
-    if (strcmp(braille, "011111") == 0) val = 'R';
-    if (strcmp(braille, "011111") == 0) val = 'S';
-    if (strcmp(braille, "011111") == 0) val = 'T';
-    if (strcmp(braille, "011111") == 0) val = 'U';
-    if (strcmp(braille, "011111") == 0) val = 'V';
-    if (strcmp(braille, "011111") == 0) val = 'W';
-    if (strcmp(braille, "011111") == 0) val = 'X';
-    if (strcmp(braille, "011111") == 0) val = 'Y';
-    if (strcmp(braille, "011111") == 0) val = 'Z';*/
+    if (strcmp(braille, "000011") == 0) val = 'P';
+    if (strcmp(braille, "000001") == 0) val = 'Q';
+    if (strcmp(braille, "000101") == 0) val = 'R';
+    if (strcmp(braille, "100011") == 0) val = 'S';
+    if (strcmp(braille, "100001") == 0) val = 'T';
+    if (strcmp(braille, "010110") == 0) val = 'U';
+    if (strcmp(braille, "000110") == 0) val = 'V';
+    if (strcmp(braille, "101000") == 0) val = 'W';
+    //if (strcmp(braille, "010010") == 0) val = 'X';
+    if (strcmp(braille, "010000") == 0) val = 'Y';
+    //if (strcmp(braille, "010100") == 0) val = 'Z';
     // check if reset
     if (strcmp(braille, "111111") == 0) val = 'Z';
-    //pc.printf(" %c \n", val);
     return val;
 }
 
@@ -74,7 +63,6 @@
 int* buttonArray::pinsUp(char val)
 {
     int* pinsup;
-    //pinsup = new int[7];
     char* braille = getBraille(val);
     int j = 1;
     for (int i = 0; i < 6; i++) {
@@ -92,16 +80,13 @@
 // takes in current and actual char as input and returns status of each char
 int* buttonArray::wrongPins(char* inarr, char actual)
 {
-    // TODO check initial value of wrong
     int* wrong;
     wrong = new int[7];
     char* actarr = getBraille(actual);
-    //pc.printf("wrong pins");
     int j = 1;
     for (int i = 0; i < 6; i++) {
         if(inarr[i] != actarr[i]) {
             wrong[j] = i+1;
-            //pc.printf("%d ", wrong[j]);
             j++;
         }
     }
@@ -147,8 +132,7 @@
 
 void buttonArray::setup()
 {
-    // servos begin at 30 degrees
-    // replace with a button setup function
+    // servo setup function; servos begin at 30 degrees
     button1.setup();
     button2.setup();
     button3.setup();