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:049de947fd98804a240725a5c69ee2477196c927
Branches Tags
Barback:development
Barback:config
Barback:v0.0.0.0.0.1

No commits in common. "development" and "049de947fd98804a240725a5c69ee2477196c927" have entirely different histories.
developmen ... 049de947fd

13 changed files with 41 additions and 73 deletions
Show stats Expand all files Collapse all files

3
.drone.yml
View file

@ -6,9 +6,6 @@ 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

11
.gitmodules vendored
View file

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

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

1
components/idf-dfplayermini Submodule

@ -0,0 +1 @@
Subproject commit 7ec406c5af692b9c99ae9ed0c7fb5ba648a0a71e

1
esp-idf

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

2
include/main.h
View file

@ -8,7 +8,7 @@
#define PUMP_COUNT (4)
static QueueHandle_t gpio_evt_queue = NULL;
extern nvs_handle_t config_handle;
nvs_handle_t config_handle;
extern uint8_t mac[6];

2
main/CMakeLists.txt
View file

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

35
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,\
@ -65,7 +72,7 @@ static barback_ble_access_t barback_ble_pump_access_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,7 +179,7 @@ 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");
pumps_run();
@ -182,7 +189,7 @@ static int svc_access_system(uint16_t conn_handle, uint16_t attr_handle, struct
}
break;
case BAROS_CHAR_BUTTON:
case CHAR_BUTTON:
break;
}
}
@ -459,7 +466,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));

7
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"
@ -15,11 +14,11 @@
#include "ble.h"
#include "user_button.h"
#include "pumps.h"
#include "dfplayermini.h"
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 +33,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);
@ -46,6 +45,8 @@ void app_main(void) {
vTaskDelay(1000 / portTICK_PERIOD_MS);
dfplayermini_init();
user_button_init();
pumps_init();
ble_init(name);

11
main/pumps.c
View file

@ -76,7 +76,7 @@ uint8_t pump_disable(int8_t i) {
}
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 +86,9 @@ void pump_timer_done(TimerHandle_t timer) {
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);
i++;
}
}
}
@ -120,7 +117,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,7 +126,7 @@ 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)) {

8
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;
@ -27,10 +27,10 @@ static void gpio_task(void* arg) {
if(level == last_level) continue;
last_level = level;
printf("GPIO[%ld] intr, val: %d\n", io_num, level);
printf("GPIO[%d] intr, val: %d\n", io_num, level);
if(state == 0)
vTaskDelay(10 / portTICK_PERIOD_MS);
vTaskDelay(10 / portTICK_RATE_MS);
pumps_run();
@ -44,7 +44,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_ANYEDGE;
io_conf.mode = GPIO_MODE_INPUT;
io_conf.pin_bit_mask = (1ULL << GPIO_USER_BUTTON);
io_conf.pull_down_en = 0;