Merge pull request #44 from Zondax/add_init_menu

Add init menu

Author: ftheirs

app/common/view.c

@@ -65,6 +65,11 @@ void h_error_accept(__Z_UNUSED unsigned int _) {
 }
 
 void h_initialize(__Z_UNUSED unsigned int _) {
+    ZEMU_LOGF(50, "Initialize function\n")
+    if (viewdata.viewfuncInitialize != NULL) {
+        viewdata.viewfuncInitialize();
+    }
+
     view_idle_show(0, NULL);
     UX_WAIT();
 }
@@ -365,6 +370,10 @@ void view_init(void) {
 #endif
 }
 
+void view_initialize_show(uint8_t item_idx, char *statusString) {
+    view_initialize_show_impl(item_idx, statusString);
+}
+
 void view_idle_show(uint8_t item_idx, char *statusString) {
     view_idle_show_impl(item_idx, statusString);
 }
@@ -381,6 +390,10 @@ void view_review_init(viewfunc_getItem_t viewfuncGetItem,
     viewdata.viewfuncAccept = viewfuncAccept;
 }
 
+void view_initialize_init(viewfunc_initialize_t viewFuncInit) {
+    viewdata.viewfuncInitialize = viewFuncInit;
+}
+
 void view_review_show(unsigned int requireReply) {
     // Set > 0 to reply apdu message
     view_review_show_impl(requireReply);

app/common/view.h

@@ -37,6 +37,8 @@ typedef zxerr_t (*viewfunc_getItem_t)(int8_t displayIdx,
 
 typedef void (*viewfunc_accept_t)();
 
+typedef zxerr_t (*viewfunc_initialize_t)();
+
 #ifdef APP_SECRET_MODE_ENABLED
 zxerr_t secret_enabled();
 #endif
@@ -45,6 +47,7 @@ zxerr_t secret_enabled();
 void view_init();
 
 /// view_initialize_show (idle view - main menu + status)
+void view_initialize_init(viewfunc_initialize_t viewFuncInit);
 void view_initialize_show(uint8_t item_idx, char *statusString);
 
 /// view_idle_show (idle view - main menu + status)

app/common/view_internal.h

@@ -102,6 +102,7 @@ typedef struct {
     viewfunc_getItem_t viewfuncGetItem;
     viewfunc_getNumItems_t viewfuncGetNumItems;
     viewfunc_accept_t viewfuncAccept;
+    viewfunc_initialize_t viewfuncInitialize;
 
 #ifdef APP_SECRET_MODE_ENABLED
     uint8_t secret_click_count;

app/common/view_s.c

@@ -104,9 +104,8 @@ const ux_menu_entry_t menu_main[] = {
 };
 
 const ux_menu_entry_t menu_initialize[] = {
-    {NULL, NULL, 0, &C_icon_app, MENU_MAIN_APP_LINE1, viewdata.key, 33, 12},
+    {NULL, NULL, 0, &C_icon_app, MENU_MAIN_APP_LINE1, "Not Ready", 33, 12},
     {NULL, h_initialize, 0, &C_icon_app, "Click to", "Initialize", 33, 12},
-    {NULL, h_expert_toggle, 0, &C_icon_app, "Expert mode:", viewdata.value, 33, 12},
     {NULL, NULL, 0, &C_icon_app, APPVERSION_LINE1, APPVERSION_LINE2, 33, 12},
     {NULL, NULL, 0, &C_icon_app, "Developed by:", "Zondax.ch", 33, 12},
     {NULL, NULL, 0, &C_icon_app, "License: ", "Apache 2.0", 33, 12},

app/common/view_x.c

@@ -39,6 +39,7 @@
 void account_enabled();
 void shortcut_enabled();
 
+void h_initialize();
 static void h_expert_toggle();
 static void h_expert_update();
 static void h_review_loop_start();
@@ -108,6 +109,21 @@ const ux_flow_step_t *const ux_idle_flow [] = {
   FLOW_END_STEP,
 };
 
+///////////
+UX_STEP_CB_INIT(ux_menu_init_flow_2_step, bn,  NULL, h_initialize(), { "Click to", "Initialize", });
+UX_STEP_NOCB(ux_menu_init_flow_4_step, bn, { "Developed by:", "Zondax.ch", });
+
+const ux_flow_step_t *const ux_menu_initialize [] = {
+  &ux_idle_flow_1_step,
+  &ux_menu_init_flow_2_step,
+  &ux_idle_flow_3_step,
+  &ux_menu_init_flow_4_step,
+  &ux_idle_flow_5_step,
+  &ux_idle_flow_6_step,
+
+  FLOW_END_STEP,
+};
+
 ///////////
 
 UX_STEP_NOCB(ux_message_flow_1_step, pbb, { &C_icon_app, viewdata.key, viewdata.value,});
@@ -330,6 +346,19 @@ void view_idle_show_impl(__Z_UNUSED uint8_t item_idx, char *statusString) {
     ux_flow_init(0, ux_idle_flow, NULL);
 }
 
+void view_initialize_show_impl(__Z_UNUSED uint8_t item_idx, char *statusString) {
+    if (statusString == NULL ) {
+        snprintf(viewdata.key, MAX_CHARS_PER_KEY_LINE, "%s", "Not Ready");
+    } else {
+        snprintf(viewdata.key, MAX_CHARS_PER_KEY_LINE, "%s", statusString);
+    }
+
+    if(G_ux.stack_count == 0) {
+        ux_stack_push();
+    }
+     ux_flow_init(0, ux_menu_initialize, NULL);
+}
+
 void view_review_show_impl(unsigned int requireReply){
     review_type = requireReply;
     h_paging_init();

include/zxversion.h

@@ -17,4 +17,4 @@
 
 #define ZXLIB_MAJOR     14
 #define ZXLIB_MINOR     1
-#define ZXLIB_PATCH     6
+#define ZXLIB_PATCH     7

scripts/getSize.py

@@ -0,0 +1,11 @@
+#!/usr/bin/env python3
+
+from ledgerblue.hexParser import IntelHexParser
+from math import ceil
+import sys
+
+block_size = 2 if sys.argv[1] == "s" else 4
+parser = IntelHexParser("app/bin/app.hex")
+bytes = parser.maxAddr() - parser.minAddr()
+size = ceil(bytes / (block_size * 1024)) * block_size
+print(size)