fix: remove led

RogueMaster · Aug 9, 2023 · 1057242 · 1057242
1 parent 8cb7f09
commit 1057242
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 104 deletions.
diff --git a/flipbip.c b/flipbip.c
@@ -104,7 +104,6 @@ FlipBip* flipbip_app_alloc() {
 
     // Settings
     app->haptic = FlipBipHapticOn;
-    app->led = FlipBipLedOn;
     app->bip39_strength = FlipBipStrength256; // 256 bits (24 words)
     app->passphrase = FlipBipPassphraseOff;
 

diff --git a/flipbip.h b/flipbip.h
@@ -34,7 +34,6 @@ typedef struct {
     FlipBipScene1* flipbip_scene_1;
     // Settings options
     int haptic;
-    int led;
     int bip39_strength;
     int passphrase;
     // Main menu options
@@ -61,11 +60,6 @@ typedef enum {
     FlipBipHapticOn,
 } FlipBipHapticState;
 
-typedef enum {
-    FlipBipLedOff,
-    FlipBipLedOn,
-} FlipBipLedState;
-
 typedef enum {
     FlipBipStrength128,
     FlipBipStrength192,

diff --git a/helpers/flipbip_led.c b/helpers/flipbip_led.c
diff --git a/helpers/flipbip_led.h b/helpers/flipbip_led.h
diff --git a/helpers/flipbip_speaker.c b/helpers/flipbip_speaker.c
diff --git a/helpers/flipbip_speaker.h b/helpers/flipbip_speaker.h
diff --git a/scenes/flipbip_scene_menu.c b/scenes/flipbip_scene_menu.c
@@ -1,6 +1,8 @@
 #include "../flipbip.h"
 #include "../helpers/flipbip_file.h"
 
+#define FLIPBIP_MENU_HEADER_TEXT "- FlipBIP wallet " FLIPBIP_VERSION " -"
+
 enum SubmenuIndex {
     SubmenuIndexScene1BTC = 10,
     SubmenuIndexScene1ETH,
@@ -9,6 +11,7 @@ enum SubmenuIndex {
     SubmenuIndexScene1New,
     SubmenuIndexScene1Import,
     SubmenuIndexSettings,
+    SubmenuIndexNOP,
 };
 
 void flipbip_scene_menu_submenu_callback(void* context, uint32_t index) {
@@ -19,6 +22,13 @@ void flipbip_scene_menu_submenu_callback(void* context, uint32_t index) {
 void flipbip_scene_menu_on_enter(void* context) {
     FlipBip* app = context;
 
+    submenu_add_item(
+        app->submenu,
+        FLIPBIP_MENU_HEADER_TEXT,
+        SubmenuIndexNOP,
+        flipbip_scene_menu_submenu_callback,
+        app);
+
     if(flipbip_has_file(FlipBipFileKey, NULL, false) &&
        flipbip_has_file(FlipBipFileDat, NULL, false)) {
         submenu_add_item(
@@ -134,6 +144,8 @@ bool flipbip_scene_menu_on_event(void* context, SceneManagerEvent event) {
                 app->scene_manager, FlipBipSceneMenu, SubmenuIndexSettings);
             scene_manager_next_scene(app->scene_manager, FlipBipSceneSettings);
             return true;
+        } else if(event.event == SubmenuIndexNOP) {
+            return true;
         }
     }
     return false;

diff --git a/scenes/flipbip_scene_settings.c b/scenes/flipbip_scene_settings.c
@@ -15,15 +15,6 @@ const uint32_t haptic_value[2] = {
     FlipBipHapticOn,
 };
 
-const char* const led_text[2] = {
-    TEXT_LABEL_OFF,
-    TEXT_LABEL_ON,
-};
-const uint32_t led_value[2] = {
-    FlipBipLedOff,
-    FlipBipLedOn,
-};
-
 const char* const bip39_strength_text[3] = {
     "12",
     "18",
@@ -51,13 +42,6 @@ static void flipbip_scene_settings_set_haptic(VariableItem* item) {
     app->haptic = haptic_value[index];
 }
 
-static void flipbip_scene_settings_set_led(VariableItem* item) {
-    FlipBip* app = variable_item_get_context(item);
-    uint8_t index = variable_item_get_current_value_index(item);
-    variable_item_set_current_value_text(item, led_text[index]);
-    app->led = led_value[index];
-}
-
 static void flipbip_scene_settings_set_bip39_strength(VariableItem* item) {
     FlipBip* app = variable_item_get_context(item);
     uint8_t index = variable_item_get_current_value_index(item);
@@ -115,13 +99,6 @@ void flipbip_scene_settings_on_enter(void* context) {
     variable_item_set_current_value_index(item, value_index);
     variable_item_set_current_value_text(item, haptic_text[value_index]);
 
-    // LED Effects on/off
-    item = variable_item_list_add(
-        app->variable_item_list, "LED FX:", 2, flipbip_scene_settings_set_led, app);
-    value_index = value_index_uint32(app->led, led_value, 2);
-    variable_item_set_current_value_index(item, value_index);
-    variable_item_set_current_value_text(item, led_text[value_index]);
-
     view_dispatcher_switch_to_view(app->view_dispatcher, FlipBipViewIdSettings);
 }
 

diff --git a/views/flipbip_scene_1.c b/views/flipbip_scene_1.c
@@ -8,7 +8,6 @@
 #include <string.h>
 #include "flipbip_icons.h"
 #include "../helpers/flipbip_haptic.h"
-#include "../helpers/flipbip_led.h"
 #include "../helpers/flipbip_string.h"
 #include "../helpers/flipbip_file.h"
 // From: /lib/crypto
@@ -666,7 +665,7 @@ void flipbip_scene_1_enter(void* context) {
 
     flipbip_play_happy_bump(app);
     //notification_message(app->notification, &sequence_blink_cyan_100);
-    flipbip_led_set_rgb(app, 255, 0, 0);
+    //flipbip_led_set_rgb(app, 255, 0, 0);
 
     with_view_model(
         instance->view,