Touch:fix bootloader ui issue (#325)

lihuanhuan · web-flow · commit db9005a319a5 · 2023-02-28T09:06:00.000+08:00
* fix(boot):fix bootloader ui issue

* chore(core):bump bootloader version to 2.3.6
diff --git a/core/embed/bootloader/messages.c b/core/embed/bootloader/messages.c
@@ -605,6 +605,7 @@ int process_msg_FirmwareUpload(uint8_t iface_num, uint32_t msg_size,
           ui_bootloader_first(NULL);
           ui_fadein();
           send_user_abort(iface_num, "Firmware install cancelled");
+          update_mode = 0;
           return -4;
         }
 
@@ -695,6 +696,7 @@ int process_msg_FirmwareUpload(uint8_t iface_num, uint32_t msg_size,
 #endif
           ui_fadein();
           send_user_abort(iface_num, "Firmware install cancelled");
+          update_mode = 0;
           return -4;
         }
 
diff --git a/core/embed/bootloader/version.h b/core/embed/bootloader/version.h
@@ -1,14 +1,14 @@
 #define VERSION_MAJOR 2
 #define VERSION_MINOR 3
-#define VERSION_PATCH 5
+#define VERSION_PATCH 6
 #define VERSION_BUILD 0
 #define VERSION_UINT32                                            \
   (VERSION_MAJOR | (VERSION_MINOR << 8) | (VERSION_PATCH << 16) | \
    (VERSION_BUILD << 24))
 
 #define FIX_VERSION_MAJOR 2
 #define FIX_VERSION_MINOR 3
-#define FIX_VERSION_PATCH 5
+#define FIX_VERSION_PATCH 6
 #define FIX_VERSION_BUILD 0
 
 #define VERSION_MONOTONIC 1

Original file line number	Diff line number	Diff line change
`@@ -605,6 +605,7 @@ int process_msg_FirmwareUpload(uint8_t iface_num, uint32_t msg_size,`
`605`	`605`	`ui_bootloader_first(NULL);`
`606`	`606`	`ui_fadein();`
`607`	`607`	`send_user_abort(iface_num, "Firmware install cancelled");`
	`608`	`+ update_mode = 0;`
`608`	`609`	`return -4;`
`609`	`610`	`}`
`610`	`611`
`@@ -695,6 +696,7 @@ int process_msg_FirmwareUpload(uint8_t iface_num, uint32_t msg_size,`
`695`	`696`	`#endif`
`696`	`697`	`ui_fadein();`
`697`	`698`	`send_user_abort(iface_num, "Firmware install cancelled");`
	`699`	`+ update_mode = 0;`
`698`	`700`	`return -4;`
`699`	`701`	`}`
`700`	`702`