diff --git a/firmware/code/MDK-ARM/lul.uvguix.Allen b/firmware/code/MDK-ARM/lul.uvguix.Allen index 25e4d6e9..9c9de8e5 100644 --- a/firmware/code/MDK-ARM/lul.uvguix.Allen +++ b/firmware/code/MDK-ARM/lul.uvguix.Allen @@ -1838,7 +1838,7 @@ Debug 2373 - 00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720000000000000000010000000000000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7200000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720000000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720000000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000000000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730000000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72000000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 + 00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720100000000000000010000000000000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7201000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720100000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720100000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000000000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730100000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72010000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 898 @@ -3678,9 +3678,9 @@ ../Src/main.c - 40 - 468 - 499 + 38 + 71 + 95 1 0 diff --git a/firmware/code/MDK-ARM/lul/lul.axf b/firmware/code/MDK-ARM/lul/lul.axf index 76de6dc0..840b0847 100644 Binary files a/firmware/code/MDK-ARM/lul/lul.axf and b/firmware/code/MDK-ARM/lul/lul.axf differ diff --git a/firmware/code/MDK-ARM/lul/lul.build_log.htm b/firmware/code/MDK-ARM/lul/lul.build_log.htm index cc49826d..f7ce8420 100644 --- a/firmware/code/MDK-ARM/lul/lul.build_log.htm +++ b/firmware/code/MDK-ARM/lul/lul.build_log.htm @@ -27,6 +27,10 @@

Project:

Output:

*** Using Compiler 'V5.06 update 6 (build 750)', folder: 'C:\Keil_v5\ARM\ARMCC\Bin' Build target 'lul' +compiling main.c... +linking... +Program Size: Code=45660 RO-data=4540 RW-data=1108 ZI-data=14780 +FromELF: creating hex file... "lul\lul.axf" - 0 Error(s), 0 Warning(s).

Software Packages used:

@@ -50,7 +54,7 @@

Collection of Component include folders:

Collection of Component Files used:

* Component: ARM::CMSIS:CORE:5.3.0 -Build Time Elapsed: 00:00:01 +Build Time Elapsed: 00:00:02 diff --git a/firmware/code/MDK-ARM/lul/lul.hex b/firmware/code/MDK-ARM/lul/lul.hex index 7d0089fd..8a643522 100644 --- a/firmware/code/MDK-ARM/lul/lul.hex +++ b/firmware/code/MDK-ARM/lul/lul.hex @@ -3154,7 +3154,7 @@ :10C5000090106769742E696F2F6475636B79706121 :10C51000640B143075407304FF8580323232171477 :10C520003246640201100D030405080706090A0BD0 -:10C530000E0D0C62101016466F7220696E737472C5 +:10C530000E0D0C62111016466F7220696E737472C4 :10C54000756374696F6E732C207365651201135DDA :10C55000461B08DD041AAD041AFD041A7D0481137C :10C56000213C1B0851041A5D041A85041AB1041AEF diff --git a/firmware/code/MDK-ARM/lul/lul.htm b/firmware/code/MDK-ARM/lul/lul.htm index c097bce7..24fbaf2c 100644 --- a/firmware/code/MDK-ARM/lul/lul.htm +++ b/firmware/code/MDK-ARM/lul/lul.htm @@ -3,7 +3,7 @@ Static Call Graph - [lul\lul.axf]

Static Call Graph for image lul\lul.axf

-

#<CALLGRAPH># ARM Linker, 5060750: Last Updated: Sun Apr 04 06:59:26 2021 +

#<CALLGRAPH># ARM Linker, 5060750: Last Updated: Sun Apr 04 07:39:00 2021

Maximum Stack Usage = 440 bytes + Unknown(Cycles, Untraceable Function Pointers)

Call chain for Maximum Stack Depth:

