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

Reworked pumps and change button IO

Browse source
This commit is contained in:
Morgan 'ARR\!' Allen 2025-07-28 21:50:39 -07:00
parent 53a9f358fa
commit 8275050dee
4 changed files with 24 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/pumps.h
View file

@ -7,10 +7,12 @@
#define PUMPS_ERR_OUT_IDX (1) #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])); #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 }; // Pins with Weak Pull-Downs 2, 4, 12, 13
static uint8_t pump_gpio_map[] = { 12, 13, 2, 4 };
void pumps_run(); void pumps_run();
void pumps_stop(); void pumps_stop();
uint8_t pumps_io_init();
uint8_t pumps_init(); uint8_t pumps_init();
uint8_t pumps_set_duration(uint8_t idx, uint8_t time); uint8_t pumps_set_duration(uint8_t idx, uint8_t time);

3
main/main.c
View file

@ -23,6 +23,9 @@ uint8_t mac[6];
nvs_handle_t config_handle = {}; nvs_handle_t config_handle = {};
void app_main(void) { 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(); esp_err_t err = nvs_flash_init();
if (err == ESP_ERR_NVS_NO_FREE_PAGES || err == ESP_ERR_NVS_NEW_VERSION_FOUND) { if (err == ESP_ERR_NVS_NO_FREE_PAGES || err == ESP_ERR_NVS_NEW_VERSION_FOUND) {

19
main/pumps.c
View file

@ -47,7 +47,7 @@ uint8_t pumps_set_enabled(uint8_t idx, uint8_t value) {
value = (value ? 1 : 0); value = (value ? 1 : 0);
ESP_LOGD(TAG, "gpio: %d value: %d", io, value); ESP_LOGI(TAG, "gpio: %d value: %d", io, value);
// invert IO // invert IO
if(safety) if(safety)
gpio_set_level(io, value); gpio_set_level(io, value);
@ -89,8 +89,6 @@ void pumps_stop() {
if(pump_timers[i] != NULL) { if(pump_timers[i] != NULL) {
pump_disable(i); pump_disable(i);
xTimerStop(pump_timers[i], 0); xTimerStop(pump_timers[i], 0);
i++;
} }
} }
} }
@ -103,15 +101,13 @@ void pumps_run() {
running++; running++;
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); xTimerStart(pump_timers[i], 0);
pumps_set_enabled(i, 1); pumps_set_enabled(i, 1);
} }
} }
uint8_t pumps_init() { uint8_t pumps_io_init() {
gpio_config_t io_conf; gpio_config_t io_conf;
// put the output high before initializing // put the output high before initializing
@ -125,12 +121,21 @@ uint8_t pumps_init() {
io_conf.pin_bit_mask = GPIO_PUMP_PIN_SEL; io_conf.pin_bit_mask = GPIO_PUMP_PIN_SEL;
io_conf.pull_down_en = 1; io_conf.pull_down_en = 1;
io_conf.pull_up_en = 0; io_conf.pull_up_en = 0;
gpio_config(&io_conf);
return gpio_config(&io_conf);
}
uint8_t pumps_init() {
// zero out pump enabled, duration // zero out pump enabled, duration
memset(&pumps_enabled, 0, sizeof(uint8_t) * PUMPS); memset(&pumps_enabled, 0, sizeof(uint8_t) * PUMPS);
memset(&pumps_duration, 5, sizeof(uint8_t) * PUMPS); memset(&pumps_duration, 5, sizeof(uint8_t) * PUMPS);
for(uint8_t i = 0; i < PUMPS; i++) {
gpio_set_level(pump_gpio_map[i], 0);
pump_timers[i] = xTimerCreate((const char *)(0x48 + i), (pumps_duration[i] * 1000 / portTICK_PERIOD_MS), pdFALSE, (void*)0, pump_timer_done);
}
size_t size = sizeof(uint8_t) * PUMPS; size_t size = sizeof(uint8_t) * PUMPS;
if(!nvs_get_blob(config_handle, "pumps_duration", &pumps_duration, &size)) { if(!nvs_get_blob(config_handle, "pumps_duration", &pumps_duration, &size)) {
ESP_LOGI(TAG, "Initializing pumps config"); ESP_LOGI(TAG, "Initializing pumps config");

8
main/user_button.c
View file

@ -2,12 +2,14 @@
#include "freertos/task.h" #include "freertos/task.h"
#include "freertos/queue.h" #include "freertos/queue.h"
#include "driver/gpio.h" #include "driver/gpio.h"
#include "esp_log.h"
#include "main.h" #include "main.h"
#include "pumps.h" #include "pumps.h"
#include "ble.h" #include "ble.h"
#define GPIO_USER_BUTTON (14) #define GPIO_USER_BUTTON (19)
#define TAG "user_btn"
static void IRAM_ATTR gpio_isr_handler(void* arg) { static void IRAM_ATTR gpio_isr_handler(void* arg) {
uint32_t gpio_num = (uint32_t) arg; uint32_t gpio_num = (uint32_t) arg;
@ -27,7 +29,7 @@ static void gpio_task(void* arg) {
if(level == last_level) continue; if(level == last_level) continue;
last_level = level; last_level = level;
printf("GPIO[%ld] intr, val: %d\n", io_num, level); ESP_LOGI(TAG, "GPIO[%ld] intr, val: %d\n", io_num, level);
if(state == 0) if(state == 0)
vTaskDelay(10 / portTICK_PERIOD_MS); vTaskDelay(10 / portTICK_PERIOD_MS);
@ -42,6 +44,8 @@ static void gpio_task(void* arg) {
} }
void user_button_init() { void user_button_init() {
ESP_LOGI(TAG, "user_button_init");
gpio_config_t io_conf; gpio_config_t io_conf;
io_conf.intr_type = GPIO_INTR_ANYEDGE; io_conf.intr_type = GPIO_INTR_ANYEDGE;