From 197a1611f5ace856649699b1edbab55e30c11da8 Mon Sep 17 00:00:00 2001 From: Peter Siegmund Date: Thu, 21 Aug 2025 00:02:56 +0200 Subject: [PATCH] move firmware into subfolder Signed-off-by: Peter Siegmund --- .vscode/.espidf.peripherals.state.json | 1 + .vscode/settings.json | 47 +++++++++++++++++++ .clang-format => firmware/.clang-format | 0 .clangd => firmware/.clangd | 0 .gitignore => firmware/.gitignore | 0 CMakeLists.txt => firmware/CMakeLists.txt | 0 .../CODE_OF_CONDUCT.md | 0 LICENSE.md => firmware/LICENSE.md | 0 Makefile => firmware/Makefile | 0 README.md => firmware/README.md | 0 .../components}/light/CMakeLists.txt | 0 .../components}/light/beacon.c | 0 .../components}/light/idf_component.yml | 0 .../components}/light/include/beacon.h | 0 .../components}/light/include/light.h | 0 .../components}/light/include/outdoor.h | 0 .../components}/light/light.c | 0 .../components}/light/outdoor.c | 0 .../components}/persistence/CMakeLists.txt | 0 .../persistence/include/persistence.h | 0 .../components}/persistence/persistence.c | 0 .../components}/remote_control/CMakeLists.txt | 0 .../remote_control/capability_service.c | 0 .../remote_control/device_service.c | 0 .../include/capability_service.h | 0 .../remote_control/include/device_service.h | 0 .../remote_control/include/led_service.h | 0 .../remote_control/include/remote_control.h | 0 .../components}/remote_control/led_service.c | 0 .../remote_control/remote_control.c | 0 .../components}/storage/CMakeLists.txt | 0 .../components}/storage/include/storage.h | 0 .../components}/storage/storage.c | 0 {data => firmware/data}/capability.json | 0 {main => firmware/main}/CMakeLists.txt | 0 {main => firmware/main}/Kconfig.projbuild | 0 {main => firmware/main}/idf_component.yml | 0 {main => firmware/main}/main.c | 0 partitions.csv => firmware/partitions.csv | 0 .../sdkconfig.defaults | 0 .../sdkconfig.defaults.esp32 | 0 .../sdkconfig.defaults.esp32c3 | 0 .../sdkconfig.defaults.esp32c5 | 0 .../sdkconfig.defaults.esp32c6 | 0 .../sdkconfig.defaults.esp32h2 | 0 .../sdkconfig.defaults.esp32p4 | 0 .../sdkconfig.defaults.esp32s3 | 0 .../sdkconfig.release | 0 version.txt => firmware/version.txt | 0 49 files changed, 48 insertions(+) create mode 100644 .vscode/.espidf.peripherals.state.json create mode 100644 .vscode/settings.json rename .clang-format => firmware/.clang-format (100%) rename .clangd => firmware/.clangd (100%) rename .gitignore => firmware/.gitignore (100%) rename CMakeLists.txt => firmware/CMakeLists.txt (100%) rename CODE_OF_CONDUCT.md => firmware/CODE_OF_CONDUCT.md (100%) rename LICENSE.md => firmware/LICENSE.md (100%) rename Makefile => firmware/Makefile (100%) rename README.md => firmware/README.md (100%) rename {components => firmware/components}/light/CMakeLists.txt (100%) rename {components => firmware/components}/light/beacon.c (100%) rename {components => firmware/components}/light/idf_component.yml (100%) rename {components => firmware/components}/light/include/beacon.h (100%) rename {components => firmware/components}/light/include/light.h (100%) rename {components => firmware/components}/light/include/outdoor.h (100%) rename {components => firmware/components}/light/light.c (100%) rename {components => firmware/components}/light/outdoor.c (100%) rename {components => firmware/components}/persistence/CMakeLists.txt (100%) rename {components => firmware/components}/persistence/include/persistence.h (100%) rename {components => firmware/components}/persistence/persistence.c (100%) rename {components => firmware/components}/remote_control/CMakeLists.txt (100%) rename {components => firmware/components}/remote_control/capability_service.c (100%) rename {components => firmware/components}/remote_control/device_service.c (100%) rename {components => firmware/components}/remote_control/include/capability_service.h (100%) rename {components => firmware/components}/remote_control/include/device_service.h (100%) rename {components => firmware/components}/remote_control/include/led_service.h (100%) rename {components => firmware/components}/remote_control/include/remote_control.h (100%) rename {components => firmware/components}/remote_control/led_service.c (100%) rename {components => firmware/components}/remote_control/remote_control.c (100%) rename {components => firmware/components}/storage/CMakeLists.txt (100%) rename {components => firmware/components}/storage/include/storage.h (100%) rename {components => firmware/components}/storage/storage.c (100%) rename {data => firmware/data}/capability.json (100%) rename {main => firmware/main}/CMakeLists.txt (100%) rename {main => firmware/main}/Kconfig.projbuild (100%) rename {main => firmware/main}/idf_component.yml (100%) rename {main => firmware/main}/main.c (100%) rename partitions.csv => firmware/partitions.csv (100%) rename sdkconfig.defaults => firmware/sdkconfig.defaults (100%) rename sdkconfig.defaults.esp32 => firmware/sdkconfig.defaults.esp32 (100%) rename sdkconfig.defaults.esp32c3 => firmware/sdkconfig.defaults.esp32c3 (100%) rename sdkconfig.defaults.esp32c5 => firmware/sdkconfig.defaults.esp32c5 (100%) rename sdkconfig.defaults.esp32c6 => firmware/sdkconfig.defaults.esp32c6 (100%) rename sdkconfig.defaults.esp32h2 => firmware/sdkconfig.defaults.esp32h2 (100%) rename sdkconfig.defaults.esp32p4 => firmware/sdkconfig.defaults.esp32p4 (100%) rename sdkconfig.defaults.esp32s3 => firmware/sdkconfig.defaults.esp32s3 (100%) rename sdkconfig.release => firmware/sdkconfig.release (100%) rename version.txt => firmware/version.txt (100%) diff --git a/.vscode/.espidf.peripherals.state.json b/.vscode/.espidf.peripherals.state.json new file mode 100644 index 0000000..1fd8041 --- /dev/null +++ b/.vscode/.espidf.peripherals.state.json @@ -0,0 +1 @@ +[{"node":"I2C1","expanded":false,"format":0,"pinned":false},{"node":"MCPWM1","expanded":false,"format":0,"pinned":false},{"node":"SPI3","expanded":false,"format":0,"pinned":false},{"node":"TIMG1","expanded":false,"format":0,"pinned":false},{"node":"UART1","expanded":false,"format":0,"pinned":false},{"node":"UART2","expanded":false,"format":0,"pinned":false},{"node":"UHCI1","expanded":false,"format":0,"pinned":false},{"node":"AES","expanded":false,"format":0,"pinned":false},{"node":"APB_CTRL","expanded":false,"format":0,"pinned":false},{"node":"APB_SARADC","expanded":false,"format":0,"pinned":false},{"node":"BB","expanded":false,"format":0,"pinned":false},{"node":"ASSIST_DEBUG","expanded":false,"format":0,"pinned":false},{"node":"DMA","expanded":false,"format":0,"pinned":false},{"node":"DS","expanded":false,"format":0,"pinned":false},{"node":"EFUSE","expanded":false,"format":0,"pinned":false},{"node":"EXTMEM","expanded":false,"format":0,"pinned":false},{"node":"GPIO","expanded":false,"format":0,"pinned":false},{"node":"GPIO_SD","expanded":false,"format":0,"pinned":false},{"node":"HMAC","expanded":false,"format":0,"pinned":false},{"node":"I2C0","expanded":false,"format":0,"pinned":false},{"node":"I2S0","expanded":false,"format":0,"pinned":false},{"node":"I2S1","expanded":false,"format":0,"pinned":false},{"node":"INTERRUPT_CORE0","expanded":false,"format":0,"pinned":false},{"node":"INTERRUPT_CORE1","expanded":false,"format":0,"pinned":false},{"node":"IO_MUX","expanded":false,"format":0,"pinned":false},{"node":"LCD_CAM","expanded":false,"format":0,"pinned":false},{"node":"LEDC","expanded":false,"format":0,"pinned":false},{"node":"PCNT","expanded":false,"format":0,"pinned":false},{"node":"PERI_BACKUP","expanded":false,"format":0,"pinned":false},{"node":"MCPWM0","expanded":false,"format":0,"pinned":false},{"node":"RMT","expanded":false,"format":0,"pinned":false},{"node":"RNG","expanded":false,"format":0,"pinned":false},{"node":"RSA","expanded":false,"format":0,"pinned":false},{"node":"RTC_CNTL","expanded":false,"format":0,"pinned":false},{"node":"RTC_I2C","expanded":false,"format":0,"pinned":false},{"node":"RTC_IO","expanded":false,"format":0,"pinned":false},{"node":"SDHOST","expanded":false,"format":0,"pinned":false},{"node":"SENS","expanded":false,"format":0,"pinned":false},{"node":"SENSITIVE","expanded":false,"format":0,"pinned":false},{"node":"SHA","expanded":false,"format":0,"pinned":false},{"node":"SPI0","expanded":false,"format":0,"pinned":false},{"node":"SPI1","expanded":false,"format":0,"pinned":false},{"node":"SPI2","expanded":false,"format":0,"pinned":false},{"node":"SYSTEM","expanded":false,"format":0,"pinned":false},{"node":"SYSTIMER","expanded":false,"format":0,"pinned":false},{"node":"TIMG0","expanded":false,"format":0,"pinned":false},{"node":"TWAI0","expanded":false,"format":0,"pinned":false},{"node":"UART0","expanded":false,"format":0,"pinned":false},{"node":"UHCI0","expanded":false,"format":0,"pinned":false},{"node":"USB0","expanded":false,"format":0,"pinned":false},{"node":"USB_DEVICE","expanded":false,"format":0,"pinned":false},{"node":"USB_WRAP","expanded":false,"format":0,"pinned":false},{"node":"WCL","expanded":false,"format":0,"pinned":false},{"node":"XTS_AES","expanded":false,"format":0,"pinned":false}] diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..f8959c8 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,47 @@ +{ + "idf.cwd": "${workspaceFolder}/firmware", + "idf.sdkconfigFilePath": "${workspaceFolder}/firmware/sdkconfig", + "idf.buildPath": "${workspaceFolder}/firmware/build", + "idf.openOcdConfigs": [ + "board/esp32h2-builtin.cfg" + ], + "idf.customExtraVars": { + "OPENOCD_SCRIPTS": "/Users/siegmund/.espressif/tools/openocd-esp32/v0.12.0-esp32-20240821/openocd-esp32/share/openocd/scripts", + "ESP_ROM_ELF_DIR": "/Users/siegmund/.espressif/tools/esp-rom-elfs/20230320/", + "IDF_TARGET": "esp32h2" + }, + "idf.flashType": "UART", + "files.associations": { + "led_strip.h": "c", + "led_matrix.h": "c", + "stdint.h": "c", + "freertos.h": "c", + "format": "c", + "thread": "c", + "sdkconfig.h": "c", + "task.h": "c", + "remote_control.h": "c", + "ble_svc_gap.h": "c", + "ble_svc_gatt.h": "c", + "nimble_port.h": "c", + "nimble_port_freertos.h": "c", + "esp_nimble_hci.h": "c", + "led_service.h": "c", + "device_service.h": "c", + "ble_hs.h": "c", + "esp_spiffs.h": "c", + "esp_log.h": "c", + "types.h": "c", + "gptimer.h": "c", + "gpio.h": "c", + "beacon.h": "c", + "persistence.h": "c", + "light.h": "c", + "outdoor.h": "c", + "inttypes.h": "c" + }, + "idf.port": "/dev/tty.usbmodem2101", + "idf.espIdfPath": "/Users/siegmund/esp/v5.5/esp-idf", + "idf.toolsPath": "/Users/siegmund/.espressif", + "idf.pythonInstallPath": "/opt/homebrew/bin/python3" +} \ No newline at end of file diff --git a/.clang-format b/firmware/.clang-format similarity index 100% rename from .clang-format rename to firmware/.clang-format diff --git a/.clangd b/firmware/.clangd similarity index 100% rename from .clangd rename to firmware/.clangd diff --git a/.gitignore b/firmware/.gitignore similarity index 100% rename from .gitignore rename to firmware/.gitignore diff --git a/CMakeLists.txt b/firmware/CMakeLists.txt similarity index 100% rename from CMakeLists.txt rename to firmware/CMakeLists.txt diff --git a/CODE_OF_CONDUCT.md b/firmware/CODE_OF_CONDUCT.md similarity index 100% rename from CODE_OF_CONDUCT.md rename to firmware/CODE_OF_CONDUCT.md diff --git a/LICENSE.md b/firmware/LICENSE.md similarity index 100% rename from LICENSE.md rename to firmware/LICENSE.md diff --git a/Makefile b/firmware/Makefile similarity index 100% rename from Makefile rename to firmware/Makefile diff --git a/README.md b/firmware/README.md similarity index 100% rename from README.md rename to firmware/README.md diff --git a/components/light/CMakeLists.txt b/firmware/components/light/CMakeLists.txt similarity index 100% rename from components/light/CMakeLists.txt rename to firmware/components/light/CMakeLists.txt diff --git a/components/light/beacon.c b/firmware/components/light/beacon.c similarity index 100% rename from components/light/beacon.c rename to firmware/components/light/beacon.c diff --git a/components/light/idf_component.yml b/firmware/components/light/idf_component.yml similarity index 100% rename from components/light/idf_component.yml rename to firmware/components/light/idf_component.yml diff --git a/components/light/include/beacon.h b/firmware/components/light/include/beacon.h similarity index 100% rename from components/light/include/beacon.h rename to firmware/components/light/include/beacon.h diff --git a/components/light/include/light.h b/firmware/components/light/include/light.h similarity index 100% rename from components/light/include/light.h rename to firmware/components/light/include/light.h diff --git a/components/light/include/outdoor.h b/firmware/components/light/include/outdoor.h similarity index 100% rename from components/light/include/outdoor.h rename to firmware/components/light/include/outdoor.h diff --git a/components/light/light.c b/firmware/components/light/light.c similarity index 100% rename from components/light/light.c rename to firmware/components/light/light.c diff --git a/components/light/outdoor.c b/firmware/components/light/outdoor.c similarity index 100% rename from components/light/outdoor.c rename to firmware/components/light/outdoor.c diff --git a/components/persistence/CMakeLists.txt b/firmware/components/persistence/CMakeLists.txt similarity index 100% rename from components/persistence/CMakeLists.txt rename to firmware/components/persistence/CMakeLists.txt diff --git a/components/persistence/include/persistence.h b/firmware/components/persistence/include/persistence.h similarity index 100% rename from components/persistence/include/persistence.h rename to firmware/components/persistence/include/persistence.h diff --git a/components/persistence/persistence.c b/firmware/components/persistence/persistence.c similarity index 100% rename from components/persistence/persistence.c rename to firmware/components/persistence/persistence.c diff --git a/components/remote_control/CMakeLists.txt b/firmware/components/remote_control/CMakeLists.txt similarity index 100% rename from components/remote_control/CMakeLists.txt rename to firmware/components/remote_control/CMakeLists.txt diff --git a/components/remote_control/capability_service.c b/firmware/components/remote_control/capability_service.c similarity index 100% rename from components/remote_control/capability_service.c rename to firmware/components/remote_control/capability_service.c diff --git a/components/remote_control/device_service.c b/firmware/components/remote_control/device_service.c similarity index 100% rename from components/remote_control/device_service.c rename to firmware/components/remote_control/device_service.c diff --git a/components/remote_control/include/capability_service.h b/firmware/components/remote_control/include/capability_service.h similarity index 100% rename from components/remote_control/include/capability_service.h rename to firmware/components/remote_control/include/capability_service.h diff --git a/components/remote_control/include/device_service.h b/firmware/components/remote_control/include/device_service.h similarity index 100% rename from components/remote_control/include/device_service.h rename to firmware/components/remote_control/include/device_service.h diff --git a/components/remote_control/include/led_service.h b/firmware/components/remote_control/include/led_service.h similarity index 100% rename from components/remote_control/include/led_service.h rename to firmware/components/remote_control/include/led_service.h diff --git a/components/remote_control/include/remote_control.h b/firmware/components/remote_control/include/remote_control.h similarity index 100% rename from components/remote_control/include/remote_control.h rename to firmware/components/remote_control/include/remote_control.h diff --git a/components/remote_control/led_service.c b/firmware/components/remote_control/led_service.c similarity index 100% rename from components/remote_control/led_service.c rename to firmware/components/remote_control/led_service.c diff --git a/components/remote_control/remote_control.c b/firmware/components/remote_control/remote_control.c similarity index 100% rename from components/remote_control/remote_control.c rename to firmware/components/remote_control/remote_control.c diff --git a/components/storage/CMakeLists.txt b/firmware/components/storage/CMakeLists.txt similarity index 100% rename from components/storage/CMakeLists.txt rename to firmware/components/storage/CMakeLists.txt diff --git a/components/storage/include/storage.h b/firmware/components/storage/include/storage.h similarity index 100% rename from components/storage/include/storage.h rename to firmware/components/storage/include/storage.h diff --git a/components/storage/storage.c b/firmware/components/storage/storage.c similarity index 100% rename from components/storage/storage.c rename to firmware/components/storage/storage.c diff --git a/data/capability.json b/firmware/data/capability.json similarity index 100% rename from data/capability.json rename to firmware/data/capability.json diff --git a/main/CMakeLists.txt b/firmware/main/CMakeLists.txt similarity index 100% rename from main/CMakeLists.txt rename to firmware/main/CMakeLists.txt diff --git a/main/Kconfig.projbuild b/firmware/main/Kconfig.projbuild similarity index 100% rename from main/Kconfig.projbuild rename to firmware/main/Kconfig.projbuild diff --git a/main/idf_component.yml b/firmware/main/idf_component.yml similarity index 100% rename from main/idf_component.yml rename to firmware/main/idf_component.yml diff --git a/main/main.c b/firmware/main/main.c similarity index 100% rename from main/main.c rename to firmware/main/main.c diff --git a/partitions.csv b/firmware/partitions.csv similarity index 100% rename from partitions.csv rename to firmware/partitions.csv diff --git a/sdkconfig.defaults b/firmware/sdkconfig.defaults similarity index 100% rename from sdkconfig.defaults rename to firmware/sdkconfig.defaults diff --git a/sdkconfig.defaults.esp32 b/firmware/sdkconfig.defaults.esp32 similarity index 100% rename from sdkconfig.defaults.esp32 rename to firmware/sdkconfig.defaults.esp32 diff --git a/sdkconfig.defaults.esp32c3 b/firmware/sdkconfig.defaults.esp32c3 similarity index 100% rename from sdkconfig.defaults.esp32c3 rename to firmware/sdkconfig.defaults.esp32c3 diff --git a/sdkconfig.defaults.esp32c5 b/firmware/sdkconfig.defaults.esp32c5 similarity index 100% rename from sdkconfig.defaults.esp32c5 rename to firmware/sdkconfig.defaults.esp32c5 diff --git a/sdkconfig.defaults.esp32c6 b/firmware/sdkconfig.defaults.esp32c6 similarity index 100% rename from sdkconfig.defaults.esp32c6 rename to firmware/sdkconfig.defaults.esp32c6 diff --git a/sdkconfig.defaults.esp32h2 b/firmware/sdkconfig.defaults.esp32h2 similarity index 100% rename from sdkconfig.defaults.esp32h2 rename to firmware/sdkconfig.defaults.esp32h2 diff --git a/sdkconfig.defaults.esp32p4 b/firmware/sdkconfig.defaults.esp32p4 similarity index 100% rename from sdkconfig.defaults.esp32p4 rename to firmware/sdkconfig.defaults.esp32p4 diff --git a/sdkconfig.defaults.esp32s3 b/firmware/sdkconfig.defaults.esp32s3 similarity index 100% rename from sdkconfig.defaults.esp32s3 rename to firmware/sdkconfig.defaults.esp32s3 diff --git a/sdkconfig.release b/firmware/sdkconfig.release similarity index 100% rename from sdkconfig.release rename to firmware/sdkconfig.release diff --git a/version.txt b/firmware/version.txt similarity index 100% rename from version.txt rename to firmware/version.txt