diff --git a/user_program/sync.sh b/user_program/sync.sh index 6d43f6f..84da4d0 100644 --- a/user_program/sync.sh +++ b/user_program/sync.sh @@ -4,7 +4,7 @@ scp ./* pi@169.254.194.124:~/usb4vc/rpi_app # ssh -t pi@169.254.194.124 "pkill python3;cd ~/usb4vc/rpi_app;python3 usb4vc_main.py" -# ssh -t pi@169.254.194.124 "pkill python3;cd ~/usb4vc/rpi_app;python3 usb4vc_check_update.py" +ssh -t pi@169.254.194.124 "pkill python3;cd ~/usb4vc/rpi_app;python3 usb4vc_check_update.py" # ssh -t pi@169.254.194.124 "pkill python3;cd ~/usb4vc/rpi_app;python3 firmware_flasher.py /home/pi/usb4vc/firmware/PBFW_IBMPC_PBID1_V0_1_5.hex" # ssh -t pi@169.254.194.124 "pkill python3;cd ~/usb4vc/rpi_app;python3 bb_tester.py" \ No newline at end of file diff --git a/user_program/usb4vc_check_update.py b/user_program/usb4vc_check_update.py index 4556c80..4db3673 100644 --- a/user_program/usb4vc_check_update.py +++ b/user_program/usb4vc_check_update.py @@ -136,8 +136,9 @@ def download_latest_firmware(pcard_id): return 2 return 0 +# print(get_remote_tag_version()[1], RPI_APP_VERSION_TUPLE) +# print(get_remote_tag_version()[1] > RPI_APP_VERSION_TUPLE) # print(download_latest_firmware(1)) - # print(update(temp_dir_path)) # print(get_usb4vc_update(temp_dir_path)) # print(get_remote_tag_version() >= RPI_APP_VERSION_TUPLE) diff --git a/user_program/usb4vc_ui.py b/user_program/usb4vc_ui.py index d1da7f4..29cd430 100644 --- a/user_program/usb4vc_ui.py +++ b/user_program/usb4vc_ui.py @@ -694,6 +694,8 @@ class usb4vc_menu(object): os._exit(0) self.goto_level(0) elif page == 3: + with canvas(usb4vc_oled.oled_device) as draw: + usb4vc_oled.oled_print_centered("Updating...", usb4vc_oled.font_medium, 10, draw) fffff = usb4vc_check_update.download_latest_firmware(this_pboard_id) if fffff != 0: with canvas(usb4vc_oled.oled_device) as draw: @@ -716,9 +718,9 @@ class usb4vc_menu(object): usb4vc_oled.oled_print_centered("Relaunching...", usb4vc_oled.font_medium, 16, draw) else: with canvas(usb4vc_oled.oled_device) as draw: - usb4vc_oled.oled_print_centered("Update failed!", usb4vc_oled.font_medium, 0, draw) - usb4vc_oled.oled_print_centered(f"Err: {update_result[-1]}", usb4vc_oled.font_regular, 16, draw) - time.sleep(3.5) + usb4vc_oled.oled_print_centered("Update failed:", usb4vc_oled.font_medium, 0, draw) + usb4vc_oled.oled_print_centered(f"{update_result[-1]}", usb4vc_oled.font_regular, 16, draw) + time.sleep(4) usb4vc_oled.oled_device.clear() os._exit(0) elif page == 4: