diff --git a/Core/Src/main.c b/Core/Src/main.c index 644cea2..0558907 100644 --- a/Core/Src/main.c +++ b/Core/Src/main.c @@ -97,7 +97,8 @@ int main(void) MX_USART1_UART_Init(); MX_USART2_UART_Init(); /* USER CODE BEGIN 2 */ - +extern void user_main(); + user_main(); /* USER CODE END 2 */ /* Infinite loop */ diff --git a/Core/Src/tim.c b/Core/Src/tim.c index f8bb3ac..08ef236 100644 --- a/Core/Src/tim.c +++ b/Core/Src/tim.c @@ -39,7 +39,7 @@ void MX_TIM3_Init(void) TIM_OC_InitTypeDef sConfigOC = {0}; htim3.Instance = TIM3; - htim3.Init.Prescaler = 1; + htim3.Init.Prescaler = 65535; htim3.Init.CounterMode = TIM_COUNTERMODE_UP; htim3.Init.Period = 0xFFFF; htim3.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1; @@ -58,7 +58,7 @@ void MX_TIM3_Init(void) Error_Handler(); } sMasterConfig.MasterOutputTrigger = TIM_TRGO_RESET; - sMasterConfig.MasterSlaveMode = TIM_MASTERSLAVEMODE_ENABLE; + sMasterConfig.MasterSlaveMode = TIM_MASTERSLAVEMODE_DISABLE; if (HAL_TIMEx_MasterConfigSynchronization(&htim3, &sMasterConfig) != HAL_OK) { Error_Handler(); diff --git a/MDK-ARM/WaveBox.uvguix.zel b/MDK-ARM/WaveBox.uvguix.zel index 146ebac..faf7a21 100644 --- a/MDK-ARM/WaveBox.uvguix.zel +++ b/MDK-ARM/WaveBox.uvguix.zel @@ -11,17 +11,17 @@ 38003 Registers - 115 195 + 115 275 346 Code Coverage - 850 160 + 530 100 204 Performance Analyzer - 1010 + 1010 151 151 100 @@ -30,7 +30,7 @@ 1506 Symbols - 133 133 133 + 392 133 133 1936 @@ -53,8 +53,8 @@ 2506 Trace Data - - 75 135 130 95 70 230 200 150 + FiltIdx=0;DescrEn=0;DescrHeight=4;FuncTrc=1;FindType=8;ColWidths=004B00870082005F004600E600C80096 + 75 135 95 70 230 200 150 @@ -63,8 +63,8 @@ 1 1 0 - 0 - -1 + 87 + 1 @@ -75,25 +75,25 @@ 2 3 - -1 - -1 + -32000 + -32000 -1 -1 - -6 - 63 - 1542 - 832 + -8 + -8 + 1030 + 734 0 - 60 - 010000000400000001000000010000000100000001000000000000000200000000000000010000000100000000000000280000002800000000000000 + 1348 + 0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000000C000000000000000100000052433A5C55736572735C7A656C5C4465736B746F705C57617665426F785C447269766572735C53544D3332463478785F48414C5F4472697665725C5372635C73746D3332663478785F68616C5F756172742E63000000001473746D3332663478785F68616C5F756172742E6300000000D9ADC200FFFFFFFF54433A5C55736572735C7A656C5C4465736B746F705C57617665426F785C447269766572735C53544D3332463478785F48414C5F4472697665725C5372635C73746D3332663478785F68616C5F7077725F65782E63000000001673746D3332663478785F68616C5F7077725F65782E6300000000C5D4F200FFFFFFFF2D433A5C55736572735C7A656C5C4465736B746F705C57617665426F785C757365635C757365725F6D61696E2E63000000000B757365725F6D61696E2E6300000000FFDC7800FFFFFFFF3A433A5C55736572735C7A656C5C4465736B746F705C57617665426F785C4D444B2D41524D5C737461727475705F73746D33326634323978782E730000000015737461727475705F73746D33326634323978782E7300000000BCA8E100FFFFFFFF2C433A5C55736572735C7A656C5C4465736B746F705C57617665426F785C436F72655C5372635C6D61696E2E6300000000066D61696E2E63000000009CC1B600FFFFFFFF54433A5C55736572735C7A656C5C4465736B746F705C57617665426F785C447269766572735C434D5349535C4465766963655C53545C53544D3332463478785C496E636C7564655C73746D33326634323978782E68000000000D73746D33326634323978782E6800000000A5C2D700FFFFFFFF29433A5C55736572735C7A656C5C4465736B746F705C57617665426F785C757365635C626F6172642E680000000007626F6172642E6800000000A5C2D700FFFFFFFF52433A5C55736572735C7A656C5C4465736B746F705C57617665426F785C447269766572735C53544D3332463478785F48414C5F4472697665725C5372635C73746D3332663478785F68616C5F6770696F2E63000000001473746D3332663478785F68616C5F6770696F2E6300000000C5D4F200FFFFFFFF4D433A5C55736572735C7A656C5C4465736B746F705C57617665426F785C447269766572735C53544D3332463478785F48414C5F4472697665725C5372635C73746D3332663478785F68616C2E63000000000F73746D3332663478785F68616C2E6300000000F7B88600FFFFFFFF39433A5C55736572735C7A656C5C4465736B746F705C57617665426F785C436F72655C5372635C73746D3332663478785F68616C5F6D73702E63000000001373746D3332663478785F68616C5F6D73702E6300000000C5D4F200FFFFFFFF2B433A5C55736572735C7A656C5C4465736B746F705C57617665426F785C436F72655C496E635C74696D2E68000000000574696D2E6800000000BECEA100FFFFFFFF53433A5C55736572735C7A656C5C4465736B746F705C57617665426F785C447269766572735C53544D3332463478785F48414C5F4472697665725C496E635C73746D3332663478785F68616C5F75736172742E68000000001573746D3332663478785F68616C5F75736172742E6800000000F0A0A100FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD50001000000000000000200000091010000660000008007000032030000 @@ -116,7 +116,7 @@ 16 - 9401000081000000900500000F010000 + 940100007C000000900500000A010000 @@ -132,7 +132,7 @@ 0 16 - 03000000890000003D0100006A020000 + 03000000660000008A01000002030000 16 @@ -152,7 +152,7 @@ 0 16 - 03000000890000003D0100006A020000 + 03000000660000008A01000002030000 16 @@ -172,7 +172,7 @@ 0 16 - 030000001F0200008D05000087020000 + 03000000120200008D05000091020000 16 @@ -192,7 +192,7 @@ 0 16 - 030000001F0200008D05000087020000 + 03000000120200008D05000091020000 16 @@ -212,7 +212,7 @@ 0 16 - 030000001F0200008D05000087020000 + 03000000120200008D05000091020000 16 @@ -232,7 +232,7 @@ 0 16 - 030000001F0200008D05000087020000 + 03000000120200008D05000091020000 16 @@ -252,7 +252,7 @@ 0 16 - 03040000890000008D050000F5010000 + 030400007C0000008D050000FF010000 16 @@ -272,7 +272,7 @@ 0 16 - 97010000890000008D050000D0000000 + 970100007C0000008D050000DA000000 16 @@ -292,7 +292,7 @@ 0 16 - 030000001F0200008D05000087020000 + 03000000120200008D05000091020000 16 @@ -312,7 +312,7 @@ 0 16 - 030000001F0200008D05000087020000 + 03000000120200008D05000091020000 16 @@ -332,7 +332,7 @@ 0 16 - 030000001F0200008D05000087020000 + 03000000120200008D05000091020000 16 @@ -352,7 +352,7 @@ 0 16 - 030000001F0200008D05000087020000 + 03000000120200008D05000091020000 16 @@ -372,7 +372,7 @@ 0 16 - 030000001F0200008D05000087020000 + 03000000120200008D05000091020000 16 @@ -392,7 +392,7 @@ 0 16 - 030000001F0200008D05000087020000 + 03000000120200008D05000091020000 16 @@ -412,7 +412,7 @@ 0 16 - 030000001F0200008D05000087020000 + 03000000120200008D05000091020000 16 @@ -432,7 +432,7 @@ 0 16 - 03000000890000003D0100006A020000 + 03000000660000008A01000002030000 16 @@ -452,7 +452,7 @@ 0 16 - 03000000890000003D0100006A020000 + 03000000660000008A01000002030000 16 @@ -472,7 +472,7 @@ 0 16 - 00000000B202000080070000D7030000 + 000000003303000080070000E6030000 16 @@ -512,7 +512,7 @@ 0 16 - 03000000B50200007D070000B4030000 + 03000000360300007D070000CD030000 16 @@ -532,7 +532,7 @@ 0 16 - 97010000890000008D050000D0000000 + 970100007C0000008D050000DA000000 16 @@ -552,7 +552,7 @@ 0 16 - 97010000890000008D050000D0000000 + 970100007C0000008D050000DA000000 16 @@ -592,7 +592,7 @@ 0 16 - 03040000890000008D050000F5010000 + 030400007C0000008D050000FF010000 16 @@ -612,7 +612,7 @@ 0 16 - 030000001F0200008D05000087020000 + 03000000120200008D05000091020000 16 @@ -632,7 +632,7 @@ 0 16 - 97010000890000008D050000D0000000 + 970100007C0000008D050000DA000000 16 @@ -652,7 +652,7 @@ 0 16 - 97010000890000008D050000D0000000 + 970100007C0000008D050000DA000000 16 @@ -672,7 +672,7 @@ 0 16 - 97010000890000008D050000D0000000 + 970100007C0000008D050000DA000000 16 @@ -692,7 +692,7 @@ 0 16 - 03040000890000008D050000F5010000 + 030400007C0000008D050000FF010000 16 @@ -712,7 +712,7 @@ 0 16 - 03040000890000008D050000F5010000 + 030400007C0000008D050000FF010000 16 @@ -732,7 +732,7 @@ 0 16 - 03040000890000008D050000F5010000 + 030400007C0000008D050000FF010000 16 @@ -752,7 +752,7 @@ 0 16 - 03040000890000008D050000F5010000 + 030400007C0000008D050000FF010000 16 @@ -772,7 +772,7 @@ 0 16 - 03040000890000008D050000F5010000 + 030400007C0000008D050000FF010000 16 @@ -792,7 +792,7 @@ 0 16 - 03040000890000008D050000F5010000 + 030400007C0000008D050000FF010000 16 @@ -812,7 +812,7 @@ 0 16 - 03040000890000008D050000F5010000 + 030400007C0000008D050000FF010000 16 @@ -832,7 +832,7 @@ 0 16 - 03040000890000008D050000F5010000 + 030400007C0000008D050000FF010000 16 @@ -852,7 +852,7 @@ 0 16 - 03040000890000008D050000F5010000 + 030400007C0000008D050000FF010000 16 @@ -872,7 +872,7 @@ 0 16 - 03040000890000008D050000F5010000 + 030400007C0000008D050000FF010000 16 @@ -892,7 +892,7 @@ 0 16 - 03040000890000008D050000F5010000 + 030400007C0000008D050000FF010000 16 @@ -912,7 +912,7 @@ 0 16 - 03040000890000008D050000F5010000 + 030400007C0000008D050000FF010000 16 @@ -932,7 +932,7 @@ 0 16 - 03040000890000008D050000F5010000 + 030400007C0000008D050000FF010000 16 @@ -952,7 +952,7 @@ 0 16 - 03040000890000008D050000F5010000 + 030400007C0000008D050000FF010000 16 @@ -972,7 +972,7 @@ 0 16 - 03040000890000008D050000F5010000 + 030400007C0000008D050000FF010000 16 @@ -992,7 +992,7 @@ 0 16 - 03040000890000008D050000F5010000 + 030400007C0000008D050000FF010000 16 @@ -1012,7 +1012,7 @@ 0 16 - 03040000890000008D050000F5010000 + 030400007C0000008D050000FF010000 16 @@ -1032,7 +1032,7 @@ 0 16 - 03040000890000008D050000F5010000 + 030400007C0000008D050000FF010000 16 @@ -1052,7 +1052,7 @@ 0 16 - 03040000890000008D050000F5010000 + 030400007C0000008D050000FF010000 16 @@ -1072,7 +1072,7 @@ 0 16 - 03040000890000008D050000F5010000 + 030400007C0000008D050000FF010000 16 @@ -1092,7 +1092,7 @@ 0 16 - 03040000890000008D050000F5010000 + 030400007C0000008D050000FF010000 16 @@ -1112,7 +1112,7 @@ 0 16 - 03000000890000003D0100006A020000 + 03000000660000008A01000002030000 16 @@ -1132,7 +1132,7 @@ 0 16 - 03000000B50200007D070000B4030000 + 03000000360300007D070000CD030000 16 @@ -1152,7 +1152,7 @@ 0 16 - 03000000B50200007D070000B4030000 + 03000000360300007D070000CD030000 16 @@ -1172,7 +1172,7 @@ 0 16 - 030000001F0200008D05000087020000 + 03000000120200008D05000091020000 16 @@ -1192,7 +1192,7 @@ 0 16 - 030000001F0200008D05000087020000 + 03000000120200008D05000091020000 16 @@ -1212,7 +1212,7 @@ 0 16 - 0000000000000000B703000023000000 + 0000000000000000B70300001C000000 16 @@ -1232,7 +1232,7 @@ 0 16 - 00000000D703000080070000F4030000 + 00000000E603000080070000F9030000 16 @@ -1252,7 +1252,7 @@ 1 16 - 0000000023000000DA01000046000000 + 000000001C000000DA01000038000000 16 @@ -1272,7 +1272,7 @@ 2 16 - 00000000460000006F02000069000000 + 00000000380000006F02000054000000 16 @@ -1281,14 +1281,14 @@ 2619 - 000000000B000000000000000020000000000000FFFFFFFFFFFFFFFF94010000F300000090050000F7000000000000000100000004000000010000000000000000000000FFFFFFFF06000000CB00000057010000CC000000F08B00005A01000079070000FFFF02000B004354616262656450616E6500200000000000009401000081000000900500000F010000940100006500000090050000F30000000000000040280046060000000B446973617373656D626C7900000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFFFC030000650000000004000018020000000000000200000004000000010000000000000000000000FFFFFFFF17000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C00000180004000000000000000040000810000009005000034020000000400006500000090050000180200000000000040410046170000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFF4001000065000000440100008D0200000100000002000010040000000100000078FEFFFFED050000FFFFFFFF05000000ED0300006D000000C3000000C40000007394000001800010000001000000000000008100000040010000A90200000000000065000000400100008D0200000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73010000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7301000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657301000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273000000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000000000000FFFFFFFFFFFFFFFF00000000F701000090050000FB01000000000000010000000400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0E0000008F070000930700009407000095070000960700009007000091070000B5010000B8010000B9050000BA050000BB050000BC050000CB09000001800080000000000000000000001702000090050000C602000000000000FB01000090050000AA02000000000000404100460E0000001343616C6C20537461636B202B204C6F63616C73000000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF084D656D6F7279203100000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFFFFFFFFFF0000000001000000000000000000000001000000FFFFFFFFC8020000FB010000CC020000AA02000000000000020000000400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF000000008D02000080070000910200000100000001000010040000000100000025FDFFFF8C000000FFFFFFFF04000000C5000000C7000000B4010000779400000180008000000100000000000000AD02000080070000F3030000000000009102000080070000D70300000000000040820056040000000C4275696C64204F757470757401000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0742726F77736572000000007794000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000 + 000000000B000000000000000020000000000000FFFFFFFFFFFFFFFF94010000F300000090050000F7000000000000000100000004000000010000000000000000000000FFFFFFFF06000000CB00000057010000CC000000F08B00005A01000079070000FFFF02000B004354616262656450616E650020000000000000940100007C000000900500000A010000940100006500000090050000F30000000000000040280046060000000B446973617373656D626C7900000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFFFC030000650000000004000018020000000000000200000004000000010000000000000000000000FFFFFFFF17000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000001800040000000000000000400007C000000900500002F020000000400006500000090050000180200000000000040410046170000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFF8D0100004F000000910100001B03000001000000020000100400000001000000FBFEFFFF70060000FFFFFFFF05000000ED0300006D000000C3000000C4000000739400000180001000000100000000000000660000008D01000032030000000000004F0000008D0100001B0300000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73010000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7301000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657301000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273000000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000000000000FFFFFFFFFFFFFFFF00000000F701000090050000FB01000000000000010000000400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0E0000008F070000930700009407000095070000960700009007000091070000B5010000B8010000B9050000BA050000BB050000BC050000CB09000001800080000000000000000000001202000090050000C102000000000000FB01000090050000AA02000000000000404100460E0000001343616C6C20537461636B202B204C6F63616C73000000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF084D656D6F7279203100000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFFFFFFFFFF0000000001000000000000000000000001000000FFFFFFFFC8020000FB010000CC020000AA02000000000000020000000400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF000000001B030000800700001F0300000100000001000010040000000100000095FDFFFF21010000FFFFFFFF04000000C5000000C7000000B40100007794000001800080000001000000000000003603000080070000FD030000000000001F03000080070000E60300000000000040820056040000000C4275696C64204F757470757401000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0742726F77736572000000007794000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000 59392 File 2348 - 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000400020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000004000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000004000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000004000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE8030000000004000000000000000000000000000000000000010000000100000096000000020020500000000004646F776E9600000000000000130004646F776E18696E697469616C5F706F736974696F6E5F70726F636573730C52533438355F52585F4255461252533438355F526563656976655F4461746108686E645F696E6974176170705F73656E645F6D73675F746F5F6170707461736B0F6D6573685F737461636B5F696E69740A70726F647563745F696412676170207374617465206F757464617465640B6472697665725F696E697403626173156D6573685F696E6E65725F6D73675F68616E646C650C6C70735F6D6F64655F73657403636C6B0A6C6F675F6469726563740D55415254305F454E41424C4544124E5246585F55415254305F454E41424C454406554152544531124E5246585F55415254455F454E41424C454400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000004001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018022800000020000001500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000400160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000000180C8880000000000001700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E4C010000020001001A0000000F50726F6A6563742057696E646F7773000000000000000000000000010000000100000000000000000000000100000008002880DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002880DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002880E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002880E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000288018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000028800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002880D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002880E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65AC030000 + 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000000000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE8030000000000000000000000000000000000000000000000010000000100000096000000020020500000000004646F776E9600000000000000130004646F776E18696E697469616C5F706F736974696F6E5F70726F636573730C52533438355F52585F4255461252533438355F526563656976655F4461746108686E645F696E6974176170705F73656E645F6D73675F746F5F6170707461736B0F6D6573685F737461636B5F696E69740A70726F647563745F696412676170207374617465206F757464617465640B6472697665725F696E697403626173156D6573685F696E6E65725F6D73675F68616E646C650C6C70735F6D6F64655F73657403636C6B0A6C6F675F6469726563740D55415254305F454E41424C4544124E5246585F55415254305F454E41424C454406554152544531124E5246585F55415254455F454E41424C454400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018022800000020000001500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000000180C8880000000000001700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E4C010000020000001A0000000F50726F6A6563742057696E646F7773000000000000000000000000010000000100000000000000000000000100000008002880DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002880DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002880E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002880E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000288018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000028800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002880D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002880E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65AC030000 1423 @@ -1304,7 +1304,7 @@ Build 676 - 00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000004001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000000001E00000000000000000000000000000000010000000100000001809E8A0000000000001F0000000000000000000000000000000001000000010000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA00000000000000000000000000000000000000000000000001000000010000009600000003002050000000000757617665426F78960000000000000001000757617665426F78000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64CF010000 + 00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000000001E00000000000000000000000000000000010000000100000001809E8A0000000000001F0000000000000000000000000000000001000000010000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000004002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA00000000000000000000000000000000000000000000000001000000010000009600000003002050000000000757617665426F78960000000000000001000757617665426F78000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64CF010000 583 @@ -1320,7 +1320,7 @@ Debug 2220 - 00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000002001380D88B000000000000310000000757617463682031000000000000000000000000010000000100000000000000000000000100000000001380D98B0000000000003100000007576174636820320000000000000000000000000100000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000084D656D6F72792031000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000084D656D6F72792032000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000084D656D6F72792033000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000084D656D6F727920340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000755415254202331000000000000000000000000010000000100000000000000000000000100000000001380940700000000000033000000075541525420233200000000000000000000000001000000010000000000000000000000010000000000138095070000000000003300000007554152542023330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000000E49544D2F525441205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000003400000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380658A000000000000340000000E4C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E00000014506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000D436F646520436F76657261676500000000000000000000000001000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720000000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720000000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000138001890000000000003600000007546F6F6C626F7800000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730000000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72000000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 + 00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000002001380D88B000000000000310000000757617463682031000000000000000000000000010000000100000000000000000000000100000000001380D98B0000000000003100000007576174636820320000000000000000000000000100000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000084D656D6F72792031000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000084D656D6F72792032000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000084D656D6F72792033000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000084D656D6F727920340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000755415254202331000000000000000000000000010000000100000000000000000000000100000000001380940700000000000033000000075541525420233200000000000000000000000001000000010000000000000000000000010000000000138095070000000000003300000007554152542023330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000000E49544D2F525441205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000003400000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380658A000000000000340000000E4C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E00000014506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000D436F646520436F76657261676500000000000000000000000001000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720100000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720100000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000138001890000000000003600000007546F6F6C626F7800000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730100000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72010000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 898 @@ -1337,6 +1337,1364 @@ 1080 - + + 1 + Debug + + -1 + -1 + 1 + 0 + 0 + 0 + 32767 + 0 + 4096 + 0 + + 16 + 940100004F0000001404000082010000 + + + 16 + 94010000660000001404000099010000 + + + + 1005 + 1005 + 1 + 0 + 0 + 0 + 32767 + 0 + 4096 + 0 + + 16 + 03000000660000008D010000D4020000 + + + 16 + 70000000870000000002000017020000 + + + + 109 + 109 + 0 + 0 + 0 + 0 + 32767 + 0 + 4096 + 0 + + 16 + 03000000660000008D010000D4020000 + + + 16 + 70000000870000008C010000C4020000 + + + + 1465 + 1465 + 1 + 0 + 0 + 0 + 32767 + 0 + 4096 + 0 + + 16 + C7030000080300007D070000CD030000 + + + 16 + 70000000870000003803000016010000 + + + + 1466 + 1466 + 0 + 0 + 0 + 0 + 32767 + 0 + 4096 + 0 + + 16 + C7030000080300007D070000CD030000 + + + 16 + 70000000870000003803000016010000 + + + + 1467 + 1467 + 0 + 0 + 0 + 0 + 32767 + 0 + 4096 + 0 + + 16 + C7030000080300007D070000CD030000 + + + 16 + 70000000870000003803000016010000 + + + + 1468 + 1468 + 0 + 0 + 0 + 0 + 32767 + 0 + 4096 + 0 + + 16 + C7030000080300007D070000CD030000 + + + 16 + 70000000870000003803000016010000 + + + + 1506 + 1506 + 1 + 0 + 0 + 0 + 32767 + 0 + 16384 + 0 + + 16 + 180400006300000080070000ED020000 + + + 16 + 70000000870000000002000017020000 + + + + 1913 + 1913 + 0 + 0 + 0 + 0 + 32767 + 0 + 8192 + 0 + + 16 + 97010000660000001104000069010000 + + + 16 + B90000007C010000E703000008030000 + + + + 1935 + 1935 + 1 + 0 + 0 + 0 + 32767 + 0 + 32768 + 0 + + 16 + C7030000080300007D070000CD030000 + + + 16 + 70000000870000000002000017020000 + + + + 1936 + 1936 + 0 + 0 + 0 + 0 + 32767 + 0 + 4096 + 0 + + 16 + C7030000080300007D070000CD030000 + + + 16 + 70000000870000000002000017020000 + + + + 1937 + 1937 + 0 + 0 + 0 + 0 + 32767 + 0 + 4096 + 0 + + 16 + C7030000080300007D070000CD030000 + + + 16 + 70000000870000000002000017020000 + + + + 1939 + 1939 + 0 + 0 + 0 + 0 + 32767 + 0 + 4096 + 0 + + 16 + C7030000080300007D070000CD030000 + + + 16 + 70000000870000003803000016010000 + + + + 1940 + 1940 + 0 + 0 + 0 + 0 + 32767 + 0 + 4096 + 0 + + 16 + C7030000080300007D070000CD030000 + + + 16 + 70000000870000003803000016010000 + + + + 1941 + 1941 + 0 + 0 + 0 + 0 + 32767 + 0 + 4096 + 0 + + 16 + C7030000080300007D070000CD030000 + + + 16 + 70000000870000003803000016010000 + + + + 1942 + 1942 + 1 + 0 + 0 + 0 + 32767 + 0 + 4096 + 0 + + 16 + C7030000080300007D070000CD030000 + + + 16 + 70000000870000003803000016010000 + + + + 195 + 195 + 1 + 0 + 0 + 0 + 32767 + 0 + 4096 + 0 + + 16 + 03000000660000008D010000D4020000 + + + 16 + 70000000870000008C010000C4020000 + + + + 196 + 196 + 0 + 0 + 0 + 0 + 32767 + 0 + 4096 + 0 + + 16 + 03000000660000008D010000D4020000 + + + 16 + 70000000870000008C010000C4020000 + + + + 197 + 197 + 0 + 0 + 0 + 0 + 32767 + 0 + 32768 + 0 + + 16 + 03000000410200008D050000A0020000 + + + 16 + 70000000870000003803000016010000 + + + + 198 + 198 + 1 + 0 + 0 + 0 + 32767 + 0 + 32768 + 0 + + 16 + 00000000F1020000C0030000E6030000 + + + 16 + 70000000870000003803000016010000 + + + + 199 + 199 + 0 + 0 + 0 + 0 + 32767 + 0 + 4096 + 0 + + 16 + 03000000410200008D050000A0020000 + + + 16 + 70000000870000003803000016010000 + + + + 203 + 203 + 1 + 0 + 0 + 0 + 32767 + 0 + 8192 + 0 + + 16 + 97010000660000001104000069010000 + + + 16 + B90000007C010000E703000008030000 + + + + 204 + 204 + 0 + 0 + 0 + 0 + 32767 + 0 + 8192 + 0 + + 16 + 97010000660000001104000069010000 + + + 16 + B90000007C010000E703000008030000 + + + + 221 + 221 + 0 + 0 + 0 + 0 + 32767 + 0 + 4096 + 0 + + 16 + 00000000000000000000000000000000 + + + 16 + 0A0000000A0000006E0000006E000000 + + + + 2506 + 2506 + 0 + 0 + 0 + 0 + 32767 + 0 + 4096 + 0 + + 16 + 1B040000660000007D070000D4020000 + + + 16 + 70000000870000000002000017020000 + + + + 2507 + 2507 + 0 + 0 + 0 + 0 + 32767 + 0 + 4096 + 0 + + 16 + C7030000080300007D070000CD030000 + + + 16 + 70000000870000003803000016010000 + + + + 343 + 343 + 0 + 0 + 0 + 0 + 32767 + 0 + 8192 + 0 + + 16 + 97010000660000001104000069010000 + + + 16 + B90000007C010000E703000008030000 + + + + 346 + 346 + 0 + 0 + 0 + 0 + 32767 + 0 + 8192 + 0 + + 16 + 97010000660000001104000069010000 + + + 16 + B90000007C010000E703000008030000 + + + + 35824 + 35824 + 1 + 0 + 0 + 0 + 32767 + 0 + 8192 + 0 + + 16 + 97010000660000001104000069010000 + + + 16 + B90000007C010000E703000008030000 + + + + 35885 + 35885 + 0 + 0 + 0 + 0 + 32767 + 0 + 4096 + 0 + + 16 + 1B040000660000007D070000D4020000 + + + 16 + 70000000870000000002000017020000 + + + + 35886 + 35886 + 0 + 0 + 0 + 0 + 32767 + 0 + 4096 + 0 + + 16 + 1B040000660000007D070000D4020000 + + + 16 + 70000000870000000002000017020000 + + + + 35887 + 35887 + 0 + 0 + 0 + 0 + 32767 + 0 + 4096 + 0 + + 16 + 1B040000660000007D070000D4020000 + + + 16 + 70000000870000000002000017020000 + + + + 35888 + 35888 + 0 + 0 + 0 + 0 + 32767 + 0 + 4096 + 0 + + 16 + 1B040000660000007D070000D4020000 + + + 16 + 70000000870000000002000017020000 + + + + 35889 + 35889 + 0 + 0 + 0 + 0 + 32767 + 0 + 4096 + 0 + + 16 + 1B040000660000007D070000D4020000 + + + 16 + 70000000870000000002000017020000 + + + + 35890 + 35890 + 0 + 0 + 0 + 0 + 32767 + 0 + 4096 + 0 + + 16 + 1B040000660000007D070000D4020000 + + + 16 + 70000000870000000002000017020000 + + + + 35891 + 35891 + 0 + 0 + 0 + 0 + 32767 + 0 + 4096 + 0 + + 16 + 1B040000660000007D070000D4020000 + + + 16 + 70000000870000000002000017020000 + + + + 35892 + 35892 + 0 + 0 + 0 + 0 + 32767 + 0 + 4096 + 0 + + 16 + 1B040000660000007D070000D4020000 + + + 16 + 70000000870000000002000017020000 + + + + 35893 + 35893 + 0 + 0 + 0 + 0 + 32767 + 0 + 4096 + 0 + + 16 + 1B040000660000007D070000D4020000 + + + 16 + 70000000870000000002000017020000 + + + + 35894 + 35894 + 0 + 0 + 0 + 0 + 32767 + 0 + 4096 + 0 + + 16 + 1B040000660000007D070000D4020000 + + + 16 + 70000000870000000002000017020000 + + + + 35895 + 35895 + 0 + 0 + 0 + 0 + 32767 + 0 + 4096 + 0 + + 16 + 1B040000660000007D070000D4020000 + + + 16 + 70000000870000000002000017020000 + + + + 35896 + 35896 + 0 + 0 + 0 + 0 + 32767 + 0 + 4096 + 0 + + 16 + 1B040000660000007D070000D4020000 + + + 16 + 70000000870000000002000017020000 + + + + 35897 + 35897 + 0 + 0 + 0 + 0 + 32767 + 0 + 4096 + 0 + + 16 + 1B040000660000007D070000D4020000 + + + 16 + 70000000870000000002000017020000 + + + + 35898 + 35898 + 0 + 0 + 0 + 0 + 32767 + 0 + 4096 + 0 + + 16 + 1B040000660000007D070000D4020000 + + + 16 + 70000000870000000002000017020000 + + + + 35899 + 35899 + 0 + 0 + 0 + 0 + 32767 + 0 + 4096 + 0 + + 16 + 1B040000660000007D070000D4020000 + + + 16 + 70000000870000000002000017020000 + + + + 35900 + 35900 + 0 + 0 + 0 + 0 + 32767 + 0 + 4096 + 0 + + 16 + 1B040000660000007D070000D4020000 + + + 16 + 70000000870000000002000017020000 + + + + 35901 + 35901 + 0 + 0 + 0 + 0 + 32767 + 0 + 4096 + 0 + + 16 + 1B040000660000007D070000D4020000 + + + 16 + 70000000870000000002000017020000 + + + + 35902 + 35902 + 0 + 0 + 0 + 0 + 32767 + 0 + 4096 + 0 + + 16 + 1B040000660000007D070000D4020000 + + + 16 + 70000000870000000002000017020000 + + + + 35903 + 35903 + 0 + 0 + 0 + 0 + 32767 + 0 + 4096 + 0 + + 16 + 1B040000660000007D070000D4020000 + + + 16 + 70000000870000000002000017020000 + + + + 35904 + 35904 + 0 + 0 + 0 + 0 + 32767 + 0 + 4096 + 0 + + 16 + 1B040000660000007D070000D4020000 + + + 16 + 70000000870000000002000017020000 + + + + 35905 + 35905 + 0 + 0 + 0 + 0 + 32767 + 0 + 4096 + 0 + + 16 + 1B040000660000007D070000D4020000 + + + 16 + 70000000870000000002000017020000 + + + + 38003 + 38003 + 1 + 0 + 0 + 0 + 32767 + 0 + 4096 + 0 + + 16 + 03000000660000008D010000D4020000 + + + 16 + 70000000870000008C010000C4020000 + + + + 38007 + 38007 + 0 + 0 + 0 + 0 + 32767 + 0 + 4096 + 0 + + 16 + 03000000410200008D050000A0020000 + + + 16 + 70000000870000003803000016010000 + + + + 436 + 436 + 0 + 0 + 0 + 0 + 32767 + 0 + 4096 + 0 + + 16 + 03000000410200008D050000A0020000 + + + 16 + 70000000870000008C010000C4020000 + + + + 437 + 437 + 0 + 0 + 0 + 0 + 32767 + 0 + 4096 + 0 + + 16 + C7030000080300007D070000CD030000 + + + 16 + 70000000870000000002000017020000 + + + + 440 + 440 + 0 + 0 + 0 + 0 + 32767 + 0 + 4096 + 0 + + 16 + C7030000080300007D070000CD030000 + + + 16 + 70000000870000000002000017020000 + + + + 59392 + 59392 + 1 + 0 + 0 + 0 + 940 + 0 + 8192 + 0 + + 16 + 0000000000000000B70300001C000000 + + + 16 + 0A0000000A0000006E0000006E000000 + + + + 59393 + 0 + 1 + 0 + 0 + 0 + 32767 + 0 + 4096 + 0 + + 16 + 00000000E603000080070000F9030000 + + + 16 + 0A0000000A0000006E0000006E000000 + + + + 59399 + 59399 + 0 + 0 + 0 + 0 + 463 + 0 + 8192 + 1 + + 16 + 000000001C000000DA01000038000000 + + + 16 + 0A0000000A0000006E0000006E000000 + + + + 59400 + 59400 + 1 + 0 + 0 + 0 + 612 + 0 + 8192 + 2 + + 16 + 010000001C0000007002000038000000 + + + 16 + 0A0000000A0000007602000042000000 + + + + 2638 + 000000000B000000000000000020000001000000FFFFFFFFFFFFFFFF940100008201000014040000860100000100000001000010040000000100000026FEFFFFB900000000000000000000000000000001000000FFFFFFFF06000000CB00000057010000CC000000F08B00005A01000079070000FFFF02000B004354616262656450616E65002000000100000094010000660000001404000099010000940100004F00000014040000820100000000000040280056060000000B446973617373656D626C7901000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657201000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0300000000000000000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000001000000FFFFFFFFFFFFFFFF140400004F00000018040000ED02000001000000020000100400000001000000FEFBFFFFDF010000FFFFFFFF17000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C00000180004000000100000018040000660000008007000004030000180400004F00000080070000ED0200000000000040410056170000000753796D626F6C7301000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFF900100004F00000094010000ED020000010000000200001004000000010000000000000000000000FFFFFFFF05000000ED0300006D000000C3000000C4000000739400000180001000000100000000000000660000009001000004030000000000004F00000090010000ED0200000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73000000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7301000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657300000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273010000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000001000000FFFFFFFFFFFFFFFF00000000ED02000080070000F102000001000000010000100400000001000000A5FEFFFF3E00000000000000000000000000000001000000C6000000FFFFFFFF0E0000008F070000930700009407000095070000960700009007000091070000B5010000B8010000B9050000BA050000BB050000BC050000CB09000001800080000001000000C40300000803000080070000FD030000C4030000F102000080070000E603000000000000404100560E0000001343616C6C20537461636B202B204C6F63616C73010000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572010000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF084D656D6F7279203101000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFF090000000000000001000000000000000100000001000000FFFFFFFFC0030000F1020000C4030000E603000001000000020000100400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000000000000FFFFFFFFFFFFFFFF0000000026020000900500002A020000000000000100000004000000010000000000000000000000FFFFFFFF04000000C5000000C7000000B40100007794000001800080000000000000000000004102000090050000D0020000000000002A02000090050000B90200000000000040820046040000000C4275696C64204F757470757400000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0642726F777365000000007794000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000 + + + 59392 + File + + 2348 + 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000000000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE8030000000000000000000000000000000000000000000000010000000100000096000000020020500000000004646F776E9600000000000000130004646F776E18696E697469616C5F706F736974696F6E5F70726F636573730C52533438355F52585F4255461252533438355F526563656976655F4461746108686E645F696E6974176170705F73656E645F6D73675F746F5F6170707461736B0F6D6573685F737461636B5F696E69740A70726F647563745F696412676170207374617465206F757464617465640B6472697665725F696E697403626173156D6573685F696E6E65725F6D73675F68616E646C650C6C70735F6D6F64655F73657403636C6B0A6C6F675F6469726563740D55415254305F454E41424C4544124E5246585F55415254305F454E41424C454406554152544531124E5246585F55415254455F454E41424C454400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018022800000020001001500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000000180C8880000000000001700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E4C010000020001001A0000000F50726F6A6563742057696E646F7773000000000000000000000000010000000100000000000000000000000100000008002880DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002880DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002880E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002880E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000288018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000028800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002880D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002880E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65AC030000 + + + 1423 + 2800FFFF01001100434D4643546F6F6C426172427574746F6E00E1000000000000FFFFFFFF000100000000000000010000000000000001000000018001E1000000000000FFFFFFFF000100000000000000010000000000000001000000018003E1000000000000FFFFFFFF0001000000000000000100000000000000010000000180CD7F000000000000FFFFFFFF00010000000000000001000000000000000100000001800000000000000000FFFFFFFF000000000000000000010000000000000001000000018023E1000000000000FFFFFFFF000100000000000000010000000000000001000000018022E1000000000000FFFFFFFF000100000000000000010000000000000001000000018025E1000000000000FFFFFFFF00010000000000000001000000000000000100000001800000000000000000FFFFFFFF00000000000000000001000000000000000100000001802BE1000000000000FFFFFFFF00010000000000000001000000000000000100000001802CE1000000000000FFFFFFFF00010000000000000001000000000000000100000001800000000000000000FFFFFFFF00000000000000000001000000000000000100000001807A8A000000000000FFFFFFFF00010000000000000001000000000000000100000001807B8A000000000000FFFFFFFF00010000000000000001000000000000000100000001800000000000000000FFFFFFFF0000000000000000000100000000000000010000000180D3B0000000000000FFFFFFFF000100000000000000010000000000000001000000018015B1000000000000FFFFFFFF0001000000000000000100000000000000010000000180F4B0000000000000FFFFFFFF000100000000000000010000000000000001000000018036B1000000000000FFFFFFFF00010000000000000001000000000000000100000001800000000000000000FFFFFFFF0000000000000000000100000000000000010000000180FF88000000000000FFFFFFFF0001000000000000000100000000000000010000000180FE88000000000000FFFFFFFF00010000000000000001000000000000000100000001800B81000000000000FFFFFFFF00010000000000000001000000000000000100000001800C81000000000000FFFFFFFF00010000000000000001000000000000000100000001800000000000000000FFFFFFFF0000000000000000000100000000000000010000000180F088000000000000FFFFFFFF0001000000000000000100000000000000010000000180EE7F000000000000FFFFFFFF000100000000000000010000000000000001000000018024E1000000000000FFFFFFFF00010000000000000001000000000000000100000001800A81000000000000FFFFFFFF00010000000000000001000000000000000100000001800000000000000000FFFFFFFF00000000000000000001000000000000000100000001802280000000000000FFFFFFFF00010000000000000001000000000000000100000001800000000000000000FFFFFFFF0000000000000000000100000000000000010000000180C488000000000000FFFFFFFF0001000000000000000100000000000000010000000180C988000000000000FFFFFFFF0001000000000000000100000000000000010000000180C788000000000000FFFFFFFF0001000000000000000100000000000000010000000180C888000000000000FFFFFFFF00010000000000000001000000000000000100000001800000000000000000FFFFFFFF0000000000000000000100000000000000010000000180DD88000000000000FFFFFFFF00010000000000000001000000000000000100000001800000000000000000FFFFFFFF0000000000000000000100000000000000010000000180FB7F000000000000FFFFFFFF000100000000000000010000000000000001000000 + + + 1423 + 2800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000000004000000000000000000000000000000000100000001000000018022E100000000000005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000000000700000000000000000000000000000000010000000100000001802CE10000000000000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000000000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000000000C0000000000000000000000000000000001000000010000000180F4B00000000000000D000000000000000000000000000000000100000001000000018036B10000000000000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF880000000000000F0000000000000000000000000000000001000000010000000180FE880000000000001000000000000000000000000000000000010000000100000001800B810000000000001100000000000000000000000000000000010000000100000001800C810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F088000000000000130000000000000000000000000000000001000000010000000180EE7F00000000000014000000000000000000000000000000000100000001000000018024E10000000000001500000000000000000000000000000000010000000100000001800A810000000000001600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018022800000000000001700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000180000000000000000000000000000000001000000010000000180C988000000000000190000000000000000000000000000000001000000010000000180C7880000000000001A0000000000000000000000000000000001000000010000000180C8880000000000001B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180DD880000000000001C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001D000000000000000000000000000000000100000001000000 + + + + 59399 + Build + + 657 + 00200000000000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000000001E00000000000000000000000000000000010000000100000001809E8A0000000000001F0000000000000000000000000000000001000000010000000180D17F0000000000002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA00000000000000000000000000000000000000000000000001000000010000009600000003002050FFFFFFFF00960000000000000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000000240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64CF010000 + + + 583 + 1000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F000000000000FFFFFFFF0001000000000000000100000000000000010000000180D07F000000000000FFFFFFFF00010000000000000001000000000000000100000001803080000000000000FFFFFFFF00010000000000000001000000000000000100000001809E8A000000000000FFFFFFFF0001000000000000000100000000000000010000000180D17F000000000000FFFFFFFF00010000000000000001000000000000000100000001800000000000000000FFFFFFFF00000000000000000001000000000000000100000001804C8A000000000000FFFFFFFF00010000000000000001000000000000000100000001800000000000000000FFFFFFFF00000000000000000001000000000000000100000001806680000000000000FFFFFFFF0001000000000000000100000000000000010000000180EB88000000000000FFFFFFFF00010000000000000001000000000000000100000001800000000000000000FFFFFFFF0000000000000000000100000000000000010000000180C07F000000000000FFFFFFFF0001000000000000000100000000000000010000000180B08A000000000000FFFFFFFF0001000000000000000100000000000000010000000180A801000000000000FFFFFFFF00010000000000000001000000000000000100000001807202000000000000FFFFFFFF0001000000000000000100000000000000010000000180BE01000000000000FFFFFFFF000100000000000000010000000000000001000000 + + + 583 + 1000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F000000000000000000000000000000000000000000000001000000010000000180D07F00000000000001000000000000000000000000000000000100000001000000018030800000000000000200000000000000000000000000000000010000000100000001809E8A000000000000030000000000000000000000000000000001000000010000000180D17F0000000000000400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000000500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001806680000000000000060000000000000000000000000000000001000000010000000180EB880000000000000700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000080000000000000000000000000000000001000000010000000180B08A000000000000090000000000000000000000000000000001000000010000000180A8010000000000000A000000000000000000000000000000000100000001000000018072020000000000000B0000000000000000000000000000000001000000010000000180BE010000000000000C000000000000000000000000000000000100000001000000 + + + + 59400 + Debug + + 2220 + 00200000010000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000004002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000020001002D0000000000000000000000000000000001000000010000000180F07F0000020001002E0000000000000000000000000000000001000000010000000180E8880000020001003700000000000000000000000000000000010000000100000001803B010000020001002F0000000000000000000000000000000001000000010000000180BB8A00000200010030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000002000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000002001380D88B000000000000310000000757617463682031000000000000000000000000010000000100000000000000000000000100000000001380D98B0000000000003100000007576174636820320000000000000000000000000100000001000000000000000000000001000000000013800F01000002000100320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000084D656D6F72792031000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000084D656D6F72792032000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000084D656D6F72792033000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000084D656D6F727920340000000000000000000000000100000001000000000000000000000001000000000013801001000002000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000755415254202331000000000000000000000000010000000100000000000000000000000100000000001380940700000000000033000000075541525420233200000000000000000000000001000000010000000000000000000000010000000000138095070000000000003300000007554152542023330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000000E49544D2F525441205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000020001003400000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380658A000000000000340000000E4C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E00000014506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000D436F646520436F76657261676500000000000000000000000001000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720000000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720000000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000138001890000020000003600000007546F6F6C626F7800000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730000000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72000000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 + + + 898 + 1900FFFF01001100434D4643546F6F6C426172427574746F6ECC88000000000000FFFFFFFF00010000000000000001000000000000000100000001800000000000000000FFFFFFFF00000000000000000001000000000000000100000001801780000000000000FFFFFFFF00010000000000000001000000000000000100000001801D80000000000000FFFFFFFF00010000000000000001000000000000000100000001800000000000000000FFFFFFFF00000000000000000001000000000000000100000001801A80000000000000FFFFFFFF00010000000000000001000000000000000100000001801B80000000000000FFFFFFFF0001000000000000000100000000000000010000000180E57F000000000000FFFFFFFF00010000000000000001000000000000000100000001801C80000000000000FFFFFFFF00010000000000000001000000000000000100000001800000000000000000FFFFFFFF00000000000000000001000000000000000100000001800089000000000000FFFFFFFF00010000000000000001000000000000000100000001800000000000000000FFFFFFFF0000000000000000000100000000000000010000000180E48B000000000000FFFFFFFF0001000000000000000100000000000000010000000180F07F000000000000FFFFFFFF0001000000000000000100000000000000010000000180E888000000000000FFFFFFFF00010000000000000001000000000000000100000001803B01000000000000FFFFFFFF0001000000000000000100000000000000010000000180BB8A000000000000FFFFFFFF0001000000000000000100000000000000010000000180D88B000000000000FFFFFFFF0001000000000000000100000000000000010000000180D28B000000000000FFFFFFFF00010000000000000001000000000000000100000001809307000000000000FFFFFFFF0001000000000000000100000000000000010000000180658A000000000000FFFFFFFF0001000000000000000100000000000000010000000180C18A000000000000FFFFFFFF0001000000000000000100000000000000010000000180EE8B000000000000FFFFFFFF00010000000000000001000000000000000100000001800000000000000000FFFFFFFF00000000000000000001000000000000000100000001800189000000000000FFFFFFFF000100000000000000010000000000000001000000 + + + 898 + 1900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000000000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000000100000000000000000000000000000000010000000100000001801D800000000000000200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000000300000000000000000000000000000000010000000100000001801B80000000000000040000000000000000000000000000000001000000010000000180E57F0000000000000500000000000000000000000000000000010000000100000001801C800000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000000700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B000000000000080000000000000000000000000000000001000000010000000180F07F000000000000090000000000000000000000000000000001000000010000000180E8880000000000000A00000000000000000000000000000000010000000100000001803B010000000000000B0000000000000000000000000000000001000000010000000180BB8A0000000000000C0000000000000000000000000000000001000000010000000180D88B0000000000000D0000000000000000000000000000000001000000010000000180D28B0000000000000E000000000000000000000000000000000100000001000000018093070000000000000F0000000000000000000000000000000001000000010000000180658A000000000000100000000000000000000000000000000001000000010000000180C18A000000000000110000000000000000000000000000000001000000010000000180EE8B0000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180018900000000000013000000000000000000000000000000000100000001000000 + + + + 0 + 1920 + 1080 + + + + + + 1 + 0 + + 100 + 0 + + ../Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_uart.c + 0 + 2684 + 2694 + 1 + + 0 + + + ../Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_pwr_ex.c + 0 + 442 + 449 + 1 + + 0 + + + ..\usec\user_main.c + 27 + 29 + 36 + 1 + + 0 + + + startup_stm32f429xx.s + 0 + 149 + 183 + 1 + + 0 + + + ../Core/Src/main.c + 0 + 71 + 78 + 1 + + 0 + + + ../Drivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f429xx.h + 18 + 1112 + 1120 + 1 + + 0 + + + ..\usec\board.h + 22 + 1 + 10 + 1 + + 0 + + + ../Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_gpio.c + 0 + 405 + 412 + 1 + + 0 + + + ../Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal.c + 0 + 323 + 326 + 1 + + 0 + + + ../Core/Src/stm32f4xx_hal_msp.c + 0 + 33 + 71 + 1 + + 0 + + + ../Core/Inc/tim.h + 0 + 1 + 33 + 1 + + 0 + + + ../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_usart.h + 0 + 47 + 48 + 1 + + 0 + + + diff --git a/MDK-ARM/WaveBox.uvoptx b/MDK-ARM/WaveBox.uvoptx index 082d5cb..5ecbcda 100644 --- a/MDK-ARM/WaveBox.uvoptx +++ b/MDK-ARM/WaveBox.uvoptx @@ -121,8 +121,8 @@ - 0 - 1 + 1 + 0 1 1 1 @@ -131,23 +131,23 @@ 1 1 1 - 1 + 0 1 1 1 - 1 + 0 1 1 1 1 0 0 - 11 + 8 - + ..\debug_config.ini @@ -158,6 +158,21 @@ 0 + ARMRTXEVENTFLAGS + -L70 -Z18 -C0 -M0 -T1 + + + 0 + DLGDARM + (1010=1190,408,1600,955,0)(1007=344,569,521,834,0)(1008=577,532,943,758,0)(1009=958,226,1192,764,0) + + + 0 + ARMDBGFLAGS + -T0 + + + 0 UL2CM3 UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32F4xx_512 -FS08000000 -FL080000 -FP0($$Device:STM32F429VETx$CMSIS/Flash/STM32F4xx_512.FLM)) @@ -168,18 +183,26 @@ + + + 1 + 0 + GPIOC + 0 + + 0 0 1 - 0 + 1 0 0 0 0 - 0 + 1 0 0 0 @@ -188,10 +211,10 @@ 0 0 0 - 0 + 1 0 0 - 0 + 1 0 0 0 @@ -224,6 +247,40 @@ + app + 1 + 0 + 0 + 0 + + 2 + 2 + 1 + 0 + 0 + 0 + 0 + ..\usec\port.c + port.c + 0 + 0 + + + 2 + 3 + 1 + 0 + 0 + 0 + 0 + ..\usec\user_main.c + user_main.c + 0 + 0 + + + + ::CMSIS 0 0 @@ -238,8 +295,8 @@ 0 0 - 3 - 2 + 4 + 4 1 0 0 @@ -251,8 +308,8 @@ 0 - 3 - 3 + 4 + 5 1 0 0 @@ -264,8 +321,8 @@ 0 - 3 - 4 + 4 + 6 1 0 0 @@ -277,8 +334,8 @@ 0 - 3 - 5 + 4 + 7 1 0 0 @@ -290,8 +347,8 @@ 0 - 3 - 6 + 4 + 8 1 0 0 @@ -303,8 +360,8 @@ 0 - 3 - 7 + 4 + 9 1 0 0 @@ -316,8 +373,8 @@ 0 - 3 - 8 + 4 + 10 1 0 0 @@ -329,8 +386,8 @@ 0 - 3 - 9 + 4 + 11 1 0 0 @@ -350,8 +407,8 @@ 0 0 - 4 - 10 + 5 + 12 1 0 0 @@ -363,8 +420,8 @@ 0 - 4 - 11 + 5 + 13 1 0 0 @@ -376,8 +433,8 @@ 0 - 4 - 12 + 5 + 14 1 0 0 @@ -389,8 +446,8 @@ 0 - 4 - 13 + 5 + 15 1 0 0 @@ -402,8 +459,8 @@ 0 - 4 - 14 + 5 + 16 1 0 0 @@ -415,8 +472,8 @@ 0 - 4 - 15 + 5 + 17 1 0 0 @@ -428,8 +485,8 @@ 0 - 4 - 16 + 5 + 18 1 0 0 @@ -441,8 +498,8 @@ 0 - 4 - 17 + 5 + 19 1 0 0 @@ -454,8 +511,8 @@ 0 - 4 - 18 + 5 + 20 1 0 0 @@ -467,8 +524,8 @@ 0 - 4 - 19 + 5 + 21 1 0 0 @@ -480,8 +537,8 @@ 0 - 4 - 20 + 5 + 22 1 0 0 @@ -493,8 +550,8 @@ 0 - 4 - 21 + 5 + 23 1 0 0 @@ -506,8 +563,8 @@ 0 - 4 - 22 + 5 + 24 1 0 0 @@ -519,8 +576,8 @@ 0 - 4 - 23 + 5 + 25 1 0 0 @@ -532,8 +589,8 @@ 0 - 4 - 24 + 5 + 26 1 0 0 @@ -545,8 +602,8 @@ 0 - 4 - 25 + 5 + 27 1 0 0 @@ -558,8 +615,8 @@ 0 - 4 - 26 + 5 + 28 1 0 0 @@ -579,8 +636,8 @@ 0 0 - 5 - 27 + 6 + 29 1 0 0 diff --git a/MDK-ARM/WaveBox.uvprojx b/MDK-ARM/WaveBox.uvprojx index 2f9515e..a7204fe 100644 --- a/MDK-ARM/WaveBox.uvprojx +++ b/MDK-ARM/WaveBox.uvprojx @@ -106,7 +106,7 @@ SARMCM3.DLL - -REMAP -MPU + -REMAP DCM.DLL -pCM4 SARMCM3.DLL @@ -123,7 +123,7 @@ 16 - 0 + 1 1 1 1 @@ -135,25 +135,25 @@ 1 - 1 + 0 1 - 1 + 0 1 1 1 - 1 + 0 1 1 1 0 - 11 + 8 - + ..\debug_config.ini @@ -171,11 +171,11 @@ 0 1 1 - 4107 + 4103 1 STLink\ST-LINKIII-KEIL_SWO.dll - + "" () @@ -365,7 +365,7 @@ --diag_suppress=381 --diag_suppress=1 --diag_suppress=177 --diag_suppress=111 --diag_suppress=1295 USE_HAL_DRIVER,STM32F429xx - ../Core/Inc; ../Drivers/STM32F4xx_HAL_Driver/Inc; ../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy; ../Drivers/CMSIS/Device/ST/STM32F4xx/Include; ../Drivers/CMSIS/Include + ../Core/Inc; ../Drivers/STM32F4xx_HAL_Driver/Inc; ../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy; ../Drivers/CMSIS/Device/ST/STM32F4xx/Include; ../Drivers/CMSIS/Include @@ -416,6 +416,21 @@ + app + + + port.c + 1 + ..\usec\port.c + + + user_main.c + 1 + ..\usec\user_main.c + + + + ::CMSIS diff --git a/MDK-ARM/startup_stm32f429xx.lst b/MDK-ARM/startup_stm32f429xx.lst index a0814e9..18543fd 100644 --- a/MDK-ARM/startup_stm32f429xx.lst +++ b/MDK-ARM/startup_stm32f429xx.lst @@ -49,44 +49,44 @@ ARM Macro Assembler Page 1 30 00000000 ; Stack Size (in Bytes) <0x0-0xFFFFFFFF:8> 31 00000000 ; 32 00000000 - 33 00000000 00000400 + 33 00000000 00001000 Stack_Size - EQU 0x400 + EQU 0x1000 34 00000000 35 00000000 AREA STACK, NOINIT, READWRITE, ALIGN =3 36 00000000 Stack_Mem SPACE Stack_Size - 37 00000400 __initial_sp - 38 00000400 - 39 00000400 - 40 00000400 ; Heap Configuration - 41 00000400 ; Heap Size (in Bytes) <0x0-0xFFFFFFFF:8> - 42 00000400 ; + 37 00001000 __initial_sp + 38 00001000 + 39 00001000 + 40 00001000 ; Heap Configuration + 41 00001000 ; Heap Size (in Bytes) <0x0-0xFFFFFFFF:8> + 42 00001000 ; ARM Macro Assembler Page 2 - 43 00000400 - 44 00000400 00000200 + 43 00001000 + 44 00001000 00000000 Heap_Size - EQU 0x200 - 45 00000400 - 46 00000400 AREA HEAP, NOINIT, READWRITE, ALIGN= + EQU 0x0 + 45 00001000 + 46 00001000 AREA HEAP, NOINIT, READWRITE, ALIGN= 3 47 00000000 __heap_base 48 00000000 Heap_Mem SPACE Heap_Size - 49 00000200 __heap_limit - 50 00000200 - 51 00000200 PRESERVE8 - 52 00000200 THUMB - 53 00000200 - 54 00000200 - 55 00000200 ; Vector Table Mapped to Address 0 at Reset - 56 00000200 AREA RESET, DATA, READONLY + 49 00000000 __heap_limit + 50 00000000 + 51 00000000 PRESERVE8 + 52 00000000 THUMB + 53 00000000 + 54 00000000 + 55 00000000 ; Vector Table Mapped to Address 0 at Reset + 56 00000000 AREA RESET, DATA, READONLY 57 00000000 EXPORT __Vectors 58 00000000 EXPORT __Vectors_End 59 00000000 EXPORT __Vectors_Size @@ -902,7 +902,7 @@ Symbol: Stack_Mem Uses None Comment: Stack_Mem unused -__initial_sp 00000400 +__initial_sp 00001000 Symbol: __initial_sp Definitions @@ -942,7 +942,7 @@ Symbol: __heap_base Uses At line 428 in file startup_stm32f429xx.s Comment: __heap_base used once -__heap_limit 00000200 +__heap_limit 00000000 Symbol: __heap_limit Definitions @@ -2003,7 +2003,7 @@ Symbol: WWDG_IRQHandler ARM Macro Assembler Page 1 Alphabetic symbol ordering Absolute symbols -Heap_Size 00000200 +Heap_Size 00000000 Symbol: Heap_Size Definitions @@ -2011,7 +2011,7 @@ Symbol: Heap_Size Uses At line 48 in file startup_stm32f429xx.s Comment: Heap_Size used once -Stack_Size 00000400 +Stack_Size 00001000 Symbol: Stack_Size Definitions diff --git a/MDK-ARM/startup_stm32f429xx.s b/MDK-ARM/startup_stm32f429xx.s index 6d04068..8dbba16 100644 --- a/MDK-ARM/startup_stm32f429xx.s +++ b/MDK-ARM/startup_stm32f429xx.s @@ -30,7 +30,7 @@ ; Stack Size (in Bytes) <0x0-0xFFFFFFFF:8> ; -Stack_Size EQU 0x400 +Stack_Size EQU 0x1000 AREA STACK, NOINIT, READWRITE, ALIGN=3 Stack_Mem SPACE Stack_Size @@ -41,7 +41,7 @@ __initial_sp ; Heap Size (in Bytes) <0x0-0xFFFFFFFF:8> ; -Heap_Size EQU 0x200 +Heap_Size EQU 0x0 AREA HEAP, NOINIT, READWRITE, ALIGN=3 __heap_base diff --git a/SCommTest.exe b/SCommTest.exe new file mode 100644 index 0000000..5c360ff Binary files /dev/null and b/SCommTest.exe differ diff --git a/WaveBox.ioc b/WaveBox.ioc index ccf4136..a75a779 100644 --- a/WaveBox.ioc +++ b/WaveBox.ioc @@ -141,7 +141,7 @@ ProjectManager.DeviceId=STM32F429VETx ProjectManager.FirmwarePackage=STM32Cube FW_F4 V1.25.2 ProjectManager.FreePins=true ProjectManager.HalAssertFull=true -ProjectManager.HeapSize=0x200 +ProjectManager.HeapSize=0x0 ProjectManager.KeepUserCode=true ProjectManager.LastFirmware=true ProjectManager.LibraryCopy=0 @@ -151,7 +151,7 @@ ProjectManager.PreviousToolchain= ProjectManager.ProjectBuild=false ProjectManager.ProjectFileName=WaveBox.ioc ProjectManager.ProjectName=WaveBox -ProjectManager.StackSize=0x400 +ProjectManager.StackSize=0x1000 ProjectManager.TargetToolchain=MDK-ARM V5.27 ProjectManager.ToolChainLocation= ProjectManager.UnderRoot=false @@ -204,9 +204,9 @@ TIM3.IPParameters=OCPolarity_1,CounterMode,AutoReloadPreload,TIM_MasterSlaveMode TIM3.OCMode_PWM-PWM\ Generation1\ CH1=TIM_OCMODE_PWM1 TIM3.OCPolarity_1=TIM_OCPOLARITY_LOW TIM3.Period=0xFFFF -TIM3.Prescaler=1 +TIM3.Prescaler=65535 TIM3.TIM_MasterOutputTrigger=TIM_TRGO_RESET -TIM3.TIM_MasterSlaveMode=TIM_MASTERSLAVEMODE_ENABLE +TIM3.TIM_MasterSlaveMode=TIM_MASTERSLAVEMODE_DISABLE TIM8.Channel-Output\ Compare1\ No\ Output=TIM_CHANNEL_1 TIM8.IPParameters=Channel-Output Compare1 No Output USART1.BaudRate=9600 diff --git a/debug_config.ini b/debug_config.ini new file mode 100644 index 0000000..53df8a0 --- /dev/null +++ b/debug_config.ini @@ -0,0 +1 @@ +map 0x40000000,0x400FFFFF read write \ No newline at end of file diff --git a/usec/board.h b/usec/board.h index d35e283..9f2df3f 100644 --- a/usec/board.h +++ b/usec/board.h @@ -1,9 +1,20 @@ #pragma once #define VERSION "v1.0" -#define ORDER_UART +#define ORDER_UART #define DEBUG_UART huart2 - #define DEBUG_LIGHT_PORT GPIOA #define DEBUG_LIGHT_PIN GPIO_PIN_1 + +#define EXT_OEn_PORT GPIOC +#define EXT_OEn_PIN GPIO_PIN_0 +#define EXT_OEn_SET(value) \ + HAL_GPIO_WritePin(EXT_OEn_PORT, EXT_OEn_PIN, \ + value ? GPIO_PIN_RESET : GPIO_PIN_SET) + +#define PWM_OEn_PORT GPIOC +#define PWM_OEn_PIN GPIO_PIN_1 +#define PWM_OEn_SET(value) \ + HAL_GPIO_WritePin(PWM_OEn_PORT, PWM_OEn_PIN, \ + value ? GPIO_PIN_RESET : GPIO_PIN_SET) \ No newline at end of file diff --git a/usec/port.h b/usec/port.h index 70bc827..9a11e37 100644 --- a/usec/port.h +++ b/usec/port.h @@ -1,3 +1,3 @@ #include -uint32_t port_haspassedms(uint32_t ticket) \ No newline at end of file +uint32_t port_haspassedms(uint32_t ticket); \ No newline at end of file diff --git a/usec/user_main.c b/usec/user_main.c index 1eabba7..cb230d1 100644 --- a/usec/user_main.c +++ b/usec/user_main.c @@ -5,9 +5,10 @@ #include #include "board.h" +#include "port.h" +// #include "gpio.h" #include "main.h" -#include "port.h" #include "tim.h" #include "usart.h" // @@ -22,21 +23,40 @@ /** * @brief 底层驱动 */ +#define LOG_RELEASE(fmt, ...) printf("" fmt, ##__VA_ARGS__); +#define LOGI(fmt, ...) printf("I:" fmt, ##__VA_ARGS__); +#define LOGD(fmt, ...) printf("D:" fmt, ##__VA_ARGS__); +#define LOGE(fmt, ...) printf("E:" fmt, ##__VA_ARGS__); static uint8_t s_order_rxbuf; static uint8_t s_rxbuf[20]; static uint8_t s_rxbuf_has_received; static bool s_rxbuf_is_ready; +//连续输出PWM +static bool g_continue_output_mode; static uint32_t g_pulse_num = 0; +static bool g_internal_sync_mode; +void set_mode_in_internal_pwm_mode() { + LOG_RELEASE("内部信号同步模式\n"); + EXT_OEn_SET(true); + PWM_OEn_SET(false); + g_internal_sync_mode = true; +} +void set_mode_in_external_pwm_mode() { + EXT_OEn_SET(false); + PWM_OEn_SET(true); + LOG_RELEASE("外部信号同步模式\n"); + g_internal_sync_mode = false; +} /** * @brief 串口数据接收回调 * * @param husart */ -void HAL_USART_RxCpltCallback(USART_HandleTypeDef *husart) { - if (&huart1 == husart) { +void HAL_UART_RxCpltCallback(UART_HandleTypeDef *huart) { + if (&huart1 == huart) { /** * @brief 接收并处指令串口的数据 */ @@ -54,12 +74,12 @@ void HAL_USART_RxCpltCallback(USART_HandleTypeDef *husart) { } } - HAL_USART_Receive_IT(&huart1, &s_order_rxbuf, 1); + HAL_UART_Receive_IT(&huart1, &s_order_rxbuf, 1); } } -void HAL_USART_ErrorCallback(USART_HandleTypeDef *husart) { - if (&huart1 == husart) { - HAL_USART_Receive_IT(&huart1, &s_order_rxbuf, 1); +void HAL_UART_ErrorCallback(UART_HandleTypeDef *huart) { + if (&huart1 == huart) { + HAL_UART_Receive_IT(&huart1, &s_order_rxbuf, 1); } } void HAL_TIM_PWM_PulseFinishedCallback(TIM_HandleTypeDef *htim) { @@ -67,10 +87,11 @@ void HAL_TIM_PWM_PulseFinishedCallback(TIM_HandleTypeDef *htim) { /** * @brief 当触发完指定数量的脉冲时,停止触发 */ + if (g_continue_output_mode) return; + if (g_pulse_num == 0) { HAL_TIM_PWM_Stop_IT(&htim3, TIM_CHANNEL_1); } else { - __HAL_TIM_SET_COUNTER(&htim3, 0); g_pulse_num--; } } @@ -103,39 +124,52 @@ uint16_t get_tim_compare_value(int32_t target_pluse_width_us, * @param pluse_width * @param pluse_num */ -void trigger_pwm(int32_t freq, int32_t pluse_width, int32_t pluse_num) { - printf("I:trigger pwm freq[%d] pluse_width[%d]us pluse_num[%d]\n", freq, - pluse_width, pluse_num); +void trigger_pwm(int32_t freq, float duty, int32_t pluse_num) { +#if 1 + LOGI("I:trigger pwm freq[%d] duty[%f]us pluse_num[%d]\n", freq, duty, + pluse_num); +#endif - if (freq == 0 || pluse_width == 0 || pluse_num == 0) { - printf("D:trigger pwm fail,parameter is error\n"); + //无论怎样先停止PWM输 + + HAL_TIM_PWM_Stop_IT(&htim3, TIM_CHANNEL_1); + if (freq == 0) { + LOGE("E:trigger pwm fail,freq == 0\n"); return; } // 确定预分频参数,重载值 - float psc_x_arr = 90 * 1000 * 1000 / freq; - uint16_t psc = 0; - uint16_t arr = 65535; + float psc_x_arr = 84 * 1000 * 1000 / freq; + uint32_t psc = 0; + uint32_t arr = 65534; for (; arr > 2; arr--) { psc = psc_x_arr / arr; if (psc >= 1) { + uint32_t tmparr = psc_x_arr / psc; + if (tmparr >= 65534) continue; break; } } - if (psc == 0) return; if (arr <= 3) return; //定时器一周期的分辨率太小了 + arr = psc_x_arr / psc; + arr = arr - 1; psc = psc - 1; __HAL_TIM_SET_AUTORELOAD(&htim3, arr); __HAL_TIM_SET_PRESCALER(&htim3, psc); // 确定PWM通道占空比 - uint16_t comparevalue = 0; - comparevalue = get_tim_compare_value(pluse_width, freq, arr); + uint16_t comparevalue = duty * arr; __HAL_TIM_SET_COMPARE(&htim3, TIM_CHANNEL_1, comparevalue); - g_pulse_num = pluse_num; + if (pluse_num == 0) { + g_continue_output_mode = true; + } else { + g_pulse_num = pluse_num - 1; + g_continue_output_mode = false; + } __HAL_TIM_SET_COUNTER(&htim3, 0); + LOGI("I:trigger arr [%d] psc[%d] comparevalue[%d]\n", arr, psc, comparevalue); HAL_TIM_PWM_Start_IT(&htim3, TIM_CHANNEL_1); } @@ -164,15 +198,27 @@ void process_rxbuf() { pluse_width = atoi(pluse_width_c); pluse_num = atoi(pluse_num_c); + //使能内部,失能外部 + set_mode_in_internal_pwm_mode(); /** * @brief 触发一次pwm */ - trigger_pwm(freq, pluse_width, pluse_num); + LOG_RELEASE("触发PWM 频率:%dHZ,脉冲宽度:%dus,脉冲数量:%d\n", freq, + pluse_width, pluse_num); + + float duty = pluse_width / (1 * 1000 * 1000 / freq); + trigger_pwm(freq, duty, pluse_num); } void user_main() { - HAL_USART_Receive_IT(&huart1, &s_order_rxbuf, 1); - trigger_pwm(1000, 500 * 1000, 10); + LOG_RELEASE("同步盒子\n"); + LOG_RELEASE("网址:%s\n", "www.zwtime.com"); + LOG_RELEASE("软件版本:%s\n", VERSION); + + LOGI("I:wavebox sv:%s\n", VERSION); + + HAL_UART_Receive_IT(&huart1, &s_order_rxbuf, 1); + set_mode_in_external_pwm_mode(); while (true) { /** * @brief 处理接收到的数据 @@ -194,4 +240,4 @@ void user_main() { } /**/ } -} \ No newline at end of file +} diff --git a/脉冲发生器安装程序Ver2.EXE b/脉冲发生器安装程序Ver2.EXE new file mode 100644 index 0000000..6771cae Binary files /dev/null and b/脉冲发生器安装程序Ver2.EXE differ