mirror of
https://github.com/openshwprojects/OpenBK7231T_App.git
synced 2026-02-10 21:45:29 +00:00
9987e685e9
* HASS discovery energy stats fixed except energycounter_clear_date * HASS: add friendly entity names, remove timestamp class from energycounter_clear_date as workaround for hass-incompatible date format * HA energycounter_clear_date fixed for correct interpreting as home assistant timestamp sensor * refactor HA power sensors discovery info * refactor HA power sensors discovery more * add apparent power, reactive power, power factor to mqtt + hass discovery, refactor some vars into new energy_sensors[] struct * amend hass sensor unique_ids due to mqtt topic/channel too long; 'Error:MQTT:Unable to queue! Topic (13), channel (66) or value (437) exceeds size limit' * hass sensors: add 'energy 2 days ago', 'energy 3 days ago', 'uptime' web UI: energy sensors apply their rounding setting drv_bl_shared.c: add enum for daily_stats[], put rearrange energy_sensor[] struct to expose only names via DRV_GetEnergySensorNames() * -HA energy sensor uniq_id values made consistent with prior builds via .hass_uniq_id_suffix -Refactor drv_bl_shared sensor/counter vars into energy_sensors[] to simplify mqtt transmissions etc -Add energy '2 days ago'/'3 days ago' to main web ui, data from vars already being saved to/from flash -NTP fix html formatting in web ui * -HA energy sensor uniq_id values made consistent with prior builds via .hass_uniq_id_suffix -Refactor drv_bl_shared sensor/counter vars into energy_sensors[] to simplify mqtt transmissions etc -Add energy '2 days ago'/'3 days ago' to main web ui, data from vars already being saved to/from flash -NTP fix html formatting in web ui * Update settings.json ignore vscode settings... * Update settings.json * Update settings.json * minor fix * fix OBK_CONSUMPTION_LAST_HOUR missing from mqtt * HASS entity names use channel labels when set, hass discovery excludes unpublished entities (i.e. those set via SetChannelPrivate), hass discovery firmware build info added to diagnostic section, energy sensor discovery bugfix re clear-date * update submodule sdk * Fix ch0 label wrongly applied to diagnostic sensors * update docs --------- Co-authored-by: Stefan Smith <stefan064>
117 lines
3.1 KiB
C
117 lines
3.1 KiB
C
|
|
#include "new_http.h"
|
|
#include "../cJSON/cJSON.h"
|
|
#include "../new_pins.h"
|
|
#include "../mqtt/new_mqtt.h"
|
|
#include "../cmnds/cmd_public.h"
|
|
|
|
typedef enum {
|
|
/// @brief Switch
|
|
RELAY = 0,
|
|
|
|
/// @brief
|
|
LIGHT_ON_OFF,
|
|
|
|
/// @brief Single PWM
|
|
LIGHT_PWM,
|
|
|
|
/// @brief 2 PWM setup (brightness and temperature)
|
|
LIGHT_PWMCW,
|
|
|
|
/// @brief RGB (3 PWM)
|
|
LIGHT_RGB,
|
|
|
|
/// @brief RGB + temperature (5 PWM or LED driver)
|
|
LIGHT_RGBCW,
|
|
|
|
/// @brief Power sensors (voltage, current, power)
|
|
ENERGY_METER_SENSOR,
|
|
|
|
POWER_SENSOR,
|
|
|
|
/// @Brief Binary Sensor
|
|
BINARY_SENSOR,
|
|
|
|
/// @brief Temperature sensor
|
|
TEMPERATURE_SENSOR,
|
|
/// @brief Humidity sensor
|
|
HUMIDITY_SENSOR,
|
|
|
|
/// @brief Battery level sensor in perc
|
|
BATTERY_SENSOR,
|
|
/// @brief Battery votage sensor in mV
|
|
BATTERY_VOLTAGE_SENSOR,
|
|
|
|
/// @brief CO2 sensor in ppm
|
|
CO2_SENSOR,
|
|
/// @brief TVOC sensor in ppb
|
|
TVOC_SENSOR,
|
|
|
|
/// @brief
|
|
VOLTAGE_SENSOR,
|
|
/// @brief
|
|
CURRENT_SENSOR,
|
|
/// @brief
|
|
//POWER_SINGLE_SENSOR,
|
|
/// @brief
|
|
POWERFACTOR_SENSOR,
|
|
/// @brief
|
|
FREQUENCY_SENSOR,
|
|
/// @brief
|
|
CUSTOM_SENSOR,
|
|
/// @brief
|
|
SMOKE_SENSOR,
|
|
/// @brief
|
|
READONLYLOWMIDHIGH_SENSOR,
|
|
// lx unit
|
|
ILLUMINANCE_SENSOR,
|
|
/// @brief dBm unit
|
|
HASS_RSSI,
|
|
/// @brief Time firmware is alive in secs
|
|
HASS_UPTIME,
|
|
/// @brief Firmware build info
|
|
HASS_BUILD,
|
|
/// @brief Wh, kWh
|
|
ENERGY_SENSOR,
|
|
// hPa
|
|
PRESSURE_SENSOR,
|
|
/// @Brief Timestamp Sensor
|
|
TIMESTAMP_SENSOR,
|
|
|
|
} ENTITY_TYPE;
|
|
|
|
//unique_id is defined in hass_populate_unique_id and is based on CFG_GetDeviceName() whose size is CGF_DEVICE_NAME_SIZE.
|
|
//Sample unique_id would be deviceName_entityType_index.
|
|
//Currently supported entityType is `relay` or `light` - 5 char.
|
|
#define HASS_UNIQUE_ID_SIZE (CGF_DEVICE_NAME_SIZE + 1 + 5 + 1 + 4)
|
|
|
|
//channel is based on unique_id (see hass_populate_device_config_channel)
|
|
#define HASS_CHANNEL_SIZE (HASS_UNIQUE_ID_SIZE + 32)
|
|
|
|
//Size of JSON (1 less than MQTT queue holding)
|
|
#define HASS_JSON_SIZE (MQTT_PUBLISH_ITEM_VALUE_LENGTH - 1)
|
|
|
|
/// @brief HomeAssistant device discovery information
|
|
typedef struct HassDeviceInfo_s {
|
|
char unique_id[HASS_UNIQUE_ID_SIZE];
|
|
char channel[HASS_CHANNEL_SIZE];
|
|
char json[HASS_JSON_SIZE];
|
|
|
|
cJSON* root;
|
|
cJSON* device;
|
|
cJSON* ids;
|
|
} HassDeviceInfo;
|
|
|
|
void hass_print_unique_id(http_request_t* request, const char* fmt, ENTITY_TYPE type, int index);
|
|
HassDeviceInfo* hass_init_relay_device_info(int index, ENTITY_TYPE type, bool bInverse);
|
|
HassDeviceInfo* hass_init_device_info(ENTITY_TYPE type, int index, const char* payload_on, const char* payload_off);
|
|
HassDeviceInfo* hass_init_light_device_info(ENTITY_TYPE type);
|
|
HassDeviceInfo* hass_init_energy_sensor_device_info(int index);
|
|
HassDeviceInfo* hass_init_light_singleColor_onChannels(int toggle, int dimmer, int brightness_scale);
|
|
HassDeviceInfo* hass_init_binary_sensor_device_info(int index, bool bInverse);
|
|
HassDeviceInfo* hass_init_sensor_device_info(ENTITY_TYPE type, int channel, int decPlaces, int decOffset, int divider);
|
|
const char* hass_build_discovery_json(HassDeviceInfo* info);
|
|
void hass_free_device_info(HassDeviceInfo* info);
|
|
char *hass_generate_multiplyAndRound_template(int decimalPlacesForRounding, int decimalPointOffset, int divider);
|
|
|