Implemented a fixed size queue for delayed displaying of received packets

Author: cnheider

lib/rapidfire_SPI/rapidFIRE_SPI.cpp

@@ -4,7 +4,7 @@
 #include "rapidFIRE_SPI.h"
 
 rapidFIRE_SPI::rapidFIRE_SPI(int pin_SCK, int pin_DATA, int pin_SS, int freq) {
-  assert(SPI_freq < RAPIDFIRE_SPI_MAX_CLOCK);
+  assert(freq < RAPIDFIRE_SPI_MAX_CLOCK);
 
   SPI_pin_SCK = pin_SCK;
   SPI_pin_DATA = pin_DATA;
@@ -68,23 +68,18 @@ RF_RESULT rapidFIRE_SPI::recvCommand(uint8_t *data, size_t len) {
 
   recv_len = spi->transfer(0);
   recv_sum = spi->transfer(0);
-  for (int i = 0; i < len; i++) {
+  for (size_t i = 0; i < len; i++) {
     data[i] = spi->transfer(0);
   }
 
   spi->end();
   spi->setHwCs(false);
 
   byte csum = recv_len;
-  for (int i = 0; i < len; ++i) {
-    //        Serial.printf("Read[%d]:0x%02x(%3d) '\%c'\n", i, data[i], data[i],
-    //        data[i]);
+  for (size_t i = 0; i < len; ++i) {
     csum += data[i];
   }
 
-  Serial.printf("CSUM:recv:%02x==calc:%02x LEN:recv:%d==%d %s\n", recv_sum,
-                csum, recv_len, len, recv_sum == csum ? "" : "NG!");
-
   if (recv_sum != csum) {
     //        return RF_RESULT_ERROR_CHECKSUM_MISSMATCH; // Checksum missmatch.
   }
@@ -104,6 +99,7 @@ RF_RESULT rapidFIRE_SPI::sendCommand(uint16_t command, byte *data, size_t len) {
   spi->begin();
   spi->pins(SPI_pin_SCK, SPI_pin_DATA, -1, SPI_pin_SS);
 #endif
+
   spi->setFrequency(SPI_freq);
   spi->setDataMode(SPI_MODE0);
   spi->setBitOrder(MSBFIRST);
@@ -117,14 +113,6 @@ RF_RESULT rapidFIRE_SPI::sendCommand(uint16_t command, byte *data, size_t len) {
 
   spi->setHwCs(false);
 
-#if 0
-  Serial.printf("sendCommand: '%c'(%02x) '%c'(%02x) LEN:%d SUM:%02x DATA:[", command>>8, command>>8, command&0xff, command&0xff, len, csum);
-  for (int i = 0; i < len; ++i)
-  {
-    Serial.printf(" %02x", data[i]);
-  }
-  Serial.printf("]\n");
-#endif
   return RF_RESULT_OK;
 }
 

lib/rapidfire_SPI/rapidFIRE_SPI.h

@@ -36,7 +36,7 @@ class rapidFIRE_SPI {
   int SPI_pin_SCK = -1;
   int SPI_pin_DATA = -1;
   int SPI_pin_SS = -1;
-  int SPI_freq;
+  int SPI_freq = -1;
 
   SPIClass *spi = NULL;
 
@@ -71,7 +71,8 @@ class rapidFIRE_SPI {
   };
   enum RAPIDFIREMODE {
     RAPIDFIRE_1 = 0x00, // - RapidFIRE #1
-    RAPIDFIRE_2 = 0x01, // - RapidFIRE #2
+    RAPIDFIRE_2 = 0x01, // - RapidFIRE #2 # Seems to have compatibility issues
+                        // with OSD UserText
     LEGACY = 0x02,      // - Legacy
   };
 

lib/rapidfire_SPI/rapidFIRE_SPI_Protocol.h

@@ -5,11 +5,12 @@
 
 #pragma once
 
-// The CS1, CS2, CS3 pins are used as the SPI interface. These are normally used as a 3-bit
-// binary interface to communicate the goggle selected channel to the module.
-// The SPI interface is configured so that the module is the slave (allowing several modules to
-// be connected to the same bus), with CPOL = 0, CPHA = 0, MSB first.
-// The speed should be limited to a clock rate of about 80kHz.
+// The CS1, CS2, CS3 pins are used as the SPI interface. These are normally used
+// as a 3-bit binary interface to communicate the goggle selected channel to the
+// module. The SPI interface is configured so that the module is the slave
+// (allowing several modules to be connected to the same bus), with CPOL = 0,
+// CPHA = 0, MSB first. The speed should be limited to a clock rate of about
+// 80kHz.
 
 #define RAPIDFIRE_SPI_CS1 1
 #define RAPIDFIRE_SPI_CS2 2
@@ -18,20 +19,24 @@
 #define RAPIDFIRE_SPI_CPOL 0
 #define RAPIDFIRE_SPI_CPHA 0
 
-#define RAPIDFIRE_SPI_BIT (SPI_MSBFIRST)
+#define RAPIDFIRE_SPI_BIT SPI_MSBFIRST
 
-#define RAPIDFIRE_SPI_MAX_CLOCK (80000) // 80kHz
+#define RAPIDFIRE_SPI_MAX_CLOCK 80000 // 80kHz
 
 #define RAPIDFIRE_SPI_MODE_ENABLE_DELAY 100 // ms
 
+#define RAPIDFIRE_MAX_LENGTH_TEXT                                              \
+  25 // max length of text to display on rapidfire osd
+
 // SPI Protocol
 // ------------
 //
 // Command Heade
 //
 // | cmd | dir | len | csum | data0 | ... | |
 //
-// Where Csum is computed as the 8 - bit checksum of all header bytes, Cmd, Dir, Len, and all(optional) data bytes.
+// Where Csum is computed as the 8 - bit checksum of all header bytes, Cmd, Dir,
+// Len, and all(optional) data bytes.
 //
 // Query Header
 // | len | csum | data0 | ... | |
@@ -43,9 +48,10 @@
 #define RAPIDFIRE_CMD(Cmd, Dir) (Cmd << 8 | Dir)
 
 // Query
-#define RAPIDFIRE_CMD_FIRMWARE_VERSION RAPIDFIRE_CMD('F', '?') // - Firmware Version, Query
-#define RAPIDFIRE_CMD_VOLTAGE RAPIDFIRE_CMD('V', '?')          // - Voltage, Query
-#define RAPIDFIRE_CMD_RSSI RAPIDFIRE_CMD('R', '?')             // - RSSI, Query
+#define RAPIDFIRE_CMD_FIRMWARE_VERSION                                         \
+  RAPIDFIRE_CMD('F', '?') // - Firmware Version, Query
+#define RAPIDFIRE_CMD_VOLTAGE RAPIDFIRE_CMD('V', '?') // - Voltage, Query
+#define RAPIDFIRE_CMD_RSSI RAPIDFIRE_CMD('R', '?')    // - RSSI, Query
 
 // Action
 #define RAPIDFIRE_CMD_SOUND_BUZZER RAPIDFIRE_CMD('S', '>') // - Buzzer
@@ -57,4 +63,3 @@
 #define RAPIDFIRE_CMD_SET_CHANNEL RAPIDFIRE_CMD('C', '=')
 #define RAPIDFIRE_CMD_SET_BAND RAPIDFIRE_CMD('B', '=')
 #define RAPIDFIRE_CMD_SET_RAPIDFIRE_MODE RAPIDFIRE_CMD('D', '=')
-