Barback/barback32
2
0
Fork 0
Code Issues 2 Pull requests Projects Releases 1 Wiki Activity

Compare commits

base: Barback:1e8e5457139c4e41d942ecc3a4b9043998ae65ce
Branches Tags
Barback:development
Barback:config
Barback:v0.0.0.0.0.1
..
compare: Barback:30ae25fa043e0a3f0c519f9cd761ac33c647efae
Branches Tags
Barback:development
Barback:config
Barback:v0.0.0.0.0.1

No commits in common. "1e8e5457139c4e41d942ecc3a4b9043998ae65ce" and "30ae25fa043e0a3f0c519f9cd761ac33c647efae" have entirely different histories.
1e8e545713 ... 30ae25fa04

4 changed files with 4 additions and 24 deletions
Show stats Expand all files Collapse all files

6
.gitmodules vendored
View file

@ -1,6 +1,6 @@
[submodule "components/configulator"] [submodule "components/idf-dfplayermini"]
path = components/configulator path = components/idf-dfplayermini
url = https://git.oit.cloud/morgan/configulator url = https://git.oit.cloud/morgan/idf-dfplayermini.git
[submodule "esp-idf"] [submodule "esp-idf"]
path = esp-idf path = esp-idf
url = https://github.com/espressif/esp-idf url = https://github.com/espressif/esp-idf

1
components/configulator

@ -1 +0,0 @@
Subproject commit c9c691ab7e7d2f6945c49a7327652df401905361

2
main/CMakeLists.txt
View file

@ -6,6 +6,6 @@ set(COMPONENT_SRCS "\
user_button.c\ user_button.c\
") ")
set(COMPONENT_ADD_INCLUDEDIRS ". ../include") set(COMPONENT_ADD_INCLUDEDIRS ". ../include")
set(REQUIRES configulato BAROS32) set(REQUIRES BAROS32)
register_component() register_component()

19
main/main.c
View file

@ -10,7 +10,6 @@
#include "nvs_flash.h" #include "nvs_flash.h"
#include "esp_vfs_dev.h" #include "esp_vfs_dev.h"
#include "configulator.h"
#include "main.h" #include "main.h"
#include "console.h" #include "console.h"
#include "ble.h" #include "ble.h"
@ -45,24 +44,6 @@ void app_main(void) {
char *name = malloc(strlen(TAG) + 4); char *name = malloc(strlen(TAG) + 4);
sprintf(name, "%s-%02X", TAG, mac[5]); sprintf(name, "%s-%02X", TAG, mac[5]);
uint8_t tank_levels[] = { 100, 100, 100, 100 };
cfglr_handle_t cfglr_handle = {
.namespace = "configulator",
.backend = CFGLR_BACKEND_NVS(),
.elements = {
CFGLR_ELEMENT_U8("armed", 1, CFGLR_SIGNALER_IDF_EVENT()),
CFGLR_ELEMENT_U8("monitor", 0, CFGLR_SIGNALER_IDF_EVENT()),
CFGLR_ELEMENT_U8("pour_button", 21, CFGLR_SIGNALER_IDF_EVENT()),
CFGLR_ELEMENT_STR("device_name", 32, name, CFGLR_SIGNALER_IDF_EVENT()),
CFGLR_ELEMENT_BIN("tank_levels", 4, tank_levels, 4, CFGLR_SIGNALER_IDF_EVENT()),
CFGLR_ELEMENT_BIN("pump_pins", 4, pump_gpio_map, 4, CFGLR_SIGNALER_IDF_EVENT()),
{ NULL },
},
};
uint8_t ret = cfglr_init(&cfglr_handle);
vTaskDelay(1000 / portTICK_PERIOD_MS); vTaskDelay(1000 / portTICK_PERIOD_MS);
user_button_init(); user_button_init();