Diff: buttonArray.cpp

Revision:

41:560ee7866781

Parent:

39:8cc80f0b4398

Child:

43:fa8d0db68228

diff -r 85be3490d3a7 -r 560ee7866781 buttonArray.cpp
--- a/buttonArray.cpp	Sun Dec 03 23:10:29 2017 +0000
+++ b/buttonArray.cpp	Sun Dec 03 23:44:27 2017 +0000
@@ -15,24 +15,18 @@
 // 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';
-    if (strcmp(braille, "011011") == 0) val = 'C';
+    //if (strcmp(braille, "001111") == 0) val = 'B';
+    //if (strcmp(braille, "011011") == 0) val = 'C';
     if (strcmp(braille, "011001") == 0) val = 'D';
-    if (strcmp(braille, "011101") == 0) val = 'E';
-    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, "101001") == 0) val = 'J';
+    //if (strcmp(braille, "011101") == 0) val = 'E';
+    //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, "101001") == 0) val = 'J';
     if (strcmp(braille, "010011") == 0) val = 'M';
     if (strcmp(braille, "010101") == 0) val = 'O';
     /*if (strcmp(braille, "011111") == 0) val = 'K';
@@ -111,41 +105,6 @@
     return wrong;
 }
 
-// release buttons
-void buttonArray::releaseButtons()
-{
-    if (button1.getPress()) {
-        button1.moveServoOut();
-        button1.setState(3);
-        button1.setPress(0);
-    }
-    if (button2.getPress()) {
-        button2.moveServoOut();
-        button2.setState(3);
-        button2.setPress(0);
-    }
-    if (button3.getPress()) {
-        button3.moveServoOut();
-        button3.setState(3);
-        button3.setPress(0);
-    }
-    if (button4.getPress()) {
-        button4.moveServoOut();
-        button4.setState(3);
-        button4.setPress(0);
-    }
-    if (button5.getPress()) {
-        button5.moveServoOut();
-        button5.setState(3);
-        button5.setPress(0);
-    }
-    if (button6.getPress()) {
-        button6.moveServoOut();
-        button6.setState(3);
-        button6.setPress(0);
-    }
-}
-
 void buttonArray::setup()
 {
     // servos begin at 30 degrees