CMakeLists.txt

@@ -1,9 +1,5 @@
 set(REQUIRES "")
-set(SRCS
-    src/configulator.c
-    src/cfglr_signal_callback.c
-    src/element_list.c
-)
+set(SRCS src/configulator.c src/cfglr_signal_callback.c)
 
 if(${ESP_PLATFORM})
   list(APPEND REQUIRES nvs_flash esp_event)

include/cfglr_signaler_idf_event.h

@@ -10,7 +10,7 @@ ESP_EVENT_DECLARE_BASE(CFGLR_EVENT_BASE);
 void cfglr_signaler_idf_init(cfglr_signaler_t *signaler, cfglr_handle_t *handle);
 void cfglr_signaler_idf_dispatch(cfglr_signaler_t *signaler, cfglr_element_t *element, cfglr_signal_e sig);
 
-#define CFGLR_SIGNALER_IDF_EVENT() (cfglr_signaler_t){\
+#define CFGLR_SIGNALER_IDF_EVENT() {\
   .dispatch = &cfglr_signaler_idf_dispatch,\
 }
 

include/configulator.h

@@ -8,11 +8,9 @@
 #define CFGLR_SIGNALERS_MAX (04)
 
 typedef enum {
-  CFGLR_SIGNAL_INIT = 0,
-  CFGLR_SIGNAL_LOADED,
+  CFGLR_SIGNAL_LOADED = 0,
   CFGLR_SIGNAL_CHANGE,
   CFGLR_SIGNAL_DELETE,
-  CFGLR_SIGNAL_FAILED,
 } cfglr_signal_e;
 
 typedef enum {
@@ -30,10 +28,9 @@ typedef enum {
 
 #define CFGLR_DATATYPE_COUNT (uint8_t)(CFGLR_DATATYPE_BIN - CFGLR_DATATYPE_U8)
 
-typedef struct cfglr_config cfglr_config_t;
-typedef struct cfglr_element cfglr_element_t;
-typedef struct cfglr_handle cfglr_handle_t;
 typedef struct cfglr_signaler cfglr_signaler_t;
+typedef struct cfglr_handle_struct cfglr_handle_t;
+typedef struct cfglr_element cfglr_element_t;
 
 typedef void (*cfglr_signaler_init_t)(cfglr_signaler_t *signaler, cfglr_element_t *element, cfglr_handle_t *handle);
 typedef void (*cfglr_signaler_dispatch_t)(cfglr_signaler_t *signaler, cfglr_element_t *element, cfglr_signal_e sig);
@@ -121,24 +118,16 @@ struct cfglr_backend {
   .set = SET,\
 }
 
-struct cfglr_config {
+struct cfglr_handle_struct {
   const char *namespace;
+  // TODO cleanup, what is store_default for?
+  uint8_t store_default;
   uint8_t backend_count;
   uint8_t element_count;
   cfglr_backend_t backend;
   cfglr_element_t elements[CFGLR_ELEMENTS_MAX];
 };
 
-
-struct cfglr_handle {
-  const char *namespace;
-  uint8_t backend_count;
-  uint8_t element_count;
-  cfglr_backend_t backend;
-  cfglr_element_t elements[CFGLR_ELEMENTS_MAX];
-  void *extra;
-};
-
 extern cfglr_handle_t *configulator;
 
 uint8_t cfglr_init(cfglr_handle_t *handle);

src/configulator.c

@@ -1,32 +1,11 @@
 #include "string.h"
 #include "configulator.h"
 #include "cfglr_log.h"
-#include "element_list.h"
 
 #define TAG "CFGLR"
 
 cfglr_handle_t *configulator;
 
-element_list_node_t *cfglr_element_list_add(cfglr_handle_t *handle, cfglr_element_t *element) {
-  element_list_node_t *node = malloc(sizeof(element_list_node_t));
-  bzero(node, sizeof(element_list_node_t));
-
-  node->element = element;
-
-  // initiaze the first node
-  // it is only first/last
-  if(handle->extra == NULL) {
-    handle->extra = node;
-
-    node->first = node;
-    node->last = node;
-
-    return node;
-  }
-
-  return element_list_add(handle->extra, node);
-}
-
 uint8_t cfglr_add_element(cfglr_handle_t *handle, cfglr_element_t *element) {
   cfglr_signaler_t *signaler;
 
@@ -34,14 +13,13 @@ uint8_t cfglr_add_element(cfglr_handle_t *handle, cfglr_element_t *element) {
   CFGLR_LOGI(TAG, "size: %d", element->datatype_size);
 
   element->handle = handle;
-
   if(element->data == NULL) {
     element->data = (void*)malloc(element->datatype_size);
     bzero(element->data, 0);
     CFGLR_LOGD(TAG, "malloc: %d @ %p", element->datatype_size, element->data);
   }
 
-  CFGLR_LOGD(TAG, "Initializing %d Signalers", element->signaler_count);
+  //CFGLR_LOGI(TAG, "element->data: %p", element->data);
 
   while((signaler = &element->signalers[element->signaler_count])) {
     if(signaler->init == NULL && signaler->dispatch == NULL) break;
@@ -53,26 +31,24 @@ uint8_t cfglr_add_element(cfglr_handle_t *handle, cfglr_element_t *element) {
     element->signaler_count++;
   }
 
-  cfglr_signal_e signal;
+  bool dispatch = false;
 
   if(handle->backend.get(&handle->backend, element, handle) == 0) {
-    signal = CFGLR_SIGNAL_LOADED;
+    dispatch = true;
   } else {
     CFGLR_LOGI(TAG, "failed to load %s, setting default", element->key);
 
     memcpy((void*)&element->data, (void*)&element->default_data, element->default_size);
-    signal = CFGLR_SIGNAL_INIT;
-
-    if(handle->backend.set(&handle->backend, element, handle) != 0) {
-      signal = CFGLR_SIGNAL_FAILED;
+    if(handle->backend.set(&handle->backend, element, handle) == 0) {
+      dispatch = true;
     }
   }
 
+  if(dispatch) {
     for(uint8_t i = 0; i < element->signaler_count; i++) {
-    element->signalers[i].dispatch(&element->signalers[i], element, signal);
+      element->signalers[i].dispatch(&element->signalers[i], element, CFGLR_SIGNAL_LOADED);
+    }
   }
-
-  cfglr_element_list_add(handle, element);
 
   return ++handle->element_count;
 }
@@ -112,7 +88,7 @@ uint16_t cfglr_commit(cfglr_element_t *element) {
 uint16_t cfglr_commit_data(cfglr_backend_t *backend, cfglr_element_t *element, cfglr_handle_t *handle) {
   uint16_t ret = backend->set(backend, element, handle);
 
-  CFGLR_LOGI(TAG, "commit: %s->%s", handle->namespace, element->key);
+  CFGLR_LOGI(TAG, "%s = %d (ret %d) %p", element->key, (uint8_t)&element->data, ret, element->data);
 
   if(ret == 0) {
     for(uint8_t i = 0; i < element->signaler_count; i++) {
@@ -125,17 +101,13 @@ uint16_t cfglr_commit_data(cfglr_backend_t *backend, cfglr_element_t *element, c
 
 cfglr_element_t * cfglr_get_element(cfglr_handle_t *handle, const char *name) {
   cfglr_element_t *element;
-  element_list_node_t *node = handle->extra;
-  node = node->first;
 
-  while(node) {
-    element = node->element;
+  uint8_t i = 0;
+  for(; i < handle->element_count; i++) {
+    element = &handle->elements[i];
 
     CFGLR_LOGI(TAG, "element: %s @ %p", element->key, element);
-
     if(strcmp(element->key, name) == 0) return element;
-
-    node = node->next;
   }
 
   return NULL;