Fix crash when no VGM. Use void* context (support more input scenarios).
This commit is contained in:
parent
05e629786a
commit
00e2574c5a
@ -35,7 +35,7 @@ struct ImuController {
|
|||||||
ImuControllerQueue queue_message;
|
ImuControllerQueue queue_message;
|
||||||
FuriMutex* mutex;
|
FuriMutex* mutex;
|
||||||
Imu* imu;
|
Imu* imu;
|
||||||
FuriMessageQueue* event_queue;
|
void* context;
|
||||||
FuriTimer* timer;
|
FuriTimer* timer;
|
||||||
uint32_t button_press_tick[InputKeyMAX];
|
uint32_t button_press_tick[InputKeyMAX];
|
||||||
ButtonState button_state[InputKeyMAX];
|
ButtonState button_state[InputKeyMAX];
|
||||||
@ -59,11 +59,11 @@ static void imu_controller_release(ImuController* controller, InputKey key) {
|
|||||||
// If the button was pressed, send a InputTypeShort event
|
// If the button was pressed, send a InputTypeShort event
|
||||||
// (otherwise we already sent a InputTypeLong event).
|
// (otherwise we already sent a InputTypeLong event).
|
||||||
if(controller->button_state[key] == ButtonStatePressed) {
|
if(controller->button_state[key] == ButtonStatePressed) {
|
||||||
controller->queue_message(controller->event_queue, InputTypeShort, key);
|
controller->queue_message(controller->context, InputTypeShort, key);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Send a InputTypeRelease event
|
// Send a InputTypeRelease event
|
||||||
controller->queue_message(controller->event_queue, InputTypeRelease, key);
|
controller->queue_message(controller->context, InputTypeRelease, key);
|
||||||
// Reset the button state
|
// Reset the button state
|
||||||
controller->button_press_tick[key] = 0;
|
controller->button_press_tick[key] = 0;
|
||||||
controller->button_state[key] = ButtonStateReleased;
|
controller->button_state[key] = ButtonStateReleased;
|
||||||
@ -89,7 +89,7 @@ static void imu_controller_press(ImuController* controller, InputKey key) {
|
|||||||
(controller->button_state[key] == ButtonStatePressed &&
|
(controller->button_state[key] == ButtonStatePressed &&
|
||||||
duration >= controller->config->button_state_long_ms)) {
|
duration >= controller->config->button_state_long_ms)) {
|
||||||
// Send a InputTypeLong event
|
// Send a InputTypeLong event
|
||||||
controller->queue_message(controller->event_queue, InputTypeLong, key);
|
controller->queue_message(controller->context, InputTypeLong, key);
|
||||||
// Update the button state
|
// Update the button state
|
||||||
controller->button_press_tick[key] = furi_get_tick();
|
controller->button_press_tick[key] = furi_get_tick();
|
||||||
controller->button_state[key] = ButtonStateLongPressed;
|
controller->button_state[key] = ButtonStateLongPressed;
|
||||||
@ -100,7 +100,7 @@ static void imu_controller_press(ImuController* controller, InputKey key) {
|
|||||||
(controller->button_state[key] >= ButtonStateLongPressed &&
|
(controller->button_state[key] >= ButtonStateLongPressed &&
|
||||||
duration > controller->config->button_state_repeat_ms)) {
|
duration > controller->config->button_state_repeat_ms)) {
|
||||||
// Send a InputTypeRepeat event
|
// Send a InputTypeRepeat event
|
||||||
controller->queue_message(controller->event_queue, InputTypeRepeat, key);
|
controller->queue_message(controller->context, InputTypeRepeat, key);
|
||||||
// Update the button state
|
// Update the button state
|
||||||
controller->button_press_tick[key] = furi_get_tick();
|
controller->button_press_tick[key] = furi_get_tick();
|
||||||
controller->button_state[key] = ButtonStateRepeatPressed;
|
controller->button_state[key] = ButtonStateRepeatPressed;
|
||||||
@ -132,7 +132,7 @@ static void imu_controller_press(ImuController* controller, InputKey key) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Send a InputTypePress event
|
// Send a InputTypePress event
|
||||||
controller->queue_message(controller->event_queue, InputTypePress, key);
|
controller->queue_message(controller->context, InputTypePress, key);
|
||||||
|
|
||||||
// Update the button state
|
// Update the button state
|
||||||
controller->button_press_tick[key] = furi_get_tick();
|
controller->button_press_tick[key] = furi_get_tick();
|
||||||
@ -155,6 +155,7 @@ static void imu_controller_callback(void* context) {
|
|||||||
// Acquire the mutex to access the IMU
|
// Acquire the mutex to access the IMU
|
||||||
furi_mutex_acquire(imu_controller->mutex, FuriWaitForever);
|
furi_mutex_acquire(imu_controller->mutex, FuriWaitForever);
|
||||||
|
|
||||||
|
if(imu_present(imu_controller->imu)) {
|
||||||
// Get the roll (up/down)
|
// Get the roll (up/down)
|
||||||
float roll = imu_roll_get(imu_controller->imu);
|
float roll = imu_roll_get(imu_controller->imu);
|
||||||
if(roll > imu_controller->config->roll_up) {
|
if(roll > imu_controller->config->roll_up) {
|
||||||
@ -184,6 +185,7 @@ static void imu_controller_callback(void* context) {
|
|||||||
imu_controller_release(imu_controller, InputKeyLeft);
|
imu_controller_release(imu_controller, InputKeyLeft);
|
||||||
imu_controller_release(imu_controller, InputKeyRight);
|
imu_controller_release(imu_controller, InputKeyRight);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Release the mutex, so other threads can access the IMU
|
// Release the mutex, so other threads can access the IMU
|
||||||
furi_mutex_release(imu_controller->mutex);
|
furi_mutex_release(imu_controller->mutex);
|
||||||
@ -203,20 +205,20 @@ static void imu_controller_release_buttons(void* context) {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Allocate a new IMU controller
|
* @brief Allocate a new IMU controller
|
||||||
* @param event_queue The event queue
|
* @param context The context for callbacks
|
||||||
* @param config The configuration for pitch and roll
|
* @param config The configuration for pitch and roll
|
||||||
* @param queue_message A callback to queue input messages
|
* @param queue_message A callback to queue input messages
|
||||||
* @return The new IMU controller
|
* @return The new IMU controller
|
||||||
*/
|
*/
|
||||||
ImuController* imu_controller_alloc(
|
ImuController* imu_controller_alloc(
|
||||||
FuriMessageQueue* event_queue,
|
void* context,
|
||||||
const ImuControllerConfig* config,
|
const ImuControllerConfig* config,
|
||||||
ImuControllerQueue queue_message) {
|
ImuControllerQueue queue_message) {
|
||||||
ImuController* imu_controller = malloc(sizeof(ImuController));
|
ImuController* imu_controller = malloc(sizeof(ImuController));
|
||||||
imu_controller->mutex = furi_mutex_alloc(FuriMutexTypeNormal);
|
imu_controller->mutex = furi_mutex_alloc(FuriMutexTypeNormal);
|
||||||
imu_controller->queue_message = queue_message;
|
imu_controller->queue_message = queue_message;
|
||||||
imu_controller->imu = imu_alloc();
|
imu_controller->imu = imu_alloc();
|
||||||
imu_controller->event_queue = event_queue;
|
imu_controller->context = context;
|
||||||
imu_controller->config = config;
|
imu_controller->config = config;
|
||||||
imu_controller->timer =
|
imu_controller->timer =
|
||||||
furi_timer_alloc(imu_controller_callback, FuriTimerTypePeriodic, imu_controller);
|
furi_timer_alloc(imu_controller_callback, FuriTimerTypePeriodic, imu_controller);
|
||||||
|
@ -40,21 +40,21 @@ extern const ImuControllerConfig IMU_CONTROLLER_DEFAULT_CONFIG;
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief A callback to queue input messages from the IMU controller to the event queue
|
* @brief A callback to queue input messages from the IMU controller to the event queue
|
||||||
* @param event_queue The event queue
|
* @param context The context for the callback
|
||||||
* @param type The input type
|
* @param type The input type
|
||||||
* @param key The input key
|
* @param key The input key
|
||||||
*/
|
*/
|
||||||
typedef void (*ImuControllerQueue)(FuriMessageQueue* event_queue, InputType type, InputKey key);
|
typedef void (*ImuControllerQueue)(void* context, InputType type, InputKey key);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Allocate a new IMU controller
|
* @brief Allocate a new IMU controller
|
||||||
* @param event_queue The event queue
|
* @param context The context for callbacks
|
||||||
* @param config The configuration for pitch and roll
|
* @param config The configuration for pitch and roll
|
||||||
* @param queue_message A callback to queue input messages
|
* @param queue_message A callback to queue input messages
|
||||||
* @return The new IMU controller
|
* @return The new IMU controller
|
||||||
*/
|
*/
|
||||||
ImuController* imu_controller_alloc(
|
ImuController* imu_controller_alloc(
|
||||||
FuriMessageQueue* event_queue,
|
void* context,
|
||||||
const ImuControllerConfig* config,
|
const ImuControllerConfig* config,
|
||||||
ImuControllerQueue queue_message);
|
ImuControllerQueue queue_message);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user