diff --git a/captures/macplus keyboard 741 numpad.sal b/captures/macplus keyboard 741 numpad.sal new file mode 100644 index 0000000..2b41671 Binary files /dev/null and b/captures/macplus keyboard 741 numpad.sal differ diff --git a/captures/macplus keyboard bootup.sal b/captures/macplus keyboard bootup.sal new file mode 100644 index 0000000..176a11a Binary files /dev/null and b/captures/macplus keyboard bootup.sal differ diff --git a/captures/macplus keyboard thn.sal b/captures/macplus keyboard thn.sal new file mode 100644 index 0000000..32a31db Binary files /dev/null and b/captures/macplus keyboard thn.sal differ diff --git a/captures/macplus keyboard up down right left.sal b/captures/macplus keyboard up down right left.sal new file mode 100644 index 0000000..99afc4e Binary files /dev/null and b/captures/macplus keyboard up down right left.sal differ diff --git a/firmware/quad_test/MDK-ARM/my_adb.uvguix.allen b/firmware/quad_test/MDK-ARM/my_adb.uvguix.allen index 3b6ac41..9c7c236 100644 --- a/firmware/quad_test/MDK-ARM/my_adb.uvguix.allen +++ b/firmware/quad_test/MDK-ARM/my_adb.uvguix.allen @@ -3608,7 +3608,7 @@ ../Src/main.c 5 279 - 308 + 306 1 0 diff --git a/firmware/quad_test/MDK-ARM/my_adb/main.crf b/firmware/quad_test/MDK-ARM/my_adb/main.crf index 6e81d75..924cdfa 100644 Binary files a/firmware/quad_test/MDK-ARM/my_adb/main.crf and b/firmware/quad_test/MDK-ARM/my_adb/main.crf differ diff --git a/firmware/quad_test/MDK-ARM/my_adb/main.o b/firmware/quad_test/MDK-ARM/my_adb/main.o index c923e9f..cb1dd0c 100644 Binary files a/firmware/quad_test/MDK-ARM/my_adb/main.o and b/firmware/quad_test/MDK-ARM/my_adb/main.o differ diff --git a/firmware/quad_test/MDK-ARM/my_adb/my_adb.axf b/firmware/quad_test/MDK-ARM/my_adb/my_adb.axf index 1225c11..0d3a920 100644 Binary files a/firmware/quad_test/MDK-ARM/my_adb/my_adb.axf and b/firmware/quad_test/MDK-ARM/my_adb/my_adb.axf differ diff --git a/firmware/quad_test/MDK-ARM/my_adb/my_adb.build_log.htm b/firmware/quad_test/MDK-ARM/my_adb/my_adb.build_log.htm index f5f3833..07097e3 100644 --- a/firmware/quad_test/MDK-ARM/my_adb/my_adb.build_log.htm +++ b/firmware/quad_test/MDK-ARM/my_adb/my_adb.build_log.htm @@ -54,7 +54,7 @@ Package Vendor: Keil

Collection of Component Files used:

* Component: ARM::CMSIS:CORE:5.3.0 -Build Time Elapsed: 00:00:02 +Build Time Elapsed: 00:00:01 diff --git a/firmware/quad_test/MDK-ARM/my_adb/my_adb.hex b/firmware/quad_test/MDK-ARM/my_adb/my_adb.hex index bbdcd67..015152a 100644 --- a/firmware/quad_test/MDK-ARM/my_adb/my_adb.hex +++ b/firmware/quad_test/MDK-ARM/my_adb/my_adb.hex @@ -489,9 +489,9 @@ :101E700010B5064A064C91784B00E052491CC8B296 :101E80009070082801D30020907010BD040000203D :101E9000240200200902014308B27047002800DA3A -:101EA0004042002801DC06487047402802DB7D20C4 -:101EB000C0007047034948430349401880B2704747 -:101EC000FFFF000034FEFFFFFC76000010B5024962 +:101EA0004042002801DC07487047402802DBFF2041 +:101EB000F5307047BD21C94348430349401880B2FB +:101EC00070470000FFFF00009231000010B502498A :101ED0000860FFF711F810BD0000002013B50A23B9 :101EE000012269460248FFF7B3F900981CBD0000C3 :101EF0004C01002000200C4A01464B00D35E491CD7 diff --git a/firmware/quad_test/MDK-ARM/my_adb/my_adb.htm b/firmware/quad_test/MDK-ARM/my_adb/my_adb.htm index 7106b13..26a485d 100644 --- a/firmware/quad_test/MDK-ARM/my_adb/my_adb.htm +++ b/firmware/quad_test/MDK-ARM/my_adb/my_adb.htm @@ -3,7 +3,7 @@ Static Call Graph - [my_adb\my_adb.axf]

Static Call Graph for image my_adb\my_adb.axf

-

#<CALLGRAPH># ARM Linker, 5060750: Last Updated: Sat Mar 26 22:19:50 2022 +

#<CALLGRAPH># ARM Linker, 5060750: Last Updated: Sat Mar 26 22:32:39 2022

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

Call chain for Maximum Stack Depth:

@@ -701,7 +701,7 @@ Global Symbols

[Called By] -

calc_arr (Thumb, 36 bytes, Stack size 0 bytes, main.o(i.calc_arr)) +

calc_arr (Thumb, 38 bytes, Stack size 0 bytes, main.o(i.calc_arr))

[Called By]

