Input handling and debouncing (#148)

* Add input driver and definitions for target_f2

* Add input_dump example

* Invert charge input

* Fix back and left button configuration

* remove input debug

* input testing case

* move header

* lint code

Co-authored-by: aanper <mail@s3f.ru>
This commit is contained in:
Vadim Kaushan
2020-10-02 09:44:05 +03:00
committed by GitHub
parent ed76f702b1
commit 8c36d65e63
13 changed files with 285 additions and 8 deletions

View File

@@ -0,0 +1,29 @@
#include "flipper.h"
#include <stdio.h>
static void state_cb(const void* value, size_t size, void* ctx) {
const InputState* state = value;
printf("state: %02x\n", *state);
}
static void event_cb(const void* value, size_t size, void* ctx) {
const InputEvent* event = value;
printf("event: %02x %s\n", event->input, event->state ? "pressed" : "released");
}
void application_input_dump(void* p) {
// TODO try open record and retry on timeout (needs FURI behaviour change)
delay(1000);
// open record
FuriRecordSubscriber* state_record =
furi_open("input_state", false, false, state_cb, NULL, NULL);
FuriRecordSubscriber* event_record =
furi_open("input_events", false, false, event_cb, NULL, NULL);
for(;;) {
delay(100);
}
}

111
applications/input/input.c Normal file
View File

@@ -0,0 +1,111 @@
#include <input/input.h>
#include <input_priv.h>
#include <stdio.h>
#include <furi.h>
static volatile bool initialized = false;
static SemaphoreHandle_t event;
static InputState input_state = {
false,
};
void input_task(void* p) {
uint32_t state_bits = 0;
StaticSemaphore_t event_semaphore;
uint8_t debounce_counters[INPUT_COUNT];
event = xSemaphoreCreateCountingStatic(1, 0, &event_semaphore);
if(!furi_create("input_state", (void*)&input_state, sizeof(input_state))) {
printf("[input_task] cannot create the input_state record\n");
furiac_exit(NULL);
}
FuriRecordSubscriber* input_state_record =
furi_open("input_state", false, false, NULL, NULL, NULL);
if(input_state_record == NULL) {
printf("[input_task] cannot open the input_state record\n");
furiac_exit(NULL);
}
if(!furi_create("input_events", NULL, 0)) {
printf("[input_task] cannot create the input_events record\n");
furiac_exit(NULL);
}
FuriRecordSubscriber* input_events_record =
furi_open("input_events", false, false, NULL, NULL, NULL);
if(input_events_record == NULL) {
printf("[input_task] cannot open the input_events record\n");
furiac_exit(NULL);
}
initialized = true;
// Force state update
for(uint32_t i = 0; i < INPUT_COUNT; i++) {
debounce_counters[i] = DEBOUNCE_TICKS / 2;
}
for(;;) {
bool changed = false;
for(uint32_t i = 0; i < INPUT_COUNT; i++) {
bool input_state = app_gpio_read(input_gpio[i]) ^ input_invert[i];
if(input_state) {
if(debounce_counters[i] < DEBOUNCE_TICKS) {
debounce_counters[i] += 1;
changed = true;
}
} else {
if(debounce_counters[i] > 0) {
debounce_counters[i] -= 1;
changed = true;
}
}
}
if(!changed) {
uint32_t new_state_bits = 0;
for(uint32_t i = 0; i < INPUT_COUNT; i++) {
if(debounce_counters[i] == DEBOUNCE_TICKS) {
new_state_bits |= (1 << i);
}
}
uint32_t changed_bits = new_state_bits ^ state_bits;
if(changed_bits != 0) {
// printf("[input] %02x -> %02x\n", state_bits, new_state_bits);
InputState new_state = _BITS2STATE(new_state_bits);
furi_write(input_state_record, &new_state, sizeof(new_state));
state_bits = new_state_bits;
for(uint32_t i = 0; i < INPUT_COUNT; i++) {
if((changed_bits & (1 << i)) != 0) {
bool state = (new_state_bits & (1 << i)) != 0;
InputEvent event = {i, state};
furi_write(input_events_record, &event, sizeof(event));
}
}
}
// Sleep: wait for event
xSemaphoreTake(event, portMAX_DELAY);
} else {
osDelay(1);
}
}
}
void HAL_GPIO_EXTI_Callback(uint16_t pin) {
if(!initialized) return;
BaseType_t task_woken = pdFALSE;
// Ignore the result, as we do not care about repeated event during event processing.
xSemaphoreGiveFromISR(event, &task_woken);
if(task_woken) {
portYIELD_FROM_ISR(task_woken);
}
}

View File

@@ -0,0 +1,40 @@
#ifndef __INPUT_H
#define __INPUT_H
#include <stdbool.h>
#define INPUT_COUNT 7
typedef enum {
InputUp = 0,
InputDown,
InputRight,
InputLeft,
InputOk,
InputBack,
InputCharging,
} Input;
typedef struct {
Input input;
bool state;
} InputEvent;
typedef struct {
bool up : 1;
bool down : 1;
bool right : 1;
bool left : 1;
bool ok : 1;
bool back : 1;
bool charging : 1;
} __attribute__((packed)) InputState;
#define _BITS2STATE(bits) \
{ \
.up = (((bits)&0x01) != 0), .down = (((bits)&0x02) != 0), .right = (((bits)&0x04) != 0), \
.left = (((bits)&0x08) != 0), .ok = (((bits)&0x10) != 0), .back = (((bits)&0x20) != 0), \
.charging = (((bits)&0x40) != 0) \
}
#endif /* __INPUT_H */

View File

@@ -15,11 +15,14 @@ void application_blink(void* p);
void application_uart_write(void* p);
void application_ipc_display(void* p);
void application_ipc_widget(void* p);
void application_input_dump(void* p);
void display_u8g2(void* p);
void u8g2_example(void* p);
void input_task(void* p);
void coreglitch_demo_0(void* p);
const FlipperStartupApp FLIPPER_STARTUP[] = {
@@ -28,6 +31,10 @@ const FlipperStartupApp FLIPPER_STARTUP[] = {
{.app = u8g2_example, .name = "u8g2_example"},
#endif
#ifdef USE_INPUT
{.app = input_task, .name = "input_task"},
#endif
// {.app = coreglitch_demo_0, .name = "coreglitch_demo_0"},
#ifdef TEST
@@ -44,4 +51,7 @@ const FlipperStartupApp FLIPPER_STARTUP[] = {
{.app = application_ipc_display, .name = "ipc display"},
{.app = application_ipc_widget, .name = "ipc widget"},
#endif
#ifdef EXAMPLE_INPUT_DUMP
{.app = application_input_dump, .name = "input dump"},
#endif
};