Skip to content

Commit

Permalink
Merge pull request #189 from ezloteam/development
Browse files Browse the repository at this point in the history
Development
  • Loading branch information
lomasSE89 authored Sep 20, 2024
2 parents 1dcb0cb + c17e031 commit 99ceb2c
Show file tree
Hide file tree
Showing 18 changed files with 62 additions and 47 deletions.
2 changes: 1 addition & 1 deletion ezlopi-core/ezlopi-core-devices/ezlopi_core_devices.c
Original file line number Diff line number Diff line change
Expand Up @@ -650,7 +650,7 @@ l_ezlopi_item_t *ezlopi_device_get_item_by_id(uint32_t item_id)
return item_to_return;
}

l_ezlopi_item_t *ezlopi_device_add_item_to_device(l_ezlopi_device_t *device, int (*item_func)(e_ezlopi_actions_t action, l_ezlopi_item_t *item, void *arg, void *user_arg))
l_ezlopi_item_t *ezlopi_device_add_item_to_device(l_ezlopi_device_t *device, ezlopi_error_t (*item_func)(e_ezlopi_actions_t action, l_ezlopi_item_t *item, void *arg, void *user_arg))
{
l_ezlopi_item_t *new_item = NULL;
if (device)
Expand Down
8 changes: 3 additions & 5 deletions ezlopi-core/ezlopi-core-devices/ezlopi_core_devices.h
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ typedef struct l_ezlopi_item

void *user_arg;
bool is_user_arg_unique;
ezlopi_error_t(*func)(e_ezlopi_actions_t action, struct l_ezlopi_item *item, void *arg, void *user_arg);
ezlopi_error_t (*func)(e_ezlopi_actions_t action, struct l_ezlopi_item *item, void *arg, void *user_arg);

struct l_ezlopi_item *next;
} l_ezlopi_item_t;
Expand Down Expand Up @@ -88,11 +88,9 @@ l_ezlopi_item_t *ezlopi_device_get_item_by_id(uint32_t item_id);
l_ezlopi_device_settings_v3_t *ezlopi_device_settings_get_by_id(uint32_t settings_id);

// l_ezlopi_item_t *ezlopi_device_add_item_to_device(l_ezlopi_device_t *device);
l_ezlopi_item_t *ezlopi_device_add_item_to_device(l_ezlopi_device_t *device,
ezlopi_error_t(*item_func)(e_ezlopi_actions_t action, struct l_ezlopi_item *item, void *arg, void *user_arg));
l_ezlopi_item_t *ezlopi_device_add_item_to_device(l_ezlopi_device_t *device, ezlopi_error_t (*item_func)(e_ezlopi_actions_t action, struct l_ezlopi_item *item, void *arg, void *user_arg));

l_ezlopi_device_settings_v3_t *ezlopi_device_add_settings_to_device_v3(l_ezlopi_device_t *device,
int (*setting_func)(e_ezlopi_settings_action_t action, struct l_ezlopi_device_settings_v3 *setting, void *arg, void *user_arg));
l_ezlopi_device_settings_v3_t *ezlopi_device_add_settings_to_device_v3(l_ezlopi_device_t *device, int (*setting_func)(e_ezlopi_settings_action_t action, struct l_ezlopi_device_settings_v3 *setting, void *arg, void *user_arg));

