jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-27 20:56:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update xdrv_44_miel_hvac.ino

Browse Source
This commit is contained in:
logon84 2021-12-06 03:10:30 +01:00 committed by GitHub
parent 56d697f30a
commit 3f1e5746a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tasmota/xdrv_44_miel_hvac.ino
View File

@ -204,23 +204,31 @@ CTASSERT(offsetof(struct miel_hvac_msg_update, temp05) == MIEL_HVAC_OFFS(19));
static inline uint8_t static inline uint8_t
miel_hvac_deg2temp(uint8_t deg) miel_hvac_deg2temp(uint8_t deg)
{ {
#ifndef MIEL_HVAC_ENHANCED_RES #ifndef MIEL_HVAC_ENHANCED_RES
return (31 - deg); return (31 - deg);
#else #else
return 2*deg + 128; return 2*deg + 128;
#endif #endif
} }
static inline uint8_t static inline uint8_t
miel_hvac_temp2deg(uint8_t temp) miel_hvac_temp2deg(uint8_t temp)
{ {
#ifndef MIEL_HVAC_ENHANCED_RES
return (31 - temp); return (31 - temp);
#else
return ((float)(((temp - 128))/2));
#endif
} }
static inline unsigned int static inline unsigned int
miel_hvac_roomtemp2deg(uint8_t roomtemp) miel_hvac_roomtemp2deg(uint8_t roomtemp)
{ {
#ifndef MIEL_HVAC_ENHANCED_RES
return ((unsigned int)roomtemp + 10); return ((unsigned int)roomtemp + 10);
#else
return ((float)(roomtemp - 128)/2;)
#endif
} }
struct miel_hvac_msg_remotetemp { struct miel_hvac_msg_remotetemp {
@ -893,7 +901,7 @@ miel_hvac_publish_settings(struct miel_hvac_softc *sc)
} }
else { else {
#define MIEL_HVAC_ENHANCED_RES 1 #define MIEL_HVAC_ENHANCED_RES 1
dtostrfd(ConvertTemp((float)(((set->temp05 - 128))/2)), dtostrfd(ConvertTemp(miel_hvac_temp2deg(set->temp05)),
Settings->flag2.temperature_resolution, temp); Settings->flag2.temperature_resolution, temp);
} }
ResponseAppend_P(PSTR(",\"" D_JSON_IRHVAC_TEMP "\":%s"), temp); ResponseAppend_P(PSTR(",\"" D_JSON_IRHVAC_TEMP "\":%s"), temp);
@ -1103,7 +1111,8 @@ miel_hvac_sensor(struct miel_hvac_softc *sc)
Settings->flag2.temperature_resolution, room_temp); Settings->flag2.temperature_resolution, room_temp);
} }
else { else {
float temp = (rt->temp05 - 128)/2; #define MIEL_HVAC_ENHANCED_RES 1
float temp = miel_hvac_roomtemp2deg(rt->temp05);
dtostrfd(ConvertTemp(temp), dtostrfd(ConvertTemp(temp),
Settings->flag2.temperature_resolution, room_temp); Settings->flag2.temperature_resolution, room_temp);
} }