asaril/McLighting
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

HA 0.87 support

Browse source 
- fix https://github.com/toblum/McLighting/issues/327
This commit is contained in:
Debashish Sahu 2019-02-08 16:00:50 -05:00
parent 39a773805e
commit f82e944d5d
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Arduino/McLighting/definitions.h
View file

@ -37,7 +37,7 @@ const char HOSTNAME[] = "McLighting01"; // Friedly hostname
#endif #endif
#ifdef MQTT_HOME_ASSISTANT_SUPPORT #ifdef MQTT_HOME_ASSISTANT_SUPPORT
#define MQTT_HOME_ASSISTANT_0_84_SUPPORT // Comment if using HA version < 0.84 #define MQTT_HOME_ASSISTANT_0_87_SUPPORT // Comment if using HA version < 0.87
#endif #endif
#if defined(USE_WS2812FX_DMA) and defined(USE_WS2812FX_UART) #if defined(USE_WS2812FX_DMA) and defined(USE_WS2812FX_UART)

8
Arduino/McLighting/request_handlers.h
View file

@ -1010,14 +1010,16 @@ void checkForRequests() {
DynamicJsonDocument jsonBuffer(JSON_ARRAY_SIZE(strip->getModeCount()) + JSON_OBJECT_SIZE(12) + 1500); DynamicJsonDocument jsonBuffer(JSON_ARRAY_SIZE(strip->getModeCount()) + JSON_OBJECT_SIZE(12) + 1500);
JsonObject json = jsonBuffer.to<JsonObject>(); JsonObject json = jsonBuffer.to<JsonObject>();
json["name"] = HOSTNAME; json["name"] = HOSTNAME;
#ifdef MQTT_HOME_ASSISTANT_0_84_SUPPORT #ifdef MQTT_HOME_ASSISTANT_0_87_SUPPORT
json["schema"] = "json"; json["schema"] = "json";
#else #else
json["platform"] = "mqtt_json"; json["platform"] = "mqtt_json";
#endif #endif
json["state_topic"] = mqtt_ha_state_out; json["state_topic"] = mqtt_ha_state_out;
json["command_topic"] = mqtt_ha_state_in; json["command_topic"] = mqtt_ha_state_in;
#ifndef MQTT_HOME_ASSISTANT_0_87_SUPPORT
json["on_command_type"] = "first"; json["on_command_type"] = "first";
#endif
json["brightness"] = "true"; json["brightness"] = "true";
json["rgb"] = "true"; json["rgb"] = "true";
json["optimistic"] = "false"; json["optimistic"] = "false";
@ -1097,14 +1099,16 @@ void checkForRequests() {
DynamicJsonDocument jsonBuffer(JSON_ARRAY_SIZE(strip->getModeCount()) + JSON_OBJECT_SIZE(12) + 1500); DynamicJsonDocument jsonBuffer(JSON_ARRAY_SIZE(strip->getModeCount()) + JSON_OBJECT_SIZE(12) + 1500);
JsonObject json = jsonBuffer.to<JsonObject>(); JsonObject json = jsonBuffer.to<JsonObject>();
json["name"] = HOSTNAME; json["name"] = HOSTNAME;
#ifdef MQTT_HOME_ASSISTANT_0_84_SUPPORT #ifdef MQTT_HOME_ASSISTANT_0_87_SUPPORT
json["schema"] = "json"; json["schema"] = "json";
#else #else
json["platform"] = "mqtt_json"; json["platform"] = "mqtt_json";
#endif #endif
json["state_topic"] = mqtt_ha_state_out; json["state_topic"] = mqtt_ha_state_out;
json["command_topic"] = mqtt_ha_state_in; json["command_topic"] = mqtt_ha_state_in;
#ifndef MQTT_HOME_ASSISTANT_0_87_SUPPORT
json["on_command_type"] = "first"; json["on_command_type"] = "first";
#endif
json["brightness"] = "true"; json["brightness"] = "true";
json["rgb"] = "true"; json["rgb"] = "true";
json["optimistic"] = "false"; json["optimistic"] = "false";