diff --git a/Core/Inc/stm32f1xx_it.h b/Core/Inc/stm32f1xx_it.h
index da8c5a7..0f4c9a0 100644
--- a/Core/Inc/stm32f1xx_it.h
+++ b/Core/Inc/stm32f1xx_it.h
@@ -57,6 +57,7 @@ void PendSV_Handler(void);
void SysTick_Handler(void);
void DMA1_Channel4_IRQHandler(void);
void DMA1_Channel5_IRQHandler(void);
+void TIM1_UP_IRQHandler(void);
void TIM2_IRQHandler(void);
void USART1_IRQHandler(void);
/* USER CODE BEGIN EFP */
diff --git a/Core/Inc/tim.h b/Core/Inc/tim.h
index 23a1d2c..adb3cb4 100644
--- a/Core/Inc/tim.h
+++ b/Core/Inc/tim.h
@@ -36,6 +36,7 @@ extern "C" {
/* USER CODE END Private defines */
+void MX_TIM1_Init(void);
void MX_TIM2_Init(void);
/* USER CODE BEGIN Prototypes */
diff --git a/Core/Src/main.c b/Core/Src/main.c
index 781c45d..ad43414 100644
--- a/Core/Src/main.c
+++ b/Core/Src/main.c
@@ -100,6 +100,7 @@ int main(void)
MX_DMA_Init();
MX_TIM2_Init();
MX_USART1_UART_Init();
+ MX_TIM1_Init();
/* USER CODE BEGIN 2 */
my_mem_init(SRAMIN); // Initialize internal memory pool 1
board_init();
diff --git a/Core/Src/stm32f1xx_it.c b/Core/Src/stm32f1xx_it.c
index c46b6ba..66671fe 100644
--- a/Core/Src/stm32f1xx_it.c
+++ b/Core/Src/stm32f1xx_it.c
@@ -229,6 +229,24 @@ void DMA1_Channel5_IRQHandler(void)
/* USER CODE END DMA1_Channel5_IRQn 1 */
}
+/**
+ * @brief This function handles TIM1 update interrupt.
+ */
+void TIM1_UP_IRQHandler(void)
+{
+ /* USER CODE BEGIN TIM1_UP_IRQn 0 */
+
+ /* USER CODE END TIM1_UP_IRQn 0 */
+ /* USER CODE BEGIN TIM1_UP_IRQn 1 */
+ if (IS_TIM_IT_FLAG(TASK_TIM))
+ {
+ TIM_IRQ_HANDLER(TASK_TIM);
+ LL_IncTick();
+ FLOW_TICK_UPDATE();
+ }
+ /* USER CODE END TIM1_UP_IRQn 1 */
+}
+
/**
* @brief This function handles TIM2 global interrupt.
*/
@@ -238,12 +256,7 @@ void TIM2_IRQHandler(void)
/* USER CODE END TIM2_IRQn 0 */
/* USER CODE BEGIN TIM2_IRQn 1 */
- if (IS_TIM_IT_FLAG(TASK_TIM))
- {
- TIM_IRQ_HANDLER(TASK_TIM);
- LL_IncTick();
- FLOW_TICK_UPDATE();
- }
+
/* USER CODE END TIM2_IRQn 1 */
}
diff --git a/Core/Src/tim.c b/Core/Src/tim.c
index c568223..3a5e897 100644
--- a/Core/Src/tim.c
+++ b/Core/Src/tim.c
@@ -24,6 +24,41 @@
/* USER CODE END 0 */
+/* TIM1 init function */
+void MX_TIM1_Init(void)
+{
+
+ /* USER CODE BEGIN TIM1_Init 0 */
+
+ /* USER CODE END TIM1_Init 0 */
+
+ LL_TIM_InitTypeDef TIM_InitStruct = {0};
+
+ /* Peripheral clock enable */
+ LL_APB2_GRP1_EnableClock(LL_APB2_GRP1_PERIPH_TIM1);
+
+ /* TIM1 interrupt Init */
+ NVIC_SetPriority(TIM1_UP_IRQn, NVIC_EncodePriority(NVIC_GetPriorityGrouping(),0, 0));
+ NVIC_EnableIRQ(TIM1_UP_IRQn);
+
+ /* USER CODE BEGIN TIM1_Init 1 */
+
+ /* USER CODE END TIM1_Init 1 */
+ TIM_InitStruct.Prescaler = 7199;
+ TIM_InitStruct.CounterMode = LL_TIM_COUNTERMODE_UP;
+ TIM_InitStruct.Autoreload = 99;
+ TIM_InitStruct.ClockDivision = LL_TIM_CLOCKDIVISION_DIV1;
+ TIM_InitStruct.RepetitionCounter = 0;
+ LL_TIM_Init(TIM1, &TIM_InitStruct);
+ LL_TIM_DisableARRPreload(TIM1);
+ LL_TIM_SetClockSource(TIM1, LL_TIM_CLOCKSOURCE_INTERNAL);
+ LL_TIM_SetTriggerOutput(TIM1, LL_TIM_TRGO_RESET);
+ LL_TIM_DisableMasterSlaveMode(TIM1);
+ /* USER CODE BEGIN TIM1_Init 2 */
+
+ /* USER CODE END TIM1_Init 2 */
+
+}
/* TIM2 init function */
void MX_TIM2_Init(void)
{
diff --git a/MDK-ARM/motor.uvoptx b/MDK-ARM/motor.uvoptx
index 1316bd9..6c8ed85 100644
--- a/MDK-ARM/motor.uvoptx
+++ b/MDK-ARM/motor.uvoptx
@@ -198,6 +198,12 @@
+
+
+ System Viewer\TIM1
+ 35905
+
+
diff --git a/MDK-ARM/motor.uvprojx b/MDK-ARM/motor.uvprojx
index 10540b2..d5bc83a 100644
--- a/MDK-ARM/motor.uvprojx
+++ b/MDK-ARM/motor.uvprojx
@@ -301,7 +301,7 @@
0
0x20000000
- 0x2800
+ 0x5000
0
diff --git a/MDK-ARM/motor/motor.hex b/MDK-ARM/motor/motor.hex
index 3c71829..c18fd8c 100644
--- a/MDK-ARM/motor/motor.hex
+++ b/MDK-ARM/motor/motor.hex
@@ -1,59 +1,59 @@
:020000040800F2
-:10000000801C002005010008C10B0008B301000896
-:10001000BD0B0008710100080D0F00080000000072
-:10002000000000000000000000000000050D0008B6
-:10003000B101000800000000050C0008070D0008D1
+:10000000801C002005010008C50B0008B301000892
+:10001000C10B0008710100083D0F0008000000003E
+:10002000000000000000000000000000490D000872
+:10003000B101000800000000490C00084B0D000849
:100040001F0100081F0100081F0100081F01000810
:100050001F0100081F0100081F0100081F01000800
:100060001F0100081F0100081F0100081F010008F0
:100070001F0100081F01000891010008A1010008EC
:100080001F0100081F0100081F0100081F010008D0
:100090001F0100081F0100081F0100081F010008C0
-:1000A0001F0100081F0100081F0100081F010008B0
-:1000B000FD0D00081F0100081F0100081F010008B6
+:1000A0001F010008410E00081F0100081F01000881
+:1000B000290F00081F0100081F0100081F01000888
:1000C0001F0100081F0100081F0100081F01000890
-:1000D0001F010008FD0E00081F0100081F01000895
+:1000D0001F0100082D0F00081F0100081F01000864
:1000E0001F0100081F0100081F010008DFF810D0E1
-:1000F00000F02CF800480047F9120008AFF3008028
+:1000F00000F02CF80048004769130008AFF30080B7
:10010000801C00200648804706480047FEE7FEE7BF
:10011000FEE7FEE7FEE7FEE7FEE7FEE7FEE7FEE7B7
-:10012000F90D0008ED000008D2B201E000F8012B43
+:100120003D0E0008ED000008D2B201E000F8012BFE
:10013000491EFBD270470022F6E710B513460A4667
:1001400004461946FFF7F0FF204610BD064C074D48
:1001500006E0E06840F0010394E807009847103497
-:10016000AC42F6D3FFF7C6FF8C1E0008AC1E000899
+:10016000AC42F6D3FFF7C6FFD81D0008F81D000803
:1001700000BFFEE770B504460D4600BF2CB901F084
-:100180004FFA01E000BF00BFFCE700BF012070BDD7
-:1001900010B50248006801F0D2FA10BD64000020DA
-:1001A00010B50248006801F0CAFA10BD64000020D2
+:1001800089FA01E000BF00BFFCE700BF012070BD9D
+:1001900010B50248006801F00CFB10BD640000209F
+:1001A00010B50248006801F004FB10BD6400002097
:1001B000704700BFFEE7000008B5054989690143A3
:1001C000034A9161114689690140009100BF08BD51
:1001D0000010024008B5054989690143034A91614D
:1001E000114689690140009100BF08BD001002401E
:1001F00010B54A1E044B9A5C825822F001034A1E35
-:10020000014CA25C835010BD301E000810B54A1E80
+:10020000014CA25C835010BD7E1D000810B54A1E33
:10021000044B9A5C825842F001034A1E014CA25CD6
-:10022000835010BD301E000810B54A1E044B9A5C66
+:10022000835010BD7E1D000810B54A1E044B9A5C19
:10023000825842F002034A1E014CA25C835010BD5A
-:10024000301E000830B54B1E054CE35CC35823F448
+:100240007E1D000830B54B1E054CE35CC35823F4FB
:10025000405313434C1E024D2C5D035130BD000032
-:10026000EE1D000830B54B1E064CE35C03445B6892
+:100260003C1D000830B54B1E064CE35C03445B6844
:100270006FF30F0313434C1E024D2C5D0444636067
-:1002800030BD0000301E000830B54B1E054CE35C4D
+:1002800030BD00007E1D000830B54B1E054CE35C00
:10029000C35844F21004A34313434C1E014D2C5D7C
-:1002A000035130BDEE1D000810B54B1E024CE35C3F
-:1002B0000344DA6010BD0000301E000830B54B1E4C
+:1002A000035130BD3C1D000810B54B1E024CE35CF1
+:1002B0000344DA6010BD00007E1D000830B54B1EFF
:1002C000054CE35CC35823F0800313434C1E024DDE
-:1002D0002C5D035130BD0000EE1D000830B54B1EF3
+:1002D0002C5D035130BD00003C1D000830B54B1EA5
:1002E000054CE35CC35823F4406313434C1E024D9A
-:1002F0002C5D035130BD0000EE1D000830B54B1ED3
+:1002F0002C5D035130BD00003C1D000830B54B1E85
:10030000054CE35CC35823F0200313434C1E024DFD
-:100310002C5D035130BD0000EE1D000810B54B1ED2
-:10032000024CE35C03449A6010BD0000301E0008DC
+:100310002C5D035130BD00003C1D000810B54B1E84
+:10032000024CE35C03449A6010BD00007E1D00088F
:1003300030B54B1E054CE35CC35823F04003134318
-:100340004C1E024D2C5D035130BD0000EE1D000817
+:100340004C1E024D2C5D035130BD00003C1D0008C9
:1003500030B54B1E054CE35CC35823F44073134384
-:100360004C1E024D2C5D035130BD0000EE1D0008F7
+:100360004C1E024D2C5D035130BD00003C1D0008A9
:100370002DE9F04102460B461868C0F30F2595FAA7
:10038000A5F0B0FA80F480E00120A04028400028C9
:100390007AD0082C04D240F2011000FA04F106E0F1
@@ -81,422 +81,410 @@
:1004F0002C431C6070BD000002480068401C01498C
:1005000008607047100000204FF47A71B0FBF1F2E0
:10051000521E4FF0E0235A6100229A6105221A61AF
-:1005200000BF704710B5044600F0A2FB20602068B1
-:1005300000F06AFB6060606800F076FBA0606068B5
-:1005400000F084FBE06010BD0149086070470000C6
-:100550000000002010B5024613681C48824208D0F3
-:10056000B2F1804F05D01A48824202D01948824227
-:1005700004D123F070004C6840EA0403134882421F
-:1005800008D0B2F1804F05D01148824202D0114804
-:10059000824204D123F44070CC6840EA0403136023
-:1005A0008868D06200BF0888906200BF0748824216
-:1005B00003D10869106300BF00BF00BF506940F05D
-:1005C0000100506100BF002010BD0000002C014060
-:1005D00000040040000800400146086900F00100E6
-:1005E000704708B50168009100BF4168009100BFE5
-:1005F00008BD6FF040010160704700002DE9FF4128
-:1006000004460D4601270026204600F055F8002834
-:1006100033D1E9686868084329690843E16841F211
-:100620000C6291430843E060A868216921F44051BD
-:100630000143216100BF6869616921F44071014390
-:10064000616100BF6846FFF76DFF0E48844201D12B
-:10065000039E08E00C48844201D1029E03E00B484F
-:10066000844200D1029E46B1286830B1002731464D
-:1006700020462A6800F025F800BF384604B0BDE8DF
-:10068000F081000000380140004400400048004074
-:1006900001460868C0F34000704701460868C0F38F
-:1006A0008000704701460868C0F3C00070470146EB
-:1006B0000868C0F3801070470146C868C0F3403036
-:1006C000704770B501EBC10303EB01139400B3FB5A
-:1006D000F4F301EBC10404EB01149500B4FBF5F451
-:1006E0006425B4FBF5F404EBC40505EB0414A3EB9B
-:1006F0008403322404EB03136424B3FBF4F303F008
-:10070000F00301EBC10404EB01149500B4FBF5F414
-:100710006425B4FBF5F403EB041401EBC10303EB14
-:1007200001139500B3FBF5F301EBC10505EB0115D2
-:100730009600B5FBF6F56426B5FBF6F505EBC506A8
-:1007400006EB0515A3EB8503322505EB03136425A2
-:10075000B3FBF5F303F00F0323449BB2836070BD3A
-:1007600038B50120144949690143134A51611146C2
-:1007700049690140009100BF00BF00F0D7FB05466A
-:100780000022114600F01EFA044621460E2000F019
-:10079000D5FB0E2000F0BCFB00F0C8FB0546002294
-:1007A000114600F00FFA044621460F2000F0C6FB68
-:1007B0000F2000F0ADFB38BD0010024000B585B041
-:1007C00014216846FFF7B7FC1020FFF7F5FC202046
-:1007D000FFF7F2FC0420FFF7EFFC0820FFF7ECFC2A
-:1007E00025492648FFF765FE40F202212448FFF71D
-:1007F00060FE24492448FFF75CFE1F48009001205A
-:100800000190022002900020039069461B48FFF7E8
-:10081000AFFD1E4800900020019069461748FFF781
-:10082000A7FD1B4800900020019069461448FFF77F
-:100830009FFD40F2022000900120019002200290D2
-:100840000020039069460E48FFF792FD1148009082
-:100850000020019069460C48FFF78AFD0948009086
-:100860000120019003200290002003906946064871
-:10087000FFF77EFD05B000BD200020040010014000
-:100880000008014030003004000C0140C000C004EA
-:10089000FDFD9904FFFFCF042DE9F04186B014213E
-:1008A00001A8FFF748FC01204849C9690143474AAC
-:1008B000D1611146C9690140009100BF00BF1C21F0
-:1008C000434B1B68C3F302200F2400250346C3F1EA
-:1008D000070CBCF1040F02D94FF0040C01E0C3F186
-:1008E000070C674603F1040CBCF1070F02D24FF06E
-:1008F000000C01E0A3F1030C66464FF0010C0CFA6A
-:1009000007FCACF1010C0CEA040C0CFA06FC4FF0ED
-:10091000010808FA06F8A8F1010808EA05084CEAF7
-:10092000080200BF002904DB1007030E29484354C6
-:1009300007E01007040E26480C3001F00F031B1FC0
-:10094000C45400BF1C20002809DB00F01F02012155
-:1009500091404209920002F1E022C2F8001100BF6A
-:1009600041F61F40ADF80400002002906320039080
-:100970000020049001A94FF08040FFF7EBFD00BF7D
-:100980004FF08040006820F080004FF08041086008
-:1009900000BF0020896844F20702914301434FF0F1
-:1009A0008042916000BF00BF1146496821F070018C
-:1009B0000143516000BF00BF1046806820F08000F6
-:1009C0001146886000BF06B0BDE8F081001002400B
-:1009D0000CED00E000E400E02DE9F0418CB01C21BA
-:1009E00005A8FFF7A8FB14216846FFF7A4FB4FF406
-:1009F0008040FFF7EFFB0420FFF7ECFB6848009016
-:100A00000920019003200290002003906946654868
-:100A1000FFF7AEFC644800900420019069466148ED
-:100A2000FFF7A6FC002205216048FFF72DFC0022FD
-:100A300005215E48FFF706FC002205215B48FFF711
-:100A40005DFC002205215948FFF772FC8022052138
-:100A50005648FFF733FC002205215448FFF778FC85
-:100A6000002205215148FFF739FC102204214F488C
-:100A7000FFF70AFC002204214C48FFF7E3FB0022A9
-:100A800004214A48FFF73AFC002204214748FFF7B7
-:100A90004FFC802204214548FFF710FC002204216E
-:100AA0004248FFF755FC002204214048FFF716FC9E
-:100AB00025213F4B1B68C3F3022000242546034633
-:100AC000C3F1070CBCF1040F02D94FF0040C01E094
-:100AD000C3F1070C674603F1040CBCF1070F02D207
-:100AE0004FF0000C01E0A3F1030C66464FF0010C3F
-:100AF0000CFA07FCACF1010C0CEA040C0CFA06FC35
-:100B00004FF0010808FA06F8A8F1010808EA0508FC
-:100B10004CEA080200BF002904DB1007030E254839
-:100B2000435407E01007040E21480C3001F00F0376
-:100B30001B1FC45400BF2520002809DB00F01F0242
-:100B4000012191404209920002F1E022C2F8001115
-:100B500000BF4FF4E1300590002006900790089008
-:100B60000C20099000200A900B9005A91248FFF76D
-:100B700045FD00BF1048006920F490400E4908610F
-:100B80000846406920F02A00486100BF00BF0846BF
-:100B9000C06840F40050C86000BF0CB0BDE8F081F0
-:100BA00002000204000801400400040400000240A6
-:100BB0000CED00E000E400E00038014000BFFEE77B
-:100BC00000BFFEE7F0B503460C4603F00701C1F194
-:100BD0000700042801D9042001E0C1F107000646FE
-:100BE000081D072801D2002000E0C81E054601208C
-:100BF000B040401E2040A8400127AF407F1E174054
-:100C00003843F0BD70470000014600BF044840680B
-:100C100000F0F0000009034A125C21FA02F070476C
-:100C200000100240181E0008014600BF0548406839
-:100C300000F4E060044A02EB1020027821FA02F08E
-:100C40007047000000100240281E0008014600BF47
-:100C50000548406800F46050044A02EBD020027856
-:100C600021FA02F07047000000100240281E000820
-:100C700010B5002400BF0B48406800F00C0020B104
-:100C8000042804D0082808D103E0074C07E0064CEC
-:100C900005E000F00BF8044601E0034C00BF00BF84
-:100CA000204610BD0010024000127A0000210022F0
-:100CB00000BF1148406800F4803002461AB1B2F516
-:100CC000803F0CD101E00D490BE000BF0A484068AD
-:100CD000C0F34040401C0A4BB3FBF0F101E0074970
-:100CE00000BF00BF00BF0448406800F4701002233A
-:100CF00003EB9040484370470010024000093D005C
-:100D000000127A007047704710B502203749096811
-:100D100021F007010143354A116000BF00BF00BF49
-:100D20003248006800F007000228F8D100BF3048C0
-:100D3000006840F480302E49086000BF00BF00BF4B
-:100D40002B480068C0F340400028F8D04FF48030B2
-:100D50004FF4E011264A526822F47C1200F440332A
-:100D60000B431A43224B5A6000BF00BF184600686D
-:100D700040F080701946086000BF00BF00BF1C48EB
-:100D80000068C0F340600028F8D000201849496886
-:100D900021F0F0010143164A516000BF10151146C1
-:100DA000496821F4E0610143516000BF0020114611
-:100DB000496821F460510143516000BF022011468F
-:100DC000496821F003010143516000BF00BF00BF2B
-:100DD0000748406800F00C000828F8D10548FFF7E4
-:100DE00093FB0448FFF7B0FB10BD00000020024059
-:100DF0000010024000A24A047047000010B54FF0F6
-:100E00008040FFF7E9FB012874D100BF00BF8007D5
-:100E10000069C0F3400068B100BF4FF08040C06877
-:100E2000C0F3400030B100BF6FF0020081070861DD
-:100E300000BF00BF00BF4FF080400069C0F38000DA
-:100E400070B100BF4FF08040C068C0F3800038B17F
-:100E500000BF6FF004004FF08041086100BF00BF89
-:100E600000BF4FF080400069C0F3C00070B100BF08
-:100E70004FF08040C068C0F3C00038B100BF6FF0D1
-:100E800008004FF08041086100BF00BF00BF4FF075
-:100E900080400069C0F3001070B100BF4FF0804087
-:100EA000C068C0F3001038B100BF6FF010004FF001
-:100EB0008041086100BF00BF4FF08040FFF78CFB0E
-:100EC00001280DD100BF8007C06800F0010038B1D3
-:100ED00000BF6FF001004FF08041086100BF00BF0C
-:100EE00000BFFFF709FB00BF03480068401C024930
-:100EF000086000BF10BD00006000002010B502486F
-:100F0000006800F047FD10BD6400002000BFFEE750
-:100F1000002809DB00F01F020121914042099200E4
-:100F200002F1E022C2F80011704700000248006898
-:100F3000C0F30220704700000CED00E010B500285F
-:100F400004DB0A07130E054A135406E00A07140EC1
-:100F5000034A00F00F031B1FD45410BD00E400E04F
-:100F600018ED00E002E008C8121F08C1002AFAD1FB
-:100F700070477047002001E001C1121F002AFBD119
-:100F800070470000014601F1100000E0001D0268FA
-:100F90001AB9024A12689042F8D370472400002020
-:100FA00010B50648046803E02046FFF7EBFF04464F
-:100FB000034800688442F7D310BD000020000020E1
-:100FC0002400002010B504462146002000F084FAD9
-:100FD00010BD10B501E000F8011B131EA2F10104C1
-:100FE000A2B2F8D110BD10B501E000F8011B131E2C
-:100FF000A2F10104A2B2F8D110BD000000200B49FB
-:10100000086000BF00BF4FF08040006840F0010062
-:101010004FF08041086000BF00BF0846C06840F044
-:101020000100C86000BF00BF70470000040000203E
-:1010300010B5024800F022F910BD000004000020A5
-:1010400010B500F077FC00F073FA10BD014908609C
-:10105000704700000C00002070B5034600224FF0DE
-:10106000E02675690D4E366803FB06F44FF0E02666
-:10107000B16910E04FF0E026B06988420BD0884299
-:1010800002D20E1A324402E02E1A0E4432440146B5
-:10109000A24200D300E0EDE700BF70BD0C000020CD
-:1010A00010B500BF01220E490E48FFF70EFA00BF2F
-:1010B0000B490C48FFF705FA0B490A48FFF701FAFC
-:1010C0000420FFF7C9FF06490648FFF7F6F9042098
-:1010D000FFF7C2FF04490348FFF7EFF910BD000016
-:1010E00010001004000C01402000200410B500BFC7
-:1010F00001220E490E48FFF7E8F900BF0D490C48E0
-:10110000FFF7DBF909490A48FFF7D7F90420FFF791
-:10111000A3FF08490648FFF7D4F904490448FFF73C
-:10112000D0F90420FFF798FF10BD00001000100454
-:10113000000C01402000200410B5002408221349AF
-:101140001348FFF7C2F911491148FFF7BAF9042013
-:10115000FFF782FF0F490E48FFF7B3F90420FFF7AE
-:101160007BFF07E0601CC4B2FA2C03DDFFF7BEFF73
-:10117000002010BD05490648FFF78EF90028F1D17F
-:1011800004490348FFF799F90120F2E71000100421
-:10119000000C01402000200470B50446002500BF6B
-:1011A000012217491748FFF790F900BF1649154863
-:1011B000FFF783F900BF1FE0E00920B11049114893
-:1011C000FFF77FF903E00E490E48FFF776F9600656
-:1011D000040E0220FFF740FF0B490A48FFF771F9A0
-:1011E0000220FFF739FF08490648FFF766F9022099
-:1011F000FFF732FF681CC5B2082DDDDB70BD0000B3
-:1012000010001004000C01402000200438B50446F2
-:1012100000208DF800008DF80140FFF741FF782095
-:10122000FFF7BAFFFFF788FF9DF80000FFF7B4FF54
-:10123000FFF782FF9DF80100FFF7AEFFFFF77CFF8D
-:10124000FFF754FF38BD38B5044640208DF8000044
-:101250008DF80140FFF724FF7820FFF79DFFFFF78F
-:101260006BFF9DF80000FFF797FFFFF765FF9DF804
-:101270000100FFF791FFFFF75FFF38BD38B5044667
-:1012800000200090206810B1152826D116E000BF7C
-:101290001448154BDA68C0F30F2121EA020302EA71
-:1012A000010543EA0543104D2B6100BF00BF0F4805
-:1012B0000068606000BF1520206000BF0B496068B7
-:1012C0000968081A642801D2002038BD00BF00BF99
-:1012D000062107A000F0F8FCDAE70020206000906B
-:1012E0000320F2E7200020040010014060000020ED
-:1012F00069646C650D0A000008B5012025498969FB
-:101300000143244A9161114689690140009100BF5F
-:1013100000BF00071146C9690143D1611146C9697F
-:101320000140009100BF00BF032002461A4B19681C
-:101330004FF6FF031940194B0B4343EA0221164BAA
-:10134000196000BF00BF1648406820F0E06040F020
-:1013500000701349486000BFFFF7D6FC11480068D1
-:101360001149B0FBF1F084B22046FFF76FFEFFF7A2
-:1013700025FAFFF7F5F9FFF78FFAFFF72DFB0020AD
-:1013800000F014F8FFF75CFEFFF738FE01E0FFF70E
-:101390004FFEFCE7001002400CED00E00000FA05F3
-:1013A000000001400000002040420F0010B504463C
-:1013B0000C4951F824104A000B4951F8240000212F
-:1013C00000F09EF8094951F824200749083951F8DE
-:1013D0002400002100F094F8012103480830015551
-:1013E00010BD0000741E000854000020841E000878
-:1013F0002DE9F04704460F460025A9462348005D25
-:1014000020B9224818380168204688471FB94FF094
-:10141000FF30BDE8F0871E4850F82400B7FBF0F617
-:101420001B4850F82400B7FBF0F100FB117000B12D
-:10143000761C184850F82400451E22E0134808384E
-:1014400050F8240030F8150010B909F1010901E045
-:101450004FF00009B14513D14FF0000809E00B48E7
-:10146000083850F8240005EB080220F8126008F153
-:101470000108B045F3D3064850F824006843C8E794
-:101480006D1E002DDADA4FF0FF30C2E75C0000205D
-:101490007C1E0008741E000810B5014600230022BF
-:1014A00007E00B4850F8210030F8120000B15B1C37
-:1014B000521C084850F821009042F2D8642058434A
-:1014C000044C54F82140B0FBF4F0C0B210BD000051
-:1014D00054000020741E000870B504460E463146C4
-:1014E0002046FFF785FF0546681C08B9002070BD3F
-:1014F000024850F824002844F9E700004C0000207E
-:1015000030B5034601E003F8011B141EA2F10102ED
-:10151000F9D130BD10B504464FF48062214603482E
-:10152000FFF761FD00F05AF810BD000080140020A4
-:1015300010B5AE20FFF76AFE2020FFF767FE1020EF
-:10154000FFF764FEC820FFF761FE0020FFF75EFE94
-:101550001020FFF75BFE4020FFF758FE8120FFF7C9
-:1015600055FEFF20FFF752FEA120FFF74FFEA620F9
-:10157000FFF74CFEA820FFF749FE3F20FFF746FE8D
-:10158000A420FFF743FED320FFF740FE0020FFF723
-:101590003DFED520FFF73AFEF020FFF737FED920B9
-:1015A000FFF734FE2220FFF731FEDA20FFF72EFE90
-:1015B0001220FFF72BFEDB20FFF728FE2020FFF78D
-:1015C00025FE8D20FFF722FE1420FFF71FFEAF201F
-:1015D000FFF71CFE0020FFF79DFF10BD70B5002433
-:1015E00018E004F1B001C8B2FFF710FE0120FFF7C8
-:1015F0000DFE1020FFF70AFE002507E005EBC411E1
-:10160000064A505CFFF71FFE681CC5B2802DF5DB53
-:10161000601CC4B2082CE4DB70BD00008014002004
-:1016200000BF00BF00BF00BF00BFBFF34F8F00BFB0
-:1016300000BF00BF0948006800F4E06008490843A3
-:10164000001D0649086000BF00BF00BFBFF34F8FF9
-:1016500000BF00BF00BF00BF00BFFDE70CED00E012
-:101660000000FA0510B5044604B910BD002020851D
-:10167000A07D012808D1606A30B1218C89040A0C50
-:101680000021606AFFF7A5FC00BFEEE72DE9F05FDF
-:101690000646884615469946DDE90B7BDDF828A00D
-:1016A0000EB1012100E0002108462921FEF762FD6C
-:1016B0004420FFF787FC04460CB1012100E0002123
-:1016C00008462C21FEF756FD0120E075002020760B
-:1016D000C4F83C902584C4F840B0A786002D0CDDEA
-:1016E0002846FFF76FFCE061E16909B1012100E0E4
-:1016F000002108463E21FEF73DFD002F0CDD384657
-:10170000FFF760FC2063216B09B1012100E000219B
-:1017100008464521FEF72EFD84F8158084F82CA09C
-:1017200066602046BDE8F09F10B5044604B910BDC0
-:10173000002060852046FFF795FF00BFF7E710B552
-:1017400004460CB1012100E00021084640F2D71107
-:10175000FEF710FD012084F838002169A068FEF72B
-:1017600047FD2069082865D2DFE800F06404111EF7
-:101770002C3A485600BFA0680168C1F3400121B16E
-:10178000A0680221416000BF00BF00BF53E000BF5E
-:10179000A0680168C1F3401121B1A0682021416017
-:1017A00000BF00BF00BF46E000BFA0680168C1F3F2
-:1017B000402129B1A0684FF40071416000BF00BF13
-:1017C00000BF38E000BFA0680168C1F3403129B113
-:1017D000A0684FF40051416000BF00BF00BF2AE085
-:1017E00000BFA0680168C1F3404129B1A0684FF46F
-:1017F0000031416000BF00BF00BF1CE000BFA06817
-:101800000168C1F3405129B1A0684FF40011416053
-:1018100000BF00BF00BF0EE000BFA0680168C1F3B9
-:10182000406129B1A0684FF00071416000BF00BF66
-:1018300000BF00E000BF00BF606800BF00BF00BF86
-:1018400000F10C0252E8002F42F0400100F10C02BE
-:1018500042E80013002BF3D100BF00BF2069082825
-:1018600065D2DFE800F06404111E2C3A485600BF30
-:10187000A0680168C1F3C00121B1A06808214160DE
-:1018800000BF00BF00BF53E000BFA0680168C1F304
-:10189000C01121B1A0688021416000BF00BF00BF1E
-:1018A00046E000BFA0680168C1F3C02129B1A0686B
-:1018B0004FF40061416000BF00BF00BF38E000BFCF
-:1018C000A0680168C1F3C03129B1A0684FF400419C
-:1018D000416000BF00BF00BF2AE000BFA0680168F0
-:1018E000C1F3C04129B1A0684FF40021416000BF9D
-:1018F00000BF00BF1CE000BFA0680168C1F3C05179
-:1019000029B1A0684FF40001416000BF00BF00BFD3
-:101910000EE000BFA0680168C1F3C06129B1A068F2
-:101920004FF00061416000BF00BF00BF00E000BF9A
-:1019300000BF10BD0EB51348006808BB0020F021A1
-:101940000122114BCDE9002102900A4601210F48E6
-:10195000FFF79CFE0B4908600020096808700C48DE
-:10196000084909688860052006490968C86004209C
-:1019700004490968086100210248006800F0E2F8A3
-:101980000EBD000064000020C71C000800380140A4
-:101990000000024038B5044604B938BD6068C1682B
-:1019A000C1F34011B9B160680168C1F3401191B150
-:1019B000608D218C884202DB2046FFF7B5FE61680E
-:1019C0004A68D2B2608D411C6185E1690A540020E9
-:1019D0002076E0753FE06068C168C1F3001100291E
-:1019E00039D060680168C1F30011002933D0607DEF
-:1019F00001282BD1D4E902014A1E514B9A5C0244C2
-:101A00005268208C801A6085207DF8B9D4E90201E3
-:101A1000FEF7EEFBE06B80B1608D00280DDD608D80
-:101A2000218C884209DC628D2078E36BE16998475C
-:101A3000228C0021E069FFF7CCFA228CD4E9020164
-:101A4000FEF710FCD4E90201FEF7E0FB0020608500
-:101A50006068FEF7C6FD6068C168C1F3801151B1CE
-:101A60006068FEF724FE30B1206C08B1206C80471E
-:101A70006068FEF7BEFDA07D01285ED1012560688B
-:101A8000C168C1F3002171B16068016801F0010112
-:101A900049B1022560680168009100BF416800916A
-:101AA00000BF00BF00BF6068FEF7F2FD68B160686C
-:101AB000FEF7EEFD48B1042560680168009100BFA3
-:101AC0004168009100BF00BF00BF6068FEF7E5FD00
-:101AD00060B16068FEF7E1FD40B1606801680091A7
-:101AE00000BF4168009100BF00BF00BF6068FEF703
-:101AF000D9FD68B16068FEF7D5FD48B11025606872
-:101B00000168009100BF4168009100BF00BF00BFA5
-:101B1000012D11D0606A78B1618D491E88B2228D85
-:101B2000616A01EB82014880228D616A01F82250CE
-:101B3000218D491C218500BF00BF00BF2DE700009B
-:101B4000301E000870B504460D46607D90B9A5753D
-:101B5000606800BF00BF00BF00F10C0252E8002F18
-:101B600042F0200100F10C0242E80013002BF3D1F7
-:101B700000BF70E00020A0756068FEF732FD2169AB
-:101B8000A068FEF735FBD4E90201FEF731FB60687F
-:101B9000011D0E463246D4E90201FEF7BFFBE269A1
-:101BA000D4E90201FEF780FB228CD4E90201FEF7A2
-:101BB00059FBD4E90201FEF737FBD4E90201FEF735
-:101BC00025FB606800BF00BF00BF00F1140252E8AF
-:101BD000002F42F0400100F1140242E80013002BF4
-:101BE000F3D100BF00BF606800BF00BF00BF00F1BD
-:101BF0000C0252E8002F42F0100100F10C0242E802
-:101C00000013002BF3D100BF00BF6068011D0E461A
-:101C100032462169A068FEF781FB226B2169A0682A
-:101C2000FEF742FB2169A068FEF7FEFA606800BF7C
-:101C300000BF00BF00F1140252E8002F42F0800103
-:101C400000F1140242E80013002BF3D100BF00BFE3
-:101C5000012084F83800A07D012833D1606A68B97A
-:101C6000218C8800FFF7AEF96062616A09B1012139
-:101C700000E0002108468221FEF77CFA606800BF80
-:101C800000BF00BF00F10C0252E8002F42F4807147
-:101C900000F10C0242E80013002BF3D100BF00BF9B
+:1005200000BF704710B5044600F0C4FB206020688F
+:1005300000F08CFB6060606800F098FBA060606871
+:1005400000F0A6FBE06010BD0149086070470000A4
+:1005500000000020016821F080010160704781687F
+:1005600021F080018160704710B5024613681C4875
+:10057000824208D0B2F1804F05D01A48824202D0A0
+:100580001948824204D123F070004C6840EA040309
+:100590001348824208D0B2F1804F05D01148824200
+:1005A00002D01148824204D123F44070CC6840EA62
+:1005B000040313608868D06200BF0888906200BF9F
+:1005C0000748824203D10869106300BF00BF00BF23
+:1005D000506940F00100506100BF002010BD0000D4
+:1005E000002C01400004004000080040014608695A
+:1005F00000F001007047826844F207039A430A43FF
+:1006000082607047426822F070020A43426070477D
+:1006100008B50168009100BF4168009100BF08BDA6
+:100620006FF04001016070472DE9FF4104460D461F
+:1006300001270026204600F055F8002833D1E9684C
+:100640006868084329690843E16841F20C629143F4
+:100650000843E060A868216921F440510143216109
+:1006600000BF6869616921F440710143616100BFA5
+:100670006846FFF757FF0E48844201D1039E08E009
+:100680000C48844201D1029E03E00B48844200D111
+:10069000029E46B1286830B10027314620462A68BC
+:1006A00000F025F800BF384604B0BDE8F081000036
+:1006B00000380140004400400048004001460868FE
+:1006C000C0F34000704701460868C0F380007047DF
+:1006D00001460868C0F3C000704701460868C0F3CF
+:1006E000801070470146C868C0F34030704770B54D
+:1006F00001EBC10303EB01139400B3FBF4F301EB33
+:10070000C10404EB01149500B4FBF5F46425B4FBBB
+:10071000F5F404EBC40505EB0414A3EB84033224C5
+:1007200004EB03136424B3FBF4F303F0F00301EBD5
+:10073000C10404EB01149500B4FBF5F46425B4FB8B
+:10074000F5F403EB041401EBC10303EB0113950073
+:10075000B3FBF5F301EBC10505EB01159600B5FB05
+:10076000F6F56426B5FBF6F505EBC50606EB0515B3
+:10077000A3EB8503322505EB03136425B3FBF5F3E7
+:1007800003F00F0323449BB2836070BD38B5012092
+:10079000144949690143134A5161114649690140AD
+:1007A000009100BF00BF00F0E5FB054600221146A6
+:1007B00000F00AFA044621460E2000F0EBFB0E2062
+:1007C00000F0BEFB00F0D6FB05460022114600F00B
+:1007D000FBF9044621460F2000F0DCFB0F2000F05F
+:1007E000AFFB38BD0010024000B585B0142168464B
+:1007F000FFF7A1FC1020FFF7DFFC2020FFF7DCFC57
+:100800000420FFF7D9FC0820FFF7D6FC254926482D
+:10081000FFF74FFE40F202212448FFF74AFE244929
+:100820002448FFF746FE1F48009001200190022057
+:1008300002900020039069461B48FFF799FD1E486F
+:1008400000900020019069461748FFF791FD1B4872
+:1008500000900020019069461448FFF789FD40F29E
+:1008600002200090012001900220029000200390BD
+:1008700069460E48FFF77CFD11480090002001906A
+:1008800069460C48FFF774FD09480090012001906B
+:10089000032002900020039069460648FFF768FD98
+:1008A00005B000BD200020040010014000080140F8
+:1008B00030003004000C0140C000C004FDFD99046C
+:1008C000FFFFCF0430B587B0142102A8FFF733FC37
+:1008D0004FF400601C49896901431B4A916111462C
+:1008E00089690140019100BF00BF00F04BFB054644
+:1008F0000022114600F088F904462146192000F034
+:100900005DFB192000F029FB41F61F40ADF80800FF
+:10091000002003906320049000200590069002A917
+:100920000A48FFF721FE0948FFF714FE0021074897
+:10093000FFF761FE00210548FFF764FE0348FFF75B
+:100940000EFE07B030BD000000100240002C014038
+:1009500030B587B0142102A8FFF7EDFB01201E4936
+:10096000C96901431C4AD1611146C969014001911D
+:1009700000BF00BF00F006FB054600220F2100F07B
+:1009800043F9044621461C2000F018FB1C2000F00F
+:10099000E4FA41F61F40ADF8080000200390632000
+:1009A00004900020059002A94FF08040FFF7DCFD85
+:1009B0004FF08040FFF7CEFD00214FF08040FFF761
+:1009C0001AFE00214FF08040FFF71CFE4FF08040E0
+:1009D000FFF7C5FD07B030BD001002402DE9F04122
+:1009E0008CB01C2105A8FFF7A6FB14216846FFF771
+:1009F000A2FB4FF48040FFF7EDFB0420FFF7EAFB7A
+:100A00006848009009200190032002900020039084
+:100A100069466548FFF7ACFC6448009004200190EB
+:100A200069466148FFF7A4FC002205216048FFF7F2
+:100A30002BFC002205215E48FFF704FC0022052163
+:100A40005B48FFF75BFC002205215948FFF770FC6B
+:100A5000802205215648FFF731FC00220521544829
+:100A6000FFF776FC002205215148FFF737FC1022E2
+:100A700004214F48FFF708FC002204214C48FFF7EF
+:100A8000E1FB002204214A48FFF738FC0022042140
+:100A90004748FFF74DFC802204214548FFF70EFC34
+:100AA000002204214248FFF753FC00220421404861
+:100AB000FFF714FC25213F4B1B68C3F302200024E1
+:100AC00025460346C3F1070CBCF1040F02D94FF0D1
+:100AD000040C01E0C3F1070C674603F1040CBCF100
+:100AE000070F02D24FF0000C01E0A3F1030C6646A1
+:100AF0004FF0010C0CFA07FCACF1010C0CEA040CF1
+:100B00000CFA06FC4FF0010808FA06F8A8F10108F3
+:100B100008EA05084CEA080200BF002904DB1007B8
+:100B2000030E2548435407E01007040E21480C30FB
+:100B300001F00F031B1FC45400BF2520002809DB50
+:100B400000F01F02012191404209920002F1E022CF
+:100B5000C2F8001100BF4FF4E1300590002006906C
+:100B6000079008900C20099000200A900B9005A98E
+:100B70001248FFF759FD00BF1048006920F490406B
+:100B80000E4908610846406920F02A00486100BF0C
+:100B900000BF0846C06840F40050C86000BF0CB0F9
+:100BA000BDE8F081020002040008014004000404D2
+:100BB000000002400CED00E000E400E000380140DD
+:100BC00000BFFEE700BFFEE7F0B503460C4603F0AA
+:100BD0000701C1F10700042801D9042001E0C1F197
+:100BE00007000646081D072801D2002000E0C81EA5
+:100BF00005460120B040401E2040A8400127AF40DC
+:100C00007F1E17403843F0BDF0B503460C4603F095
+:100C10000701C1F10700042801D9042001E0C1F156
+:100C200007000646081D072801D2002000E0C81E64
+:100C300005460120B040401E2040A8400127AF409B
+:100C40007F1E17403843F0BD70470000014600BFCB
+:100C50000448406800F0F0000009034A125C21FAE1
+:100C600002F0704700100240661D0008014600BFF8
+:100C70000548406800F4E060044A02EB1020027866
+:100C800021FA02F07047000000100240761D0008B3
+:100C9000014600BF0548406800F46050044A02EB7A
+:100CA000D020027821FA02F07047000000100240C4
+:100CB000761D000810B5002400BF0B48406800F006
+:100CC0000C0020B1042804D0082808D103E0074C08
+:100CD00007E0064C05E000F00BF8044601E0034C89
+:100CE00000BF00BF204610BD0010024000127A0075
+:100CF0000021002200BF1148406800F48030024605
+:100D00001AB1B2F5803F0CD101E00D490BE000BFF4
+:100D10000A484068C0F34040401C0A4BB3FBF0F166
+:100D200001E0074900BF00BF00BF0448406800F46D
+:100D30007010022303EB90404843704700100240BC
+:100D400000093D0000127A007047704710B502207C
+:100D50003749096821F007010143354A116000BF96
+:100D600000BF00BF3248006800F007000228F8D139
+:100D700000BF3048006840F480302E49086000BF52
+:100D800000BF00BF2B480068C0F340400028F8D0E7
+:100D90004FF480304FF4E011264A526822F47C125E
+:100DA00000F440330B431A43224B5A6000BF00BF8C
+:100DB0001846006840F080701946086000BF00BF08
+:100DC00000BF1C480068C0F340600028F8D0002035
+:100DD0001849496821F0F0010143164A516000BFEB
+:100DE00010151146496821F4E0610143516000BFCC
+:100DF00000201146496821F460510143516000BF51
+:100E000002201146496821F003010143516000BFEF
+:100E100000BF00BF0748406800F00C000828F8D168
+:100E20000548FFF771FB0448FFF78EFB10BD00007B
+:100E3000002002400010024000A24A047047000057
+:100E400010B53748FFF7D2FB012868D100BF00BFBB
+:100E500033480069C0F3400060B100BF3048C0684B
+:100E6000C0F3400030B100BF6FF002002C490861B0
+:100E700000BF00BF00BF2A480069C0F3800060B116
+:100E800000BF2748C068C0F3800030B100BF6FF0DA
+:100E900004002349086100BF00BF00BF204800696B
+:100EA000C0F3C00060B100BF1D48C068C0F3C000FF
+:100EB00030B100BF6FF008001949086100BF00BFE2
+:100EC00000BF17480069C0F3001060B100BF1448AC
+:100ED000C068C0F3001030B100BF6FF010001049BF
+:100EE000086100BF00BF0E48FFF780FB01280CD14E
+:100EF00000BF0B48C06800F0010030B100BF6FF0C8
+:100F000001000749086100BF00BF00BFFFF7F4FA06
+:100F100000BF04480068401C0249086000BF10BDC3
+:100F2000002C0140600000207047000010B502480E
+:100F3000006800F069FD10BD6400002000BFFEE7FE
+:100F4000002809DB00F01F020121914042099200B4
+:100F500002F1E022C2F800117047002809DB00F01E
+:100F60001F02012191404209920002F1E022C2F8E1
+:100F70000011704702480068C0F30220704700006B
+:100F80000CED00E002480068C0F30220704700004A
+:100F90000CED00E010B5002804DB0A07130E054A2B
+:100FA000135406E00A07140E034A00F00F031B1F38
+:100FB000D45410BD00E400E018ED00E010B50028A6
+:100FC00004DB0A07130E054A135406E00A07140E41
+:100FD000034A00F00F031B1FD45410BD00E400E0CF
+:100FE00018ED00E002E008C8121F08C1002AFAD17B
+:100FF00070477047002001E001C1121F002AFBD199
+:1010000070470000014601F1100000E0001D026879
+:101010001AB9024A12689042F8D37047240000209F
+:1010200010B50648046803E02046FFF7EBFF0446CE
+:10103000034800688442F7D310BD00002000002060
+:101040002400002010B504462146002000F07EFA5E
+:1010500010BD10B501E000F8011B131EA2F1010440
+:10106000A2B2F8D110BD10B501E000F8011B131EAB
+:10107000A2F10104A2B2F8D110BD000000200A497B
+:10108000086000BF00BF0948006840F00100074940
+:10109000086000BF00BF0846C06840F00100C8609B
+:1010A00000BF00BF7047000004000020002C01407A
+:1010B00010B5024800F022F910BD00000400002025
+:1010C00010B500F071FC00F06DFA10BD0149086028
+:1010D000704700000C00002070B5034600224FF05E
+:1010E000E02675690D4E366803FB06F44FF0E026E6
+:1010F000B16910E04FF0E026B06988420BD0884219
+:1011000002D20E1A324402E02E1A0E443244014634
+:10111000A24200D300E0EDE700BF70BD0C0000204C
+:1011200010B500BF01220E490E48FFF7CEF900BFEF
+:101130000B490C48FFF7C5F90B490A48FFF7C1F9FD
+:101140000420FFF7C9FF06490648FFF7B6F9042057
+:10115000FFF7C2FF04490348FFF7AFF910BD0000D5
+:1011600010001004000C01402000200410B500BF46
+:1011700001220E490E48FFF7A8F900BF0D490C489F
+:10118000FFF79BF909490A48FFF797F90420FFF791
+:10119000A3FF08490648FFF794F904490448FFF7FC
+:1011A00090F90420FFF798FF10BD00001000100414
+:1011B000000C01402000200410B50024082213492F
+:1011C0001348FFF782F911491148FFF77AF9042013
+:1011D000FFF782FF0F490E48FFF773F90420FFF76E
+:1011E0007BFF07E0601CC4B2FA2C03DDFFF7BEFFF3
+:1011F000002010BD05490648FFF74EF90028F1D13F
+:1012000004490348FFF759F90120F2E710001004E0
+:10121000000C01402000200470B50446002500BFEA
+:10122000012217491748FFF750F900BF1649154822
+:10123000FFF743F900BF1FE0E00920B11049114852
+:10124000FFF73FF903E00E490E48FFF736F9600655
+:10125000040E0220FFF740FF0B490A48FFF731F95F
+:101260000220FFF739FF08490648FFF726F9022058
+:10127000FFF732FF681CC5B2082DDDDB70BD000032
+:1012800010001004000C01402000200438B5044672
+:1012900000208DF800008DF80140FFF741FF782015
+:1012A000FFF7BAFFFFF788FF9DF80000FFF7B4FFD4
+:1012B000FFF782FF9DF80100FFF7AEFFFFF77CFF0D
+:1012C000FFF754FF38BD38B5044640208DF80000C4
+:1012D0008DF80140FFF724FF7820FFF79DFFFFF70F
+:1012E0006BFF9DF80000FFF797FFFFF765FF9DF884
+:1012F0000100FFF791FFFFF75FFF38BD38B50146EA
+:1013000000200090086810B1152821D116E000BF18
+:10131000124B134CE068C3F30F2222EA000400EAE8
+:10132000020544EA05440E4D2C6100BF00BF0D4884
+:101330000068486000BF1520086000BF094A48687F
+:101340001268101A642801D2002038BD00BFDFE700
+:101350000020086000900320F7E700002000200430
+:10136000001001406000002008B50120264989696D
+:101370000143254A9161114689690140009100BFEE
+:1013800000BF00071146C9690143D1611146C9690F
+:101390000140009100BF00BF032002461B4B1968AB
+:1013A0004FF6FF0319401A4B0B4343EA0221174B38
+:1013B000196000BF00BF1748406820F0E06040F0AF
+:1013C00000701449486000BFFFF7C0FC1248006875
+:1013D0001249B0FBF1F084B22046FFF777FEFFF729
+:1013E00003FAFFF7D3F9FFF7B3FAFFF7F7FAFFF7BE
+:1013F00069FA002000F014F8FFF762FEFFF73EFEE6
+:1014000001E0FFF755FEFCE7001002400CED00E0A4
+:101410000000FA05000001400000002040420F00DB
+:1014200010B504460C4951F824104A000B4951F8F4
+:101430002400002100F09EF8094951F824200749B2
+:10144000083951F82400002100F094F801210348E4
+:101450000830015510BD0000C01D000854000020D8
+:10146000D01D00082DE9F04704460F460025A94687
+:101470002348005D20B92248183801682046884773
+:101480001FB94FF0FF30BDE8F0871E4850F8240028
+:10149000B7FBF0F61B4850F82400B7FBF0F100FB57
+:1014A000117000B1761C184850F82400451E22E047
+:1014B0001348083850F8240030F8150010B909F125
+:1014C000010901E04FF00009B14513D14FF00008C8
+:1014D00009E00B48083850F8240005EB080220F812
+:1014E000126008F10108B045F3D3064850F8240013
+:1014F0006843C8E76D1E002DDADA4FF0FF30C2E70F
+:101500005C000020C81D0008C01D000810B5014681
+:101510000023002207E00B4850F8210030F81200A9
+:1015200000B15B1C521C084850F821009042F2D8D0
+:1015300064205843044C54F82140B0FBF4F0C0B28E
+:1015400010BD000054000020C01D000870B5044606
+:101550000E4631462046FFF785FF0546681C08B950
+:10156000002070BD024850F824002844F9E700002C
+:101570004C00002030B5034601E003F8011B141EA7
+:10158000A2F10102F9D130BD10B504464FF48062DA
+:1015900021460348FFF767FD00F05AF810BD000030
+:1015A0008014002010B5AE20FFF770FE2020FFF75A
+:1015B0006DFE1020FFF76AFEC820FFF767FE0020CF
+:1015C000FFF764FE1020FFF761FE4020FFF75EFE8C
+:1015D0008120FFF75BFEFF20FFF758FEA120FFF7F9
+:1015E00055FEA620FFF752FEA820FFF74FFE3F2032
+:1015F000FFF74CFEA420FFF749FED320FFF746FE7D
+:101600000020FFF743FED520FFF740FEF020FFF754
+:101610003DFED920FFF73AFE2220FFF737FEDA2001
+:10162000FFF734FE1220FFF731FEDB20FFF72EFE1E
+:101630002020FFF72BFE8D20FFF728FE1420FFF758
+:1016400025FEAF20FFF722FE0020FFF79DFF10BD13
+:1016500070B5002418E004F1B001C8B2FFF716FE1F
+:101660000120FFF713FE1020FFF710FE002507E012
+:1016700005EBC411064A505CFFF725FE681CC5B295
+:10168000802DF5DB601CC4B2082CE4DB70BD0000CB
+:101690008014002000BF00BF00BF00BF00BFBFF329
+:1016A0004F8F00BF00BF00BF0948006800F4E06032
+:1016B00008490843001D0649086000BF00BF00BF7D
+:1016C000BFF34F8F00BF00BF00BF00BF00BFFDE7EB
+:1016D0000CED00E00000FA0510B5044604B910BD99
+:1016E00000202085A07D012808D1606A30B1218CBE
+:1016F00089040A0C0021606AFFF7ABFC00BFEEE72B
+:101700002DE9F05F0646884615469946DDE90B7BD4
+:10171000DDF828A00EB1012100E0002108462921B2
+:10172000FEF728FD4420FFF78DFC04460CB1012193
+:1017300000E0002108462C21FEF71CFD0120E07589
+:1017400000202076C4F83C902584C4F840B0A786D9
+:10175000002D0CDD2846FFF775FCE061E16909B159
+:10176000012100E0002108463E21FEF703FD002F85
+:101770000CDD3846FFF766FC2063216B09B10121BF
+:1017800000E0002108464521FEF7F4FC84F81580AE
+:1017900084F82CA066602046BDE8F09F10B5044692
+:1017A00004B910BD002060852046FFF795FF00BFFB
+:1017B000F7E710B504460CB1012100E0002108460E
+:1017C00040F2D711FEF7D6FC012084F838002169D9
+:1017D000A068FEF70DFD2069082865D2DFE800F05B
+:1017E0006404111E2C3A485600BFA0680168C1F37A
+:1017F000400121B1A0680221416000BF00BF00BFCD
+:1018000053E000BFA0680168C1F3401121B1A06896
+:101810002021416000BF00BF00BF46E000BFA068BC
+:101820000168C1F3402129B1A0684FF40071416003
+:1018300000BF00BF00BF38E000BFA0680168C1F36F
+:10184000403129B1A0684FF40051416000BF00BF92
+:1018500000BF2AE000BFA0680168C1F3404129B180
+:10186000A0684FF40031416000BF00BF00BF1CE022
+:1018700000BFA0680168C1F3405129B1A0684FF4CE
+:101880000011416000BF00BF00BF0EE000BFA068B4
+:101890000168C1F3406129B1A0684FF00071416057
+:1018A00000BF00BF00BF00E000BF00BF606800BF16
+:1018B00000BF00BF00F10C0252E8002F42F04001CF
+:1018C00000F10C0242E80013002BF3D100BF00BF6F
+:1018D0002069082865D2DFE800F06404111E2C3A64
+:1018E000485600BFA0680168C1F3C00121B1A068DB
+:1018F0000821416000BF00BF00BF53E000BFA068E7
+:101900000168C1F3C01121B1A0688021416000BF0E
+:1019100000BF00BF46E000BFA0680168C1F3C0215E
+:1019200029B1A0684FF40061416000BF00BF00BF53
+:1019300038E000BFA0680168C1F3C03129B1A068D8
+:101940004FF40041416000BF00BF00BF2AE000BF6C
+:10195000A0680168C1F3C04129B1A0684FF400211B
+:10196000416000BF00BF00BF1CE000BFA06801686D
+:10197000C1F3C05129B1A0684FF40001416000BF1C
+:1019800000BF00BF0EE000BFA0680168C1F3C061E6
+:1019900029B1A0684FF00061416000BF00BF00BFE7
+:1019A00000E000BF00BF10BD0EB51348006808BBC3
+:1019B0000020F0210122114BCDE9002102900A46BE
+:1019C00001210F48FFF79CFE0B49086000200968C1
+:1019D00008700C48084909688860052006490968AC
+:1019E000C8600420044909680861002102480068B1
+:1019F00000F0E2F80EBD0000640000203B1D00086E
+:101A0000003801400000024038B5044604B938BD32
+:101A10006068C168C1F34011B9B160680168C1F381
+:101A2000401191B1608D218C884202DB2046FFF786
+:101A3000B5FE61684A68D2B2608D411C6185E1697A
+:101A40000A5400202076E0753FE06068C168C1F369
+:101A50000011002939D060680168C1F30011002924
+:101A600033D0607D01282BD1D4E902014A1E514BAD
+:101A70009A5C02445268208C801A6085207DF8B9F7
+:101A8000D4E90201FEF7B4FBE06B80B1608D002861
+:101A90000DDD608D218C884209DC628D2078E36B3E
+:101AA000E1699847228C0021E069FFF7D2FA228C85
+:101AB000D4E90201FEF7D6FBD4E90201FEF7A6FB4A
+:101AC000002060856068FEF7A3FD6068C168C1F30F
+:101AD000801151B16068FEF700FE30B1206C08B192
+:101AE000206C80476068FEF79BFDA07D01285ED1D9
+:101AF00001256068C168C1F3002171B160680168A7
+:101B000001F0010149B1022560680168009100BF40
+:101B10004168009100BF00BF00BF6068FEF7CEFDC6
+:101B200068B16068FEF7CAFD48B1042560680168C5
+:101B3000009100BF4168009100BF00BF00BF606816
+:101B4000FEF7C1FD60B16068FEF7BDFD40B16068A1
+:101B50000168009100BF4168009100BF00BF00BF55
+:101B60006068FEF7B5FD68B16068FEF7B1FD48B189
+:101B7000102560680168009100BF4168009100BFB6
+:101B800000BF00BF012D11D0606A78B1618D491E80
+:101B900088B2228D616A01EB82014880228D616AE0
+:101BA00001F82250218D491C218500BF00BF00BFD4
+:101BB0002DE700007E1D000870B504460D46607DCF
+:101BC00090B9A575606800BF00BF00BF00F10C02AE
+:101BD00052E8002F42F0200100F10C0242E800130D
+:101BE000002BF3D100BF70E00020A0756068FEF705
+:101BF0000FFD2169A068FEF7FBFAD4E90201FEF7A8
+:101C0000F7FA6068011D0E463246D4E90201FEF77C
+:101C100085FBE269D4E90201FEF746FB228CD4E998
+:101C20000201FEF71FFBD4E90201FEF7FDFAD4E939
+:101C30000201FEF7EBFA606800BF00BF00BF00F1D1
+:101C4000140252E8002F42F0400100F1140242E871
+:101C50000013002BF3D100BF00BF606800BF00BFBE
+:101C600000BF00F10C0252E8002F42F0100100F119
+:101C70000C0242E80013002BF3D100BF00BF6068E4
+:101C8000011D0E4632462169A068FEF747FB226B14
+:101C90002169A068FEF708FB2169A068FEF7C4FA75
:101CA000606800BF00BF00BF00F1140252E8002FBF
-:101CB00042F0010100F1140242E80013002BF3D1BD
-:101CC00000BF00BF70BD704770B504460D462A4680
-:101CD00021460248006800F003F870BD640000204F
-:101CE0002DE9F04104460D4616460CB1012100E0F5
-:101CF00000210846C221FEF73DFA0DB1012100E0A6
-:101D000000210846C321FEF735FA002E01DD01212E
-:101D100000E000210846C421FEF72CFA002794F8C1
-:101D20002C00012831D1002084F8380029463246A1
-:101D3000206B03E011F8013B00F8013B131EA2F1F8
-:101D4000010C1FFA8CF2F5D100BF2169A068FEF7E3
-:101D50004FFA226B2169A068FEF7A6FA3246216984
-:101D6000A068FEF77FFA2169A068FEF74FFA07E046
-:101D70003846791C8FB2B0F5FA6F01DBBDE8F0810F
-:101D800094F838000028F3D02FE00027002015E059
-:101D900000272A5C61684A6000BF07E039467A1C68
-:101DA00097B2FE2901DB002700E000BF61680A68E6
-:101DB000C2F3C012002AF1D0411C88B2B042E7DB66
-:101DC00007E03846791C8FB2FE2801DB002700E0CF
-:101DD00000BF6068FEF76BFC0028F2D0206C08B1F1
-:101DE000206C80476068FEF704FC00BFC6E7081C53
-:101DF0003044586C80000000000404040000080017
-:101E00000000080000080000000800020406080A9C
-:101E10000C000102030405060000000000000000A1
-:101E20000102030406070809000000000102030480
-:101E3000081C3044586C80000000000404040000BA
-:101E40000800000008000008000000080002040666
-:101E5000080A0C000102030405065F6C6973740034
-:101E60006C69737420616C6C20636F6D6D616E645E
-:101E70000000000000020000000000000800000058
-:101E8000080000000010000000000000AC1E000868
-:101E90000000002078000000640F0008241F0008E4
-:101EA00078000020081C0000740F00080024F400D3
-:101EB0000000000000000000000000000000000022
-:101EC0000000000000000000000000000000000012
-:101ED0000000000000000000000000000000000002
-:101EE00000000000000000000000000000000000F2
-:101EF000AD13000899140008800000204000002065
-:101F000080100020420000200000000000000000BF
-:101F1000000000005A1E0008601E0008C6E533B429
-:041F2000A10F000805
+:101CB00042F0800100F1140242E80013002BF3D13E
+:101CC00000BF00BF012084F83800A07D012833D177
+:101CD000606A68B9218C8800FFF7B4F96062616AB4
+:101CE00009B1012100E0002108468221FEF742FAF5
+:101CF000606800BF00BF00BF00F10C0252E8002F77
+:101D000042F4807100F10C0242E80013002BF3D181
+:101D100000BF00BF606800BF00BF00BF00F1140239
+:101D200052E8002F42F0010100F1140242E80013D2
+:101D3000002BF3D100BF00BF70BD7047081C3044BA
+:101D4000586C80000000000404040000080000003B
+:101D5000080000080000000800020406080A0C0041
+:101D6000010203040506000000000000000001025B
+:101D70000304060708090000000001020304081C10
+:101D80003044586C80000000000404040000080087
+:101D90000000080000080000000800020406080A0D
+:101DA0000C000102030405065F6C697374006C6922
+:101DB000737420616C6C20636F6D6D616E640000E4
+:101DC0000002000000000000080000000800000001
+:101DD0000010000000000000F81D000800000020B6
+:101DE00078000000E40F0008701E00087800002052
+:101DF000081C0000F40F00080024F400000000009C
+:101E000000000000000000000000000000000000D2
+:101E100000000000000000000000000000000000C2
+:101E200000000000000000000000000000000000B2
+:101E30000000000000000000000000002114000865
+:101E40000D150008800000204000002080100020B8
+:101E50004200002000000000000000000000000020
+:101E6000A81D0008AE1D0008C6E533B42110000807
:04000005080000ED02
:00000001FF
diff --git a/User/board/board.h b/User/board/board.h
index 44d8d51..170d4c8 100644
--- a/User/board/board.h
+++ b/User/board/board.h
@@ -5,7 +5,7 @@
#define UART_RXSIZE (240u) // 接收240个字节
#define UART_TXSIZE (240u) // 发送240个字节
-#define TASK_TIM TIM2
+#define TASK_TIM TIM1
extern uart_t *uart;
diff --git a/motor.ioc b/motor.ioc
index 170710c..1348df1 100644
--- a/motor.ioc
+++ b/motor.ioc
@@ -32,15 +32,17 @@ Mcu.IP0=DMA
Mcu.IP1=NVIC
Mcu.IP2=RCC
Mcu.IP3=SYS
-Mcu.IP4=TIM2
-Mcu.IP5=USART1
-Mcu.IPNb=6
+Mcu.IP4=TIM1
+Mcu.IP5=TIM2
+Mcu.IP6=USART1
+Mcu.IPNb=7
Mcu.Name=STM32F103C(8-B)Tx
Mcu.Package=LQFP48
Mcu.Pin0=PC13-TAMPER-RTC
Mcu.Pin1=PD0-OSC_IN
Mcu.Pin10=VP_SYS_VS_Systick
-Mcu.Pin11=VP_TIM2_VS_ClockSourceINT
+Mcu.Pin11=VP_TIM1_VS_ClockSourceINT
+Mcu.Pin12=VP_TIM2_VS_ClockSourceINT
Mcu.Pin2=PD1-OSC_OUT
Mcu.Pin3=PA1
Mcu.Pin4=PB12
@@ -49,7 +51,7 @@ Mcu.Pin6=PA9
Mcu.Pin7=PA10
Mcu.Pin8=PA13
Mcu.Pin9=PA14
-Mcu.PinsNb=12
+Mcu.PinsNb=13
Mcu.ThirdParty0=RealThread.RT-Thread.3.1.5
Mcu.ThirdPartyNb=1
Mcu.UserConstants=
@@ -68,6 +70,7 @@ NVIC.PendSV_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false
NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4
NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false
NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:false\:true\:false
+NVIC.TIM1_UP_IRQn=true\:0\:0\:false\:false\:true\:true\:true\:true
NVIC.TIM2_IRQn=true\:15\:0\:true\:false\:true\:true\:true\:true
NVIC.USART1_IRQn=true\:0\:0\:false\:false\:true\:true\:true\:true
NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false
@@ -134,7 +137,7 @@ ProjectManager.ToolChainLocation=
ProjectManager.UAScriptAfterPath=
ProjectManager.UAScriptBeforePath=
ProjectManager.UnderRoot=false
-ProjectManager.functionlistsort=1-SystemClock_Config-RCC-false-LL-false,2-MX_GPIO_Init-GPIO-false-LL-true,3-MX_DMA_Init-DMA-false-LL-true,4-MX_TIM2_Init-TIM2-false-LL-true,5-MX_USART1_UART_Init-USART1-false-LL-true
+ProjectManager.functionlistsort=1-SystemClock_Config-RCC-false-LL-false,2-MX_GPIO_Init-GPIO-false-LL-true,3-MX_DMA_Init-DMA-false-LL-true,4-MX_TIM2_Init-TIM2-false-LL-true,5-MX_USART1_UART_Init-USART1-false-LL-true,6-MX_TIM1_Init-TIM1-false-LL-true
RCC.ADCFreqValue=36000000
RCC.AHBFreq_Value=72000000
RCC.APB1CLKDivider=RCC_HCLK_DIV2
@@ -164,6 +167,9 @@ RealThread.RT-Thread.3.1.5.RT_USING_COMPONENTS_INIT=1
RealThread.RT-Thread.3.1.5.RT_USING_CONSOLE=0
RealThread.RT-Thread.3.1.5.RT_USING_DEVICE=1
RealThread.RT-Thread.3.1.5_SwParameter=RTOSJjkernel\:true;RTOSJjshell\:true;RTOSJjdevice\:true;
+TIM1.IPParameters=Prescaler,Period
+TIM1.Period=99
+TIM1.Prescaler=7199
TIM2.IPParameters=Prescaler,Period
TIM2.Period=99
TIM2.Prescaler=7199
@@ -171,6 +177,8 @@ USART1.IPParameters=VirtualMode
USART1.VirtualMode=VM_ASYNC
VP_SYS_VS_Systick.Mode=SysTick
VP_SYS_VS_Systick.Signal=SYS_VS_Systick
+VP_TIM1_VS_ClockSourceINT.Mode=Internal
+VP_TIM1_VS_ClockSourceINT.Signal=TIM1_VS_ClockSourceINT
VP_TIM2_VS_ClockSourceINT.Mode=Internal
VP_TIM2_VS_ClockSourceINT.Signal=TIM2_VS_ClockSourceINT
board=custom