Remove BT Congestion settings

Left over from Bluetooth congestion settings (and custom BT implementation)

Author: nseidle

Firmware/RTK_Surveyor/Bluetooth.ino

@@ -69,17 +69,6 @@ byte bluetoothGetState()
 #endif  //COMPILE_BT
 }
 
-//Determine if the Bluetooth link is congested
-bool bluetoothIsCongested()
-{
-#ifdef COMPILE_BT
-  //return bluetoothSerial->isCongested();
-  return false;
-#else   //COMPILE_BT
-  return false;
-#endif  //COMPILE_BT
-}
-
 //Read data from the Bluetooth device
 int bluetoothReadBytes(uint8_t * buffer, int length)
 {

Firmware/RTK_Surveyor/NVM.ino

@@ -181,7 +181,6 @@ void recordSystemSettingsToFile(File * settingsFile)
   settingsFile->printf("%s=%d\n\r", "sppTxQueueSize", settings.sppTxQueueSize);
   settingsFile->printf("%s=%d\n\r", "dynamicModel", settings.dynamicModel);
   settingsFile->printf("%s=%d\n\r", "lastState", settings.lastState);
-  settingsFile->printf("%s=%d\n\r", "throttleDuringSPPCongestion", settings.throttleDuringSPPCongestion);
   settingsFile->printf("%s=%d\n\r", "enableSensorFusion", settings.enableSensorFusion);
   settingsFile->printf("%s=%d\n\r", "autoIMUmountAlignment", settings.autoIMUmountAlignment);
   settingsFile->printf("%s=%d\n\r", "enableResetDisplay", settings.enableResetDisplay);
@@ -688,8 +687,6 @@ bool parseLine(char* str, Settings *settings)
       settings->updateZEDSettings = true;
     }
   }
-  else if (strcmp(settingName, "throttleDuringSPPCongestion") == 0)
-    settings->throttleDuringSPPCongestion = d;
   else if (strcmp(settingName, "enableSensorFusion") == 0)
   {
     if (settings->enableSensorFusion != d)

Firmware/RTK_Surveyor/Tasks.ino

@@ -14,11 +14,11 @@ void F9PSerialWriteTask(void *e)
       {
         //Pass bytes to GNSS receiver
         int s = bluetoothReadBytes(wBuffer, sizeof(wBuffer));
-        
+
         //TODO - control if this RTCM source should be listened to or not
         serialGNSS.write(wBuffer, s);
         bluetoothIncomingRTCM = true;
-        if(!inMainMenu) log_d("Bluetooth received %d RTCM bytes, sent to ZED", s);
+        if (!inMainMenu) log_d("Bluetooth received %d RTCM bytes, sent to ZED", s);
 
         if (settings.enableTaskReports == true)
           Serial.printf("SerialWriteTask High watermark: %d\n\r",  uxTaskGetStackHighWaterMark(NULL));
@@ -170,34 +170,17 @@ void F9PSerialReadTask(void *e)
         if ((btTail + btBytesToSend) >= sizeof(rBuffer))
           btBytesToSend = sizeof(rBuffer) - btTail;
 
-        if ((bluetoothIsCongested() == false) || (settings.throttleDuringSPPCongestion == false))
+        //Push new data to BT SPP if not congested or not throttling
+        btBytesToSend = bluetoothWriteBytes(&rBuffer[btTail], btBytesToSend);
+        if (btBytesToSend > 0)
         {
-          //Push new data to BT SPP if not congested or not throttling
-          btBytesToSend = bluetoothWriteBytes(&rBuffer[btTail], btBytesToSend);
-          if (btBytesToSend > 0)
-          {
-            //If we are in base mode, assume part of the outgoing data is RTCM
-            if (systemState >= STATE_BASE_NOT_STARTED && systemState <= STATE_BASE_FIXED_TRANSMITTING)
-              bluetoothOutgoingRTCM = true;
-          }
-          else
-            log_w("BT failed to send");
+          //If we are in base mode, assume part of the outgoing data is RTCM
+          if (systemState >= STATE_BASE_NOT_STARTED && systemState <= STATE_BASE_FIXED_TRANSMITTING)
+            bluetoothOutgoingRTCM = true;
         }
         else
-        {
-          //Don't push data to BT SPP if there is congestion to prevent heap hits.
-          if (btBytesToSend >= (sizeof(rBuffer) - 1))
-          {
-            //Error - no more room in the buffer, drop a buffer's worth of data
-            btTail = dataHead;
-            Serial.printf("ERROR - BT congestion dropped %d bytes: GNSS --> Bluetooth\r\n", btBytesToSend);
-          }
-          else
-          {
-            log_w("BT congestion delayed %d bytes, Tasks.ino line %d", btBytesToSend, __LINE__);
-            btBytesToSend = 0;
-          }
-        }
+          log_w("BT failed to send");
+
 
         //Account for the sent or dropped data
         btTail += btBytesToSend;

Firmware/RTK_Surveyor/bluetoothSelect.h

@@ -61,14 +61,6 @@ class BTClassicSerial : public virtual BTSerialInterface, public BluetoothSerial
       return BluetoothSerial::readBytes(buffer, bufferSize);
     }
 
-    bool isCongested()
-    {
-      // Removed congestion testing in v2.4 
-      // TODO Remove settings and checking
-      return(false);
-      //return BluetoothSerial::isCongested();
-    }
-
     size_t write(const uint8_t *buffer, size_t size)
     {
       return BluetoothSerial::write(buffer, size);
@@ -122,12 +114,6 @@ class BTLESerial: public virtual BTSerialInterface, public BleSerial
       return BleSerial::readBytes(buffer, bufferSize);
     }
 
-    bool isCongested()
-    {
-      // not currently supported in this implementation
-      return false;
-    }
-
     size_t write(const uint8_t *buffer, size_t size)
     {
       return BleSerial::write(buffer, size);

Firmware/RTK_Surveyor/menuSystem.ino

@@ -321,10 +321,6 @@ void menuDebug()
     Serial.print("6) Set SPP TX Buffer Size: ");
     Serial.println(settings.sppTxQueueSize);
 
-    Serial.print("7) Throttle BT Transmissions During SPP Congestion: ");
-    if (settings.throttleDuringSPPCongestion == true) Serial.println("Enabled");
-    else Serial.println("Disabled");
-
     Serial.printf("8) Display Reset Counter: %d - ", settings.resetCount);
     if (settings.enableResetDisplay == true) Serial.println("Enabled");
     else Serial.println("Disabled");
@@ -465,10 +461,6 @@ void menuDebug()
           settings.sppTxQueueSize = queSize; //Recorded to NVM and file at main menu exit
         }
       }
-      else if (incoming == 7)
-      {
-        settings.throttleDuringSPPCongestion ^= 1;
-      }
       else if (incoming == 8)
       {
         settings.enableResetDisplay ^= 1;

Firmware/RTK_Surveyor/settings.h

@@ -294,7 +294,6 @@ typedef struct {
   uint16_t sppTxQueueSize = 512;
   uint8_t dynamicModel = DYN_MODEL_PORTABLE;
   SystemState lastState = STATE_ROVER_NOT_STARTED; //For Express, start unit in last known state
-  bool throttleDuringSPPCongestion = true;
   bool enableSensorFusion = false; //If IMU is available, avoid using it unless user specifically selects automotive
   bool autoIMUmountAlignment = true; //Allows unit to automatically establish device orientation in vehicle
   bool enableResetDisplay = false;