rkcf
/
esp32-sequencer
Archived
1
0
Fork 0
Code Issues 12 Pull Requests Packages Projects 2 Releases Wiki Activity

add proper functionality for tap bpm change. fix some debounce issues

main
rkcf 2023-01-28 14:10:22 -06:00
parent 9bcbd9f4b1
commit 31d3acd9e6
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
main/esp32-sequencer.c
View File

@ -9,6 +9,7 @@
#include "esp_log.h" #include "esp_log.h"
#include "esp_random.h" #include "esp_random.h"
#include "freertos/FreeRTOS.h" #include "freertos/FreeRTOS.h"
#include "freertos/portmacro.h"
#include "freertos/queue.h" #include "freertos/queue.h"
#include "freertos/task.h" #include "freertos/task.h"
#include "hal/gpio_types.h" #include "hal/gpio_types.h"
@ -37,11 +38,14 @@ static QueueHandle_t control_event_queue = NULL;
static gptimer_handle_t tap_tempo_timer = NULL; static gptimer_handle_t tap_tempo_timer = NULL;
static gptimer_handle_t gate_timer = NULL; static gptimer_handle_t gate_timer = NULL;
static const uint16_t DEBOUNCE_TIMEOUT = 20; // polling period length when debouncing in ms static const uint16_t DEBOUNCE_TIMEOUT = 10; // polling period length when debouncing in ms
static uint64_t debounce_time = 0; // system time of last intterupt static uint64_t debounce_time = 0; // system time of last intterupt
static uint8_t btn_state = 1; // state of gpio last recorded static uint8_t btn_state = 1; // state of gpio last recorded
portMUX_TYPE mux = portMUX_INITIALIZER_UNLOCKED;
static const uint32_t DEFAULT_BPM = 120; static const uint32_t DEFAULT_BPM = 120;
static uint16_t current_bpm = DEFAULT_BPM;
#define SEQ_MAX_LEN 8 #define SEQ_MAX_LEN 8
static uint8_t sequence[SEQ_MAX_LEN] = {0}; static uint8_t sequence[SEQ_MAX_LEN] = {0};
@ -85,14 +89,18 @@ static void tap_tempo_handler(){
ESP_LOGI(TAG, "Starting tap tempo monitoring"); ESP_LOGI(TAG, "Starting tap tempo monitoring");
} else { // stop the timer and calc bpm } else { // stop the timer and calc bpm
ESP_ERROR_CHECK(gptimer_stop(tap_tempo_timer)); ESP_ERROR_CHECK(gptimer_stop(tap_tempo_timer));
ESP_LOGI(TAG, "Stopping tap tempo monitoring at %" PRIu64 "µs", count); ESP_ERROR_CHECK(gptimer_set_raw_count(tap_tempo_timer, 0));
current_bpm = ms_to_bpm(count / 1000);
ESP_LOGI(TAG, "Stopping tap tempo monitoring at %" PRIu64 "ms", count / 1000);
} }
} }
static void IRAM_ATTR gpio_isr_handler(void* arg) { static void IRAM_ATTR gpio_isr_handler(void* arg) {
debounce_time = xTaskGetTickCount(); // set time of interrupt
uint32_t gpio_num = (uint32_t)arg; uint32_t gpio_num = (uint32_t)arg;
portENTER_CRITICAL_ISR(&mux);
debounce_time = xTaskGetTickCount(); // set time of interrupt
btn_state = gpio_get_level(gpio_num); // set state btn_state = gpio_get_level(gpio_num); // set state
portEXIT_CRITICAL_ISR(&mux);
xQueueSendFromISR(control_event_queue, &gpio_num, NULL); xQueueSendFromISR(control_event_queue, &gpio_num, NULL);
} }
@ -102,8 +110,10 @@ static void control_event_handler(void* arg) {
uint64_t last_debounce_time; uint64_t last_debounce_time;
while (1) { while (1) {
// save these so we can make comparisons // save these so we can make comparisons
portENTER_CRITICAL_ISR(&mux);
last_btn_state = btn_state; last_btn_state = btn_state;
last_debounce_time = debounce_time; last_debounce_time = debounce_time;
portEXIT_CRITICAL_ISR(&mux);
uint8_t current_state = gpio_get_level(gpio_num); uint8_t current_state = gpio_get_level(gpio_num);
if (xQueueReceive(control_event_queue, &gpio_num, portMAX_DELAY)) { if (xQueueReceive(control_event_queue, &gpio_num, portMAX_DELAY)) {
// Check if interrupt triggered stays the same for long enough // Check if interrupt triggered stays the same for long enough
@ -264,7 +274,7 @@ void app_main(void) {
pulse_cv(false); pulse_cv(false);
} }
printf("%i", sequence[step]); printf("%i", sequence[step]);
vTaskDelay(bpm_to_ms(DEFAULT_BPM)/ portTICK_PERIOD_MS); vTaskDelay(bpm_to_ms(current_bpm)/ portTICK_PERIOD_MS);
} }
printf("\n"); printf("\n");