Skip to content

Commit

Permalink
Fixed Compressor and Operation for MiElHVAC
Browse files Browse the repository at this point in the history 
Changed Widevane position name from ISEE to AUTO sam as in MELCLoud
  • Loading branch information
@grzegorz914
grzegorz914 committed Oct 13, 2024
1 parent b934a8c commit f0973c8
Showing 1 changed file with 60 additions and 14 deletions.
74 changes: 60 additions & 14 deletions tasmota/tasmota_xdrv_driver/xdrv_44_miel_hvac.ino
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,16 @@ struct miel_hvac_data_roomtemp {
};

struct miel_hvac_data_status {
uint8_t _pad1[2];
uint8_t _pad1[3];
uint8_t compressor;
#define MIEL_HVAC_STATUS_COMPRESSOR_OFF 0x00
#define MIEL_HVAC_STATUS_COMPRESSOR_ON 0x01
uint8_t operation;
#define MIEL_HVAC_STATUS_OPERATION_OFF 0x00
#define MIEL_HVAC_STATUS_OPERATION_1 0x01
#define MIEL_HVAC_STATUS_OPERATION_2 0x02
#define MIEL_HVAC_STATUS_OPERATION_3 0x03
#define MIEL_HVAC_STATUS_OPERATION_4 0x04
};

