|
@@ -46,8 +46,8 @@
|
|
|
//
|
|
//
|
|
|
static void cbTimer(void* ctx) {
|
|
static void cbTimer(void* ctx) {
|
|
|
ENTER;
|
|
ENTER;
|
|
|
|
|
+ furi_assert(ctx);
|
|
|
FuriMessageQueue* queue = ctx;
|
|
FuriMessageQueue* queue = ctx;
|
|
|
- furi_assert(queue);
|
|
|
|
|
|
|
|
|
|
eventMsg_t message = {.id = EVID_TICK};
|
|
eventMsg_t message = {.id = EVID_TICK};
|
|
|
furi_message_queue_put(queue, &message, 0);
|
|
furi_message_queue_put(queue, &message, 0);
|
|
@@ -62,9 +62,14 @@ static void cbTimer(void* ctx) {
|
|
|
//
|
|
//
|
|
|
static void cbInput(InputEvent* event, void* ctx) {
|
|
static void cbInput(InputEvent* event, void* ctx) {
|
|
|
ENTER;
|
|
ENTER;
|
|
|
|
|
+<<<<<<< HEAD
|
|
|
FuriMessageQueue* queue = ctx;
|
|
FuriMessageQueue* queue = ctx;
|
|
|
furi_assert(queue);
|
|
furi_assert(queue);
|
|
|
|
|
+=======
|
|
|
|
|
+ furi_assert(ctx);
|
|
|
|
|
+>>>>>>> 19c5ebf73a10da65de9107d6c33364e8524b0016
|
|
|
furi_assert(event);
|
|
furi_assert(event);
|
|
|
|
|
+ FuriMessageQueue* queue = ctx;
|
|
|
|
|
|
|
|
// Put an "input" event message on the message queue
|
|
// Put an "input" event message on the message queue
|
|
|
eventMsg_t message = {.id = EVID_KEY, .input = *event};
|
|
eventMsg_t message = {.id = EVID_KEY, .input = *event};
|