mirror of
https://github.com/richonguzman/LoRa_APRS_iGate.git
synced 2026-03-28 16:52:33 +01:00
Compare commits
7 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3cc8fed15f | ||
|
|
725be9fed5 | ||
|
|
16d9ef1c06 | ||
|
|
d2b7c063f7 | ||
|
|
eaced15265 | ||
|
|
af4bc20ac2 | ||
|
|
14473cb7c7 |
@@ -54,6 +54,7 @@ ____________________________________________________
|
||||
|
||||
## Timeline (Versions):
|
||||
|
||||
- 2025-04-20000000
|
||||
- 2025.03.20 Manager List added to enable/disable DigiEcoMode and Tx Control. Thanks LB5JJ.
|
||||
- 2025.03.03 T-Beam Supreme board added and more BlackList rules added.
|
||||
- 2025.02.28 Heltec Wireless Paper with Epaper working. Thanks SzymonPriv for pointing to the right library.
|
||||
|
||||
@@ -48,7 +48,7 @@ ___________________________________________________________________*/
|
||||
#endif
|
||||
|
||||
|
||||
String versionDate = "2025-04-24";
|
||||
String versionDate = "2025-04-25";
|
||||
Configuration Config;
|
||||
WiFiClient espClient;
|
||||
#ifdef HAS_GPS
|
||||
@@ -203,4 +203,10 @@ void loop() {
|
||||
Utils::checkRebootTime();
|
||||
Utils::checkSleepByLowBatteryVoltage(1);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// ESP32 (and ESPS3) work?
|
||||
|
||||
// ESP32C3 :
|
||||
// - HT-CT62 sleeps??
|
||||
// - and others?
|
||||
@@ -2,6 +2,7 @@
|
||||
#include "configuration.h"
|
||||
#include "aprs_is_utils.h"
|
||||
#include "station_utils.h"
|
||||
#include "board_pinout.h"
|
||||
#include "syslog_utils.h"
|
||||
#include "query_utils.h"
|
||||
#include "A7670_utils.h"
|
||||
@@ -370,7 +371,6 @@ namespace APRS_IS_Utils {
|
||||
listenAPRSIS();
|
||||
}
|
||||
}
|
||||
if (Config.digi.ecoMode == 1) displayToggle(false);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -4,6 +4,9 @@
|
||||
#include "display.h"
|
||||
|
||||
|
||||
bool shouldSleepStop = true;
|
||||
|
||||
|
||||
void Configuration::writeFile() {
|
||||
Serial.println("Saving config...");
|
||||
|
||||
@@ -166,6 +169,7 @@ bool Configuration::readFile() {
|
||||
|
||||
digi.mode = data["digi"]["mode"] | 0;
|
||||
digi.ecoMode = data["digi"]["ecoMode"] | 0;
|
||||
if (digi.ecoMode == 1) shouldSleepStop = false;
|
||||
|
||||
loramodule.txFreq = data["lora"]["txFreq"] | 433775000;
|
||||
loramodule.rxFreq = data["lora"]["rxFreq"] | 433775000;
|
||||
|
||||
@@ -225,7 +225,7 @@ namespace GPS_Utils {
|
||||
|
||||
void setup() {
|
||||
#ifdef HAS_GPS
|
||||
if (Config.beacon.gpsActive) {
|
||||
if (Config.beacon.gpsActive && Config.digi.ecoMode != 1) {
|
||||
gpsSerial.begin(GPS_BAUD, SERIAL_8N1, GPS_TX, GPS_RX);
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -133,8 +133,7 @@ namespace LoRa_Utils {
|
||||
}
|
||||
|
||||
#ifdef INTERNAL_LED_PIN
|
||||
//if (Config.digi.ecoMode != 1)
|
||||
digitalWrite(INTERNAL_LED_PIN, HIGH); // disabled in Ultra Eco Mode
|
||||
if (Config.digi.ecoMode != 1) digitalWrite(INTERNAL_LED_PIN, HIGH); // disabled in Ultra Eco Mode
|
||||
#endif
|
||||
int state = radio.transmit("\x3c\xff\x01" + newPacket);
|
||||
transmitFlag = true;
|
||||
@@ -149,18 +148,13 @@ namespace LoRa_Utils {
|
||||
Utils::println(String(state));
|
||||
}
|
||||
#ifdef INTERNAL_LED_PIN
|
||||
//if (Config.digi.ecoMode != 1)
|
||||
digitalWrite(INTERNAL_LED_PIN, LOW); // disabled in Ultra Eco Mode
|
||||
if (Config.digi.ecoMode != 1) digitalWrite(INTERNAL_LED_PIN, LOW); // disabled in Ultra Eco Mode
|
||||
#endif
|
||||
if (Config.loramodule.txFreq != Config.loramodule.rxFreq) {
|
||||
changeFreqRx();
|
||||
}
|
||||
}
|
||||
|
||||
/*void startReceive() {
|
||||
radio.startReceive();
|
||||
}*/
|
||||
|
||||
String receivePacketFromSleep() {
|
||||
String packet = "";
|
||||
int state = radio.readData(packet);
|
||||
|
||||
@@ -223,17 +223,19 @@ namespace POWER_Utils {
|
||||
}
|
||||
|
||||
#ifdef VEXT_CTRL
|
||||
pinMode(VEXT_CTRL,OUTPUT); // GPS + TFT on HELTEC Wireless_Tracker and only for Oled in HELTEC V3
|
||||
#if defined(HELTEC_WIRELESS_TRACKER) || defined(HELTEC_V3)
|
||||
digitalWrite(VEXT_CTRL, HIGH);
|
||||
#endif
|
||||
#if defined(HELTEC_WP) || defined(HELTEC_WS) || defined(HELTEC_V3_2)
|
||||
digitalWrite(VEXT_CTRL, LOW);
|
||||
#endif
|
||||
if (Config.digi.ecoMode != 1) {
|
||||
pinMode(VEXT_CTRL,OUTPUT); // GPS + TFT on HELTEC Wireless_Tracker and only for Oled in HELTEC V3
|
||||
#if defined(HELTEC_WIRELESS_TRACKER) || defined(HELTEC_V3)
|
||||
digitalWrite(VEXT_CTRL, HIGH);
|
||||
#endif
|
||||
#if defined(HELTEC_WP) || defined(HELTEC_WS) || defined(HELTEC_V3_2)
|
||||
digitalWrite(VEXT_CTRL, LOW);
|
||||
#endif
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef HAS_GPS
|
||||
if (Config.beacon.gpsActive) activateGPS();
|
||||
if (Config.beacon.gpsActive && Config.digi.ecoMode != 1) activateGPS();
|
||||
#endif
|
||||
|
||||
#ifdef ADC_CTRL
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
|
||||
|
||||
extern Configuration Config;
|
||||
extern bool shouldSleepStop;
|
||||
extern uint32_t lastBeaconTx;
|
||||
|
||||
bool wakeUpFlag = false;
|
||||
@@ -48,15 +49,15 @@ namespace SLEEP_Utils {
|
||||
}
|
||||
|
||||
void startSleeping() {
|
||||
uint32_t timeToSleep = getSecondsToSleep();
|
||||
esp_sleep_enable_timer_wakeup(timeToSleep * 1000000); // 1 min = 60sec
|
||||
Serial.print("(Sleeping : "); Serial.print(timeToSleep); Serial.println("seconds)");
|
||||
|
||||
//esp_sleep_enable_timer_wakeup(getSecondsToSleep() * 1000000); // 1 min = 60sec
|
||||
|
||||
delay(100);
|
||||
LoRa_Utils::wakeRadio();
|
||||
esp_light_sleep_start();
|
||||
if (!shouldSleepStop) {
|
||||
uint32_t timeToSleep = getSecondsToSleep();
|
||||
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();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@@ -88,7 +88,7 @@ namespace Utils {
|
||||
}
|
||||
|
||||
void setupDisplay() {
|
||||
displaySetup();
|
||||
if (Config.digi.ecoMode != 1) displaySetup();
|
||||
#ifdef INTERNAL_LED_PIN
|
||||
digitalWrite(INTERNAL_LED_PIN,HIGH);
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user