salfter/USB4VC
1
0
Fork 0
mirror of https://github.com/dekuNukem/USB4VC.git synced 2025-10-31 11:26:46 -07:00
Code Issues Packages Projects Releases Wiki Activity

finished internet update and usb config loading

Browse Source
This commit is contained in:
dekunukem
2022-04-04 00:05:04 +01:00
parent ddf96a5c62
commit e336fafd9f
4 changed files with 62 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
user_program/sync.sh
View File

@@ -3,7 +3,7 @@
# sh sync.sh; ssh -t pi@169.254.194.124 "pkill python3;cd ~/usb4vc/rpi_app;python3 usb4vc_main.py"
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_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 firmware_flasher.py /home/pi/usb4vc/firmware/PBFW_IBMPC_PBID1_V0_1_5.hex"

8
user_program/usb4vc_check_update.py
View File

@@ -13,6 +13,8 @@ from usb4vc_shared import config_dir_path
from usb4vc_shared import firmware_dir_path
from usb4vc_shared import temp_dir_path
from usb4vc_shared import ensure_dir
from usb4vc_shared import i2c_bootloader_pbid
from usb4vc_shared import usb_bootloader_pbid
usb4vc_release_url = "https://api.github.com/repos/dekuNukem/usb4vc/releases/latest"
@@ -93,6 +95,7 @@ def update(temp_path):
return 5, f'Unknown error: {e}'
os.system(f'rm -rfv {os.path.join(this_app_dir_path, "*")}')
os.system(f'cp -fv {os.path.join(src_code_path, "*")} {this_app_dir_path}')
os.system(f'chown pi {os.path.join(this_app_dir_path, "*")}') # change owner from root back to pi for easy editing
return 0, 'Success'
firmware_url = 'https://api.github.com/repos/dekuNukem/USB4VC/contents/firmware/releases?ref=master'
@@ -112,7 +115,7 @@ def get_firmware_list(pcard_id):
def download_latest_firmware(pcard_id):
fw_list = get_firmware_list(pcard_id)
if pcard_id == 2:
if pcard_id in usb_bootloader_pbid:
fw_list = [x for x in fw_list if x.lower().endswith('.dfu')]
else:
fw_list = [x for x in fw_list if x.lower().endswith('.hex')]
@@ -129,10 +132,11 @@ def download_latest_firmware(pcard_id):
content = requests.get(fw_download_url, timeout=5).content
out_file.write(content)
except Exception as e:
print('exception download_latest_firmware:', e)
return 2
return 0
print(download_latest_firmware(1))
# print(download_latest_firmware(1))
# print(update(temp_dir_path))
# print(get_usb4vc_update(temp_dir_path))

5
user_program/usb4vc_shared.py
View File

