Mirrors/OpenBK7231T_App
2
0
Fork 0
mirror of https://github.com/openshwprojects/OpenBK7231T_App.git synced 2026-03-08 08:17:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Sensor

Browse Source
This commit is contained in:
Indu Prakash
2022-10-07 19:57:16 -05:00
parent 87e69d19b2
commit 2af56fb56f
5 changed files with 73 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/httpserver/http_fns.c
View File

@@ -1229,6 +1229,15 @@ void get_Relay_PWM_Count(int *relayCount, int *pwmCount){
}
}
bool isLedDriverChipRunning()
{
#ifndef OBK_DISABLE_ALL_DRIVERS
return DRV_IsRunning("SM2135") || DRV_IsRunning("BP5758D");
#else
return false;
#endif
}
/// @brief Sends HomeAssistant discovery MQTT messages.
/// @param request
/// @return
@@ -1237,17 +1246,10 @@ int http_fn_ha_discovery(http_request_t *request) {
char topic[32];
int relayCount = 0;
int pwmCount = 0;
char bLedDriverChipRunning;
http_setup(request, httpMimeTypeText);
get_Relay_PWM_Count(&relayCount, &pwmCount);
#ifndef OBK_DISABLE_ALL_DRIVERS
bLedDriverChipRunning = DRV_IsRunning("SM2135") || DRV_IsRunning("BP5758D");
#else
bLedDriverChipRunning = 0;
#endif
if ((relayCount == 0) && (pwmCount == 0)) {
poststr(request, NULL);
return 0;
@@ -1272,7 +1274,7 @@ int http_fn_ha_discovery(http_request_t *request) {
}
}
if (pwmCount == 5 || bLedDriverChipRunning) {
if (pwmCount == 5 || isLedDriverChipRunning()) {
// Enable + RGB control + CW control
HassDeviceInfo *dev_info = hass_init_light_device_info(ENTITY_LIGHT_RGBCW, -1);
MQTT_QueuePublish(topic, dev_info->channel, hass_build_discovery_json(dev_info), OBK_PUBLISH_FLAG_RETAIN);
@@ -1294,6 +1296,17 @@ int http_fn_ha_discovery(http_request_t *request) {
}
}
#ifndef OBK_DISABLE_ALL_DRIVERS
if (DRV_IsMeasuringPower()){
for(i = 0;i < OBK_NUM_MEASUREMENTS;i ++)
{
HassDeviceInfo *dev_info = hass_init_light_device_info(ENTITY_SENSOR, i);
MQTT_QueuePublish(topic, dev_info->channel, hass_build_discovery_json(dev_info), OBK_PUBLISH_FLAG_RETAIN);
hass_free_device_info(dev_info);
}
}
#endif
poststr(request, NULL);
return 0;
}
@@ -1321,7 +1334,6 @@ int http_fn_ha_cfg(http_request_t *request) {
char mqttAdded = 0;
char switchAdded = 0;
char lightAdded = 0;
int bLedDriverChipRunning;
shortDeviceName = CFG_GetShortDeviceName();
clientId = CFG_GetMQTTClientId();
@@ -1338,12 +1350,6 @@ int http_fn_ha_cfg(http_request_t *request) {
get_Relay_PWM_Count(&relayCount, &pwmCount);
#ifndef OBK_DISABLE_ALL_DRIVERS
bLedDriverChipRunning = DRV_IsRunning("SM2135") || DRV_IsRunning("BP5758D");
#else
bLedDriverChipRunning = 0;
#endif
if(relayCount > 0) {
for(i = 0; i < CHANNEL_MAX; i++) {
@@ -1370,7 +1376,7 @@ int http_fn_ha_cfg(http_request_t *request) {
}
}
}
if(pwmCount == 5 || bLedDriverChipRunning) {
if(pwmCount == 5 || isLedDriverChipRunning()) {
// Enable + RGB control + CW control
if (mqttAdded == 0){
poststr(request,HASS_MQTT_NODE);