finishing touches

Author: dekuNukem

user_program/sync.sh

@@ -4,7 +4,7 @@
 
 scp ./* [email protected]:~/usb4vc/rpi_app
 # ssh -t [email protected] "pkill python3;cd ~/usb4vc/rpi_app;python3 usb4vc_main.py"
-ssh -t [email protected] "pkill python3;cd ~/usb4vc/rpi_app;python3 usb4vc_check_update.py"
+# ssh -t [email protected] "pkill python3;cd ~/usb4vc/rpi_app;python3 usb4vc_check_update.py"
 
 # ssh -t [email protected] "pkill python3;cd ~/usb4vc/rpi_app;python3 firmware_flasher.py /home/pi/usb4vc/firmware/PBFW_IBMPC_PBID1_V0_1_5.hex"
 # ssh -t [email protected] "pkill python3;cd ~/usb4vc/rpi_app;python3 bb_tester.py"

user_program/usb4vc_main.py

@@ -50,7 +50,7 @@ def check_rpi_model():
         os.system("cd /home/pi/xpadneo/; sudo ./uninstall.sh")
         usb4vc_ui.oled_print_oneline("Recompiling...")
         os.system("cd /home/pi/xpadneo/; sudo ./install.sh")
-        usb4vc_ui.oled_print_oneline("Done! Rebooting..")
+        usb4vc_ui.oled_print_reboot()
         save_rpi_model(current_model)
         time.sleep(2)
         os.system('sudo reboot')

user_program/usb4vc_ui.py

@@ -413,7 +413,7 @@ def load_config():
     except Exception as e:
         print("exception config load failed!", e)
 
-def get_ip_name():
+def get_ip_address():
     ip_str = subprocess.getoutput("timeout 1 hostname -I")
     ip_list = [x for x in ip_str.split(' ') if '.' in x]
     if len(ip_list) == 0:
@@ -507,7 +507,7 @@ def display_page(self, level, page):
                     else:
                         draw.text((0, 0), f"{self.pb_info['full_name']}", font=usb4vc_oled.font_regular, fill="white")
                     draw.text((0, 10), f"PB {self.pb_info['fw_ver'][0]}.{self.pb_info['fw_ver'][1]}.{self.pb_info['fw_ver'][2]}  RPi {usb4vc_shared.RPI_APP_VERSION_TUPLE[0]}.{usb4vc_shared.RPI_APP_VERSION_TUPLE[1]}.{usb4vc_shared.RPI_APP_VERSION_TUPLE[2]}", font=usb4vc_oled.font_regular, fill="white")
-                    draw.text((0, 20), f"IP: {get_ip_name()}", font=usb4vc_oled.font_regular, fill="white")
+                    draw.text((0, 20), f"IP: {get_ip_address()}", font=usb4vc_oled.font_regular, fill="white")
             if page == 2:
                 with canvas(usb4vc_oled.oled_device) as draw:
                     usb4vc_oled.oled_print_centered("Load Custom", usb4vc_oled.font_medium, 0, draw)
@@ -802,7 +802,8 @@ def action(self, level, page):
                 os._exit(0)
             if page == 2:
                 with canvas(usb4vc_oled.oled_device) as draw:
-                    usb4vc_oled.oled_print_centered("Rebooting...", usb4vc_oled.font_medium, 10, draw)
+                    usb4vc_oled.oled_print_centered("Rebooting...", usb4vc_oled.font_medium, 0, draw)
+                    usb4vc_oled.oled_print_centered("Unplug if stuck >10s", usb4vc_oled.font_regular, 16, draw)
                 os.system("sudo reboot")
                 while 1:
                     time.sleep(1)
@@ -814,7 +815,7 @@ def action(self, level, page):
         self.display_curent_page()
 
     def action_current_page(self):
-        self.action(self.current_level, self.current_page);
+        self.action(self.current_level, self.current_page)
 
     def display_curent_page(self):
         self.display_page(self.current_level, self.current_page)
@@ -823,6 +824,10 @@ def update_usb_status(self):
         if self.current_level == 0 and self.current_page == 0:
             self.display_page(0, 0)
 
+    def update_board_status(self):
+        if self.current_level == 0 and self.current_page == 1:
+            self.display_page(0, 1)
+
 pboard_database = {
     PBOARD_ID_UNKNOWN:{'author':'Unknown', 'fw_ver':(0,0,0), 'full_name':'Unknown', 'hw_rev':0, 'protocol_list_keyboard':raw_keyboard_protocols, 'protocol_list_mouse':raw_mouse_protocols, 'protocol_list_gamepad':raw_gamepad_protocols},
     PBOARD_ID_IBMPC:{'author':'dekuNukem', 'fw_ver':(0,0,0), 'full_name':'IBM PC Compatible', 'hw_rev':0, 'protocol_list_keyboard':ibmpc_keyboard_protocols, 'protocol_list_mouse':ibmpc_mouse_protocols, 'protocol_list_gamepad':ibmpc_gamepad_protocols},
@@ -912,7 +917,8 @@ def ui_worker():
         time.sleep(0.1)
         my_oled.ui_loop_count += 1
         if my_oled.is_sleeping is False and my_oled.ui_loop_count % 5 == 0:
-            my_menu.update_usb_status();
+            my_menu.update_usb_status()
+            my_menu.update_board_status()
 
         if plus_button.is_pressed():
             my_oled.kick()
@@ -962,4 +968,9 @@ def oled_print_oneline(msg):
     with canvas(usb4vc_oled.oled_device) as draw:
         usb4vc_oled.oled_print_centered(msg, usb4vc_oled.font_medium, 10, draw)
 
+def oled_print_reboot():
+    with canvas(usb4vc_oled.oled_device) as draw:
+        usb4vc_oled.oled_print_centered("Done! Rebooting..", usb4vc_oled.font_medium, 0, draw)
+        usb4vc_oled.oled_print_centered("Unplug if stuck >10s", usb4vc_oled.font_regular, 16, draw)
+
 ui_thread = threading.Thread(target=ui_worker, daemon=True)