ehhh nope

include/aprs_is_utils.h

@@ -8,10 +8,10 @@ namespace APRS_IS_Utils {
 
     void    upload(const String& line);
     void    connect();
-
+    
     void    checkStatus();
     String  checkForStartingBytes(const String& packet);
-
+    
     String  buildPacketToUpload(const String& packet);
     bool    processReceivedLoRaMessage(const String& sender, const String& packet, bool thirdParty);
     void    processLoRaPacket(const String& packet);

include/battery_utils.h

@@ -8,7 +8,7 @@ namespace BATTERY_Utils {
 
     void    adcCalibration();
     void    adcCalibrationCheck();
-
+    
     void    setup();
     float   checkInternalVoltage();
     float   checkExternalVoltage();

include/configuration.h

@@ -152,7 +152,7 @@ public:
     WEBADMIN                webadmin;
     NTP                     ntp;    
     REMOTE_MANAGEMENT       remoteManagement;
-
+  
     void init();
     void writeFile();
     Configuration();

include/lora_utils.h

@@ -13,6 +13,7 @@ namespace LoRa_Utils {
     void    changeFreqTx();
     void    changeFreqRx();
     void    wakeRadio();
+    //void    startReceive();
     void    sleepRadio();
 
 }

include/tnc_utils.h

@@ -8,7 +8,7 @@ namespace TNC_Utils {
 
     void setup();
     void loop();
-
+    
     void sendToClients(const String& packet);
     void sendToSerial(const String& packet);
 

include/wifi_utils.h

@@ -11,7 +11,7 @@ namespace WIFI_Utils {
     void startWiFi();
     void checkAutoAPTimeout();
     void setup();
-
+    
 }
 
 #endif

src/A7670_utils.cpp

@@ -129,7 +129,7 @@
                         delayATMessage = 0;
                     } else if (ATMessage.indexOf(Config.callsign) >= 3 && !modemLoggedToAPRSIS && response.indexOf("OK") >= 0 && !stationBeacon) { // login info
                         validAT = true;
-                        delayATMessage = 0;
+                        delayATMessage = 0;       
                     } else if (ATMessage.indexOf(Config.callsign) == 0 && !beaconSended && response.indexOf("OK") >= 0 && !stationBeacon) {   // self beacon or querys
                         validAT = true;
                         i = 1;
@@ -203,5 +203,4 @@
             delay(1);
         }
     }
-    
 #endif

src/aprs_is_utils.cpp

@@ -28,7 +28,7 @@ uint32_t    lastRxTime      = millis();
 bool        passcodeValid   = false;
 
 #ifdef HAS_A7670
-    extern bool             stationBeacon;
+    extern bool                 stationBeacon;
 #endif
 
 
@@ -75,7 +75,7 @@ namespace APRS_IS_Utils {
                 wifiState = "--";
             } else {
                 wifiState = "AP";
-            }
+            }            
             if (!Config.display.alwaysOn && Config.display.timeout != 0) {
                 displayToggle(true);
             }
@@ -136,7 +136,7 @@ namespace APRS_IS_Utils {
             ackMessage.concat(packet.substring(packet.indexOf("{") + 1));
             ackMessage.trim();
             //Serial.println(ackMessage);
-
+            
             String addToBuffer = Config.callsign;
             addToBuffer += ">APLRG1";
             if (!thirdParty) addToBuffer += ",RFONLY";

src/digi_utils.cpp

@@ -116,7 +116,7 @@ namespace DIGI_Utils {
         }
     }
 
