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

added mac plus keyboard capture, updated quad test code

Browse Source
This commit is contained in:
dekunukem
2022-03-28 03:23:03 +01:00
parent 9729ee2113
commit 00286b7d8a
15 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
captures/macplus keyboard 741 numpad.sal Normal file
View File

Binary file not shown.

BIN
captures/macplus keyboard bootup.sal Normal file
View File

Binary file not shown.

BIN
captures/macplus keyboard thn.sal Normal file
View File

Binary file not shown.

BIN
captures/macplus keyboard up down right left.sal Normal file
View File

Binary file not shown.

2
firmware/quad_test/MDK-ARM/my_adb.uvguix.allen
View File

@@ -3608,7 +3608,7 @@
<Name>../Src/main.c</Name> <Name>../Src/main.c</Name>
<ColumnNumber>5</ColumnNumber> <ColumnNumber>5</ColumnNumber>
<TopLine>279</TopLine> <TopLine>279</TopLine>
<CurrentLine>308</CurrentLine> <CurrentLine>306</CurrentLine>
<Folding>1</Folding> <Folding>1</Folding>
<ContractedFolders></ContractedFolders> <ContractedFolders></ContractedFolders>
<PaneID>0</PaneID> <PaneID>0</PaneID>

BIN
firmware/quad_test/MDK-ARM/my_adb/main.crf
View File

Binary file not shown.

BIN
firmware/quad_test/MDK-ARM/my_adb/main.o
View File

Binary file not shown.

BIN
firmware/quad_test/MDK-ARM/my_adb/my_adb.axf
View File

Binary file not shown.

2
firmware/quad_test/MDK-ARM/my_adb/my_adb.build_log.htm
View File

@@ -54,7 +54,7 @@ Package Vendor: Keil
<h2>Collection of Component Files used:</h2> <h2>Collection of Component Files used:</h2>
* Component: ARM::CMSIS:CORE:5.3.0 * Component: ARM::CMSIS:CORE:5.3.0
Build Time Elapsed: 00:00:02 Build Time Elapsed: 00:00:01
</pre> </pre>
</body> </body>
</html> </html>

6
firmware/quad_test/MDK-ARM/my_adb/my_adb.hex
View File

@@ -489,9 +489,9 @@
:101E700010B5064A064C91784B00E052491CC8B296 :101E700010B5064A064C91784B00E052491CC8B296
:101E80009070082801D30020907010BD040000203D :101E80009070082801D30020907010BD040000203D
:101E9000240200200902014308B27047002800DA3A :101E9000240200200902014308B27047002800DA3A
:101EA0004042002801DC06487047402802DB7D20C4 :101EA0004042002801DC07487047402802DBFF2041
:101EB000C0007047034948430349401880B2704747 :101EB000F5307047BD21C94348430349401880B2FB
:101EC000FFFF000034FEFFFFFC76000010B5024962 :101EC00070470000FFFF00009231000010B502498A
:101ED0000860FFF711F810BD0000002013B50A23B9 :101ED0000860FFF711F810BD0000002013B50A23B9
:101EE000012269460248FFF7B3F900981CBD0000C3 :101EE000012269460248FFF7B3F900981CBD0000C3
:101EF0004C01002000200C4A01464B00D35E491CD7 :101EF0004C01002000200C4A01464B00D35E491CD7

4
firmware/quad_test/MDK-ARM/my_adb/my_adb.htm
View File

@@ -3,7 +3,7 @@
<title>Static Call Graph - [my_adb\my_adb.axf]</title></head> <title>Static Call Graph - [my_adb\my_adb.axf]</title></head>
<body><HR> <body><HR>
<H1>Static Call Graph for image my_adb\my_adb.axf</H1><HR> <H1>Static Call Graph for image my_adb\my_adb.axf</H1><HR>
<BR><P>#&#060CALLGRAPH&#062# ARM Linker, 5060750: Last Updated: Sat Mar 26 22:19:50 2022 <BR><P>#&#060CALLGRAPH&#062# ARM Linker, 5060750: Last Updated: Sat Mar 26 22:32:39 2022
<BR><P> <BR><P>
<H3>Maximum Stack Usage = 180 bytes + Unknown(Cycles, Untraceable Function Pointers)</H3><H3> <H3>Maximum Stack Usage = 180 bytes + Unknown(Cycles, Untraceable Function Pointers)</H3><H3>
Call chain for Maximum Stack Depth:</H3> Call chain for Maximum Stack Depth:</H3>
@@ -701,7 +701,7 @@ Global Symbols
<BR><BR>[Called By]<UL><LI><a href="#[4b]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;parse_spi_buf <BR><BR>[Called By]<UL><LI><a href="#[4b]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;parse_spi_buf
</UL> </UL>
<P><STRONG><a name="[64]"></a>calc_arr</STRONG> (Thumb, 36 bytes, Stack size 0 bytes, main.o(i.calc_arr)) <P><STRONG><a name="[64]"></a>calc_arr</STRONG> (Thumb, 38 bytes, Stack size 0 bytes, main.o(i.calc_arr))
<BR><BR>[Called By]<UL><LI><a href="#[21]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;main <BR><BR>[Called By]<UL><LI><a href="#[21]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;main
<LI><a href="#[5b]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;HAL_TIM_PeriodElapsedCallback <LI><a href="#[5b]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;HAL_TIM_PeriodElapsedCallback
</UL> </UL>

