mirror of
https://github.com/richonguzman/LoRa_APRS_iGate.git
synced 2026-07-09 19:31:20 +02:00
Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 2c6665b557 | |||
| 38f52564f1 | |||
| 49e92c622f | |||
| 5370850ae1 | |||
| 984e9f9561 | |||
| f60252ef94 |
@@ -12,7 +12,7 @@ ____________________________________________________
|
||||
# <a href="https://richonguzman.github.io/lora-igate-web-flasher/installer.html" target="_blank">WEB FLASHER/INSTALLER</a>
|
||||
|
||||
|
||||
# <a href="https://drive.google.com/file/d/1-jafzOWis_qOaNUl4WGVcFKjh_uCJtB6/view?usp=share_link" target="_blank">LoRa APRS iGate CA2RXU Firmware Manual</a>
|
||||
# <a href="https://drive.google.com/file/d/1Hff_Szd7ks8RC7_RiV6POxPJlclbO05M/view?usp=sharing" target="_blank">LoRa APRS iGate CA2RXU Firmware Manual</a>
|
||||
|
||||
____________________________________________________
|
||||
|
||||
|
||||
+1
-1
@@ -38,7 +38,7 @@ lib_deps =
|
||||
mathieucarbou/AsyncTCP @ 3.2.5
|
||||
mathieucarbou/ESPAsyncWebServer @ 3.2.3
|
||||
mikalhart/TinyGPSPlus @ 1.0.3
|
||||
richonguzman/APRSPacketLib @1.0.4
|
||||
richonguzman/APRSPacketLib @ 1.0.4
|
||||
display_libs =
|
||||
adafruit/Adafruit GFX Library @ 1.11.9
|
||||
adafruit/Adafruit SSD1306 @ 2.5.10
|
||||
|
||||
@@ -67,8 +67,8 @@ ___________________________________________________________________*/
|
||||
#endif
|
||||
|
||||
|
||||
String versionDate = "2025-12-01";
|
||||
String versionNumber = "3.1.5";
|
||||
String versionDate = "2025-12-11";
|
||||
String versionNumber = "3.1.5.1";
|
||||
Configuration Config;
|
||||
WiFiClient aprsIsClient;
|
||||
WiFiClient mqttClient;
|
||||
|
||||
+1
-1
@@ -45,7 +45,7 @@ namespace NTP_Utils {
|
||||
}
|
||||
|
||||
String getFormatedTime() {
|
||||
if (Config.digi.ecoMode == 0) return timeClient->getFormattedTime();
|
||||
if (WiFi.status() == WL_CONNECTED && Config.digi.ecoMode == 0) return timeClient->getFormattedTime();
|
||||
return "DigiEcoMode Active";
|
||||
}
|
||||
|
||||
|
||||
@@ -122,7 +122,7 @@ namespace TELEMETRY_Utils {
|
||||
telemetryCounter++;
|
||||
if (telemetryCounter == 1000) telemetryCounter = 0;
|
||||
if (Config.battery.sendInternalVoltage) telemetry += generateEncodedTelemetryBytes(BATTERY_Utils::checkInternalVoltage(), false, 0);
|
||||
if (Config.battery.sendExternalVoltage) telemetry += generateEncodedTelemetryBytes(BATTERY_Utils::checkExternalVoltage(), false, 1);
|
||||
if (Config.battery.sendExternalVoltage) telemetry += generateEncodedTelemetryBytes(BATTERY_Utils::checkExternalVoltage(), false, Config.battery.useExternalI2CSensor ? 0 : 1);
|
||||
telemetry += "|";
|
||||
return telemetry;
|
||||
}
|
||||
|
||||
+2
-3
@@ -158,6 +158,8 @@ namespace Utils {
|
||||
|
||||
showActiveStations();
|
||||
|
||||
beaconPacket = iGateBeaconPacket;
|
||||
secondaryBeaconPacket = iGateLoRaBeaconPacket;
|
||||
#ifdef HAS_GPS
|
||||
if (Config.beacon.gpsActive && Config.digi.ecoMode == 0) {
|
||||
GPS_Utils::getData();
|
||||
@@ -176,9 +178,6 @@ namespace Utils {
|
||||
secondaryBeaconPacket += encodedGPS;
|
||||
}
|
||||
}
|
||||
#else
|
||||
beaconPacket = iGateBeaconPacket;
|
||||
secondaryBeaconPacket = iGateLoRaBeaconPacket;
|
||||
#endif
|
||||
|
||||
if (Config.wxsensor.active) {
|
||||
|
||||
+17
-13
@@ -270,21 +270,25 @@ namespace WX_Utils {
|
||||
newPress = 0;
|
||||
break;
|
||||
case 5: // SHTC3
|
||||
#ifdef LIGHTGATEWAY_PLUS_1_0
|
||||
sensors_event_t humidity, temp;
|
||||
shtc3.getEvent(&humidity, &temp);
|
||||
newTemp = temp.temperature;
|
||||
newHum = humidity.relative_humidity;
|
||||
newPress = 0;
|
||||
#endif
|
||||
{
|
||||
#ifdef LIGHTGATEWAY_PLUS_1_0
|
||||
sensors_event_t humidity, temp;
|
||||
shtc3.getEvent(&humidity, &temp);
|
||||
newTemp = temp.temperature;
|
||||
newHum = humidity.relative_humidity;
|
||||
newPress = 0;
|
||||
#endif
|
||||
}
|
||||
break;
|
||||
case 6: // BMP280 + AHT20
|
||||
bmp280.takeForcedMeasurement();
|
||||
newTemp = bmp280.readTemperature();
|
||||
newPress = (bmp280.readPressure() / 100.0F);
|
||||
sensors_event_t humidity, temp;
|
||||
aht20.getEvent(&humidity, &temp);
|
||||
newHum = humidity.relative_humidity;
|
||||
{
|
||||
bmp280.takeForcedMeasurement();
|
||||
newTemp = bmp280.readTemperature();
|
||||
newPress = (bmp280.readPressure() / 100.0F);
|
||||
sensors_event_t humidity, temp;
|
||||
aht20.getEvent(&humidity, &temp);
|
||||
newHum = humidity.relative_humidity;
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user