Diff: main.cpp

Revision:

1:a3a6e8f878da

Parent:

0:09e78c46c376

Child:

2:e06d96952cef

--- a/main.cpp	Tue Oct 20 06:30:21 2015 +0000
+++ b/main.cpp	Wed Oct 21 05:25:21 2015 +0000
@@ -5,7 +5,7 @@
 // 9600 bauds, 8-bit data, no parity
 //------------------------------------
 
-Serial pc(PA_9, PA_10);
+Serial pc(SERIAL_TX, SERIAL_RX);
 
 DigitalOut myled0(D15);
 DigitalOut myled1(D14);
@@ -56,12 +56,10 @@
                             data = pc.getc();
                             pc.printf("\n");
                             state_menu=0;
-
-                            switch(data) {
-
-                                case 'a':
-                                case 'A':
-                                    myled0=1;
+                       
+                                    if(data=='a')
+                                    {
+                                      myled0=1;
                                     wait(1);
                                     myled0=0;
                                     
@@ -91,12 +89,10 @@
                                     
                                     myled7=1;
                                     wait(1);
-                                    myled7=0;
-                                                                        
-                                    break;
-
-                                case 'd':
-                                case 'D':
+                                    myled7=0;  
+                                    }
+                                    if(data=='d')
+                                    {
                                     myled0 =1;
                                     myled1 =1;
                                     myled4 =1;
@@ -116,21 +112,10 @@
                                     myled3 =0;
                                     myled6 =0;
                                     myled7 =0;
-                                   
-                                    break;
-
-                                case 's':
-                                    state_exit =1;
-                                   
-                                    break;
-
-                                default:
-                                    pc.printf("plz select a or d\n");
-                                    pc.printf("\n\n");
-                                    break;
+                                    }
 
                             }
-                        }
+                        
 
                     } while(state_exit ==0);
                     pc.printf("\n");
@@ -138,7 +123,6 @@
 
                 case '2':
 
-                    do {
                         if(state_menu == 0) 
                         {
                             pc.printf("LED status\n");
@@ -147,15 +131,14 @@
                         if(inbutton == 0) 
                         {
                             pc.printf("OFF\n");
-                            state_menu=0;
+                            state_menu=1;
                         }
                         if(inbutton == 1) 
                         {
                             pc.printf("ON\n");
-                            state_menu=0;
+                            state_menu=1;
                         }
                         
-                    } while(state_exit ==0);
                     pc.printf("\n\n");
                     break;