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

Compare commits

base: Barback:development
Branches Tags
Barback:development
Barback:config
Barback:v0.0.0.0.0.1
..
compare: Barback:8a62260dc2ae33744d45978900e854b2bd50427a
Branches Tags
Barback:development
Barback:config
Barback:v0.0.0.0.0.1

No commits in common. "development" and "8a62260dc2ae33744d45978900e854b2bd50427a" have entirely different histories.
developmen ... 8a62260dc2

14 changed files with 66 additions and 173 deletions
Show stats Expand all files Collapse all files

21
.drone.yml
View file

@ -1,21 +0,0 @@
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

12
.gitmodules vendored
View file

@ -1,9 +1,3 @@
[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
[submodule "components/BAROS32"]
path = components/BAROS32
url = https://git.oit.cloud/Barback/BAROS32.git
[submodule "components/esp32-lora"]
path = components/esp32-lora
url = https://gitlab.com/morganrallen/esp32-lora.git

31
.woodpecker.yml
View file

@ -1,31 +0,0 @@
labels:
hardware: esp32
steps:
build:
image: espressif/idf:v5.2.2
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
secrets: [ ACCESS_TOKEN ]
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

1
CMakeLists.txt
View file

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

1
components/BAROS32

@ -1 +0,0 @@
Subproject commit 54c7a2d2d65dc9159dad27d6388d8a5409b59dd0

1
esp-idf

@ -1 +0,0 @@
Subproject commit 3b8741b172dc951e18509698dee938304bcf1523

6
include/main.h
View file

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

2
include/pumps.h
View file

@ -19,6 +19,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_running(uint8_t idx);
uint8_t pumps_get_state(uint8_t idx);
#endif

1
main/CMakeLists.txt
View file

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

79
main/ble.c
View file

@ -16,7 +16,6 @@
#include "driver/gpio.h"
#include "barback.h"
#include "baros.h"
#include "main.h"
#include "ble.h"
#include "pumps.h"
@ -47,13 +46,21 @@ 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(BAROS_BLE_SERVICE_PUMP_ENABLED + idx),\
.uuid = BLE_UUID16_DECLARE(BLE_SERVICE_PUMP_ENABLED + idx),\
.access_cb = barback_ble_char_access,\
.arg = &barback_ble_pump_access_enabled,\
.val_handle = &ble_svc_handle,\
@ -61,11 +68,11 @@ static barback_ble_access_t barback_ble_pump_access_enabled = {
}
static barback_ble_access_t barback_ble_pump_access_state = {
.read = pumps_get_running,
.read = pumps_get_state,
};
#define BLE_CHAR_PUMP_STATE(idx) {\
.uuid = BLE_UUID16_DECLARE(BAROS_BLE_SERVICE_PUMP_STATE + idx),\
.uuid = BLE_UUID16_DECLARE(BLE_SERVICE_PUMP_STATE + idx),\
.access_cb = barback_ble_char_access,\
.arg = &barback_ble_pump_access_state,\
.val_handle = &ble_svc_handle,\
@ -78,7 +85,7 @@ static barback_ble_access_t barback_ble_pump_access_duration = {
};
#define BLE_CHAR_PUMP_DURATION(idx) {\
.uuid = BLE_UUID16_DECLARE(BAROS_BLE_SERVICE_PUMP_DURATION + idx),\
.uuid = BLE_UUID16_DECLARE(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],\
@ -88,7 +95,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(BAROS_BLE_SERVICE_PUMP_ENABLED),
.uuid = BLE_UUID16_DECLARE(BLE_SERVICE_PUMP_ENABLED),
.characteristics = (struct ble_gatt_chr_def[]) {
BLE_CHAR_PUMP_ENABLED(1),
@ -99,7 +106,7 @@ static const struct ble_gatt_svc_def service_defs[] = {
},
}, {
.type = BLE_GATT_SVC_TYPE_PRIMARY,
.uuid = BLE_UUID16_DECLARE(BAROS_BLE_SERVICE_PUMP_STATE),
.uuid = BLE_UUID16_DECLARE(BLE_SERVICE_PUMP_STATE),
.characteristics = (struct ble_gatt_chr_def[]) {
BLE_CHAR_PUMP_STATE(1),
BLE_CHAR_PUMP_STATE(2),
@ -109,7 +116,7 @@ static const struct ble_gatt_svc_def service_defs[] = {
},
}, {
.type = BLE_GATT_SVC_TYPE_PRIMARY,
.uuid = BLE_UUID16_DECLARE(BAROS_BLE_SERVICE_PUMP_DURATION),
.uuid = BLE_UUID16_DECLARE(BLE_SERVICE_PUMP_DURATION),
.characteristics = (struct ble_gatt_chr_def[]) {
BLE_CHAR_PUMP_DURATION(1),
BLE_CHAR_PUMP_DURATION(2),
@ -119,20 +126,20 @@ static const struct ble_gatt_svc_def service_defs[] = {
},
}, {
.type = BLE_GATT_SVC_TYPE_PRIMARY,
.uuid = BLE_UUID16_DECLARE(BAROS_BLE_SERVICE_BARBACK),
.uuid = BLE_UUID16_DECLARE(BLE_SERVICE_BARBACK),
.characteristics = (struct ble_gatt_chr_def[]) {
{
.uuid = BLE_UUID16_DECLARE(BAROS_CHAR_POUR),
.uuid = BLE_UUID16_DECLARE(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(BAROS_CHAR_BUTTON),
.uuid = BLE_UUID16_DECLARE(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
@ -172,17 +179,16 @@ static int svc_access_system(uint16_t conn_handle, uint16_t attr_handle, struct
);
switch(uuid16) {
case BAROS_CHAR_POUR:
case CHAR_POUR:
if(value == 1) {
ESP_LOGI(TAG, "starting pumps");
ESP_LOGI(TAG, "starting pump");
pumps_run();
} else {
ESP_LOGI(TAG, "stoping pumps");
pumps_stop();
}
break;
case BAROS_CHAR_BUTTON:
case CHAR_BUTTON:
break;
}
}
@ -191,15 +197,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) {
uint16_t chr_uuid = ble_uuid_u16(ctxt->chr->uuid);
// match the UUID against 0b111
uint8_t idx = (chr_uuid & 0x07) - 1;
uint16_t uuid16 = ble_uuid_u16(ctxt->chr->uuid);
uint8_t idx = uuid16 - (BLE_SERVICE_PUMP_ENABLED + 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, chr_uuid, (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, uuid16, (ctxt->op == 0 ? "read" : ctxt->op == 1 ? "write" : "unknown"));
if(ctxt->op == BLE_GATT_ACCESS_OP_WRITE_CHR) {
gatt_svr_chr_write(
@ -211,35 +215,24 @@ 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 == 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);
if(access->write != NULL)
access->write(idx, value);
}
} else if(access != NULL && ctxt->op == BLE_GATT_ACCESS_OP_READ_CHR) {
if(access->read == NULL) {
} else if(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 value = access->read(idx);
uint8_t enabled = access->read(idx);
ESP_LOGI(TAG, "returning read idx: %d value: %d", idx, value);
os_mbuf_append(ctxt->om, &value, sizeof value);
ESP_LOGI(TAG, "pumps_enabled[%d] = %d", idx, enabled);
os_mbuf_append(ctxt->om, &enabled, sizeof enabled);
}
return 0;
@ -383,14 +376,6 @@ 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,
@ -459,7 +444,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();

1
main/console.c
View file

@ -25,6 +25,7 @@ void console_task(void *args) {
.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));

6
main/main.c
View file

@ -5,7 +5,6 @@
#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"
@ -19,7 +18,6 @@
static const char *TAG = "BARBACK";
uint8_t mac[6];
nvs_handle_t config_handle = {};
void app_main(void) {
esp_err_t err = nvs_flash_init();
@ -34,7 +32,7 @@ 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", (int)config_handle);
ESP_LOGI(TAG, "config_handle: %d", config_handle);
}
esp_efuse_mac_get_default((uint8_t*)&mac);
@ -44,8 +42,6 @@ void app_main(void) {
char *name = malloc(strlen(TAG) + 4);
sprintf(name, "%s-%02X", TAG, mac[5]);
vTaskDelay(1000 / portTICK_PERIOD_MS);
user_button_init();
pumps_init();
ble_init(name);

49
main/pumps.c
View file

@ -5,7 +5,6 @@
#include "driver/gpio.h"
#include "nvs_flash.h"
#include "main.h"
#include "pumps.h"
#define TAG "PUMP!"
@ -15,17 +14,9 @@ uint8_t running = 0;
TimerHandle_t pump_timers[PUMPS];
static uint8_t pumps_duration[PUMPS] = {0};
static uint8_t pumps_enabled[PUMPS] = {0};
static uint8_t pumps_running[PUMPS] = {0};
static uint8_t pumps_state[PUMPS] = {0};
static uint8_t safety = 1;
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;
@ -33,15 +24,9 @@ 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];
@ -59,24 +44,24 @@ uint8_t pumps_get_enabled(uint8_t idx) {
return pumps_enabled[idx] ? 1 : 0;
}
uint8_t pumps_get_running(uint8_t idx) {
return pumps_running[idx];
uint8_t pumps_get_duration(uint8_t idx) {
return pumps_duration[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 = (pcTimerGetName(timer) - 0x48);
uint8_t idx = (pcTimerGetTimerName(timer) - 0x48);
ESP_LOGD(TAG, "pump done: %d", idx);
running--;
@ -86,12 +71,8 @@ void pump_timer_done(TimerHandle_t timer) {
void pumps_stop() {
for(uint8_t i = 0; i < PUMPS; i++) {
if(pump_timers[i] != NULL) {
pump_disable(i);
if(pump_timers[i] != NULL)
xTimerStop(pump_timers[i], 0);
i++;
}
}
}
@ -120,7 +101,7 @@ uint8_t pumps_init() {
gpio_set_level(pump_gpio_map[i], 0);
}
io_conf.intr_type = GPIO_INTR_DISABLE;
io_conf.intr_type = GPIO_PIN_INTR_DISABLE;
io_conf.mode = GPIO_MODE_OUTPUT;
io_conf.pin_bit_mask = GPIO_PUMP_PIN_SEL;
io_conf.pull_down_en = 1;
@ -129,14 +110,10 @@ uint8_t pumps_init() {
// zero out pump enabled, duration
memset(&pumps_enabled, 0, sizeof(uint8_t) * PUMPS);
memset(&pumps_duration, 5, sizeof(uint8_t) * PUMPS);
memset(&pumps_duration, 10, sizeof(uint8_t) * PUMPS);
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);
};
//uint32_t durations;
//esp_err_t err = nvs_get_i32(config_handle, "durations", &durations);
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]);

28
main/user_button.c
View file

@ -7,7 +7,7 @@
#include "pumps.h"
#include "ble.h"
#define GPIO_USER_BUTTON (14)
#define GPIO_USER_BUTTON (19)
static void IRAM_ATTR gpio_isr_handler(void* arg) {
uint32_t gpio_num = (uint32_t) arg;
@ -17,26 +17,24 @@ static void IRAM_ATTR gpio_isr_handler(void* arg) {
static void gpio_task(void* arg) {
uint32_t io_num;
uint8_t state = 0;
int8_t last_level = -1;
uint8_t on = 1;
uint8_t off = 0;
for(;;) {
if(xQueueReceive(gpio_evt_queue, &io_num, portMAX_DELAY)) {
uint8_t level = gpio_get_level(io_num);
if(level == last_level) continue;
last_level = level;
printf("GPIO[%ld] intr, val: %d\n", io_num, level);
if(state == 0)
vTaskDelay(10 / portTICK_PERIOD_MS);
printf("GPIO[%d] intr, val: %d\n", io_num, level);
pumps_run();
state = !state;
ble_send_notification((void*)&on, 1);
ble_send_notification((void*)&state, 1);
// just a wee debounce
vTaskDelay(500 / portTICK_PERIOD_MS);
ble_send_notification((void*)&off, 1);
xQueueReset(gpio_evt_queue);
}
}
}
@ -44,7 +42,7 @@ static void gpio_task(void* arg) {
void user_button_init() {
gpio_config_t io_conf;
io_conf.intr_type = GPIO_INTR_ANYEDGE;
io_conf.intr_type = GPIO_PIN_INTR_NEGEDGE;
io_conf.mode = GPIO_MODE_INPUT;
io_conf.pin_bit_mask = (1ULL << GPIO_USER_BUTTON);
io_conf.pull_down_en = 0;
@ -56,5 +54,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*)GPIO_USER_BUTTON);
gpio_isr_handler_add(GPIO_USER_BUTTON, gpio_isr_handler, (void*) 0);
}