mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14278 from SteWers/Solax-X1-Temperature-fix 

[Solax X1] Changed variable type for temperature from float to int16_t
This commit is contained in:
Theo Arends 2022-01-05 09:59:48 +01:00 committed by GitHub
parent bfdf34813f 9956aa59c4
commit 2add8aa12c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tasmota/xnrg_12_solaxX1.ino
View File

@ -94,7 +94,7 @@ const char kSolaxError[] PROGMEM =
TasmotaSerial *solaxX1Serial; TasmotaSerial *solaxX1Serial;
struct SOLAXX1 { struct SOLAXX1 {
float temperature = 0; int16_t temperature = 0;
float energy_today = 0; float energy_today = 0;
float dc1_voltage = 0; float dc1_voltage = 0;
float dc2_voltage = 0; float dc2_voltage = 0;
@ -260,7 +260,7 @@ void solaxX1250MSecond(void) // Every 250 milliseconds
solaxX1_send_retry = 20; solaxX1_send_retry = 20;
Energy.data_valid[0] = 0; Energy.data_valid[0] = 0;
solaxX1.temperature = (float)((value[9] << 8) | value[10]); // Temperature solaxX1.temperature = (value[9] << 8) | value[10]; // Temperature
solaxX1.energy_today = (float)((value[11] << 8) | value[12]) * 0.1f; // Energy Today solaxX1.energy_today = (float)((value[11] << 8) | value[12]) * 0.1f; // Energy Today
solaxX1.dc1_voltage = (float)((value[13] << 8) | value[14]) * 0.1f; // PV1 Voltage solaxX1.dc1_voltage = (float)((value[13] << 8) | value[14]) * 0.1f; // PV1 Voltage
solaxX1.dc2_voltage = (float)((value[15] << 8) | value[16]) * 0.1f; // PV2 Voltage solaxX1.dc2_voltage = (float)((value[15] << 8) | value[16]) * 0.1f; // PV2 Voltage
@ -447,12 +447,12 @@ void solaxX1Show(bool json)
ResponseAppend_P(PSTR(",\"" D_JSON_PV2_VOLTAGE "\":%s,\"" D_JSON_PV2_CURRENT "\":%s,\"" D_JSON_PV2_POWER "\":%s"), ResponseAppend_P(PSTR(",\"" D_JSON_PV2_VOLTAGE "\":%s,\"" D_JSON_PV2_CURRENT "\":%s,\"" D_JSON_PV2_POWER "\":%s"),
pv2_voltage, pv2_current, pv2_power); pv2_voltage, pv2_current, pv2_power);
#endif #endif
ResponseAppend_P(PSTR(",\"" D_JSON_TEMPERATURE "\":%*_f,\"" D_JSON_RUNTIME "\":%s,\"" D_JSON_STATUS "\":\"%s\",\"" D_JSON_ERROR "\":%d"), ResponseAppend_P(PSTR(",\"" D_JSON_TEMPERATURE "\":%d,\"" D_JSON_RUNTIME "\":%s,\"" D_JSON_STATUS "\":\"%s\",\"" D_JSON_ERROR "\":%d"),
Settings->flag2.temperature_resolution, &solaxX1.temperature, runtime, status, solaxX1.errorCode); solaxX1.temperature, runtime, status, solaxX1.errorCode);
#ifdef USE_DOMOTICZ #ifdef USE_DOMOTICZ
// Avoid bad temperature report at beginning of the day (spikes of 1200 celsius degrees) // Avoid bad temperature report at beginning of the day (spikes of 1200 celsius degrees)
if (0 == TasmotaGlobal.tele_period && solaxX1.temperature < 100) { DomoticzFloatSensor(DZ_TEMP, solaxX1.temperature); } if (0 == TasmotaGlobal.tele_period && solaxX1.temperature < 100) { DomoticzSensor(DZ_TEMP, solaxX1.temperature); }
#endif // USE_DOMOTICZ #endif // USE_DOMOTICZ
#ifdef USE_WEBSERVER #ifdef USE_WEBSERVER