Squashed 'rc2014_coleco/' changes from d349b9e9b..f580a8e67

f580a8e67 move apps
REVERT: d349b9e9b Add .gitignore.
REVERT: ec8cada9a Update application manifest.
REVERT: 6f2ad1b13 Update GPIO pin naming.
REVERT: ee86e18e9 Update to furi_mutex.
REVERT: bb4af7666 Add video and sound card repository links.
REVERT: 73e8ca64c Fix typo.
REVERT: 4b08f1870 Expand README.
REVERT: e40eae90f Add indicators to joystick/fire selected icons.
REVERT: baa1847af Use uint8_t for numpad code.
REVERT: 1a23a4b18 Split fire and alternate buttons.
REVERT: 7816e40e7 Implement controller GUI.
REVERT: 57331207a Modify for use with an external 74257 multiplexer instead of ISR pin.
REVERT: 9e0615f35 Merge branch 'main' of github.com:ezod/flipperzero-rc2014-coleco
REVERT: 3484f3f8d Process output changes in a thread.
REVERT: 98b3cf2a0 First draft of ColecoVision controller app.
REVERT: defa5759e Add controller interface schematic and PCB layout.
REVERT: b8b028b63 Skeleton application.
REVERT: 03bd35e6d Initial README contents.
REVERT: 8e0f8c3d9 Initial commit

git-subtree-dir: rc2014_coleco
git-subtree-split: f580a8e67e0d9a7900e9f4497e08f207cd55ac2d

.gitignore

@@ -50,8 +50,3 @@ modules.order
 Module.symvers
 Mkfile.old
 dkms.conf
-
-# uFBT
-.vscode
-.clang-format
-dist/

application.fam

