Diff: main.cpp

Revision:

8:d597a92014c4

Parent:

7:cc8eacadcf09

Child:

9:0d5c2787a01f

--- a/main.cpp	Mon Aug 27 13:22:40 2018 +0000
+++ b/main.cpp	Mon Aug 27 14:06:11 2018 +0000
@@ -38,27 +38,28 @@
         pc.pc_send("set name: %s", hc05.set_modul_name(pc.buffer + 5));
     }
 
-    else if(strncmp(pc.buffer, "mastermode", 10) == 0)  {
-        hc05.init_master_fixed("0000", "nucleo", "2015,11,27524");
-        pc.pc_send("master init OK\r\n", "");
-    }
-
     else if(strncmp(pc.buffer, "role", 4) == 0)  {
-        ROLE r;
-
+        
         if(strcmp(pc.buffer + 5, "1") == 0)  {
-            r = MASTER;
+            pc.pc_send("state role: %s", hc05.set_modul_role(MASTER));
         } else if(strcmp(pc.buffer + 5, "0") == 0)  {
-            r = SLAVE;
+            pc.pc_send("state role: %s", hc05.set_modul_role(SLAVE));
+        } else  {
+            pc.pc_send("can't change value!!\r\n", "");
         }
 
-        pc.pc_send("state role: %s", hc05.set_modul_role(r));
     }
 
     else if(strncmp(pc.buffer, "uart", 4) == 0)  {
         pc.pc_send("set uart: %s", hc05.set_modul_uart(pc.buffer + 5));
     }
 
+
+    else if(strncmp(pc.buffer, "mastermode", 10) == 0)  {
+        hc05.init_master_fixed("0000", "nucleo", "2015,11,27524");
+        pc.pc_send("master init OK\r\n", "");
+    }
+
     else if(strcmp(pc.buffer, "info") == 0)  {
         getInfo();
     }
@@ -76,13 +77,13 @@
         hc05.data_send(pc.buffer + 5);
         pc.pc_send("Data send\r\n", "");
     }
-    
+
     else if(strcmp(pc.buffer, "?") == 0)  {
         options();
     }
 
-    
-    
+
+
     pc.clear();
 }
 
@@ -99,15 +100,15 @@
 void options()
 {
     pc.pc_send("\r\n*********  Menu  ***********************************\r\n\r\n", "");
-    pc.pc_send("Pincode read           type in 'pin'\r\n", "");
-    pc.pc_send("Name    read           type in 'name'\r\n", "");
+    pc.pc_send("Set to Pincode         type in 'pin'\r\n", "");
+    pc.pc_send("Set to Name            type in 'name'\r\n", "");
+    pc.pc_send("Set to Role            type in 'role 0, 1 or 2'\r\n", "");
+    pc.pc_send("Set to UART            type in 'uart baud, startbit, parity'\r\n", "");
     pc.pc_send("Set to Mastermode      type in 'mastermode'\r\n", "");
-    pc.pc_send("Set to Role            type in 'role 0, 1 or 2'\r\n", "");
-    pc.pc_send("Set to UART            type in 'uart baud, startbit, parity'\r\n", ""); 
     pc.pc_send("Info Modul settings    type in 'info'\r\n", "");
     pc.pc_send("Search other BT-Moduls type in 'search'\r\n", "");
     pc.pc_send("Cancel search          type in 'end search'\r\n", "");
     pc.pc_send("Send Data to Connected type in 'Strings'\r\n", "");
-    pc.pc_send("Display this Menue     type in '?'\r\n", ""); 
-    pc.pc_send("\r\n********* End Menu  ********************************\r\n", "");  
+    pc.pc_send("Display this Menue     type in '?'\r\n", "");
+    pc.pc_send("\r\n********* End Menu  ********************************\r\n", "");
 }