From 96dafc49411b8dd40ce95bb7000cf98a4c3b3750 Mon Sep 17 00:00:00 2001 From: "Morgan 'ARR\\!' Allen" Date: Wed, 13 Nov 2024 15:29:42 -0800 Subject: [PATCH 1/3] tie esp-idf directly to project via submodule --- .gitmodules | 3 +++ esp-idf | 1 + 2 files changed, 4 insertions(+) create mode 160000 esp-idf diff --git a/.gitmodules b/.gitmodules index 7df473a..d2a9925 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "components/idf-dfplayermini"] path = components/idf-dfplayermini url = https://git.oit.cloud/morgan/idf-dfplayermini.git +[submodule "esp-idf"] + path = esp-idf + url = https://github.com/espressif/esp-idf diff --git a/esp-idf b/esp-idf new file mode 160000 index 0000000..3b8741b --- /dev/null +++ b/esp-idf @@ -0,0 +1 @@ +Subproject commit 3b8741b172dc951e18509698dee938304bcf1523 From aba57662ee1f655547db8501e9402411ce1d2af7 Mon Sep 17 00:00:00 2001 From: "Morgan 'ARR\\!' Allen" Date: Fri, 15 Nov 2024 15:36:50 -0800 Subject: [PATCH 2/3] include BAROS32 --- .gitmodules | 3 +++ components/BAROS32 | 1 + 2 files changed, 4 insertions(+) create mode 160000 components/BAROS32 diff --git a/.gitmodules b/.gitmodules index d2a9925..7c29c63 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,6 @@ [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 diff --git a/components/BAROS32 b/components/BAROS32 new file mode 160000 index 0000000..54c7a2d --- /dev/null +++ b/components/BAROS32 @@ -0,0 +1 @@ +Subproject commit 54c7a2d2d65dc9159dad27d6388d8a5409b59dd0 From 30ae25fa043e0a3f0c519f9cd761ac33c647efae Mon Sep 17 00:00:00 2001 From: "Morgan 'ARR\\!' Allen" Date: Fri, 15 Nov 2024 15:39:49 -0800 Subject: [PATCH 3/3] migrating to BAROS32 based BLE definitions --- main/CMakeLists.txt | 2 +- main/ble.c | 31 ++++++++++++------------------- 2 files changed, 13 insertions(+), 20 deletions(-) diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt index 55360f2..964ee77 100644 --- a/main/CMakeLists.txt +++ b/main/CMakeLists.txt @@ -6,6 +6,6 @@ set(COMPONENT_SRCS "\ user_button.c\ ") set(COMPONENT_ADD_INCLUDEDIRS ". ../include") -set(REQUIRES idf-dfplayermini) +set(REQUIRES BAROS32) register_component() diff --git a/main/ble.c b/main/ble.c index e8c63e2..9a8e8e8 100644 --- a/main/ble.c +++ b/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) // 0x4401 -#define CHAR_BUTTON (BLE_SERVICE_BARBACK + 2) // 0x4402 - 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,\ @@ -72,7 +65,7 @@ static barback_ble_access_t barback_ble_pump_access_state = { }; #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,15 +119,15 @@ 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 @@ -179,7 +172,7 @@ static int svc_access_system(uint16_t conn_handle, uint16_t attr_handle, struct ); switch(uuid16) { - case CHAR_POUR: + case BAROS_CHAR_POUR: if(value == 1) { ESP_LOGI(TAG, "starting pumps"); pumps_run(); @@ -189,7 +182,7 @@ static int svc_access_system(uint16_t conn_handle, uint16_t attr_handle, struct } break; - case CHAR_BUTTON: + case BAROS_CHAR_BUTTON: break; } }