diff --git a/.gitignore b/.gitignore index 2d20cb18970e8341601f53ca3e76b62302732618..7e5973e0b9c5ebba608520ecc0add3ba5174568b 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,6 @@ user.props # MacOS desktop metadata files .DS_Store + +#ctags +tags diff --git a/badge23/captouch.c b/badge23/captouch.c index c277cf87e535b61f776e43b4a3f2f7a1dfd18d05..b84205da74bf274cfb1190b9cc79123b2755b388 100644 --- a/badge23/captouch.c +++ b/badge23/captouch.c @@ -2,6 +2,7 @@ //#include <string.h> #include "esp_log.h" #include "driver/i2c.h" +#include <stdint.h> static const char *TAG = "captouch"; @@ -153,6 +154,12 @@ static void IRAM_ATTR gpio_isr_handler(void* arg) xQueueSendFromISR(gpio_evt_queue, &chip, NULL); } +void manual_captouch_readout(uint8_t top) +{ + struct ad714x_chip* chip = top ? (&chip_top) : (&chip_bot); + xQueueSendFromISR(gpio_evt_queue, &chip, NULL); +} + void espan_handle_captouch(uint16_t pressed_top, uint16_t pressed_bot); static uint16_t pressed_top, pressed_bot; diff --git a/badge23/captouch.h b/badge23/captouch.h index 8c3ff2aaf616d084198a063abb5864566e3085b3..6a4ef88db4027ba41a0681b3cef5a2373da81adf 100644 --- a/badge23/captouch.h +++ b/badge23/captouch.h @@ -1,6 +1,8 @@ #pragma once +#include <stdint.h> void captouch_init(void); void captouch_print_debug_info(void); void gpio_event_handler(void * arg); +void manual_captouch_readout(uint8_t top); void captouch_get_cross(int paddle, int * x, int * y); diff --git a/badge23/espan.c b/badge23/espan.c index 08caaa49f9545c697d6bd231111aecd9bc1f6042..36f6c60bd22894894a6c7b7ffc78e7abd9f3b4bd 100644 --- a/badge23/espan.c +++ b/badge23/espan.c @@ -100,7 +100,7 @@ void os_app_main(void) audio_init(); leds_init(); //display_init(); - //captouch_init(); + captouch_init(); mp_hal_stdout_tx_str("task inits done\n\r"); //play_bootsound(); @@ -115,6 +115,11 @@ void os_app_main(void) int i = 0; void * asdasd = &i; while(1) { + manual_captouch_readout(1); + vTaskDelay(10 / portTICK_PERIOD_MS); + manual_captouch_readout(0); + vTaskDelay(10 / portTICK_PERIOD_MS); + continue; i = (i + 1) % 10; if(!(i == 2 || i == 8)) continue;