Skip to content

Commit 293bc43

Browse files
committed
starting to work on internet update
1 parent 3755df6 commit 293bc43

File tree

3 files changed

+16
-11
lines changed

3 files changed

+16
-11
lines changed

user_program/usb4vc_shared.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
RPI_APP_VERSION_TUPLE = (0, 0, 7)
1+
RPI_APP_VERSION_TUPLE = (0, 0, 8)
22

33
code_name_to_value_lookup = {
44
'KEY_RESERVED':(0, 'kb_key'),

user_program/usb4vc_ui.py

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -466,7 +466,7 @@ def __init__(self, pboard, conf_dict):
466466
self.current_level = 0
467467
self.current_page = 0
468468
self.level_size = 6
469-
self.page_size = [6, 6, 4, 1, 1, 5]
469+
self.page_size = [7, 6, 4, 1, 1, 5]
470470
self.kb_protocol_list = list(pboard['protocol_list_keyboard'])
471471
self.mouse_protocol_list = list(pboard['protocol_list_mouse'])
472472
self.gamepad_protocol_list = list(pboard['protocol_list_gamepad'])
@@ -530,16 +530,19 @@ def display_page(self, level, page):
530530
draw.text((0, 20), f"IP: {get_ip_name()}", font=usb4vc_oled.font_regular, fill="white")
531531
if page == 2:
532532
with canvas(usb4vc_oled.oled_device) as draw:
533-
usb4vc_oled.oled_print_centered("Update via", usb4vc_oled.font_medium, 0, draw)
534-
usb4vc_oled.oled_print_centered("USB Flashdrive", usb4vc_oled.font_medium, 16, draw)
533+
usb4vc_oled.oled_print_centered("Load Custom", usb4vc_oled.font_medium, 0, draw)
534+
usb4vc_oled.oled_print_centered("Mapping from USB", usb4vc_oled.font_medium, 16, draw)
535535
if page == 3:
536+
with canvas(usb4vc_oled.oled_device) as draw:
537+
usb4vc_oled.oled_print_centered("Internet Update", usb4vc_oled.font_medium, 10, draw)
538+
if page == 4:
536539
with canvas(usb4vc_oled.oled_device) as draw:
537540
usb4vc_oled.oled_print_centered("Show Event Codes", usb4vc_oled.font_medium, 0, draw)
538541
usb4vc_oled.oled_print_centered("(experimental)", usb4vc_oled.font_regular, 20, draw)
539-
if page == 4:
542+
if page == 5:
540543
with canvas(usb4vc_oled.oled_device) as draw:
541544
usb4vc_oled.oled_print_centered("Remove BT Device", usb4vc_oled.font_medium, 10, draw)
542-
if page == 5:
545+
if page == 6:
543546
with canvas(usb4vc_oled.oled_device) as draw:
544547
usb4vc_oled.oled_print_centered("Pair Bluetooth", usb4vc_oled.font_medium, 10, draw)
545548
if level == 1:
@@ -709,16 +712,19 @@ def action(self, level, page):
709712
usb4vc_oled.oled_device.clear()
710713
os._exit(0)
711714
elif page == 3:
715+
print("INTERNET UPDATE")
716+
self.goto_level(0)
717+
elif page == 4:
712718
try:
713719
usb4vc_show_ev.ev_loop([plus_button, minus_button, enter_button])
714720
except Exception as e:
715721
print('exception ev_loop:', e)
716722
self.goto_level(0)
717-
elif page == 4:
723+
elif page == 5:
718724
self.paired_devices_list = list(get_paired_devices())
719725
self.page_size[4] = len(self.paired_devices_list) + 1
720726
self.goto_level(4)
721-
elif page == 5:
727+
elif page == 6:
722728
self.goto_level(2)
723729
else:
724730
self.goto_level(1)

user_program/usb4vc_usb_scan.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -801,7 +801,6 @@ def raw_input_event_worker():
801801
if axes_code in this_gp_dict and 127 - 12 <= this_gp_dict[axes_code] <= 127 + 12:
802802
this_gp_dict[axes_code] = 127
803803
gamepad_output = make_gamepad_spi_packet(gamepad_status_dict, this_device)
804-
print(gamepad_output[0])
805804
if gamepad_output != last_gamepad_msg:
806805
gp_to_transfer, kb_to_transfer, mouse_to_transfer = gamepad_output
807806
pcard_spi.xfer(list(gp_to_transfer))
@@ -917,10 +916,10 @@ def get_pboard_info():
917916
this_msg[5] = usb4vc_shared.RPI_APP_VERSION_TUPLE[2]
918917
pcard_spi.xfer(this_msg)
919918

920-
time.sleep(0.1)
919+
time.sleep(0.05)
921920
# send an empty message to allow response to be shifted into RPi
922921
response = pcard_spi.xfer(list(nop_spi_msg_template))
923-
time.sleep(0.01)
922+
time.sleep(0.05)
924923
response = pcard_spi.xfer(list(nop_spi_msg_template))
925924
return response
926925

0 commit comments

Comments
 (0)