diff --git a/firmware/code/MDK-ARM/lul/lul_lul.dep b/firmware/code/MDK-ARM/lul/lul_lul.dep index 3257537c..94b1a57d 100644 --- a/firmware/code/MDK-ARM/lul/lul_lul.dep +++ b/firmware/code/MDK-ARM/lul/lul_lul.dep @@ -555,7 +555,7 @@ I (../Middlewares/Third_Party/FreeRTOS/Source/include/event_groups.h)(0x5E3DA25F I (../Inc/parser.h)(0x6069554B) I (../Inc/buttons.h)(0x5F997909) I (../Inc/keyboard.h)(0x606947C4) -F (../Src/main.c)(0x60695585)(-c --cpu Cortex-M0 -D__MICROLIB -g -O2 --apcs=interwork --split_sections -I ../Inc -I ../Drivers/STM32F0xx_HAL_Driver/Inc -I ../Drivers/STM32F0xx_HAL_Driver/Inc/Legacy -I ../Drivers/CMSIS/Device/ST/STM32F0xx/Include -I ../Drivers/CMSIS/Include -I ../Middlewares/Third_Party/FatFs/src -I ../Middlewares/ST/STM32_USB_Device_Library/Core/Inc -I ../Middlewares/ST/STM32_USB_Device_Library/Class/HID/Inc -I ../Middlewares/Third_Party/FreeRTOS/Source/portable/RVDS/ARM_CM0 -I ../Middlewares/Third_Party/FreeRTOS/Source/include -I ../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS --C99 -I.\RTE\_lul -IC:\Users\allen\AppData\Local\Arm\Packs\ARM\CMSIS\5.6.0\CMSIS\Core\Include -IC:\Users\allen\AppData\Local\Arm\Packs\Keil\STM32F0xx_DFP\2.0.0\Drivers\CMSIS\Device\ST\STM32F0xx\Include -D__UVISION_VERSION="529" -D_RTE_ -DSTM32F072xB -DUSE_HAL_DRIVER -DSTM32F072xB -o lul\main.o --omf_browse lul\main.crf --depend lul\main.d) +F (../Src/main.c)(0x60695EFF)(-c --cpu Cortex-M0 -D__MICROLIB -g -O2 --apcs=interwork --split_sections -I ../Inc -I ../Drivers/STM32F0xx_HAL_Driver/Inc -I ../Drivers/STM32F0xx_HAL_Driver/Inc/Legacy -I ../Drivers/CMSIS/Device/ST/STM32F0xx/Include -I ../Drivers/CMSIS/Include -I ../Middlewares/Third_Party/FatFs/src -I ../Middlewares/ST/STM32_USB_Device_Library/Core/Inc -I ../Middlewares/ST/STM32_USB_Device_Library/Class/HID/Inc -I ../Middlewares/Third_Party/FreeRTOS/Source/portable/RVDS/ARM_CM0 -I ../Middlewares/Third_Party/FreeRTOS/Source/include -I ../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS --C99 -I.\RTE\_lul -IC:\Users\allen\AppData\Local\Arm\Packs\ARM\CMSIS\5.6.0\CMSIS\Core\Include -IC:\Users\allen\AppData\Local\Arm\Packs\Keil\STM32F0xx_DFP\2.0.0\Drivers\CMSIS\Device\ST\STM32F0xx\Include -D__UVISION_VERSION="529" -D_RTE_ -DSTM32F072xB -DUSE_HAL_DRIVER -DSTM32F072xB -o lul\main.o --omf_browse lul\main.crf --depend lul\main.d) I (../Inc/main.h)(0x5FAFFC04) I (../Drivers/STM32F0xx_HAL_Driver/Inc/stm32f0xx_hal.h)(0x5E3DA25C) I (../Inc/stm32f0xx_hal_conf.h)(0x5FAFFC04) diff --git a/firmware/code/MDK-ARM/lul/main.crf b/firmware/code/MDK-ARM/lul/main.crf index bbcdc093..cc984a31 100644 Binary files a/firmware/code/MDK-ARM/lul/main.crf and b/firmware/code/MDK-ARM/lul/main.crf differ diff --git a/firmware/code/MDK-ARM/lul/main.o b/firmware/code/MDK-ARM/lul/main.o index 05a4de45..8c05f242 100644 Binary files a/firmware/code/MDK-ARM/lul/main.o and b/firmware/code/MDK-ARM/lul/main.o differ diff --git a/firmware/code/Src/main.c b/firmware/code/Src/main.c index 63435674..86c73f2d 100644 --- a/firmware/code/Src/main.c +++ b/firmware/code/Src/main.c @@ -84,7 +84,7 @@ osThreadId kb_scanHandle; /* USER CODE BEGIN PV */ /* Private variables ---------------------------------------------------------*/ uint8_t fw_version_major = 0; -uint8_t fw_version_minor = 16; +uint8_t fw_version_minor = 17; uint8_t fw_version_patch = 0; char instruction[] = "For instructions, see"; /* USER CODE END PV */ diff --git a/firmware/duckypad_v0.17.0.dfu b/firmware/duckypad_v0.17.0.dfu new file mode 100644 index 00000000..71c63bb9 Binary files /dev/null and b/firmware/duckypad_v0.17.0.dfu differ diff --git a/firmware_updates_and_version_history.md b/firmware_updates_and_version_history.md index 509dc3ba..41996cef 100644 --- a/firmware_updates_and_version_history.md +++ b/firmware_updates_and_version_history.md @@ -6,15 +6,15 @@ ## Latest Firmware -### 0.16.0 +### 0.17.0 -[Download Here](https://github.com/dekuNukem/duckyPad/raw/master/firmware/duckypad_v0.16.0.dfu) +[Download Here](https://github.com/dekuNukem/duckyPad/raw/master/firmware/duckypad_v0.17.0.dfu) -* Added `COMMAND` and `OPTION` aliases for macOS. +* `LOOP` counter is no longer reset during sleep. -* Added support for right-side modifier keys, such as `RCTRL`, `RSHFIT`, `RALT`, etc. +* Key colour changes also persist through sleep now. -* [Click me](https://github.com/dekuNukem/duckyPad/blob/master/duckyscript_info.md#special-keys) to learn more. +* `MENU` key now works properly. ## USB Firmware Updates @@ -50,7 +50,7 @@ In the `Available DUF Devices` section at top left corner, you should see a `STM Press the `Choose...` button and select a firmware file in `.dfu` format. -* [Click me](https://github.com/dekuNukem/duckyPad/raw/master/firmware/duckypad_v0.16.0.dfu) to download the latest firmware (v0.16.0) +* [Click me](https://github.com/dekuNukem/duckyPad/raw/master/firmware/duckypad_v0.17.0.dfu) to download the latest firmware (v0.17.0) * ...or [scroll down](#firmware-version-history) for older firmware versions. @@ -82,6 +82,17 @@ After completion, press **`RESET`** button (or power-cycle) to start using the n ## Firmware Version History +### 0.17.0 + +[Download Here](https://github.com/dekuNukem/duckyPad/raw/master/firmware/duckypad_v0.17.0.dfu) + +* `LOOP` counter will no longer reset during sleep. + +* Key colour changes will also now persist through sleep. + +* `MENU` key now works properly. + + ### 0.16.0 [Download Here](https://github.com/dekuNukem/duckyPad/raw/master/firmware/duckypad_v0.16.0.dfu)