diff --git a/bin/firmware-debug.bin b/bin/firmware-debug.bin index dede29f..af786e7 100644 Binary files a/bin/firmware-debug.bin and b/bin/firmware-debug.bin differ diff --git a/bin/firmware.bin b/bin/firmware.bin index c04bfbf..9e146b7 100644 Binary files a/bin/firmware.bin and b/bin/firmware.bin differ diff --git a/src/config.cpp b/src/config.cpp index affe5dc..645bc5f 100644 --- a/src/config.cpp +++ b/src/config.cpp @@ -38,6 +38,7 @@ Config::Config() { sprintf(&buf[0], "" WIFI_MDNS "%s", getID() ); mDNS = &buf[0]; setTempFormat('C'); + setGravityFormat('G'); setSleepInterval(900); // 15 minutes setVoltageFactor(1.59); // Conversion factor for battery setTempSensorAdj(0.0); @@ -58,9 +59,10 @@ void Config::createJson(DynamicJsonDocument& doc) { doc[ CFG_PARAM_PUSH_HTTP ] = getHttpPushTarget(); doc[ CFG_PARAM_PUSH_HTTP2 ] = getHttpPushTarget2(); doc[ CFG_PARAM_SLEEP_INTERVAL ] = getSleepInterval(); - doc[ CFG_PARAM_PUSH_INTERVAL ] = getSleepInterval(); // TODO: @deprecated +// doc[ CFG_PARAM_PUSH_INTERVAL ] = getSleepInterval(); // TODO: @deprecated doc[ CFG_PARAM_VOLTAGEFACTOR ] = getVoltageFactor(); doc[ CFG_PARAM_GRAVITY_FORMULA ] = getGravityFormula(); + doc[ CFG_PARAM_GRAVITY_FORMAT ] = String(getGravityFormat()); doc[ CFG_PARAM_TEMP_ADJ ] = getTempSensorAdj(); doc[ CFG_PARAM_GRAVITY_TEMP_ADJ ] = isGravityTempAdj(); @@ -169,6 +171,10 @@ bool Config::loadFile() { setVoltageFactor( doc[ CFG_PARAM_VOLTAGEFACTOR ].as() ); if( !doc[ CFG_PARAM_GRAVITY_FORMULA ].isNull() ) setGravityFormula( doc[ CFG_PARAM_GRAVITY_FORMULA ] ); + if( !doc[ CFG_PARAM_GRAVITY_FORMAT ].isNull() ) { + String s = doc[ CFG_PARAM_GRAVITY_FORMAT ]; + setGravityFormat( s.charAt(0) ); + } if( !doc[ CFG_PARAM_TEMP_ADJ ].isNull() ) setTempSensorAdj( doc[ CFG_PARAM_TEMP_ADJ ].as() ); @@ -230,6 +236,7 @@ void Config::debug() { Log.verbose(F("CFG : Temp Adj; %F." CR), getTempSensorAdj() ); Log.verbose(F("CFG : VoltageFactor; %F." CR), getVoltageFactor() ); Log.verbose(F("CFG : Gravity formula; '%s'." CR), getGravityFormula() ); + Log.verbose(F("CFG : Gravity format; '%c'." CR), getGravityFormat() ); Log.verbose(F("CFG : Push brewfather; '%s'." CR), getBrewfatherPushTarget() ); Log.verbose(F("CFG : Push http; '%s'." CR), getHttpPushTarget() ); Log.verbose(F("CFG : Push http2; '%s'." CR), getHttpPushTarget2() ); diff --git a/src/config.h b/src/config.h index 6eb48da..8d24dce 100644 --- a/src/config.h +++ b/src/config.h @@ -54,6 +54,7 @@ SOFTWARE. #define CFG_PARAM_TEMPFORMAT "temp-format" // C or F #define CFG_PARAM_VOLTAGEFACTOR "voltage-factor" // Factor to calculate the battery voltage #define CFG_PARAM_GRAVITY_FORMULA "gravity-formula" // Formula for calculating gravity +#define CFG_PARAM_GRAVITY_FORMAT "gravity-format" // Gravity format G or P #define CFG_PARAM_GRAVITY_TEMP_ADJ "gravity-temp-adjustment" // True/False. Adjust gravity for temperature #define CFG_PARAM_TEMP_ADJ "temp-adjustment-value" // Correction value for temp sensor #define CFG_PARAM_GYRO_CALIBRATION "gyro-calibration-data" // READ ONLY