-    void processLoRaPacket(const String& packet) {
+    void processLoRaPacket(const String& packet) {        
         if (packet.indexOf("NOGATE") == -1) {
             bool thirdPartyPacket = false;
             String temp, Sender;

src/display.cpp

@@ -44,7 +44,7 @@
         #endif
     #endif
 #endif
-
+    
 extern  Configuration   Config;
 
 bool    displayFound    = false;

src/gps_utils.cpp

@@ -101,7 +101,7 @@ namespace GPS_Utils {
         }
         generateBeaconFirstPart();
         String encodedGPS       = encodeGPS(Config.beacon.latitude, Config.beacon.longitude, Config.beacon.overlay, Config.beacon.symbol);
-        iGateBeaconPacket       += encodedGPS;
+        iGateBeaconPacket       += encodedGPS;        
         iGateLoRaBeaconPacket   += encodedGPS;
     }
 

src/lora_utils.cpp

@@ -23,8 +23,9 @@ bool transmitFlag    = true;
 #endif
 #ifdef HAS_SX1268
     #if defined(LIGHTGATEWAY_1_0) || defined(LIGHTGATEWAY_PLUS_1_0)
-        SPIClass loraSPI(FSPI);
-        SX1268 radio = new Module(RADIO_CS_PIN, RADIO_DIO1_PIN, RADIO_RST_PIN, RADIO_BUSY_PIN, loraSPI); 
+        //SPIClass loraSPI(FSPI);
+        //SX1268 radio = new Module(RADIO_CS_PIN, RADIO_DIO1_PIN, RADIO_RST_PIN, RADIO_BUSY_PIN, loraSPI);
+        SX1268 radio = new Module(RADIO_CS_PIN, RADIO_DIO1_PIN, RADIO_RST_PIN, RADIO_BUSY_PIN);
     #else
         SX1268 radio = new Module(RADIO_CS_PIN, RADIO_DIO1_PIN, RADIO_RST_PIN, RADIO_BUSY_PIN);
     #endif
@@ -53,7 +54,8 @@ namespace LoRa_Utils {
         #if defined (LIGHTGATEWAY_1_0) || defined(LIGHTGATEWAY_PLUS_1_0)
             pinMode(RADIO_VCC_PIN,OUTPUT);
             digitalWrite(RADIO_VCC_PIN,HIGH);
-            loraSPI.begin(RADIO_SCLK_PIN, RADIO_MISO_PIN, RADIO_MOSI_PIN, RADIO_CS_PIN);
+            //loraSPI.begin(RADIO_SCLK_PIN, RADIO_MISO_PIN, RADIO_MOSI_PIN, RADIO_CS_PIN);
+            SPI.begin(RADIO_SCLK_PIN, RADIO_MISO_PIN, RADIO_MOSI_PIN);
         #else
             SPI.begin(RADIO_SCLK_PIN, RADIO_MISO_PIN, RADIO_MOSI_PIN);
         #endif
@@ -199,7 +201,7 @@ namespace LoRa_Utils {
                             }
                         } else {
                             packet = "";
-                        }
+                        }                        
                         lastRxTime = millis();
                         return packet;
                     }

src/ota_utils.cpp

