refactor: use ms in update method

.editorconfig

@@ -0,0 +1,30 @@
+# EditorConfig helps developers define and maintain consistent
+# coding styles between different editors and IDEs
+# editorconfig.org
+
+root = true
+
+[*]
+
+# Change these settings to your own preference
+indent_style = space
+indent_size = 4
+
+# We recommend you to keep these unchanged
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.md]
+trim_trailing_whitespace = false
+
+[Makefile]
+indent_style = tab
+
+[*.{yml,jade,js,css,lua,json}]
+indent_size = 2
+
+[*.go]
+indent_style = tab
+indent_size = 4

Makefile

@@ -2,7 +2,7 @@ FLIPPER_FIRMWARE_PATH ?= /home/gelin/work/github/flipperzero-firmware/
 
 .PHONY: build
 build: $(FLIPPER_FIRMWARE_PATH)/applications_user/t-rex-runner
-	cd $(FLIPPER_FIRMWARE_PATH) && ./fbt firmware_t-rex-runner
+	cd $(FLIPPER_FIRMWARE_PATH) && ./fbt fap_t-rex-runner
 
 .PHONY: launch
 launch: $(FLIPPER_FIRMWARE_PATH)/applications_user/t-rex-runner

assets_icons.c

@@ -20,6 +20,6 @@ const uint8_t* const _I_HorizonLine1[] = {_I_HorizonLine1_0};
 const Icon I_Dino = {.width=20,.height=22,.frame_count=1,.frame_rate=0,.frames=_I_Dino};
 const Icon I_DinoRun0 = {.width=20,.height=22,.frame_count=1,.frame_rate=0,.frames=_I_DinoRun0};
 const Icon I_DinoRun1 = {.width=20,.height=22,.frame_count=1,.frame_rate=0,.frames=_I_DinoRun1};
-const Icon I_HorizonLine0 = {.width=600,.height=12,.frame_count=1,.frame_rate=0,.frames=_I_HorizonLine0};
-const Icon I_HorizonLine1 = {.width=600,.height=12,.frame_count=1,.frame_rate=0,.frames=_I_HorizonLine1};
+//const Icon I_HorizonLine0 = {.width=600,.height=12,.frame_count=1,.frame_rate=0,.frames=_I_HorizonLine0};
+//const Icon I_HorizonLine1 = {.width=600,.height=12,.frame_count=1,.frame_rate=0,.frames=_I_HorizonLine1};
 

assets_icons.h

@@ -5,5 +5,5 @@
 extern const Icon I_Dino;
 extern const Icon I_DinoRun0;
 extern const Icon I_DinoRun1;
-extern const Icon I_HorizonLine0;
-extern const Icon I_HorizonLine1;
+//extern const Icon I_HorizonLine0;
+//extern const Icon I_HorizonLine1;

trexrunner.c

@@ -12,7 +12,7 @@
 
 #define FPS 60
 