@@ -5,12 +5,15 @@ config_dir_path = "/home/pi/usb4vc/config"
firmware_dir_path = "/home/pi/usb4vc/firmware"
temp_dir_path = "/home/pi/usb4vc/temp"
i2c_bootloader_pbid = [1]
usb_bootloader_pbid = [2]
def ensure_dir(dir_path):
print('ensure_dir', dir_path)
if not os.path.exists(dir_path):
os.makedirs(dir_path)
RPI_APP_VERSION_TUPLE = (0, 0, 8)
RPI_APP_VERSION_TUPLE = (0, 1, 0)
code_name_to_value_lookup = {
'KEY_RESERVED':(0, 'kb_key'),

96
user_program/usb4vc_ui.py
View File

@@ -20,6 +20,8 @@ from usb4vc_shared import config_dir_path
from usb4vc_shared import firmware_dir_path
from usb4vc_shared import temp_dir_path
from usb4vc_shared import ensure_dir
from usb4vc_shared import i2c_bootloader_pbid
from usb4vc_shared import usb_bootloader_pbid
config_file_path = os.path.join(config_dir_path, 'config.json')
@@ -189,19 +191,12 @@ def check_usb_drive():
return False, 'USB Drive Not Found'
for this_path in usb_drive_set:
usb_rpi_src_path = os.path.join(this_path, 'rpi_app')
usb_firmware_path = os.path.join(this_path, 'firmware')
usb_config_path = os.path.join(this_path, 'config')
if not os.path.isdir(usb_rpi_src_path):
usb_rpi_src_path = None
if not os.path.isdir(usb_firmware_path):
usb_firmware_path = None
if not os.path.isdir(usb_config_path):
usb_config_path = None
if usb_rpi_src_path or usb_firmware_path or usb_config_path:
return True, (usb_rpi_src_path, usb_firmware_path, usb_config_path)
if usb_config_path is not None:
return True, usb_config_path
return False, 'No Update Data Found'
@@ -213,15 +208,12 @@ def get_pbid_and_version(dfu_file_name):
print("exception fw pbid parse:", e)
fw_ver_tuple = None
try:
fw_ver = dfu_file_name.split('_V')[-1].split('.')[0].split('_')
fw_ver = dfu_file_name.lower().split('_v')[-1].split('.')[0].split('_')
fw_ver_tuple = (int(fw_ver[0]), int(fw_ver[1]), int(fw_ver[2]))
except Exception as e:
print('exception fw ver parse:', e)
return pbid, fw_ver_tuple
i2c_bootloader_pbid = [1]
usb_bootloader_pbid = [2]
def reset_pboard():
print("resetting protocol board...")
GPIO.setup(PBOARD_BOOT0_PIN, GPIO.IN)
@@ -277,36 +269,25 @@ def fw_update(fw_path, pbid):
exit_dfu()
return is_updated
def update_pboard_firmware():
def update_pboard_firmware(this_pid):
onlyfiles = [f for f in os.listdir(firmware_dir_path) if os.path.isfile(os.path.join(firmware_dir_path, f))]
firmware_files = [x for x in onlyfiles if x.startswith("PBFW_") and (x.lower().endswith(".dfu") or x.lower().endswith(".hex")) and "PBID" in x]
this_pboard_id = pboard_info_spi_msg[3]
this_pboard_version_tuple = (pboard_info_spi_msg[5], pboard_info_spi_msg[6], pboard_info_spi_msg[7])
for item in firmware_files:
pbid, fw_ver_tuple = get_pbid_and_version(item)
if pbid is None or fw_ver_tuple is None:
continue
print('update_pboard_firmware:', this_pboard_id, this_pboard_version_tuple, fw_ver_tuple)
if pbid == this_pboard_id and fw_ver_tuple > this_pboard_version_tuple:
print('update_pboard_firmware:', this_pid, this_pboard_version_tuple, fw_ver_tuple)
if pbid == this_pid and fw_ver_tuple > this_pboard_version_tuple:
print("DOING IT NOW")
with canvas(usb4vc_oled.oled_device) as draw:
usb4vc_oled.oled_print_centered("Loading Firmware:", usb4vc_oled.font_medium, 0, draw)
usb4vc_oled.oled_print_centered(item.strip("PBFW_").strip(".dfu").strip(".hex"), usb4vc_oled.font_regular, 16, draw)
if fw_update(os.path.join(firmware_dir_path, item), this_pboard_id):
time.sleep(1)
return
def update_from_usb(usb_rpi_src_path, usb_firmware_path, usb_config_path):
if usb_firmware_path is not None:
os.system('rm -rfv /home/pi/usb4vc/firmware/*')
os.system(f"cp -v {os.path.join(usb_firmware_path, '*')} /home/pi/usb4vc/firmware")
update_pboard_firmware()
if usb_rpi_src_path is not None:
os.system('rm -rfv /home/pi/usb4vc/rpi_app/*')
os.system(f"cp -v {os.path.join(usb_rpi_src_path, '*')} /home/pi/usb4vc/rpi_app")
if fw_update(os.path.join(firmware_dir_path, item), this_pid):
return True
return False
def update_from_usb(usb_config_path):
if usb_config_path is not None:
os.system(f'cp -v /home/pi/usb4vc/config/config.json {usb_config_path}')
os.system('mv -v /home/pi/usb4vc/config/config.json /home/pi/usb4vc/config.json')
@@ -530,7 +511,7 @@ class usb4vc_menu(object):
if page == 2:
with canvas(usb4vc_oled.oled_device) as draw:
usb4vc_oled.oled_print_centered("Load Custom", usb4vc_oled.font_medium, 0, draw)
usb4vc_oled.oled_print_centered("Mapping from USB", usb4vc_oled.font_medium, 16, draw)
usb4vc_oled.oled_print_centered("Config from USB", usb4vc_oled.font_medium, 16, draw)
if page == 3:
with canvas(usb4vc_oled.oled_device) as draw:
usb4vc_oled.oled_print_centered("Internet Update", usb4vc_oled.font_medium, 10, draw)
@@ -687,34 +668,59 @@ class usb4vc_menu(object):
def action(self, level, page):
if level == 0:
if page == 2:
if copy_debug_log():
with canvas(usb4vc_oled.oled_device) as draw:
usb4vc_oled.oled_print_centered("Copying", usb4vc_oled.font_medium, 0, draw)
usb4vc_oled.oled_print_centered("Debug Log...", usb4vc_oled.font_medium, 16, draw)
time.sleep(2)
usb_present, result = check_usb_drive()
usb_present, config_path = check_usb_drive()
if usb_present is False:
with canvas(usb4vc_oled.oled_device) as draw:
usb4vc_oled.oled_print_centered("Error:", usb4vc_oled.font_medium, 0, draw)
usb4vc_oled.oled_print_centered(result, usb4vc_oled.font_regular, 16, draw)
usb4vc_oled.oled_print_centered(str(config_path), usb4vc_oled.font_regular, 16, draw)
time.sleep(3)
self.goto_level(0)
else:
with canvas(usb4vc_oled.oled_device) as draw:
usb4vc_oled.oled_print_centered("Updating...", usb4vc_oled.font_medium, 10, draw)
usb4vc_oled.oled_print_centered("Copying", usb4vc_oled.font_medium, 0, draw)
usb4vc_oled.oled_print_centered("Debug Log...", usb4vc_oled.font_medium, 16, draw)
copy_debug_log()
time.sleep(2)
update_from_usb(*result)
with canvas(usb4vc_oled.oled_device) as draw:
usb4vc_oled.oled_print_centered("Copying custom", usb4vc_oled.font_medium, 0, draw)
usb4vc_oled.oled_print_centered("mapping...", usb4vc_oled.font_medium, 16, draw)
time.sleep(2)
update_from_usb(config_path)
with canvas(usb4vc_oled.oled_device) as draw:
usb4vc_oled.oled_print_centered("Update complete!", usb4vc_oled.font_medium, 0, draw)
usb4vc_oled.oled_print_centered("Relaunching...", usb4vc_oled.font_medium, 16, draw)
time.sleep(3)
usb4vc_oled.oled_device.clear()
os._exit(0)
elif page == 3:
print("INTERNET UPDATE")
usb4vc_check_update.download_latest_firmware(pboard_info_spi_msg[3])
update_pboard_firmware()
self.goto_level(0)
elif page == 3:
fffff = usb4vc_check_update.download_latest_firmware(this_pboard_id)
if fffff != 0:
with canvas(usb4vc_oled.oled_device) as draw:
usb4vc_oled.oled_print_centered("Unable to download", usb4vc_oled.font_medium, 0, draw)
usb4vc_oled.oled_print_centered(f"firmware: {fffff}", usb4vc_oled.font_medium, 16, draw)
elif update_pboard_firmware(this_pboard_id):
with canvas(usb4vc_oled.oled_device) as draw:
usb4vc_oled.oled_print_centered("Firmware updated!", usb4vc_oled.font_medium, 10, draw)
else:
with canvas(usb4vc_oled.oled_device) as draw:
usb4vc_oled.oled_print_centered("FW update failed!", usb4vc_oled.font_medium, 10, draw)
time.sleep(3)
with canvas(usb4vc_oled.oled_device) as draw:
usb4vc_oled.oled_print_centered("Updating code...", usb4vc_oled.font_medium, 10, draw)
time.sleep(1)
update_result = usb4vc_check_update.update(temp_dir_path)
if update_result[0] == 0:
with canvas(usb4vc_oled.oled_device) as draw:
usb4vc_oled.oled_print_centered("Update complete!", usb4vc_oled.font_medium, 0, draw)
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_device.clear()
os._exit(0)
elif page == 4:
try:
usb4vc_show_ev.ev_loop([plus_button, minus_button, enter_button])