update deps

debouncing could be better

.drone.yml

@@ -0,0 +1,21 @@
+kind: pipeline
+type: docker
+name: default
+
+steps:
+  - name: build
+    image: espressif/idf:release-v4.1
+    commands:
+      - mkdir ~/.ssh
+      - ssh-keyscan -t rsa git.oit.cloud >> ~/.ssh/known_hosts
+      - git submodule update --init
+      - if [ -f sdkconfig ]; then
+      -   rm sdkconfig
+      - fi
+      - ls
+      - . /opt/esp/idf/export.sh
+      - idf.py reconfigure
+      - echo "BB-CI-$((1 + RANDOM % 999))" > bbid
+      - sed -i -e s/BARBACK_ID=\"Barback\"/BARBACK_ID=\"`cat bbid`\"/ sdkconfig
+      - idf.py reconfigure
+      - idf.py build

.gitmodules

@@ -1,3 +1,9 @@
-[submodule "components/esp32-lora"]
+[submodule "components/configulator"]
-	path = components/esp32-lora
+	path = components/configulator
-	url = https://gitlab.com/morganrallen/esp32-lora.git
+	url = https://git.oit.cloud/morgan/configulator
+[submodule "esp-idf"]
+	path = esp-idf
+	url = https://github.com/espressif/esp-idf
+[submodule "components/BAROS32"]
+	path = components/BAROS32
+	url = https://git.oit.cloud/Barback/BAROS32.git

.woodpecker.yml

@@ -0,0 +1,27 @@
+steps:
+  build:
+    image: espressif/idf:v5.5.5
+    when:
+      - event: [ tag, push, manual ]
+    commands:
+      - git submodule update --init
+      - if [ -f sdkconfig ]; then
+      -   rm sdkconfig
+      - fi
+      - . /opt/esp/idf/export.sh
+      - idf.py reconfigure
+      - idf.py build
+  release:
+    image: woodpeckerci/plugin-release
+    when:
+      - event: tag
+    settings:
+      log_level: debug
+      title: 'Release ${CI_COMMIT_TAG}'
+      files:
+        - 'build/barback.bin'
+      api_key:
+        from_secret: ACCESS_TOKEN
+      generate_release_notes: true
+      overwrite: true
+      upload-url: https://git.oit.cloud/repos/${CI_REPO}/releases

CMakeLists.txt

@@ -3,4 +3,5 @@
 cmake_minimum_required(VERSION 3.5)
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+
 project(barback)

components/BAROS32

@@ -0,0 +1 @@
+Subproject commit 6467f21fcaf29cc8eb11d9e899a53f73acb13651

components/configulator

@@ -0,0 +1 @@
+Subproject commit 2e690a786443773b4bfddd9e631e04293c947c17

dependencies.lock

@@ -0,0 +1,118 @@
+dependencies:
+  espressif/ble_conn_mgr:
+    component_hash: 4edfb961659fb1eec522acca3fa8826e04a7090f29021a354b92f33a86141cc9
+    dependencies:
+    - name: espressif/cmake_utilities
+      registry_url: https://components.espressif.com
+      require: private
+      version: 0.*
+    - name: idf
+      require: private
+      version: '>=4.3'
+    source:
+      registry_url: https://components.espressif.com/
+      type: service
+    version: 1.2.0
+  espressif/ble_ota:
+    component_hash: 1415ffdf0ff3169d52b668f5da8c3dd60932938f07a28c54ffbc0e8901dbf7ba
+    dependencies:
+    - name: espressif/cmake_utilities
+      registry_url: https://components.espressif.com
+      require: private
+      version: 0.*
+    - name: espressif/esp_encrypted_img
+      registry_url: https://components.espressif.com
+      require: private
+      version: ^2.0.1
+    - name: idf
+      require: private
+      version: '>=4.4'
+    source:
+      registry_url: https://components.espressif.com/
+      type: service
+    targets:
+    - esp32
+    - esp32c3
+    - esp32h2
+    - esp32s3
+    - esp32c2
+    - esp32c6
+    version: 0.1.16
+  espressif/ble_services:
+    component_hash: 1ec69e3bbb886d29ad2bec6c9db63c52784117a15d1a74ac07097f546b1822f3
+    dependencies: []
+    source:
+      registry_url: https://components.espressif.com/
+      type: service
+    version: 1.4.0~1
+  espressif/cmake_utilities:
+    component_hash: 351350613ceafba240b761b4ea991e0f231ac7a9f59a9ee901f751bddc0bb18f
+    dependencies:
+    - name: idf
+      require: private
+      version: '>=4.1'
+    source:
+      registry_url: https://components.espressif.com
+      type: service
+    version: 0.5.3
+  espressif/esp_delta_ota:
+    component_hash: 147161b602ef51e9f6649eb6d90c4d4ac3c94228cb264fa0e68be7877180462d
+    dependencies:
+    - name: idf
+      require: private
+      version: '>=4.3'
+    source:
+      registry_url: https://components.espressif.com/
+      type: service
+    version: 1.1.4
+  espressif/esp_encrypted_img:
+    component_hash: c04b8f14c45a836b4f9f8dc6e7767a5adc034f00492354423053e042c5aeb342
+    dependencies:
+    - name: espressif/esp_secure_cert_mgr
+      registry_url: https://components.espressif.com
+      require: private
+      rules:
+      - if: idf_version >= 5.3
+      version: '>=2.5.1'
+    - name: idf
+      require: private
+      version: '>=5.0'
+    source:
+      registry_url: https://components.espressif.com/
+      type: service
+    version: 2.7.1
+  espressif/esp_secure_cert_mgr:
+    component_hash: 0b83e150f48d6839f0a0a8753850be55a51cc298cfca7658f21d355d5f41dd67
+    dependencies:
+    - name: idf
+      require: private
+      version: '>=4.3'
+    source:
+      registry_url: https://components.espressif.com
+      type: service
+    version: 2.9.3
+  espressif/led_strip:
+    component_hash: 28621486f77229aaf81c71f5e15d6fbf36c2949cf11094e07090593e659e7639
+    dependencies:
+    - name: idf
+      require: private
+      version: '>=5.0'
+    source:
+      registry_url: https://components.espressif.com/
+      type: service
+    version: 3.0.3
+  idf:
+    source:
+      type: idf
+    version: 5.5.5
+direct_dependencies:
+- espressif/ble_conn_mgr
+- espressif/ble_ota
+- espressif/ble_services
+- espressif/esp_delta_ota
+- espressif/esp_encrypted_img
+- espressif/led_strip
+- idf
+manifest_hash: 1cb97a3caa49761f939cab42584ada31292591aa3d07b9c39eaf5674fabe7ad1
+target: esp32
+version: 2.0.0