-#define DINO_RUNNING_TICKS 15
+#define DINO_RUNNING_MS_PER_FRAME 100
 
 typedef enum {
     EventTypeTick,
@@ -25,121 +25,131 @@ typedef struct {
 } PluginEvent;
 
 typedef struct {
-  FuriTimer* timer;
-  const Icon* dino_icon;
-  int dino_tick;
+    FuriTimer *timer;
+    uint32_t last_tick;
+    const Icon* dino_icon;
+    int dino_frame_ms;
 } GameState;
 
-static void timer_callback(void* ctx) {
-  GameState* game_state = acquire_mutex((ValueMutex*)ctx, 25);
-  if (game_state == NULL) {
-    return;
-  }
-
-  // game update
-  game_state->dino_tick++;
-  // TODO: switch by dino state
-  if (game_state->dino_tick >= DINO_RUNNING_TICKS) {
-    if (game_state->dino_icon == &I_DinoRun0) {
-      game_state->dino_icon = &I_DinoRun1;
-    } else {
-      game_state->dino_icon = &I_DinoRun0;
+static void timer_callback(void *ctx) {
+    GameState *game_state = acquire_mutex((ValueMutex *) ctx, 25);
+    if (game_state == NULL) {
+        return;
     }
-    game_state->dino_tick = 0;
-  }
 
-  release_mutex((ValueMutex*)ctx, game_state);
+    uint32_t ticks_elapsed = furi_get_tick() - game_state->last_tick;
+    int delta_time_ms = ticks_elapsed * 1000 / furi_kernel_get_tick_frequency();
+
+    // dino update
+    game_state->dino_frame_ms += delta_time_ms;
+    // TODO: switch by dino state
+    if (game_state->dino_frame_ms >= DINO_RUNNING_MS_PER_FRAME) {
+        if (game_state->dino_icon == &I_DinoRun0) {
+            game_state->dino_icon = &I_DinoRun1;
+        } else {
+            game_state->dino_icon = &I_DinoRun0;
+        }
+        game_state->dino_frame_ms = 0;
+    }
+
+    release_mutex((ValueMutex *) ctx, game_state);
 }
 
-static void input_callback(InputEvent* input_event, FuriMessageQueue* event_queue) {
+static void input_callback(InputEvent *input_event, FuriMessageQueue *event_queue) {
     furi_assert(event_queue);
 
     PluginEvent event = {.type = EventTypeKey, .input = *input_event};
     furi_message_queue_put(event_queue, &event, FuriWaitForever);
 }
 
-static void render_callback(Canvas* const canvas, void* ctx) {
-  const GameState* game_state = acquire_mutex((ValueMutex*)ctx, 25);
-  if (game_state == NULL) {
-    return;
-  }
+static void render_callback(Canvas *const canvas, void *ctx) {
+    const GameState *game_state = acquire_mutex((ValueMutex *) ctx, 25);
+    if (game_state == NULL) {
+        return;
+    }
 
 //  canvas_draw_xbm(canvas, 0, 0, dino_width, dino_height, dino_bits);
-  canvas_draw_icon(canvas, DINO_START_X, DINO_START_Y, game_state->dino_icon);
+    canvas_draw_icon(canvas, DINO_START_X, DINO_START_Y, game_state->dino_icon);
 
-  release_mutex((ValueMutex*)ctx, game_state);
+    release_mutex((ValueMutex *) ctx, game_state);
 }
 
-static void game_state_init(GameState* const game_state) {
-  game_state->dino_tick = 0;
-  game_state->dino_icon = &I_Dino;
+static void game_state_init(GameState *const game_state) {
+    game_state->last_tick = furi_get_tick();
+    game_state->dino_frame_ms = 0;
+    game_state->dino_icon = &I_Dino;
 }
 
-int32_t trexrunner_app(void* p) {
-  UNUSED(p);
+int32_t trexrunner_app(void *p) {
+    UNUSED(p);
 
-  FuriMessageQueue* event_queue = furi_message_queue_alloc(8, sizeof(PluginEvent));
+    FuriMessageQueue *event_queue = furi_message_queue_alloc(8, sizeof(PluginEvent));
 
-  GameState* game_state = malloc(sizeof(GameState));
-  game_state_init(game_state);
+    GameState *game_state = malloc(sizeof(GameState));
+    game_state_init(game_state);
 
-  ValueMutex state_mutex;
-  if (!init_mutex(&state_mutex, game_state, sizeof(game_state))) {
-      FURI_LOG_E("T-rex runner", "cannot create mutex\r\n");
+    ValueMutex state_mutex;
+    if (!init_mutex(&state_mutex, game_state, sizeof(game_state))) {
+        FURI_LOG_E("T-rex runner", "cannot create mutex\r\n");
         free(game_state);
-      return 255;
-  }
-  // BEGIN IMPLEMENTATION
+        return 255;
+    }
+    // BEGIN IMPLEMENTATION
 
-  // Set system callbacks
-  ViewPort* view_port = view_port_alloc();
-  view_port_draw_callback_set(view_port, render_callback, &state_mutex);
-  view_port_input_callback_set(view_port, input_callback, event_queue);
-  game_state->timer = furi_timer_alloc(timer_callback, FuriTimerTypePeriodic, &state_mutex);
+    // Set system callbacks
+    ViewPort *view_port = view_port_alloc();
+    view_port_draw_callback_set(view_port, render_callback, &state_mutex);
+    view_port_input_callback_set(view_port, input_callback, event_queue);
+    game_state->timer = furi_timer_alloc(timer_callback, FuriTimerTypePeriodic, &state_mutex);
 
-  furi_timer_start(game_state->timer, (uint32_t) furi_kernel_get_tick_frequency() / FPS);
+    furi_timer_start(game_state->timer, (uint32_t) furi_kernel_get_tick_frequency() / FPS);
 
-  // Open GUI and register view_port
-  Gui* gui = furi_record_open("gui");
-  gui_add_view_port(gui, view_port, GuiLayerFullscreen);
+    // Open GUI and register view_port
+    Gui *gui = furi_record_open("gui");
+    gui_add_view_port(gui, view_port, GuiLayerFullscreen);
 
-  PluginEvent event;
-  for (bool processing = true; processing;) {
-    FuriStatus event_status = furi_message_queue_get(event_queue, &event, 100);
+    PluginEvent event;
+    for (bool processing = true; processing;) {
+        FuriStatus event_status = furi_message_queue_get(event_queue, &event, 100);
 //    Minesweeper* minesweeper_state = (Minesweeper*)acquire_mutex_block(&state_mutex);
-    if (event_status == FuriStatusOk) {
-      // press events
-      if (event.type == EventTypeKey) {
-        if (event.input.type == InputTypeShort) {
-          switch (event.input.key) {
-          case InputKeyUp: break;
-          case InputKeyDown: break;
-          case InputKeyLeft: break;
-          case InputKeyRight: break;
-          case InputKeyOk: break;
-          case InputKeyBack:
-            // Exit the app
-            processing = false;
-            break;
-          }
+        if (event_status == FuriStatusOk) {
+            // press events
+            if (event.type == EventTypeKey) {
+                if (event.input.type == InputTypeShort) {
+                    switch (event.input.key) {
+                        case InputKeyUp:
+                            break;
+                        case InputKeyDown:
+                            break;
+                        case InputKeyLeft:
+                            break;
+                        case InputKeyRight:
+                            break;
+                        case InputKeyOk:
+                            break;
+                        case InputKeyBack:
+                            // Exit the app
+                            processing = false;
+                            break;
+                    }
+                }
+            }
+        } else {
+            // event timeout
+            ;
         }
-      }
-    } else {
-      // event timeout
-      ;
+        view_port_update(view_port);
+        release_mutex(&state_mutex, game_state);
     }
-    view_port_update(view_port);
-    release_mutex(&state_mutex, game_state);
-  }
-
-  view_port_enabled_set(view_port, false);
-  gui_remove_view_port(gui, view_port);
-  furi_record_close("gui");
-  view_port_free(view_port);
-  furi_message_queue_free(event_queue);
-  delete_mutex(&state_mutex);
-  furi_timer_free(game_state->timer);
-  free(game_state);
-
-  return 0;
+
+    view_port_enabled_set(view_port, false);
+    gui_remove_view_port(gui, view_port);
+    furi_record_close("gui");
+    view_port_free(view_port);
+    furi_message_queue_free(event_queue);
+    delete_mutex(&state_mutex);
+    furi_timer_free(game_state->timer);
+    free(game_state);
+
+    return 0;
 }