..\Src\ps2mouse.c
- 1
+ 31
135
- 154
+ 161
1
0
diff --git a/firmware/ibmpc/MDK-ARM/ibmpc.uvoptx b/firmware/ibmpc/MDK-ARM/ibmpc.uvoptx
index 51dc906..04a93de 100644
--- a/firmware/ibmpc/MDK-ARM/ibmpc.uvoptx
+++ b/firmware/ibmpc/MDK-ARM/ibmpc.uvoptx
@@ -421,14 +421,6 @@
-
- ::CMSIS
- 0
- 0
- 0
- 1
-
-
Drivers/STM32F0xx_HAL_Driver
0
@@ -436,7 +428,7 @@
0
0
- 4
+ 3
18
1
0
@@ -448,7 +440,7 @@
0
- 4
+ 3
19
1
0
@@ -460,7 +452,7 @@
0
- 4
+ 3
20
1
0
@@ -472,7 +464,7 @@
0
- 4
+ 3
21
1
0
@@ -484,7 +476,7 @@
0
- 4
+ 3
22
1
0
@@ -496,7 +488,7 @@
0
- 4
+ 3
23
1
0
@@ -508,7 +500,7 @@
0
- 4
+ 3
24
1
0
@@ -520,7 +512,7 @@
0
- 4
+ 3
25
1
0
@@ -532,7 +524,7 @@
0
- 4
+ 3
26
1
0
@@ -544,7 +536,7 @@
0
- 4
+ 3
27
1
0
@@ -556,7 +548,7 @@
0
- 4
+ 3
28
1
0
@@ -568,7 +560,7 @@
0
- 4
+ 3
29
1
0
@@ -580,7 +572,7 @@
0
- 4
+ 3
30
1
0
@@ -592,7 +584,7 @@
0
- 4
+ 3
31
1
0
@@ -604,7 +596,7 @@
0
- 4
+ 3
32
1
0
@@ -616,7 +608,7 @@
0
- 4
+ 3
33
1
0
@@ -628,7 +620,7 @@
0
- 4
+ 3
34
1
0
@@ -640,7 +632,7 @@
0
- 4
+ 3
35
1
0
@@ -652,7 +644,7 @@
0
- 4
+ 3
36
1
0
@@ -672,7 +664,7 @@
0
0
- 5
+ 4
37
1
0
@@ -685,4 +677,12 @@
+
+ ::CMSIS
+ 0
+ 0
+ 0
+ 1
+
+
diff --git a/firmware/ibmpc/MDK-ARM/ibmpc.uvprojx b/firmware/ibmpc/MDK-ARM/ibmpc.uvprojx
index a343f4e..e4bc468 100644
--- a/firmware/ibmpc/MDK-ARM/ibmpc.uvprojx
+++ b/firmware/ibmpc/MDK-ARM/ibmpc.uvprojx
@@ -474,9 +474,6 @@
-
- ::CMSIS
-
Drivers/STM32F0xx_HAL_Driver
@@ -587,6 +584,9 @@
+
+ ::CMSIS
+
diff --git a/firmware/ibmpc/MDK-ARM/ibmpc/ibmpc.axf b/firmware/ibmpc/MDK-ARM/ibmpc/ibmpc.axf
index 565a920..1fd460d 100644
Binary files a/firmware/ibmpc/MDK-ARM/ibmpc/ibmpc.axf and b/firmware/ibmpc/MDK-ARM/ibmpc/ibmpc.axf differ
diff --git a/firmware/ibmpc/MDK-ARM/ibmpc/ibmpc.build_log.htm b/firmware/ibmpc/MDK-ARM/ibmpc/ibmpc.build_log.htm
index 95fb259..f8f92c6 100644
--- a/firmware/ibmpc/MDK-ARM/ibmpc/ibmpc.build_log.htm
+++ b/firmware/ibmpc/MDK-ARM/ibmpc/ibmpc.build_log.htm
@@ -22,16 +22,25 @@ Tool Versions:
Project:
C:\Users\allen\Desktop\repos\USB4VC\firmware\ibmpc\MDK-ARM\ibmpc.uvprojx
-Project File Date: 03/07/2023
+Project File Date: 04/30/2023
Output:
*** Using Compiler 'V5.06 update 6 (build 750)', folder: 'C:\Keil_v5\ARM\ARMCC\Bin'
Build target 'ibmpc'
-compiling ps2mouse.c...
+compiling main.c...
+../Src/main.c(556): warning: #188-D: enumerated type mixed with another type
+ HAL_GPIO_WritePin(GAMEPAD_B1_GPIO_Port, GAMEPAD_B1_Pin, !(this_gamepad_event->button_1));
+../Src/main.c(557): warning: #188-D: enumerated type mixed with another type
+ HAL_GPIO_WritePin(GAMEPAD_B2_GPIO_Port, GAMEPAD_B2_Pin, !(this_gamepad_event->button_2));
+../Src/main.c(558): warning: #188-D: enumerated type mixed with another type
+ HAL_GPIO_WritePin(GAMEPAD_B3_GPIO_Port, GAMEPAD_B3_Pin, !(this_gamepad_event->button_3));
+../Src/main.c(559): warning: #188-D: enumerated type mixed with another type
+ HAL_GPIO_WritePin(GAMEPAD_B4_GPIO_Port, GAMEPAD_B4_Pin, !(this_gamepad_event->button_4));
+../Src/main.c: 4 warnings, 0 errors
linking...
-Program Size: Code=17252 RO-data=768 RW-data=140 ZI-data=2340
+Program Size: Code=17284 RO-data=768 RW-data=144 ZI-data=2344
FromELF: creating hex file...
-"ibmpc\ibmpc.axf" - 0 Error(s), 0 Warning(s).
+"ibmpc\ibmpc.axf" - 0 Error(s), 4 Warning(s).
Software Packages used:
diff --git a/firmware/ibmpc/MDK-ARM/ibmpc/ibmpc.hex b/firmware/ibmpc/MDK-ARM/ibmpc/ibmpc.hex
index 4c77b89..80d94e1 100644
--- a/firmware/ibmpc/MDK-ARM/ibmpc/ibmpc.hex
+++ b/firmware/ibmpc/MDK-ARM/ibmpc/ibmpc.hex
@@ -1,5 +1,5 @@
:020000040800F2
-:10000000B0090020D50000083D1E00087519000841
+:10000000B8090020D50000083D1E00087519000839
:1000100000000000000000000000000000000000E0
:100020000000000000000000000000007B2100082C
:100030000000000000000000851E00087D2100086F
@@ -12,7 +12,7 @@
:1000A000E7000008891E0008E7000008E7000008D4
:1000B000E70000087D270008E7000008E7000008C7
:1000C0000348854600F04EF800480047152F000809
-:1000D000B00900200448804704480047FEE7FEE7D7
+:1000D000B80900200448804704480047FEE7FEE7CF
:1000E000FEE7FEE7FEE7FEE7F5210008C100000895
:1000F00030B50B46014600202022012409E00D46C0
:10010000D5409D4205D31D469540491B2546954047
@@ -23,7 +23,7 @@
:10015000F6E710B513460A4604461946FFF7F0FFC6
:10016000204610BD064C0125064E05E0E36807CC8D
:100170002B430C3C98471034B442F7D3FFF7A4FF4D
-:10018000444600086446000810B5022000F042F81A
+:10018000644600088446000810B5022000F042F8DA
:1001900010BD70B50024014620314A78022A03D0F0
:1001A00004218163012416E0026813680E25AB4325
:1001B0001360026813685B085B0013600122056C22
@@ -57,7 +57,7 @@
:100370000004004800080048000C00480010004835
:10038000000401400069084000D001207047426924
:100390004A4042617047002A01D081617047816202
-:1003A0007047000001480068704700007800002096
+:1003A0007047000001480068704700007C00002092
:1003B00070B5024640325378202B1CD11378012BA4
:1003C00019D00123137024245470046825689D43B8
:1003D0002560046825681E03B54325600468256808
@@ -130,7 +130,7 @@
:1008000001E004490160002070BD0000CCCC000074
:1008100055550000AAAA00000068024901600020A6
:1008200070470000AAAA000002480168491C016044
-:10083000704700007800002010B5064801681022BB
+:10083000704700007C00002010B5064801681022B7
:1008400011430160002000F007F800F017F80020C5
:1008500010BD00000020024010B5044600F078F9F9
:100860007D21C900FFF744FC00F0E2FD0022214693
@@ -179,10 +179,10 @@
:100B10006068072109028843E9680843606000F0C3
:100B20002DF86168084A0906090F515CC840074959
:100B300008600020FFF790FE0020F8BD0020024072
-:100B40000010024088130000294600087C000020A5
-:100B500001480068704700007C00002004480549F7
+:100B40000010024088130000494600088000002081
+:100B500001480068704700008000002004480549F3
:100B600000684968044A4905490F515CC84070470C
-:100B70007C000020001002403946000830B516A362
+:100B700080000020001002405946000830B516A33E
:100B80000FCB89B06C460FC417A30FCB0FC41A4903
:100B90004A680C20144604401848042C05D0184B11
:100BA000082C04D00C2C00D1184609B030BD94029A
@@ -299,27 +299,27 @@
:10129000CF1E0008611F0008F8B501220920D10304
:1012A000C006FFF778F856492022881AFEF736FF65
:1012B000534C0127203C2078524EDE2801D0777213
-:1012C00090E0A07808280BD0092810D000250B2822
-:1012D00030D003284AD001284FD0022879D081E0AD
-:1012E0004748A2792179203001F00EFD7AE061793A
+:1012C00091E0A07808280BD0092810D000250B2821
+:1012D00030D003284AD001284FD002287AD082E0AB
+:1012E0004748A2792179203001F00EFD7BE0617939
:1012F000207901F05DFB424A2C321060E179A0793F
:1013000001F056FB40425060207A3D494042107245
:10131000607A5072607B9072A07B1073E07BD07219
-:10132000207C5073607C907336482C31203001F063
-:10133000EBFF57E0324821794C3001706179417000
+:10132000207C5073607C907336482C31243001F05F
+:10133000EBFF58E0324821794C30017061794170FF
:10134000A1798170E179C170057145718571C571AF
:10135000217A0172617A4172A17A8172E17AC17255
-:1013600001462848283001F051FB3BE001210022D2
-:1013700049032548FFF70FF834E021482021403881
+:10136000014628482C3001F051FB3CE001210022CD
+:1013700049032548FFF70FF835E021482021403880
:10138000FEF7E5FE1E48CD214038017061784170BE
:1013900080238370C7703178017145710521817197
-:1013A000C171082200210546A1356C5C002C0CD0CF
-:1013B000022C02D0012C03D005E0815403E008E0A8
-:1013C0000C461C438454521CD2B2491C1029ECDB3D
-:1013D00008E00325605D002804D001F013FC6D1CBB
-:1013E000202DF7DB064A2023114640390748FFF736
-:1013F000E9FE01F01FFF064940187061F8BD0000CA
-:101400003C0300204800002000080048780100202C
+:1013A0000621C171082200210546A1356C5C002C84
+:1013B0000CD0022C02D0012C03D005E0815403E0B4
+:1013C00008E00C461C438454521CD2B2491C10291C
+:1013D000ECDB08E00325605D002804D001F012FC7E
+:1013E0006D1C202DF7DB064A2023114640390748A3
+:1013F000FFF7E8FE01F01EFF054940187061F8BDD7
+:101400004003002048000020000800487C01002024
:1014100010270000042204490428086902D09043E0
:10142000086170471043FBE700E000E070470000F0
:10143000094910B5401E884201D9012010BD074C52
@@ -465,30 +465,30 @@
:101CF0000161416181610122C161C2600162FEF73F
:101D0000A1FB002800D0FEE700210848FEF750FBA9
:101D1000002800D0FEE700210448FEF76EFB0028F3
-:101D200000D0FEE710BD0000005800401C0100205C
+:101D200000D0FEE710BD0000005800402001002058
:101D30005D3E302010B50D480B4901600021416027
:101D40008160016141618161072201621202416289
:101D5000C260816207220163C2624163FFF7AAF990
-:101D6000002800D0FEE710BD0030014078010020BF
+:101D6000002800D0FEE710BD003001407C010020BB
:101D700010B50121124886B08907016000242F2187
:101D8000846041600461611E8461C160FFF790FB63
:101D9000002800D0FEE701200003009069460848B3
:101DA000FFF7BEFB002800D0FEE7049404A9044816
:101DB0000594FFF759FB002800D0FEE706B010BDE0
-:101DC000DC01002010B50C480A490160E1214902FC
+:101DC000E001002010B50C480A490160E1214902F8
:101DD000416000218160C16001618161C1610C22AB
:101DE000016242614162FFF7AFFC002800D0FEE7CC
-:101DF00010BD0000003801401C02002010B50E4844
+:101DF00010BD0000003801402002002010B50E4840
:101E00000C4901604B21090141600021C160016161
:101E100081610C22C1614261016230214162012174
:101E2000090381634900C163FFF78EFC002800D0DD
-:101E3000FEE710BD004800408C0200207047000003
+:101E3000FEE710BD004800409002002070470000FF
:101E40008307FF22DB0E9A408907090E994000287C
:101E50000BDA0007000F0838830808489B001818A1
:101E6000C36993430B43C3617047830804489B00D5
:101E70001B181868904308431860704700ED00E095
:101E800000E400E07047000010B50248FFF7A8F832
-:101E900010BD00007801002010B50168C968026C0F
+:101E900010BD00007C01002010B50168C968026C0B
:101EA0001180016C891C016401464031CA88521EB0
:101EB000CA80C988002909D101684A6840239A4329
:101EC0004A60C18F002901D100F06EF810BD10B535
@@ -631,9 +631,9 @@
:102750008160202060346072A0720020207203200B
:1027600005B0F0BD2068C1693046884304D0002020
:10277000B842D9D00020F3E70120F9E710B50248AC
-:10278000FEF748FF10BD00008C0200200FB410B50A
+:10278000FEF748FF10BD0000900200200FB410B506
:1027900003A9044B044A029800F024F810BC08BCBA
-:1027A00004B01847F52900088000002030B47446B2
+:1027A00004B01847F52900088400002030B47446AE
:1027B000641E2578641CAB4200D21D46635D5B003D
:1027C000E31830BC184702E008C8121F08C1002AED
:1027D000FAD170477047002001E001C1121F002AA2
@@ -671,7 +671,7 @@
:1029D000014600F02FFC411800F02CFC8842FBD38C
:1029E00000BD000010B502490860FEF78DFD10BD66
:1029F0000000002013B56423012269460248FEF757
-:102A000022FF00981CBD00001C02002010B50B46E0
+:102A000022FF00981CBD00002002002010B50B46DC
:102A1000044600F01DF8002801D0012010BD2078E8
:102A20000C226168504308181946FDF777FB20789F
:102A3000401C4007400F2070002010BD10B5044618
@@ -690,7 +690,7 @@
:102B0000607A291A002000F079FBA07A291A0220A5
:102B100000F074FBE07A291A012000F06FFB0648F0
:102B2000FFF7ACFF70BD0122C4E70122CBE7012211
-:102B3000D3E70122D9E7000070000020001400480C
+:102B3000D3E70122D9E70000740000200014004808
:102B40000008004870B50C4C012202212046FDF718
:102B500022FC0A4D0122D1032846FDF71CFC01226C
:102B600011462046FDF717FC012291032846FDF788
@@ -707,19 +707,19 @@
:102C10002BD2254D285D002827D0002926D0022858
:102C200023D122482300FFF7C1FD091E060D1E1007
:102C3000161E1C191E00FF2301330246590000F026
-:102C400039FC10E001F000FB0DE0102302462021CA
+:102C400039FC10E001F010FB0DE0102302462021BA
:102C500001F09EF807E000F0A1FB04E000F0AAFB01
:102C600001E0FFF76FFF0120285570BD0128FCD15E
:102C7000022028552300FFF799FD0805060B050ED5
:102C800005051305F1E700F0D9FD00F0E7FD70BD83
-:102C900001F02AFB70BD01F015F901F003F970BDD8
-:102CA000FFF750FF70BD00009D03002000040048A6
+:102C900001F03AFB70BD01F015F901F003F970BDC8
+:102CA000FFF750FF70BD0000A103002000040048A2
:102CB000002802D0ED2901D3002070470B4882780C
:102CC0000B48012A04D0022A06D0032A08D00BE0C0
:102CD0008E2909D2042206E08E2905D2022202E0C2
:102CE0008E2901D2032242540120704704000020A3
-:102CF0008C000020102803D20249085C012800D073
-:102D0000002070479D03002010B50C46034600F0DC
+:102CF00090000020102803D20249085C012800D06F
+:102D000000207047A103002010B50C46034600F0D8
:102D10001FF8002801D0012010BD197858684454CC
:102D20001978986842541878401C4007400F187072
:102D3000002010BD10B50446082000F001FA6060C4
@@ -752,38 +752,38 @@
:102EE0000021207802E014220121EE2000F032FDC2
:102EF000FEBD14220121FA2000F02CFD1E210298B3
:102F000000F01EFC00288BD0FEBD00000400002055
-:102F10008C0000201CB57148714C8089A081FDF7A0
+:102F1000900000201CB57148714C8089A081FDF79C
:102F20008BFCFFF731F9FEF72DFEFEF7D9FEFEF719
:102F300001FFFEF71DFFFEF745FFFEF75FFF6A4842
:102F400068490160032141606849C1608160FDF703
-:102F500031FC002800D0FEE76348FDF75DFC05204A
-:102F60000090019000232278614962A0FFF70EFCD7
-:102F70005D487430FFF736FD00F068FAFF26013631
-:102F8000614D77002A4633463946104600F092FAE2
-:102F90002A4633463946104601F060F92A46102386
-:102FA0002021104600F0F4FE0220FFF7A3FE0028C7
-:102FB00001D001F049F95548FFF7BCFE48482030E0
-:102FC00000F0B8F946482830FFF738FD00F0FEF869
-:102FD0004E4820216038FDF7BAF84C4A4248203A62
-:102FE0001146202340391030FEF7ECF8A18948A0A3
-:102FF000FFF7CCFB00F0DAF8002812D148A0FFF769
-:10300000C5FB002708212846FDF7C1F93220FDF74E
-:10301000E4F87F1C0A2FF5DB012208212846FDF782
-:10302000BAF90927FF063048FDF7F6FB00F002F970
-:103030006169884205D901210022C9033846FDF79C
-:10304000AAF90420FFF756FE002809D00121C90380
-:103050002846FDF797F9002802D000F05FFF0EE048
-:103060000520FFF747FE002802D000F0EBF806E04D
-:103070000820FFF73FFE002801D000F0A5F901204D
-:10308000FFF738FE00280FD031463846FDF77AF9B1
-:10309000002809D000F0F4FB002812D00022012102
-:1030A0003846FDF778F90CE00220FFF723FE0028F0
-:1030B00007D031463846FDF765F9002801D001F008
-:1030C00033F90720FFF716FE002801D0FFF7E8FCD0
-:1030D000607A0028A7D001F043F80000C0F7FF1F76
-:1030E000480000200030004068010020FF0F000071
-:1030F000F245000825730A726576256420762564FA
-:103100002E25642E25640A00000400485C0300207C
+:102F500031FC002800D0FEE76348FDF75DFC062148
+:102F600005200191009000232278614961A0FFF7BC
+:102F70000DFC5D487430FFF735FD00F067FAFF2661
+:102F80000136614D77002A4633463946104600F037
+:102F900091FA2A4633463946104601F06FF92A461F
+:102FA00010232021104600F0F3FE0220FFF7A2FEBE
+:102FB000002801D001F058F95448FFF7BBFE4848FB
+:102FC000243000F0B7F946482C30FFF737FD00F009
+:102FD000FDF84E4820216038FDF7B9F84B4A4248C9
+:102FE000203A1146202340391030FEF7EBF8A18932
+:102FF00047A0FFF7CBFB00F0D9F8002812D148A07A
+:10300000FFF7C4FB002708212846FDF7C0F932204E
+:10301000FDF7E3F87F1C0A2FF5DB01220821284683
+:10302000FDF7B9F90927FF062F48FDF7F5FB00F07A
+:1030300001F96169884205D901210022C903384696
+:10304000FDF7A9F90420FFF755FE002809D001215A
+:10305000C9032846FDF796F9002802D000F05EFF6C
+:103060000EE00520FFF746FE002802D000F0EAF847
+:1030700006E00820FFF73EFE002801D000F0A4F98A
+:103080000120FFF737FE00280FD031463846FDF704
+:1030900079F9002809D000F0F3FB002812D00022B3
+:1030A00001213846FDF777F90CE00220FFF722FEF8
+:1030B000002807D031463846FDF764F9002801D0D2
+:1030C00001F042F90720FFF715FE002801D0FFF7B5
+:1030D000E7FC607A0028A7D001F052F8C0F7FF1F84
+:1030E00048000020003000406C010020FF0F00006D
+:1030F0001246000825730A726576256420762564D9
+:103100002E25642E25640A00000400486003002078
:10311000666C6173685F73697A653A2025640A009A
:103120004469676974616C20706F74206E6F7420DD
:10313000726573706F6E64696E67210A000000002B
@@ -792,21 +792,21 @@
:1031600030C3083B00E04368136002C004E0021D66
:1031700010680028ECD13046002803D138680028B8
:1031800001D00020F0BD064A06481060064A121A17
-:10319000D208D20044C001203860D7E78800002060
-:1031A00084000020B4030020B005002010B5642383
+:10319000D208D20044C001203860D7E78C0000205C
+:1031A00088000020BC030020B805002010B564236F
:1031B000012258210448FDF79FF9002801D0002082
-:1031C00010BD012010BD00001C01002070B50A4C8C
+:1031C00010BD012010BD00002001002070B50A4C88
:1031D000002204212046FDF7DEF87D25ED0028467B
:1031E000FFF7F5FB012204212046FDF7D4F828461D
:1031F000FFF7EDFB70BD00000004004803B583B08D
:10320000042802D3FF2005B000BD08496423085CF0
:1032100001210007020E04A80293019100900B46C1
-:1032200058210348FDF7F6F9EDE70000EE450008E8
-:103230001C010020024800680068406A70470000D6
+:1032200058210348FDF7F6F9EDE700000E460008C7
+:1032300020010020024800680068406A70470000D2
:103240000000002070B52E4C207A002601250028B1
:1032500008D04D20E0710122E11D2A48FEF757FBFE
-:10326000A57226722648203000F07AF8002845D052
-:10327000A07A002842D123492148EC312030FFF7C1
+:10326000A57226722648243000F07AF8002845D04E
+:10327000A07A002842D123492148EC312430FFF7BD
:103280007FFC1F48C0210E300680867001701D49EA
:10329000EC318A7A002A01D0E02202700A7B002AEF
:1032A00003D0027810231A4302700A88898812B268
@@ -815,7 +815,7 @@
:1032D0000378022633430370530602D503782B4349
:1032E00003709206920E42708906890E817004491D
:1032F00003220E310348FEF70AFBA57270BD0000E1
-:10330000480000208C02002030B50B46024600F039
+:10330000480000209002002030B50B46024600F035
:103310001CF8002801D0012030BD11785068090147
:1033200040183ACB3AC01078401C0007000F1070CC
:10333000002030BD10B50446FF200130FFF700FF2C
@@ -826,18 +826,18 @@
:10338000090F4170704710B5002101704170FF2195
:1033900040680131FCF7DBFE10BD000010B50120D4
:1033A0000349000788600846FEF7CEF910BD00000B
-:1033B0008C02002010B50349002088600846FEF703
-:1033C000C3F910BD8C02002070B51E48FFF7C8FF7E
-:1033D000002835D01B4C203CA07A002830D11A4957
-:1033E0001848FFF7CDFB204618300022026002711A
+:1033B0009002002010B50349002088600846FEF7FF
+:1033C000C3F910BD9002002070B51E48FFF7C8FF7A
+:1033D000002835D01B4C243CA07A002830D11A4953
+:1033E0001848FFF7CDFB20461C3000220260027116
:1033F0008721017014498B7A002B01D0832303703D
:10340000CB7A002B03D00378FD252B4003700B7B78
:10341000002B03D003785B085B0003700B784370CC
:1034200009798170C27002710648FFF7A3FF054950
:10343000054805220839EC38FEF769FA0120A07228
-:1034400070BD0000680000207803002010B5102136
+:1034400070BD00006C0000207C03002010B510212E
:103450000648FCF77CFE012104480222417082707C
-:10346000017142710272C17110BD00009D03002004
+:10346000017142710272C17110BD0000A103002000
:1034700070B50F4DA988A868FCF784FF0446E98859
:10348000E868FCF77FFF012802D0002809D00AE095
:10349000012C02D0002C02D005E0032070BD0220D8
@@ -875,14 +875,14 @@
:10369000772000F05FF900280ED110BD022010BD88
:1036A0001422012120468CE714220021E02000F0A2
:1036B00051F9002800D149E7082010BD032010BDB2
-:1036C0007545000810B5C32801D3052010BD1A4A5E
+:1036C0009545000810B5C32801D3052010BD1A4A3E
:1036D000145CFF2C03D08E2C03D3062010BD0220D7
:1036E00010BD16480129025D04D0002910D002291E
:1036F0001BD01EE0022A03D0012A01D0032A18D1D0
:1037000014220021204600F025F900280BD110E0FA
:10371000022A01D0012A0CD114220021F02000F04D
:1037200019F90028ECD0082010BD012AE8D0042A9D
-:10373000E6D0002010BD0000244400088C000020CA
+:10373000E6D0002010BD00004444000890000020A6
:10374000F3B581B00F4600250126FCF72BFE3A4C5D
:10375000206107E0FCF726FE2169401AB84201D338
:103760000420FEBDFFF784FE0128F3D11220FFF7ED
@@ -902,7 +902,7 @@
:103840000122A188A068FCF7A6FD0122E188E068BA
:10385000FCF7A1FD10BD00000400002010B50548D4
:1038600002210170012141708E2203490348FCF7B7
-:1038700055FC10BD04000020E74400088C00002027
+:1038700055FC10BD04000020074500089000002002
:1038800038B5FFF7F5FD304C0228A07106D00925A8
:10389000ED06012806D0032837D04EE0FFF7CEFF13
:1038A000002038BD012211462846FCF774FDFF2197
@@ -915,7 +915,7 @@
:10391000511E6030FFF727FA00280ED10122114610
:103920002846FCF738FD2179E078FFF7D1FD08281B
:1039300005D006486030FFF726FA012038BD012087
-:10394000FCF74BFCF9E7000048000020FC020020D7
+:10394000FCF74BFCF9E700004800002000030020D2
:1039500000080048F8B515460E460746144CFCF71B
:1039600021FD206107E0FCF71DFD2169401AA842F6
:1039700001D30420F8BDFFF77BFD0328F3D1FFF747
@@ -963,27 +963,27 @@
:103C10000843F7E718000020F8B500250E46FF28F6
:103C200010D0E63800210127584C0300FEF7BEFDF6
:103C300011A0A69063619B9B9B5A9B549B331E1CB7
-:103C40001A179B0000F03EF91421FA2000F0E5F964
-:103C5000FA21AA2000F0D4F91421002075E000F028
+:103C40001A179B0000F03EF91421FA2000F0F5F954
+:103C5000FA21AA2000F0E4F91421002075E000F018
:103C60003DF980E021707EE027707CE01421FA208D
-:103C700000F0D3F945489621401C00F097F8002841
+:103C700000F0E3F945489621401C00F097F8002831
:103C80002FD142492079143162780A5407286AD228
-:103C9000401C207167E01421FA2000F0BEF9217960
+:103C9000401C207167E01421FA2000F0CEF9217950
:103CA000022916D93948143040182038C17F5029CC
:103CB0000FD1817F642902D0C82905D009E0407F57
:103CC000C82806D1032003E0407FC82801D1042082
-:103CD00060711421607938E01421FA2000F09DF918
-:103CE000A771F8BD1421FA2000F097F90220A07105
-:103CF000F8BDA17137E01421FA2000F08EF9A07907
+:103CD00060711421607938E01421FA2000F0ADF908
+:103CE000A771F8BD1421FA2000F0A7F90220A071F5
+:103CF000F8BDA17137E01421FA2000F09EF9A079F7
:103D0000012800D140252078002801D0202005433B
:103D1000E078022801D110200543B07A002801D0B4
:103D200004200543F07A002801D002200543307BAF
-:103D3000002800D03D431421284600F061F91421E9
-:103D4000A07800F05DF91421607800F059F9F8BD11
-:103D50001421FA2000F061F90C489621801C00F033
-:103D600025F80028F3D11421FA2000F056F9F8BD07
-:103D70001421FA2000F051F9E770F8BD1421FA205F
-:103D800000F04BF90220E070F8BD000018000020A0
+:103D3000002800D03D431421284600F071F91421D9
+:103D4000A07800F06DF91421607800F069F9F8BDF1
+:103D50001421FA2000F071F90C489621801C00F023
+:103D600025F80028F3D11421FA2000F066F9F8BDF7
+:103D70001421FA2000F061F9E770F8BD1421FA204F
+:103D800000F05BF90220E070F8BD00001800002090
:103D900010B5054CE06021812261638100F092F84A
:103DA00000F080F810BD000018000020F3B581B0CD
:103DB0000F4600250126FCF7F5FA044606E0FCF75D
@@ -1007,132 +1007,135 @@
:103ED00048618861487100BD1800002005486421D0
:103EE0004170022181700121C17000210170817136
:103EF000704700001800002070B50546002407E058
-:103F000028194078C82100F07BF8002804D1641CEF
+:103F000028194078C82100F08BF8002804D1641CDF
:103F10002878A042F4DC002070BD000070B5FFF7E7
-:103F2000DBFD254C0228607124D00925ED0601280F
-:103F300023D020462030FFF713FA00281CD020465B
-:103F40001E492030FEF71CFE1C491C481C31FFF79F
-:103F5000F3FD002810D1012211462846FCF71BFA78
-:103F600016481C30FFF7C8FF00281FD0FCF71AFACC
-:103F7000044617E0FFF796FF70BD01221146284660
-:103F8000FCF709FA0C480A21801CFFF70FFF0B49C8
-:103F9000A0781039FFF740FE08E0FCF703FA001B99
-:103FA000142803D8FFF798FD0328F6D10022012139
-:103FB0002846FCF7F0F970BD480000207803002087
-:103FC00070B50546FCF7EEF9044606E0FCF7EAF9A1
-:103FD000001BA84201D3042070BDFFF77DFD03281C
-:103FE000F4D1FFF727F9044603E0FFF775FD032836
-:103FF000E8D1FFF71FF9001B3C28F6D3002070BD65
-:1040000010B504460846FFF7DBFF002801D0042066
-:1040100010BD204600F012F810BD10B50446084649
-:10402000FFF7CEFF002801D0042010BDAF20800094
-:10403000FEF7CDFC204600F001F810BDF8B5474C66
-:1040400005460126002261892069FCF7A4F91220A7
-:10405000FEF7BDFC00222189E068FCF79CF92420D2
-:10406000FEF7B5FC01222189E068FCF794F91220E3
-:10407000FEF7ADFC2189E068FCF784F9002868D0E0
-:104080000027E80701D0012200E0002261892069B1
-:10409000FCF781F91220FEF79AFC00222189E068E2
-:1040A000FCF779F92420FEF792FC01222189E068CF
-:1040B000FCF771F91220FEF78AFC2189E068FCF711
-:1040C00061F9002845D0E807C00F46406D087F1C05
-:1040D000082FD6DB002E01D0012200E000226189EA
-:1040E0002069FCF758F91220FEF771FC00222189A3
-:1040F000E068FCF750F92420FEF769FC01222189D1
-:10410000E068FCF748F91220FEF761FC2189E068BD
-:10411000FCF738F900281CD0012261892069FCF7DE
-:104120003AF91220FEF753FC00222189E068FCF7DF
-:1041300032F92420FEF74BFC01222189E068FCF7CC
-:104140002AF91220FEF743FCFA20FEF740FC00207B
-:10415000F8BDFFF7A7FE0820F8BD000018000020FA
-:1041600011A0FEF713FB134D0024295D12A0FEF7EA
-:104170000DFB641C202CF8DB10A0FEF707FB134D91
-:10418000002408212846FCF702F96420FCF725F8F2
-:10419000641C642CF5DBBFF34F8F0E490C48C860DC
-:1041A000BFF34F8F00BFFDE7535049204552524F98
-:1041B000520A00001C030020256420000A72656278
-:1041C0006F6F74696E672E2E2E0A0000000400487F
-:1041D0000400FA0500ED00E070B50646FCF7E2F8D1
-:1041E0000446084D06E0FCF7DDF8001BB04201D99B
-:1041F000042070BD29886868FCF7C4F80028F2D054
-:10420000002070BD3400002010B50E4C218860687D
-:10421000FCF7B8F8012802D1FCF7C4F8E060FCF71D
-:10422000C1F8E168401A14280BD9C820FFF7D4FF61
-:104230001420FBF7D2FFAA2000F094F80A20FBF725
-:10424000CCFF10BD3400002010B500F05DF8FCF785
-:10425000A9F80149C86010BD3400002010B5034C16
-:1042600060602180A260638010BD000034000020E7
-:1042700070B5044666380300FEF798FA0A1406087B
-:104280000A0C0E101216181A482413E0492411E0E3
-:104290004B240FE04D240DE04F240BE0502409E0A7
-:1042A000512407E0472405E0522403E0532401E0B1
-:1042B000532C0BD8022902D000290DD00EE0FCF7B8
-:1042C00071F8084D2969401A502801D8002070BDA6
-:1042D000FCF768F8286101E080200443204600F0E4
-:1042E00041F870BD3400002010B5064C0122218831
-:1042F0006068FCF750F801226188A068FCF74BF871
-:1043000010BD00003400002010B5064C01222188A9
-:104310006068FCF740F800226188A068FCF73BF871
-:1043200010BD00003400002010B5FFF76DFF0B4AF0
-:104330000B48511EFEF717FD00280AD10748001F41
-:104340000179C078FFF794FF452803D00448FEF7B1
-:104350001AFD10BD0120FBF740FF10BD4C000020EE
-:104360005C03002070B52E4C054621886068FCF780
-:1043700009F800282AD0002221886068FCF70BF891
-:104380000520FEF724FB01226188A068FCF703F8F2
-:104390006E20FEF71CFB6188A068FBF7F3FF002886
-:1043A00014D0012221886068FBF7F5FF4120FEF759
-:1043B0000EFB002221886068FBF7EDFF1E20FEF750
-:1043C00006FB0026E80705D0012204E0FFF79CFF6A
-:1043D000452070BD00226188A068FBF7DCFF012248
-:1043E00021886068FBF7D7FF4120FEF7F0FA002232
-:1043F00021886068FBF7CFFF1E20FEF7E8FA6D0802
-:10440000761C082EDEDB012221886068FBF7C3FFE3
-:1044100000226188A068FBF7BEFF002070BD00008D
-:1044200034000020FF08161E26252E363D3E464548
-:104430004E55660D151D242D2C353C43444D545BC3
-:104440005A111C1B232B34333B424B4C520E125C33
-:104450001A22212A32313A41494A597E1929140730
-:104460000F171F272F373F474F765F6C757D4E6BB9
-:1044700073747C69727A7071FFFF13565EFFFFFFE1
-:10448000FFFFFFFF79584A5739FF6E636F616A6516
-:10449000606D6764FFFFFFFFFFFFFF62FFFFFFFF2D
-:1044A000FF8B8C8DFFFFFFFFFFFFFFFFFFFFFFFF75
-:1044B000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0C
-:1044C000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFC
-:1044D000FFFFFFFFFFFFFFFFFFFFFF08101820286F
-:1044E0003038404850575F010101010101010303C9
-:1044F00001010101010103010202010201010301A5
-:104500000201010101010301010101010101030196
-:104510000101010101010301010101010101030187
-:104520000301010101010301010101010101030175
-:104530000101010101010301010101010103030363
-:104540000201010101030301010301010301030150
-:10455000030103030303030303030303030303012F
-:104560000303010103030101010101030101010131
-:104570000101010101FF76161E26252E363D3E461D
-:10458000454E55660D151D242D2C353C43444D5488
-:104590005B5A141C1B232B34333B424B4C520E12E0
-:1045A0005D1A22212A32313A41494A597C1129584F
-:1045B0000506040C030B830A0109777E6C757D7B6D
-:1045C0006B73747969727A7071FFFF6178075A149E
-:1045D0004AFF11FF6C757D6B7469727A7071FFFF11
-:1045E000FFFFFFFFFFFFFFFFFFFFFF1F272F000160
-:1045F00006075553423456432050726F746F636FF1
-:104600006C20426F6172640A49424D20504320433E
-:104610006F6D70617469626C650A64656B754E7567
-:104620006B656D2032303232000000000000000067
-:10463000000102030406070809000000000102034C
-:104640000400000064460008000000208C00000008
-:10465000C6270008F04600088C000020240900004E
-:10466000D627000800000000020100000000000042
-:10467000000000000000000000000000000000003A
-:10468000000000000000000000000000000000002A
+:103F2000DBFD2C4C022860712CD00925ED06012800
+:103F30002BD0FFF77FF9A169401A2749884223D97E
+:103F400020462430FFF70CFA00281DD020462349D4
+:103F50002430FEF715FE214920481C31FFF7ECFD07
+:103F6000002811D1012211462E462846FCF713FAEB
+:103F70001A481C30FFF7C0FF002822D0FCF712FAC5
+:103F800005461AE0FFF78EFF70BD01221146284654
+:103F9000FCF701FA0F480A21801CFFF707FF0F49C1
+:103FA000A0781039FFF738FE0022012128460EE0E4
+:103FB000FCF7F8F9401B142803D8FFF78DFD032800
+:103FC000F6D1FFF737F9A061002201213046FCF756
+:103FD000E2F970BD48000020881300007C03002037
+:103FE00070B50546FCF7DEF9044606E0FCF7DAF9A1
+:103FF000001BA84201D3042070BDFFF76DFD03280C
+:10400000F4D1FFF717F9044603E0FFF765FD032835
+:10401000E8D1FFF70FF9001B3C28F6D3002070BD54
+:1040200010B504460846FFF7DBFF002801D0042046
+:1040300010BD204600F012F810BD10B50446084629
+:10404000FFF7CEFF002801D0042010BDAF20800074
+:10405000FEF7BDFC204600F001F810BDF8B5474C56
+:1040600005460126002261892069FCF794F9122097
+:10407000FEF7ADFC00222189E068FCF78CF92420D2
+:10408000FEF7A5FC01222189E068FCF784F91220E3
+:10409000FEF79DFC2189E068FCF774F9002868D0E0
+:1040A0000027E80701D0012200E000226189206991
+:1040B000FCF771F91220FEF78AFC00222189E068E2
+:1040C000FCF769F92420FEF782FC01222189E068CF
+:1040D000FCF761F91220FEF77AFC2189E068FCF711
+:1040E00051F9002845D0E807C00F46406D087F1CF5
+:1040F000082FD6DB002E01D0012200E000226189CA
+:104100002069FCF748F91220FEF761FC00222189A2
+:10411000E068FCF740F92420FEF759FC01222189D0
+:10412000E068FCF738F91220FEF751FC2189E068BD
+:10413000FCF728F900281CD0012261892069FCF7CE
+:104140002AF91220FEF743FC00222189E068FCF7DF
+:1041500022F92420FEF73BFC01222189E068FCF7CC
+:104160001AF91220FEF733FCFA20FEF730FC00208B
+:10417000F8BDFFF797FE0820F8BD000018000020EA
+:1041800011A0FEF703FB134D0024295D12A0FEF7DA
+:10419000FDFA641C202CF8DB10A0FEF7F7FA134D93
+:1041A000002408212846FCF7F2F86420FCF715F8F3
+:1041B000641C642CF5DBBFF34F8F0E490C48C860BC
+:1041C000BFF34F8F00BFFDE7535049204552524F78
+:1041D000520A000020030020256420000A72656254
+:1041E0006F6F74696E672E2E2E0A0000000400485F
+:1041F0000400FA0500ED00E070B50646FCF7D2F8C1
+:104200000446084D06E0FCF7CDF8001BB04201D98A
+:10421000042070BD29886868FCF7B4F80028F2D043
+:10422000002070BD3400002010B50E4C218860685D
+:10423000FCF7A8F8012802D1FCF7B4F8E060FCF71D
+:10424000B1F8E168401A14280BD9C820FFF7D4FF51
+:104250001420FBF7C2FFAA2000F094F80A20FBF715
+:10426000BCFF10BD3400002010B500F05DF8FCF775
+:1042700099F80149C86010BD3400002010B5034C06
+:1042800060602180A260638010BD000034000020C7
+:1042900070B5044666380300FEF788FA0A1406086B
+:1042A0000A0C0E101216181A482413E0492411E0C3
+:1042B0004B240FE04D240DE04F240BE0502409E087
+:1042C000512407E0472405E0522403E0532401E091
+:1042D000532C0BD8022902D000290DD00EE0FCF798
+:1042E00061F8084D2969401A502801D8002070BD96
+:1042F000FCF758F8286101E080200443204600F0D4
+:1043000041F870BD3400002010B5064C0122218810
+:104310006068FCF740F801226188A068FCF73BF870
+:1043200010BD00003400002010B5064C0122218889
+:104330006068FCF730F800226188A068FCF72BF871
+:1043400010BD00003400002010B5FFF76DFF0B4AD0
+:104350000B48511EFEF707FD00280AD10748001F31
+:104360000179C078FFF794FF452803D00448FEF791
+:104370000AFD10BD0120FBF730FF10BD4C000020EE
+:104380006003002070B52E4C054621886068FBF75D
+:10439000F9FF00282AD0002221886068FBF7FBFF84
+:1043A0000520FEF714FB01226188A068FBF7F3FFEC
+:1043B0006E20FEF70CFB6188A068FBF7E3FF002886
+:1043C00014D0012221886068FBF7E5FF4120FEF749
+:1043D000FEFA002221886068FBF7DDFF1E20FEF751
+:1043E000F6FA0026E80705D0012204E0FFF79CFF5B
+:1043F000452070BD00226188A068FBF7CCFF012238
+:1044000021886068FBF7C7FF4120FEF7E0FA002231
+:1044100021886068FBF7BFFF1E20FEF7D8FA6D0801
+:10442000761C082EDEDB012221886068FBF7B3FFD3
+:1044300000226188A068FBF7AEFF002070BD00007D
+:1044400034000020FF08161E26252E363D3E464528
+:104450004E55660D151D242D2C353C43444D545BA3
+:104460005A111C1B232B34333B424B4C520E125C13
+:104470001A22212A32313A41494A597E1929140710
+:104480000F171F272F373F474F765F6C757D4E6B99
+:1044900073747C69727A7071FFFF13565EFFFFFFC1
+:1044A000FFFFFFFF79584A5739FF6E636F616A65F6
+:1044B000606D6764FFFFFFFFFFFFFF62FFFFFFFF0D
+:1044C000FF8B8C8DFFFFFFFFFFFFFFFFFFFFFFFF55
+:1044D000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEC
+:1044E000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDC
+:1044F000FFFFFFFFFFFFFFFFFFFFFF08101820284F
+:104500003038404850575F010101010101010303A8
+:104510000101010101010301020201020101030184
+:104520000201010101010301010101010101030176
+:104530000101010101010301010101010101030167
+:104540000301010101010301010101010101030155
+:104550000101010101010301010101010103030343
+:104560000201010101030301010301010301030130
+:10457000030103030303030303030303030303010F
+:104580000303010103030101010101030101010111
+:104590000101010101FF76161E26252E363D3E46FD
+:1045A000454E55660D151D242D2C353C43444D5468
+:1045B0005B5A141C1B232B34333B424B4C520E12C0
+:1045C0005D1A22212A32313A41494A597C1129582F
+:1045D0000506040C030B830A0109777E6C757D7B4D
+:1045E0006B73747969727A7071FFFF6178075A147E
+:1045F0004AFF11FF6C757D6B7469727A7071FFFFF1
+:10460000FFFFFFFFFFFFFFFFFFFFFF1F272F00013F
+:1046100006075553423456432050726F746F636FD0
+:104620006C20426F6172640A49424D20504320431E
+:104630006F6D70617469626C650A64656B754E7547
+:104640006B656D2032303232000000000000000047
+:10465000000102030406070809000000000102032C
+:1046600004000000844600080000002090000000C4
+:10467000C627000814470008900000202809000001
+:10468000D627000800000000020100000000000022
:10469000000000000000000000000000000000001A
:1046A000000000000000000000000000000000000A
:1046B00000000000000000000000000000000000FA
:1046C00000000000000000000000000000000000EA
:1046D00000000000000000000000000000000000DA
-:1046E00000127A000000000000000000000000003E
+:1046E00000000000000000000000000000000000CA
+:1046F00000000000000000000000000000000000BA
+:104700000000000000127A0000000000000000001D
+:0447100000000000A5
:04000005080000C12E
:00000001FF
diff --git a/firmware/ibmpc/MDK-ARM/ibmpc/ibmpc.htm b/firmware/ibmpc/MDK-ARM/ibmpc/ibmpc.htm
index 7c0a447..fe69d3a 100644
--- a/firmware/ibmpc/MDK-ARM/ibmpc/ibmpc.htm
+++ b/firmware/ibmpc/MDK-ARM/ibmpc/ibmpc.htm
@@ -3,7 +3,7 @@
Static Call Graph - [ibmpc\ibmpc.axf]
Static Call Graph for image ibmpc\ibmpc.axf
-
#<CALLGRAPH># ARM Linker, 5060750: Last Updated: Tue Mar 07 22:20:15 2023
+
#<CALLGRAPH># ARM Linker, 5060750: Last Updated: Sun Apr 30 22:35:38 2023
Maximum Stack Usage = 212 bytes + Unknown(Cycles, Untraceable Function Pointers)
Call chain for Maximum Stack Depth:
@@ -571,7 +571,7 @@
>> HAL_SPI_TxRxCpltCallback
-HAL_SPI_TxRxCpltCallback (Thumb, 358 bytes, Stack size 24 bytes, main.o(i.HAL_SPI_TxRxCpltCallback))
+
HAL_SPI_TxRxCpltCallback (Thumb, 360 bytes, Stack size 24 bytes, main.o(i.HAL_SPI_TxRxCpltCallback))
[Stack]
- Max Depth = 148
- Call Chain = HAL_SPI_TxRxCpltCallback ⇒ handle_protocol_switch ⇒ mouse_uart_switch_to_8bit ⇒ HAL_UART_Init ⇒ UART_SetConfig ⇒ HAL_RCC_GetSysClockFreq ⇒ __aeabi_uidivmod
[Calls]- >> HAL_GPIO_WritePin
@@ -1060,7 +1060,7 @@
[Called By]
-
main (Thumb, 454 bytes, Stack size 16 bytes, main.o(i.main))
+
main (Thumb, 456 bytes, Stack size 16 bytes, main.o(i.main))
[Stack]
- Max Depth = 212
- Call Chain = main ⇒ SystemClock_Config ⇒ HAL_RCC_ClockConfig ⇒ HAL_RCC_GetSysClockFreq ⇒ __aeabi_uidivmod
[Calls]- >> MX_USART3_UART_Init
@@ -1141,6 +1141,7 @@
[Called By]- >> ps2mouse_wait_for_idle
- >> ps2kb_write
- >> delay_us
+
- >> ps2mouse_update
- >> main
- >> HAL_SPI_TxRxCpltCallback
@@ -1450,7 +1451,7 @@
[Called By]
-
ps2mouse_update (Thumb, 156 bytes, Stack size 16 bytes, main.o(i.ps2mouse_update))
+
ps2mouse_update (Thumb, 184 bytes, Stack size 16 bytes, main.o(i.ps2mouse_update))
[Stack]
- Max Depth = 80
- Call Chain = ps2mouse_update ⇒ ps2mouse_host_req_reply ⇒ ps2mouse_write_delay_start ⇒ ps2mouse_write_nowait ⇒ ps2mouse_release_lines
[Calls]- >> ps2mouse_send_update
@@ -1462,6 +1463,7 @@
- >> HAL_GetTick
- >> HAL_GPIO_WritePin
- >> mouse_buf_peek
+
- >> micros
- >> get_consolidated_mouse_event
[Called By]- >> main
diff --git a/firmware/ibmpc/MDK-ARM/ibmpc/ibmpc.map b/firmware/ibmpc/MDK-ARM/ibmpc/ibmpc.map
index 2fd7b1d..7754a02 100644
--- a/firmware/ibmpc/MDK-ARM/ibmpc/ibmpc.map
+++ b/firmware/ibmpc/MDK-ARM/ibmpc/ibmpc.map
@@ -292,6 +292,7 @@ Section Cross References
main.o(i.ps2kb_update) refers to main.o(.data) for .data
main.o(i.ps2kb_update) refers to main.o(.bss) for .bss
main.o(i.ps2mouse_update) refers to ps2mouse.o(i.ps2mouse_get_bus_status) for ps2mouse_get_bus_status
+ main.o(i.ps2mouse_update) refers to delay_us.o(i.micros) for micros
main.o(i.ps2mouse_update) refers to helpers.o(i.mouse_buf_peek) for mouse_buf_peek
main.o(i.ps2mouse_update) refers to main.o(i.get_consolidated_mouse_event) for get_consolidated_mouse_event
main.o(i.ps2mouse_update) refers to ps2mouse.o(i.ps2mouse_get_outgoing_data) for ps2mouse_get_outgoing_data
@@ -2076,39 +2077,39 @@ Image Symbol Table
i.ps2mouse_restore_defaults 0x08003edc Section 0 ps2mouse.o(i.ps2mouse_restore_defaults)
i.ps2mouse_send_update 0x08003ef8 Section 0 ps2mouse.o(i.ps2mouse_send_update)
i.ps2mouse_update 0x08003f1c Section 0 main.o(i.ps2mouse_update)
- i.ps2mouse_wait_for_idle 0x08003fc0 Section 0 ps2mouse.o(i.ps2mouse_wait_for_idle)
- i.ps2mouse_write 0x08004000 Section 0 ps2mouse.o(i.ps2mouse_write)
- i.ps2mouse_write_delay_start 0x0800401a Section 0 ps2mouse.o(i.ps2mouse_write_delay_start)
- i.ps2mouse_write_nowait 0x0800403c Section 0 ps2mouse.o(i.ps2mouse_write_nowait)
- i.spi_error_dump_reboot 0x08004160 Section 0 main.o(i.spi_error_dump_reboot)
- i.wait_for_clk_high 0x080041d8 Section 0 xt_kb.o(i.wait_for_clk_high)
- i.xtkb_check_for_softreset 0x08004208 Section 0 xt_kb.o(i.xtkb_check_for_softreset)
- i.xtkb_enable 0x08004248 Section 0 xt_kb.o(i.xtkb_enable)
- i.xtkb_init 0x0800425c Section 0 xt_kb.o(i.xtkb_init)
- i.xtkb_press_key 0x08004270 Section 0 xt_kb.o(i.xtkb_press_key)
- i.xtkb_release_lines 0x080042e8 Section 0 xt_kb.o(i.xtkb_release_lines)
- i.xtkb_reset_bus 0x08004308 Section 0 xt_kb.o(i.xtkb_reset_bus)
- i.xtkb_update 0x08004328 Section 0 main.o(i.xtkb_update)
- i.xtkb_write 0x08004364 Section 0 xt_kb.o(i.xtkb_write)
- .constdata 0x08004424 Section 458 ps2kb.o(.constdata)
- .constdata 0x080045ee Section 4 mcp4451.o(.constdata)
- .constdata 0x080045f2 Section 55 main.o(.constdata)
- .constdata 0x08004629 Section 16 system_stm32f0xx.o(.constdata)
- .constdata 0x08004639 Section 8 system_stm32f0xx.o(.constdata)
+ i.ps2mouse_wait_for_idle 0x08003fe0 Section 0 ps2mouse.o(i.ps2mouse_wait_for_idle)
+ i.ps2mouse_write 0x08004020 Section 0 ps2mouse.o(i.ps2mouse_write)
+ i.ps2mouse_write_delay_start 0x0800403a Section 0 ps2mouse.o(i.ps2mouse_write_delay_start)
+ i.ps2mouse_write_nowait 0x0800405c Section 0 ps2mouse.o(i.ps2mouse_write_nowait)
+ i.spi_error_dump_reboot 0x08004180 Section 0 main.o(i.spi_error_dump_reboot)
+ i.wait_for_clk_high 0x080041f8 Section 0 xt_kb.o(i.wait_for_clk_high)
+ i.xtkb_check_for_softreset 0x08004228 Section 0 xt_kb.o(i.xtkb_check_for_softreset)
+ i.xtkb_enable 0x08004268 Section 0 xt_kb.o(i.xtkb_enable)
+ i.xtkb_init 0x0800427c Section 0 xt_kb.o(i.xtkb_init)
+ i.xtkb_press_key 0x08004290 Section 0 xt_kb.o(i.xtkb_press_key)
+ i.xtkb_release_lines 0x08004308 Section 0 xt_kb.o(i.xtkb_release_lines)
+ i.xtkb_reset_bus 0x08004328 Section 0 xt_kb.o(i.xtkb_reset_bus)
+ i.xtkb_update 0x08004348 Section 0 main.o(i.xtkb_update)
+ i.xtkb_write 0x08004384 Section 0 xt_kb.o(i.xtkb_write)
+ .constdata 0x08004444 Section 458 ps2kb.o(.constdata)
+ .constdata 0x0800460e Section 4 mcp4451.o(.constdata)
+ .constdata 0x08004612 Section 55 main.o(.constdata)
+ .constdata 0x08004649 Section 16 system_stm32f0xx.o(.constdata)
+ .constdata 0x08004659 Section 8 system_stm32f0xx.o(.constdata)
.data 0x20000000 Section 4 delay_us.o(.data)
.data 0x20000004 Section 20 ps2kb.o(.data)
.data 0x20000018 Section 28 ps2mouse.o(.data)
.data 0x20000034 Section 20 xt_kb.o(.data)
- .data 0x20000048 Section 48 main.o(.data)
- .data 0x20000078 Section 4 stm32f0xx_hal.o(.data)
- .data 0x2000007c Section 4 system_stm32f0xx.o(.data)
- .data 0x20000080 Section 4 stdout.o(.data)
- .data 0x20000084 Section 4 mvars.o(.data)
+ .data 0x20000048 Section 52 main.o(.data)
+ .data 0x2000007c Section 4 stm32f0xx_hal.o(.data)
+ .data 0x20000080 Section 4 system_stm32f0xx.o(.data)
+ .data 0x20000084 Section 4 stdout.o(.data)
.data 0x20000088 Section 4 mvars.o(.data)
- .bss 0x2000008c Section 142 ps2kb.o(.bss)
- .bss 0x2000011c Section 657 main.o(.bss)
- HEAP 0x200003b0 Section 512 startup_stm32f072xb.o(HEAP)
- STACK 0x200005b0 Section 1024 startup_stm32f072xb.o(STACK)
+ .data 0x2000008c Section 4 mvars.o(.data)
+ .bss 0x20000090 Section 142 ps2kb.o(.bss)
+ .bss 0x20000120 Section 657 main.o(.bss)
+ HEAP 0x200003b8 Section 512 startup_stm32f072xb.o(HEAP)
+ STACK 0x200005b8 Section 1024 startup_stm32f072xb.o(STACK)
Global Symbols
@@ -2254,7 +2255,7 @@ Image Symbol Table
HAL_SPI_MspInit 0x0800116d Thumb Code 76 stm32f0xx_hal_msp.o(i.HAL_SPI_MspInit)
HAL_SPI_RxCpltCallback 0x080011c1 Thumb Code 2 stm32f0xx_hal_spi.o(i.HAL_SPI_RxCpltCallback)
HAL_SPI_TransmitReceive_IT 0x080011c5 Thumb Code 196 stm32f0xx_hal_spi.o(i.HAL_SPI_TransmitReceive_IT)
- HAL_SPI_TxRxCpltCallback 0x08001299 Thumb Code 358 main.o(i.HAL_SPI_TxRxCpltCallback)
+ HAL_SPI_TxRxCpltCallback 0x08001299 Thumb Code 360 main.o(i.HAL_SPI_TxRxCpltCallback)
HAL_SYSTICK_CLKSourceConfig 0x08001415 Thumb Code 20 stm32f0xx_hal_cortex.o(i.HAL_SYSTICK_CLKSourceConfig)
HAL_SYSTICK_Callback 0x0800142d Thumb Code 2 stm32f0xx_hal_cortex.o(i.HAL_SYSTICK_Callback)
HAL_SYSTICK_Config 0x08001431 Thumb Code 38 stm32f0xx_hal_cortex.o(i.HAL_SYSTICK_Config)
@@ -2322,7 +2323,7 @@ Image Symbol Table
kb_buf_pop 0x08002d87 Thumb Code 18 helpers.o(i.kb_buf_pop)
kb_buf_reset 0x08002d99 Thumb Code 28 helpers.o(i.kb_buf_reset)
keyboard_reply 0x08002db5 Thumb Code 342 ps2kb.o(i.keyboard_reply)
- main 0x08002f15 Thumb Code 454 main.o(i.main)
+ main 0x08002f15 Thumb Code 456 main.o(i.main)
malloc 0x08003141 Thumb Code 92 malloc.o(i.malloc)
mcp4451_is_available 0x080031ad Thumb Code 26 mcp4451.o(i.mcp4451_is_available)
mcp4451_reset 0x080031cd Thumb Code 42 mcp4451.o(i.mcp4451_reset)
@@ -2360,31 +2361,31 @@ Image Symbol Table
ps2mouse_reset 0x08003ec5 Thumb Code 20 ps2mouse.o(i.ps2mouse_reset)
ps2mouse_restore_defaults 0x08003edd Thumb Code 22 ps2mouse.o(i.ps2mouse_restore_defaults)
ps2mouse_send_update 0x08003ef9 Thumb Code 34 ps2mouse.o(i.ps2mouse_send_update)
- ps2mouse_update 0x08003f1d Thumb Code 156 main.o(i.ps2mouse_update)
- ps2mouse_wait_for_idle 0x08003fc1 Thumb Code 64 ps2mouse.o(i.ps2mouse_wait_for_idle)
- ps2mouse_write 0x08004001 Thumb Code 26 ps2mouse.o(i.ps2mouse_write)
- ps2mouse_write_delay_start 0x0800401b Thumb Code 34 ps2mouse.o(i.ps2mouse_write_delay_start)
- ps2mouse_write_nowait 0x0800403d Thumb Code 286 ps2mouse.o(i.ps2mouse_write_nowait)
- spi_error_dump_reboot 0x08004161 Thumb Code 72 main.o(i.spi_error_dump_reboot)
- wait_for_clk_high 0x080041d9 Thumb Code 44 xt_kb.o(i.wait_for_clk_high)
- xtkb_check_for_softreset 0x08004209 Thumb Code 60 xt_kb.o(i.xtkb_check_for_softreset)
- xtkb_enable 0x08004249 Thumb Code 16 xt_kb.o(i.xtkb_enable)
- xtkb_init 0x0800425d Thumb Code 14 xt_kb.o(i.xtkb_init)
- xtkb_press_key 0x08004271 Thumb Code 116 xt_kb.o(i.xtkb_press_key)
- xtkb_release_lines 0x080042e9 Thumb Code 26 xt_kb.o(i.xtkb_release_lines)
- xtkb_reset_bus 0x08004309 Thumb Code 26 xt_kb.o(i.xtkb_reset_bus)
- xtkb_update 0x08004329 Thumb Code 52 main.o(i.xtkb_update)
- xtkb_write 0x08004365 Thumb Code 186 xt_kb.o(i.xtkb_write)
- linux_keycode_to_ps3_scancode_lookup_codeset3 0x08004424 Data 195 ps2kb.o(.constdata)
- scancode_set3_default_status 0x080044e7 Data 142 ps2kb.o(.constdata)
- linux_keycode_to_ps2_scancode_lookup_single_byte_codeset2 0x08004575 Data 89 ps2kb.o(.constdata)
- linux_keycode_to_ps2_scancode_lookup_special_codeset2 0x080045ce Data 32 ps2kb.o(.constdata)
- mcp4451_wiper_id_to_reg_addr_lookup 0x080045ee Data 4 mcp4451.o(.constdata)
- boot_message 0x080045f2 Data 55 main.o(.constdata)
- AHBPrescTable 0x08004629 Data 16 system_stm32f0xx.o(.constdata)
- APBPrescTable 0x08004639 Data 8 system_stm32f0xx.o(.constdata)
- Region$$Table$$Base 0x08004644 Number 0 anon$$obj.o(Region$$Table)
- Region$$Table$$Limit 0x08004664 Number 0 anon$$obj.o(Region$$Table)
+ ps2mouse_update 0x08003f1d Thumb Code 184 main.o(i.ps2mouse_update)
+ ps2mouse_wait_for_idle 0x08003fe1 Thumb Code 64 ps2mouse.o(i.ps2mouse_wait_for_idle)
+ ps2mouse_write 0x08004021 Thumb Code 26 ps2mouse.o(i.ps2mouse_write)
+ ps2mouse_write_delay_start 0x0800403b Thumb Code 34 ps2mouse.o(i.ps2mouse_write_delay_start)
+ ps2mouse_write_nowait 0x0800405d Thumb Code 286 ps2mouse.o(i.ps2mouse_write_nowait)
+ spi_error_dump_reboot 0x08004181 Thumb Code 72 main.o(i.spi_error_dump_reboot)
+ wait_for_clk_high 0x080041f9 Thumb Code 44 xt_kb.o(i.wait_for_clk_high)
+ xtkb_check_for_softreset 0x08004229 Thumb Code 60 xt_kb.o(i.xtkb_check_for_softreset)
+ xtkb_enable 0x08004269 Thumb Code 16 xt_kb.o(i.xtkb_enable)
+ xtkb_init 0x0800427d Thumb Code 14 xt_kb.o(i.xtkb_init)
+ xtkb_press_key 0x08004291 Thumb Code 116 xt_kb.o(i.xtkb_press_key)
+ xtkb_release_lines 0x08004309 Thumb Code 26 xt_kb.o(i.xtkb_release_lines)
+ xtkb_reset_bus 0x08004329 Thumb Code 26 xt_kb.o(i.xtkb_reset_bus)
+ xtkb_update 0x08004349 Thumb Code 52 main.o(i.xtkb_update)
+ xtkb_write 0x08004385 Thumb Code 186 xt_kb.o(i.xtkb_write)
+ linux_keycode_to_ps3_scancode_lookup_codeset3 0x08004444 Data 195 ps2kb.o(.constdata)
+ scancode_set3_default_status 0x08004507 Data 142 ps2kb.o(.constdata)
+ linux_keycode_to_ps2_scancode_lookup_single_byte_codeset2 0x08004595 Data 89 ps2kb.o(.constdata)
+ linux_keycode_to_ps2_scancode_lookup_special_codeset2 0x080045ee Data 32 ps2kb.o(.constdata)
+ mcp4451_wiper_id_to_reg_addr_lookup 0x0800460e Data 4 mcp4451.o(.constdata)
+ boot_message 0x08004612 Data 55 main.o(.constdata)
+ AHBPrescTable 0x08004649 Data 16 system_stm32f0xx.o(.constdata)
+ APBPrescTable 0x08004659 Data 8 system_stm32f0xx.o(.constdata)
+ Region$$Table$$Base 0x08004664 Number 0 anon$$obj.o(Region$$Table)
+ Region$$Table$$Limit 0x08004684 Number 0 anon$$obj.o(Region$$Table)
us_timer 0x20000000 Data 4 delay_us.o(.data)
ps2kb_current_scancode_set 0x20000004 Data 1 ps2kb.o(.data)
ps2kb_data_reporting_enabled 0x20000005 Data 1 ps2kb.o(.data)
@@ -2426,33 +2427,34 @@ Image Symbol Table
flash_size 0x20000054 Data 2 main.o(.data)
microsoft_serial_mouse_output_buf 0x20000056 Data 3 main.o(.data)
ACT_LED_off_ts 0x2000005c Data 4 main.o(.data)
- mousesystems_serial_mouse_output_buf 0x20000060 Data 5 main.o(.data)
- my_mouse_buf 0x20000068 Data 8 main.o(.data)
- my_gamepad_buf 0x20000070 Data 8 main.o(.data)
- uwTick 0x20000078 Data 4 stm32f0xx_hal.o(.data)
- SystemCoreClock 0x2000007c Data 4 system_stm32f0xx.o(.data)
- __stdout 0x20000080 Data 4 stdout.o(.data)
- __microlib_freelist 0x20000084 Data 4 mvars.o(.data)
- __microlib_freelist_initialised 0x20000088 Data 4 mvars.o(.data)
- scancode_set3_current_status 0x2000008c Data 142 ps2kb.o(.bss)
- hi2c2 0x2000011c Data 76 main.o(.bss)
- hiwdg 0x20000168 Data 16 main.o(.bss)
- hspi1 0x20000178 Data 100 main.o(.bss)
- htim2 0x200001dc Data 64 main.o(.bss)
- huart1 0x2000021c Data 112 main.o(.bss)
- huart3 0x2000028c Data 112 main.o(.bss)
- spi_transmit_buf 0x200002fc Data 32 main.o(.bss)
- backup_spi1_recv_buf 0x2000031c Data 32 main.o(.bss)
- spi_recv_buf 0x2000033c Data 32 main.o(.bss)
- my_kb_buf 0x2000035c Data 12 main.o(.bss)
- latest_mouse_event 0x20000368 Data 16 main.o(.bss)
- consolidated_mouse_event 0x20000378 Data 16 main.o(.bss)
- latest_gamepad_event 0x20000388 Data 12 main.o(.bss)
- my_ps2_outbuf 0x20000394 Data 9 main.o(.bss)
- protocol_status_lookup 0x2000039d Data 16 main.o(.bss)
- __heap_base 0x200003b0 Data 0 startup_stm32f072xb.o(HEAP)
- __heap_limit 0x200005b0 Data 0 startup_stm32f072xb.o(HEAP)
- __initial_sp 0x200009b0 Data 0 startup_stm32f072xb.o(STACK)
+ last_mouse_movement 0x20000060 Data 4 main.o(.data)
+ mousesystems_serial_mouse_output_buf 0x20000064 Data 5 main.o(.data)
+ my_mouse_buf 0x2000006c Data 8 main.o(.data)
+ my_gamepad_buf 0x20000074 Data 8 main.o(.data)
+ uwTick 0x2000007c Data 4 stm32f0xx_hal.o(.data)
+ SystemCoreClock 0x20000080 Data 4 system_stm32f0xx.o(.data)
+ __stdout 0x20000084 Data 4 stdout.o(.data)
+ __microlib_freelist 0x20000088 Data 4 mvars.o(.data)
+ __microlib_freelist_initialised 0x2000008c Data 4 mvars.o(.data)
+ scancode_set3_current_status 0x20000090 Data 142 ps2kb.o(.bss)
+ hi2c2 0x20000120 Data 76 main.o(.bss)
+ hiwdg 0x2000016c Data 16 main.o(.bss)
+ hspi1 0x2000017c Data 100 main.o(.bss)
+ htim2 0x200001e0 Data 64 main.o(.bss)
+ huart1 0x20000220 Data 112 main.o(.bss)
+ huart3 0x20000290 Data 112 main.o(.bss)
+ spi_transmit_buf 0x20000300 Data 32 main.o(.bss)
+ backup_spi1_recv_buf 0x20000320 Data 32 main.o(.bss)
+ spi_recv_buf 0x20000340 Data 32 main.o(.bss)
+ my_kb_buf 0x20000360 Data 12 main.o(.bss)
+ latest_mouse_event 0x2000036c Data 16 main.o(.bss)
+ consolidated_mouse_event 0x2000037c Data 16 main.o(.bss)
+ latest_gamepad_event 0x2000038c Data 12 main.o(.bss)
+ my_ps2_outbuf 0x20000398 Data 9 main.o(.bss)
+ protocol_status_lookup 0x200003a1 Data 16 main.o(.bss)
+ __heap_base 0x200003b8 Data 0 startup_stm32f072xb.o(HEAP)
+ __heap_limit 0x200005b8 Data 0 startup_stm32f072xb.o(HEAP)
+ __initial_sp 0x200009b8 Data 0 startup_stm32f072xb.o(STACK)
@@ -2462,9 +2464,9 @@ Memory Map of the image
Image Entry point : 0x080000c1
- Load Region LR_IROM1 (Base: 0x08000000, Size: 0x000046f0, Max: 0x00010000, ABSOLUTE)
+ Load Region LR_IROM1 (Base: 0x08000000, Size: 0x00004714, Max: 0x00010000, ABSOLUTE)
- Execution Region ER_IROM1 (Exec base: 0x08000000, Load base: 0x08000000, Size: 0x00004664, Max: 0x00010000, ABSOLUTE)
+ Execution Region ER_IROM1 (Exec base: 0x08000000, Load base: 0x08000000, Size: 0x00004684, Max: 0x00010000, ABSOLUTE)
Exec Addr Load Addr Size Type Attr Idx E Section Name Object
@@ -2669,50 +2671,50 @@ Memory Map of the image
0x08003edc 0x08003edc 0x0000001c Code RO 408 i.ps2mouse_restore_defaults ps2mouse.o
0x08003ef8 0x08003ef8 0x00000022 Code RO 410 i.ps2mouse_send_update ps2mouse.o
0x08003f1a 0x08003f1a 0x00000002 PAD
- 0x08003f1c 0x08003f1c 0x000000a4 Code RO 635 i.ps2mouse_update main.o
- 0x08003fc0 0x08003fc0 0x00000040 Code RO 411 i.ps2mouse_wait_for_idle ps2mouse.o
- 0x08004000 0x08004000 0x0000001a Code RO 412 i.ps2mouse_write ps2mouse.o
- 0x0800401a 0x0800401a 0x00000022 Code RO 413 i.ps2mouse_write_delay_start ps2mouse.o
- 0x0800403c 0x0800403c 0x00000124 Code RO 414 i.ps2mouse_write_nowait ps2mouse.o
- 0x08004160 0x08004160 0x00000078 Code RO 636 i.spi_error_dump_reboot main.o
- 0x080041d8 0x080041d8 0x00000030 Code RO 542 i.wait_for_clk_high xt_kb.o
- 0x08004208 0x08004208 0x00000040 Code RO 543 i.xtkb_check_for_softreset xt_kb.o
- 0x08004248 0x08004248 0x00000014 Code RO 544 i.xtkb_enable xt_kb.o
- 0x0800425c 0x0800425c 0x00000014 Code RO 545 i.xtkb_init xt_kb.o
- 0x08004270 0x08004270 0x00000078 Code RO 546 i.xtkb_press_key xt_kb.o
- 0x080042e8 0x080042e8 0x00000020 Code RO 547 i.xtkb_release_lines xt_kb.o
- 0x08004308 0x08004308 0x00000020 Code RO 548 i.xtkb_reset_bus xt_kb.o
- 0x08004328 0x08004328 0x0000003c Code RO 637 i.xtkb_update main.o
- 0x08004364 0x08004364 0x000000c0 Code RO 549 i.xtkb_write xt_kb.o
- 0x08004424 0x08004424 0x000001ca Data RO 314 .constdata ps2kb.o
- 0x080045ee 0x080045ee 0x00000004 Data RO 507 .constdata mcp4451.o
- 0x080045f2 0x080045f2 0x00000037 Data RO 643 .constdata main.o
- 0x08004629 0x08004629 0x00000010 Data RO 3961 .constdata system_stm32f0xx.o
- 0x08004639 0x08004639 0x00000008 Data RO 3962 .constdata system_stm32f0xx.o
- 0x08004641 0x08004641 0x00000003 PAD
- 0x08004644 0x08004644 0x00000020 Data RO 4333 Region$$Table anon$$obj.o
+ 0x08003f1c 0x08003f1c 0x000000c4 Code RO 635 i.ps2mouse_update main.o
+ 0x08003fe0 0x08003fe0 0x00000040 Code RO 411 i.ps2mouse_wait_for_idle ps2mouse.o
+ 0x08004020 0x08004020 0x0000001a Code RO 412 i.ps2mouse_write ps2mouse.o
+ 0x0800403a 0x0800403a 0x00000022 Code RO 413 i.ps2mouse_write_delay_start ps2mouse.o
+ 0x0800405c 0x0800405c 0x00000124 Code RO 414 i.ps2mouse_write_nowait ps2mouse.o
+ 0x08004180 0x08004180 0x00000078 Code RO 636 i.spi_error_dump_reboot main.o
+ 0x080041f8 0x080041f8 0x00000030 Code RO 542 i.wait_for_clk_high xt_kb.o
+ 0x08004228 0x08004228 0x00000040 Code RO 543 i.xtkb_check_for_softreset xt_kb.o
+ 0x08004268 0x08004268 0x00000014 Code RO 544 i.xtkb_enable xt_kb.o
+ 0x0800427c 0x0800427c 0x00000014 Code RO 545 i.xtkb_init xt_kb.o
+ 0x08004290 0x08004290 0x00000078 Code RO 546 i.xtkb_press_key xt_kb.o
+ 0x08004308 0x08004308 0x00000020 Code RO 547 i.xtkb_release_lines xt_kb.o
+ 0x08004328 0x08004328 0x00000020 Code RO 548 i.xtkb_reset_bus xt_kb.o
+ 0x08004348 0x08004348 0x0000003c Code RO 637 i.xtkb_update main.o
+ 0x08004384 0x08004384 0x000000c0 Code RO 549 i.xtkb_write xt_kb.o
+ 0x08004444 0x08004444 0x000001ca Data RO 314 .constdata ps2kb.o
+ 0x0800460e 0x0800460e 0x00000004 Data RO 507 .constdata mcp4451.o
+ 0x08004612 0x08004612 0x00000037 Data RO 643 .constdata main.o
+ 0x08004649 0x08004649 0x00000010 Data RO 3961 .constdata system_stm32f0xx.o
+ 0x08004659 0x08004659 0x00000008 Data RO 3962 .constdata system_stm32f0xx.o
+ 0x08004661 0x08004661 0x00000003 PAD
+ 0x08004664 0x08004664 0x00000020 Data RO 4333 Region$$Table anon$$obj.o
- Execution Region RW_IRAM1 (Exec base: 0x20000000, Load base: 0x08004664, Size: 0x000009b0, Max: 0x00004000, ABSOLUTE)
+ Execution Region RW_IRAM1 (Exec base: 0x20000000, Load base: 0x08004684, Size: 0x000009b8, Max: 0x00004000, ABSOLUTE)
Exec Addr Load Addr Size Type Attr Idx E Section Name Object
- 0x20000000 0x08004664 0x00000004 Data RW 15 .data delay_us.o
- 0x20000004 0x08004668 0x00000014 Data RW 315 .data ps2kb.o
- 0x20000018 0x0800467c 0x0000001c Data RW 415 .data ps2mouse.o
- 0x20000034 0x08004698 0x00000014 Data RW 550 .data xt_kb.o
- 0x20000048 0x080046ac 0x00000030 Data RW 644 .data main.o
- 0x20000078 0x080046dc 0x00000004 Data RW 1607 .data stm32f0xx_hal.o
- 0x2000007c 0x080046e0 0x00000004 Data RW 3963 .data system_stm32f0xx.o
- 0x20000080 0x080046e4 0x00000004 Data RW 4307 .data mc_p.l(stdout.o)
- 0x20000084 0x080046e8 0x00000004 Data RW 4310 .data mc_p.l(mvars.o)
- 0x20000088 0x080046ec 0x00000004 Data RW 4311 .data mc_p.l(mvars.o)
- 0x2000008c - 0x0000008e Zero RW 313 .bss ps2kb.o
- 0x2000011a 0x080046f0 0x00000002 PAD
- 0x2000011c - 0x00000291 Zero RW 638 .bss main.o
- 0x200003ad 0x080046f0 0x00000003 PAD
- 0x200003b0 - 0x00000200 Zero RW 2 HEAP startup_stm32f072xb.o
- 0x200005b0 - 0x00000400 Zero RW 1 STACK startup_stm32f072xb.o
+ 0x20000000 0x08004684 0x00000004 Data RW 15 .data delay_us.o
+ 0x20000004 0x08004688 0x00000014 Data RW 315 .data ps2kb.o
+ 0x20000018 0x0800469c 0x0000001c Data RW 415 .data ps2mouse.o
+ 0x20000034 0x080046b8 0x00000014 Data RW 550 .data xt_kb.o
+ 0x20000048 0x080046cc 0x00000034 Data RW 644 .data main.o
+ 0x2000007c 0x08004700 0x00000004 Data RW 1607 .data stm32f0xx_hal.o
+ 0x20000080 0x08004704 0x00000004 Data RW 3963 .data system_stm32f0xx.o
+ 0x20000084 0x08004708 0x00000004 Data RW 4307 .data mc_p.l(stdout.o)
+ 0x20000088 0x0800470c 0x00000004 Data RW 4310 .data mc_p.l(mvars.o)
+ 0x2000008c 0x08004710 0x00000004 Data RW 4311 .data mc_p.l(mvars.o)
+ 0x20000090 - 0x0000008e Zero RW 313 .bss ps2kb.o
+ 0x2000011e 0x08004714 0x00000002 PAD
+ 0x20000120 - 0x00000291 Zero RW 638 .bss main.o
+ 0x200003b1 0x08004714 0x00000007 PAD
+ 0x200003b8 - 0x00000200 Zero RW 2 HEAP startup_stm32f072xb.o
+ 0x200005b8 - 0x00000400 Zero RW 1 STACK startup_stm32f072xb.o
==============================================================================
@@ -2724,7 +2726,7 @@ Image component sizes
52 10 0 4 0 506967 delay_us.o
466 0 0 0 0 11760 helpers.o
- 3344 380 55 48 657 25316 main.o
+ 3376 380 55 52 657 25392 main.o
136 22 4 0 0 2311 mcp4451.o
1874 108 458 20 142 12207 ps2kb.o
1506 66 0 28 0 10908 ps2mouse.o
@@ -2749,9 +2751,9 @@ Image component sizes
528 52 0 20 0 5878 xt_kb.o
----------------------------------------------------------------------
- 16450 1060 768 128 2340 655062 Object Totals
+ 16482 1060 768 132 2344 655138 Object Totals
0 0 32 0 0 0 (incl. Generated)
- 34 0 3 0 5 0 (incl. Padding)
+ 34 0 3 0 9 0 (incl. Padding)
----------------------------------------------------------------------
@@ -2795,15 +2797,15 @@ Image component sizes
Code (inc. data) RO Data RW Data ZI Data Debug
- 17252 1104 768 140 2340 647970 Grand Totals
- 17252 1104 768 140 2340 647970 ELF Image Totals
- 17252 1104 768 140 0 0 ROM Totals
+ 17284 1104 768 144 2344 648046 Grand Totals
+ 17284 1104 768 144 2344 648046 ELF Image Totals
+ 17284 1104 768 144 0 0 ROM Totals
==============================================================================
- Total RO Size (Code + RO Data) 18020 ( 17.60kB)
- Total RW Size (RW Data + ZI Data) 2480 ( 2.42kB)
- Total ROM Size (Code + RO Data + RW Data) 18160 ( 17.73kB)
+ Total RO Size (Code + RO Data) 18052 ( 17.63kB)
+ Total RW Size (RW Data + ZI Data) 2488 ( 2.43kB)
+ Total ROM Size (Code + RO Data + RW Data) 18196 ( 17.77kB)
==============================================================================
diff --git a/firmware/ibmpc/MDK-ARM/ibmpc/ibmpc_ibmpc.dep b/firmware/ibmpc/MDK-ARM/ibmpc/ibmpc_ibmpc.dep
index bbe55f3..c12d764 100644
--- a/firmware/ibmpc/MDK-ARM/ibmpc/ibmpc_ibmpc.dep
+++ b/firmware/ibmpc/MDK-ARM/ibmpc/ibmpc_ibmpc.dep
@@ -240,7 +240,7 @@ I (../Inc/shared.h)(0x61B61A00)
I (../Inc/xt_kb.h)(0x626EFE9E)
I (../Inc/delay_us.h)(0x617487C7)
F (..\Inc\xt_kb.h)(0x626EFE9E)()
-F (../Src/main.c)(0x6407B1E1)(--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\_ibmpc
-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 ibmpc\main.o --omf_browse ibmpc\main.crf --depend ibmpc\main.d)
+F (../Src/main.c)(0x644EDF25)(--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\_ibmpc
-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 ibmpc\main.o --omf_browse ibmpc\main.crf --depend ibmpc\main.d)
I (../Inc/main.h)(0x6407AABA)
I (../Drivers/STM32F0xx_HAL_Driver/Inc/stm32f0xx_hal.h)(0x5DFA0893)
I (../Inc/stm32f0xx_hal_conf.h)(0x6407AABA)
diff --git a/firmware/ibmpc/MDK-ARM/ibmpc/main.crf b/firmware/ibmpc/MDK-ARM/ibmpc/main.crf
index 4eba365..c15fb54 100644
Binary files a/firmware/ibmpc/MDK-ARM/ibmpc/main.crf and b/firmware/ibmpc/MDK-ARM/ibmpc/main.crf differ
diff --git a/firmware/ibmpc/MDK-ARM/ibmpc/main.o b/firmware/ibmpc/MDK-ARM/ibmpc/main.o
index 820effe..5d18ecd 100644
Binary files a/firmware/ibmpc/MDK-ARM/ibmpc/main.o and b/firmware/ibmpc/MDK-ARM/ibmpc/main.o differ
diff --git a/firmware/ibmpc/Src/main.c b/firmware/ibmpc/Src/main.c
index f707124..0acab01 100644
--- a/firmware/ibmpc/Src/main.c
+++ b/firmware/ibmpc/Src/main.c
@@ -66,10 +66,18 @@ UART_HandleTypeDef huart3;
/* USER CODE BEGIN PV */
/* Private variables ---------------------------------------------------------*/
+
+/*
+0.5.6
+2023 04 30
+Capped PS/2 mouse rate at 200Hz
+
+
+*/
const uint8_t board_id = 1;
const uint8_t version_major = 0;
const uint8_t version_minor = 5;
-const uint8_t version_patch = 5;
+const uint8_t version_patch = 6;
uint8_t hw_revision;
uint8_t spi_transmit_buf[SPI_BUF_SIZE];
@@ -363,6 +371,7 @@ void get_consolidated_mouse_event(mouse_buf* mbuf, mouse_event* cme_result)
cap_to_127(&cme_result->movement_y);
}
+uint32_t last_mouse_movement;
void ps2mouse_update(void)
{
ps2mouse_bus_status = ps2mouse_get_bus_status();
@@ -380,6 +389,10 @@ void ps2mouse_update(void)
return;
}
+ // 5ms, PS/2 tops out at 200Hz
+ if(micros() - last_mouse_movement <= 5000)
+ return;
+
if(mouse_buf_peek(&my_mouse_buf) == NULL)
return;
@@ -399,6 +412,7 @@ void ps2mouse_update(void)
break;
}
}
+ last_mouse_movement = micros();
PCARD_BUSY_LOW();
}
@@ -685,7 +699,6 @@ int main(void)
while (1)
{
- // HAL_GPIO_TogglePin(PCARD_BUSY_GPIO_Port, PCARD_BUSY_Pin);
HAL_IWDG_Refresh(&hiwdg);
if(micros() > ACT_LED_off_ts)
HAL_GPIO_WritePin(ACT_LED_GPIO_Port, ACT_LED_Pin, GPIO_PIN_RESET);
diff --git a/firmware/releases/PBFW_IBMPC_PBID1_V0_5_6.dfu b/firmware/releases/PBFW_IBMPC_PBID1_V0_5_6.dfu
new file mode 100644
index 0000000..c696ac0
Binary files /dev/null and b/firmware/releases/PBFW_IBMPC_PBID1_V0_5_6.dfu differ
diff --git a/firmware/releases/PBFW_IBMPC_PBID1_V0_5_6.hex b/firmware/releases/PBFW_IBMPC_PBID1_V0_5_6.hex
new file mode 100644
index 0000000..80d94e1
--- /dev/null
+++ b/firmware/releases/PBFW_IBMPC_PBID1_V0_5_6.hex
@@ -0,0 +1,1141 @@
+:020000040800F2
+:10000000B8090020D50000083D1E00087519000839
+:1000100000000000000000000000000000000000E0
+:100020000000000000000000000000007B2100082C
+:100030000000000000000000851E00087D2100086F
+:10004000E7000008E7000008E7000008E7000008F4
+:10005000E700000889010008E7000008E700000841
+:10006000E7000008E7000008E7000008E7000008D4
+:10007000E7000008E7000008E7000008E7000008C4
+:10008000E7000008E7000008E7000008E7000008B4
+:10009000E7000008E7000008E7000008E7000008A4
+:1000A000E7000008891E0008E7000008E7000008D4
+:1000B000E70000087D270008E7000008E7000008C7
+:1000C0000348854600F04EF800480047152F000809
+:1000D000B80900200448804704480047FEE7FEE7CF
+:1000E000FEE7FEE7FEE7FEE7F5210008C100000895
+:1000F00030B50B46014600202022012409E00D46C0
+:10010000D5409D4205D31D469540491B2546954047
+:1001100040191546521E002DF1DC30BD03460B433D
+:100120009B0703D009E008C9121F08C0042AFAD2AD
+:1001300003E00B780370401C491C521EF9D2704733
+:10014000D2B201E00270401C491EFBD2704700226F
+:10015000F6E710B513460A4604461946FFF7F0FFC6
+:10016000204610BD064C0125064E05E0E36807CC8D
+:100170002B430C3C98471034B442F7D3FFF7A4FF4D
+:10018000644600088446000810B5022000F042F8DA
+:1001900010BD70B50024014620314A78022A03D0F0
+:1001A00004218163012416E0026813680E25AB4325
+:1001B0001360026813685B085B0013600122056C22
+:1001C0001346AB40C56B6B604A7000220A70416BEE
+:1001D000002900D08847204670BD31B500F0E2F814
+:1001E000009C0546601C00D0641C00F0DBF8401B3E
+:1001F000A042FAD338BD000000B5022807D105207F
+:1002000002F078FD002802D001490120087200BDEB
+:100210004800002010B504494A69024202D04861F2
+:10022000FFF7EAFF10BD000000040140F8B500230D
+:1002300093E0224601249C40A44622407ED04C6894
+:10024000022C01D0122C0CD1DC08A40027183C6A27
+:100250005D07ED0E0F26AE40B4430E69AE40264357
+:100260003E6205685E000324B4400F79A543BF07D2
+:10027000BF0FB7402F4307604D68012D05D0022DF9
+:1002800003D0112D01D0122D0ED18568CF68A54362
+:10029000B7402F43876047686546AF430D79ED0649
+:1002A000ED0F9D403D434560C568A5438C68B44053
+:1002B0002C43C4604C68E4004ED52B4CA569012644
+:1002C0003543A561A4699D0834400094274CAD00D6
+:1002D0002F19BC689D072E0F0F25B540AC4309258B
+:1002E000ED06A84201D1002514E0214DA84201D11C
+:1002F00001250FE01F4DA84201D102250AE01E4D45
+:10030000A84201D1032505E01C4DA84201D10425D6
+:1003100000E00525B5402543BD60194C25684E68B1
+:100320009543F60300D51543256065684E689543EF
+:10033000B60300D515436560A56800E00CE04E6883
+:100340009543F60200D51543A560E5684E689543D0
+:10035000B60200D51543E5605B1C0A681446DA4016
+:1003600000D066E7F8BD0000001002400000014028
+:100370000004004800080048000C00480010004835
+:10038000000401400069084000D001207047426924
+:100390004A4042617047002A01D081617047816202
+:1003A0007047000001480068704700007C00002092
+:1003B00070B5024640325378202B1CD11378012BA4
+:1003C00019D00123137024245470046825689D43B8
+:1003D0002560046825681E03B54325600468256808
+:1003E0000D432560006801681943016020205070AA
+:1003F0000020107070BD022070BD70B50246403202
+:100400005378202B1BD11378012B18D001241470A2
+:100410002423537003681D68A5431D6005682B687D
+:100420000F263602B34309021943296000680168A8
+:1004300021430160202050700020107070BD022008
+:1004400070BD000070B5040006D0254640356878C0
+:100450000026002802D005E0012070BD2E70204645
+:1004600000F082F92420687020680168490849007A
+:1004700001600F21606809068843216808612168CE
+:100480008A680120C00382438A60E1680129A1686B
+:1004900008D021229202114322689160E16802296A
+:1004A00002D005E00143F7E701212268C90251604B
+:1004B00021684A680F4B1A434A602168CA68824320
+:1004C000CA60616920690843A1690902084321687B
+:1004D000C860216AE06908432168086020680168F3
+:1004E0000122114301606664202068702663AE70AB
+:1004F000002070BD00800002FFB50446002083B0DC
+:100500002546403501906A78202A7FD12268926979
+:10051000D24312047AD52A78012A77D001222A7090
+:1005200024226A7060648F05BF0DE06801280BD03B
+:100530000520C002012138188902884321684860DB
+:10054000FFF730FF064612E03148F3E70698401CFB
+:100550000DD00698002805D0FFF724FF811B0698D0
+:10056000814204D9202068700020287043E0206870
+:100570008169C943890606D58069C043C00602D592
+:100580006878A028E2D120688069069BC043C00635
+:1005900000960ED500222021204601F07FFA002887
+:1005A00029D121682020C86168700020287007B018
+:1005B000F0BD00222021204601F070FA00281AD157
+:1005C00020681021C16120682021C1610198411C6F
+:1005D00001910599884214D1206841680122920353
+:1005E000114341600096002220212046069B01F025
+:1005F00055FA002802D00320D9E707E0216820201F
+:10060000C8610199059881428FD3ABE70220CEE7FC
+:1006100000200002FFB5054604464035687883B0E7
+:10062000202876D10C98002874D00D98002871D01D
+:10063000287801286DD001202870FFF7B3FE074607
+:10064000012200901923D103204601F027FA002847
+:1006500053D1212068704020A870002666640C9851
+:1006600060620D98608566630E980090019704A9FA
+:100670000EC9204601F0CAF9002804D0606C2E7023
+:1006800004286AD039E0608DFF2805D9FF22228531
+:1006900001231B06009606E0608D20850096208DC4
+:1006A0000123C2B25B062046049901F0E5F93A46FF
+:1006B00020460E9901F03DFA002803D0606C042812
+:1006C0004BD01AE0606A411C616221680078886240
+:1006D000608D401E6085208D401E0004000C20852A
+:1006E00024D1608D002821D000970022802120464F
+:1006F0000E9B01F0D3F9002802D0032007B0F0BD13
+:10070000608DFF2807D9FF22228501231B06009652
+:1007100008E024E021E0608D20850096208D0123F3
+:10072000C2B25B062046049901F0A6F9608D00284C
+:10073000BDD13A4620460E9901F0D4F90028BDD12A
+:1007400020682021C16120684268064B1A4042603F
+:100750006970AE702E700020D0E70120CEE7022035
+:10076000CCE7000000E800FE00B500680E4987B045
+:10077000884217D1032040030090122001900020EE
+:100780000290032003900520049069460748FFF774
+:100790004DFD0748C269012189050A43C261C0694C
+:1007A0000840059007B000BD005800400004004814
+:1007B0000010024070B504000FD021681348086093
+:1007C00021681348086003CC41602068083C216818
+:1007D0008860FFF7E7FD054608E0012070BDFFF7E0
+:1007E000E1FD401B272801D9032070BD2068C068A7
+:1007F0000028F4D120680269E1688A4201D00161D1
+:1008000001E004490160002070BD0000CCCC000074
+:1008100055550000AAAA00000068024901600020A6
+:1008200070470000AAAA000002480168491C016044
+:10083000704700007C00002010B5064801681022B7
+:1008400011430160002000F007F800F017F80020C5
+:1008500010BD00000020024010B5044600F078F9F9
+:100860007D21C900FFF744FC00F0E2FD0022214693
+:10087000501E00F02FF8002010BD000008B50F48F2
+:100880008169012211438161816911400091C2692E
+:1008900001040A43C261C069002208400090114669
+:1008A000501F00F017F800221146901E00F012F8B9
+:1008B00000221146501E00F00DF808BD0010024045
+:1008C000C106C90E01208840014908607047000038
+:1008D00000E100E010B501F0B3FA10BDF8B5044630
+:1008E0000068434DC00352D5E8690026C00007D414
+:1008F000E96928040143E961E969014001260091A1
+:100900003C480168C90510D4016882151143016093
+:10091000FFF748FD074604E0FFF744FDC01B6428CD
+:1009200024D834480068C005F6D5286A03273F025A
+:10093000384020D06168394081421CD0286A2A6A38
+:10094000B843012109040A432A622A6A8A432A62B7
+:100950002862C0070FD0FFF725FD009008E0FFF7E1
+:1009600021FD0099411A2448814201D90320F8BD94
+:10097000286A8007F3D5286A6168B843084328626B
+:10098000002E04D0E869012109078843E861207836
+:10099000C00705D0286BA168800880000843286341
+:1009A0002078800706D5286B032109048843E16875
+:1009B000084328632078800605D5286B10218843DA
+:1009C0002169084328632068800305D5286B8021AE
+:1009D0008843A169084328632088400505D5286B12
+:1009E000402188436169084328630020F8BD000066
+:1009F000001002400070004088130000F8B5054662
+:100A00004E480E460068C007C00FB0420AD24B489D
+:100A1000016849084900314301600068C007C00F00
+:100A2000B04270D12878464C800705D56068F02127
+:100A30008843A968084360602878C00753D0686875
+:100A4000012817D0022818D0032819D02168890757
+:100A5000002958DA61688908890001436160FFF75D
+:100A6000A1FC69680746012913D002291DD003297A
+:100A700027D034E021688903EAE721688901E7E7A4
+:100A8000616BC903E4E7FFF78DFCC11B2D48814270
+:100A900023D860680007800F0128F4D123E0FFF716
+:100AA00081FCC11B2748814217D860680007800F6E
+:100AB0000228F4D117E0FFF775FCC11B21488142E1
+:100AC0000BD860680007800F0328F4D10BE0FFF714
+:100AD00069FCC11B1B48814201D90320F8BD606835
+:100AE0000007800FF3D115480168C907C90FB1424B
+:100AF0000BD9016849084900314301600068C0070B
+:100B0000C00FB04201D00120F8BD2878400706D5BB
+:100B10006068072109028843E9680843606000F0C3
+:100B20002DF86168084A0906090F515CC840074959
+:100B300008600020FFF790FE0020F8BD0020024072
+:100B40000010024088130000494600088000002081
+:100B500001480068704700008000002004480549F3
+:100B600000684968044A4905490F515CC84070470C
+:100B700080000020001002405946000830B516A33E
+:100B80000FCB89B06C460FC417A30FCB0FC41A4903
+:100B90004A680C20144604401848042C05D0184B11
+:100BA000082C04D00C2C00D1184609B030BD94029A
+:100BB000240F6D462C5DC96A04AD0907090FD203E5
+:100BC000695C920F022A02D0032A00D11846FFF76F
+:100BD0008FFA6043E9E700000203040506070809ED
+:100BE0000A0B0C0D0E0F1010010203040506070876
+:100BF000090A0B0C0D0E0F100010024000127A00B3
+:100C0000006CDC02FEB504460078F04EF04DC007E3
+:100C100048D068680007800F01281FD06868000767
+:100C2000800F022804D16868C003800F022815D005
+:100C30006168012919D001208004002901D005290B
+:100C400017D02968B1432960296881432960606809
+:100C500000281BD0FFF7A6FB074613E02868800397
+:100C600020D56068002876D01CE0286830432860D2
+:100C7000EDE7296801432960F7E7FFF793FBC01B05
+:100C8000642869D828688003F7D50BE0FFF78AFB52
+:100C9000074604E0FFF786FBC01B6428F1D82868EC
+:100CA0008003F7D4207880073ED568680007800F5E
+:100CB00014D068680007800F022804D16868C00358
+:100CC000800F01280AD0E068002828681DD0012183
+:100CD00008432860FFF766FB07460BE0286880079B
+:100CE0000BD5E068012836D107E0FFF75BFBC01B9E
+:100CF0000228C6D828688007F7D52868F8218843D5
+:100D00002169C900084328600EE0400840002860BF
+:100D1000FFF748FB074604E0FFF744FBC01B02282F
+:100D2000AFD828688007F7D42078000724D5E06979
+:100D30000028686A11D0012108436862FFF732FB7E
+:100D4000074604E0FFF72EFBC01B022899D8686A0B
+:100D50008007F7D510E036E1D1E040084000686236
+:100D6000FFF720FB074604E0FFF71CFBC01B02282F
+:100D700087D8686A8007F7D42078042740070028BE
+:100D800061DA00200190E869C00008D4E969B8067A
+:100D90000143E961E96901400120009101908D481A
+:100DA0000168C90511D40168821511430160FFF77C
+:100DB000F9FA009005E0FFF7F5FA0099401A642867
+:100DC00097D884480068C005F5D5A06801280AD0E6
+:100DD000002801D0052811D0286A40084000286268
+:100DE000286AB84302E0286A012108432862A06803
+:100DF000002812D0FFF7D6FA00900AE0286A38439C
+:100E00002862F0E7FFF7CEFA0099411A7248814252
+:100E100075D8286A8007F5D50DE0FFF7C3FA009072
+:100E200006E0FFF7BFFA0099411A6B48814266D885
+:100E3000286A8007F5D40198002804D0E9690120C8
+:100E400000078143E9612078C00635D56069012833
+:100E50000CD0401D686B24D038436863686B400831
+:100E600040006863FFF79EFA074622E0686B38434C
+:100E70006863686B012108436863FFF793FA0746CC
+:100E800004E0FFF78FFAC01B022838D8686B800790
+:100E9000F7D5686BF8218843A169C90008436863E6
+:100EA0000AE0B8436863F4E7FFF77CFAC01B022846
+:100EB00025D8686B8007F7D42078800637D5686816
+:100EC0000007800F032813D068680007800F0228EE
+:100ED00004D16868C003800F032809D0206A002865
+:100EE000686B16D030436863FFF75CFA06460CE087
+:100EF000686BC0031BD5206A012864D117E05BE052
+:100F0000FFF750FA801B022856D8686BC003F7D54C
+:100F10000DE0B0436863FFF745FA064604E0FFF7CB
+:100F200041FA801B022847D8686BC003F7D4606A77
+:100F3000002846D069680907890F022943D0012695
+:100F400036060228286805D0B0432860FFF72AFA41
+:100F5000044633E0B0432860FFF724FA074604E074
+:100F6000FFF720FAC01B022826D828688001F7D492
+:100F7000E86A216B000900010843E862A16AE06A9F
+:100F8000084369687B22D20391430843686028685C
+:100F900030432860FFF706FA044604E0FFF702FA40
+:100FA000001B022808D828688001F7D509E0FFF760
+:100FB000F9F9001B022801D90320FEBD2868800131
+:100FC000F5D40020FEBD0120FEBD000000000100A0
+:100FD00000100240007000408813000070470000BD
+:100FE000F8B504460068426881684B0605D4CB0713
+:100FF00003D0530601D5E16C04E08B0705D5130639
+:1010000003D5216D20468847F8BDFF23613319427F
+:10101000FAD09306F8D523464D064033002D09DA61
+:101020005D7F032D3CD0256E042635432566C568BB
+:10103000856800958E060125002E08DA266E2E435F
+:1010400026668668009606684027BE430660C80587
+:1010500006D5206E0821084320662068806800902D
+:10106000206E0028D0D020684168E026B14341605E
+:101070005D77900718D02068416889088900416031
+:10108000A06D0B4D002803D04563A06DFFF781F8DC
+:10109000606D0028B8D04563606DFFF77AF8F8BD41
+:1010A000C16880680090F8BD2046FFF797FFF8BD43
+:1010B000FB1F0008F8B5040007D000262546403580
+:1010C000A662687F002802D005E00120F8BD2E77D7
+:1010D000204600F04BF802236B772068016840221D
+:1010E000914301600721E0680902884201D900228A
+:1010F00001E0012212030F273F02B84202D08842CA
+:1011000000D0A662276B002F05D1884201D9236346
+:1011100001E001202063A1686068636908432169D8
+:10112000194308430123A1695B0219400843E1699F
+:101130000843216A0843A16A084321680860616B7B
+:10114000606AA36908431B0C0427E1683B4019430C
+:1011500008432168104348602068C1697A029143BE
+:10116000C1612666012068770020F8BD00B50068DF
+:10117000114987B088421DD11048826981140A4301
+:101180008261806908400590F02000900220019063
+:101190000021032003900291049109206946C006B2
+:1011A000FFF744F8002211461920FFF793FB19209E
+:1011B000FFF786FB07B000BD003001400010024081
+:1011C00070470000F0B504468C464034217F00256E
+:1011D000C768964601290CD001212177667F4168B6
+:1011E000012E0CD0CA1FFD3A07D18168002904D115
+:1011F00001E00220F0BD042E01D0022540E061464E
+:1012000000291BD07146002918D0002B16D0617F11
+:10121000042901D0052161770021016661468163BF
+:101220008387C38771460164A380E3800721090295
+:101230008F4205D9144AC264144A04E001251FE014
+:10124000134AC264134A0265012212038F4202D874
+:10125000E188022903D301684B68934302E00168E7
+:101260004B6813434B6001684A68E0231A434A60A5
+:1012700000680168490603D40168402211430160F7
+:10128000002020772846F0BD991E00082D1F000879
+:10129000CF1E0008611F0008F8B501220920D10304
+:1012A000C006FFF778F856492022881AFEF736FF65
+:1012B000534C0127203C2078524EDE2801D0777213
+:1012C00091E0A07808280BD0092810D000250B2821
+:1012D00030D003284AD001284FD002287AD082E0AB
+:1012E0004748A2792179203001F00EFD7BE0617939
+:1012F000207901F05DFB424A2C321060E179A0793F
+:1013000001F056FB40425060207A3D494042107245
+:10131000607A5072607B9072A07B1073E07BD07219
+:10132000207C5073607C907336482C31243001F05F
+:10133000EBFF58E0324821794C30017061794170FF
+:10134000A1798170E179C170057145718571C571AF
+:10135000217A0172617A4172A17A8172E17AC17255
+:10136000014628482C3001F051FB3CE001210022CD
+:1013700049032548FFF70FF835E021482021403880
+:10138000FEF7E5FE1E48CD214038017061784170BE
+:1013900080238370C7703178017145710521817197
+:1013A0000621C171082200210546A1356C5C002C84
+:1013B0000CD0022C02D0012C03D005E0815403E0B4
+:1013C00008E00C461C438454521CD2B2491C10291C
+:1013D000ECDB08E00325605D002804D001F012FC7E
+:1013E0006D1C202DF7DB064A2023114640390748A3
+:1013F000FFF7E8FE01F01EFF054940187061F8BDD7
+:101400004003002048000020000800487C01002024
+:1014100010270000042204490428086902D09043E0
+:10142000086170471043FBE700E000E070470000F0
+:10143000094910B5401E884201D9012010BD074C52
+:1014400060610321081F00F0FBFC0020A061072061
+:101450002061002010BD0000FFFFFF0000E000E061
+:1014600010B5FFF7E3FF10BD70B502462032137FC1
+:10147000012B1BD00123137702245477046865687D
+:101480007026B5436560046865680E68354365601D
+:101490000468A5688026B543A5600068846849682B
+:1014A0000C43846053770020107770BD022070BD1C
+:1014B00070B5040005D025462035687F002802D08D
+:1014C00006E0012070BD00202877204600F00AF8D1
+:1014D00002206877211D206800F0BAFE012068779D
+:1014E000002070BD08B5006801218907884207D136
+:1014F0000448C16901221143C161C06910400090D4
+:1015000008BD0000001002400222014620314A7747
+:101510000268136801200343136048770020704776
+:10152000F8B5054604462035287F012817D0012745
+:101530002F7702206877226890687726FF23B043D0
+:101540001B02984390600868502837D00EDC202892
+:1015500057D006DC00284ED0102840D14EE00220A3
+:10156000F8BD302850D0402839D13CE060282DD03B
+:10157000702817D001221203801A0ED090422ED16B
+:10158000CB684A688968206800F0ACFE20688168F2
+:10159000012292031143816021E020688168C9081B
+:1015A000C900F8E7CB684A688968206800F09AFEAD
+:1015B00021688868B0433043886010E0CA68496891
+:1015C000206800F0A2FE5021206806E0CA68496841
+:1015D000206800F0ABFE6021206800F08EFE6F777F
+:1015E00000202877F8BDCA684968206800F08DFEA1
+:1015F00040212068F1E700212068EEE710212068F3
+:10160000EBE720212068E8E730212068E5E7704714
+:1016100070470000F8B503680446D86919680507E3
+:101620002D0F07D1820605D58A0603D5204600F086
+:1016300055FFF8BD9A68002D64D0D507ED0FFF2641
+:1016400021360E402E435DD0C60706D0CE0504D508
+:1016500001261E62E36E3343E366870702230426F6
+:10166000002F06DAD70704D027683B62E76E3743BE
+:10167000E766470706D5D20704D022681662E26EF5
+:101680001A43E266020709D520220A402A4305D000
+:10169000236808221A62E36E1343E366E26E002AAF
+:1016A000C7D0800604D5880602D5204600F016FF74
+:1016B000E06E000703D42068806840061CD52046F1
+:1016C00000F0F0FE20688168490611D5816840224B
+:1016D00091438160606E00280AD01A494163606EB0
+:1016E000FEF757FD0028A4D0606E416B8847F8BD17
+:1016F0002046FFF78DFFF8BD2046FFF789FF002049
+:10170000E066F8BDC5020DD552020BD501200005DB
+:101710001862202120466030417281722046FFF716
+:1017200076FFF8BD020605D50A0603D5204600F06F
+:10173000C1FFF8BD4006FCD54806FAD5204600F0AA
+:10174000C0FEF8BD9124000870B5040005D0254600
+:101750006035687A002802D006E0012070BD0020C4
+:101760002872204600F026F824206872206801685C
+:10177000490849000160204600F0EEFE0128EDD046
+:10178000606A002802D0204600F0E3FD206841682E
+:101790000922D20291434160206881682A22914344
+:1017A000816020680168012211430160204600F039
+:1017B00035FE70BD30B51F4D046800211E48022261
+:1017C000032387B0AC4214D1856954032543856156
+:1017D00080690291204005905802009001200490F9
+:1017E0000920039301926946C006FEF71FFD07B06A
+:1017F00030BD124DAC42FAD1C5690124A404254381
+:10180000C561C069029120400590032080020090CC
+:10181000042004900393019269460948FEF706FDEF
+:10182000002201211D20FFF755F81D20FFF748F881
+:10183000DDE7000000380140001002400048004091
+:10184000000400487047FFB5064604466036707ACB
+:1018500083B00D46202858D1002D0CD005980028C3
+:1018600009D00120A1680003814207D12069002826
+:1018700004D1E80702D0012007B0F0BD307A01287A
+:1018800043D0012030720020E06621207072FEF704
+:1018900089FD01902746403705983882059878825F
+:1018A00018E0788A401E78820698009000228021F5
+:1018B0002046019B00F031FF002818D10120A168CB
+:1018C0000003814202D12069002812D021682878C3
+:1018D00008856D1C788A0028E3D1069800900022C4
+:1018E00040212046019B00F018FF002808D003206B
+:1018F000C2E728882168C005C00D0885AD1CE9E74E
+:101900002020707200203072B6E70220B4E730B5B4
+:10191000034660335C7A202C23D100290BD0002AA7
+:1019200009D0012584682D03AC4206D10469002C3E
+:1019300003D1CC0701D0012030BD1C7A012C10D07E
+:10194000C164014640310A824A820021C1662122D7
+:101950005A721972006801688022114301600020E8
+:1019600030BD022030BD0000014900208872704760
+:1019700048000020FEE701688A69D243920701D43B
+:1019800000228A6200688169C943C90703D081695E
+:101990000122114381617047F7B5044600680E4685
+:1019A0008069C043C0062CD42027254640352068D6
+:1019B0008069C04380060FD5701CF8D0002E05D07A
+:1019C000FEF7F0FC0299401AB042F0D96F70002087
+:1019D000A87028700320FEBD21681020C86120680F
+:1019E000C7612046FFF7C7FF20684168064A1140DB
+:1019F0004160042060646F700020A870287001208E
+:101A0000FEBD0020FEBD000000E800FEF8B5044663
+:101A10000120164640031D46DAB2C3020090079F1C
+:101A2000204600F029F83A462046069900F081F851
+:101A3000002803D0606C04281BD018E02846F5B2BB
+:101A4000012809D02168300A88623A462046069962
+:101A500000F06FF80028EDD1206885620097002221
+:101A600080212046069B00F019F8002800D00320B2
+:101A7000F8BD0120F8BD000070B50568049C6868D9
+:101A80008905890D1204044E114319433040214346
+:101A90000143696070BD0000009800FCF8B51C4669
+:101AA00017460E46054611E0601C0FD0002C05D0ED
+:101AB000FEF778FC0699401AA04207D9202040354D
+:101AC00068700020A87028700320F8BD286881691C
+:101AD0003046884304D00020B842E5D00020F8BD4D
+:101AE0000120F9E770B516460D4604461AE0324665
+:101AF00029462046FFF750FF002801D0012070BD85
+:101B0000002D04D0FEF74EFC801BA8420AD9616C60
+:101B1000202001436164403460700020A070207078
+:101B2000032070BD20688069C0438006DFD4002098
+:101B300070BD70B516460D4604461CE03246294677
+:101B40002046FFF729FF002801D0012070BD681C46
+:101B500011D0002D04D0FEF725FC801BA8420AD925
+:101B6000616C202001436164403460700020A070EB
+:101B70002070032070BD20688069C0438007DDD4D9
+:101B8000002070BDF0B5504887B041690120C00405
+:101B90004D4A014351615169014005915169C000AD
+:101BA000014351615169014005915169401101435F
+:101BB000516151690140104605914169012080043D
+:101BC00001435161516944110140059100222146B0
+:101BD0003E48FEF7E0FB0326B603012231463B48B0
+:101BE000FEF7D9FB012203213948FEF7D4FB394F18
+:101BF000092000223946C006FEF7CDFBCD21012287
+:101C000089003548FEF7C7FB002208213248FEF75D
+:101C1000C2FB0094002401250195029469462B48DB
+:101C20000394FEF703FB00961126029469462748A9
+:101C300001960394FEF7FAFA032000900294694695
+:101C4000019603942248FEF7F1FA092002946946AE
+:101C5000C006009701950394FEF7E8FA1F48022793
+:101C600001906946009702941B48FEF7DFFACD20E9
+:101C70008000009002946946019603941648FEF78E
+:101C8000D5FAE8036A4691C269461348FEF7CEFAD0
+:101C900028026A4691C209206946C006FEF7C6FAC4
+:101CA0000820009002946946019503940A48FEF7C3
+:101CB000BDFA002202210520FEF70CFE0520FEF7EA
+:101CC000FFFD07B0F0BD0000001002400008004812
+:101CD00000140048018000000004004800002110AA
+:101CE00010B512481049016011494160002181601E
+:101CF0000161416181610122C161C2600162FEF73F
+:101D0000A1FB002800D0FEE700210848FEF750FBA9
+:101D1000002800D0FEE700210448FEF76EFB0028F3
+:101D200000D0FEE710BD0000005800402001002058
+:101D30005D3E302010B50D480B4901600021416027
+:101D40008160016141618161072201621202416289
+:101D5000C260816207220163C2624163FFF7AAF990
+:101D6000002800D0FEE710BD003001407C010020BB
+:101D700010B50121124886B08907016000242F2187
+:101D8000846041600461611E8461C160FFF790FB63
+:101D9000002800D0FEE701200003009069460848B3
+:101DA000FFF7BEFB002800D0FEE7049404A9044816
+:101DB0000594FFF759FB002800D0FEE706B010BDE0
+:101DC000E001002010B50C480A490160E1214902F8
+:101DD000416000218160C16001618161C1610C22AB
+:101DE000016242614162FFF7AFFC002800D0FEE7CC
+:101DF00010BD0000003801402002002010B50E4840
+:101E00000C4901604B21090141600021C160016161
+:101E100081610C22C1614261016230214162012174
+:101E2000090381634900C163FFF78EFC002800D0DD
+:101E3000FEE710BD004800409002002070470000FF
+:101E40008307FF22DB0E9A408907090E994000287C
+:101E50000BDA0007000F0838830808489B001818A1
+:101E6000C36993430B43C3617047830804489B00D5
+:101E70001B181868904308431860704700ED00E095
+:101E800000E400E07047000010B50248FFF7A8F832
+:101E900010BD00007C01002010B50168C968026C0B
+:101EA0001180016C891C016401464031CA88521EB0
+:101EB000CA80C988002909D101684A6840239A4329
+:101EC0004A60C18F002901D100F06EF810BD10B535
+:101ED00001464031CC880368026C012C11D9DB68C3
+:101EE0001380026C921C0264CA88921ECA80CA883F
+:101EF000012A0DD10268536801242403234353604F
+:101F000006E01C7B531C03641470CA88521ECA80EE
+:101F1000C988002909D101684A6860239A434A6048
+:101F2000C18F002901D100F03FF810BD10B5816BC1
+:101F300002680988D160816B891C8163C18F491E49
+:101F4000C187C18F00290AD101684A6880239A435A
+:101F50004A604621095A002901D100F025F810BD38
+:101F600010B5C38F0268816B022B07D30988D1603B
+:101F7000816B891C8163C18F891E05E04B1C8363C3
+:101F800009781173C18F491EC187C18F00290AD1F9
+:101F900001684A6880239A434A604621095A002909
+:101FA00001D100F001F810BD70B50446FEF7FAF952
+:101FB0000246206841682025A943416064212046EB
+:101FC00000F024F8002802D0206E28432066226EFC
+:101FD000204601214030002A04D041772046FEF7F8
+:101FE000FDFF70BD427F4177042A204602D0FFF7F3
+:101FF00053F970BDFFF7E4F870BD10B5406A0021D9
+:1020000046221152C187FEF7E9FF10BDF8B50F4611
+:102010000B4615460092032104460022C90200F037
+:102020001BF82026002812D13B46002280212046A2
+:10203000009500F05CF8002809D103213B460022FE
+:1020400049022046009500F007F8002803D0206ED2
+:10205000304320660320F8BDF8B51D4617460E46EE
+:1020600004463DE0032149028E4205D1002F03D1F1
+:10207000017B684601700078681C31D0002D05D0C6
+:10208000FEF790F90699401AA84229D320684168C2
+:10209000E022914341606068C11FFD390CD10121EC
+:1020A000A068C903884202D04911884204D120683F
+:1020B00001684022914301600120A16A40038142EE
+:1020C00007D121680A6882430A6021680A680243CE
+:1020D0000A60012040346077002020770320F8BD9B
+:1020E000206881683140B942BCD10020F8BDF8B504
+:1020F0001D4617460E46044633E0681C31D0002DBD
+:1021000005D0FEF74FF90699401AA84229D3206856
+:102110004168E022914341606068C11FFD390CD1E4
+:102120000121A068C903884202D04911884204D124
+:10213000206801684022914301600120A16A4003A8
+:10214000814207D121680A6882430A6021680A68CF
+:1021500002430A600120403460770020207703208A
+:10216000F8BD206881683046884304D00020B8421A
+:10217000C3D10020F8BD0120F9E7704710B5FEF784
+:1021800053FBFFF76DF910BD30B599B0282001253C
+:10219000002400900895079509946846FEF732FDE3
+:1021A000002800D0FEE707200D9003200E900F942A
+:1021B000012110940DA8FEF721FC002800D0FEE7B5
+:1021C000119511A81395FEF789FB002800D0FEE7B2
+:1021D000FEF7BEFC7D21C900FDF78AFFFFF728F955
+:1021E0000420FFF717F900221146501EFEF772FB7C
+:1021F00019B030BD124801680122114301604168E5
+:10220000104A1140416001680F4A114001600168A5
+:10221000012292049143016041683F2212049143DC
+:102220004160C16A09090901C162016B074A114095
+:102230000163416B49084900416300218160704797
+:10224000001002400CB8FF08FFFFF6FE2CFEFCFF5A
+:10225000F0B502681D4B0124A4071D4D984203D020
+:10226000A04201D0A84203D17026B2434E68324347
+:10227000184E194F98420DD0A0420BD0A84209D059
+:10228000164CA04206D0B04204D0B84202D0144C42
+:10229000A04204D103242402A243CC682243802418
+:1022A000A2434C69224302608A68C2620A68826261
+:1022B000984206D0B04204D0B84202D0084A9042B8
+:1022C00001D10969016301214161F0BD002C014088
+:1022D0000004004000400140004401400020004054
+:1022E0000048014030B58468FF252D021B021343CE
+:1022F000AC430B432343836030BD826870239A4311
+:102300000A4307210A438260704730B5036A046AB2
+:102310006408640004628469F025AC43120122431E
+:102320000A24A3430B438261036230BD30B5036AC4
+:102330001024A34303628469036A0F252D0312034B
+:10234000AC432243A024A3430901194382610162E3
+:1023500030BD10B5818CC90707D001684A680123D8
+:102360005B049A43836A1A434A60818C890707D5C4
+:1023700001684A6801231B049A43C36A1A434A60EE
+:10238000818C490707D501684A6801239B049A4359
+:10239000036B1A434A60818C090707D501684A68B4
+:1023A0000123DB039A43436B1A434A60818CC906BD
+:1023B00007D50268916801231B039943836B194376
+:1023C0009160818C890607D501688A6801235B03C7
+:1023D0009A43C36B1A438A60818C490612D50368FD
+:1023E0005A6801210905046C8A4322435A60026C31
+:1023F0008A4207D10268516803235B059943436C05
+:1024000019435160818C090607D501684A68012388
+:10241000DB04806C9A4302434A6010BDF8B5002685
+:102420000446C666FDF7BEFF054616492068884289
+:1024300002D0154988421DD10068144F000709D504
+:1024400001212B46002249052046009700F065F93E
+:1024500000280DD12068006840070BD501212B46CC
+:10246000002289052046009700F057F9002801D086
+:102470000320F8BD202060346072A0722672002014
+:10248000F8BD00000038014000440040FFFFFF019C
+:1024900010B5406A0022014640314A834A82FFF764
+:1024A000B7F810BD01680A68FF2321339A430A6018
+:1024B00001688A68520852008A6020216030817267
+:1024C000704710B501680A6840239A430A602022C9
+:1024D00069210A54FFF748FA002010BD70B5024682
+:1024E000403203466033948B9D7A0168222D05D0DB
+:1024F0008869082210438861022070BD898C0126FA
+:1025000085683603B54202D10569002D0BD0214004
+:10251000446D651C45652170518B491E0904090CE9
+:10252000518307D015E0456D21402980416D891CFC
+:102530004165F1E701680A68FF242134A2430A607B
+:1025400001688A68520852008A6020219972FFF758
+:1025500079F9002070BD0000F8B504462369A2682F
+:10256000E5691A43636910202B43002125681A434B
+:102570002B680E46474F3B4013432B6023685A6835
+:1025800003252D03AA43E5682A435A60236AA269FA
+:1025900025681A43AB680B273F02BB431343AB606C
+:1025A0003D4F25683D4B0203BD420AD11B6B9B0783
+:1025B0009B0F20D0012B14D0022B14D0032B1BD146
+:1025C0000DE0374FBD4210D11B6B03273F043B404A
+:1025D00011D09B1A05D09B1A05D093420CD1022032
+:1025E0000AE0042008E0082006E02E4B9D4202D0BD
+:1025F0002D4B9D4200D100200123E769DB039F4260
+:1026000022D100280CD002280DD0042813D008288D
+:1026100017D001260A0912010807400F10432EE0C7
+:10262000FEF79CFA09E06168204A48088018FDF727
+:102630005FFD81B2EEE7FEF7A1FA616840004A084B
+:10264000F4E761684808F1E7002808D0022809D0BB
+:1026500004280CD0082815D001263046F8BDFEF716
+:102660007DFA06E06168124A480880180DE0FEF71E
+:1026700085FA61684A088018FDF73AFD80B2216842
+:10268000C860EAE761684808C018FDF731FD80B20C
+:10269000E860E2E7F369FFEF003801400010024014
+:1026A0000044004000480040004C00400024F4007A
+:1026B00000127A006921095C212901D002207047AB
+:1026C00002464032518A002912D0012381681B033F
+:1026D000994202D10169002915D0C16C4B1CC36419
+:1026E000006809780185508A401E5082002070479A
+:1026F00001680A6880239A430A60006801684022E2
+:1027000011430160F2E7C16C03680988C905C90D6E
+:102710001985C16C891CC164E5E7FFB581B0174616
+:102720000E4604460A9D1DE0681C1BD0002D05D0F6
+:10273000FDF738FE0499401AA84213D920680168B1
+:10274000FF22A13291430160206881684908490055
+:102750008160202060346072A0720020207203200B
+:1027600005B0F0BD2068C1693046884304D0002020
+:10277000B842D9D00020F3E70120F9E710B50248AC
+:10278000FEF748FF10BD0000900200200FB410B506
+:1027900003A9044B044A029800F024F810BC08BCBA
+:1027A00004B01847F52900088400002030B47446AE
+:1027B000641E2578641CAB4200D21D46635D5B003D
+:1027C000E31830BC184702E008C8121F08C1002AED
+:1027D000FAD170477047002001E001C1121F002AA2
+:1027E000FBD17047FFB58DB00F460546002606E0C9
+:1027F00025280AD0109A0F9990476D1C761C2878CE
+:102800000028F5D1304611B0F0BD00240121674AFF
+:10281000009400E004436D1C2B780846203B984050
+:102820001042F7D128782E2815D104200443687867
+:102830006D1C2A280AD101CF6D1C00900BE0009975
+:102840000A225143303940186D1C00902878014607
+:1028500030390929F3D92878692843D006DC0028C3
+:10286000D0D063280BD0642804D13BE073280FD06C
+:1028700075284CD0109A0F999047761C94E03878C0
+:10288000694608720020487202A80190012003E006
+:10289000386801900020C0433F1D61070CD500241B
+:1028A00000E0641C00998C420FDA8442F9DB019944
+:1028B000095D0029F5D108E0002400E0641C844291
+:1028C000FCDB0199095D0029F8D1361907E0019870
+:1028D00001990078491C0191109A0F999047641E44
+:1028E000F5D261E00A20019001CF002802DA4042CF
+:1028F0002D2102E0210504D52B216A461172012108
+:1029000003E0E10701D02021F7E70C9104E00A2061
+:10291000019001CF00210C910BA90B9108E00199C6
+:10292000FDF7E6FB0A460B993032491E0B910A70FF
+:102930000028F4D10B9803A9081A203001906007F1
+:1029400001D5009801E0012000900199884203DD43
+:1029500001460198081A00E000200024009006E0DB
+:1029600002A8109A005D0F999047641C761C0C9881
+:102970008442F5DB04E0109A30200F999047761CD2
+:102980000099481E00900029F5DC08E00B980B998F
+:102990000078491C0B91109A0F999047761C019969
+:1029A000481E01900029F1DC6D1C28E70928010070
+:1029B0000902014308B2704702687F2A01DD7F21C6
+:1029C00003E07E21C9438A4200DA0160704700B506
+:1029D000014600F02FFC411800F02CFC8842FBD38C
+:1029E00000BD000010B502490860FEF78DFD10BD66
+:1029F0000000002013B56423012269460248FEF757
+:102A000022FF00981CBD00002002002010B50B46DC
+:102A1000044600F01DF8002801D0012010BD2078E8
+:102A20000C226168504308181946FDF777FB20789F
+:102A3000401C4007400F2070002010BD10B5044618
+:102A4000602000F07DFB6060204600F020F810BDA3
+:102A500041780078401C4007400F814201D101209D
+:102A600070470020704741780278914201D10020E0
+:102A7000704740680C2251434018704741780278F3
+:102A8000914203D0491C4907490F4170704710B566
+:102A900000210170417040686021FDF758FB10BDB6
+:102AA00070B52548FFF7DFFF04003BD020780028F1
+:102AB00039D00022214E02213046FDF76CFC6078AF
+:102AC000002832D000221E4D0121C9032846FDF7FF
+:102AD00062FCA07800282AD0002201213046FDF7B0
+:102AE0005AFCE078002824D00022012189032846DE
+:102AF000FDF751FC207AFF25291A032000F07EFB08
+:102B0000607A291A002000F079FBA07A291A0220A5
+:102B100000F074FBE07A291A012000F06FFB0648F0
+:102B2000FFF7ACFF70BD0122C4E70122CBE7012211
+:102B3000D3E70122D9E70000740000200014004808
+:102B40000008004870B50C4C012202212046FDF718
+:102B500022FC0A4D0122D1032846FDF71CFC01226C
+:102B600011462046FDF717FC012291032846FDF788
+:102B700012FC00F02BFB70BD001400480008004858
+:102B800070B5054600200860486008724872887277
+:102B90000873C87248730C468873284600F0E0FB3F
+:102BA000002827D02168026889182160616842687E
+:102BB00089186160217A027A89182172617A427AD1
+:102BC00089186172A17A827A1143A172217B027BFA
+:102BD00011432173E17AC27A1143E172617B427B36
+:102BE00011436173A17B807B0143A173284600F0F0
+:102BF000C1FBD2E72046FFF7DFFE201DFFF7DCFE1A
+:102C000070BD000070B54406C109640EC901102CE6
+:102C10002BD2254D285D002827D0002926D0022858
+:102C200023D122482300FFF7C1FD091E060D1E1007
+:102C3000161E1C191E00FF2301330246590000F026
+:102C400039FC10E001F010FB0DE0102302462021BA
+:102C500001F09EF807E000F0A1FB04E000F0AAFB01
+:102C600001E0FFF76FFF0120285570BD0128FCD15E
+:102C7000022028552300FFF799FD0805060B050ED5
+:102C800005051305F1E700F0D9FD00F0E7FD70BD83
+:102C900001F03AFB70BD01F015F901F003F970BDC8
+:102CA000FFF750FF70BD0000A103002000040048A2
+:102CB000002802D0ED2901D3002070470B4882780C
+:102CC0000B48012A04D0022A06D0032A08D00BE0C0
+:102CD0008E2909D2042206E08E2905D2022202E0C2
+:102CE0008E2901D2032242540120704704000020A3
+:102CF00090000020102803D20249085C012800D06F
+:102D000000207047A103002010B50C46034600F0D8
+:102D10001FF8002801D0012010BD197858684454CC
+:102D20001978986842541878401C4007400F187072
+:102D3000002010BD10B50446082000F001FA6060C4
+:102D4000082000F0FDF9A060204600F025F810BD35
+:102D500041780078401C4007400F814201D101209A
+:102D600070470020704710B543780478A34201D122
+:102D7000012010BD4468E35C0B7081684078085CFA
+:102D80001070002010BD41780278914203D0491C98
+:102D90004907490F4170704710B504460020207064
+:102DA000607008216068FDF7D2F90821A068FDF77E
+:102DB000CEF910BDF3B581B00746FF206946087013
+:102DC000524C3946A078FFF773FF002814D1002633
+:102DD000ED3FA6700125032102224D483B00FFF77D
+:102DE000E5FC1388820B660B585049403D36302A6B
+:102DF0002422201E0B0F0B0014220121FA2075E063
+:102E000014220121FA2000F0A5FD00F027FDFF208B
+:102E10004E30FDF7E2F9FA220021AA2066E0A17007
+:102E2000EAE7A270E8E7A570E6E700214554491CEF
+:102E30008E29FBDBE0E700228154521C8E2AFBDB4B
+:102E4000DAE700214254491C8E29FBDBD4E700213C
+:102E500004224254491C8E29FBDBCDE700F0FEFC26
+:102E6000CAE700F0FBFC14220121FA2000F072FDF9
+:102E70006670FEBD14220121FA2000F06BFD657022
+:102E8000FEBD14220121FA2000F064FD1E216846D7
+:102E900036E014220121FA2000F05CFD142200210A
+:102EA000AB2000F057FD1422002183201EE01422E5
+:102EB0000121FA2000F04EFD1E21684600F040FC82
+:102EC0000028DDD114220121FA2000F043FD6846DC
+:102ED0000078002803D00328D2D82070FEBD142229
+:102EE0000021207802E014220121EE2000F032FDC2
+:102EF000FEBD14220121FA2000F02CFD1E210298B3
+:102F000000F01EFC00288BD0FEBD00000400002055
+:102F1000900000201CB57148714C8089A081FDF79C
+:102F20008BFCFFF731F9FEF72DFEFEF7D9FEFEF719
+:102F300001FFFEF71DFFFEF745FFFEF75FFF6A4842
+:102F400068490160032141606849C1608160FDF703
+:102F500031FC002800D0FEE76348FDF75DFC062148
+:102F600005200191009000232278614961A0FFF7BC
+:102F70000DFC5D487430FFF735FD00F067FAFF2661
+:102F80000136614D77002A4633463946104600F037
+:102F900091FA2A4633463946104601F06FF92A461F
+:102FA00010232021104600F0F3FE0220FFF7A2FEBE
+:102FB000002801D001F058F95448FFF7BBFE4848FB
+:102FC000243000F0B7F946482C30FFF737FD00F009
+:102FD000FDF84E4820216038FDF7B9F84B4A4248C9
+:102FE000203A1146202340391030FEF7EBF8A18932
+:102FF00047A0FFF7CBFB00F0D9F8002812D148A07A
+:10300000FFF7C4FB002708212846FDF7C0F932204E
+:10301000FDF7E3F87F1C0A2FF5DB01220821284683
+:10302000FDF7B9F90927FF062F48FDF7F5FB00F07A
+:1030300001F96169884205D901210022C903384696
+:10304000FDF7A9F90420FFF755FE002809D001215A
+:10305000C9032846FDF796F9002802D000F05EFF6C
+:103060000EE00520FFF746FE002802D000F0EAF847
+:1030700006E00820FFF73EFE002801D000F0A4F98A
+:103080000120FFF737FE00280FD031463846FDF704
+:1030900079F9002809D000F0F3FB002812D00022B3
+:1030A00001213846FDF777F90CE00220FFF722FEF8
+:1030B000002807D031463846FDF764F9002801D0D2
+:1030C00001F042F90720FFF715FE002801D0FFF7B5
+:1030D000E7FC607A0028A7D001F052F8C0F7FF1F84
+:1030E00048000020003000406C010020FF0F00006D
+:1030F0001246000825730A726576256420762564D9
+:103100002E25642E25640A00000400486003002078
+:10311000666C6173685F73697A653A2025640A009A
+:103120004469676974616C20706F74206E6F7420DD
+:10313000726573706F6E64696E67210A000000002B
+:10314000F0B50B30C108C900144F0026144A0FE037
+:1031500003688B420BD38B4205D95C1A4318456830
+:1031600030C3083B00E04368136002C004E0021D66
+:1031700010680028ECD13046002803D138680028B8
+:1031800001D00020F0BD064A06481060064A121A17
+:10319000D208D20044C001203860D7E78C0000205C
+:1031A00088000020BC030020B805002010B564236F
+:1031B000012258210448FDF79FF9002801D0002082
+:1031C00010BD012010BD00002001002070B50A4C88
+:1031D000002204212046FDF7DEF87D25ED0028467B
+:1031E000FFF7F5FB012204212046FDF7D4F828461D
+:1031F000FFF7EDFB70BD00000004004803B583B08D
+:10320000042802D3FF2005B000BD08496423085CF0
+:1032100001210007020E04A80293019100900B46C1
+:1032200058210348FDF7F6F9EDE700000E460008C7
+:1032300020010020024800680068406A70470000D2
+:103240000000002070B52E4C207A002601250028B1
+:1032500008D04D20E0710122E11D2A48FEF757FBFE
+:10326000A57226722648243000F07AF8002845D04E
+:10327000A07A002842D123492148EC312430FFF7BD
+:103280007FFC1F48C0210E300680867001701D49EA
+:10329000EC318A7A002A01D0E02202700A7B002AEF
+:1032A00003D0027810231A4302700A88898812B268
+:1032B000494209B20B0603D503780826334303704D
+:1032C0004B0603D50378042633430370130603D556
+:1032D0000378022633430370530602D503782B4349
+:1032E00003709206920E42708906890E817004491D
+:1032F00003220E310348FEF70AFBA57270BD0000E1
+:10330000480000209002002030B50B46024600F035
+:103310001CF8002801D0012030BD11785068090147
+:1033200040183ACB3AC01078401C0007000F1070CC
+:10333000002030BD10B50446FF200130FFF700FF2C
+:103340006060204600F01FF810BD41780078401CF6
+:103350000007000F814201D1012070470020704713
+:1033600041780278914201D10020704740680901FC
+:103370004018704741780278914203D0491C0907F0
+:10338000090F4170704710B5002101704170FF2195
+:1033900040680131FCF7DBFE10BD000010B50120D4
+:1033A0000349000788600846FEF7CEF910BD00000B
+:1033B0009002002010B50349002088600846FEF7FF
+:1033C000C3F910BD9002002070B51E48FFF7C8FF7A
+:1033D000002835D01B4C243CA07A002830D11A4953
+:1033E0001848FFF7CDFB20461C3000220260027116
+:1033F0008721017014498B7A002B01D0832303703D
+:10340000CB7A002B03D00378FD252B4003700B7B78
+:10341000002B03D003785B085B0003700B784370CC
+:1034200009798170C27002710648FFF7A3FF054950
+:10343000054805220839EC38FEF769FA0120A07228
+:1034400070BD00006C0000207C03002010B510212E
+:103450000648FCF77CFE012104480222417082707C
+:10346000017142710272C17110BD0000A103002000
+:1034700070B50F4DA988A868FCF784FF0446E98859
+:10348000E868FCF77FFF012802D0002809D00AE095
+:10349000012C02D0002C02D005E0032070BD0220D8
+:1034A00070BD012C01D0002070BD012070BD000056
+:1034B0000400002010B5054CA060A180E260E3800C
+:1034C00000F0BCF900F0CAF910BD000004000020B3
+:1034D00010B50C4A5378002B08D01278012A07D077
+:1034E000022A08D0032A09D0072010BD012010BDF0
+:1034F00000F00AF810BD00F01DF810BD00F0E2F871
+:1035000010BD00000400002010B5532805D957282D
+:1035100003D0582801D0032010BD002907D0142261
+:10352000002100F017FA0028F6D0082010BD8021F5
+:103530000843F4E710B5592810D2614A145CFF2CF7
+:103540007ED0002902D014220021ABE014220021F9
+:10355000F02000F0FFF9002873D1F4E7632816D0BB
+:1035600077285AD00246603A1F2A6BD8544A5932FB
+:10357000101860380478FF2C62D000297ED0142205
+:103580000021E02000F0E6F900285AD188E0002967
+:103590001CD014220021E02000F0DCF9002850D1DA
+:1035A00014220021122000F0D5F9002849D114225C
+:1035B0000021E02000F0CEF900287DD11422002166
+:1035C0007C2000F0C7F9002876D110BD142200211C
+:1035D000E02000F0BFF900286ED114220021F02075
+:1035E00000F0B8F9002867D1142200217C2000F0F7
+:1035F000B1F9002860D114220021E02000F0AAF9DE
+:10360000002859D114220021F02000F0A3F900284D
+:1036100052D1142200211220D3E70029A6D014226F
+:103620000021E12000F096F9002845D11422002164
+:10363000104600F08FF900283ED11422002102E04C
+:103640002CE039E03AE0772000F084F9002833D10B
+:1036500014220021E12000F07DF900282CD1142251
+:103660000021F02000F076F9002825D11422002155
+:10367000104600F06FF900281ED100E014E014227B
+:103680000021F02000F066F9002815D11422002155
+:10369000772000F05FF900280ED110BD022010BD88
+:1036A0001422012120468CE714220021E02000F0A2
+:1036B00051F9002800D149E7082010BD032010BDB2
+:1036C0009545000810B5C32801D3052010BD1A4A3E
+:1036D000145CFF2C03D08E2C03D3062010BD0220D7
+:1036E00010BD16480129025D04D0002910D002291E
+:1036F0001BD01EE0022A03D0012A01D0032A18D1D0
+:1037000014220021204600F025F900280BD110E0FA
+:10371000022A01D0012A0CD114220021F02000F04D
+:1037200019F90028ECD0082010BD012AE8D0042A9D
+:10373000E6D0002010BD00004444000890000020A6
+:10374000F3B581B00F4600250126FCF72BFE3A4C5D
+:10375000206107E0FCF726FE2169401AB84201D338
+:103760000420FEBDFFF784FE0128F3D11220FFF7ED
+:103770002EF90022A188A068FCF70DFE2420FFF797
+:1037800026F90122A188A068FCF705FE1220FFF7A8
+:103790001EF9E188E068FCF7F5FD012800D135430A
+:1037A0007004060C1220FFF712F90022A188A0680D
+:1037B000FCF7F1FD2420FFF70AF90122A188A06897
+:1037C000FCF7E9FD1220FFF702F9FF2EE1D91220E4
+:1037D000FFF7FDF80022A188A068FCF7DCFD24209B
+:1037E000FFF7F5F80122A188A068FCF7D4FD1220AC
+:1037F000FFF7EDF81220FFF7EAF80022E188E06811
+:10380000FCF7C9FD0022A188A068FCF7C4FD2420B4
+:10381000FFF7DDF80122A188A068FCF7BCFD1220AB
+:10382000FFF7D5F80122E188E068FCF7B4FD0198C4
+:1038300005700020FEBD00000400002010B5064CFD
+:103840000122A188A068FCF7A6FD0122E188E068BA
+:10385000FCF7A1FD10BD00000400002010B50548D4
+:1038600002210170012141708E2203490348FCF7B7
+:1038700055FC10BD04000020074500089000002002
+:1038800038B5FFF7F5FD304C0228A07106D00925A8
+:10389000ED06012806D0032837D04EE0FFF7CEFF13
+:1038A000002038BD012211462846FCF774FDFF2197
+:1038B0006846017024480A21401CFFF741FF694611
+:1038C0006078FFF777FA68460478FF2C35D020211E
+:1038D0001E48FCF73CFC1D48CD21017001462031FB
+:1038E0004978417081218170E2070121002A00D0CE
+:1038F000C170A20700D50171620700D54171012294
+:1039000051031348FCF747FD17E00F4A0F48121DFB
+:10391000511E6030FFF727FA00280ED10122114610
+:103920002846FCF738FD2179E078FFF7D1FD08281B
+:1039300005D006486030FFF726FA012038BD012087
+:10394000FCF74BFCF9E700004800002000030020D2
+:1039500000080048F8B515460E460746144CFCF71B
+:1039600021FD206107E0FCF71DFD2169401AA842F6
+:1039700001D30420F8BDFFF77BFD0328F3D1FFF747
+:1039800059FC206103E0FFF773FD0328E7D1FFF73F
+:1039900051FC2169401A3C28F5D3002E03D0AF20FA
+:1039A0008000FFF714F8384600F004F8F8BD000076
+:1039B00004000020F8B5474C054601260022E188A6
+:1039C000E068FCF7E8FC1220FFF701F80022A1886C
+:1039D000A068FCF7E0FC2420FEF7F9FF0122A18893
+:1039E000A068FCF7D8FC1220FEF7F1FFA188A068C0
+:1039F000FCF7C8FC002868D00027E80701D00122A6
+:103A000000E00022E188E068FCF7C5FC1220FEF728
+:103A1000DEFF0022A188A068FCF7BDFC2420FEF791
+:103A2000D6FF0122A188A068FCF7B5FC1220FEF7A2
+:103A3000CEFFA188A068FCF7A5FC002845D0E807C8
+:103A4000C00F46406D087F1C082FD6DB002E01D02A
+:103A5000012200E00022E188E068FCF79CFC1220D3
+:103A6000FEF7B5FF0022A188A068FCF794FC242093
+:103A7000FEF7ADFF0122A188A068FCF78CFC1220A4
+:103A8000FEF7A5FFA188A068FCF77CFC00281CD0ED
+:103A90000122E188E068FCF77EFC1220FEF797FF28
+:103AA0000022A188A068FCF776FC2420FEF78FFF97
+:103AB0000122A188A068FCF76EFC1220FEF787FFA8
+:103AC000C820FEF784FF0020F8BDFFF7B7FE0820EE
+:103AD000F8BD00000400002010B5164C6189206973
+:103AE000FCF750FC012805D12189E068FCF74AFC6D
+:103AF000012806D061892069FCF744FC012802D026
+:103B000007E0032010BD2189E068FCF73BFC00289A
+:103B100006D061892069FCF735FC002802D007E057
+:103B2000022010BD2189E068FCF72CFC0128F8D0A8
+:103B3000002010BD18000020F8B5364E054630783C
+:103B40000C46002804D0B079002803D00620F8BD28
+:103B50000120F8BD0821601CFCF7F9FA0320207051
+:103B600008206070A87A002801D009206070287BA6
+:103B70000221002802D0607808436070E87A0422AD
+:103B8000002802D060781043607028681023002855
+:103B900002DA60781843607068682027002802DA2B
+:103BA0006078384360702878A0702879E070707968
+:103BB000032806D0042806D0002800D02270002058
+:103BC000F8BD287A1EE0687B002802D020791843CF
+:103BD0002071A87B002802D0207938432071092069
+:103BE0002856002801DD207903E0002803DA207937
+:103BF0000E210843207108202856002804DD207972
+:103C0000012105E02071D9E70028D7DA20790F21BA
+:103C10000843F7E718000020F8B500250E46FF28F6
+:103C200010D0E63800210127584C0300FEF7BEFDF6
+:103C300011A0A69063619B9B9B5A9B549B331E1CB7
+:103C40001A179B0000F03EF91421FA2000F0F5F954
+:103C5000FA21AA2000F0E4F91421002075E000F018
+:103C60003DF980E021707EE027707CE01421FA208D
+:103C700000F0E3F945489621401C00F097F8002831
+:103C80002FD142492079143162780A5407286AD228
+:103C9000401C207167E01421FA2000F0CEF9217950
+:103CA000022916D93948143040182038C17F5029CC
+:103CB0000FD1817F642902D0C82905D009E0407F57
+:103CC000C82806D1032003E0407FC82801D1042082
+:103CD00060711421607938E01421FA2000F0ADF908
+:103CE000A771F8BD1421FA2000F0A7F90220A071F5
+:103CF000F8BDA17137E01421FA2000F09EF9A079F7
+:103D0000012800D140252078002801D0202005433B
+:103D1000E078022801D110200543B07A002801D0B4
+:103D200004200543F07A002801D002200543307BAF
+:103D3000002800D03D431421284600F071F91421D9
+:103D4000A07800F06DF91421607800F069F9F8BDF1
+:103D50001421FA2000F071F90C489621801C00F023
+:103D600025F80028F3D11421FA2000F066F9F8BDF7
+:103D70001421FA2000F061F9E770F8BD1421FA204F
+:103D800000F05BF90220E070F8BD00001800002090
+:103D900010B5054CE06021812261638100F092F84A
+:103DA00000F080F810BD000018000020F3B581B0CD
+:103DB0000F4600250126FCF7F5FA044606E0FCF75D
+:103DC000F1FA001BB84201D30420FEBDFFF784FEC8
+:103DD0000128F4D11220FEF7FAFD314C002221898E
+:103DE000E068FCF7D8FA2420FEF7F1FD01222189D2
+:103DF000E068FCF7D0FA1220FEF7E9FD618920693E
+:103E0000FCF7C0FA012800D135437004060C1220DB
+:103E1000FEF7DDFD00222189E068FCF7BCFA2420D2
+:103E2000FEF7D5FD01222189E068FCF7B4FA1220E3
+:103E3000FEF7CDFDFF2EE1D91220FEF7C8FD0022CE
+:103E40002189E068FCF7A7FA2420FEF7C0FD0122D3
+:103E50002189E068FCF79FFA1220FEF7B8FD1220D6
+:103E6000FEF7B5FD002261892069FCF794FA002273
+:103E70002189E068FCF78FFA2420FEF7A8FD0122D3
+:103E80002189E068FCF787FA1220FEF7A0FD0122E5
+:103E900061892069FCF77FFA019805700020FEBD5A
+:103EA0001800002010B5064C01222189E068FCF7BB
+:103EB00072FA012261892069FCF76DFA10BD0000D9
+:103EC0001800002000B500F009F80349002008712F
+:103ED00048618861487100BD1800002005486421D0
+:103EE0004170022181700121C17000210170817136
+:103EF000704700001800002070B50546002407E058
+:103F000028194078C82100F08BF8002804D1641CDF
+:103F10002878A042F4DC002070BD000070B5FFF7E7
+:103F2000DBFD2C4C022860712CD00925ED06012800
+:103F30002BD0FFF77FF9A169401A2749884223D97E
+:103F400020462430FFF70CFA00281DD020462349D4
+:103F50002430FEF715FE214920481C31FFF7ECFD07
+:103F6000002811D1012211462E462846FCF713FAEB
+:103F70001A481C30FFF7C0FF002822D0FCF712FAC5
+:103F800005461AE0FFF78EFF70BD01221146284654
+:103F9000FCF701FA0F480A21801CFFF707FF0F49C1
+:103FA000A0781039FFF738FE0022012128460EE0E4
+:103FB000FCF7F8F9401B142803D8FFF78DFD032800
+:103FC000F6D1FFF737F9A061002201213046FCF756
+:103FD000E2F970BD48000020881300007C03002037
+:103FE00070B50546FCF7DEF9044606E0FCF7DAF9A1
+:103FF000001BA84201D3042070BDFFF76DFD03280C
+:10400000F4D1FFF717F9044603E0FFF765FD032835
+:10401000E8D1FFF70FF9001B3C28F6D3002070BD54
+:1040200010B504460846FFF7DBFF002801D0042046
+:1040300010BD204600F012F810BD10B50446084629
+:10404000FFF7CEFF002801D0042010BDAF20800074
+:10405000FEF7BDFC204600F001F810BDF8B5474C56
+:1040600005460126002261892069FCF794F9122097
+:10407000FEF7ADFC00222189E068FCF78CF92420D2
+:10408000FEF7A5FC01222189E068FCF784F91220E3
+:10409000FEF79DFC2189E068FCF774F9002868D0E0
+:1040A0000027E80701D0012200E000226189206991
+:1040B000FCF771F91220FEF78AFC00222189E068E2
+:1040C000FCF769F92420FEF782FC01222189E068CF
+:1040D000FCF761F91220FEF77AFC2189E068FCF711
+:1040E00051F9002845D0E807C00F46406D087F1CF5
+:1040F000082FD6DB002E01D0012200E000226189CA
+:104100002069FCF748F91220FEF761FC00222189A2
+:10411000E068FCF740F92420FEF759FC01222189D0
+:10412000E068FCF738F91220FEF751FC2189E068BD
+:10413000FCF728F900281CD0012261892069FCF7CE
+:104140002AF91220FEF743FC00222189E068FCF7DF
+:1041500022F92420FEF73BFC01222189E068FCF7CC
+:104160001AF91220FEF733FCFA20FEF730FC00208B
+:10417000F8BDFFF797FE0820F8BD000018000020EA
+:1041800011A0FEF703FB134D0024295D12A0FEF7DA
+:10419000FDFA641C202CF8DB10A0FEF7F7FA134D93
+:1041A000002408212846FCF7F2F86420FCF715F8F3
+:1041B000641C642CF5DBBFF34F8F0E490C48C860BC
+:1041C000BFF34F8F00BFFDE7535049204552524F78
+:1041D000520A000020030020256420000A72656254
+:1041E0006F6F74696E672E2E2E0A0000000400485F
+:1041F0000400FA0500ED00E070B50646FCF7D2F8C1
+:104200000446084D06E0FCF7CDF8001BB04201D98A
+:10421000042070BD29886868FCF7B4F80028F2D043
+:10422000002070BD3400002010B50E4C218860685D
+:10423000FCF7A8F8012802D1FCF7B4F8E060FCF71D
+:10424000B1F8E168401A14280BD9C820FFF7D4FF51
+:104250001420FBF7C2FFAA2000F094F80A20FBF715
+:10426000BCFF10BD3400002010B500F05DF8FCF775
+:1042700099F80149C86010BD3400002010B5034C06
+:1042800060602180A260638010BD000034000020C7
+:1042900070B5044666380300FEF788FA0A1406086B
+:1042A0000A0C0E101216181A482413E0492411E0C3
+:1042B0004B240FE04D240DE04F240BE0502409E087
+:1042C000512407E0472405E0522403E0532401E091
+:1042D000532C0BD8022902D000290DD00EE0FCF798
+:1042E00061F8084D2969401A502801D8002070BD96
+:1042F000FCF758F8286101E080200443204600F0D4
+:1043000041F870BD3400002010B5064C0122218810
+:104310006068FCF740F801226188A068FCF73BF870
+:1043200010BD00003400002010B5064C0122218889
+:104330006068FCF730F800226188A068FCF72BF871
+:1043400010BD00003400002010B5FFF76DFF0B4AD0
+:104350000B48511EFEF707FD00280AD10748001F31
+:104360000179C078FFF794FF452803D00448FEF791
+:104370000AFD10BD0120FBF730FF10BD4C000020EE
+:104380006003002070B52E4C054621886068FBF75D
+:10439000F9FF00282AD0002221886068FBF7FBFF84
+:1043A0000520FEF714FB01226188A068FBF7F3FFEC
+:1043B0006E20FEF70CFB6188A068FBF7E3FF002886
+:1043C00014D0012221886068FBF7E5FF4120FEF749
+:1043D000FEFA002221886068FBF7DDFF1E20FEF751
+:1043E000F6FA0026E80705D0012204E0FFF79CFF5B
+:1043F000452070BD00226188A068FBF7CCFF012238
+:1044000021886068FBF7C7FF4120FEF7E0FA002231
+:1044100021886068FBF7BFFF1E20FEF7D8FA6D0801
+:10442000761C082EDEDB012221886068FBF7B3FFD3
+:1044300000226188A068FBF7AEFF002070BD00007D
+:1044400034000020FF08161E26252E363D3E464528
+:104450004E55660D151D242D2C353C43444D545BA3
+:104460005A111C1B232B34333B424B4C520E125C13
+:104470001A22212A32313A41494A597E1929140710
+:104480000F171F272F373F474F765F6C757D4E6B99
+:1044900073747C69727A7071FFFF13565EFFFFFFC1
+:1044A000FFFFFFFF79584A5739FF6E636F616A65F6
+:1044B000606D6764FFFFFFFFFFFFFF62FFFFFFFF0D
+:1044C000FF8B8C8DFFFFFFFFFFFFFFFFFFFFFFFF55
+:1044D000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEC
+:1044E000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDC
+:1044F000FFFFFFFFFFFFFFFFFFFFFF08101820284F
+:104500003038404850575F010101010101010303A8
+:104510000101010101010301020201020101030184
+:104520000201010101010301010101010101030176
+:104530000101010101010301010101010101030167
+:104540000301010101010301010101010101030155
+:104550000101010101010301010101010103030343
+:104560000201010101030301010301010301030130
+:10457000030103030303030303030303030303010F
+:104580000303010103030101010101030101010111
+:104590000101010101FF76161E26252E363D3E46FD
+:1045A000454E55660D151D242D2C353C43444D5468
+:1045B0005B5A141C1B232B34333B424B4C520E12C0
+:1045C0005D1A22212A32313A41494A597C1129582F
+:1045D0000506040C030B830A0109777E6C757D7B4D
+:1045E0006B73747969727A7071FFFF6178075A147E
+:1045F0004AFF11FF6C757D6B7469727A7071FFFFF1
+:10460000FFFFFFFFFFFFFFFFFFFFFF1F272F00013F
+:1046100006075553423456432050726F746F636FD0
+:104620006C20426F6172640A49424D20504320431E
+:104630006F6D70617469626C650A64656B754E7547
+:104640006B656D2032303232000000000000000047
+:10465000000102030406070809000000000102032C
+:1046600004000000844600080000002090000000C4
+:10467000C627000814470008900000202809000001
+:10468000D627000800000000020100000000000022
+:10469000000000000000000000000000000000001A
+:1046A000000000000000000000000000000000000A
+:1046B00000000000000000000000000000000000FA
+:1046C00000000000000000000000000000000000EA
+:1046D00000000000000000000000000000000000DA
+:1046E00000000000000000000000000000000000CA
+:1046F00000000000000000000000000000000000BA
+:104700000000000000127A0000000000000000001D
+:0447100000000000A5
+:04000005080000C12E
+:00000001FF
diff --git a/user_program/usb4vc_usb_scan.py b/user_program/usb4vc_usb_scan.py
index 4eedd61..f15f5d6 100644
--- a/user_program/usb4vc_usb_scan.py
+++ b/user_program/usb4vc_usb_scan.py
@@ -835,7 +835,7 @@ def raw_input_event_worker():
pass
# send spi mouse message if there is moment, or the button is not typematic
elif (max(this_mouse_msg[13:18]) != 2 or sum(this_mouse_msg[4:10]) != 0) and (this_mouse_msg[4:] != last_mouse_msg[4:] or sum(this_mouse_msg[4:]) != 0):
- xfer_when_not_busy(list(this_mouse_msg), drop=True)
+ xfer_when_not_busy(list(this_mouse_msg))
next_gamepad_hold_check = now + gamepad_hold_check_interval
clear_mouse_movement(mouse_status_dict)
last_mouse_msg = list(this_mouse_msg)