@@ -14,14 +14,14 @@ unsigned long ota_progress_millis = 0;
 
 
 namespace OTA_Utils {
-
+    
     void setup(AsyncWebServer *server) {
         if (Config.ota.username != ""  && Config.ota.password != "") {
             ElegantOTA.begin(server, Config.ota.username.c_str(), Config.ota.password.c_str());
         } else {
             ElegantOTA.begin(server);
         }
-
+        
         ElegantOTA.setAutoReboot(true);
         ElegantOTA.onStart(onOTAStart);
         ElegantOTA.onProgress(onOTAProgress);
@@ -55,8 +55,8 @@ namespace OTA_Utils {
 
         Serial.println(success ? "OTA update finished successfully!" : "There was an error during OTA update!");
         displayShow("", "", statusMessage, "", rebootMessage, "", "", 4000);
-
+        
         isUpdatingOTA = false;
     }
-
+    
 }

src/power_utils.cpp

@@ -232,7 +232,7 @@ namespace POWER_Utils {
                 digitalWrite(VEXT_CTRL, Config.digi.ecoMode == 1 ? HIGH : LOW);
             #endif
         #endif
-
+        
         #ifdef HAS_GPS
             if (Config.beacon.gpsActive && Config.digi.ecoMode != 1) activateGPS();
         #endif
@@ -274,7 +274,7 @@ namespace POWER_Utils {
             delay(500);
             Wire.begin(BOARD_I2C_SDA, BOARD_I2C_SCL);
         #endif
-
+        
         delay(1000);
         BATTERY_Utils::setup();
         BATTERY_Utils::startupBatteryHealth();

src/query_utils.cpp

@@ -113,7 +113,7 @@ namespace QUERY_Utils {
                 Config.writeFile();
             }
         }
-
+        
         if (answer == "") return "";
 
         String queryAnswer = Config.callsign;

src/sleep_utils.cpp

@@ -27,16 +27,36 @@ namespace SLEEP_Utils {
             wakeUpFlag = false;
         }
     }
-
+    
     void setup() {
         if (Config.digi.ecoMode == 1) {
             pinMode(RADIO_WAKEUP_PIN, INPUT);
             attachInterrupt(digitalPinToInterrupt(RADIO_WAKEUP_PIN), wakeUpLoRaPacketReceived, RISING);
-            #if defined(TTGO_LORA32_V2_1) || defined(TTGO_LORA32_V2_1_915) || defined(TTGO_LORA32_T3S3_V1_2) || defined(TTGO_T_BEAM_V1_0) || defined(TTGO_T_BEAM_V1_0_915) || defined(TTGO_T_BEAM_V1_0_SX1268) || defined(TTGO_T_BEAM_V1_2) || defined(TTGO_T_BEAM_V1_2_915) || defined(TTGO_T_BEAM_V1_2_SX1262) || defined(TTGO_T_DECK_PLUS) || defined(TTGO_T_DECK_GPS) || defined(TTGO_T_Beam_S3_SUPREME_V3) || defined(HELTEC_V3) || defined(HELTEC_V3_2) || defined(HELTEC_WP) || defined(HELTEC_WS) || defined(HELTEC_WSL_V3) || defined(HELTEC_WSL_V3_DISPLAY) || defined(HELTEC_WIRELESS_TRACKER) || defined(HELTEC_V2) || defined(XIAO_ESP32S3_LORA) || defined(LIGHTGATEWAY_1_0) || defined(LIGHTGATEWAY_PLUS_1_0) || defined(TROY_LoRa_APRS) || defined(OE5HWN_MeshCom) || defined(ESP32_DIY_LoRa) || defined(ESP32_DIY_LoRa_915) || defined(ESP32_DIY_1W_LoRa) || defined(ESP32_DIY_1W_LoRa_915) || defined(ESP32_DIY_1W_LoRa_LLCC68) || defined(ESP32_DIY_1W_LoRa_Mesh_V1_2) || defined(WEMOS_S2_MINI_DIY_LoRa) || defined(WEMOS_D1_R32_RA02) || defined(WEMOS_LOLIN32_OLED_DIY_LoRa)
+            #if defined(TTGO_LORA32_V2_1) || defined(TTGO_LORA32_V2_1_915) || defined(TTGO_LORA32_T3S3_V1_2) || defined(TTGO_T_BEAM_V1_0) || defined(TTGO_T_BEAM_V1_0_915) || defined(TTGO_T_BEAM_V1_0_SX1268) || defined(TTGO_T_BEAM_V1_2) || defined(TTGO_T_BEAM_V1_2_915) || defined(TTGO_T_BEAM_V1_2_SX1262) || defined(TTGO_T_DECK_PLUS) || defined(TTGO_T_DECK_GPS) || defined(TTGO_T_Beam_S3_SUPREME_V3) || defined(HELTEC_V3) || defined(HELTEC_V3_2) || defined(HELTEC_WP) || defined(HELTEC_WS) || defined(HELTEC_WSL_V3) || defined(HELTEC_WSL_V3_DISPLAY) || defined(HELTEC_WIRELESS_TRACKER) || defined(HELTEC_V2) || defined(XIAO_ESP32S3_LORA) || defined(LIGHTGATEWAY_1_0) || defined(TROY_LoRa_APRS) || defined(OE5HWN_MeshCom) || defined(ESP32_DIY_LoRa) || defined(ESP32_DIY_LoRa_915) || defined(ESP32_DIY_1W_LoRa) || defined(ESP32_DIY_1W_LoRa_915) || defined(ESP32_DIY_1W_LoRa_LLCC68) || defined(ESP32_DIY_1W_LoRa_Mesh_V1_2) || defined(WEMOS_S2_MINI_DIY_LoRa) || defined(WEMOS_D1_R32_RA02) || defined(WEMOS_LOLIN32_OLED_DIY_LoRa)
                 esp_sleep_enable_ext1_wakeup(GPIO_WAKEUP_PIN, ESP_EXT1_WAKEUP_ANY_HIGH);
+
+
+                //esp_sleep_enable_ext1_wakeup(1ULL << GPIO_WAKEUP_PIN, ESP_EXT1_WAKEUP_ANY_HIGH);
+                //gpio_wakeup_enable((gpio_num_t)RADIO_WAKEUP_PIN, GPIO_INTR_HIGH_LEVEL); // ?????
             #endif
             #if defined(HELTEC_HTCT62) || defined(ESP32C3_DIY_1W_LoRa) || defined(ESP32C3_DIY_1W_LoRa_915) || defined(ESP32_C3_OctopusLab_LoRa)
                 esp_deep_sleep_enable_gpio_wakeup(1ULL << GPIO_WAKEUP_PIN, ESP_GPIO_WAKEUP_GPIO_HIGH);
+
+                //gpio_wakeup_enable(GPIO_WAKEUP_PIN, GPIO_INTR_HIGH_LEVEL);
+	            //esp_sleep_enable_gpio_wakeup();
+            #endif
+            #if defined(LIGHTGATEWAY_PLUS_1_0)
+                //esp_sleep_enable_ext1_wakeup(GPIO_WAKEUP_PIN, ESP_EXT1_WAKEUP_ANY_HIGH);
+                esp_sleep_enable_ext1_wakeup(1ULL << GPIO_WAKEUP_PIN, ESP_EXT1_WAKEUP_ANY_HIGH);
+
+                // Configure the GPIO wakeup source
+                //esp_sleep_enable_gpio_wakeup();
+
+                // Set wakeup condition on GPIO5: high level
+                //gpio_wakeup_enable(GPIO_NUM_5, GPIO_INTR_HIGH_LEVEL);
+                //gpio_wakeup_enable(GPIO_WAKEUP_PIN, GPIO_INTR_HIGH_LEVEL);
+                
+
             #endif
         }
     }
@@ -53,9 +73,15 @@ namespace SLEEP_Utils {
             esp_sleep_enable_timer_wakeup(timeToSleep * 1000000);   // 1 min = 60sec
             Serial.print("(Sleeping : "); Serial.print(timeToSleep); Serial.println("seconds)");
             delay(100);
-            LoRa_Utils::wakeRadio();
-            esp_light_sleep_start();
+            //LoRa_Utils::wakeRadio();
+            LoRa_Utils::sleepRadio();
+            //esp_light_sleep_start();
+            delay(500);
+            digitalWrite(RADIO_VCC_PIN,LOW);
+            delay(500);
+            esp_deep_sleep_start();
         }
+        
     }
 
     void checkSerial() {

src/station_utils.cpp

@@ -58,10 +58,10 @@ namespace STATION_Utils {
                 if (callsign.startsWith(wildcard)) return true;
             } else {
                 if (list[i] == callsign) return true;
-            }
+            }                
         }
         return false;
