Add size of list response to the top of the list response.

Author: nseidle

Firmware/RTK_Everywhere/Bluetooth.ino

@@ -283,23 +283,6 @@ int bluetoothCommandAvailable()
 #endif // COMPILE_BT
 }
 
-// Pass a command string to the BLE Serial interface
-void bluetoothSendCommand(char *rxData)
-{
-#ifdef COMPILE_BT
-    // Direct output to Bluetooth Command
-    PrintEndpoint originalPrintEndpoint = printEndpoint;
-
-    printEndpoint = PRINT_ENDPOINT_ALL;
-
-    systemPrint(rxData); // Send command output to BLE, SPP, and Serial
-    printEndpoint = originalPrintEndpoint;
-
-#else  // COMPILE_BT
-    systemPrint(rxData); // Send command output to Serial
-#endif // COMPILE_BT
-}
-
 // Write data to the Bluetooth device
 int bluetoothWrite(const uint8_t *buffer, int length)
 {
@@ -407,12 +390,16 @@ void bluetoothFlush()
     if (settings.bluetoothRadioType == BLUETOOTH_RADIO_SPP_AND_BLE)
     {
         bluetoothSerialBle->flush();
+        bluetoothSerialBleCommands->flush(); // Complete any transfers
         bluetoothSerialSpp->flush();
     }
     else if (settings.bluetoothRadioType == BLUETOOTH_RADIO_SPP)
         bluetoothSerialSpp->flush();
     else if (settings.bluetoothRadioType == BLUETOOTH_RADIO_BLE)
+    {
         bluetoothSerialBle->flush();
+        bluetoothSerialBleCommands->flush(); // Complete any transfers
+    }
     else if (settings.bluetoothRadioType == BLUETOOTH_RADIO_SPP_ACCESSORY_MODE)
         bluetoothSerialSpp->flush(); // Needed? Not sure... TODO
 #else                                // COMPILE_BT

Firmware/RTK_Everywhere/menuCommands.ino

@@ -267,6 +267,26 @@ t_cliResult processCommand(char *cmdBuffer)
             else if (strcmp(tokens[1], "LIST") == 0)
             {
                 // Respond with a list of variables, types, and current value
+
+                // First calculate the size of the LIST response
+                PrintEndpoint originalPrintEndpoint = printEndpoint;
+                printEndpoint = PRINT_ENDPOINT_COUNT;
+                systemWriteLength = 0;
+                printAvailableSettings();
+                printEndpoint = originalPrintEndpoint;
+
+                // Use log10 to find the number of digits in systemWriteLength
+                int systemWriteLengthDigits = floor(log10(systemWriteLength)) + 1;
+
+                // Adjust systemWriteLength to include the length of the list entry
+                systemWriteLength = systemWriteLength + sizeof("$SPLST,list,int,*2A") + systemWriteLengthDigits;
+
+                // Print the list entry
+                char settingValue[6]; // 12345
+                snprintf(settingValue, sizeof(settingValue), "%d", systemWriteLength);
+                commandSendExecuteListResponse("list", "int", settingValue);
+
+                // Now actually print the list
                 printAvailableSettings();
                 commandSendExecuteOkResponse(tokens[0], tokens[1]);
                 return (CLI_OK);
@@ -469,8 +489,22 @@ void commandSendResponse(const char *innerBuffer)
 
     sprintf(responseBuffer, "$%s*%02X\r\n", innerBuffer, calculatedChecksum);
 
-    // CLI interactions may come from BLE or serial, respond to both interfaces
-    bluetoothSendCommand(responseBuffer);
+    // CLI interactions may come from BLE or serial, respond to all interfaces
+    commandSendAllInterfaces(responseBuffer);
+}
+
+// Pass a command string to the all interfaces
+void commandSendAllInterfaces(char *rxData)
+{
+    // Direct output to Bluetooth Command
+    PrintEndpoint originalPrintEndpoint = printEndpoint;
+
+    // Don't re-direct if we're doing a count of the print output
+    if (printEndpoint != PRINT_ENDPOINT_COUNT)
+        printEndpoint = PRINT_ENDPOINT_ALL;
+
+    systemPrint(rxData); // Send command output to BLE, SPP, and Serial
+    printEndpoint = originalPrintEndpoint;
 }
 
 // Checks structure of command and checksum
@@ -1506,7 +1540,7 @@ SettingValueResponse updateSettingWithValue(bool inCommands, const char *setting
     }
 
     // Check if this setting is read only
-    if(knownSetting == false)
+    if (knownSetting == false)
     {
         const char *table[] = {
             "batteryLevelPercent",
@@ -1516,12 +1550,13 @@ SettingValueResponse updateSettingWithValue(bool inCommands, const char *setting
             "deviceId",
             "deviceName",
             "gnssModuleInfo",
+            "list",
             "rtkFirmwareVersion",
             "rtkRemoteFirmwareVersion",
         };
         const int tableEntries = sizeof(table) / sizeof(table[0]);
 
-        if(commandCheckListForVariable(settingName, table, tableEntries))
+        if (commandCheckListForVariable(settingName, table, tableEntries))
             return (SETTING_KNOWN_READ_ONLY);
     }
 
@@ -3938,7 +3973,7 @@ void printAvailableSettings()
             checkBatteryLevels();
 
             // Convert int to string
-            char batteryLvlStr[4] = {0}; //104
+            char batteryLvlStr[4] = {0}; // 104
             snprintf(batteryLvlStr, sizeof(batteryLvlStr), "%d", batteryLevelPercent);
 
             // Create the settingType based on the length of the firmware version
@@ -3964,7 +3999,7 @@ void printAvailableSettings()
             commandSendExecuteListResponse("batteryVoltage", settingType, batteryVoltageStr);
         }
 
-                // Display the current battery charging percent per hour
+        // Display the current battery charging percent per hour
         else if (commandIndex[i] == COMMAND_BATTERY_CHARGING_PERCENT)
         {
             checkBatteryLevels();
@@ -4010,5 +4045,4 @@ void printAvailableSettings()
             commandSendExecuteListResponse("deviceId", settingType, printDeviceId());
         }
     }
-    systemPrintln();
 }