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

Compare commits

base: Barback:0a42bafaedcc343ff9909f90fb2a6a9e9f41bda7
Branches Tags
Barback:development
Barback:vienna_wtf
Barback:config
Barback:v0.0.0.0.0.1
..
compare: Barback:368dd37e67d5ecf194f950f42ab8861abfb7dfc1
Branches Tags
Barback:development
Barback:vienna_wtf
Barback:config
Barback:v0.0.0.0.0.1

No commits in common. "0a42bafaedcc343ff9909f90fb2a6a9e9f41bda7" and "368dd37e67d5ecf194f950f42ab8861abfb7dfc1" have entirely different histories.
0a42bafaed ... 368dd37e67

3 changed files with 10 additions and 10 deletions
Show stats Expand all files Collapse all files

2
components/BAROS32

@ -1 +1 @@
Subproject commit f7cd159a1df5cc2732444072819e55bacf1887ca Subproject commit a57221785078515bcd64f93df1d85099d51c1814

2
components/configulator

@ -1 +1 @@
Subproject commit 2e690a786443773b4bfddd9e631e04293c947c17 Subproject commit 31da8a4edee54d0049b09bc7f5932df9e23b792f

16
main/main.c
View file

@ -81,7 +81,7 @@ void app_main(void) {
ESP_LOGI(TAG, "MAC: [%02X:%02X:%02X:%02X:%02X:%02X]", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); ESP_LOGI(TAG, "MAC: [%02X:%02X:%02X:%02X:%02X:%02X]", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
char *name = malloc(BAROS_NAME_MAX_LEN); char *name = malloc(32);
sprintf(name, "%s-%02X", TAG, mac[5]); sprintf(name, "%s-%02X", TAG, mac[5]);
ESP_LOGI(TAG, "name: %p", name); ESP_LOGI(TAG, "name: %p", name);
@ -93,20 +93,20 @@ void app_main(void) {
.namespace = "configulator", .namespace = "configulator",
.backend = CFGLR_BACKEND_NVS(), .backend = CFGLR_BACKEND_NVS(),
.elements = { .elements = {
CFGLR_ELEMENT_U8("armed", NULL, 1, CFGLR_SIGNALER_IDF_EVENT()), CFGLR_ELEMENT_U8("armed", 1, CFGLR_SIGNALER_IDF_EVENT()),
CFGLR_ELEMENT_U8("monitor", NULL, 0, CFGLR_SIGNALER_IDF_EVENT()), CFGLR_ELEMENT_U8("monitor", 0, CFGLR_SIGNALER_IDF_EVENT()),
CFGLR_ELEMENT_U8("pour_button", NULL, 19, CFGLR_SIGNALER_IDF_EVENT()), CFGLR_ELEMENT_U8("pour_button", 19, CFGLR_SIGNALER_IDF_EVENT()),
CFGLR_ELEMENT_STR( CFGLR_ELEMENT_STR(
"device_name", "device_name",
name, name,
BAROS_NAME_MAX_LEN, 32,
name, name,
CFGLR_SIGNALER_IDF_EVENT(), CFGLR_SIGNALER_IDF_EVENT(),
CFGLR_SIGNALER_CALLBACK(test_callback) CFGLR_SIGNALER_CALLBACK(test_callback)
), ),
CFGLR_ELEMENT_BIN("tank_levels", NULL, 4, tank_levels, 4, CFGLR_SIGNALER_IDF_EVENT()), CFGLR_ELEMENT_BIN("tank_levels", 4, tank_levels, 4, CFGLR_SIGNALER_IDF_EVENT()),
CFGLR_ELEMENT_BIN("pump_pins", NULL, 4, pump_gpio_map, 4, CFGLR_SIGNALER_IDF_EVENT()), CFGLR_ELEMENT_BIN("pump_pins", 4, pump_gpio_map, 4, CFGLR_SIGNALER_IDF_EVENT()),
CFGLR_ELEMENT_BIN("pump_ramp_ms", NULL, sizeof(uint16_t) * 4, pump_ramp_ms, sizeof(uint16_t) * 4, CFGLR_SIGNALER_IDF_EVENT()), CFGLR_ELEMENT_BIN("pump_ramp_ms", sizeof(uint16_t) * 4, pump_ramp_ms, sizeof(uint16_t) * 4, CFGLR_SIGNALER_IDF_EVENT()),
{ NULL }, { NULL },
}, },
}; };