-    }
+    }    
 
     bool isBlacklisted(const String& callsign) {
         return checkCallsignList(blacklist, callsign);
@@ -94,7 +94,7 @@ namespace STATION_Utils {
         lastHeardObjects.emplace_back(LastHeardStation{millis(), object});  // Add new object and Tx
         return true;
     }
-
+    
     void deleteNotHeard() {
         std::vector<LastHeardStation>  lastHeardStation_temp;
         for (int i = 0; i < lastHeardStations.size(); i++) {
@@ -149,13 +149,13 @@ namespace STATION_Utils {
         return true;
     }
 
-    void processOutputPacketBufferUltraEcoMode() {
+    void processOutputPacketBufferUltraEcoMode() { 
         size_t currentIndex = 0;
         while (currentIndex < outputPacketBuffer.size()) {                  // this sends all packets from output buffer
             delay(3000);                                                    // and cleans buffer to avoid sending packets with time offset
             LoRa_Utils::sendNewPacket(outputPacketBuffer[currentIndex]);    // next time it wakes up
             currentIndex++;
-        }
+        }                               
         outputPacketBuffer.clear();
         //
         if (saveNewDigiEcoModeConfig) {

src/syslog_utils.cpp

@@ -17,7 +17,7 @@ namespace SYSLOG_Utils {
             String syslogPacket = "<165>1 - ";
             syslogPacket.concat(Config.callsign);
             syslogPacket.concat(" CA2RXU_LoRa_iGate_3.0 - - - "); //RFC5424 The Syslog Protocol
-
+            
             char signalData[35];
             snprintf(signalData, sizeof(signalData), " / %ddBm / %.2fdB / %dHz", rssi, snr, freqError);
 

src/tnc_utils.cpp

@@ -47,7 +47,7 @@ namespace TNC_Utils {
     void handleInputData(char character, int bufferIndex) {
         String* data = (bufferIndex == -1) ? &inputSerialBuffer : &inputServerBuffer[bufferIndex];
         if (data->length() == 0 && character != (char)FEND) return;
-
+        
         data->concat(character);
 
         if (character == (char)FEND && data->length() > 3) {

src/utils.cpp

@@ -189,7 +189,7 @@ namespace Utils {
     void checkBeaconInterval() {
         uint32_t lastTx = millis() - lastBeaconTx;
         if (lastBeaconTx == 0 || lastTx >= Config.beacon.interval * 60 * 1000) {
-            beaconUpdate = true;
+            beaconUpdate = true;    
         }
 
         #ifdef HAS_GPS

src/web_utils.cpp

@@ -115,7 +115,7 @@ namespace WEB_Utils {
 
         Config.wifiAutoAP.password      = request->getParam("wifi.autoAP.password", true)->value();
         Config.wifiAutoAP.timeout       = request->getParam("wifi.autoAP.timeout", true)->value().toInt();
-
+        
 
         Config.aprs_is.active           = request->hasParam("aprs_is.active", true);
         Config.aprs_is.passcode         = request->getParam("aprs_is.passcode", true)->value();
@@ -175,7 +175,7 @@ namespace WEB_Utils {
         Config.battery.externalSleepVoltage     = request->getParam("battery.externalSleepVoltage", true)->value().toFloat();
 
         Config.battery.sendVoltageAsTelemetry   = request->hasParam("battery.sendVoltageAsTelemetry", true);
-
+        
         Config.wxsensor.active                  = request->hasParam("wxsensor.active", true);
         Config.wxsensor.heightCorrection        = request->getParam("wxsensor.heightCorrection", true)->value().toInt();
         Config.wxsensor.temperatureCorrection   = request->getParam("wxsensor.temperatureCorrection", true)->value().toFloat();

src/wx_utils.cpp

@@ -71,7 +71,7 @@ namespace WX_Utils {
 
     void setup() {
         if (Config.wxsensor.active) {
-            getWxModuleAddres();
+            getWxModuleAddres();            
             if (wxModuleAddress != 0x00) {
                 bool wxModuleFound = false;
                 if (wxModuleAddress == 0x76 || wxModuleAddress == 0x77) {

variants/ESP32_C3_OctopusLab_LoRa/board_pinout.h

@@ -12,7 +12,7 @@
     #define RADIO_RST_PIN           -1
     #define RADIO_BUSY_PIN          8
     #define RADIO_WAKEUP_PIN        RADIO_DIO1_PIN
-    #define GPIO_WAKEUP_PIN         GPIO_NUM_3
+    #define GPIO_WAKEUP_PIN         RADIO_DIO1_PIN
 
     //  Display
     #define HAS_DISPLAY

variants/QRPLabs_LightGateway_Plus_1_0/board_pinout.h

@@ -16,6 +16,7 @@
     #define RADIO_TXEN              14
     #define RADIO_WAKEUP_PIN        RADIO_DIO1_PIN
     #define GPIO_WAKEUP_PIN         GPIO_SEL_5
+    //#define GPIO_WAKEUP_PIN         GPIO_NUM_5
 
     //  Display
     #define HAS_DISPLAY

variants/esp32c3_DIY_1W_LoRa/board_pinout.h

@@ -14,6 +14,6 @@
     #define RADIO_RXEN              6
     #define RADIO_TXEN              7
     #define RADIO_WAKEUP_PIN        RADIO_DIO1_PIN
-    #define GPIO_WAKEUP_PIN         GPIO_NUM_2
+    #define GPIO_WAKEUP_PIN         RADIO_DIO1_PIN
 
 #endif

variants/esp32c3_DIY_1W_LoRa_915/board_pinout.h

@@ -14,6 +14,6 @@
     #define RADIO_RXEN              6
     #define RADIO_TXEN              7
     #define RADIO_WAKEUP_PIN        RADIO_DIO1_PIN
-    #define GPIO_WAKEUP_PIN         GPIO_NUM_2
+    #define GPIO_WAKEUP_PIN         RADIO_DIO1_PIN
 
 #endif

variants/heltec_ht-ct62/platformio.ini

@@ -1,5 +1,5 @@
 [env:heltec_ht-ct62]
-board = esp32-c3-devkitm-1
+board = heltec_wireless_stick_lite
 board_build.mcu = esp32c3
 build_flags =
 	${common.build_flags}