12
firmware/quad_test/MDK-ARM/my_adb/my_adb.map
View File

@@ -1985,7 +1985,7 @@ Image Symbol Table
__scatterload_zeroinit 0x08001c95 Thumb Code 14 handlers.o(i.__scatterload_zeroinit) __scatterload_zeroinit 0x08001c95 Thumb Code 14 handlers.o(i.__scatterload_zeroinit)
avg_buf_add 0x08001e71 Thumb Code 28 main.o(i.avg_buf_add) 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) 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) delay_us_init 0x08001ecd Thumb Code 12 delay_us.o(i.delay_us_init)
fputc 0x08001edd Thumb Code 18 main.o(i.fputc) fputc 0x08001edd Thumb Code 18 main.o(i.fputc)
get_buf_avg 0x08001ef5 Thumb Code 52 main.o(i.get_buf_avg) 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 16 4 0 4 0 448436 delay_us.o
306 0 0 0 0 7297 helpers.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 114 4 4 0 0 3719 quad_encoder.o
88 38 192 0 1536 648 startup_stm32f042x6.o 88 38 192 0 1536 648 startup_stm32f042x6.o
122 18 0 4 0 3631 stm32f0xx_hal.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 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) 0 0 32 0 0 0 (incl. Generated)
26 0 1 0 4 0 (incl. Padding) 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 Code (inc. data) RO Data RW Data ZI Data Debug
9080 638 308 40 2080 534011 Grand Totals 9080 636 308 40 2080 534011 Grand Totals
9080 638 308 40 2080 534011 ELF Image Totals 9080 636 308 40 2080 534011 ELF Image Totals
9080 638 308 40 0 0 ROM Totals 9080 636 308 40 0 0 ROM Totals
============================================================================== ==============================================================================

2
firmware/quad_test/MDK-ARM/my_adb/my_adb_my_adb.dep
View File

@@ -112,7 +112,7 @@ I (../Drivers/STM32F0xx_HAL_Driver/Inc/stm32f0xx_hal_tim_ex.h)(0x5DFA0893)
-IC:\Users\allen\AppData\Local\Arm\Packs\ARM\CMSIS\5.6.0\CMSIS\Core\Include -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 -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 -D__UVISION_VERSION="529" -D_RTE_ -DSTM32F042x6 -DUSE_HAL_DRIVER -DSTM32F042x6
-o my_adb\quad_encoder.o --omf_browse my_adb\quad_encoder.crf --depend my_adb\quad_encoder.d) -o my_adb\quad_encoder.o --omf_browse my_adb\quad_encoder.crf --depend my_adb\quad_encoder.d)

9
firmware/quad_test/Src/main.c
View File

@@ -288,12 +288,17 @@ uint16_t calc_arr(int32_t speed_val)
if(speed_val <= 0) if(speed_val <= 0)
return 65535; return 65535;
if(speed_val >= 64) if(speed_val >= 64)
return 1000; return 500;
return (uint16_t)(-460*speed_val + 30460); return (uint16_t)(-190*speed_val + 12690); // 1, 12500 | 64, 500
} }
quad_output quad_x; quad_output quad_x;
int32_t avg_speed; 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) void HAL_TIM_PeriodElapsedCallback(TIM_HandleTypeDef *htim)
{ {
if(htim == &htim17) if(htim == &htim17)

2
firmware/quad_test/scrap.c
View File

@@ -1,6 +1,6 @@
// printf("%d %d\n", avg_buf_index, value); // printf("%d %d\n", avg_buf_index, value);
y=−306.4516129032258x+20306.451612903224 y=−306.4516129032258x+20306.451612903224
https://planetcalc.com/8110/
if(avg_speed > 64) if(avg_speed > 64)
avg_speed = 64 avg_speed = 64
elif(avg_speed < -64) elif(avg_speed < -64)