[FL-943] Add CLI command for input events injection (#363)
* input: add cli commands for input events injection * input: add short and long events
This commit is contained in:
parent
1ebbd2c266
commit
10978c51fd
@ -1,4 +1,5 @@
|
|||||||
#include "input_i.h"
|
#include "input_i.h"
|
||||||
|
#include <m-string.h>
|
||||||
|
|
||||||
#define GPIO_Read(input_pin) \
|
#define GPIO_Read(input_pin) \
|
||||||
(HAL_GPIO_ReadPin((GPIO_TypeDef*)input_pin.pin->port, input_pin.pin->pin) ^ \
|
(HAL_GPIO_ReadPin((GPIO_TypeDef*)input_pin.pin->port, input_pin.pin->pin) ^ \
|
||||||
@ -18,12 +19,69 @@ void input_isr(void* _pin, void* _ctx) {
|
|||||||
osThreadFlagsSet(input->thread, INPUT_THREAD_FLAG_ISR);
|
osThreadFlagsSet(input->thread, INPUT_THREAD_FLAG_ISR);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void input_cli_send(string_t args, void* context) {
|
||||||
|
InputEvent event;
|
||||||
|
|
||||||
|
// Get first word as key name
|
||||||
|
string_t key_name;
|
||||||
|
string_init(key_name);
|
||||||
|
size_t ws = string_search_char(args, ' ');
|
||||||
|
if(ws == STRING_FAILURE) {
|
||||||
|
printf("Wrong input");
|
||||||
|
string_clear(key_name);
|
||||||
|
return;
|
||||||
|
} else {
|
||||||
|
string_set_n(key_name, args, 0, ws);
|
||||||
|
string_right(args, ws);
|
||||||
|
string_strim(args);
|
||||||
|
}
|
||||||
|
// Check key name and set event key
|
||||||
|
if(!string_cmp(key_name, "up")) {
|
||||||
|
event.key = InputKeyUp;
|
||||||
|
} else if(!string_cmp(key_name, "down")) {
|
||||||
|
event.key = InputKeyDown;
|
||||||
|
} else if(!string_cmp(key_name, "left")) {
|
||||||
|
event.key = InputKeyLeft;
|
||||||
|
} else if(!string_cmp(key_name, "right")) {
|
||||||
|
event.key = InputKeyRight;
|
||||||
|
} else if(!string_cmp(key_name, "ok")) {
|
||||||
|
event.key = InputKeyOk;
|
||||||
|
} else if(!string_cmp(key_name, "back")) {
|
||||||
|
event.key = InputKeyBack;
|
||||||
|
} else {
|
||||||
|
printf("Wrong argument");
|
||||||
|
string_clear(key_name);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
string_clear(key_name);
|
||||||
|
// Check the rest of args string and set event type
|
||||||
|
if(!string_cmp(args, "press")) {
|
||||||
|
event.type = InputTypePress;
|
||||||
|
} else if(!string_cmp(args, "release")) {
|
||||||
|
event.type = InputTypeRelease;
|
||||||
|
} else if(!string_cmp(args, "short")) {
|
||||||
|
event.type = InputTypeShort;
|
||||||
|
} else if(!string_cmp(args, "long")) {
|
||||||
|
event.type = InputTypeLong;
|
||||||
|
} else {
|
||||||
|
printf("Wrong argument");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
// Publish input event
|
||||||
|
notify_pubsub(&input->event_pubsub, &event);
|
||||||
|
}
|
||||||
|
|
||||||
int32_t input_task() {
|
int32_t input_task() {
|
||||||
input = furi_alloc(sizeof(Input));
|
input = furi_alloc(sizeof(Input));
|
||||||
input->thread = osThreadGetId();
|
input->thread = osThreadGetId();
|
||||||
init_pubsub(&input->event_pubsub);
|
init_pubsub(&input->event_pubsub);
|
||||||
furi_record_create("input_events", &input->event_pubsub);
|
furi_record_create("input_events", &input->event_pubsub);
|
||||||
|
|
||||||
|
input->cli = furi_record_open("cli");
|
||||||
|
if(input->cli) {
|
||||||
|
cli_add_command(input->cli, "input_send", input_cli_send, input);
|
||||||
|
}
|
||||||
|
|
||||||
const size_t pin_count = input_pins_count;
|
const size_t pin_count = input_pins_count;
|
||||||
input->pin_states = furi_alloc(pin_count * sizeof(InputPinState));
|
input->pin_states = furi_alloc(pin_count * sizeof(InputPinState));
|
||||||
|
|
||||||
|
@ -6,6 +6,7 @@
|
|||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <furi.h>
|
#include <furi.h>
|
||||||
|
#include <cli/cli.h>
|
||||||
|
|
||||||
#define INPUT_DEBOUNCE_TICKS_HALF (INPUT_DEBOUNCE_TICKS / 2)
|
#define INPUT_DEBOUNCE_TICKS_HALF (INPUT_DEBOUNCE_TICKS / 2)
|
||||||
#define INPUT_LONG_PRESS_TICKS 2048
|
#define INPUT_LONG_PRESS_TICKS 2048
|
||||||
@ -25,6 +26,7 @@ typedef struct {
|
|||||||
osThreadId_t thread;
|
osThreadId_t thread;
|
||||||
PubSub event_pubsub;
|
PubSub event_pubsub;
|
||||||
InputPinState* pin_states;
|
InputPinState* pin_states;
|
||||||
|
Cli* cli;
|
||||||
} Input;
|
} Input;
|
||||||
|
|
||||||
/* Input press timer callback */
|
/* Input press timer callback */
|
||||||
|
Loading…
Reference in New Issue
Block a user