Improved queue and buffering

Config.h

@@ -4,7 +4,7 @@
 	#define CONFIG_H
 
 	#define MAJ_VERS  0x01
-	#define MIN_VERS  0x0E
+	#define MIN_VERS  0x0F
 
 	#define MCU_1284P 0x91
 
@@ -34,9 +34,9 @@
 		const int pin_led_rx = 12;
 		const int pin_led_tx = 13;
 
-		#define CONFIG_UART_BUFFER_SIZE 6750
+		#define CONFIG_UART_BUFFER_SIZE 6144
-		#define CONFIG_QUEUE_SIZE 6750
+		#define CONFIG_QUEUE_SIZE 6144
-		#define CONFIG_QUEUE_MAX_LENGTH 70
+		#define CONFIG_QUEUE_MAX_LENGTH 128
 
 		#define EEPROM_SIZE 4096
 		#define EEPROM_OFFSET EEPROM_SIZE-EEPROM_RESERVED

LoRa.cpp

@@ -368,8 +368,7 @@ void LoRaClass::sleep()
   writeRegister(REG_OP_MODE, MODE_LONG_RANGE_MODE | MODE_SLEEP);
 }
 
-void LoRaClass::setTxPower(int level, int outputPin)
+void LoRaClass::setTxPower(int level, int outputPin) {
-{
   if (PA_OUTPUT_RFO_PIN == outputPin) {
     // RFO
     if (level < 0) {
@@ -379,6 +378,7 @@ void LoRaClass::setTxPower(int level, int outputPin)
     }
 
     writeRegister(REG_PA_CONFIG, 0x70 | level);
+
   } else {
     // PA BOOST
     if (level < 2) {

README.md

@@ -44,7 +44,6 @@ All communications to and from the board uses [KISS framing](https://en.wikipedi
 | Radio Lock       | 0x07 | Sets or queries the radio lock
 | Device Detect    | 0x08 | Probe command for device detection
 | Promiscuous      | 0x0E | Sets or queries promiscuous mode
-| Ready            | 0x0F | Flow control command indicating ready for TX
 | RX Stats         | 0x21 | Queries received bytes
 | TX Stats         | 0x22 | Queries transmitted bytes
 | Last RSSI        | 0x23 | Indicates RSSI of last packet received

RNode_Firmware.ino

@@ -17,6 +17,9 @@ volatile uint8_t queue_height = 0;
 volatile size_t queued_bytes = 0;
 volatile size_t queue_cursor = 0;
 volatile size_t current_packet_start = 0;
+volatile bool serial_buffering = false;
+
+char sbuf[128];
 
 void setup() {
   // Seed the PRNG
@@ -29,7 +32,7 @@ void setup() {
   Serial.begin(serial_baudrate);
   while (!Serial);
 
-  serial_timer_init();
+  serial_interrupt_init();
 
   // Configure input and output pins
   pinMode(pin_led_rx, OUTPUT);
@@ -211,7 +214,7 @@ void receiveCallback(int packet_size) {
 }
 
 bool queueFull() {
-  return (queue_height < CONFIG_QUEUE_MAX_LENGTH && queued_bytes < CONFIG_QUEUE_SIZE);
+  return (queue_height >= CONFIG_QUEUE_MAX_LENGTH || queued_bytes >= CONFIG_QUEUE_SIZE);
 }
 
 volatile bool queue_flushing = false;
@@ -220,11 +223,11 @@ void flushQueue(void) {
     queue_flushing = true;
 
     size_t processed = 0;
-    for (size_t n = 0; n < queue_height; n++) {
+    while (!fifo16_isempty_locked(&packet_starts)) {
-      size_t start = fifo16_pop_locked(&packet_starts);
+      size_t start = fifo16_pop(&packet_starts);
-      size_t length = fifo16_pop_locked(&packet_lengths);
+      size_t length = fifo16_pop(&packet_lengths);
 
-      if (length >= MIN_L) {
+      if (length >= MIN_L && length <= MTU) {
         for (size_t i = 0; i < length; i++) {
           size_t pos = (start+i)%CONFIG_QUEUE_SIZE;
           tbuf[i] = packet_queue[pos];
@@ -239,7 +242,6 @@ void flushQueue(void) {
   queue_height = 0;
   queued_bytes = 0;
   queue_flushing = false;
-  kiss_indicate_ready();
 }
 
 void transmit(size_t size) {
@@ -306,7 +308,7 @@ void serialCallback(uint8_t sbyte) {
   if (IN_FRAME && sbyte == FEND && command == CMD_DATA) {
     IN_FRAME = false;
 
-    if (queue_height < CONFIG_QUEUE_MAX_LENGTH && queued_bytes < CONFIG_QUEUE_SIZE) {
+    if (!fifo16_isfull(&packet_starts) && queued_bytes < CONFIG_QUEUE_SIZE) {
         size_t s = current_packet_start;
         size_t e = queue_cursor-1; if (e == -1) e = CONFIG_QUEUE_SIZE-1;
         size_t l;
@@ -320,14 +322,13 @@ void serialCallback(uint8_t sbyte) {
         if (l >= MIN_L) {
             queue_height++;
 
-            fifo16_push_locked(&packet_starts, s);
+            fifo16_push(&packet_starts, s);
-            fifo16_push_locked(&packet_lengths, l);
+            fifo16_push(&packet_lengths, l);
 
             current_packet_start = queue_cursor;
         }
-    }
 
-    if (!queueFull()) kiss_indicate_ready();   
+    }
 
   } else if (sbyte == FEND) {
     IN_FRAME = true;
@@ -593,32 +594,47 @@ void loop() {
     }
   }
 
-  serial_poll();
+  if (!fifo_isempty_locked(&serialFIFO)) serial_poll();
 }
 
+volatile bool serial_polling = false;
 void serial_poll() {
+  serial_polling = true;
+
   while (!fifo_isempty_locked(&serialFIFO)) {
-    char sbyte = fifo_pop_locked(&serialFIFO);
+    char sbyte = fifo_pop(&serialFIFO);
     serialCallback(sbyte);
   }
+
+  serial_polling = false;
 }
 
+#define MAX_CYCLES 20
 void buffer_serial() {
-  while (Serial.available()) {
+  if (!serial_buffering) {
-    char c = Serial.read();
+    serial_buffering = true;
+
+    uint8_t c = 0;
+    while (c < MAX_CYCLES && Serial.available()) {
+      c++;
+
       if (!fifo_isfull_locked(&serialFIFO)) {
-      fifo_push_locked(&serialFIFO, c);
+        fifo_push_locked(&serialFIFO, Serial.read());
-    }
       }
     }
 
-void serial_timer_init() {
+    serial_buffering = false;
+  }
+}
+
+void serial_interrupt_init() {
   TCCR3A = 0;
   TCCR3B = _BV(CS10) |
            _BV(WGM33)|
            _BV(WGM32);
 
-  ICR3 = 23704; // Approximation of 16Mhz / 675
+  // Buffer incoming frames every 1ms
+  ICR3 = 16000;
 
   TIMSK3 = _BV(ICIE3);
 }

Utilities.h

@@ -620,10 +620,10 @@ static inline size_t fifo16_pop_locked(FIFOBuffer16 *f) {
 
 inline void fifo16_init(FIFOBuffer16 *f, size_t *buffer, size_t size) {
   f->head = f->tail = f->begin = buffer;
-  f->end = buffer + (size/sizeof(size_t)) - 2;
+  f->end = buffer + (size/sizeof(size_t)) - 1;
 }
 
 inline size_t fifo16_len(FIFOBuffer16 *f) {
-  return ((f->end - f->begin))/sizeof(size_t);
+  return ((f->end - f->begin));
 }