struct miel_hvac_data {
Expand Down Expand Up @@ -130,6 +137,9 @@ CTASSERT(offsetof(struct miel_hvac_data, data.settings.airdirection) == 14);
CTASSERT(offsetof(struct miel_hvac_data, data.roomtemp.temp) == 3);
CTASSERT(offsetof(struct miel_hvac_data, data.roomtemp.temp05) == 6);

CTASSERT(offsetof(struct miel_hvac_data, data.status.compressor) == 4);
CTASSERT(offsetof(struct miel_hvac_data, data.status.operation) == 5);

/* to hvac */

#define MIEL_HVAC_H_TYPE_CONNECT 0x5a
Expand Down Expand Up @@ -206,7 +216,7 @@ struct miel_hvac_msg_update {
uint8_t _pad1[4];
uint8_t widevane;
#define MIEL_HVAC_UPDATE_WIDEVANE_MASK 0x0f
#define MIEL_HVAC_UPDATE_WIDEVANE_ISEE 0x00
#define MIEL_HVAC_UPDATE_WIDEVANE_AUTO 0x00
#define MIEL_HVAC_UPDATE_WIDEVANE_LL 0x01
#define MIEL_HVAC_UPDATE_WIDEVANE_L 0x02
#define MIEL_HVAC_UPDATE_WIDEVANE_C 0x03
Expand Down Expand Up @@ -304,6 +314,11 @@ struct miel_hvac_map {
const char *name;
};

static const struct miel_hvac_map miel_hvac_power_map[] = {
{ MIEL_HVAC_UPDATE_POWER_OFF, "off" },
{ MIEL_HVAC_UPDATE_POWER_ON, "on" },
};

static const struct miel_hvac_map miel_hvac_mode_map[] = {
{ MIEL_HVAC_UPDATE_MODE_HEAT, "heat" },
{ MIEL_HVAC_UPDATE_MODE_DRY, "dry" },
Expand Down Expand Up @@ -335,7 +350,7 @@ static const struct miel_hvac_map miel_hvac_vane_map[] = {
};

static const struct miel_hvac_map miel_hvac_widevane_map[] = {
{ MIEL_HVAC_UPDATE_WIDEVANE_ISEE, "isee" },
{ MIEL_HVAC_UPDATE_WIDEVANE_AUTO, "auto" },
{ MIEL_HVAC_UPDATE_WIDEVANE_LL, "left" },
{ MIEL_HVAC_UPDATE_WIDEVANE_L, "left_middle" },
{ MIEL_HVAC_UPDATE_WIDEVANE_C, "center" },
Expand All @@ -362,6 +377,19 @@ static const struct miel_hvac_map miel_hvac_airdirection_map[] = {
{ MIEL_HVAC_UPDATE_AIRDIRECTION_DIRECT, "direct" },
};

static const struct miel_hvac_map miel_hvac_compressor_map[] = {
{ MIEL_HVAC_STATUS_COMPRESSOR_OFF, "off" },
{ MIEL_HVAC_STATUS_COMPRESSOR_ON, "on" },
};

static const struct miel_hvac_map miel_hvac_operation_map[] = {
{ MIEL_HVAC_STATUS_OPERATION_OFF, "off" },
{ MIEL_HVAC_STATUS_OPERATION_1, "1" },
{ MIEL_HVAC_STATUS_OPERATION_2, "2" },
{ MIEL_HVAC_STATUS_OPERATION_3, "3" },
{ MIEL_HVAC_STATUS_OPERATION_4, "4" },
};

enum miel_hvac_parser_state {
MIEL_HVAC_P_START,
MIEL_HVAC_P_TYPE,
Expand Down Expand Up @@ -997,8 +1025,12 @@ miel_hvac_publish_settings(struct miel_hvac_softc *sc)
const char *name;
const char *name_swing_h;

Response_P(PSTR("{\"" D_JSON_IRHVAC_POWER "\":\"%s\""),
set->power ? "ON" : "OFF");
name = miel_hvac_map_byval(set->power,
miel_hvac_power_map, nitems(miel_hvac_power_map));
if (name != NULL) {
Response_P(PSTR("{\"" D_JSON_IRHVAC_POWER "\":\"%s\""),
name);
}

name = miel_hvac_map_byval( set->mode &
MIEL_HVAC_SETTINGS_MODE_MASK,
Expand Down Expand Up @@ -1046,7 +1078,7 @@ miel_hvac_publish_settings(struct miel_hvac_softc *sc)
miel_hvac_airdirection_map, nitems(miel_hvac_airdirection_map));
if (name != NULL) {
ResponseAppend_P(PSTR(",\"AirDirection\":\"%s\""),
name_swing_h == "isee" ? name : "OFF");
name_swing_h == "auto" ? name : "OFF");
}

name = miel_hvac_map_byval(set->prohibit,
Expand Down Expand Up @@ -1236,8 +1268,13 @@ miel_hvac_sensor(struct miel_hvac_softc *sc)
const char *name_swing_h;

ResponseAppend_P(PSTR("," "\"MiElHVAC\":{"));
ResponseAppend_P(PSTR("\"Power\":\"%s\""),
set->power ? "ON" : "OFF");

name = miel_hvac_map_byval(set->power,
miel_hvac_power_map, nitems(miel_hvac_power_map));
if (name != NULL) {
ResponseAppend_P(PSTR("\"Power\":\"%s\""),
name);
}

name = miel_hvac_map_byval( set->mode &
MIEL_HVAC_SETTINGS_MODE_MASK,
Expand Down Expand Up @@ -1283,7 +1320,7 @@ miel_hvac_sensor(struct miel_hvac_softc *sc)
miel_hvac_airdirection_map, nitems(miel_hvac_airdirection_map));
if (name != NULL) {
ResponseAppend_P(PSTR(",\"AirDirection\":\"%s\""),
name_swing_h == "isee" ? name : "OFF");
name_swing_h == "auto" ? name : "off");
}

name = miel_hvac_map_byval(set->prohibit,
Expand Down Expand Up @@ -1317,13 +1354,22 @@ miel_hvac_sensor(struct miel_hvac_softc *sc)
}

if (sc->sc_status.type != 0) {
const struct miel_hvac_data_status *s =
const struct miel_hvac_data_status *status =
&sc->sc_status.data.status;

ResponseAppend_P(PSTR(",\"Operation\":\"%s\""),
s->operation ? "ON" : "OFF");
ResponseAppend_P(PSTR(",\"Compressor\":\"%s\""),
s->compressor ? "ON" : "OFF");
name = miel_hvac_map_byval(status->compressor,
miel_hvac_compressor_map, nitems(miel_hvac_compressor_map));
if (name != NULL) {
ResponseAppend_P(PSTR(",\"Compressor\":\"%s\""),
name);
}

name = miel_hvac_map_byval(status->operation,
miel_hvac_operation_map, nitems(miel_hvac_operation_map));
if (name != NULL) {
ResponseAppend_P(PSTR(",\"Operation\":\"%s\""),
name);
}
}

if (sc->sc_temp.type != 0) {
Expand Down

0 comments on commit f0973c8

Please sign in to comment.