From f955848721476b8c0814e7cd8b6974587739cbe3 Mon Sep 17 00:00:00 2001 From: Peter Siegmund Date: Tue, 7 May 2024 12:15:58 +0200 Subject: [PATCH] changed folder structure used advices from https://docs.espressif.com/projects/esp-idf/en/v5.2.1/esp32/api-guides/build-system.html Signed-off-by: Peter Siegmund --- CMakeLists.txt | 2 ++ components/ble/CMakeLists.txt | 3 +++ components/ble/osr_ble.c | 20 ++++++++++++++++++++ components/ble/osr_ble.h | 3 +++ main/main.c | 15 ++------------- 5 files changed, 30 insertions(+), 13 deletions(-) create mode 100644 components/ble/CMakeLists.txt create mode 100644 components/ble/osr_ble.c create mode 100644 components/ble/osr_ble.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 304ebeb..6770713 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,3 +6,5 @@ cmake_minimum_required(VERSION 3.16) include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(firmware_thomas_the_tank_engine) + +# idf_build_set_property(COMPILE_OPTIONS "-Wno-error" APPEND) diff --git a/components/ble/CMakeLists.txt b/components/ble/CMakeLists.txt new file mode 100644 index 0000000..db4ce1e --- /dev/null +++ b/components/ble/CMakeLists.txt @@ -0,0 +1,3 @@ +idf_component_register(SRCS "osr_ble.c" + INCLUDE_DIRS "." + REQUIRES "nvs_flash") diff --git a/components/ble/osr_ble.c b/components/ble/osr_ble.c new file mode 100644 index 0000000..038201a --- /dev/null +++ b/components/ble/osr_ble.c @@ -0,0 +1,20 @@ +#include "osr_ble.h" + +#include +#include + +void nvs_init() +{ + esp_err_t ret = nvs_flash_init(); + if (ret == ESP_ERR_NVS_NO_FREE_PAGES || ret == ESP_ERR_NVS_NEW_VERSION_FOUND) + { + ESP_ERROR_CHECK(nvs_flash_erase()); + ret = nvs_flash_init(); + } + ESP_ERROR_CHECK(ret); +} + +void osr_ble_init() +{ + nvs_init(); +} diff --git a/components/ble/osr_ble.h b/components/ble/osr_ble.h new file mode 100644 index 0000000..6d61d3e --- /dev/null +++ b/components/ble/osr_ble.h @@ -0,0 +1,3 @@ +#pragma once + +void osr_ble_init(); diff --git a/main/main.c b/main/main.c index d262807..0861013 100644 --- a/main/main.c +++ b/main/main.c @@ -1,22 +1,11 @@ #include #include -#include -#include -void nvs_init() -{ - esp_err_t ret = nvs_flash_init(); - if (ret == ESP_ERR_NVS_NO_FREE_PAGES || ret == ESP_ERR_NVS_NEW_VERSION_FOUND) - { - ESP_ERROR_CHECK(nvs_flash_erase()); - ret = nvs_flash_init(); - } - ESP_ERROR_CHECK(ret); -} +#include "osr_ble.h" void setup() { - nvs_init(); + osr_ble_init(); } void loop()