esp-idf

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

include/barback.h

@@ -1,9 +1,13 @@
 #ifndef __BARBACK_H__
 #define __BARBACK_H__
 
+#include "configulator.h"
+
 typedef uint8_t (*barback_ble_access_read_t)(uint8_t idx);
 typedef uint8_t (*barback_ble_access_write_t)(uint8_t idx, uint8_t value);
 
+extern cfglr_handle_t *configulator;
+
 typedef struct {
   uint16_t base_uuid;
 

include/console.h

@@ -1,5 +0,0 @@
-#ifndef __CONSOLE_H__
-#define __CONSOLE_H__
-void console_task(void *args);
-void console_init();
-#endif

include/main.h

@@ -1,12 +1,14 @@
 #ifndef __MAIN_H_
 #define __MAIN_H_
 
+#include "freertos/FreeRTOS.h"
+#include "freertos/queue.h"
 #include "nvs_flash.h"
 
 #define PUMP_COUNT		(4)
 
-static xQueueHandle gpio_evt_queue = NULL;
+static QueueHandle_t gpio_evt_queue = NULL;
-nvs_handle_t config_handle;
+extern nvs_handle_t config_handle;
 
 extern uint8_t mac[6];
 

include/pumps.h

@@ -7,10 +7,12 @@
 #define PUMPS_ERR_OUT_IDX   (1)
 #define GPIO_PUMP_PIN_SEL   ((1ULL<<pump_gpio_map[0]) | (1ULL<<pump_gpio_map[1]) |  (1ULL<<pump_gpio_map[2]) | (1ULL<<pump_gpio_map[3]));
 
-static uint8_t pump_gpio_map[] = { 27, 26, 25, 33 };
+static uint8_t pump_gpio_map[] = { 12, 13, 2, 4 };
+extern uint8_t running;
 
 void pumps_run();
 void pumps_stop();
+uint8_t pumps_io_init();
 uint8_t pumps_init();
 
 uint8_t pumps_set_duration(uint8_t idx, uint8_t time);
@@ -19,6 +21,6 @@ uint8_t pumps_get_duration(uint8_t idx);
 uint8_t pumps_set_enabled(uint8_t idx, uint8_t value);
 uint8_t pumps_get_enabled(uint8_t idx);
 
-uint8_t pumps_get_state(uint8_t idx);
+uint8_t pumps_get_running(uint8_t idx);
 
 #endif

main/CMakeLists.txt

@@ -1,10 +1,9 @@
 set(COMPONENT_SRCS "\
   main.c\
-  ble.c\
-  console.c\
   pumps.c\
   user_button.c\
 ")
 set(COMPONENT_ADD_INCLUDEDIRS ". ../include")
+set(REQUIRES configulato BAROS32)
 
 register_component()

main/ble.c

@@ -16,6 +16,7 @@
 #include "driver/gpio.h"
 
 #include "barback.h"
+#include "baros.h"
 #include "main.h"
 #include "ble.h"
 #include "pumps.h"
@@ -46,21 +47,13 @@ static int svc_access_system(uint16_t conn_handle, uint16_t attr_handle, struct
 
 static int barback_ble_char_access(uint16_t conn_handle, uint16_t attr_handle, struct ble_gatt_access_ctxt *ctxt, void *arg);
 
-#define BLE_SERVICE_PUMP_ENABLED        (0x4200)
-#define BLE_SERVICE_PUMP_STATE          (0x4300)
-#define BLE_SERVICE_PUMP_DURATION       (0x4350)
-
-#define BLE_SERVICE_BARBACK             (0x4400)
-#define CHAR_POUR                       (BLE_SERVICE_BARBACK + 1)
-#define CHAR_BUTTON                     (BLE_SERVICE_BARBACK + 2)
-
 static barback_ble_access_t barback_ble_pump_access_enabled = {
   .read = pumps_get_enabled,
   .write = pumps_set_enabled
 };
 
 #define BLE_CHAR_PUMP_ENABLED(idx) {\
-  .uuid = BLE_UUID16_DECLARE(BLE_SERVICE_PUMP_ENABLED + idx),\
+  .uuid = BLE_UUID16_DECLARE(BAROS_BLE_SERVICE_PUMP_ENABLED + idx),\
   .access_cb = barback_ble_char_access,\
   .arg = &barback_ble_pump_access_enabled,\
   .val_handle = &ble_svc_handle,\
@@ -68,11 +61,11 @@ static barback_ble_access_t barback_ble_pump_access_enabled = {
 }
 
 static barback_ble_access_t barback_ble_pump_access_state = {
-  .read = pumps_get_state,
+  .read = pumps_get_running,
 };
 
 #define BLE_CHAR_PUMP_STATE(idx) {\
-  .uuid = BLE_UUID16_DECLARE(BLE_SERVICE_PUMP_STATE + idx),\
+  .uuid = BLE_UUID16_DECLARE(BAROS_BLE_SERVICE_PUMP_STATE + idx),\
   .access_cb = barback_ble_char_access,\
   .arg = &barback_ble_pump_access_state,\
   .val_handle = &ble_svc_handle,\
@@ -85,7 +78,7 @@ static barback_ble_access_t barback_ble_pump_access_duration = {
 };
 
 #define BLE_CHAR_PUMP_DURATION(idx) {\
-  .uuid = BLE_UUID16_DECLARE(BLE_SERVICE_PUMP_DURATION + idx),\
+  .uuid = BLE_UUID16_DECLARE(BAROS_BLE_SERVICE_PUMP_DURATION + idx),\
   .access_cb = barback_ble_char_access,\
   .arg = &barback_ble_pump_access_duration,\
   .val_handle = &pump_duration_svc_val_handles[idx - 1],\
@@ -95,7 +88,7 @@ static barback_ble_access_t barback_ble_pump_access_duration = {
 static const struct ble_gatt_svc_def service_defs[] = {
   {
     .type = BLE_GATT_SVC_TYPE_PRIMARY,
-    .uuid = BLE_UUID16_DECLARE(BLE_SERVICE_PUMP_ENABLED),
+    .uuid = BLE_UUID16_DECLARE(BAROS_BLE_SERVICE_PUMP_ENABLED),
 
     .characteristics = (struct ble_gatt_chr_def[]) {
       BLE_CHAR_PUMP_ENABLED(1),
@@ -106,7 +99,7 @@ static const struct ble_gatt_svc_def service_defs[] = {
     },
   }, {
     .type = BLE_GATT_SVC_TYPE_PRIMARY,
-    .uuid = BLE_UUID16_DECLARE(BLE_SERVICE_PUMP_STATE),
+    .uuid = BLE_UUID16_DECLARE(BAROS_BLE_SERVICE_PUMP_STATE),
     .characteristics = (struct ble_gatt_chr_def[]) {
       BLE_CHAR_PUMP_STATE(1),
       BLE_CHAR_PUMP_STATE(2),
@@ -116,7 +109,7 @@ static const struct ble_gatt_svc_def service_defs[] = {
     },
   }, {
     .type = BLE_GATT_SVC_TYPE_PRIMARY,
-      .uuid = BLE_UUID16_DECLARE(BLE_SERVICE_PUMP_DURATION),
+      .uuid = BLE_UUID16_DECLARE(BAROS_BLE_SERVICE_PUMP_DURATION),
       .characteristics = (struct ble_gatt_chr_def[]) {
         BLE_CHAR_PUMP_DURATION(1),
         BLE_CHAR_PUMP_DURATION(2),
@@ -126,27 +119,26 @@ static const struct ble_gatt_svc_def service_defs[] = {
       },
   }, {
     .type = BLE_GATT_SVC_TYPE_PRIMARY,
-      .uuid = BLE_UUID16_DECLARE(BLE_SERVICE_BARBACK),
+      .uuid = BLE_UUID16_DECLARE(BAROS_BLE_SERVICE_BARBACK),
       .characteristics = (struct ble_gatt_chr_def[]) {
         {
-          .uuid = BLE_UUID16_DECLARE(CHAR_POUR),
+          .uuid = BLE_UUID16_DECLARE(BAROS_CHAR_POUR),
           .access_cb = svc_access_system,
           .val_handle = &ble_svc_handle,
           .flags = BLE_GATT_CHR_F_WRITE | BLE_GATT_CHR_F_READ
         }, {
-          .uuid = BLE_UUID16_DECLARE(CHAR_BUTTON),
+          .uuid = BLE_UUID16_DECLARE(BAROS_CHAR_BUTTON),
           .access_cb = svc_access_system,
           .val_handle = &svc_handle_button,
           .flags = BLE_GATT_CHR_F_READ | BLE_GATT_CHR_F_NOTIFY
         },
-          { 0 }
+        { 0 }
       }
   },
   { 0 } // no more services
 };
 
-static int gatt_svr_chr_write(struct os_mbuf *om, uint16_t min_len, uint16_t max_len,
+static int gatt_svr_chr_write(struct os_mbuf *om, uint16_t min_len, uint16_t max_len, void *dst, uint16_t *len) {
-    void *dst, uint16_t *len) {
   uint16_t om_len;
   int rc;
 
@@ -166,6 +158,7 @@ static int gatt_svr_chr_write(struct os_mbuf *om, uint16_t min_len, uint16_t max
 static int svc_access_system(uint16_t conn_handle, uint16_t attr_handle, struct ble_gatt_access_ctxt *ctxt, void *arg) {
   uint16_t uuid16 = ble_uuid_u16(ctxt->chr->uuid);
   uint8_t value = 0;
+  uint16_t vlen = 0;
 
   ESP_LOGI(TAG, "0x%02X access: %d", uuid16, ctxt->op);
 
@@ -175,20 +168,23 @@ static int svc_access_system(uint16_t conn_handle, uint16_t attr_handle, struct
         ctxt->om,
         sizeof value,
         sizeof value,
-        &value, NULL
+        &value, &vlen
         );
 
+    ESP_LOGI(TAG, "value (%d): %d", vlen, value);
+
     switch(uuid16) {
-      case CHAR_POUR:
+      case BAROS_CHAR_POUR:
         if(value == 1) {
-          ESP_LOGI(TAG, "starting pump");
+          ESP_LOGI(TAG, "starting pumps");
           pumps_run();
         } else {
+          ESP_LOGI(TAG, "stoping pumps");
           pumps_stop();
         }
         break;
 
-      case CHAR_BUTTON:
+      case BAROS_CHAR_BUTTON:
         break;
     }
   }
@@ -197,13 +193,15 @@ static int svc_access_system(uint16_t conn_handle, uint16_t attr_handle, struct
 }
 
 static int barback_ble_char_access(uint16_t conn_handle, uint16_t attr_handle, struct ble_gatt_access_ctxt *ctxt, void *arg) {
-  uint16_t uuid16 = ble_uuid_u16(ctxt->chr->uuid);
+  uint16_t chr_uuid = ble_uuid_u16(ctxt->chr->uuid);
-  uint8_t idx = uuid16 - (BLE_SERVICE_PUMP_ENABLED + 1);
+
+  // match the UUID against 0b111
+  uint8_t idx = (chr_uuid & 0x07) - 1;
   uint8_t value = 0;
 
   barback_ble_access_t *access = (barback_ble_access_t *)arg;
 
-  ESP_LOGI(TAG, "conn_handle: %d	attr_handle: %d	char: 0x%02X	op: %s", conn_handle, attr_handle, uuid16, (ctxt->op == 0 ? "read" : ctxt->op == 1 ? "write" : "unknown"));
+  ESP_LOGI(TAG, "conn_handle: %d	attr_handle: %d	char: 0x%02X	op: %s", conn_handle, attr_handle, chr_uuid, (ctxt->op == 0 ? "read" : ctxt->op == 1 ? "write" : "unknown"));
 
   if(ctxt->op == BLE_GATT_ACCESS_OP_WRITE_CHR) {
     gatt_svr_chr_write(
@@ -215,24 +213,35 @@ static int barback_ble_char_access(uint16_t conn_handle, uint16_t attr_handle, s
 
     struct ble_gap_conn_desc notifiee;
 
+    // TODO
+    // this could needs to be verified, it might actually be needed
+    // NiBLE could be passing notifications itself on chr_handler changes
     for (uint16_t i = 0; i < CONFIG_NIMBLE_MAX_CONNECTIONS; i++) {
       if(ble_gap_conn_find(i, &notifiee) == ESP_OK) {
         ble_gattc_notify_custom(i, attr_handle, ctxt->om);
       }
     }
 
-    if(access->write != NULL)
+    if(access == NULL) {
+      ESP_LOGI(TAG, "no read/write functions defined");
+      return 0;
+    }
+
+    if(access->write != NULL) {
+      ESP_LOGI(TAG, "calling BLE write function: %d %d", idx, value);
+
       access->write(idx, value);
-  } else if(ctxt->op == BLE_GATT_ACCESS_OP_READ_CHR) {
+    }
-    if(access->read != NULL) {
+  } else if(access != NULL && ctxt->op == BLE_GATT_ACCESS_OP_READ_CHR) {
+    if(access->read == NULL) {
       ESP_LOGW(TAG, "Attempted read without defining access.read");
       return 1;
     }
 
-    uint8_t enabled = access->read(idx);
+    uint8_t value = access->read(idx);
 
-    ESP_LOGI(TAG, "pumps_enabled[%d] = %d", idx, enabled);
+    ESP_LOGI(TAG, "returning read idx: %d value: %d", idx, value);
-    os_mbuf_append(ctxt->om, &enabled, sizeof enabled);
+    os_mbuf_append(ctxt->om, &value, sizeof value);
   }
 
   return 0;
@@ -376,6 +385,14 @@ static int ble_gap_event(struct ble_gap_event *event, void *arg) {
           event->mtu.value);
       break;
 
+    case BLE_GAP_EVENT_NOTIFY_RX:
+      ESP_LOGI(TAG, "BLE_GAP_EVENT_NOTIFY_RX; conn_handle=%d mtu=%d attr_handle=%d\n",
+          event->mtu.conn_handle,
+          event->mtu.value,
+          event->notify_rx.attr_handle);
+
+      break;
+
     case BLE_GAP_EVENT_NOTIFY_TX:
       ESP_LOGI(TAG, "BLE_GAP_EVENT_NOTIFY_TX; conn_handle=%d mtu=%d\n",
           event->mtu.conn_handle,
@@ -444,7 +461,7 @@ void ble_init(char *name) {
 
   memset(&callback_handlers, 0, sizeof(event_callback_handle_t) * CONFIG_CACO_MAX_SERVICES);
 
-  ESP_ERROR_CHECK(esp_nimble_hci_and_controller_init());
+  //ESP_ERROR_CHECK(esp_nimble_hci_and_controller_init());
 
   nimble_port_init();
 

main/console.c

@@ -1,81 +0,0 @@
-#include <stdio.h>
-#include <string.h>
-
-#include "esp_system.h"
-#include "esp_log.h"
-#include "esp_console.h"
-#include "esp_vfs_dev.h"
-#include "driver/uart.h"
-#include "linenoise/linenoise.h"
-#include "argtable3/argtable3.h"
-
-#include "main.h"
-
-// main console setup and task, assume mostly copied from example
-void console_task(void *args) {
-  // disable buffering
-  setvbuf(stdin, NULL, _IONBF, 0);
-
-  // setup line endings
-  esp_vfs_dev_uart_set_rx_line_endings(ESP_LINE_ENDINGS_CR);
-  esp_vfs_dev_uart_set_tx_line_endings(ESP_LINE_ENDINGS_CRLF);
-
-  const uart_config_t uart_config = {
-    .baud_rate = CONFIG_ESP_CONSOLE_UART_BAUDRATE,
-    .data_bits = UART_DATA_8_BITS,
-    .parity = UART_PARITY_DISABLE,
-    .stop_bits = UART_STOP_BITS_1,
-    .use_ref_tick = true
-  };
-
-  ESP_ERROR_CHECK(uart_param_config(CONFIG_ESP_CONSOLE_UART_NUM, &uart_config));
-
-  ESP_ERROR_CHECK(uart_driver_install(CONFIG_ESP_CONSOLE_UART_NUM, 256, 0, 0, NULL, 0));
-
-  esp_vfs_dev_uart_use_driver(CONFIG_ESP_CONSOLE_UART_NUM);
-
-  esp_console_config_t console_config = {
-    .max_cmdline_args = 8,
-    .max_cmdline_length = 256,
-    .hint_color = atoi(LOG_COLOR_CYAN)
-  };
-
-  ESP_ERROR_CHECK(esp_console_init(&console_config));
-
-  linenoiseSetMultiLine(1);
-  linenoiseSetCompletionCallback(&esp_console_get_completion);
-  linenoiseSetHintsCallback((linenoiseHintsCallback*) &esp_console_get_hint);
-  linenoiseHistorySetMaxLen(100);
-
-  esp_console_register_help_command();
-
-  char *prompt;
-
-  while(true) {
-    asprintf(&prompt, LOG_COLOR_I "> " LOG_RESET_COLOR);
-
-    char* line = linenoise(prompt);
-
-    free(prompt);
-
-    if (line == NULL) { /* Ignore empty lines */
-      continue;
-    }
-
-    linenoiseHistoryAdd(line);
-
-    int ret;
-    esp_err_t err = esp_console_run(line, &ret);
-
-    if (err == ESP_ERR_NOT_FOUND) {
-      printf("Unrecognized command\n");
-    } else if (err == ESP_ERR_INVALID_ARG) {
-    } else if (err == ESP_OK && ret != ESP_OK) {
-      printf("Command returned non-zero error code: 0x%x (%s)\n", ret, esp_err_to_name(err));
-    } else if (err != ESP_OK) {
-      printf("Internal error: %s\n", esp_err_to_name(err));
-    }
-
-    linenoiseFree(line);
-  }
-}

main/idf_component.yml

@@ -0,0 +1,21 @@
+## IDF Component Manager Manifest File
+dependencies:
+  ## Required IDF version
+  idf:
+    version: '>=4.1.0'
+  # # Put list of dependencies here
+  # # For components maintained by Espressif:
+  # component: "~1.0.0"
+  # # For 3rd party components:
+  # username/component: ">=1.0.0,<2.0.0"
+  # username2/component2:
+  #   version: "~1.0.0"
+  #   # For transient dependencies `public` flag can be set.
+  #   # `public` flag doesn't have an effect dependencies of the `main` component.
+  #   # All dependencies of `main` are public by default.
+  #   public: true
+  espressif/led_strip: ^3.0.1~1
+  espressif/ble_ota: '>0.1.8'
+  espressif/esp_delta_ota: ^1.1.2
+  espressif/ble_conn_mgr: ^1.1.0
+  espressif/ble_services: =*

main/main.c

@@ -5,21 +5,63 @@
 #include "freertos/queue.h"
 #include "driver/uart.h"
 #include "esp_log.h"
+#include "esp_mac.h"
 #include "esp_debug_helpers.h"
 #include "nvs_flash.h"
 #include "esp_vfs_dev.h"
 
+#include "led_strip.h"
+
+#include "baros.h"
+#include "configulator.h"
+#include "barback.h"
+// TODO main should be merged into barback
 #include "main.h"
-#include "console.h"
-#include "ble.h"
 #include "user_button.h"
 #include "pumps.h"
 
+#define LED_GPIO 14
+#define LED_COUNT 5
+
 static const char *TAG = "BARBACK";
 
 uint8_t mac[6];
+nvs_handle_t config_handle = {};
+led_strip_handle_t led_strip;
+
+void led_init() {
+  led_strip_config_t strip_config = {
+      .strip_gpio_num = LED_GPIO,  // The GPIO that connected to the LED strip's data line
+      .max_leds = LED_COUNT,                 // The number of LEDs in the strip,
+      .led_model = LED_MODEL_WS2812, // LED strip model, it determines the bit timing
+      .color_component_format = LED_STRIP_COLOR_COMPONENT_FMT_GRB, // The color component format is G-R-B
+      .flags = {
+          .invert_out = false, // don't invert the output signal
+      }
+  };
+
+  /// RMT backend specific configuration
+  led_strip_rmt_config_t rmt_config = {
+      .clk_src = RMT_CLK_SRC_DEFAULT,    // different clock source can lead to different power consumption
+      .resolution_hz = 10 * 1000 * 1000, // RMT counter clock frequency: 10MHz
+      .mem_block_symbols = 64,           // the memory size of each RMT channel, in words (4 bytes)
+      .flags = {
+          .with_dma = false, // DMA feature is available on chips like ESP32-S3/P4
+      }
+  };
+
+  /// Create the LED strip object
+  ESP_ERROR_CHECK(led_strip_new_rmt_device(&strip_config, &rmt_config, &led_strip));
+}
+
+void test_callback(cfglr_signaler_t *signaler, cfglr_element_t *element, cfglr_signal_e sig) {
+  CFGLR_LOGI(TAG, "callback %s = '%s'", element->key, element->data);
+}
 
 void app_main(void) {
+  // init pump IO immediately to limit run away pumps in case power is on
+  pumps_io_init();
+
   esp_err_t err = nvs_flash_init();
 
   if (err == ESP_ERR_NVS_NO_FREE_PAGES || err == ESP_ERR_NVS_NEW_VERSION_FOUND) {
@@ -32,23 +74,69 @@ void app_main(void) {
   if (err != ESP_OK) {
     printf("Error (%s) opening NVS handle!\n", esp_err_to_name(err));
   } else {
-    ESP_LOGI(TAG, "config_handle: %d", config_handle);
+    ESP_LOGI(TAG, "config_handle: %d", (int)config_handle);
   }
 
   esp_efuse_mac_get_default((uint8_t*)&mac);
 
   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(strlen(TAG) + 4);
+  char *name = malloc(BAROS_NAME_MAX_LEN);
   sprintf(name, "%s-%02X", TAG, mac[5]);
 
+  ESP_LOGI(TAG, "name: %p", name);
+
+  uint8_t tank_levels[] = { 100, 100, 100, 100 };
+
+  cfglr_handle_t cfglr_handle = {
+    .namespace = "configulator",
+    .backend = CFGLR_BACKEND_NVS(),
+    .elements = {
+      CFGLR_ELEMENT_U8("armed", NULL, 1, CFGLR_SIGNALER_IDF_EVENT()),
+      CFGLR_ELEMENT_U8("monitor", NULL, 0, CFGLR_SIGNALER_IDF_EVENT()),
+      CFGLR_ELEMENT_U8("pour_button", NULL, 19, CFGLR_SIGNALER_IDF_EVENT()),
+      CFGLR_ELEMENT_STR(
+        "device_name",
+        name,
+        BAROS_NAME_MAX_LEN,
+        name,
+        CFGLR_SIGNALER_IDF_EVENT(),
+        CFGLR_SIGNALER_CALLBACK(test_callback)
+      ),
+      CFGLR_ELEMENT_BIN("tank_levels", NULL, 4, tank_levels, 4, CFGLR_SIGNALER_IDF_EVENT()),
+      { NULL },
+    },
+  };
+
+  // setup configulator global handler
+  configulator = &cfglr_handle;
+
+  uint8_t ret = cfglr_init(configulator);
+
+  baros_cfg_t cfg = {
+    .name = name,
+    .role = BAROS_ROLE_BACK
+  };
+
+  baros_init(&cfg);
+
   user_button_init();
   pumps_init();
-  ble_init(name);
 
-  xTaskCreate(console_task, "console", 4048, NULL, tskIDLE_PRIORITY + 3, NULL);
+  led_init();
+
+  uint16_t tick = 0;
+
+  printf(BARBACK_BANNER);
 
   while(1) {
-    vTaskDelay(1000 / portTICK_PERIOD_MS);
+    uint16_t delay = running > 0 ? 500 / running : 500;
+    vTaskDelay(delay / portTICK_PERIOD_MS);
+
+    uint8_t color = tick % (LED_COUNT * 2) > LED_COUNT ? 0 : 100;
+
+    ESP_ERROR_CHECK(led_strip_set_pixel(led_strip, tick % LED_COUNT, 5, 5, color));
+    ESP_ERROR_CHECK(led_strip_refresh(led_strip));
+    tick++;
   }
 }

main/pumps.c

@@ -1,22 +1,63 @@
 #include "string.h"
 #include "freertos/FreeRTOS.h"
 #include "freertos/timers.h"
+#include "freertos/queue.h"
 #include "esp_log.h"
 #include "driver/gpio.h"
+#include "driver/ledc.h"
 #include "nvs_flash.h"
 
+#include "main.h"
 #include "pumps.h"
 
 #define TAG     "PUMP!"
 
 uint8_t running = 0;
 
+typedef enum {
+  PUMP_STATE_IDLE = 0,
+  PUMP_STATE_RAMPING_UP,
+  PUMP_STATE_RUNNING,
+  PUMP_STATE_RAMPING_DOWN,
+} pump_states_e;
+
 TimerHandle_t pump_timers[PUMPS];
+QueueHandle_t pump_step_queue;
+
+static pump_states_e pump_states[PUMPS] = { PUMP_STATE_IDLE };
 static uint8_t pumps_duration[PUMPS] = {0};
 static uint8_t pumps_enabled[PUMPS] = {0};
-static uint8_t pumps_state[PUMPS] = {0};
+static uint8_t pumps_running[PUMPS] = {0};
 static uint8_t safety = 1;
 
+#define RAMP_UP_TIME            (500)
+#define RAMP_DOWN_TIME          (250)
+
+#define LEDC_HS_TIMER           LEDC_TIMER_0
+#define LEDC_HS_MODE            LEDC_HIGH_SPEED_MODE
+#define LEDC_LS_TIMER           LEDC_TIMER_1
+#define LEDC_LS_MODE            LEDC_LOW_SPEED_MODE
+
+#define LEDC_CONFIG(CHANNEL_NO, GPIO) (ledc_channel_config_t){\
+  .channel = CHANNEL_NO,\
+  .duty = 0,\
+  .gpio_num = GPIO,\
+  .speed_mode = LEDC_LOW_SPEED_MODE,\
+  .hpoint = 0,\
+  .timer_sel = LEDC_TIMER_1,\
+  .flags.output_invert = 0,\
+}
+
+ledc_channel_config_t ledc_motor_channels[4] = {};
+
+void pumps_update_config() {
+  ESP_LOGI(TAG, "writing config");
+
+  size_t size = sizeof(uint8_t) * PUMPS;
+  nvs_set_blob(config_handle, "pumps_duration", &pumps_duration, size);
+  nvs_commit(config_handle);
+}
+
 uint8_t pumps_set_duration(uint8_t idx, uint8_t time) {
   if(idx > PUMPS) return PUMPS_ERR_OUT_IDX;
 
@@ -24,15 +65,21 @@ uint8_t pumps_set_duration(uint8_t idx, uint8_t time) {
 
   pumps_duration[idx] = time;
 
+  pumps_update_config();
+
   return 0;
 }
 
+uint8_t pumps_get_duration(uint8_t idx) {
+  return pumps_duration[idx];
+}
+
 uint8_t pumps_set_enabled(uint8_t idx, uint8_t value) {
   uint8_t io = pump_gpio_map[idx];
 
   value = (value ? 1 : 0);
 
-  ESP_LOGD(TAG, "gpio: %d value: %d", io, value);
+  ESP_LOGI(TAG, "gpio: %d value: %d", io, value);
   // invert IO
   if(safety)
     gpio_set_level(io, value);
@@ -44,79 +91,190 @@ uint8_t pumps_get_enabled(uint8_t idx) {
   return pumps_enabled[idx] ? 1 : 0;
 }
 
-uint8_t pumps_get_duration(uint8_t idx) {
+uint8_t pumps_get_running(uint8_t idx) {
-  return pumps_duration[idx];
+  return pumps_running[idx];
-}
-
-uint8_t pumps_get_state(uint8_t idx) {
-  return pumps_state[idx];
 }
 
 uint8_t pump_enable(int8_t i) {
+  ESP_LOGI(TAG, "pump: %d enabled", i);
+
   return gpio_set_level(pump_gpio_map[i], 0);
 }
 
 uint8_t pump_disable(int8_t i) {
+  ESP_LOGI(TAG, "pump: %d disabled", i);
+
   return gpio_set_level(pump_gpio_map[i], 0);
 }
 
 void pump_timer_done(TimerHandle_t timer) {
-  uint8_t idx = (pcTimerGetTimerName(timer) - 0x48);
+  uint8_t idx = (uint8_t)(pcTimerGetName(timer) - 0x48);
   ESP_LOGD(TAG, "pump done: %d", idx);
 
-  running--;
+  xQueueSend(pump_step_queue, &idx, portMAX_DELAY);
-
-  pumps_set_enabled(idx, 0);
 }
 
 void pumps_stop() {
   for(uint8_t i = 0; i < PUMPS; i++) {
-    if(pump_timers[i] != NULL)
+    if(pump_timers[i] != NULL) {
+      pump_disable(i);
       xTimerStop(pump_timers[i], 0);
+    }
   }
 }
 
 void pumps_run() {
   if(running > 0) return;
 
+  ESP_LOGI(TAG, "Running pumps");
+
   for(uint8_t i = 0; i < PUMPS; i++) {
-    if(pumps_duration[i] == 0) continue;
+    //if(pumps_duration[i] == 0 || pumps_enabled[i] != 1) continue;
+
+    if(pump_states[i] != PUMP_STATE_IDLE) {
+      ESP_LOGW(TAG, "Attempting to start pump in non-IDLE state. idx: %d state: %d", i, pump_states[i]);
+    }
+
+    ledc_set_fade_with_time(ledc_motor_channels[i].speed_mode, ledc_motor_channels[i].channel, 8192, RAMP_UP_TIME);
+    ledc_fade_start(ledc_motor_channels[i].speed_mode, ledc_motor_channels[i].channel, LEDC_FADE_NO_WAIT);
+
+    pump_states[i] = PUMP_STATE_RAMPING_UP;
 
     running++;
-
+    ESP_LOGI(TAG, "Pump %d started", i);
-    pump_timers[i] = xTimerCreate((const char *)(0x48 + i), (pumps_duration[i] * 1000 / portTICK_PERIOD_MS), pdFALSE, (void*)0, pump_timer_done);
-
-    xTimerStart(pump_timers[i], 0);
-
-    pumps_set_enabled(i, 1);
   }
 }
 
-uint8_t pumps_init() {
+void pump_step_task() {
+  uint8_t idx;
+  TickType_t awoke = pdFALSE;
+
+  ESP_LOGI(TAG, "Starting pump stepping task");
+
+  while(true) {
+    while(xQueueReceive(pump_step_queue, &idx, awoke)) {
+      ESP_LOGI(TAG, "step %d complete for %d", pump_states[idx], idx);
+
+      if(pump_states[idx] == PUMP_STATE_RAMPING_UP) {
+        uint16_t pump_time = pumps_duration[idx] * 250 - (RAMP_UP_TIME + RAMP_DOWN_TIME) / 2;
+
+        if(RAMP_UP_TIME + RAMP_DOWN_TIME / 2 > pumps_duration[idx] * 250) {
+          ESP_LOGW(TAG, "Pump %d total ramp time great that duration, running for 1 Tick", idx);
+
+          pump_time = 10;
+        }
+
+        ESP_LOGI(TAG, "Running pump %d for %dms", idx, pump_time);
+
+        xTimerChangePeriod(pump_timers[idx], pump_time / portTICK_PERIOD_MS, portMAX_DELAY);
+        xTimerStart(pump_timers[idx], portMAX_DELAY);
+
+        pump_states[idx] = PUMP_STATE_RUNNING;
+
+        continue;
+      } else if(pump_states[idx] == PUMP_STATE_RUNNING) {
+        ledc_set_fade_with_time(ledc_motor_channels[idx].speed_mode, ledc_motor_channels[idx].channel, 0, RAMP_UP_TIME);
+        ledc_fade_start(ledc_motor_channels[idx].speed_mode, ledc_motor_channels[idx].channel, LEDC_FADE_NO_WAIT);
+
+        pump_states[idx] = PUMP_STATE_RAMPING_DOWN;
+        continue;
+      } else if(pump_states[idx] == PUMP_STATE_RAMPING_DOWN) {
+        ESP_LOGI(TAG, "Pump cycles complete: %d", idx);
+        pump_states[idx] = PUMP_STATE_IDLE;
+
+        running--;
+      } else {
+        ESP_LOGE(TAG, "Pump step fired with unknown state: %d", pump_states[idx]);
+      }
+    }
+
+    vTaskDelay(portTICK_PERIOD_MS / 10);
+  }
+}
+
+static IRAM_ATTR bool ledc_fade_end_event(const ledc_cb_param_t *param, void *parg) {
+  BaseType_t awoke = pdFALSE;
+
+  xQueueSendFromISR(pump_step_queue, parg, &awoke);
+
+  return (awoke == pdTRUE);
+}
+
+uint8_t pumps_io_init() {
   gpio_config_t io_conf;
 
-  // put the output high before initializing
+  for(uint8_t i = 0 ; i < PUMPS; i++) {
-  // to prevent relays from clacking
-  for(uint8_t i = 0 ; i < 4; i++) {
     gpio_set_level(pump_gpio_map[i], 0);
   }
 
-  io_conf.intr_type = GPIO_PIN_INTR_DISABLE;
+  io_conf.intr_type = GPIO_INTR_DISABLE;
   io_conf.mode = GPIO_MODE_OUTPUT;
   io_conf.pin_bit_mask = GPIO_PUMP_PIN_SEL;
   io_conf.pull_down_en = 1;
   io_conf.pull_up_en = 0;
-  gpio_config(&io_conf);
 
+  return gpio_config(&io_conf);
+}
+
+uint8_t pumps_init() {
   // zero out pump enabled, duration
   memset(&pumps_enabled, 0, sizeof(uint8_t) * PUMPS);
-  memset(&pumps_duration, 10, sizeof(uint8_t) * PUMPS);
+  memset(&pumps_duration, 5, sizeof(uint8_t) * PUMPS);
 
-  //uint32_t durations;
+  // this should neve go above 4, but just in case?
-  //esp_err_t err = nvs_get_i32(config_handle, "durations", &durations);
+  pump_step_queue = xQueueCreate(PUMPS * 4, sizeof(uint8_t));
+
+  size_t size = sizeof(uint8_t) * PUMPS;
+  if(!nvs_get_blob(config_handle, "pumps_duration", &pumps_duration, &size)) {
+    ESP_LOGI(TAG, "Initializing pumps config");
+
+    nvs_set_blob(config_handle, "pumps_duration", &pumps_duration, size);
+  };
+
+  ledc_timer_config_t ledc_timer = {
+    .duty_resolution = LEDC_TIMER_13_BIT, // resolution of PWM duty
+    .freq_hz = 4000,                      // frequency of PWM signal
+    .speed_mode = LEDC_LS_MODE,           // timer mode
+    .timer_num = LEDC_LS_TIMER,            // timer index
+    .clk_cfg = LEDC_AUTO_CLK,              // Auto select the source clock
+  };
+
+  ledc_timer_config(&ledc_timer);
+
+  ledc_timer.speed_mode = LEDC_HS_MODE;
+  ledc_timer.timer_num = LEDC_HS_TIMER;
+
+  ledc_timer_config(&ledc_timer);
+
+  for(uint8_t i = 0; i < PUMPS; i++) {
+    gpio_set_level(pump_gpio_map[i], 0);
+
+    pump_timers[i] = xTimerCreate((const char *)(0x48 + i), 1, pdFALSE, (void*)0, pump_timer_done);
+  }
+
+  for(uint8_t i = 0; i < PUMPS; i++) {
+    ledc_motor_channels[i] = LEDC_CONFIG(i, pump_gpio_map[i]);
+    ledc_channel_config(&ledc_motor_channels[i]);
+  }
+
+  ledc_cbs_t callbacks = {
+    .fade_cb = ledc_fade_end_event
+  };
+
+  ledc_fade_func_install(0);
+
+  uint8_t *idx;
+
+  for(uint8_t i = 0; i < PUMPS; i++) {
+    idx = malloc(1);
+    memcpy(idx, &i, 1);
+    ledc_cb_register(ledc_motor_channels[i].speed_mode, ledc_motor_channels[i].channel, &callbacks, idx);
+  }
 
   ESP_LOGI(TAG, "pumps_enabled: %d %d %d %d", pumps_enabled[0], pumps_enabled[1], pumps_enabled[2], pumps_enabled[3]);
   ESP_LOGI(TAG, "pumps_duration: %d %d %d %d", pumps_duration[0], pumps_duration[1], pumps_duration[2], pumps_duration[3]);
 
+  xTaskCreate(pump_step_task, "ramp", 4024, NULL, tskIDLE_PRIORITY + 4, NULL);
+
   return 0;
 }

main/user_button.c

@@ -2,12 +2,14 @@
 #include "freertos/task.h"
 #include "freertos/queue.h"
 #include "driver/gpio.h"
+#include "esp_log.h"
 
 #include "main.h"
 #include "pumps.h"
 #include "ble.h"
 
 #define GPIO_USER_BUTTON      (19)
+#define TAG "user_btn"
 
 static void IRAM_ATTR gpio_isr_handler(void* arg) {
   uint32_t gpio_num = (uint32_t) arg;
@@ -17,32 +19,36 @@ static void IRAM_ATTR gpio_isr_handler(void* arg) {
 
 static void gpio_task(void* arg) {
   uint32_t io_num;
-  uint8_t on = 1;
+  uint8_t state = 0;
-  uint8_t off = 0;
+  int8_t last_level = -1;
 
   for(;;) {
     if(xQueueReceive(gpio_evt_queue, &io_num, portMAX_DELAY)) {
       uint8_t level = gpio_get_level(io_num);
-      printf("GPIO[%d] intr, val: %d\n", io_num, level);
+
+      if(level == last_level) continue;
+      last_level = level;
+
+      ESP_LOGI(TAG, "GPIO[%ld] intr, val: %d\n", io_num, level);
+
+      if(state == 0)
+        vTaskDelay(10 / portTICK_PERIOD_MS);
 
       pumps_run();
 
-      ble_send_notification((void*)&on, 1);
+      state = !state;
 
-      // just a wee debounce
+      ble_send_notification((void*)&state, 1);
-      vTaskDelay(500 / portTICK_PERIOD_MS);
-
-      ble_send_notification((void*)&off, 1);
-
-      xQueueReset(gpio_evt_queue);
     }
   }
 }
 
 void user_button_init() {
+  ESP_LOGI(TAG, "user_button_init");
+
   gpio_config_t io_conf;
 
-  io_conf.intr_type = GPIO_PIN_INTR_NEGEDGE;
+  io_conf.intr_type = GPIO_INTR_ANYEDGE;
   io_conf.mode = GPIO_MODE_INPUT;
   io_conf.pin_bit_mask = (1ULL << GPIO_USER_BUTTON);
   io_conf.pull_down_en = 0;
@@ -54,5 +60,5 @@ void user_button_init() {
   xTaskCreate(gpio_task, "gpio_task", 4096, NULL, 10, NULL);
 
   gpio_install_isr_service(0);
-  gpio_isr_handler_add(GPIO_USER_BUTTON, gpio_isr_handler, (void*) 0);
+  gpio_isr_handler_add(GPIO_USER_BUTTON, gpio_isr_handler, (void*)GPIO_USER_BUTTON);
 }

sdkconfig.defaults

@@ -1,3 +1,4 @@
 CONFIG_BARBACK_ID="Barback"
 CONFIG_BT_ENABLED=y
 CONFIG_BT_NIMBLE_ENABLED=y
+CONFIG_BT_NIMBLE_DYNAMIC_SERVICE=y