Work on ESP32 compatibility

diff --git a/Config.h b/Config.h
index 570bf4a61801986629d6037e11e06dfcd246dcb8..89f419fabbf06f5c0fcadc8959da9992854cbc4e 100644 (file)
--- a/Config.h
+++ b/Config.h
@@ -79,6 +79,10 @@
 
                #define EEPROM_SIZE 1024
                #define EEPROM_OFFSET EEPROM_SIZE-EEPROM_RESERVED
+
+               #define GPS_BAUD_RATE 9600
+               #define PIN_GPS_TX 12
+               #define PIN_GPS_RX 34
        #endif
 
        #define eeprom_addr(a) (a+EEPROM_OFFSET)

diff --git a/RNode_Firmware.ino b/RNode_Firmware.ino
index c5a86eda63c03e4d82b478fe48c720412055abee..6c0301952e077de03f51ce12e5151e14a278f385 100644 (file)
--- a/RNode_Firmware.ino
+++ b/RNode_Firmware.ino
@@ -34,7 +34,7 @@ void setup() {
     delay(500);
     EEPROM.begin(EEPROM_SIZE);
     // TODO: Check this
-    //Serial.setRxBufferSize(CONFIG_UART_BUFFER_SIZE);
+    Serial.setRxBufferSize(CONFIG_UART_BUFFER_SIZE);
   #endif
 
   // Seed the PRNG
@@ -71,13 +71,15 @@ void setup() {
 
   #if MCU_VARIANT == MCU_ESP32
     // ESP32-specific initialisation
-    // The WDT is disabled for now. This
-    // should be re-enabled as soon as any
-    // Core0-related features are used
-    rtc_wdt_protect_off();
-    rtc_wdt_disable();
+    Serial1.begin(GPS_BAUD_RATE, SERIAL_8N1, PIN_GPS_RX, PIN_GPS_TX);
+    
+    // rtc_wdt_protect_off();
     // rtc_wdt_set_stage(RTC_WDT_STAGE0, RTC_WDT_STAGE_ACTION_RESET_SYSTEM);
     // rtc_wdt_set_time(RTC_WDT_STAGE0, 25);
+    // rtc_wdt_protect_on();
+    // rtc_wdt_enable();
+
+    kiss_indicate_reset();
   #endif
 
   // Validate board health, EEPROM and config
@@ -108,80 +110,123 @@ inline void kiss_write_packet() {
   #endif
 }
 
-void ISR_VECT receive_callback(int packet_size) {
-  if (!promisc) {
-    // The standard operating mode allows large
-    // packets with a payload up to 500 bytes,
-    // by combining two raw LoRa packets.
-    // We read the 1-byte header and extract
-    // packet sequence number and split flags
-    uint8_t header   = LoRa.read(); packet_size--;
-    uint8_t sequence = packetSequence(header);
-    bool    ready    = false;
-
-    if (isSplitPacket(header) && seq == SEQ_UNSET) {
-      // This is the first part of a split
-      // packet, so we set the seq variable
-      // and add the data to the buffer
-      read_len = 0;
-      seq = sequence;
-
-      #if MCU_VARIANT != MCU_ESP32
-        last_rssi = LoRa.packetRssi();
-        last_snr_raw = LoRa.packetSnrRaw();
-      #endif
+inline void getPacketData(int len) {
+  while (len-- && read_len < MTU) {
+    pbuf[read_len++] = LoRa.read();
+  }
+}
 
-      getPacketData(packet_size);
-    } else if (isSplitPacket(header) && seq == sequence) {
-      // This is the second part of a split
-      // packet, so we add it to the buffer
-      // and set the ready flag.
-      
-      #if MCU_VARIANT != MCU_ESP32
-        last_rssi = (last_rssi+LoRa.packetRssi())/2;
-        last_snr_raw = (last_snr_raw+LoRa.packetSnrRaw())/2;
-      #endif
-      
-      getPacketData(packet_size);
-      seq = SEQ_UNSET;
-      ready = true;
-    } else if (isSplitPacket(header) && seq != sequence) {
-      // This split packet does not carry the
-      // same sequence id, so we must assume
-      // that we are seeing the first part of
-      // a new split packet.
-      read_len = 0;
-      seq = sequence;
+#if MCU_VARIANT == MCU_ESP32
+  portMUX_TYPE isr_lock = portMUX_INITIALIZER_UNLOCKED;
+#endif
 
-      #if MCU_VARIANT != MCU_ESP32
-        last_rssi = LoRa.packetRssi();
-        last_snr_raw = LoRa.packetSnrRaw();
-      #endif
+bool handling_packet = false;
+void ISR_VECT receive_callback(int packet_size) {
+  #if MCU_VARIANT == MCU_ESP32
+    portENTER_CRITICAL_ISR(&isr_lock);
+  #endif
 
-      getPacketData(packet_size);
-    } else if (!isSplitPacket(header)) {
-      // This is not a split packet, so we
-      // just read it and set the ready
-      // flag to true.
+  #if MCU_VARIANT == MCU_ESP32
+  if (!handling_packet) {
+    handling_packet = true;
+    #endif
 
-      if (seq != SEQ_UNSET) {
-        // If we already had part of a split
-        // packet in the buffer, we clear it.
+    if (!promisc) {
+      // The standard operating mode allows large
+      // packets with a payload up to 500 bytes,
+      // by combining two raw LoRa packets.
+      // We read the 1-byte header and extract
+      // packet sequence number and split flags
+      uint8_t header   = LoRa.read(); packet_size--;
+      uint8_t sequence = packetSequence(header);
+      bool    ready    = false;
+
+      if (isSplitPacket(header) && seq == SEQ_UNSET) {
+        // This is the first part of a split
+        // packet, so we set the seq variable
+        // and add the data to the buffer
         read_len = 0;
+        seq = sequence;
+
+        #if MCU_VARIANT != MCU_ESP32
+          last_rssi = LoRa.packetRssi();
+          last_snr_raw = LoRa.packetSnrRaw();
+        #endif
+
+        getPacketData(packet_size);
+
+      } else if (isSplitPacket(header) && seq == sequence) {
+        // This is the second part of a split
+        // packet, so we add it to the buffer
+        // and set the ready flag.
+        
+        #if MCU_VARIANT != MCU_ESP32
+          last_rssi = (last_rssi+LoRa.packetRssi())/2;
+          last_snr_raw = (last_snr_raw+LoRa.packetSnrRaw())/2;
+        #endif
+        
+        getPacketData(packet_size);
         seq = SEQ_UNSET;
+        ready = true;
+
+      } else if (isSplitPacket(header) && seq != sequence) {
+        // This split packet does not carry the
+        // same sequence id, so we must assume
+        // that we are seeing the first part of
+        // a new split packet.
+        read_len = 0;
+        seq = sequence;
+
+        #if MCU_VARIANT != MCU_ESP32
+          last_rssi = LoRa.packetRssi();
+          last_snr_raw = LoRa.packetSnrRaw();
+        #endif
+
+        getPacketData(packet_size);
+
+      } else if (!isSplitPacket(header)) {
+        // This is not a split packet, so we
+        // just read it and set the ready
+        // flag to true.
+
+        if (seq != SEQ_UNSET) {
+          // If we already had part of a split
+          // packet in the buffer, we clear it.
+          read_len = 0;
+          seq = SEQ_UNSET;
+        }
+
+        #if MCU_VARIANT != MCU_ESP32
+          last_rssi = LoRa.packetRssi();
+          last_snr_raw = LoRa.packetSnrRaw();
+        #endif
+
+        getPacketData(packet_size);
+        ready = true;
       }
 
+      if (ready) {
+        #if MCU_VARIANT != MCU_ESP32
+          // We first signal the RSSI of the
+          // recieved packet to the host.
+          kiss_indicate_stat_rssi();
+          kiss_indicate_stat_snr();
+
+          // And then write the entire packet
+          kiss_write_packet();
+        #else
+          packet_ready = true;
+        #endif
+      }  
+    } else {
       #if MCU_VARIANT != MCU_ESP32
+        // In promiscuous mode, raw packets are
+        // output directly to the host
+        read_len = 0;
         last_rssi = LoRa.packetRssi();
         last_snr_raw = LoRa.packetSnrRaw();
-      #endif
-
-      getPacketData(packet_size);
-      ready = true;
-    }
+        getPacketData(packet_size);
 
-    if (ready) {
-      #if MCU_VARIANT != MCU_ESP32
         // We first signal the RSSI of the
         // recieved packet to the host.
         kiss_indicate_stat_rssi();
@@ -189,33 +234,21 @@ void ISR_VECT receive_callback(int packet_size) {
 
         // And then write the entire packet
         kiss_write_packet();
+
       #else
+        read_len = 0;
+        getPacketData(packet_size);
         packet_ready = true;
       #endif
-    }  
-  } else {
-    #if MCU_VARIANT != MCU_ESP32
-      // In promiscuous mode, raw packets are
-      // output directly to the host
-      read_len = 0;
-      last_rssi = LoRa.packetRssi();
-      last_snr_raw = LoRa.packetSnrRaw();
-      getPacketData(packet_size);
-
-      // We first signal the RSSI of the
-      // recieved packet to the host.
-      kiss_indicate_stat_rssi();
-      kiss_indicate_stat_snr();
-
-      // And then write the entire packet
-      kiss_write_packet();
-
-    #else
-      // Promiscous mode is not supported on ESP32 for now
-      getPacketData(packet_size);
-      read_len = 0;
+    #if MCU_VARIANT == MCU_ESP32
+    }
+    handling_packet = false;
     #endif
   }
+
+  #if MCU_VARIANT == MCU_ESP32
+    portEXIT_CRITICAL_ISR(&isr_lock);
+  #endif
 }
 
 
@@ -747,7 +780,7 @@ void serial_poll() {
 #if MCU_VARIANT != MCU_ESP32
   #define MAX_CYCLES 20
 #else
-  #define MAX_CYCLES 1
+  #define MAX_CYCLES 10
 #endif
 void buffer_serial() {
   if (!serial_buffering) {
@@ -768,6 +801,14 @@ void buffer_serial() {
       #endif
     }
 
+    #if MCU_VARIANT == MCU_ESP32
+      // Discard GPS data for now
+      c = 0;
+      while (c < MAX_CYCLES && Serial1.available()) {
+        uint8_t void_c = Serial1.read();
+      }
+    #endif
+
     serial_buffering = false;
   }
 }

diff --git a/Utilities.h b/Utilities.h
index 4c6cfdb5e98619ab029cba2e70bf2a58570bc257..fa45296775431df315e3fdc4598c4cb6d4e36e45 100644 (file)
--- a/Utilities.h
+++ b/Utilities.h
@@ -31,8 +31,8 @@ uint8_t boot_vector = 0x00;
        void led_tx_on()  { digitalWrite(pin_led_tx, HIGH); }
        void led_tx_off() { digitalWrite(pin_led_tx, LOW); }
 #elif MCU_VARIANT == MCU_ESP32
-       void led_rx_on()  { digitalWrite(pin_led_rx, LOW); }
-       void led_rx_off() {     digitalWrite(pin_led_rx, HIGH); }
+       void led_rx_on()  { digitalWrite(pin_led_rx, HIGH); }
+       void led_rx_off() {     digitalWrite(pin_led_rx, LOW); }
        void led_tx_on()  { digitalWrite(pin_led_tx, LOW); }
        void led_tx_off() { digitalWrite(pin_led_tx, HIGH); }
 #endif
@@ -216,6 +216,13 @@ void escapedSerialWrite(uint8_t byte) {
     Serial.write(byte);
 }
 
+void kiss_indicate_reset() {
+       Serial.write(FEND);
+       Serial.write(CMD_RESET);
+       Serial.write(CMD_RESET_BYTE);
+       Serial.write(FEND);
+}
+
 void kiss_indicate_error(uint8_t error_code) {
        Serial.write(FEND);
        Serial.write(CMD_ERROR);
@@ -389,12 +396,6 @@ inline uint8_t packetSequence(uint8_t header) {
        return header >> 4;
 }
 
-inline void getPacketData(int len) {
-       while (len--) {
-               pbuf[read_len++] = LoRa.read();
-       }
-}
-
 void setSpreadingFactor() {
        if (radio_online) LoRa.setSpreadingFactor(lora_sf);
 }