From 3d61ea9a1ffd93bbab31ba034dd203c2dabb90e2 Mon Sep 17 00:00:00 2001 From: Alexandre B Date: Tue, 13 Aug 2024 13:54:02 -0400 Subject: [PATCH] . --- ESP32-Rainmaker-Switch/build/.ninja_log | 8 ++++ .../build/bootloader/.ninja_log | 2 + ESP32-Rainmaker-Switch/main/app_driver.c | 37 +++++++++++++++++-- 3 files changed, 44 insertions(+), 3 deletions(-) diff --git a/ESP32-Rainmaker-Switch/build/.ninja_log b/ESP32-Rainmaker-Switch/build/.ninja_log index a13b905eb..7652cdd23 100644 --- a/ESP32-Rainmaker-Switch/build/.ninja_log +++ b/ESP32-Rainmaker-Switch/build/.ninja_log @@ -1181,3 +1181,11 @@ 14079 14724 7451702125527297 C:/Users/alex/github/ESP-Nodes/ESP32-Rainmaker-Switch/build/.bin_timestamp 983b9a5bbba3c76a 14724 14930 0 esp-idf/esptool_py/CMakeFiles/app_check_size e2e552add3db6290 14724 14930 0 C:/Users/alex/github/ESP-Nodes/ESP32-Rainmaker-Switch/build/esp-idf/esptool_py/CMakeFiles/app_check_size e2e552add3db6290 +266 621 7451435038420539 bootloader-prefix/src/bootloader-stamp/bootloader-build be50754f10ab1bb6 +266 621 7451435038420539 bootloader/bootloader.elf be50754f10ab1bb6 +266 621 7451435038420539 bootloader/bootloader.bin be50754f10ab1bb6 +266 621 7451435038420539 bootloader/bootloader.map be50754f10ab1bb6 +266 621 7451435038420539 C:/Users/alex/github/ESP-Nodes/ESP32-Rainmaker-Switch/build/bootloader-prefix/src/bootloader-stamp/bootloader-build be50754f10ab1bb6 +266 621 7451435038420539 C:/Users/alex/github/ESP-Nodes/ESP32-Rainmaker-Switch/build/bootloader/bootloader.elf be50754f10ab1bb6 +266 621 7451435038420539 C:/Users/alex/github/ESP-Nodes/ESP32-Rainmaker-Switch/build/bootloader/bootloader.bin be50754f10ab1bb6 +266 621 7451435038420539 C:/Users/alex/github/ESP-Nodes/ESP32-Rainmaker-Switch/build/bootloader/bootloader.map be50754f10ab1bb6 diff --git a/ESP32-Rainmaker-Switch/build/bootloader/.ninja_log b/ESP32-Rainmaker-Switch/build/bootloader/.ninja_log index 8368102f9..f110b2c29 100644 --- a/ESP32-Rainmaker-Switch/build/bootloader/.ninja_log +++ b/ESP32-Rainmaker-Switch/build/bootloader/.ninja_log @@ -103,3 +103,5 @@ 40 562 0 C:/Users/alex/github/ESP-Nodes/ESP32-Rainmaker-Switch/build/bootloader/esp-idf/esptool_py/CMakeFiles/bootloader_check_size 7fa5a58273f3cc6e 36 225 0 esp-idf/esptool_py/CMakeFiles/bootloader_check_size 7fa5a58273f3cc6e 36 225 0 C:/Users/alex/github/ESP-Nodes/ESP32-Rainmaker-Switch/build/bootloader/esp-idf/esptool_py/CMakeFiles/bootloader_check_size 7fa5a58273f3cc6e +36 228 0 esp-idf/esptool_py/CMakeFiles/bootloader_check_size 7fa5a58273f3cc6e +36 228 0 C:/Users/alex/github/ESP-Nodes/ESP32-Rainmaker-Switch/build/bootloader/esp-idf/esptool_py/CMakeFiles/bootloader_check_size 7fa5a58273f3cc6e diff --git a/ESP32-Rainmaker-Switch/main/app_driver.c b/ESP32-Rainmaker-Switch/main/app_driver.c index 154f51e49..a95e3662f 100644 --- a/ESP32-Rainmaker-Switch/main/app_driver.c +++ b/ESP32-Rainmaker-Switch/main/app_driver.c @@ -49,10 +49,10 @@ static bool g_power_state = DEFAULT_POWER; // Define the name of app for logs. static const char *TAG = "ESP32-Nodes Rainmaker Switch"; -static float a_light; +static float a_light, internal_temp; static float tsens_value; static int a_light_raw; -static TimerHandle_t sensor_timer; +static TimerHandle_t sensor_timer, internal_sensor_timer; static temperature_sensor_handle_t temp_sensor = NULL; static temperature_sensor_config_t temp_sensor_config = TEMPERATURE_SENSOR_CONFIG_DEFAULT(10, 50); esp_adc_cal_characteristics_t adc1_chars; @@ -93,12 +93,43 @@ void app_sensor_init(void) { } //return ESP_FAIL; } - float app_get_current_temperature() { //return a_light; return a_light_raw; } +static void internal_temperature_sensor_update(TimerHandle_t handle) { + static float delta = 0.25; + a_light += delta; + + // Obtain raw ADC value from the ambient light sensor connected to GPIO 1 + a_light_raw = adc1_get_raw(ADC1_CHANNEL_1); + + // switch_device + esp_rmaker_param_update_and_report( + esp_rmaker_device_get_param_by_type(chip_sensor_device, ESP_RMAKER_PARAM_TEMPERATURE), + esp_rmaker_float((float))); + + ESP_LOGI(TAG, "\nInternal temperature: %i", internal_temp); + ESP_ERROR_CHECK(temperature_sensor_get_celsius(temp_sensor, &tsens_value)); + ESP_LOGI(TAG, "\nESP32-C3 Module temperature: %0.2f", tsens_value); +} +void app_internal_temp_sensor_init(void) { +//esp_err_t app_sensor_init(void) { + internal_temp = 0; + internal_sensor_timer = xTimerCreate("ambient_light_sensor_update_timer", (REPORTING_PERIOD*250) / portTICK_PERIOD_MS, + pdTRUE, NULL, light_sensor_update); + + if (sensor_timer) { + xTimerStart(sensor_timer, 0); + //return ESP_OK; + } + //return ESP_FAIL; +} +float app_get_internal_temperature() { + return internal_temp; +} + //static void app_bme280_init() {} static void app_indicator_set(bool state)