From bba59ca7ab78e3bc68b2e0ba4d9393739ad4b209 Mon Sep 17 00:00:00 2001 From: KemoNine Date: Wed, 19 Apr 2023 08:43:39 -0400 Subject: [PATCH] refactor debugging code so its better organized and adjust the output to be more meaningful --- boot.py | 29 ++++++++++++++++------------- main.py | 2 -- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/boot.py b/boot.py index 74e71d8..4c7492d 100644 --- a/boot.py +++ b/boot.py @@ -1,7 +1,6 @@ print('START boot.py') -# http://kmkfw.io/docs/boot/ -# Below is a fully working example, which disables USB storage, CDC and enables BIOS mode. +# Used http://kmkfw.io/docs/boot/ as starting point import supervisor import board @@ -15,6 +14,20 @@ from kmk.quickpin.pro_micro.kb2040 import pinout as pins from kb import KMKKeyboard from usb_hid import Device +# Print env vars if debugging enabled +if os.getenv('ARDUX_KMK_DEBUGGING'): + print('debugging enabled') + print('START env') + print('CIRCUITPY_BLE_NAME:', os.getenv('CIRCUITPY_BLE_NAME')) + print('ARDUX_KMK_DEBUGGING:', os.getenv('ARDUX_KMK_DEBUGGING')) + print('ARDUX_KMK_USB_DISK_ALWAYS:', os.getenv('ARDUX_KMK_USB_DISK_ALWAYS')) + print('ARDUX_SIZE:', os.getenv('ARDUX_SIZE')) + print('ARDUX_HAND:', os.getenv('ARDUX_HAND')) + print('ARDUX_BOARD:', os.getenv('ARDUX_BOARD')) + print('END env') +else: + print('debugging disabled') + # Enable use w/ BIOS usb_hid.enable((Device.KEYBOARD, Device.MOUSE), boot_device=1) @@ -30,7 +43,7 @@ key_2.switch_to_input(pull=digitalio.Pull.UP) key_1_val = not (key_1.value) key_2_val = not (key_2.value) -if not (key_1_val or key_2_val): +if not (key_1_val or key_2_val) and not os.getenv('ARDUX_KMK_DEBUGGING'): if not os.getenv('ARDUX_KMK_USB_DISK_ALWAYS'): storage.disable_usb_drive() usb_cdc.disable() # Equivalent to usb_cdc.enable(console=False, data=False) @@ -39,14 +52,4 @@ if not (key_1_val or key_2_val): key_1.deinit() key_2.deinit() -if os.getenv('ARDUX_KMK_DEBUGGING'): - print('START env') - print('CIRCUITPY_BLE_NAME:', os.getenv('CIRCUITPY_BLE_NAME')) - print('ARDUX_KMK_DEBUGGING:', os.getenv('ARDUX_KMK_DEBUGGING')) - print('ARDUX_KMK_USB_DISK_ALWAYS:', os.getenv('ARDUX_KMK_USB_DISK_ALWAYS')) - print('ARDUX_SIZE:', os.getenv('ARDUX_SIZE')) - print('ARDUX_HAND:', os.getenv('ARDUX_HAND')) - print('ARDUX_BOARD:', os.getenv('ARDUX_BOARD')) - print('END env') - print('END boot.py') diff --git a/main.py b/main.py index 836bd2c..692dd2c 100644 --- a/main.py +++ b/main.py @@ -74,7 +74,5 @@ keyboard.keymap = [ ##### # Main if __name__ == '__main__': - print('begin main.py') keyboard.go() - print('end main.py')