Merge pull request #965 from cyberman54/master

sync dev to master

.github/workflows/build.yml

@@ -255,7 +255,7 @@ jobs:
           run: sleep 120s
           shell: bash
         - name: Query testboard
-          uses: indiesdev/curl@v1.1
+          uses: cyberman54/curl@v1.3
           id: ttn
           with:
             #Get latest decoded payload message seen last 120 seconds from testboard

platformio_orig.ini

@@ -1,6 +1,7 @@
 ; ---> SELECT ONE TARGET BOARD FROM FOLLOWING ROWS <---
 ;
 ; Note: For "LILYGO TTGO ESP32-Paxcounter LoRa32 V2.1 1.6.1" select board ttgov21new.h
+; Note: For "LILYGO TTGO ESP32-Paxcounter LoRa32 V2.0 1.6.0" select board ttgov2.h and add bodge wire from LORA_IO1 to GPIO33
 ;
 ;
 [board]
@@ -124,6 +125,11 @@ upload_protocol = custom
 
 [env:usb]
 upload_protocol = esptool
+upload_speed = 921600
+monitor_speed = 115200
+; necessary for macos - adjust devicename accordingly
+;upload_port = /dev/tty.usbserial-xxxxxxx
+;monitor_port = /dev/tty.usbserial-xxxxxxx
 
 [env:dev]
 upload_protocol = esptool

src/hal/ttgov2.h

@@ -1,13 +1,14 @@
 // clang-format off
 // upload_speed 921600
-// board ttgo-lora32-v1
+// board ttgo-lora32-v2
+// https://github.com/LilyGO/TTGO-LORA32
 
 #ifndef _TTGOV2_H
 #define _TTGOV2_H
 
 #include <stdint.h>
 
-// Hardware related definitions for TTGO V2 Board
+// Hardware related definitions for LilyGO TTGO LORA32 V2 Board
 
 #define HAS_LORA 1       // comment out if device shall not send data via LoRa
 #define CFG_sx1276_radio 1 // HPD13A LoRa SoC
@@ -34,8 +35,10 @@
 
 // Pins for LORA chip SPI interface come from board file, we need some
 // additional definitions for LMIC
-#define LORA_RST  LMIC_UNUSED_PIN
+// ********************************************************************************************
+//! LORA_IO1 is not connected on LilyGO TTGO V2 - bodge wire from LORA_IO1 to GPIO33 necessary
 #define LORA_IO1  (33)
+// ********************************************************************************************
 #define LORA_IO2  LMIC_UNUSED_PIN
 
 #endif

src/lorawan.cpp

@@ -219,7 +219,11 @@ void lora_send(void *pvParameters) {
       xQueueReceive(LoraSendQueue, &SendBuffer, (TickType_t)0);
       break;
     case LMIC_ERROR_TX_BUSY:   // LMIC already has a tx message pending
+      ESP_LOGV(TAG, "Message not sent, LMIC busy, will retry later");
+      vTaskDelay(pdMS_TO_TICKS(500 + random(400))); // wait a while
+      break;
     case LMIC_ERROR_TX_FAILED: // message was not sent
+      ESP_LOGV(TAG, "Message not sent, TX failed, will retry later");
       vTaskDelay(pdMS_TO_TICKS(500 + random(400))); // wait a while
       break;
     case LMIC_ERROR_TX_TOO_LARGE:    // message size exceeds LMIC buffer size