Merge with latest 2.3

2020-06-18 11:14:07 +02:00
parent 396ebf27b5 fca11fc6b6
commit 71ec1db9f6
121 changed files with 3269 additions and 1775 deletions
@@ -48,17 +48,18 @@ Bluetooth bluetooth;

 void Bluetooth::write(const uint8_t * data, uint8_t length)
 {
-  BLUETOOTH_TRACE("BT>");
-  for (int i=0; i<length; i++) {
-    BLUETOOTH_TRACE(" %02X", data[i]);
-    while (btTxFifo.isFull()) {
-      if (!bluetoothIsWriting())
-        bluetoothWriteWakeup();
-      RTOS_WAIT_MS(1);
+  if (btTxFifo.hasSpace(length)) {
+    BLUETOOTH_TRACE("BT>");
+    for (int i = 0; i < length; i++) {
+      BLUETOOTH_TRACE(" %02X", data[i]);
+      btTxFifo.push(data[i]);
    }
-    btTxFifo.push(data[i]);
+    BLUETOOTH_TRACE(CRLF);
  }
-  BLUETOOTH_TRACE(CRLF);
+  else {
+    BLUETOOTH_TRACE("[BT] TX fifo full!" CRLF);
+  }
+
  bluetoothWriteWakeup();
 }

@@ -175,7 +176,7 @@ void Bluetooth::processTrainerByte(uint8_t data)
  switch (dataState) {
    case STATE_DATA_START:
      if (data == START_STOP) {
-        dataState = STATE_DATA_IN_FRAME ;
+        dataState = STATE_DATA_IN_FRAME;
        bufferIndex = 0;
      }
      else {
@@ -188,7 +189,7 @@ void Bluetooth::processTrainerByte(uint8_t data)
        dataState = STATE_DATA_XOR; // XOR next byte
      }
      else if (data == START_STOP) {
-        dataState = STATE_DATA_IN_FRAME ;
+        dataState = STATE_DATA_IN_FRAME;
        bufferIndex = 0;
      }
      else {