void ezlopi_device_free_device(l_ezlopi_device_t *device);
void ezlopi_device_free_device_by_item(l_ezlopi_item_t *item);
Expand Down
13 changes: 3 additions & 10 deletions ezlopi-core/ezlopi-core-devices/ezlopi_core_devices_list_modules.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ EZLOPI_DEVICE_LIST("digital-out plug ", 3, device_0003_digita
EZLOPI_DEVICE_LIST("digital-in generic ", 4, device_0004_digitalIn_generic)
#endif // DEVICE_0001_DIGITALOUT_GENERIC


#if (1 == SENSOR_0005_I2C_MPU6050)
EZLOPI_DEVICE_LIST("sensor-MPU6050-I2C ", 5, sensor_0005_I2C_MPU6050)
#endif // SENSOR_0005_I2C_MPU6050
Expand All @@ -36,11 +35,10 @@ EZLOPI_DEVICE_LIST("sensor-LTR303ALS-I2C ", 8, sensor_0008_I2C_LT
EZLOPI_DEVICE_LIST("device-rgp_strip-RMT_SK6812 ", 9, device_0009_other_RMT_SK6812)
#endif // DEVICE_0009_OTHER_RMT_SK6812


#if (1 == SENSOR_0010_I2C_BME680)
#if (CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32)
#if (CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32 || CONFIG_IDF_TARGET_ESP32S2)
EZLOPI_DEVICE_LIST("sensor-bme680-i2c ", 10, sensor_0010_I2C_BME680)
#endif // CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32
#endif // CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32 || CONFIG_IDF_TARGET_ESP32S2
#endif // SENSOR_0010_I2C_BME680

#if (1 == SENSOR_0012_I2C_BME280)
Expand All @@ -53,12 +51,11 @@ EZLOPI_DEVICE_LIST("sensor-bme280-i2c-temp-humid ", 12, sensor_0012_I2C_B
EZLOPI_DEVICE_LIST("sensor-DHT11-1-wire-temp-humid ", 15, sensor_0015_oneWire_DHT11)
#endif // SENSOR_0015_ONEWIRE_DHT11

#endif // CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32

#if (1 == SENSOR_0016_ONEWIRE_DHT22)
EZLOPI_DEVICE_LIST("sensor-DHT22-1-wire-temp-humid ", 16, sensor_0016_oneWire_DHT22)
#endif // SENSOR_0016_ONEWIRE_DHT22

#endif // CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32 || CONFIG_IDF_TARGET_ESP32S2

#if (1 == SENSOR_0017_ADC_POTENTIOMETER)
EZLOPI_DEVICE_LIST("sensor-potentiometer-ADC ", 17, sensor_0017_ADC_potentiometer)
Expand All @@ -82,7 +79,6 @@ EZLOPI_DEVICE_LIST("sensor-2AXIS-JOYSTICK ", 20, sensor_0020_other
EZLOPI_DEVICE_LIST("sensor-UART-MB1013 ", 21, sensor_0021_UART_MB1013)
#endif // SENSOR_0021_UART_MB1013


#if (1 == DEVICE_0022_PWM_DIMMABLE_LAMP)
EZLOPI_DEVICE_LIST("device-PWM-dimmable-lamp ", 22, device_0022_PWM_dimmable_lamp)
#endif // DEVICE_0022_PWM_DIMMABLE_LAMP
Expand Down Expand Up @@ -111,7 +107,6 @@ EZLOPI_DEVICE_LIST("sensor-WATERLEAK-ADC ", 27, sensor_0027_ADC_w
EZLOPI_DEVICE_LIST("sensor-GY61-other-accelerometer ", 28, sensor_0028_other_GY61)
#endif // SENSOR_0028_OTHER_GY61


#if (1 == SENSOR_0029_I2C_GXHTC3)
EZLOPI_DEVICE_LIST("sensor-GXHTC3-I2C-temp-humidity ", 29, sensor_0029_I2C_GXHTC3)
#endif // SENSOR_0029_I2C_GXHTC3
Expand Down Expand Up @@ -220,7 +215,6 @@ EZLOPI_DEVICE_LIST("sensor-Force-sensetive-resistor-ADC ", 56, sensor_0056_ADC_F
EZLOPI_DEVICE_LIST("sensor-KY026-Flame-detector ", 57, sensor_0057_other_KY026_FlameDetector)
#endif // SENSOR_0057_OTHER_KY026_FLAMEDETECTOR


#if (1 == SENSOR_0059_OTHER_MQ6_LPG_DETECTOR)
EZLOPI_DEVICE_LIST("sensor-MQ6-LPG-detector ", 59, sensor_0059_other_MQ6_LPG_detector)
#endif // SENSOR_0059_OTHER_MQ6_LPG_DETECTOR
Expand All @@ -241,7 +235,6 @@ EZLOPI_DEVICE_LIST("sensor-MQ7-CO-detector ", 62, sensor_0062_other
EZLOPI_DEVICE_LIST("sensor-MQ9-LPG-flameable-detector ", 63, sensor_0063_other_MQ9_LPG_flameable_detector)
#endif // SENSOR_0063_OTHER_MQ9_LPG_FLAMEABLE_DETECTOR


#if (1 == SENSOR_0065_DIGITALIN_FLOAT_SWITCH)
EZLOPI_DEVICE_LIST("sensor-float-switch-digital ", 65, sensor_0065_digitalIn_float_switch)
#endif // SENSOR_0065_DIGITALIN_FLOAT_SWITCH
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ static const char *ezlopi_config_test =
#elif defined(CONFIG_IDF_TARGET_ESP32S2)
static const char *ezlopi_config_test = "{\"cmd\":3,\"dev_detail\":[{\"dev_type\":1,\"dev_name\":\"switch_temp\",\"id_room\":\"\",\"id_item\":2,\"gpio_in\":0,\"gpio_out\":2,\"pullup_ip\":false,\"pullup_op\":false,\"is_ip\":false,\"ip_inv\":false,\"op_inv\":false,\"val_ip\":false,\"val_op\":false},{\"dev_type\":1,\"dev_name\":\"Bulb\",\"id_room\":\"\",\"id_item\":1,\"gpio_in\":0,\"gpio_out\":3,\"pullup_ip\":false,\"pullup_op\":false,\"is_ip\":false,\"ip_inv\":false,\"op_inv\":false,\"val_ip\":false,\"val_op\":false},{\"dev_type\":7,\"dev_name\":\"DHT22_temp_humi\",\"id_room\":\"\",\"id_item\":16,\"gpio\":1}],\"config_id\":\"1234567\",\"config_time\":1696508363,\"config_name\":\"My moisture sensor\",\"chipset\":\"ESP32S2\"}";
#elif defined(CONFIG_IDF_TARGET_ESP32C3)
static const char *ezlopi_config_test = "{\"cmd\":3,\"dev_detail\":[{\"dev_type\":1,\"dev_name\":\"switch_temp\",\"id_room\":\"\",\"id_item\":2,\"gpio_in\":0,\"gpio_out\":25,\"pullup_ip\":false,\"pullup_op\":false,\"is_ip\":false,\"ip_inv\":false,\"op_inv\":false,\"val_ip\":false,\"val_op\":false},{\"dev_type\":7,\"dev_name\":\"temp_humi\",\"id_room\":\"\",\"id_item\":16,\"gpio\":12}],\"config_id\":\"1234567\",\"config_time\":1696508363,\"config_name\":\"My moisture sensor\",\"chipset\":\"ESP32C3\"}";
static const char *ezlopi_config_test = "{\"cmd\":3,\"dev_detail\":[],\"config_id\":\"1234567\",\"config_time\":1696508363,\"config_name\":\"My moisture sensor\",\"chipset\":\"ESP32C3\"}";
#endif
#endif

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ const char *log_indentation_level[4] = {
"8",
};

static e_enum_temperature_scale_t temperature_scale_to_user = TEMPERATURE_SCALE_FAHRENHEIT;
static e_enum_temperature_scale_t temperature_scale_to_user = TEMPERATURE_SCALE_CELSIUS;
static e_enum_date_format_t date_format_to_user = DATE_FORMAT_MMDDYY;
static e_enum_time_format_t time_format_to_user = TIME_FORMAT_12;
static int network_ping_timeout_to_user = 10;
Expand Down Expand Up @@ -386,16 +386,16 @@ int ezlopi_core_setting_commands_read_settings()
int ret = 0;

EZPI_CORE_nvs_read_temperature_scale((uint32_t *)&temperature_scale_to_user);
printf("Temperature scale: %s\n", temperature_scale_enum[temperature_scale_to_user]);
TRACE_I("Temperature scale: %s", temperature_scale_enum[temperature_scale_to_user]);

EZPI_CORE_nvs_read_date_format((uint32_t *)&date_format_to_user);
printf("Date format: %s\n", date_format_enum[date_format_to_user]);
TRACE_I("Date format: %s", date_format_enum[date_format_to_user]);

EZPI_CORE_nvs_read_time_format((uint32_t *)&time_format_to_user);
printf("Time format: %s\n", time_format_enum[time_format_to_user]);
TRACE_I("Time format: %s", time_format_enum[time_format_to_user]);

EZPI_CORE_nvs_read_network_ping_timeout((uint32_t *)&network_ping_timeout_to_user);
printf("Network Ping Timeout: %d\n", network_ping_timeout_to_user);
TRACE_I("Network Ping Timeout: %d", network_ping_timeout_to_user);

#ifdef CONFIG_EZPI_UTIL_TRACE_EN
ezlopi_core_read_set_log_severities();
Expand Down Expand Up @@ -441,4 +441,17 @@ e_ezlopi_core_setting_command_names_t ezlopi_core_setting_command_get_command_en
}
}
return ret;
}
}

const char *ezlopi_core_setting_get_temperature_scale_str()
{
return temperature_scale_enum[temperature_scale_to_user];
}
const char *ezlopi_core_setting_get_date_format_str()
{
return date_format_enum[date_format_to_user];
}
const char *ezlopi_core_setting_get_time_format_str()
{
return time_format_enum[time_format_to_user];
}
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,8 @@ e_enum_time_format_t ezlopi_core_setting_get_time_format();
int ezlopi_core_setting_get_network_ping_timeout();
int ezlopi_core_setting_updated_broadcast(cJSON *cj_params, cJSON *cj_result);

const char *ezlopi_core_setting_get_temperature_scale_str();
const char *ezlopi_core_setting_get_date_format_str();
const char *ezlopi_core_setting_get_time_format_str();

#endif /// __EZLOPI_CORE_SETTING_COMMANDS_H__
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,7 @@ static ezlopi_error_t __prepare(void *arg)
temperature_item->cloud_properties.item_name = ezlopi_item_name_temp;
temperature_item->cloud_properties.value_type = value_type_temperature;

e_enum_temperature_scale_t scale_to_use = ezlopi_core_setting_get_temperature_scale();
temperature_item->cloud_properties.scale = (scale_to_use == TEMPERATURE_SCALE_CELSIUS) ? scales_celsius : scales_fahrenheit;
temperature_item->cloud_properties.scale = ezlopi_core_setting_get_temperature_scale_str();
__prepare_cloud_properties(temperature_item, cj_device, user_data);
}

Expand Down Expand Up @@ -326,8 +325,8 @@ static ezlopi_error_t __notify(l_ezlopi_item_t *item)
{
if (ezlopi_item_name_temp == item->cloud_properties.item_name)
{
item->cloud_properties.scale = ezlopi_core_setting_get_temperature_scale_str();
e_enum_temperature_scale_t scale_to_use = ezlopi_core_setting_get_temperature_scale();
item->cloud_properties.scale = (TEMPERATURE_SCALE_FAHRENHEIT == scale_to_use) ? scales_fahrenheit : scales_celsius;
if (TEMPERATURE_SCALE_FAHRENHEIT == scale_to_use)
{
user_data->temperature = (user_data->temperature * (9.0f / 5.0f)) + 32.0f;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,9 +108,9 @@ static ezlopi_error_t __notify(l_ezlopi_item_t *item)
{
if (ezlopi_item_name_temp == item->cloud_properties.item_name)
{
e_enum_temperature_scale_t scale_to_use = ezlopi_core_setting_get_temperature_scale();
item->cloud_properties.scale = (TEMPERATURE_SCALE_FAHRENHEIT == scale_to_use) ? scales_fahrenheit : scales_celsius;
item->cloud_properties.scale = ezlopi_core_setting_get_temperature_scale_str();

e_enum_temperature_scale_t scale_to_use = ezlopi_core_setting_get_temperature_scale();
if (TEMPERATURE_SCALE_FAHRENHEIT == scale_to_use)
{
temperature = (temperature * (9.0f / 5.0f)) + 32.0f;
Expand Down Expand Up @@ -293,8 +293,7 @@ static void __prepare_item_temperature_properties(l_ezlopi_item_t *item, cJSON *
item->cloud_properties.has_getter = true;
item->cloud_properties.has_setter = false;

e_enum_temperature_scale_t scale_to_use = ezlopi_core_setting_get_temperature_scale();
item->cloud_properties.scale = (scale_to_use == TEMPERATURE_SCALE_FAHRENHEIT) ? scales_fahrenheit : scales_celsius;
item->cloud_properties.scale = ezlopi_core_setting_get_temperature_scale_str();

item->cloud_properties.item_name = ezlopi_item_name_temp;
item->cloud_properties.value_type = value_type_temperature;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -186,8 +186,7 @@ static ezlopi_error_t __dht11_setup_item_properties_temperature(l_ezlopi_item_t
item->cloud_properties.show = true;
item->cloud_properties.value_type = value_type_temperature;

e_enum_temperature_scale_t scale_to_use = ezlopi_core_setting_get_temperature_scale();
item->cloud_properties.scale = (TEMPERATURE_SCALE_FAHRENHEIT == scale_to_use) ? scales_fahrenheit : scales_celsius;
item->cloud_properties.scale = ezlopi_core_setting_get_temperature_scale_str();

item->is_user_arg_unique = true;
item->user_arg = user_arg;
Expand Down Expand Up @@ -279,9 +278,9 @@ static ezlopi_error_t __0015_notify(l_ezlopi_item_t *item)
float temperature = getTemperature_dht11();
if (temperature > 15)
{
e_enum_temperature_scale_t scale_to_use = ezlopi_core_setting_get_temperature_scale();
item->cloud_properties.scale = (TEMPERATURE_SCALE_FAHRENHEIT == scale_to_use) ? scales_fahrenheit : scales_celsius;
item->cloud_properties.scale = ezlopi_core_setting_get_temperature_scale_str();

e_enum_temperature_scale_t scale_to_use = ezlopi_core_setting_get_temperature_scale();
if (TEMPERATURE_SCALE_FAHRENHEIT == scale_to_use)
{
temperature = (temperature * (9.0f / 5.0f)) + 32.0f;
Expand Down
4 changes: 4 additions & 0 deletions ezlopi-sensors-devices/sensor-0016-oneWire-DHT22/dht22.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ int dht22_sensor_read_data(uint32_t gpio_pin, dht22_sensor_t* data);
DHT22 temperature sensor driver
*/

#if (CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32 || CONFIG_IDF_TARGET_ESP32S2)

#define DHT_OK 0
#define DHT_CHECKSUM_ERROR -1
#define DHT_TIMEOUT_ERROR -2
Expand All @@ -50,4 +52,6 @@ float getHumidity_dht22();
float getTemperature_dht22();
int dht22_getSignalLevel(int usTimeOut, bool state);

#endif // (CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32 || CONFIG_IDF_TARGET_ESP32S2)

#endif //__DHT22_H__
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#if (CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32 || CONFIG_IDF_TARGET_ESP32S2)

#include <math.h>
#include "cjext.h"
#include "ezlopi_util_trace.h"
Expand Down Expand Up @@ -99,9 +101,9 @@ static ezlopi_error_t dht22_sensor_notify(l_ezlopi_item_t *item)
if (ezlopi_item_name_temp == item->cloud_properties.item_name)
{
float temperature = getTemperature_dht22();
e_enum_temperature_scale_t scale_to_use = ezlopi_core_setting_get_temperature_scale();
item->cloud_properties.scale = (TEMPERATURE_SCALE_FAHRENHEIT == scale_to_use) ? scales_fahrenheit : scales_celsius;
item->cloud_properties.scale = ezlopi_core_setting_get_temperature_scale_str();

e_enum_temperature_scale_t scale_to_use = ezlopi_core_setting_get_temperature_scale();
if (TEMPERATURE_SCALE_FAHRENHEIT == scale_to_use)
{
temperature = (temperature * (9.0f / 5.0f)) + 32.0f;
Expand Down Expand Up @@ -269,8 +271,7 @@ static ezlopi_error_t dht22_sensor_setup_item_properties_temperature(l_ezlopi_it
item->cloud_properties.item_name = ezlopi_item_name_temp;
item->cloud_properties.value_type = value_type_temperature;

e_enum_temperature_scale_t scale_to_use = ezlopi_core_setting_get_temperature_scale();
item->cloud_properties.scale = (scale_to_use == TEMPERATURE_SCALE_FAHRENHEIT) ? scales_fahrenheit : scales_celsius;
item->cloud_properties.scale = ezlopi_core_setting_get_temperature_scale_str();

item->cloud_properties.item_id = ezlopi_cloud_generate_item_id();

Expand Down Expand Up @@ -315,3 +316,5 @@ static ezlopi_error_t dht22_sensor_setup_item_properties_humidity(l_ezlopi_item_

return ret;
}

#endif // (CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32 || CONFIG_IDF_TARGET_ESP32S2)
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,9 @@ static ezlopi_error_t __notify(l_ezlopi_item_t *item)
{
// TRACE_I("Current %f, prev %f", temperature_current_value, *temperature_prev_value);
// TRACE_I("Diff is %f", fabs(*temperature_prev_value - temperature_current_value));
e_enum_temperature_scale_t scale_to_use = ezlopi_core_setting_get_temperature_scale();
item->cloud_properties.scale = (TEMPERATURE_SCALE_FAHRENHEIT == scale_to_use) ? scales_fahrenheit : scales_celsius;
item->cloud_properties.scale = ezlopi_core_setting_get_temperature_scale_str();

e_enum_temperature_scale_t scale_to_use = ezlopi_core_setting_get_temperature_scale();
if (TEMPERATURE_SCALE_FAHRENHEIT == scale_to_use)
{
temperature_current_value = (temperature_current_value * (9.0f / 5.0f)) + 32.0f;
Expand Down Expand Up @@ -151,8 +151,7 @@ static void __prepare_item_properties(l_ezlopi_item_t *item, cJSON *cj_device)
item->cloud_properties.value_type = value_type_temperature;
item->cloud_properties.item_id = ezlopi_cloud_generate_item_id();

e_enum_temperature_scale_t scale_to_use = ezlopi_core_setting_get_temperature_scale();
item->cloud_properties.scale = (TEMPERATURE_SCALE_FAHRENHEIT == scale_to_use) ? scales_fahrenheit : scales_celsius;
item->cloud_properties.scale = ezlopi_core_setting_get_temperature_scale_str();

item->interface_type = EZLOPI_DEVICE_INTERFACE_ONEWIRE_MASTER;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@ static int __notify(l_ezlopi_item_t *item)
{
int ret = 0;
float system_temperature_current_value = 0;
float _eplison = 1.0;
esp_err_t error = temp_sensor_read_celsius(&system_temperature_current_value);
if (ESP_OK == error)
{
Expand All @@ -147,9 +148,10 @@ static int __notify(l_ezlopi_item_t *item)
if (TEMPERATURE_SCALE_FAHRENHEIT == scale_to_use)
{
system_temperature_current_value = (system_temperature_current_value * (9.0f / 5.0f)) + 32.0f;
_eplison = 2.5;
}

if (fabs(system_temperature - system_temperature_current_value) > 0.5)
if (fabs(system_temperature - system_temperature_current_value) > _eplison)
{
system_temperature = system_temperature_current_value;
ezlopi_device_value_updated_from_device_broadcast(item);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ static void __connection_upcall(bool connected);
static void __message_upcall(const char *payload, uint32_t len);
static void __message_process(const char *payload, uint32_t len);

static int __send_str_data_to_nma_websocket(char *str_data);
static ezlopi_error_t __send_str_data_to_nma_websocket(char *str_data);
static int __send_cjson_data_to_nma_websocket(cJSON *cj_data);

uint32_t ezlopi_service_web_provisioning_get_message_count(void)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,10 @@ static void __wifi_connection_event(esp_event_base_t event, int32_t event_id, vo
static void __ws_async_send(void *arg);
static esp_err_t __trigger_async_send(httpd_req_t *req);
static int __respond_cjson(httpd_req_t *req, cJSON *cj_response);
static int __ws_server_send(l_ws_server_client_conn_t *client, char *data, uint32_t len);
static ezlopi_error_t __ws_server_send(l_ws_server_client_conn_t *client, char *data, uint32_t len);

static esp_err_t __msg_handler(httpd_req_t *req);
static int __ws_server_broadcast(char *data);
static ezlopi_error_t __ws_server_broadcast(char *data);

e_ws_status_t ezlopi_service_ws_server_status(void)
{
Expand Down
1 change: 1 addition & 0 deletions sdkconfig.esp32c3.4mb
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,7 @@ CONFIG_EZPI_SERV_ENABLE_MESHBOTS=y
CONFIG_EZPI_SERV_ENABLE_MODES=y
# CONFIG_EZPI_ENABLE_LED_INDICATOR is not set
# CONFIG_EZPI_ENABLE_CAPTIVE_PORTAL is not set
CONFIG_EZPI_ENABLE_SYSTEM_TEMPERATURE=y

#
# EzloPi mDNS config
Expand Down
Loading

0 comments on commit 99ceb2c

Please sign in to comment.