From 88b09adc24dff8c0311cb254d9c7bbc10577ece2 Mon Sep 17 00:00:00 2001 From: Alexandre B Date: Sat, 17 Aug 2024 00:02:41 -0400 Subject: [PATCH] . --- ESP32-C3_Table-Lamp/.vscode/settings.json | 12 +- ESP32-C3_Table-Lamp/CMakeLists.txt | 2 +- ESP32-C3_Table-Lamp/build/CMakeCache.txt | 2 +- .../build/local_components_list.temp.yml | 191 ++++++++++++++++++ ESP32-C3_Table-Lamp/main/app_driver.c | 16 +- ESP32-C3_Table-Lamp/main/app_main.c | 5 +- 6 files changed, 210 insertions(+), 18 deletions(-) create mode 100644 ESP32-C3_Table-Lamp/build/local_components_list.temp.yml diff --git a/ESP32-C3_Table-Lamp/.vscode/settings.json b/ESP32-C3_Table-Lamp/.vscode/settings.json index f35a64196..fcbf9bfb3 100644 --- a/ESP32-C3_Table-Lamp/.vscode/settings.json +++ b/ESP32-C3_Table-Lamp/.vscode/settings.json @@ -1,11 +1,11 @@ { "C_Cpp.intelliSenseEngine": "default", "idf.adapterTargetName": "esp32c3", - "idf.customExtraPaths": "c:\\Users\\alex\\.espressif\\tools\\tools\\xtensa-esp-elf-gdb\\14.2_20240403\\xtensa-esp-elf-gdb\\bin;c:\\Users\\alex\\.espressif\\tools\\tools\\riscv32-esp-elf-gdb\\14.2_20240403\\riscv32-esp-elf-gdb\\bin;c:\\Users\\alex\\.espressif\\tools\\tools\\xtensa-esp-elf\\esp-13.2.0_20230928\\xtensa-esp-elf\\bin;c:\\Users\\alex\\.espressif\\tools\\tools\\riscv32-esp-elf\\esp-13.2.0_20230928\\riscv32-esp-elf\\bin;c:\\Users\\alex\\.espressif\\tools\\tools\\esp32ulp-elf\\2.35_20220830\\esp32ulp-elf\\bin;c:\\Users\\alex\\.espressif\\tools\\tools\\cmake\\3.24.0\\bin;c:\\Users\\alex\\.espressif\\tools\\tools\\openocd-esp32\\v0.12.0-esp32-20240318\\openocd-esp32\\bin;c:\\Users\\alex\\.espressif\\tools\\tools\\ninja\\1.11.1;c:\\Users\\alex\\.espressif\\tools\\tools\\idf-exe\\1.0.3;c:\\Users\\alex\\.espressif\\tools\\tools\\ccache\\4.8\\ccache-4.8-windows-x86_64;c:\\Users\\alex\\.espressif\\tools\\tools\\dfu-util\\0.11\\dfu-util-0.11-win64;c:\\Users\\alex\\.espressif\\tools\\tools\\esp-rom-elfs\\20230320", + "idf.customExtraPaths": "c:\\Users\\alex\\esp\\tools\\xtensa-esp-elf-gdb\\14.2_20240403\\xtensa-esp-elf-gdb\\bin;c:\\Users\\alex\\esp\\tools\\riscv32-esp-elf-gdb\\14.2_20240403\\riscv32-esp-elf-gdb\\bin;c:\\Users\\alex\\esp\\tools\\xtensa-esp-elf\\esp-13.2.0_20230928\\xtensa-esp-elf\\bin;c:\\Users\\alex\\esp\\tools\\riscv32-esp-elf\\esp-13.2.0_20230928\\riscv32-esp-elf\\bin;c:\\Users\\alex\\esp\\tools\\esp32ulp-elf\\2.35_20220830\\esp32ulp-elf\\bin;c:\\Users\\alex\\esp\\tools\\cmake\\3.24.0\\bin;c:\\Users\\alex\\esp\\tools\\openocd-esp32\\v0.12.0-esp32-20240318\\openocd-esp32\\bin;c:\\Users\\alex\\esp\\tools\\ninja\\1.11.1;c:\\Users\\alex\\esp\\tools\\idf-exe\\1.0.3;c:\\Users\\alex\\esp\\tools\\ccache\\4.8\\ccache-4.8-windows-x86_64;c:\\Users\\alex\\esp\\tools\\dfu-util\\0.11\\dfu-util-0.11-win64;c:\\Users\\alex\\esp\\tools\\esp-rom-elfs\\20230320", "idf.customExtraVars": { - "OPENOCD_SCRIPTS": "c:\\Users\\alex\\.espressif\\tools\\tools\\openocd-esp32\\v0.12.0-esp32-20240318/openocd-esp32/share/openocd/scripts", + "OPENOCD_SCRIPTS": "c:\\Users\\alex\\esp\\tools\\openocd-esp32\\v0.12.0-esp32-20240318/openocd-esp32/share/openocd/scripts", "IDF_CCACHE_ENABLE": "1", - "ESP_ROM_ELF_DIR": "c:\\Users\\alex\\.espressif\\tools\\tools\\esp-rom-elfs\\20230320/" + "ESP_ROM_ELF_DIR": "c:\\Users\\alex\\esp\\tools\\esp-rom-elfs\\20230320/" }, "idf.espIdfPathWin": "C:\\Users\\alex\\esp\\v5.2.2\\esp-idf", "idf.espAdfPathWin": "C:\\Users\\alex\\.espressif\\esp-adf", @@ -13,8 +13,8 @@ "board/esp32c3-builtin.cfg" ], "idf.portWin": "COM27", - "idf.pythonBinPathWin": "c:\\Users\\alex\\.espressif\\tools\\python_env\\idf5.2_py3.11_env\\Scripts\\python.exe", - "idf.toolsPathWin": "c:\\Users\\alex\\.espressif\\tools", - "idf.gitPathWin": "c:\\Users\\alex\\.espressif\\tools\\tools\\idf-git\\2.39.2\\cmd\\git.exe", + "idf.pythonBinPathWin": "c:\\Users\\alex\\esp\\python_env\\idf5.2_py3.11_env\\Scripts\\python.exe", + "idf.toolsPathWin": "c:\\Users\\alex\\esp\\", + "idf.gitPathWin": "c:\\Users\\alex\\esp\\tools\\idf-git\\2.39.2\\cmd\\git.exe", "idf.flashType": "UART" } diff --git a/ESP32-C3_Table-Lamp/CMakeLists.txt b/ESP32-C3_Table-Lamp/CMakeLists.txt index df3c03f3f..9bddb7209 100644 --- a/ESP32-C3_Table-Lamp/CMakeLists.txt +++ b/ESP32-C3_Table-Lamp/CMakeLists.txt @@ -11,6 +11,6 @@ endif(DEFINED ENV{RMAKER_PATH}) # Add RainMaker components and other common application components set(EXTRA_COMPONENT_DIRS ${RMAKER_PATH}/components/esp-insights/components ${RMAKER_PATH}/components ${RMAKER_PATH}/examples/common) -set(PROJECT_VER "1.2") +set(PROJECT_VER "1.2.1") include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(ESP32-C3_Table-Lamp) diff --git a/ESP32-C3_Table-Lamp/build/CMakeCache.txt b/ESP32-C3_Table-Lamp/build/CMakeCache.txt index 124854a55..36820bd56 100644 --- a/ESP32-C3_Table-Lamp/build/CMakeCache.txt +++ b/ESP32-C3_Table-Lamp/build/CMakeCache.txt @@ -545,7 +545,7 @@ CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_NM CMAKE_NM-ADVANCED:INTERNAL=1 //number of local generators -CMAKE_NUMBER_OF_MAKEFILES:INTERNAL=106 +CMAKE_NUMBER_OF_MAKEFILES:INTERNAL=1 //ADVANCED property for variable: CMAKE_OBJCOPY CMAKE_OBJCOPY-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_OBJDUMP diff --git a/ESP32-C3_Table-Lamp/build/local_components_list.temp.yml b/ESP32-C3_Table-Lamp/build/local_components_list.temp.yml new file mode 100644 index 000000000..4624823bb --- /dev/null +++ b/ESP32-C3_Table-Lamp/build/local_components_list.temp.yml @@ -0,0 +1,191 @@ +components: + - name: "app_trace" + path: "C:/Users/alex/esp/v5.2.2/esp-idf/components/app_trace" + - name: "app_update" + path: "C:/Users/alex/esp/v5.2.2/esp-idf/components/app_update" + - name: "bootloader" + path: "C:/Users/alex/esp/v5.2.2/esp-idf/components/bootloader" + - name: "bootloader_support" + path: "C:/Users/alex/esp/v5.2.2/esp-idf/components/bootloader_support" + - name: "bt" + path: "C:/Users/alex/esp/v5.2.2/esp-idf/components/bt" + - name: "cmock" + path: "C:/Users/alex/esp/v5.2.2/esp-idf/components/cmock" + - name: "console" + path: "C:/Users/alex/esp/v5.2.2/esp-idf/components/console" + - name: "cxx" + path: "C:/Users/alex/esp/v5.2.2/esp-idf/components/cxx" + - name: "driver" + path: "C:/Users/alex/esp/v5.2.2/esp-idf/components/driver" + - name: "efuse" + path: "C:/Users/alex/esp/v5.2.2/esp-idf/components/efuse" + - name: "esp-tls" + path: "C:/Users/alex/esp/v5.2.2/esp-idf/components/esp-tls" + - name: "esp_adc" + path: "C:/Users/alex/esp/v5.2.2/esp-idf/components/esp_adc" + - name: "esp_app_format" + path: "C:/Users/alex/esp/v5.2.2/esp-idf/components/esp_app_format" + - name: "esp_bootloader_format" + path: "C:/Users/alex/esp/v5.2.2/esp-idf/components/esp_bootloader_format" + - name: "esp_coex" + path: "C:/Users/alex/esp/v5.2.2/esp-idf/components/esp_coex" + - name: "esp_common" + path: "C:/Users/alex/esp/v5.2.2/esp-idf/components/esp_common" + - name: "esp_eth" + path: "C:/Users/alex/esp/v5.2.2/esp-idf/components/esp_eth" + - name: "esp_event" + path: "C:/Users/alex/esp/v5.2.2/esp-idf/components/esp_event" + - name: "esp_gdbstub" + path: "C:/Users/alex/esp/v5.2.2/esp-idf/components/esp_gdbstub" + - name: "esp_hid" + path: "C:/Users/alex/esp/v5.2.2/esp-idf/components/esp_hid" + - name: "esp_http_client" + path: "C:/Users/alex/esp/v5.2.2/esp-idf/components/esp_http_client" + - name: "esp_http_server" + path: "C:/Users/alex/esp/v5.2.2/esp-idf/components/esp_http_server" + - name: "esp_https_ota" + path: "C:/Users/alex/esp/v5.2.2/esp-idf/components/esp_https_ota" + - name: "esp_https_server" + path: "C:/Users/alex/esp/v5.2.2/esp-idf/components/esp_https_server" + - name: "esp_hw_support" + path: "C:/Users/alex/esp/v5.2.2/esp-idf/components/esp_hw_support" + - name: "esp_lcd" + path: "C:/Users/alex/esp/v5.2.2/esp-idf/components/esp_lcd" + - name: "esp_local_ctrl" + path: "C:/Users/alex/esp/v5.2.2/esp-idf/components/esp_local_ctrl" + - name: "esp_mm" + path: "C:/Users/alex/esp/v5.2.2/esp-idf/components/esp_mm" + - name: "esp_netif" + path: "C:/Users/alex/esp/v5.2.2/esp-idf/components/esp_netif" + - name: "esp_netif_stack" + path: "C:/Users/alex/esp/v5.2.2/esp-idf/components/esp_netif_stack" + - name: "esp_partition" + path: "C:/Users/alex/esp/v5.2.2/esp-idf/components/esp_partition" + - name: "esp_phy" + path: "C:/Users/alex/esp/v5.2.2/esp-idf/components/esp_phy" + - name: "esp_pm" + path: "C:/Users/alex/esp/v5.2.2/esp-idf/components/esp_pm" + - name: "esp_psram" + path: "C:/Users/alex/esp/v5.2.2/esp-idf/components/esp_psram" + - name: "esp_ringbuf" + path: "C:/Users/alex/esp/v5.2.2/esp-idf/components/esp_ringbuf" + - name: "esp_rom" + path: "C:/Users/alex/esp/v5.2.2/esp-idf/components/esp_rom" + - name: "esp_system" + path: "C:/Users/alex/esp/v5.2.2/esp-idf/components/esp_system" + - name: "esp_timer" + path: "C:/Users/alex/esp/v5.2.2/esp-idf/components/esp_timer" + - name: "esp_wifi" + path: "C:/Users/alex/esp/v5.2.2/esp-idf/components/esp_wifi" + - name: "espcoredump" + path: "C:/Users/alex/esp/v5.2.2/esp-idf/components/espcoredump" + - name: "esptool_py" + path: "C:/Users/alex/esp/v5.2.2/esp-idf/components/esptool_py" + - name: "fatfs" + path: "C:/Users/alex/esp/v5.2.2/esp-idf/components/fatfs" + - name: "freertos" + path: "C:/Users/alex/esp/v5.2.2/esp-idf/components/freertos" + - name: "hal" + path: "C:/Users/alex/esp/v5.2.2/esp-idf/components/hal" + - name: "heap" + path: "C:/Users/alex/esp/v5.2.2/esp-idf/components/heap" + - name: "http_parser" + path: "C:/Users/alex/esp/v5.2.2/esp-idf/components/http_parser" + - name: "idf_test" + path: "C:/Users/alex/esp/v5.2.2/esp-idf/components/idf_test" + - name: "ieee802154" + path: "C:/Users/alex/esp/v5.2.2/esp-idf/components/ieee802154" + - name: "json" + path: "C:/Users/alex/esp/v5.2.2/esp-idf/components/json" + - name: "linux" + path: "C:/Users/alex/esp/v5.2.2/esp-idf/components/linux" + - name: "log" + path: "C:/Users/alex/esp/v5.2.2/esp-idf/components/log" + - name: "lwip" + path: "C:/Users/alex/esp/v5.2.2/esp-idf/components/lwip" + - name: "mbedtls" + path: "C:/Users/alex/esp/v5.2.2/esp-idf/components/mbedtls" + - name: "mqtt" + path: "C:/Users/alex/esp/v5.2.2/esp-idf/components/mqtt" + - name: "newlib" + path: "C:/Users/alex/esp/v5.2.2/esp-idf/components/newlib" + - name: "nvs_flash" + path: "C:/Users/alex/esp/v5.2.2/esp-idf/components/nvs_flash" + - name: "nvs_sec_provider" + path: "C:/Users/alex/esp/v5.2.2/esp-idf/components/nvs_sec_provider" + - name: "openthread" + path: "C:/Users/alex/esp/v5.2.2/esp-idf/components/openthread" + - name: "partition_table" + path: "C:/Users/alex/esp/v5.2.2/esp-idf/components/partition_table" + - name: "perfmon" + path: "C:/Users/alex/esp/v5.2.2/esp-idf/components/perfmon" + - name: "protobuf-c" + path: "C:/Users/alex/esp/v5.2.2/esp-idf/components/protobuf-c" + - name: "protocomm" + path: "C:/Users/alex/esp/v5.2.2/esp-idf/components/protocomm" + - name: "pthread" + path: "C:/Users/alex/esp/v5.2.2/esp-idf/components/pthread" + - name: "riscv" + path: "C:/Users/alex/esp/v5.2.2/esp-idf/components/riscv" + - name: "sdmmc" + path: "C:/Users/alex/esp/v5.2.2/esp-idf/components/sdmmc" + - name: "soc" + path: "C:/Users/alex/esp/v5.2.2/esp-idf/components/soc" + - name: "spi_flash" + path: "C:/Users/alex/esp/v5.2.2/esp-idf/components/spi_flash" + - name: "spiffs" + path: "C:/Users/alex/esp/v5.2.2/esp-idf/components/spiffs" + - name: "tcp_transport" + path: "C:/Users/alex/esp/v5.2.2/esp-idf/components/tcp_transport" + - name: "touch_element" + path: "C:/Users/alex/esp/v5.2.2/esp-idf/components/touch_element" + - name: "ulp" + path: "C:/Users/alex/esp/v5.2.2/esp-idf/components/ulp" + - name: "unity" + path: "C:/Users/alex/esp/v5.2.2/esp-idf/components/unity" + - name: "usb" + path: "C:/Users/alex/esp/v5.2.2/esp-idf/components/usb" + - name: "vfs" + path: "C:/Users/alex/esp/v5.2.2/esp-idf/components/vfs" + - name: "wear_levelling" + path: "C:/Users/alex/esp/v5.2.2/esp-idf/components/wear_levelling" + - name: "wifi_provisioning" + path: "C:/Users/alex/esp/v5.2.2/esp-idf/components/wifi_provisioning" + - name: "wpa_supplicant" + path: "C:/Users/alex/esp/v5.2.2/esp-idf/components/wpa_supplicant" + - name: "xtensa" + path: "C:/Users/alex/esp/v5.2.2/esp-idf/components/xtensa" + - name: "main" + path: "C:/Users/alex/github/ESP-Nodes/ESP32-C3_Table-Lamp/main" + - name: "esp_diag_data_store" + path: "C:/Users/alex/esp/esp-rainmaker/components/esp-insights/components/esp_diag_data_store" + - name: "esp_diagnostics" + path: "C:/Users/alex/esp/esp-rainmaker/components/esp-insights/components/esp_diagnostics" + - name: "esp_insights" + path: "C:/Users/alex/esp/esp-rainmaker/components/esp-insights/components/esp_insights" + - name: "rmaker_common" + path: "C:/Users/alex/esp/esp-rainmaker/components/rmaker_common" + - name: "esp_rainmaker" + path: "C:/Users/alex/esp/esp-rainmaker/components/esp_rainmaker" + - name: "esp_schedule" + path: "C:/Users/alex/esp/esp-rainmaker/components/esp_schedule" + - name: "jsmn" + path: "C:/Users/alex/esp/esp-rainmaker/components/jsmn" + - name: "json_generator" + path: "C:/Users/alex/esp/esp-rainmaker/components/json_generator" + - name: "json_parser" + path: "C:/Users/alex/esp/esp-rainmaker/components/json_parser" + - name: "app_insights" + path: "C:/Users/alex/esp/esp-rainmaker/examples/common/app_insights" + - name: "app_reset" + path: "C:/Users/alex/esp/esp-rainmaker/examples/common/app_reset" + - name: "app_wifi" + path: "C:/Users/alex/esp/esp-rainmaker/examples/common/app_wifi" + - name: "gpio_button" + path: "C:/Users/alex/esp/esp-rainmaker/examples/common/gpio_button" + - name: "ledc_driver" + path: "C:/Users/alex/esp/esp-rainmaker/examples/common/ledc_driver" + - name: "qrcode" + path: "C:/Users/alex/esp/esp-rainmaker/examples/common/qrcode" + - name: "ws2812_led" + path: "C:/Users/alex/esp/esp-rainmaker/examples/common/ws2812_led" diff --git a/ESP32-C3_Table-Lamp/main/app_driver.c b/ESP32-C3_Table-Lamp/main/app_driver.c index e62e99afb..c28c03fb9 100644 --- a/ESP32-C3_Table-Lamp/main/app_driver.c +++ b/ESP32-C3_Table-Lamp/main/app_driver.c @@ -1,10 +1,6 @@ -/* Switch demo implementation using button and RGB LED - - This example code is in the Public Domain (or CC0 licensed, at your option.) - - Unless required by applicable law or agreed to in writing, this - software is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR - CONDITIONS OF ANY KIND, either express or implied. +/* + Table Night Ambient Lights + Hardware */ #include @@ -76,7 +72,11 @@ static void push_btn_cb(void *arg) static void set_power_state(bool target) { - gpio_set_level(OUTPUT_GPIO, target); + //gpio_set_level(OUTPUT_GPIO, target); + if (target) + gpio_set_level(OUTPUT_GPIO, 1); + else + gpio_set_level(OUTPUT_GPIO, 0); app_indicator_set(target); } diff --git a/ESP32-C3_Table-Lamp/main/app_main.c b/ESP32-C3_Table-Lamp/main/app_main.c index c71e0bf4d..9691ac557 100644 --- a/ESP32-C3_Table-Lamp/main/app_main.c +++ b/ESP32-C3_Table-Lamp/main/app_main.c @@ -1,6 +1,7 @@ -/* Table Night Ambient Lights +/* + Table Night Ambient Lights - Controlled by Rainmaker + Controlled by Rainmaker Cloud by: Alexander Bobkov