Compare commits

...

5 Commits

Author SHA1 Message Date
richonguzman fd24ce8598 versionDate update 2025-08-04 14:50:33 -04:00
richonguzman 6cbe8173e8 test1 2025-07-30 08:53:02 -04:00
richonguzman b4261f37cb index Requires update 2025-07-26 10:23:46 -04:00
richonguzman b5a68a6758 index date update 2025-07-26 10:03:06 -04:00
richonguzman ce3d136954 versionDate 2025-07-26 09:58:38 -04:00
3 changed files with 17 additions and 10 deletions
+7 -4
View File
@@ -661,7 +661,10 @@
<label <label
for="digi.ecoMode" for="digi.ecoMode"
class="form-label" class="form-label"
>Eco Mode</label >Eco Mode
<small
>(Requires Digipeating enabled and APRS-IS connection disabled).</small
></label
> >
<select <select
class="form-select form-select" class="form-select form-select"
@@ -1245,9 +1248,9 @@
<label <label
for="wxsensor.active" for="wxsensor.active"
class="form-label" class="form-label"
><b>Activate Wx Telemetry</b> >Activate Wx Telemetry
<small <small
>Requires a BME/BMP280, BME680 or Si7021 sensor.</small >(Requires a BME/BMP280, BME680 or Si7021 sensor).</small
></label ></label
> >
</div> </div>
@@ -1889,7 +1892,7 @@
d="M16 8A8 8 0 1 1 0 8a8 8 0 0 1 16 0M5.408 5.89c.681 0 1.138.47 1.187 1.107h1.147v-.11c-.053-1.187-1.024-2-2.343-2-1.604 0-2.518 1.05-2.518 2.751v.747c0 1.7.906 2.73 2.518 2.73 1.314 0 2.285-.792 2.343-1.939v-.114H6.595c-.049.615-.497 1.05-1.187 1.05-.84 0-1.318-.62-1.318-1.727v-.742c0-1.112.488-1.754 1.318-1.754Zm5.404 0c.68 0 1.138.47 1.186 1.107h1.147v-.11c-.053-1.187-1.024-2-2.342-2-1.604 0-2.518 1.05-2.518 2.751v.747c0 1.7.905 2.73 2.518 2.73 1.314 0 2.285-.792 2.342-1.939v-.114h-1.147c-.048.615-.496 1.05-1.186 1.05-.84 0-1.319-.62-1.319-1.727v-.742c0-1.112.488-1.754 1.319-1.754Z" d="M16 8A8 8 0 1 1 0 8a8 8 0 0 1 16 0M5.408 5.89c.681 0 1.138.47 1.187 1.107h1.147v-.11c-.053-1.187-1.024-2-2.343-2-1.604 0-2.518 1.05-2.518 2.751v.747c0 1.7.906 2.73 2.518 2.73 1.314 0 2.285-.792 2.343-1.939v-.114H6.595c-.049.615-.497 1.05-1.187 1.05-.84 0-1.318-.62-1.318-1.727v-.742c0-1.112.488-1.754 1.318-1.754Zm5.404 0c.68 0 1.138.47 1.186 1.107h1.147v-.11c-.053-1.187-1.024-2-2.342-2-1.604 0-2.518 1.05-2.518 2.751v.747c0 1.7.905 2.73 2.518 2.73 1.314 0 2.285-.792 2.342-1.939v-.114h-1.147c-.048.615-.496 1.05-1.186 1.05-.84 0-1.319-.62-1.319-1.727v-.742c0-1.112.488-1.754 1.319-1.754Z"
/> />
</svg> </svg>
2023-24 2023-25
<b <b
><a href="https://github.com/richonguzman" ><a href="https://github.com/richonguzman"
>CA2RXU</a >CA2RXU</a
+1 -1
View File
@@ -66,7 +66,7 @@ ___________________________________________________________________*/
#endif #endif
String versionDate = "2025-06-20"; String versionDate = "2025-08-04";
Configuration Config; Configuration Config;
WiFiClient espClient; WiFiClient espClient;
#ifdef HAS_GPS #ifdef HAS_GPS
+9 -5
View File
@@ -224,6 +224,14 @@ namespace WX_Utils {
} }
} }
float getAltitudeCorrection() {
#ifdef HAS_GPS
return Config.beacon.gpsActive ? gps.altitude.meters() : Config.wxsensor.heightCorrection;
#else
return Config.wxsensor.heightCorrection;
#endif
}
String readDataSensor() { String readDataSensor() {
switch (wxModuleType) { switch (wxModuleType) {
case 1: // BME280 case 1: // BME280
@@ -282,11 +290,7 @@ namespace WX_Utils {
String presStr = (wxModuleType == 4 || wxModuleType == 5) String presStr = (wxModuleType == 4 || wxModuleType == 5)
? "....." ? "....."
#ifdef HAS_GPS : generatePresString(newPress + getAltitudeCorrection() / CORRECTION_FACTOR);
: generatePresString(newPress + (gps.altitude.meters() / CORRECTION_FACTOR));
#else
: generatePresString(newPress + (Config.wxsensor.heightCorrection / CORRECTION_FACTOR));
#endif
fifthLine = "BME-> "; fifthLine = "BME-> ";
fifthLine += String(int(newTemp + Config.wxsensor.temperatureCorrection)); fifthLine += String(int(newTemp + Config.wxsensor.temperatureCorrection));