Touch:fix bootloader ui issue (#322)

* fix(boot):fix bootloader ui issue

* chore(core):bump bootloader version to 2.3.5

Author: lihuanhuan

core/embed/bootloader/main.c

@@ -223,7 +223,7 @@ static secbool bootloader_usb_loop(const vendor_header *const vhdr,
           restart();
           return secfalse;    // shutdown
         } else if (r == 0) {  // last chunk received
-          ui_screen_install_progress_upload(1000);
+          // ui_screen_install_progress_upload(1000);
           ui_fadeout();
           ui_screen_done(4, sectrue);
           ui_fadein();

core/embed/bootloader/messages.c

@@ -406,7 +406,8 @@ void process_msg_Ping(uint8_t iface_num, uint32_t msg_size, uint8_t *buf) {
   MSG_SEND(Success);
 }
 
-static uint32_t firmware_remaining, firmware_block, chunk_requested;
+static uint32_t firmware_remaining, firmware_len, firmware_block,
+    chunk_requested;
 
 void process_msg_FirmwareErase(uint8_t iface_num, uint32_t msg_size,
                                uint8_t *buf) {
@@ -417,7 +418,7 @@ void process_msg_FirmwareErase(uint8_t iface_num, uint32_t msg_size,
   MSG_RECV_INIT(FirmwareErase);
   MSG_RECV(FirmwareErase);
 
-  firmware_remaining = msg_recv.has_length ? msg_recv.length : 0;
+  firmware_len = firmware_remaining = msg_recv.has_length ? msg_recv.length : 0;
   if ((firmware_remaining > 0) &&
       ((firmware_remaining % sizeof(uint32_t)) == 0) &&
       (firmware_remaining <= (FIRMWARE_SECTORS_COUNT * IMAGE_CHUNK_SIZE))) {
@@ -476,8 +477,7 @@ static bool _read_payload(pb_istream_t *stream, const pb_field_t *field,
   while (stream->bytes_left) {
     // update loader but skip first block
     if (update_mode == UPDATE_BLE) {
-      ui_screen_install_progress_upload(1000 * chunk_written /
-                                        firmware_remaining);
+      ui_screen_install_progress_upload(1000 * chunk_written / firmware_len);
     } else {
       if (firmware_block > 0) {
         ui_screen_install_progress_upload(
@@ -496,6 +496,10 @@ static bool _read_payload(pb_istream_t *stream, const pb_field_t *field,
     chunk_written += buffer_size;
   }
 
+  if (update_mode == UPDATE_BLE) {
+    ui_screen_install_progress_upload(1000 * chunk_written / firmware_len);
+  }
+
   return true;
 }
 

core/embed/bootloader/version.h

@@ -1,14 +1,14 @@
 #define VERSION_MAJOR 2
 #define VERSION_MINOR 3
-#define VERSION_PATCH 4
+#define VERSION_PATCH 5
 #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 4
+#define FIX_VERSION_PATCH 5
 #define FIX_VERSION_BUILD 0
 
 #define VERSION_MONOTONIC 1

core/embed/extmod/modtrezorui/display.c

@@ -1115,7 +1115,7 @@ void display_progress_percent(int x, int y, int permil) {
 
 void _display_progress(uint16_t y, const char *desc, int permil) {
   if (desc) {
-    display_text_center(MAX_DISPLAY_RESX / 2, y, desc, -1, FONT_NORMAL,
+    display_text_center(MAX_DISPLAY_RESX / 2, y - 20, desc, -1, FONT_NORMAL,
                         COLOR_WHITE, COLOR_BLACK);
   }
   display_progress_percent(MAX_DISPLAY_RESX / 2, y + 40, permil / 10);

core/embed/trezorhal/nordic_dfu.c

@@ -281,7 +281,7 @@ bool updateBle(uint8_t *init_data, uint8_t init_len, uint8_t *firmware,
 
   // firmware
   if (select_object(fw_type) != true) return false;
-  display_bar(0, 556, DISPLAY_RESX, 64, COLOR_BLACK);
+  display_bar(0, 400, DISPLAY_RESX, 400, COLOR_BLACK);
   while (fm_len > 0) {
     display_progress("Installing bluetooth firmware",
                      1000 * offset_i / totol_len);