diff --git a/firmware/quad_test/MDK-ARM/my_adb/my_adb.map b/firmware/quad_test/MDK-ARM/my_adb/my_adb.map index 6b0c373..2ae3dc4 100644 --- a/firmware/quad_test/MDK-ARM/my_adb/my_adb.map +++ b/firmware/quad_test/MDK-ARM/my_adb/my_adb.map @@ -1985,7 +1985,7 @@ Image Symbol Table __scatterload_zeroinit 0x08001c95 Thumb Code 14 handlers.o(i.__scatterload_zeroinit) avg_buf_add 0x08001e71 Thumb Code 28 main.o(i.avg_buf_add) byte_to_int16_t 0x08001e95 Thumb Code 8 main.o(i.byte_to_int16_t) - calc_arr 0x08001e9d Thumb Code 36 main.o(i.calc_arr) + calc_arr 0x08001e9d Thumb Code 38 main.o(i.calc_arr) delay_us_init 0x08001ecd Thumb Code 12 delay_us.o(i.delay_us_init) fputc 0x08001edd Thumb Code 18 main.o(i.fputc) get_buf_avg 0x08001ef5 Thumb Code 52 main.o(i.get_buf_avg) @@ -2230,7 +2230,7 @@ Image component sizes 16 4 0 4 0 448436 delay_us.o 306 0 0 0 0 7297 helpers.o - 1618 238 55 16 540 18321 main.o + 1618 236 55 16 540 18321 main.o 114 4 4 0 0 3719 quad_encoder.o 88 38 192 0 1536 648 startup_stm32f042x6.o 122 18 0 4 0 3631 stm32f0xx_hal.o @@ -2247,7 +2247,7 @@ Image component sizes 92 14 24 4 0 1147 system_stm32f0xx.o ---------------------------------------------------------------------- - 8276 594 308 28 2080 537891 Object Totals + 8276 592 308 28 2080 537891 Object Totals 0 0 32 0 0 0 (incl. Generated) 26 0 1 0 4 0 (incl. Padding) @@ -2293,9 +2293,9 @@ Image component sizes Code (inc. data) RO Data RW Data ZI Data Debug - 9080 638 308 40 2080 534011 Grand Totals - 9080 638 308 40 2080 534011 ELF Image Totals - 9080 638 308 40 0 0 ROM Totals + 9080 636 308 40 2080 534011 Grand Totals + 9080 636 308 40 2080 534011 ELF Image Totals + 9080 636 308 40 0 0 ROM Totals ============================================================================== diff --git a/firmware/quad_test/MDK-ARM/my_adb/my_adb_my_adb.dep b/firmware/quad_test/MDK-ARM/my_adb/my_adb_my_adb.dep index 8428555..f27fe32 100644 --- a/firmware/quad_test/MDK-ARM/my_adb/my_adb_my_adb.dep +++ b/firmware/quad_test/MDK-ARM/my_adb/my_adb_my_adb.dep @@ -112,7 +112,7 @@ I (../Drivers/STM32F0xx_HAL_Driver/Inc/stm32f0xx_hal_tim_ex.h)(0x5DFA0893) I (../Drivers/STM32F0xx_HAL_Driver/Inc/stm32f0xx_hal_uart.h)(0x5DFA0893) I (../Drivers/STM32F0xx_HAL_Driver/Inc/stm32f0xx_hal_uart_ex.h)(0x5DFA0893) I (../Inc/shared.h)(0x617487BD) -F (../Src/main.c)(0x623F9182)(--c99 -c --cpu Cortex-M0 -D__MICROLIB -g -O3 --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.\RTE\_my_adb -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_ -DSTM32F042x6 -DUSE_HAL_DRIVER -DSTM32F042x6 -o my_adb\main.o --omf_browse my_adb\main.crf --depend my_adb\main.d) +F (../Src/main.c)(0x623F947E)(--c99 -c --cpu Cortex-M0 -D__MICROLIB -g -O3 --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.\RTE\_my_adb -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_ -DSTM32F042x6 -DUSE_HAL_DRIVER -DSTM32F042x6 -o my_adb\main.o --omf_browse my_adb\main.crf --depend my_adb\main.d) I (../Inc/main.h)(0x623F86F5) I (../Drivers/STM32F0xx_HAL_Driver/Inc/stm32f0xx_hal.h)(0x5DFA0893) I (../Inc/stm32f0xx_hal_conf.h)(0x623F86F5) diff --git a/firmware/quad_test/Src/main.c b/firmware/quad_test/Src/main.c index abad2dd..65e9cd4 100644 --- a/firmware/quad_test/Src/main.c +++ b/firmware/quad_test/Src/main.c @@ -288,12 +288,17 @@ uint16_t calc_arr(int32_t speed_val) if(speed_val <= 0) return 65535; if(speed_val >= 64) - return 1000; - return (uint16_t)(-460*speed_val + 30460); + return 500; + return (uint16_t)(-190*speed_val + 12690); // 1, 12500 | 64, 500 } quad_output quad_x; int32_t avg_speed; + +/* + this gets called every 10ms, fetches mouse event and put them into a running buffer + a window average is calculated, used to adjust the timer autoreload register +*/ void HAL_TIM_PeriodElapsedCallback(TIM_HandleTypeDef *htim) { if(htim == &htim17) diff --git a/firmware/quad_test/scrap.c b/firmware/quad_test/scrap.c index fd64945..7e86d87 100644 --- a/firmware/quad_test/scrap.c +++ b/firmware/quad_test/scrap.c @@ -1,6 +1,6 @@ // printf("%d %d\n", avg_buf_index, value); y=−306.4516129032258x+20306.451612903224 - +https://planetcalc.com/8110/ if(avg_speed > 64) avg_speed = 64 elif(avg_speed < -64)