Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-05-22 05:14:46 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fz-dev' into dev

Browse Source
This commit is contained in:
Eng1n33r
2022-07-20 16:28:48 +03:00
parent 8e7246ae8c ec57dd310a
commit ad970c6c6d
265 changed files with 2576 additions and 3884 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
applications/snake_game/snake_game.c
View File

@@ -113,18 +113,18 @@ static void snake_game_render_callback(Canvas* const canvas, void* ctx) {
release_mutex((ValueMutex*)ctx, snake_state);
}
static void snake_game_input_callback(InputEvent* input_event, osMessageQueueId_t event_queue) {
static void snake_game_input_callback(InputEvent* input_event, FuriMessageQueue* event_queue) {
furi_assert(event_queue);
SnakeEvent event = {.type = EventTypeKey, .input = *input_event};
osMessageQueuePut(event_queue, &event, 0, osWaitForever);
furi_message_queue_put(event_queue, &event, FuriWaitForever);
}
static void snake_game_update_timer_callback(osMessageQueueId_t event_queue) {
static void snake_game_update_timer_callback(FuriMessageQueue* event_queue) {
furi_assert(event_queue);
SnakeEvent event = {.type = EventTypeTick};
osMessageQueuePut(event_queue, &event, 0, 0);
furi_message_queue_put(event_queue, &event, 0);
}
static void snake_game_init_game(SnakeState* const snake_state) {
@@ -296,7 +296,7 @@ int32_t snake_game_app(void* p) {
UNUSED(p);
srand(DWT->CYCCNT);
osMessageQueueId_t event_queue = osMessageQueueNew(8, sizeof(SnakeEvent), NULL);
FuriMessageQueue* event_queue = furi_message_queue_alloc(8, sizeof(SnakeEvent));
SnakeState* snake_state = malloc(sizeof(SnakeState));
snake_game_init_game(snake_state);
@@ -312,9 +312,9 @@ int32_t snake_game_app(void* p) {
view_port_draw_callback_set(view_port, snake_game_render_callback, &state_mutex);
view_port_input_callback_set(view_port, snake_game_input_callback, event_queue);
osTimerId_t timer =
osTimerNew(snake_game_update_timer_callback, osTimerPeriodic, event_queue, NULL);
osTimerStart(timer, osKernelGetTickFreq() / 4);
FuriTimer* timer =
furi_timer_alloc(snake_game_update_timer_callback, FuriTimerTypePeriodic, event_queue);
furi_timer_start(timer, furi_kernel_get_tick_frequency() / 4);
// Open GUI and register view_port
Gui* gui = furi_record_open("gui");
@@ -322,11 +322,11 @@ int32_t snake_game_app(void* p) {
SnakeEvent event;
for(bool processing = true; processing;) {
osStatus_t event_status = osMessageQueueGet(event_queue, &event, NULL, 100);
FuriStatus event_status = furi_message_queue_get(event_queue, &event, 100);
SnakeState* snake_state = (SnakeState*)acquire_mutex_block(&state_mutex);
if(event_status == osOK) {
if(event_status == FuriStatusOk) {
// press events
if(event.type == EventTypeKey) {
if(event.input.type == InputTypePress) {
@@ -364,12 +364,12 @@ int32_t snake_game_app(void* p) {
release_mutex(&state_mutex, snake_state);
}
osTimerDelete(timer);
furi_timer_free(timer);
view_port_enabled_set(view_port, false);
gui_remove_view_port(gui, view_port);
furi_record_close("gui");
view_port_free(view_port);
osMessageQueueDelete(event_queue);
furi_message_queue_free(event_queue);
delete_mutex(&state_mutex);
free(snake_state);