[Bluetooth] CLEAR command added

radio/src/bluetooth.cpp

@@ -450,6 +450,11 @@ void Bluetooth::wakeup()
     /* else if (state == BLUETOOTH_STATE_DISCOVER_START && !strcmp(line, "OK+DISCE")) {
       state = BLUETOOTH_STATE_DISCOVER_END;
     } */
+    else if (state == BLUETOOTH_STATE_CLEAR_REQUESTED) {
+      char command[] = "AT+CLEAR";
+      writeString(command);
+      state = BLUETOOTH_STATE_IDLE;
+    }
     else if (state == BLUETOOTH_STATE_BIND_REQUESTED) {
       char command[32];
       strAppend(strAppend(command, "AT+CON"), distantAddr);

radio/src/bluetooth.h

@@ -40,6 +40,7 @@ enum BluetoothStates {
   BLUETOOTH_STATE_CONNECT_SENT,
   BLUETOOTH_STATE_CONNECTED,
   BLUETOOTH_STATE_DISCONNECTED,
+  BLUETOOTH_STATE_CLEAR_REQUESTED,
   BLUETOOTH_STATE_FLASH_FIRMWARE
 };
 

radio/src/gui/128x64/model_setup.cpp

@@ -1192,7 +1192,7 @@ void menuModelSetup(event_t event)
             lcdDrawText(INDENT_WIDTH, y+1, bluetooth.distantAddr, TINSIZE);
             lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, BUTTON(TR_CLEAR), attr);
             if (attr && event == EVT_KEY_FIRST(KEY_ENTER)) {
-              bluetooth.state = BLUETOOTH_STATE_OFF;
+              bluetooth.state = BLUETOOTH_STATE_CLEAR_REQUESTED;
               memclear(bluetooth.distantAddr, sizeof(bluetooth.distantAddr));
             }
           }
@@ -1203,6 +1203,7 @@ void menuModelSetup(event_t event)
             else
               lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, STR_BUTTON_DISCOVER, attr);
             if (attr && event == EVT_KEY_FIRST(KEY_ENTER)) {
+              killEvents(KEY_ENTER);
               if (bluetooth.state < BLUETOOTH_STATE_IDLE) {
                 bluetooth.state = BLUETOOTH_STATE_OFF;
               }