@@ -3,6 +3,7 @@ App(
     name="RC2014 ColecoVision",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="coleco_app",
+    cdefines=["APP_COLECO"],
     requires=["gui"],
     stack_size=1 * 1024,
     order=35,

coleco.c

@@ -29,392 +29,336 @@ const GpioPin* const pin_code3 = &gpio_ext_pc1;
 const GpioPin* const pin_fire = &gpio_ext_pb3;
 const GpioPin* const pin_alt = &gpio_usart_tx;
 
-typedef enum
-{
-  EventTypeTick,
-  EventTypeKey,
+typedef enum {
+    EventTypeTick,
+    EventTypeKey,
 } EventType;
 
-typedef struct
-{
-  EventType type;
-  InputEvent input;
+typedef struct {
+    EventType type;
+    InputEvent input;
 } PluginEvent;
 
-typedef struct
-{
-  bool dpad;
-  int row;
-  int column;
-  FuriMutex* mutex;
+typedef struct {
+    FuriMutex* mutex;
+    bool dpad;
+    int row;
+    int column;
 } Coleco;
 
-static void render_callback(Canvas* const canvas, void* context)
-{
-  Coleco* coleco = (Coleco*)context;
-  furi_mutex_acquire(coleco->mutex, FuriWaitForever);
-
-  if (coleco->dpad)
-  {
-    canvas_draw_icon(canvas, 4, 16, &I_ColecoJoystick_sel_33x33);
-    canvas_draw_icon(canvas, 27, 52, &I_ColecoFire_sel_18x9);
-  }
-  else
-  {
-    const bool hvr = coleco->row == 0 && coleco->column < 2;
-    canvas_draw_icon(canvas, 4, 16, hvr ? &I_ColecoJoystick_hvr_33x33 : &I_ColecoJoystick_33x33);
-    canvas_draw_icon(canvas, 27, 52, hvr ? &I_ColecoFire_hvr_18x9 : &I_ColecoFire_18x9);
-  }
-
-  canvas_draw_icon(canvas, 27, 4,
-      (coleco->row == 0 && coleco->column == 2) ? &I_ColecoAlt_hvr_18x9 : &I_ColecoAlt_18x9);
-  canvas_draw_icon(canvas, 49, 44,
-      (coleco->row == 1 && coleco->column == 0) ? &I_Coleco1_hvr_17x17 : &I_Coleco1_17x17);
-  canvas_draw_icon(canvas, 49, 24,
-      (coleco->row == 1 && coleco->column == 1) ? &I_Coleco2_hvr_17x17 : &I_Coleco2_17x17);
-  canvas_draw_icon(canvas, 49, 4,
-      (coleco->row == 1 && coleco->column == 2) ? &I_Coleco3_hvr_17x17 : &I_Coleco3_17x17);
-  canvas_draw_icon(canvas, 69, 44,
-      (coleco->row == 2 && coleco->column == 0) ? &I_Coleco4_hvr_17x17 : &I_Coleco4_17x17);
-  canvas_draw_icon(canvas, 69, 24,
-      (coleco->row == 2 && coleco->column == 1) ? &I_Coleco5_hvr_17x17 : &I_Coleco5_17x17);
-  canvas_draw_icon(canvas, 69, 4,
-      (coleco->row == 2 && coleco->column == 2) ? &I_Coleco6_hvr_17x17 : &I_Coleco6_17x17);
-  canvas_draw_icon(canvas, 89, 44,
-      (coleco->row == 3 && coleco->column == 0) ? &I_Coleco7_hvr_17x17 : &I_Coleco7_17x17);
-  canvas_draw_icon(canvas, 89, 24,
-      (coleco->row == 3 && coleco->column == 1) ? &I_Coleco8_hvr_17x17 : &I_Coleco8_17x17);
-  canvas_draw_icon(canvas, 89, 4,
-      (coleco->row == 3 && coleco->column == 2) ? &I_Coleco9_hvr_17x17 : &I_Coleco9_17x17);
-  canvas_draw_icon(canvas, 109, 44,
-      (coleco->row == 4 && coleco->column == 0) ? &I_ColecoStar_hvr_17x17 : &I_ColecoStar_17x17);
-  canvas_draw_icon(canvas, 109, 24,
-      (coleco->row == 4 && coleco->column == 1) ? &I_Coleco0_hvr_17x17 : &I_Coleco0_17x17);
-  canvas_draw_icon(canvas, 109, 4,
-      (coleco->row == 4 && coleco->column == 2) ? &I_ColecoPound_hvr_17x17 : &I_ColecoPound_17x17);
-
-  furi_mutex_release(coleco->mutex);
-}
+static void render_callback(Canvas* const canvas, void* context) {
+    furi_assert(context);
+    Coleco* coleco = context;
+    furi_mutex_acquire(coleco->mutex, FuriWaitForever);
 
-static void input_callback(InputEvent* input_event, FuriMessageQueue* event_queue)
-{
-  furi_assert(event_queue);
+    if(coleco->dpad) {
+        canvas_draw_icon(canvas, 4, 16, &I_ColecoJoystick_sel_33x33);
+        canvas_draw_icon(canvas, 27, 52, &I_ColecoFire_sel_18x9);
+    } else {
+        const bool hvr = coleco->row == 0 && coleco->column < 2;
+        canvas_draw_icon(
+            canvas, 4, 16, hvr ? &I_ColecoJoystick_hvr_33x33 : &I_ColecoJoystick_33x33);
+        canvas_draw_icon(canvas, 27, 52, hvr ? &I_ColecoFire_hvr_18x9 : &I_ColecoFire_18x9);
+    }
 
-  PluginEvent event = {.type = EventTypeKey, .input = *input_event};
-  furi_message_queue_put(event_queue, &event, FuriWaitForever);
+    canvas_draw_icon(
+        canvas,
+        27,
+        4,
+        (coleco->row == 0 && coleco->column == 2) ? &I_ColecoAlt_hvr_18x9 : &I_ColecoAlt_18x9);
+    canvas_draw_icon(
+        canvas,
+        49,
+        44,
+        (coleco->row == 1 && coleco->column == 0) ? &I_Coleco1_hvr_17x17 : &I_Coleco1_17x17);
+    canvas_draw_icon(
+        canvas,
+        49,
+        24,
+        (coleco->row == 1 && coleco->column == 1) ? &I_Coleco2_hvr_17x17 : &I_Coleco2_17x17);
+    canvas_draw_icon(
+        canvas,
+        49,
+        4,
+        (coleco->row == 1 && coleco->column == 2) ? &I_Coleco3_hvr_17x17 : &I_Coleco3_17x17);
+    canvas_draw_icon(
+        canvas,
+        69,
+        44,
+        (coleco->row == 2 && coleco->column == 0) ? &I_Coleco4_hvr_17x17 : &I_Coleco4_17x17);
+    canvas_draw_icon(
+        canvas,
+        69,
+        24,
+        (coleco->row == 2 && coleco->column == 1) ? &I_Coleco5_hvr_17x17 : &I_Coleco5_17x17);
+    canvas_draw_icon(
+        canvas,
+        69,
+        4,
+        (coleco->row == 2 && coleco->column == 2) ? &I_Coleco6_hvr_17x17 : &I_Coleco6_17x17);
+    canvas_draw_icon(
+        canvas,
+        89,
+        44,
+        (coleco->row == 3 && coleco->column == 0) ? &I_Coleco7_hvr_17x17 : &I_Coleco7_17x17);
+    canvas_draw_icon(
+        canvas,
+        89,
+        24,
+        (coleco->row == 3 && coleco->column == 1) ? &I_Coleco8_hvr_17x17 : &I_Coleco8_17x17);
+    canvas_draw_icon(
+        canvas,
+        89,
+        4,
+        (coleco->row == 3 && coleco->column == 2) ? &I_Coleco9_hvr_17x17 : &I_Coleco9_17x17);
+    canvas_draw_icon(
+        canvas,
+        109,
+        44,
+        (coleco->row == 4 && coleco->column == 0) ? &I_ColecoStar_hvr_17x17 : &I_ColecoStar_17x17);
+    canvas_draw_icon(
+        canvas,
+        109,
+        24,
+        (coleco->row == 4 && coleco->column == 1) ? &I_Coleco0_hvr_17x17 : &I_Coleco0_17x17);
+    canvas_draw_icon(
+        canvas,
+        109,
+        4,
+        (coleco->row == 4 && coleco->column == 2) ? &I_ColecoPound_hvr_17x17 :
+                                                    &I_ColecoPound_17x17);
+
+    furi_mutex_release(coleco->mutex);
 }
 
-static void coleco_write_code(uint8_t code)
-{
-  furi_hal_gpio_write(pin_code0, (code & 1));
-  furi_hal_gpio_write(pin_code1, (code & 2));
-  furi_hal_gpio_write(pin_code2, (code & 4));
-  furi_hal_gpio_write(pin_code3, (code & 8));
+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 coleco_gpio_init()
-{
-  // configure output pins
-  furi_hal_gpio_init(pin_up, GpioModeOutputPushPull, GpioPullNo, GpioSpeedVeryHigh);
-  furi_hal_gpio_init(pin_down, GpioModeOutputPushPull, GpioPullNo, GpioSpeedVeryHigh);
-  furi_hal_gpio_init(pin_right, GpioModeOutputPushPull, GpioPullNo, GpioSpeedVeryHigh);
-  furi_hal_gpio_init(pin_left, GpioModeOutputPushPull, GpioPullNo, GpioSpeedVeryHigh);
-  furi_hal_gpio_init(pin_code0, GpioModeOutputPushPull, GpioPullNo, GpioSpeedVeryHigh);
-  furi_hal_gpio_init(pin_code1, GpioModeOutputPushPull, GpioPullNo, GpioSpeedVeryHigh);
-  furi_hal_gpio_init(pin_code2, GpioModeOutputPushPull, GpioPullNo, GpioSpeedVeryHigh);
-  furi_hal_gpio_init(pin_code3, GpioModeOutputPushPull, GpioPullNo, GpioSpeedVeryHigh);
-  furi_hal_gpio_init(pin_fire, GpioModeOutputPushPull, GpioPullNo, GpioSpeedVeryHigh);
-  furi_hal_gpio_init(pin_alt, GpioModeOutputPushPull, GpioPullNo, GpioSpeedVeryHigh);
-
-  furi_hal_gpio_write(pin_up, true);
-  furi_hal_gpio_write(pin_down, true);
-  furi_hal_gpio_write(pin_right, true);
-  furi_hal_gpio_write(pin_left, true);
-  furi_hal_gpio_write(pin_fire, true);
-  furi_hal_gpio_write(pin_alt, true);
-
-  coleco_write_code(CODE_N);
+static void coleco_write_code(uint8_t code) {
+    furi_hal_gpio_write(pin_code0, (code & 1));
+    furi_hal_gpio_write(pin_code1, (code & 2));
+    furi_hal_gpio_write(pin_code2, (code & 4));
+    furi_hal_gpio_write(pin_code3, (code & 8));
 }
 
-static Coleco* coleco_alloc()
-{
-  Coleco* coleco = malloc(sizeof(Coleco));
+static void coleco_gpio_init() {
+    // configure output pins
+    furi_hal_gpio_init(pin_up, GpioModeOutputPushPull, GpioPullNo, GpioSpeedVeryHigh);
+    furi_hal_gpio_init(pin_down, GpioModeOutputPushPull, GpioPullNo, GpioSpeedVeryHigh);
+    furi_hal_gpio_init(pin_right, GpioModeOutputPushPull, GpioPullNo, GpioSpeedVeryHigh);
+    furi_hal_gpio_init(pin_left, GpioModeOutputPushPull, GpioPullNo, GpioSpeedVeryHigh);
+    furi_hal_gpio_init(pin_code0, GpioModeOutputPushPull, GpioPullNo, GpioSpeedVeryHigh);
+    furi_hal_gpio_init(pin_code1, GpioModeOutputPushPull, GpioPullNo, GpioSpeedVeryHigh);
+    furi_hal_gpio_init(pin_code2, GpioModeOutputPushPull, GpioPullNo, GpioSpeedVeryHigh);
+    furi_hal_gpio_init(pin_code3, GpioModeOutputPushPull, GpioPullNo, GpioSpeedVeryHigh);
+    furi_hal_gpio_init(pin_fire, GpioModeOutputPushPull, GpioPullNo, GpioSpeedVeryHigh);
+    furi_hal_gpio_init(pin_alt, GpioModeOutputPushPull, GpioPullNo, GpioSpeedVeryHigh);
+
+    furi_hal_gpio_write(pin_up, true);
+    furi_hal_gpio_write(pin_down, true);
+    furi_hal_gpio_write(pin_right, true);
+    furi_hal_gpio_write(pin_left, true);
+    furi_hal_gpio_write(pin_fire, true);
+    furi_hal_gpio_write(pin_alt, true);
+
+    coleco_write_code(CODE_N);
+}
 
-  coleco->dpad = false;
-  coleco->row = 0;
-  coleco->column = 1;
+static Coleco* coleco_alloc() {
+    Coleco* coleco = malloc(sizeof(Coleco));
 
-  coleco->mutex = furi_mutex_alloc(FuriMutexTypeNormal);
-  if (!coleco->mutex)
-  {
-    FURI_LOG_E("Coleco", "cannot create mutex\r\n");
-    free(coleco);
-    return NULL;
-  }
+    coleco->dpad = false;
+    coleco->row = 0;
+    coleco->column = 1;
 
-  return coleco;
+    return coleco;
 }
 
-static void coleco_free(Coleco* coleco)
-{
-  furi_assert(coleco);
+static void coleco_free(Coleco* coleco) {
+    furi_assert(coleco);
 
-  furi_mutex_free(coleco->mutex);
-  free(coleco);
+    free(coleco);
 }
 
-int32_t coleco_app(void* p)
-{
-  UNUSED(p);
+int32_t coleco_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));
 
-  Coleco* coleco = coleco_alloc();
-  if (coleco == NULL)
-  {
-    return 255;
-  }
+    Coleco* coleco = coleco_alloc();
 
-  // set system callbacks
-  ViewPort* view_port = view_port_alloc();
-  view_port_draw_callback_set(view_port, render_callback, coleco);
-  view_port_input_callback_set(view_port, input_callback, event_queue);
-
-  // open GUI and register view_port
-  Gui* gui = furi_record_open("gui");
-  gui_add_view_port(gui, view_port, GuiLayerFullscreen);
-
-  coleco_gpio_init();
-  furi_hal_power_enable_otg();
-
-  PluginEvent event;
-  for (bool processing = true; processing;)
-  {
-    FuriStatus event_status = furi_message_queue_get(event_queue, &event, 100);
-
-    furi_mutex_acquire(coleco->mutex, FuriWaitForever);
+    coleco->mutex = furi_mutex_alloc(FuriMutexTypeNormal);
+    if(!coleco->mutex) {
+        FURI_LOG_E("Coleco", "cannot create mutex\r\n");
+        coleco_free(coleco);
+        return 255;
+    }
 
-    if (event_status == FuriStatusOk)
-    {
-      // press events
-      if (event.type == EventTypeKey)
-      {
-        switch (event.input.key)
-        {
-          case InputKeyUp:
-            if (coleco->dpad)
-            {
-              if (event.input.type == InputTypePress)
-              {
-                furi_hal_gpio_write(pin_up, false);
-              }
-              else if (event.input.type == InputTypeRelease)
-              {
-                furi_hal_gpio_write(pin_up, true);
-              }
-            }
-            else
-            {
-              if (event.input.type == InputTypePress && coleco->column < 2)
-              {
-                coleco->column++;
-                coleco_write_code(CODE_N);
-              }
-            }
-            break;
-          case InputKeyDown:
-            if (coleco->dpad)
-            {
-              if (event.input.type == InputTypePress)
-              {
-                furi_hal_gpio_write(pin_down, false);
-              }
-              else if (event.input.type == InputTypeRelease)
-              {
-                furi_hal_gpio_write(pin_down, true);
-              }
-            }
-            else
-            {
-              if (event.input.type == InputTypePress && coleco->column > 0)
-              {
-                coleco->column--;
-                coleco_write_code(CODE_N);
-              }
-            }
-            break;
-          case InputKeyRight:
-            if (coleco->dpad)
-            {
-              if (event.input.type == InputTypePress)
-              {
-                furi_hal_gpio_write(pin_right, false);
-              }
-              else if (event.input.type == InputTypeRelease)
-              {
-                furi_hal_gpio_write(pin_right, true);
-              }
-            }
-            else
-            {
-              if (event.input.type == InputTypePress && coleco->row < 4)
-              {
-                coleco->row++;
-                coleco_write_code(CODE_N);
-              }
-            }
-            break;
-          case InputKeyLeft:
-            if (coleco->dpad)
-            {
-              if (event.input.type == InputTypePress)
-              {
-                furi_hal_gpio_write(pin_left, false);
-              }
-              else if (event.input.type == InputTypeRelease)
-              {
-                furi_hal_gpio_write(pin_left, true);
-              }
-            }
-            else
-            {
-              if (event.input.type == InputTypePress && coleco->row > 0)
-              {
-                coleco->row--;
-                coleco_write_code(CODE_N);
-              }
-            }
-            break;
-          case InputKeyOk:
-            if (coleco->dpad)
-            {
-              if (event.input.type == InputTypePress)
-              {
-                furi_hal_gpio_write(pin_fire, false);
-              }
-              else if (event.input.type == InputTypeRelease)
-              {
-                furi_hal_gpio_write(pin_fire, true);
-              }
-            }
-            else
-            {
-              if (event.input.type == InputTypePress)
-              {
-                if (coleco->row == 0)
-                {
-                  if (coleco->column == 2)
-                  {
-                    furi_hal_gpio_write(pin_alt, false);
-                  }
-                  else
-                  {
-                    coleco->dpad = true;
-                  }
-                }
-                else if (coleco->row == 1)
-                {
-                  if (coleco->column == 0)
-                  {
-                    coleco_write_code(CODE_1);
-                  }
-                  else if (coleco->column == 1)
-                  {
-                    coleco_write_code(CODE_2);
-                  }
-                  else
-                  {
-                    coleco_write_code(CODE_3);
-                  }
+    // set system callbacks
+    ViewPort* view_port = view_port_alloc();
+    view_port_draw_callback_set(view_port, render_callback, coleco);
+    view_port_input_callback_set(view_port, input_callback, event_queue);
+
+    // open GUI and register view_port
+    Gui* gui = furi_record_open("gui");
+    gui_add_view_port(gui, view_port, GuiLayerFullscreen);
+
+    coleco_gpio_init();
+    furi_hal_power_enable_otg();
+
+    PluginEvent event;
+    for(bool processing = true; processing;) {
+        FuriStatus event_status = furi_message_queue_get(event_queue, &event, 100);
+
+        furi_mutex_acquire(coleco->mutex, FuriWaitForever);
+
+        if(event_status == FuriStatusOk) {
+            // press events
+            if(event.type == EventTypeKey) {
+                switch(event.input.key) {
+                case InputKeyUp:
+                    if(coleco->dpad) {
+                        if(event.input.type == InputTypePress) {
+                            furi_hal_gpio_write(pin_up, false);
+                        } else if(event.input.type == InputTypeRelease) {
+                            furi_hal_gpio_write(pin_up, true);
+                        }
+                    } else {
+                        if(event.input.type == InputTypePress && coleco->column < 2) {
+                            coleco->column++;
+                            coleco_write_code(CODE_N);
+                        }
+                    }
+                    break;
+                case InputKeyDown:
+                    if(coleco->dpad) {
+                        if(event.input.type == InputTypePress) {
+                            furi_hal_gpio_write(pin_down, false);
+                        } else if(event.input.type == InputTypeRelease) {
+                            furi_hal_gpio_write(pin_down, true);
+                        }
+                    } else {
+                        if(event.input.type == InputTypePress && coleco->column > 0) {
+                            coleco->column--;
+                            coleco_write_code(CODE_N);
+                        }
+                    }
+                    break;
+                case InputKeyRight:
+                    if(coleco->dpad) {
+                        if(event.input.type == InputTypePress) {
+                            furi_hal_gpio_write(pin_right, false);
+                        } else if(event.input.type == InputTypeRelease) {
+                            furi_hal_gpio_write(pin_right, true);
+                        }
+                    } else {
+                        if(event.input.type == InputTypePress && coleco->row < 4) {
+                            coleco->row++;
+                            coleco_write_code(CODE_N);
+                        }
+                    }
+                    break;
+                case InputKeyLeft:
+                    if(coleco->dpad) {
+                        if(event.input.type == InputTypePress) {
+                            furi_hal_gpio_write(pin_left, false);
+                        } else if(event.input.type == InputTypeRelease) {
+                            furi_hal_gpio_write(pin_left, true);
+                        }
+                    } else {
+                        if(event.input.type == InputTypePress && coleco->row > 0) {
+                            coleco->row--;
+                            coleco_write_code(CODE_N);
+                        }
+                    }
+                    break;
+                case InputKeyOk:
+                    if(coleco->dpad) {
+                        if(event.input.type == InputTypePress) {
+                            furi_hal_gpio_write(pin_fire, false);
+                        } else if(event.input.type == InputTypeRelease) {
+                            furi_hal_gpio_write(pin_fire, true);
+                        }
+                    } else {
+                        if(event.input.type == InputTypePress) {
+                            if(coleco->row == 0) {
+                                if(coleco->column == 2) {
+                                    furi_hal_gpio_write(pin_alt, false);
+                                } else {
+                                    coleco->dpad = true;
+                                }
+                            } else if(coleco->row == 1) {
+                                if(coleco->column == 0) {
+                                    coleco_write_code(CODE_1);
+                                } else if(coleco->column == 1) {
+                                    coleco_write_code(CODE_2);
+                                } else {
+                                    coleco_write_code(CODE_3);
+                                }
+                            } else if(coleco->row == 2) {
+                                if(coleco->column == 0) {
+                                    coleco_write_code(CODE_4);
+                                } else if(coleco->column == 1) {
+                                    coleco_write_code(CODE_5);
+                                } else {
+                                    coleco_write_code(CODE_6);
+                                }
+                            } else if(coleco->row == 3) {
+                                if(coleco->column == 0) {
+                                    coleco_write_code(CODE_7);
+                                } else if(coleco->column == 1) {
+                                    coleco_write_code(CODE_8);
+                                } else {
+                                    coleco_write_code(CODE_9);
+                                }
+                            } else if(coleco->row == 4) {
+                                if(coleco->column == 0) {
+                                    coleco_write_code(CODE_S);
+                                } else if(coleco->column == 1) {
+                                    coleco_write_code(CODE_0);
+                                } else {
+                                    coleco_write_code(CODE_H);
+                                }
+                            }
+                        }
+                        if(event.input.type == InputTypeRelease) {
+                            furi_hal_gpio_write(pin_alt, true);
+                            coleco_write_code(CODE_N);
+                        }
+                    }
+                    break;
+                case InputKeyBack:
+                    if(event.input.type == InputTypePress) {
+                        if(coleco->dpad) {
+                            coleco->dpad = false;
+                        } else {
+                            processing = false;
+                        }
+                    }
+                    break;
+                default:
+                    break;
                 }
-                else if (coleco->row == 2)
-                {
-                  if (coleco->column == 0)
-                  {
-                    coleco_write_code(CODE_4);
-                  }
-                  else if (coleco->column == 1)
-                  {
-                    coleco_write_code(CODE_5);
-                  }
-                  else
-                  {
-                    coleco_write_code(CODE_6);
-                  }
-                }
-                else if (coleco->row == 3)
-                {
-                  if (coleco->column == 0)
-                  {
-                    coleco_write_code(CODE_7);
-                  }
-                  else if (coleco->column == 1)
-                  {
-                    coleco_write_code(CODE_8);
-                  }
-                  else
-                  {
-                    coleco_write_code(CODE_9);
-                  }
-                }
-                else if (coleco->row == 4)
-                {
-                  if (coleco->column == 0)
-                  {
-                    coleco_write_code(CODE_S);
-                  }
-                  else if (coleco->column == 1)
-                  {
-                    coleco_write_code(CODE_0);
-                  }
-                  else
-                  {
-                    coleco_write_code(CODE_H);
-                  }
-                }
-              }
-              if (event.input.type == InputTypeRelease)
-              {
-                furi_hal_gpio_write(pin_alt, true);
-                coleco_write_code(CODE_N);
-              }
-            }
-            break;
-          case InputKeyBack:
-            if (event.input.type == InputTypePress)
-            {
-              if (coleco->dpad)
-              {
-                coleco->dpad = false;
-              }
-              else
-              {
-                processing = false;
-              }
+
+                view_port_update(view_port);
             }
-            break;
-          default:
-            break;
         }
 
-        view_port_update(view_port);
-      }
-    }
-    else
-    {
-      FURI_LOG_D("Coleco", "FuriMessageQueue: event timeout");
+        furi_mutex_release(coleco->mutex);
     }
 
-    furi_mutex_release(coleco->mutex);
-  }
-
-  furi_hal_power_disable_otg();
+    furi_hal_power_disable_otg();
 
-  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);
-  coleco_free(coleco);
-  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);
+    furi_mutex_free(coleco->mutex);
+    coleco_free(coleco);
+    return 0;
 }