diff --git a/Core/Inc/main.h b/Core/Inc/main.h
index 06b3ff8..2a5632c 100644
--- a/Core/Inc/main.h
+++ b/Core/Inc/main.h
@@ -78,10 +78,21 @@ void Error_Handler(void);
/* Private defines -----------------------------------------------------------*/
#define LED_BLUE_Pin LL_GPIO_PIN_13
#define LED_BLUE_GPIO_Port GPIOC
+#define MOTOR_B_Pin LL_GPIO_PIN_15
+#define MOTOR_B_GPIO_Port GPIOC
+#define MOTOR_A_Pin LL_GPIO_PIN_0
+#define MOTOR_A_GPIO_Port GPIOA
+#define MOTOR_A_EXTI_IRQn EXTI0_IRQn
#define AIN1_Pin LL_GPIO_PIN_4
#define AIN1_GPIO_Port GPIOA
#define AIN2_Pin LL_GPIO_PIN_5
#define AIN2_GPIO_Port GPIOA
+#define KEY_ADD_Pin LL_GPIO_PIN_6
+#define KEY_ADD_GPIO_Port GPIOA
+#define KEY_SUB_Pin LL_GPIO_PIN_7
+#define KEY_SUB_GPIO_Port GPIOA
+#define KEY_S_Pin LL_GPIO_PIN_0
+#define KEY_S_GPIO_Port GPIOB
#define OLED_SDA_Pin LL_GPIO_PIN_12
#define OLED_SDA_GPIO_Port GPIOB
#define OLDE_SCK_Pin LL_GPIO_PIN_13
diff --git a/Core/Inc/stm32f1xx_it.h b/Core/Inc/stm32f1xx_it.h
index 0f4c9a0..8753d18 100644
--- a/Core/Inc/stm32f1xx_it.h
+++ b/Core/Inc/stm32f1xx_it.h
@@ -55,10 +55,11 @@ void SVC_Handler(void);
void DebugMon_Handler(void);
void PendSV_Handler(void);
void SysTick_Handler(void);
+void EXTI0_IRQHandler(void);
void DMA1_Channel4_IRQHandler(void);
void DMA1_Channel5_IRQHandler(void);
void TIM1_UP_IRQHandler(void);
-void TIM2_IRQHandler(void);
+void TIM3_IRQHandler(void);
void USART1_IRQHandler(void);
/* USER CODE BEGIN EFP */
diff --git a/Core/Inc/tim.h b/Core/Inc/tim.h
index adb3cb4..6998ec1 100644
--- a/Core/Inc/tim.h
+++ b/Core/Inc/tim.h
@@ -38,6 +38,7 @@ extern "C" {
void MX_TIM1_Init(void);
void MX_TIM2_Init(void);
+void MX_TIM3_Init(void);
/* USER CODE BEGIN Prototypes */
diff --git a/Core/Src/gpio.c b/Core/Src/gpio.c
index b70c885..7ebbef0 100644
--- a/Core/Src/gpio.c
+++ b/Core/Src/gpio.c
@@ -44,6 +44,7 @@
void MX_GPIO_Init(void)
{
+ LL_EXTI_InitTypeDef EXTI_InitStruct = {0};
LL_GPIO_InitTypeDef GPIO_InitStruct = {0};
/* GPIO Ports Clock Enable */
@@ -74,18 +75,13 @@ void MX_GPIO_Init(void)
LL_GPIO_Init(GPIOC, &GPIO_InitStruct);
/**/
- GPIO_InitStruct.Pin = LL_GPIO_PIN_15;
+ GPIO_InitStruct.Pin = MOTOR_B_Pin;
GPIO_InitStruct.Mode = LL_GPIO_MODE_FLOATING;
- LL_GPIO_Init(GPIOC, &GPIO_InitStruct);
+ LL_GPIO_Init(MOTOR_B_GPIO_Port, &GPIO_InitStruct);
/**/
- GPIO_InitStruct.Pin = LL_GPIO_PIN_0;
- GPIO_InitStruct.Mode = LL_GPIO_MODE_FLOATING;
- LL_GPIO_Init(GPIOA, &GPIO_InitStruct);
-
- /**/
- GPIO_InitStruct.Pin = LL_GPIO_PIN_2|LL_GPIO_PIN_3|LL_GPIO_PIN_6|LL_GPIO_PIN_7
- |LL_GPIO_PIN_8|LL_GPIO_PIN_11|LL_GPIO_PIN_12|LL_GPIO_PIN_15;
+ GPIO_InitStruct.Pin = LL_GPIO_PIN_2|LL_GPIO_PIN_3|LL_GPIO_PIN_8|LL_GPIO_PIN_11
+ |LL_GPIO_PIN_12|LL_GPIO_PIN_15;
GPIO_InitStruct.Mode = LL_GPIO_MODE_ANALOG;
LL_GPIO_Init(GPIOA, &GPIO_InitStruct);
@@ -98,10 +94,22 @@ void MX_GPIO_Init(void)
LL_GPIO_Init(GPIOA, &GPIO_InitStruct);
/**/
- GPIO_InitStruct.Pin = LL_GPIO_PIN_0|LL_GPIO_PIN_1|LL_GPIO_PIN_2|LL_GPIO_PIN_10
- |LL_GPIO_PIN_11|LL_GPIO_PIN_14|LL_GPIO_PIN_15|LL_GPIO_PIN_3
- |LL_GPIO_PIN_4|LL_GPIO_PIN_5|LL_GPIO_PIN_6|LL_GPIO_PIN_7
- |LL_GPIO_PIN_8|LL_GPIO_PIN_9;
+ GPIO_InitStruct.Pin = KEY_ADD_Pin|KEY_SUB_Pin;
+ GPIO_InitStruct.Mode = LL_GPIO_MODE_INPUT;
+ GPIO_InitStruct.Pull = LL_GPIO_PULL_DOWN;
+ LL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+
+ /**/
+ GPIO_InitStruct.Pin = KEY_S_Pin;
+ GPIO_InitStruct.Mode = LL_GPIO_MODE_INPUT;
+ GPIO_InitStruct.Pull = LL_GPIO_PULL_DOWN;
+ LL_GPIO_Init(KEY_S_GPIO_Port, &GPIO_InitStruct);
+
+ /**/
+ GPIO_InitStruct.Pin = LL_GPIO_PIN_1|LL_GPIO_PIN_2|LL_GPIO_PIN_10|LL_GPIO_PIN_11
+ |LL_GPIO_PIN_14|LL_GPIO_PIN_15|LL_GPIO_PIN_3|LL_GPIO_PIN_4
+ |LL_GPIO_PIN_5|LL_GPIO_PIN_6|LL_GPIO_PIN_7|LL_GPIO_PIN_8
+ |LL_GPIO_PIN_9;
GPIO_InitStruct.Mode = LL_GPIO_MODE_ANALOG;
LL_GPIO_Init(GPIOB, &GPIO_InitStruct);
@@ -112,6 +120,23 @@ void MX_GPIO_Init(void)
GPIO_InitStruct.OutputType = LL_GPIO_OUTPUT_PUSHPULL;
LL_GPIO_Init(GPIOB, &GPIO_InitStruct);
+ /**/
+ LL_GPIO_AF_SetEXTISource(LL_GPIO_AF_EXTI_PORTA, LL_GPIO_AF_EXTI_LINE0);
+
+ /**/
+ EXTI_InitStruct.Line_0_31 = LL_EXTI_LINE_0;
+ EXTI_InitStruct.LineCommand = ENABLE;
+ EXTI_InitStruct.Mode = LL_EXTI_MODE_IT;
+ EXTI_InitStruct.Trigger = LL_EXTI_TRIGGER_RISING;
+ LL_EXTI_Init(&EXTI_InitStruct);
+
+ /**/
+ LL_GPIO_SetPinMode(MOTOR_A_GPIO_Port, MOTOR_A_Pin, LL_GPIO_MODE_FLOATING);
+
+ /* EXTI interrupt init*/
+ NVIC_SetPriority(EXTI0_IRQn, NVIC_EncodePriority(NVIC_GetPriorityGrouping(),0, 0));
+ NVIC_EnableIRQ(EXTI0_IRQn);
+
}
/* USER CODE BEGIN 2 */
diff --git a/Core/Src/main.c b/Core/Src/main.c
index ad43414..7198ed5 100644
--- a/Core/Src/main.c
+++ b/Core/Src/main.c
@@ -101,6 +101,7 @@ int main(void)
MX_TIM2_Init();
MX_USART1_UART_Init();
MX_TIM1_Init();
+ MX_TIM3_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 237d314..f28fd06 100644
--- a/Core/Src/stm32f1xx_it.c
+++ b/Core/Src/stm32f1xx_it.c
@@ -25,6 +25,8 @@
#include "sys.h"
#include "flow.h"
#include "board.h"
+#include "btn.h"
+#include "work.h"
/* USER CODE END Includes */
/* Private typedef -----------------------------------------------------------*/
@@ -67,8 +69,8 @@
/* Cortex-M3 Processor Interruption and Exception Handlers */
/******************************************************************************/
/**
- * @brief This function handles Non maskable interrupt.
- */
+ * @brief This function handles Non maskable interrupt.
+ */
void NMI_Handler(void)
{
/* USER CODE BEGIN NonMaskableInt_IRQn 0 */
@@ -82,8 +84,8 @@ void NMI_Handler(void)
}
/**
- * @brief This function handles Hard fault interrupt.
- */
+ * @brief This function handles Hard fault interrupt.
+ */
void HardFault_Handler(void)
{
/* USER CODE BEGIN HardFault_IRQn 0 */
@@ -97,8 +99,8 @@ void HardFault_Handler(void)
}
/**
- * @brief This function handles Memory management fault.
- */
+ * @brief This function handles Memory management fault.
+ */
void MemManage_Handler(void)
{
/* USER CODE BEGIN MemoryManagement_IRQn 0 */
@@ -112,8 +114,8 @@ void MemManage_Handler(void)
}
/**
- * @brief This function handles Prefetch fault, memory access fault.
- */
+ * @brief This function handles Prefetch fault, memory access fault.
+ */
void BusFault_Handler(void)
{
/* USER CODE BEGIN BusFault_IRQn 0 */
@@ -127,8 +129,8 @@ void BusFault_Handler(void)
}
/**
- * @brief This function handles Undefined instruction or illegal state.
- */
+ * @brief This function handles Undefined instruction or illegal state.
+ */
void UsageFault_Handler(void)
{
/* USER CODE BEGIN UsageFault_IRQn 0 */
@@ -142,8 +144,8 @@ void UsageFault_Handler(void)
}
/**
- * @brief This function handles System service call via SWI instruction.
- */
+ * @brief This function handles System service call via SWI instruction.
+ */
void SVC_Handler(void)
{
/* USER CODE BEGIN SVCall_IRQn 0 */
@@ -155,8 +157,8 @@ void SVC_Handler(void)
}
/**
- * @brief This function handles Debug monitor.
- */
+ * @brief This function handles Debug monitor.
+ */
void DebugMon_Handler(void)
{
/* USER CODE BEGIN DebugMonitor_IRQn 0 */
@@ -168,8 +170,8 @@ void DebugMon_Handler(void)
}
/**
- * @brief This function handles Pendable request for system service.
- */
+ * @brief This function handles Pendable request for system service.
+ */
void PendSV_Handler(void)
{
/* USER CODE BEGIN PendSV_IRQn 0 */
@@ -181,8 +183,8 @@ void PendSV_Handler(void)
}
/**
- * @brief This function handles System tick timer.
- */
+ * @brief This function handles System tick timer.
+ */
void SysTick_Handler(void)
{
/* USER CODE BEGIN SysTick_IRQn 0 */
@@ -202,8 +204,28 @@ void SysTick_Handler(void)
/******************************************************************************/
/**
- * @brief This function handles DMA1 channel4 global interrupt.
- */
+ * @brief This function handles EXTI line0 interrupt.
+ */
+void EXTI0_IRQHandler(void)
+{
+ /* USER CODE BEGIN EXTI0_IRQn 0 */
+
+ /* USER CODE END EXTI0_IRQn 0 */
+ if (LL_EXTI_IsActiveFlag_0_31(LL_EXTI_LINE_0) != RESET)
+ {
+ LL_EXTI_ClearFlag_0_31(LL_EXTI_LINE_0);
+ /* USER CODE BEGIN LL_EXTI_LINE_0 */
+ work_encoder_exti();
+ /* USER CODE END LL_EXTI_LINE_0 */
+ }
+ /* USER CODE BEGIN EXTI0_IRQn 1 */
+
+ /* USER CODE END EXTI0_IRQn 1 */
+}
+
+/**
+ * @brief This function handles DMA1 channel4 global interrupt.
+ */
void DMA1_Channel4_IRQHandler(void)
{
/* USER CODE BEGIN DMA1_Channel4_IRQn 0 */
@@ -216,8 +238,8 @@ void DMA1_Channel4_IRQHandler(void)
}
/**
- * @brief This function handles DMA1 channel5 global interrupt.
- */
+ * @brief This function handles DMA1 channel5 global interrupt.
+ */
void DMA1_Channel5_IRQHandler(void)
{
/* USER CODE BEGIN DMA1_Channel5_IRQn 0 */
@@ -230,8 +252,8 @@ void DMA1_Channel5_IRQHandler(void)
}
/**
- * @brief This function handles TIM1 update interrupt.
- */
+ * @brief This function handles TIM1 update interrupt.
+ */
void TIM1_UP_IRQHandler(void)
{
/* USER CODE BEGIN TIM1_UP_IRQn 0 */
@@ -242,31 +264,32 @@ void TIM1_UP_IRQHandler(void)
{
TIM_IRQ_HANDLER(TASK_TIM);
LL_IncTick();
+ button_ticks();
FLOW_TICK_UPDATE();
}
/* USER CODE END TIM1_UP_IRQn 1 */
}
/**
- * @brief This function handles TIM2 global interrupt.
- */
-void TIM2_IRQHandler(void)
+ * @brief This function handles TIM3 global interrupt.
+ */
+void TIM3_IRQHandler(void)
{
- /* USER CODE BEGIN TIM2_IRQn 0 */
+ /* USER CODE BEGIN TIM3_IRQn 0 */
- /* USER CODE END TIM2_IRQn 0 */
- /* USER CODE BEGIN TIM2_IRQn 1 */
- if (IS_TIM_IT_FLAG(PWM_TIM))
+ /* USER CODE END TIM3_IRQn 0 */
+ /* USER CODE BEGIN TIM3_IRQn 1 */
+ if (IS_TIM_IT_FLAG(WORK_TIM))
{
- TIM_IRQ_HANDLER(PWM_TIM);
- // GPIO_TOGGLE(PWM_GPIO_Port, PWM_Pin);
+ TIM_IRQ_HANDLER(WORK_TIM);
+ work_process();
}
- /* USER CODE END TIM2_IRQn 1 */
+ /* USER CODE END TIM3_IRQn 1 */
}
/**
- * @brief This function handles USART1 global interrupt.
- */
+ * @brief This function handles USART1 global interrupt.
+ */
void USART1_IRQHandler(void)
{
/* USER CODE BEGIN USART1_IRQn 0 */
diff --git a/Core/Src/tim.c b/Core/Src/tim.c
index 3044bb4..ae928c8 100644
--- a/Core/Src/tim.c
+++ b/Core/Src/tim.c
@@ -38,7 +38,7 @@ void MX_TIM1_Init(void)
LL_APB2_GRP1_EnableClock(LL_APB2_GRP1_PERIPH_TIM1);
/* TIM1 interrupt Init */
- NVIC_SetPriority(TIM1_UP_IRQn, NVIC_EncodePriority(NVIC_GetPriorityGrouping(),0, 0));
+ NVIC_SetPriority(TIM1_UP_IRQn, NVIC_EncodePriority(NVIC_GetPriorityGrouping(),3, 0));
NVIC_EnableIRQ(TIM1_UP_IRQn);
/* USER CODE BEGIN TIM1_Init 1 */
@@ -74,10 +74,6 @@ void MX_TIM2_Init(void)
/* Peripheral clock enable */
LL_APB1_GRP1_EnableClock(LL_APB1_GRP1_PERIPH_TIM2);
- /* TIM2 interrupt Init */
- NVIC_SetPriority(TIM2_IRQn, NVIC_EncodePriority(NVIC_GetPriorityGrouping(),15, 0));
- NVIC_EnableIRQ(TIM2_IRQn);
-
/* USER CODE BEGIN TIM2_Init 1 */
/* USER CODE END TIM2_Init 1 */
@@ -86,7 +82,7 @@ void MX_TIM2_Init(void)
TIM_InitStruct.Autoreload = 7199;
TIM_InitStruct.ClockDivision = LL_TIM_CLOCKDIVISION_DIV1;
LL_TIM_Init(TIM2, &TIM_InitStruct);
- LL_TIM_DisableARRPreload(TIM2);
+ LL_TIM_EnableARRPreload(TIM2);
LL_TIM_SetClockSource(TIM2, LL_TIM_CLOCKSOURCE_INTERNAL);
LL_TIM_OC_EnablePreload(TIM2, LL_TIM_CHANNEL_CH2);
TIM_OC_InitStruct.OCMode = LL_TIM_OCMODE_PWM2;
@@ -111,6 +107,40 @@ void MX_TIM2_Init(void)
GPIO_InitStruct.OutputType = LL_GPIO_OUTPUT_PUSHPULL;
LL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+}
+/* TIM3 init function */
+void MX_TIM3_Init(void)
+{
+
+ /* USER CODE BEGIN TIM3_Init 0 */
+
+ /* USER CODE END TIM3_Init 0 */
+
+ LL_TIM_InitTypeDef TIM_InitStruct = {0};
+
+ /* Peripheral clock enable */
+ LL_APB1_GRP1_EnableClock(LL_APB1_GRP1_PERIPH_TIM3);
+
+ /* TIM3 interrupt Init */
+ NVIC_SetPriority(TIM3_IRQn, NVIC_EncodePriority(NVIC_GetPriorityGrouping(),1, 0));
+ NVIC_EnableIRQ(TIM3_IRQn);
+
+ /* USER CODE BEGIN TIM3_Init 1 */
+
+ /* USER CODE END TIM3_Init 1 */
+ TIM_InitStruct.Prescaler = 7199;
+ TIM_InitStruct.CounterMode = LL_TIM_COUNTERMODE_UP;
+ TIM_InitStruct.Autoreload = 99;
+ TIM_InitStruct.ClockDivision = LL_TIM_CLOCKDIVISION_DIV1;
+ LL_TIM_Init(TIM3, &TIM_InitStruct);
+ LL_TIM_DisableARRPreload(TIM3);
+ LL_TIM_SetClockSource(TIM3, LL_TIM_CLOCKSOURCE_INTERNAL);
+ LL_TIM_SetTriggerOutput(TIM3, LL_TIM_TRGO_RESET);
+ LL_TIM_DisableMasterSlaveMode(TIM3);
+ /* USER CODE BEGIN TIM3_Init 2 */
+
+ /* USER CODE END TIM3_Init 2 */
+
}
/* USER CODE BEGIN 1 */
diff --git a/Core/Src/usart.c b/Core/Src/usart.c
index e15ef4a..0e99926 100644
--- a/Core/Src/usart.c
+++ b/Core/Src/usart.c
@@ -88,7 +88,7 @@ void MX_USART1_UART_Init(void)
LL_DMA_SetMemorySize(DMA1, LL_DMA_CHANNEL_4, LL_DMA_MDATAALIGN_BYTE);
/* USART1 interrupt Init */
- NVIC_SetPriority(USART1_IRQn, NVIC_EncodePriority(NVIC_GetPriorityGrouping(),0, 0));
+ NVIC_SetPriority(USART1_IRQn, NVIC_EncodePriority(NVIC_GetPriorityGrouping(),5, 0));
NVIC_EnableIRQ(USART1_IRQn);
/* USER CODE BEGIN USART1_Init 1 */
diff --git a/MDK-ARM/motor.uvoptx b/MDK-ARM/motor.uvoptx
index fe03e32..e341cdc 100644
--- a/MDK-ARM/motor.uvoptx
+++ b/MDK-ARM/motor.uvoptx
@@ -125,7 +125,7 @@
0
CMSIS_AGDI
- -X"Any" -UAny -O206 -S0 -C0 -P00000000 -N00("ARM CoreSight SW-DP") -D00(1BA01477) -L00(0) -TO65554 -TC10000000 -TT10000000 -TP20 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO15 -FD20000000 -FC1000 -FN1 -FF0STM32F10x_128.FLM -FS08000000 -FL020000 -FP0($$Device:STM32F103C8$Flash\STM32F10x_128.FLM)
+ -X"Any" -UAny -O206 -S0 -C0 -P00000000 -N00("ARM CoreSight SW-DP") -D00(1BA01477) -L00(0) -TO65554 -TC10000000 -TT10000000 -TP20 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC1000 -FN1 -FF0STM32F10x_128.FLM -FS08000000 -FL020000 -FP0($$Device:STM32F103C8$Flash\STM32F10x_128.FLM)
0
@@ -163,17 +163,12 @@
2
1
- 0x00000E0F,0x0A
+ work,0x0A
3
1
- 0x0000270F,0x0A
-
-
- 4
- 1
- 0x000003E7,0x0A
+ ch
@@ -182,7 +177,7 @@
0
1
- 1
+ 0
0
0
0
@@ -218,20 +213,6 @@
-
-
- System Viewer\GPIOA
- 35905
-
-
- System Viewer\GPIOC
- 35903
-
-
- System Viewer\TIM2
- 35904
-
-
@@ -373,6 +354,30 @@
0
0
+
+ 4
+ 10
+ 1
+ 0
+ 0
+ 0
+ ..\User\application\key.c
+ key.c
+ 0
+ 0
+
+
+ 4
+ 11
+ 1
+ 0
+ 0
+ 0
+ ..\User\application\work.c
+ work.c
+ 0
+ 0
+
@@ -383,7 +388,7 @@
0
5
- 10
+ 12
1
0
0
@@ -395,7 +400,7 @@
5
- 11
+ 13
1
0
0
@@ -407,7 +412,7 @@
5
- 12
+ 14
1
0
0
@@ -419,7 +424,7 @@
5
- 13
+ 15
1
0
0
@@ -431,7 +436,7 @@
5
- 14
+ 16
1
0
0
@@ -443,7 +448,7 @@
5
- 15
+ 17
1
0
0
@@ -455,7 +460,7 @@
5
- 16
+ 18
1
0
0
@@ -467,7 +472,7 @@
5
- 17
+ 19
1
0
0
@@ -487,7 +492,7 @@
0
6
- 18
+ 20
1
0
0
@@ -499,7 +504,7 @@
6
- 19
+ 21
1
0
0
@@ -511,7 +516,7 @@
6
- 20
+ 22
1
0
0
@@ -523,7 +528,7 @@
6
- 21
+ 23
1
0
0
@@ -535,7 +540,7 @@
6
- 22
+ 24
1
0
0
@@ -547,7 +552,7 @@
6
- 23
+ 25
1
0
0
@@ -559,7 +564,7 @@
6
- 24
+ 26
1
0
0
@@ -571,7 +576,7 @@
6
- 25
+ 27
1
0
0
@@ -583,7 +588,7 @@
6
- 26
+ 28
1
0
0
@@ -595,7 +600,7 @@
6
- 27
+ 29
1
0
0
@@ -607,7 +612,7 @@
6
- 28
+ 30
1
0
0
@@ -619,7 +624,7 @@
6
- 29
+ 31
1
0
0
@@ -631,7 +636,7 @@
6
- 30
+ 32
1
0
0
@@ -643,7 +648,7 @@
6
- 31
+ 33
1
0
0
@@ -655,7 +660,7 @@
6
- 32
+ 34
1
0
0
@@ -675,7 +680,7 @@
0
7
- 33
+ 35
1
0
0
@@ -687,7 +692,7 @@
7
- 34
+ 36
1
0
0
@@ -699,7 +704,7 @@
7
- 35
+ 37
1
0
0
@@ -711,7 +716,7 @@
7
- 36
+ 38
1
0
0
@@ -723,7 +728,7 @@
7
- 37
+ 39
1
0
0
@@ -735,7 +740,7 @@
7
- 38
+ 40
1
0
0
@@ -747,7 +752,7 @@
7
- 39
+ 41
1
0
0
@@ -759,7 +764,7 @@
7
- 40
+ 42
1
0
0
@@ -779,7 +784,7 @@
0
8
- 41
+ 43
1
0
0
@@ -791,7 +796,7 @@
8
- 42
+ 44
1
0
0
@@ -803,6 +808,74 @@
+
+ User/lib/control
+ 0
+ 0
+ 0
+ 0
+
+ 9
+ 45
+ 1
+ 0
+ 0
+ 0
+ ..\User\lib\control\src\pid.c
+ pid.c
+ 0
+ 0
+
+
+ 9
+ 46
+ 1
+ 0
+ 0
+ 0
+ ..\User\lib\control\src\pid_auto_tune.c
+ pid_auto_tune.c
+ 0
+ 0
+
+
+ 9
+ 47
+ 1
+ 0
+ 0
+ 0
+ ..\User\lib\control\src\pid_common.c
+ pid_common.c
+ 0
+ 0
+
+
+ 9
+ 48
+ 1
+ 0
+ 0
+ 0
+ ..\User\lib\control\src\pid_fuzzy.c
+ pid_fuzzy.c
+ 0
+ 0
+
+
+ 9
+ 49
+ 1
+ 0
+ 0
+ 0
+ ..\User\lib\control\src\pid_neural.c
+ pid_neural.c
+ 0
+ 0
+
+
+
::CMSIS
0
diff --git a/MDK-ARM/motor.uvprojx b/MDK-ARM/motor.uvprojx
index d5bc83a..cdd84e9 100644
--- a/MDK-ARM/motor.uvprojx
+++ b/MDK-ARM/motor.uvprojx
@@ -339,7 +339,7 @@
STM32,STM32F103xB,USE_FULL_LL_DRIVER,HSE_VALUE=8000000,HSE_STARTUP_TIMEOUT=100,LSE_STARTUP_TIMEOUT=5000,LSE_VALUE=32768,HSI_VALUE=8000000,LSI_VALUE=40000,VDD_VALUE=3300,PREFETCH_ENABLE=1
- ../Core/Inc;../Drivers/STM32F1xx_HAL_Driver/Inc;../Drivers/CMSIS/Device/ST/STM32F1xx/Include;../Drivers/CMSIS/Include;../User;../User/application;../User/board;../User/system/inc;../User/system/bsp;../User/lib/inc;../User/lib/flow
+ ../Core/Inc;../Drivers/STM32F1xx_HAL_Driver/Inc;../Drivers/CMSIS/Device/ST/STM32F1xx/Include;../Drivers/CMSIS/Include;../User;../User/application;../User/board;../User/system/inc;../User/system/bsp;../User/lib/inc;../User/lib/flow;../User/lib/control/inc
@@ -596,6 +596,16 @@
1
..\User\application\app.c
+
+ key.c
+ 1
+ ..\User\application\key.c
+
+
+ work.c
+ 1
+ ..\User\application\work.c
+
@@ -1260,6 +1270,36 @@
+
+ User/lib/control
+
+
+ pid.c
+ 1
+ ..\User\lib\control\src\pid.c
+
+
+ pid_auto_tune.c
+ 1
+ ..\User\lib\control\src\pid_auto_tune.c
+
+
+ pid_common.c
+ 1
+ ..\User\lib\control\src\pid_common.c
+
+
+ pid_fuzzy.c
+ 1
+ ..\User\lib\control\src\pid_fuzzy.c
+
+
+ pid_neural.c
+ 1
+ ..\User\lib\control\src\pid_neural.c
+
+
+
::CMSIS
diff --git a/MDK-ARM/motor/motor.hex b/MDK-ARM/motor/motor.hex
index 8aca44a..c42aede 100644
--- a/MDK-ARM/motor/motor.hex
+++ b/MDK-ARM/motor/motor.hex
@@ -1,597 +1,1477 @@
:020000040800F2
-:10000000801C002005010008490E000803020008BA
-:10001000450E0008C1010008891400080000000016
-:10002000000000000000000000000000E9110008CE
-:100030000102000800000000E9100008EB110008B0
+:10000000002000200501000801190008B9090008B6
+:10001000FD1800084D090008052000080000000038
+:10002000000000000000000000000000691D000842
+:100030008D09000800000000691C00086B1D000805
:100040001F0100081F0100081F0100081F01000810
-:100050001F0100081F0100081F0100081F01000800
+:100050001F0100081F010008910900081F01000886
:100060001F0100081F0100081F0100081F010008F0
-:100070001F0100081F010008E1010008F10100084C
+:100070001F0100081F0100086D0900087D09000824
:100080001F0100081F0100081F0100081F010008D0
:100090001F0100081F0100081F0100081F010008C0
-:1000A0001F010008E11200081F0100081F010008DD
-:1000B000B11300081F0100081F0100081F010008FC
+:1000A0001F010008611E00081F0100081F01000851
+:1000B0001F010008351F00081F0100081F0100086C
:1000C0001F0100081F0100081F0100081F01000890
-:1000D0001F010008791400081F0100081F01000813
+:1000D0001F010008F51F00081F0100081F0100088C
:1000E0001F0100081F0100081F010008DFF810D0E1
-:1000F00000F054F800480047CD190008AFF3008025
-:10010000801C00200648804706480047FEE7FEE7BF
+:1000F00000F01AFC0048004749390008AFF30080BF
+:10010000002000200648804706480047FEE7FEE73B
:10011000FEE7FEE7FEE7FEE7FEE7FEE7FEE7FEE7B7
-:10012000DD120008ED000008D2B201E000F8012B5A
+:100120005D1E0008ED000008D2B201E000F8012BCE
:10013000491EFBD270470022F6E710B513460A4667
-:1001400004461946FFF7F0FF204610BD20F000409E
-:10015000C10DC0F3160040F400007F2901DA002031
-:100160007047962903DCC1F19601C8407047963963
-:1001700088407047002801DBC0F10040002901DB06
-:10018000C1F1004181427047002801DBC0F100400D
-:10019000002901DBC1F1004188427047064C074D40
-:1001A00006E0E06840F0010394E807009847103447
-:1001B000AC42F6D3FFF79EFF84240008A424000875
-:1001C00000BFFEE770B504460D4600BF2CB901F034
-:1001D000A1FD01E000BF00BFFCE700BF012070BD32
-:1001E00010B50248006801F024FE10BD6400002034
-:1001F00010B50248006801F01CFE10BD640000202C
-:10020000704700BFFEE7000008B505498969014352
-:10021000034A9161114689690140009100BF08BD00
-:100220000010024008B5054989690143034A9161FC
-:10023000114689690140009100BF08BD00100240CD
-:1002400008B5054989690143034A916111468969E5
-:100250000140009100BF08BD0010024010B54A1EC9
-:10026000044B9A5C825822F001034A1E014CA25CA6
-:10027000835010BD2824000810B54A1E044B9A5C18
-:10028000825842F001034A1E014CA25C835010BD0B
-:100290002824000810B54A1E044B9A5C825842F08C
-:1002A00002034A1E014CA25C835010BD28240008A2
-:1002B00030B54B1E054CE35CC35823F44053134345
-:1002C0004C1E024D2C5D035130BD0000E62300089A
-:1002D00030B54B1E064CE35C03445B686FF30F03C1
-:1002E00013434C1E024D2C5D0444636030BD00007E
-:1002F0002824000830B54B1E054CE35CC35844F27B
-:100300001004A34313434C1E014D2C5D035130BD1B
-:10031000E623000810B54B1E024CE35C0344DA6090
-:1003200010BD00002824000830B54B1E054CE35CCE
-:10033000C35823F0800313434C1E024D2C5D035120
-:1003400030BD0000E623000830B54B1E054CE35CD1
-:10035000C35823F4406313434C1E024D2C5D0351DC
-:1003600030BD0000E623000830B54B1E054CE35CB1
-:10037000C35823F0200313434C1E024D2C5D035140
-:1003800030BD0000E623000810B54B1E024CE35CB4
-:1003900003449A6010BD00002824000830B54B1EAD
-:1003A000054CE35CC35823F0400313434C1E024D3D
-:1003B0002C5D035130BD0000E623000830B54B1E14
-:1003C000054CE35CC35823F4407313434C1E024DA9
-:1003D0002C5D035130BD0000E62300082DE9F041FB
-:1003E00002460B461868C0F30F2595FAA5F0B0FA3F
-:1003F00080F480E00120A040284000287AD0082C1A
-:1004000004D240F2011000FA04F106E0A4F1080061
-:100410004FF00116864046F08061586808280ED1DA
-:100420001869D66826EA11260F0A97FAA7F7B7FACD
-:1004300087F700FA07F73E43D66000BF00BF586851
-:1004400002EB116691FAA1FCBCFA8CFC4FEA8C0815
-:100450004FF00F0C0CFA08FC376827EA0C0791FAEA
-:10046000A1FCBCFA8CFC4FEA8C0C00FA0CFC47EAAD
-:100470000C07376000BF5868012802D05868092867
-:1004800038D1986802EB116691FAA1FCBCFA8CFC99
-:100490004FEA8C084FF0030C0CFA08FC376827EA87
-:1004A0000C0791FAA1FCBCFA8CFC4FEA8C0C00FA08
-:1004B0000CFC47EA0C07376000BFD86802EB1166F6
-:1004C00091FAA1FCBCFA8CFC4FEA8C084FF0040CAA
-:1004D0000CFA08FC376827EA0C0791FAA1FCBCFA71
-:1004E0008CFC4FEA8C0C00FA0CFC47EA0C073760D6
-:1004F00000BF00BF641C25FA04F000287FF47AAF27
-:10050000BDE8F08102469068C1F30F231840C1F3A3
-:100510000F23984201D1012070470020FCE7C1F36E
-:100520000F2242617047C1F30F2242617047C1F34D
-:100530000F2242617047C1F30F2242617047C1F33D
-:100540000F2202617047C1F30F220261704770B53C
-:1005500000EB116391FAA1F5B5FA85F5AE000F2510
-:10056000B5401C68AC4391FAA1F5B5FA85F5AD002C
-:1005700002FA05F52C431C6070BD000002480068BB
-:10058000401C014908607047200000204FF47A7138
-:10059000B0FBF1F2521E4FF0E0235A6100229A6143
-:1005A00005221A6100BF704710B5044600F0D2FD65
-:1005B0002060206800F09AFD6060606800F0A6FD91
-:1005C000A060606800F0B4FDE06010BD0149086003
-:1005D0007047000000000020016821F080010160E8
-:1005E0007047816821F0800181607047016841F0A7
-:1005F000010101607047C16841F00101C1607047AD
-:1006000010B5024613681C48824208D0B2F1804FF0
-:1006100005D01A48824202D01948824204D123F000
-:1006200070004C6840EA04031348824208D0B2F1DB
-:10063000804F05D01148824202D01148824204D135
-:1006400023F44070CC6840EA040313608868D062E9
-:1006500000BF0888906200BF0748824203D1086942
-:10066000106300BF00BF00BF506940F0010050613F
-:1006700000BF002010BD0000002C0140000400401D
-:100680000008004001460869C0F340007047014679
-:100690000869C0F38000704701460869C0F3C000D4
-:1006A000704701460869C0F30010704701460869A9
-:1006B00000F0010070470146C868C0F34000704771
-:1006C0000146C868C0F3800070470146C868C0F39F
-:1006D000C00070470146C868C0F30010704701466B
-:1006E000C86800F00100704770B50246012901D1C9
-:1006F000002416E0042901D1012412E0102901D1BF
-:1007000002240EE0402901D103240AE0B1F5807FE4
-:1007100001D1042405E0B1F5806F01D1052400E08A
-:1007200006242346064CE55C02F1180428190468E7
-:10073000044DEE5C0425B5402C43046070BD000000
-:10074000C3230008CA23000870B50246012901D15D
-:10075000002416E0042901D1012412E0102901D15E
-:1007600002240EE0402901D103240AE0B1F5807F84
-:1007700001D1042405E0B1F5806F01D1052400E02A
-:1007800006242346064CE55C02F118042819046887
-:10079000044DEE5C0825B5402C43046070BD00009C
-:1007A000C3230008CA2300082DE9F04106460C4681
-:1007B00015460127012C08D0102C0CD0B4F5807FF1
-:1007C0000FD0B4F5805F18D111E02946304600F013
-:1007D0007DFB074612E02946304600F0B3FB074692
-:1007E0000CE02946304600F0EFFB074606E02946BC
-:1007F000304600F025FC074600E000BF00BF384649
-:10080000BDE8F08181637047826844F207039A4330
-:100810000A4382607047426822F070020A434260D5
-:10082000704708B50168009100BF4168009100BFA2
-:1008300008BD6FF040010160704700002DE9FF41E5
-:1008400004460D4601270026204600F055F80028F2
-:1008500033D1E9686868084329690843E16841F2CF
-:100860000C6291430843E060A868216921F440517B
-:100870000143216100BF6869616921F4407101434E
-:10088000616100BF6846FFF78FFE0E48844201D1C8
-:10089000039E08E00C48844201D1029E03E00B480D
-:1008A000844200D1029E46B1286830B1002731460B
-:1008B00020462A6800F025F800BF384604B0BDE89D
-:1008C000F081000000380140004400400048004032
-:1008D00001460868C0F34000704701460868C0F34D
-:1008E0008000704701460868C0F3C00070470146A9
-:1008F0000868C0F3801070470146C868C0F34030F4
-:10090000704770B501EBC10303EB01139400B3FB17
-:10091000F4F301EBC10404EB01149500B4FBF5F40E
-:100920006425B4FBF5F404EBC40505EB0414A3EB58
-:100930008403322404EB03136424B3FBF4F303F0C5
-:10094000F00301EBC10404EB01149500B4FBF5F4D2
-:100950006425B4FBF5F403EB041401EBC10303EBD2
-:1009600001139500B3FBF5F301EBC10505EB011590
-:100970009600B5FBF6F56426B5FBF6F505EBC50666
-:1009800006EB0515A3EB8503322505EB0313642560
-:10099000B3FBF5F303F00F0323449BB2836070BDF8
-:1009A00038B50120144949690143134A5161114680
-:1009B00049690140009100BF00BF00F081FD05467C
-:1009C0000022114600F042FA044621460E2000F0B3
-:1009D00087FD0E2000F05AFD00F072FD0546002252
-:1009E000114600F033FA044621460F2000F078FD4E
-:1009F0000F2000F04BFD38BD0010024000B585B05F
-:100A000014216846FFF797FB1020FFF7FDFB20201D
-:100A1000FFF7FAFB0420FFF7F7FB0820FFF7F4FBD2
-:100A20002F493048FFF77BFD43F230012E48FFF796
-:100A300076FD2E492E48FFF772FD294800900120CF
-:100A40000190022002900020039069462548FFF79C
-:100A5000C5FC284800900020019069462148FFF716
-:100A6000BDFC254800900420019069461D48FFF711
-:100A7000B5FC40F2011000900420019069461A482C
-:100A8000FFF7ACFC1D480090002001906946164815
-:100A9000FFF7A4FC43F230000090012001900220F7
-:100AA0000290002003900120049069460E48FFF751
-:100AB00095FC134800900020019069460C48FFF710
-:100AC0008DFC0A4800900120019003200290002034
-:100AD000039069460648FFF781FC05B000BD0000A1
-:100AE00020002004001001400008014030003004C4
-:100AF000000C01404000400480008004DDCC9904DB
-:100B0000FFFFCF0430B585B014216846FFF713FB13
-:100B10004FF40060FFF786FB00F0DAFC0546002288
-:100B2000114600F0B3F904462146192000F0ECFC10
-:100B3000192000F0B8FC41F61F40ADF8000000207D
-:100B400001906320029000200390049069460948B8
-:100B5000FFF756FD0748FFF73FFD00210548FFF767
-:100B600053FE00210348FFF756FE0248FFF739FD08
-:100B700005B030BD002C014030B593B014210EA853
-:100B8000FFF7D9FA202106A8FFF7D5FA142101A80A
-:100B9000FFF7D1FA01203049C96901432E4AD161DA
-:100BA0001146C9690140009100BF00BF00F090FCF0
-:100BB000054600220F2100F069F9044621461C2059
-:100BC00000F0A2FC1C2000F06EFC0020ADF8380004
-:100BD0000F9041F61F401090002011900EA94FF089
-:100BE0008040FFF70DFD4FF08040FFF7F5FC00213E
-:100BF0004FF08040FFF708FE10218806FFF7A4FDA4
-:100C000070200690002007900890099002200A901A
-:100C100006AA10214007FFF7C7FD10218806FFF73D
-:100C200063FD00214FF08040FFF7F5FD4FF080405D
-:100C3000FFF7D7FC0420FFF7F5FA40F202200190FD
-:100C400009200290022003900020049001A903488B
-:100C5000FFF7C4FB13B030BD001002400008014094
-:100C60002DE9F0418CB01C2105A8FFF764FA14218E
-:100C70006846FFF760FA4FF48040FFF7E1FA04207E
-:100C8000FFF7DEFA684800900920019003200290E7
-:100C90000020039069466548FFF7A0FB6448009078
-:100CA0000420019069466148FFF798FB0022052166
-:100CB0006048FFF71FFB002205215E48FFF7F8FAA6
-:100CC000002205215B48FFF74FFB00220521594810
-:100CD000FFF764FB802205215648FFF725FB002221
-:100CE00005215448FFF76AFB002205215148FFF710
-:100CF0002BFB102204214F48FFF7FCFA00220421AD
-:100D00004C48FFF7D5FA002204214A48FFF72CFB94
-:100D1000002204214748FFF741FB80220421454877
-:100D2000FFF702FB002204214248FFF747FB0022A5
-:100D300004214048FFF708FB25213F4B1B68C3F304
-:100D40000220002425460346C3F1070CBCF1040F22
-:100D500002D94FF0040C01E0C3F1070C674603F120
-:100D6000040CBCF1070F02D24FF0000C01E0A3F11C
-:100D7000030C66464FF0010C0CFA07FCACF1010CB9
-:100D80000CEA040C0CFA06FC4FF0010808FA06F80D
-:100D9000A8F1010808EA05084CEA080200BF00298A
-:100DA00004DB1007030E2548435407E01007040E28
-:100DB00021480C3001F00F031B1FC45400BF252035
-:100DC000002809DB00F01F02012191404209920036
-:100DD00002F1E022C2F8001100BF4FF4E1300590AB
-:100DE00000200690079008900C20099000200A909F
-:100DF0000B9005A91248FFF721FD00BF10480069BC
-:100E000020F490400E4908610846406920F02A000D
-:100E1000486100BF00BF0846C06840F40050C86089
-:100E200000BF0CB0BDE8F0810200020400080140E0
-:100E300004000404000002400CED00E000E400E0C7
-:100E40000038014000BFFEE700BFFEE7F0B50346F3
-:100E50000C4603F00701C1F10700042801D9042062
-:100E600001E0C1F107000646081D072801D2002055
-:100E700000E0C81E05460120B040401E2040A840AA
-:100E80000127AF407F1E17403843F0BDF0B5034641
-:100E90000C4603F00701C1F10700042801D9042022
-:100EA00001E0C1F107000646081D072801D2002015
-:100EB00000E0C81E05460120B040401E2040A8406A
-:100EC0000127AF407F1E17403843F0BD70B5024682
-:100ED000106A20F001001062136A5568946924F0CA
-:100EE000030424F070000E6840EA060423F00200B8
-:100EF0000E6940EA060323F001004E6840EA06034B
-:100F00000F48824213D123F008004E6940EA86035D
-:100F100023F004008E6840EA860325F480708E6911
-:100F200040EA060525F40070CE6940EA46055560A2
-:100F30009461C868506300BF1362002070BD000058
-:100F4000002C01402DE9F04104460D46206A20F0B6
-:100F500010002062266AD4F80480A76927F440773D
-:100F600027F4E040296840EA012726F0200029699B
-:100F700040EA011626F01000696840EA011611489F
-:100F8000844213D126F08000696940EA811626F078
-:100F90004000A96840EA811628F48060A96940EA07
-:100FA000810828F40060E96940EAC108C4F80480B7
-:100FB000A7612046E968FFF725FC26620020BDE80E
-:100FC000F0810000002C014070B50246106A20F448
-:100FD00080701062136A5568D46924F0030424F009
-:100FE00070000E6840EA060423F400700E6940EABF
-:100FF000062323F480704E6840EA06230F4882429D
-:1010000013D123F400604E6940EA862323F4806004
-:101010008E6840EA862325F480508E6940EA0615E2
-:1010200025F40050CE6940EA46155560D461C86881
-:10103000D06300BF1362002070BD0000002C01408F
-:1010400070B50246106A20F480501062146A556828
-:10105000D36923F4407323F4E0400E6840EA06238A
-:1010600024F400500E6940EA063424F480504E689F
-:1010700040EA06340748824204D125F480408E6954
-:1010800040EA86155560D361C868106400BF1462D9
-:10109000002070BD002C014070B503460C46DD6A8F
-:1010A00055436426B5FBF6F5A8B2012C08D0102CE8
-:1010B0000AD0B4F5807F0BD0B4F5805F10D10BE07F
-:1010C00000BF586300BF0CE000BF986300BF08E09A
-:1010D00000BFD86300BF04E000BF186400BF00E099
-:1010E00000BF00BF00BF70BD70470000014600BFD9
-:1010F0000448406800F0F0000009034A125C21FA3D
-:1011000002F070470010024010240008014600BFA2
-:101110000548406800F4E060044A02EB10200278C1
-:1011200021FA02F07047000000100240202400085D
-:10113000014600BF0548406800F46050044A02EBD5
-:10114000D020027821FA02F070470000001002401F
-:101150002024000810B5002400BF0B48406800F0B0
-:101160000C0020B1042804D0082808D103E0074C63
-:1011700007E0064C05E000F00BF8044601E0034CE4
-:1011800000BF00BF204610BD0010024000127A00D0
-:101190000021002200BF1148406800F48030024660
-:1011A0001AB1B2F5803F0CD101E00D490BE000BF50
-:1011B0000A484068C0F34040401C0A4BB3FBF0F1C2
-:1011C00001E0074900BF00BF00BF0448406800F4C9
-:1011D0007010022303EB9040484370470010024018
-:1011E00000093D0000127A007047704710B50220D8
-:1011F0003749096821F007010143354A116000BFF2
-:1012000000BF00BF3248006800F007000228F8D194
-:1012100000BF3048006840F480302E49086000BFAD
-:1012200000BF00BF2B480068C0F340400028F8D042
-:101230004FF480304FF4E011264A526822F47C12B9
-:1012400000F440330B431A43224B5A6000BF00BFE7
-:101250001846006840F080701946086000BF00BF63
-:1012600000BF1C480068C0F340600028F8D0002090
-:101270001849496821F0F0010143164A516000BF46
-:1012800010151146496821F4E0610143516000BF27
-:1012900000201146496821F460510143516000BFAC
-:1012A00002201146496821F003010143516000BF4B
-:1012B00000BF00BF0748406800F00C000828F8D1C4
-:1012C0000548FFF763F90448FFF780F910BD0000F7
-:1012D000002002400010024000A24A0470470000B3
-:1012E00010B53148FFF7E2F901285CD100BF2E4864
-:1012F000FFF7C8F901280AD12B48FFF7DCF90128CC
-:1013000005D100BF001F2849086100BF00BF264863
-:10131000FFF7BDF901280AD12348FFF7D1F90128C9
-:1013200005D100BF801F2049086100BF00BF1E48D3
-:10133000FFF7B2F901280BD11B48FFF7C6F90128C6
-:1013400006D100BF6FF008001749086100BF00BF59
-:101350001548FFF7A6F901280BD11348FFF7BAF992
-:10136000012806D100BF6FF010000F49086100BFCF
-:1013700000BF0D48FFF79AF901280AD10A48FFF784
-:10138000AEF9012805D100BFC01E0749086100BFA2
-:1013900000BF00BFFFF7F2F800BF04480068401C20
-:1013A0000249086000BF10BD002C01406000002011
-:1013B00010B54FF08040FFF779F901285BD100BFED
-:1013C0008007FFF75FF901280AD18007FFF773F95B
-:1013D000012805D100BF001F8107086100BF00BFC1
-:1013E0004FF08040FFF753F901280BD18007FFF73A
-:1013F00067F9012806D100BF801F4FF080410861C6
-:1014000000BF00BF4FF08040FFF746F901280CD124
-:101410008007FFF75AF9012807D100BF6FF00800D5
-:101420004FF08041086100BF00BF4FF08040FFF7E0
-:1014300038F901280CD18007FFF74CF9012807D1B2
-:1014400000BF6FF010004FF08041086100BF00BF87
-:101450004FF08040FFF72AF901280BD18007FFF7F2
-:101460003EF9012806D100BFC01E4FF0804108613F
-:1014700000BF00BF00BF10BD10B50248006800F0FB
-:1014800003FE10BD6400002000BFFEE7002809DB5A
-:1014900000F01F02012191404209920002F1E02276
-:1014A000C2F800117047002809DB00F01F0201217B
-:1014B00091404209920002F1E022C2F80011704707
-:1014C00002480068C0F30220704700000CED00E005
-:1014D00002480068C0F30220704700000CED00E0F5
-:1014E00010B5002804DB0A07130E054A135406E062
-:1014F0000A07140E034A00F00F031B1FD45410BD3B
-:1015000000E400E018ED00E010B5002804DB0A0755
-:10151000130E054A135406E00A07140E034A00F09E
-:101520000F031B1FD45410BD00E400E018ED00E0D1
-:1015300002E008C8121F08C1002AFAD1704770479C
-:10154000002001E001C1121F002AFBD170470000FA
-:10155000014601F1100000E0001D02681AB9024ABC
-:1015600012689042F8D370473400002010B5064846
-:10157000046803E02046FFF7EBFF044603480068D9
-:101580008442F7D310BD000030000020340000205A
-:1015900010B504462146002000F018FB10BD10B520
-:1015A00001E000F8011B131EA2F10104A2B2F8D160
-:1015B00010BD10B501E000F8011B131EA2F10104DB
-:1015C000A2B2F8D110BD000010B500201D4908607E
-:1015D0001D49086000BF1D48FFF708F81B48FFF7CA
-:1015E0000AF800BF00BF4FF08040FEF7FFFF4FF04A
-:1015F0008040FFF700F800BF00BF4FF08040FEF7CB
-:10160000F5FF10208106096A01438206116200BFBE
-:1016100000BF002210218006FFF73EFD00BF00BF83
-:101620004FF08040806A401C09490968B1FBF0F125
-:101630004FF08040C06A401CB1FBF0F005494860A3
-:1016400010BD0000040000200C000020002C014010
-:10165000000000201400002010B5034800F010F82E
-:10166000024800F07DF910BD040000200C000020AD
-:1016700010B500F0D9FC00F0D5FA00F003FA10BD67
-:10168000F8B5044600200090206810B11A2844D113
-:1016900039E000BF234908680021FEF775FD0AD232
-:1016A00041F210012048FEF74AFF42F220011E4895
-:1016B000FEF739FF09E041F210011B48FEF733FF46
-:1016C00042F220011848FEF73AFF16490868002147
-:1016D000FEF750FD04D21348006880F0004001E09E
-:1016E000104800680646FEF731FD85B22A461021F3
-:1016F0008806FFF7D1FC00BF0C480068606000BF9F
-:101700001A20206000BF094960680968081AC828C3
-:1017100001D20020F8BD00BFBCE70020206000908F
-:101720000320F7E7140000200008014060000020BB
-:1017300001490860704700001C00002070B5034696
-:1017400000224FF0E02675690D4E366803FB06F463
-:101750004FF0E026B16910E04FF0E026B069884212
-:101760000BD0884202D20E1A324402E02E1A0E44E6
-:1017700032440146A24200D300E0EDE700BF70BD55
-:101780001C00002010B500BF01220E490E48FEF7D4
-:10179000DEFE00BF0B490C48FEF7D5FE0B490A4898
-:1017A000FEF7D1FE0420FFF7C9FF06490648FEF701
-:1017B000C2FE0420FFF7C2FF04490348FEF7BBFE48
-:1017C00010BD000010001004000C01402000200497
-:1017D00010B500BF01220E490E48FEF7B8FE00BF4B
-:1017E0000D490C48FEF7A7FE09490A48FEF7A3FE7B
-:1017F0000420FFF7A3FF08490648FEF7A4FE0449AA
-:101800000448FEF7A0FE0420FFF798FF10BD00007B
-:1018100010001004000C01402000200410B500242A
-:10182000082213491348FEF792FE11491148FEF7AA
-:101830008AFE0420FFF782FF0F490E48FEF783FE61
-:101840000420FFF77BFF07E0601CC4B2FA2C03DD25
-:10185000FFF7BEFF002010BD05490648FEF752FE07
-:101860000028F1D104490348FEF765FE0120F2E7A4
-:1018700010001004000C01402000200470B5044644
-:10188000002500BF012217491748FEF760FE00BF80
-:1018900016491548FEF74FFE00BF1FE0E00920B1D2
-:1018A00010491148FEF74FFE03E00E490E48FEF7BF
-:1018B00042FE6006040E0220FFF740FF0B490A4873
-:1018C000FEF741FE0220FFF739FF08490648FEF700
-:1018D00032FE0220FFF732FF681CC5B2082DDDDBA7
-:1018E00070BD000010001004000C01402000200416
-:1018F00038B5044600208DF800008DF80140FFF750
-:1019000041FF7820FFF7BAFFFFF788FF9DF800003E
-:10191000FFF7B4FFFFF782FF9DF80100FFF7AEFF6E
-:10192000FFF77CFFFFF754FF38BD38B50446402071
-:101930008DF800008DF80140FFF724FF7820FFF7B5
-:101940009DFFFFF76BFF9DF80000FFF797FFFFF784
-:1019500065FF9DF80100FFF791FFFFF75FFF38BDBE
-:1019600038B5014600200090086810B12D2821D11B
-:1019700016E000BF124B134CE068C3F30F2222EABB
-:10198000000400EA020544EA05440E4D2C6100BF44
-:1019900000BF0D480068486000BF2D20086000BFF0
-:1019A000094A48681268101A642801D2002038BD1C
-:1019B00000BFDFE70020086000900320F7E7000089
-:1019C00020002004001001406000002008B5012024
-:1019D000264989690143254A916111468969014077
-:1019E000009100BF00BF00071146C9690143D161E2
-:1019F0001146C9690140009100BF00BF03200246A3
-:101A00001B4B19684FF6FF0319401A4B0B4343EA6F
-:101A10000221174B196000BF00BF1748406820F033
-:101A2000E06040F000701449486000BFFFF7DEFB43
-:101A3000124800681249B0FBF1F084B22046FFF76B
-:101A400077FEFEF7DBFFFEF7ABFFFFF795F8FFF73A
-:101A500007F9FFF757F8002000F022F8FFF708FE1B
-:101A6000FFF7B2FD01E0FFF7F7FDFCE700100240D1
-:101A70000CED00E00000FA0500000140000000202D
-:101A800040420F0010B541F210010448FEF74FFD2F
-:101A900042F220010148FEF74AFD10BD0008014056
-:101AA00010B504460C4951F824104A000B4951F86E
-:101AB0002400002100F09EF8094951F8242007492C
-:101AC000083951F82400002100F094F8012103485E
-:101AD0000830015510BD00006C240008540000209F
-:101AE0007C2400082DE9F04704460F460025A9464E
-:101AF0002348005D20B922481838016820468847ED
-:101B00001FB94FF0FF30BDE8F0871E4850F82400A1
-:101B1000B7FBF0F61B4850F82400B7FBF0F100FBD0
-:101B2000117000B1761C184850F82400451E22E0C0
-:101B30001348083850F8240030F8150010B909F19E
-:101B4000010901E04FF00009B14513D14FF0000841
-:101B500009E00B48083850F8240005EB080220F88B
-:101B6000126008F10108B045F3D3064850F824008C
-:101B70006843C8E76D1E002DDADA4FF0FF30C2E788
-:101B80005C000020742400086C24000810B5014695
-:101B90000023002207E00B4850F8210030F8120023
-:101BA00000B15B1C521C084850F821009042F2D84A
-:101BB00064205843044C54F82140B0FBF4F0C0B208
-:101BC00010BD0000540000206C24000870B50446CD
-:101BD0000E4631462046FFF785FF0546681C08B9CA
-:101BE000002070BD024850F824002844F9E70000A6
-:101BF0004C00002030B5034601E003F8011B141E21
-:101C0000A2F10102F9D130BD10B504464FF4806253
-:101C100021460348FFF7CDFC00F05AF810BD000044
-:101C20008014002010B5AE20FFF762FE2020FFF7E1
-:101C30005FFE1020FFF75CFEC820FFF759FE002072
-:101C4000FFF756FE1020FFF753FE4020FFF750FE2F
-:101C50008120FFF74DFEFF20FFF74AFEA120FFF78E
-:101C600047FEA620FFF744FEA820FFF741FE3F20D5
-:101C7000FFF73EFEA420FFF73BFED320FFF738FE20
-:101C80000020FFF735FED520FFF732FEF020FFF7EA
-:101C90002FFED920FFF72CFE2220FFF729FEDA20A5
-:101CA000FFF726FE1220FFF723FEDB20FFF720FEC2
-:101CB0002020FFF71DFE8D20FFF71AFE1420FFF7EE
-:101CC00017FEAF20FFF714FE0020FFF79DFF10BDA9
-:101CD00070B5002418E004F1B001C8B2FFF708FEA7
-:101CE0000120FFF705FE1020FFF702FE002507E0A8
-:101CF00005EBC411064A505CFFF717FE681CC5B21D
-:101D0000802DF5DB601CC4B2082CE4DB70BD000044
-:101D10008014002000BF00BF00BF00BF00BFBFF3A2
-:101D20004F8F00BF00BF00BF0948006800F4E060AB
-:101D300008490843001D0649086000BF00BF00BFF6
-:101D4000BFF34F8F00BF00BF00BF00BF00BFFDE764
-:101D50000CED00E00000FA0510B5044604B910BD12
-:101D600000202085A07D012808D1606A30B1218C37
-:101D700089040A0C0021606AFFF711FC00BFEEE73E
-:101D80002DE9F05F0646884615469946DDE90B7B4E
-:101D9000DDF828A00EB1012100E00021084629212C
-:101DA000FEF710FA4420FFF7F3FB04460CB10121C3
-:101DB00000E0002108462C21FEF704FA0120E0751E
-:101DC00000202076C4F83C902584C4F840B0A78653
-:101DD000002D0CDD2846FFF7DBFBE061E16909B16E
-:101DE000012100E0002108463E21FEF7EBF9002F1B
-:101DF0000CDD3846FFF7CCFB2063216B09B10121D4
-:101E000000E0002108464521FEF7DCF984F8158042
-:101E100084F82CA066602046BDE8F09F10B504460B
-:101E200004B910BD002060852046FFF795FF00BF74
-:101E3000F7E710B504460CB1012100E00021084687
-:101E400040F2D711FEF7BEF9012084F8380021696D
-:101E5000A068FEF703FA2069082865D2DFE800F0E1
-:101E60006404111E2C3A485600BFA0680168C1F3F3
-:101E7000400121B1A0680221416000BF00BF00BF46
-:101E800053E000BFA0680168C1F3401121B1A06810
-:101E90002021416000BF00BF00BF46E000BFA06836
-:101EA0000168C1F3402129B1A0684FF4007141607D
-:101EB00000BF00BF00BF38E000BFA0680168C1F3E9
-:101EC000403129B1A0684FF40051416000BF00BF0C
-:101ED00000BF2AE000BFA0680168C1F3404129B1FA
-:101EE000A0684FF40031416000BF00BF00BF1CE09C
-:101EF00000BFA0680168C1F3405129B1A0684FF448
-:101F00000011416000BF00BF00BF0EE000BFA0682D
-:101F10000168C1F3406129B1A0684FF000714160D0
-:101F200000BF00BF00BF00E000BF00BF606800BF8F
-:101F300000BF00BF00F10C0252E8002F42F0400148
-:101F400000F10C0242E80013002BF3D100BF00BFE8
-:101F50002069082865D2DFE800F06404111E2C3ADD
-:101F6000485600BFA0680168C1F3C00121B1A06854
-:101F70000821416000BF00BF00BF53E000BFA06860
-:101F80000168C1F3C01121B1A0688021416000BF88
-:101F900000BF00BF46E000BFA0680168C1F3C021D8
-:101FA00029B1A0684FF40061416000BF00BF00BFCD
-:101FB00038E000BFA0680168C1F3C03129B1A06852
-:101FC0004FF40041416000BF00BF00BF2AE000BFE6
-:101FD000A0680168C1F3C04129B1A0684FF4002195
-:101FE000416000BF00BF00BF1CE000BFA0680168E7
-:101FF000C1F3C05129B1A0684FF40001416000BF96
-:1020000000BF00BF0EE000BFA0680168C1F3C0615F
-:1020100029B1A0684FF00061416000BF00BF00BF60
-:1020200000E000BF00BF10BD0EB51348006808BB3C
-:102030000020F0210122114BCDE9002102900A4637
-:1020400001210F48FFF79CFE0B490860002009683A
-:1020500008700C4808490968886005200649096825
-:10206000C86004200449096808610021024800682A
-:1020700000F0E2F80EBD000064000020BB23000861
-:10208000003801400000024038B5044604B938BDAC
-:102090006068C168C1F34011B9B160680168C1F3FB
-:1020A000401191B1608D218C884202DB2046FFF700
-:1020B000B5FE61684A68D2B2608D411C6185E169F4
-:1020C0000A5400202076E0753FE06068C168C1F3E3
-:1020D0000011002939D060680168C1F3001100299E
-:1020E00033D0607D01282BD1D4E902014A1E514B27
-:1020F0009A5C02445268208C801A6085207DF8B971
-:10210000D4E90201FEF7AAF8E06B80B1608D0028E7
-:102110000DDD608D218C884209DC628D2078E36BB7
-:10212000E1699847228C0021E069FFF738FA228C98
-:10213000D4E90201FEF7CCF8D4E90201FEF79CF8DD
-:10214000002060856068FEF76CFB6068C168C1F3C1
-:10215000801151B16068FEF7CAFB30B1206C08B144
-:10216000206C80476068FEF764FBA07D01285ED18B
-:1021700001256068C168C1F3002171B16068016820
-:1021800001F0010149B1022560680168009100BFBA
-:102190004168009100BF00BF00BF6068FEF798FB78
-:1021A00068B16068FEF794FB48B104256068016877
-:1021B000009100BF4168009100BF00BF00BF606890
-:1021C000FEF78BFB60B16068FEF787FB40B160688B
-:1021D0000168009100BF4168009100BF00BF00BFCF
-:1021E0006068FEF77FFB68B16068FEF77BFB48B173
-:1021F000102560680168009100BF4168009100BF30
-:1022000000BF00BF012D11D0606A78B1618D491EF9
-:1022100088B2228D616A01EB82014880228D616A59
-:1022200001F82250218D491C218500BF00BF00BF4D
-:102230002DE700002824000870B504460D46607D97
-:1022400090B9A575606800BF00BF00BF00F10C0227
-:1022500052E8002F42F0200100F10C0242E8001386
-:10226000002BF3D100BF70E00020A0756068FEF77E
-:10227000D8FA2169A068FDF7F1FFD4E90201FDF762
-:10228000EDFF6068011D0E463246D4E90201FEF7FB
-:102290007BF8E269D4E90201FEF73CF8228CD4E92C
-:1022A0000201FEF715F8D4E90201FDF7F3FFD4E9C6
-:1022B0000201FDF7E1FF606800BF00BF00BF00F151
-:1022C000140252E8002F42F0400100F1140242E8EB
-:1022D0000013002BF3D100BF00BF606800BF00BF38
-:1022E00000BF00F10C0252E8002F42F0100100F193
-:1022F0000C0242E80013002BF3D100BF00BF60685E
-:10230000011D0E4632462169A068FEF73DF8226B9A
-:102310002169A068FDF7FEFF2169A068FDF7BAFFFB
-:10232000606800BF00BF00BF00F1140252E8002F38
-:1023300042F0800100F1140242E80013002BF3D1B7
-:1023400000BF00BF012084F83800A07D012833D1F0
-:10235000606A68B9218C8800FFF71AF96062616AC7
-:1023600009B1012100E0002108468221FDF72AFF82
-:10237000606800BF00BF00BF00F10C0252E8002FF0
-:1023800042F4807100F10C0242E80013002BF3D1FB
-:1023900000BF00BF606800BF00BF00BF00F11402B3
-:1023A00052E8002F42F0010100F1140242E800134C
-:1023B000002BF3D100BF00BF70BD7047081C304434
-:1023C000586C8000000000040404000008000000B5
-:1023D000080000080000000800020406080A0C00BB
-:1023E000010203040506081C3044586C80000000FC
-:1023F00000040404000008000000080000080000B9
-:10240000000800020406080A0C0001020304050685
-:102410000000000000000000010203040607080994
-:102420000000000001020304081C3044586C8000C6
-:102430000000000404040000080000000800000878
-:102440000000000800020406080A0C000102030450
-:1024500005065F6C697374006C69737420616C6C41
-:1024600020636F6D6D616E6400000000000200006B
-:10247000000000000800000008000000001000003C
-:1024800000000000A42400080000002078000000E4
-:10249000301500081C25000878000020081C0000EA
-:1024A000401500080024F4000000000000000000B7
-:1024B000000000000000000000000000000000001C
-:1024C000000000000000000000000000000000000C
-:1024D00000000000000000000000000000000000FC
-:1024E0000000000000000000A11A00088D1B000879
-:1024F00080000020400000208010002042000020CA
-:10250000000000000000000000000000522400084D
-:0C25100058240008C6E533B46D1500081F
+:1001400004461946FFF7F0FF204610BDF0B480EAE0
+:100150000102D40F4200B2EB410F02D20246084620
+:1001600011464A0042D0C30DDDB2C1F3C752AD1AE9
+:10017000202D35DAC1F3160141F4000204B15242D8
+:10018000C5F1200602FA06F12A411044B3EBD05F14
+:1001900023D0C4B1012DA0EBC35009DCF0BC4FF05B
+:1001A000004202EAC352DBB200F5000000F030BBAF
+:1001B000400000F1807000EBC350A0F1807040EA75
+:1001C000D170490009E0490841EAC071A0EBC35071
+:1001D00000F50000400800EBC350F0BC00F00FBB7E
+:1001E0006142012202EB4101001BF6E7F0BC7047BF
+:1001F00081F00041AAE780F00040A7E780EA010211
+:1002000010B502F00043400022D04A001FD0010E7A
+:1002100001EB1261C0F35600C2F3560240F4000035
+:1002200042F40002A0FB022000047F39140400D035
+:10023000401C50EA124001D44000491EC2B20C06D4
+:1002400004EBD010401C4008802A02D003E00020BC
+:1002500010BD20F00100002900DA0020184310BD75
+:1002600030B480EA010202F0004530F0004221F093
+:10027000004013D090B1C30DD40DC2F31601C0F3EA
+:100280001600E41A41F4000140F400027D3491426A
+:1002900001D3641C00E04900002C02DA30BC0020CD
+:1002A00070474FF400000023914201D3891A0343A1
+:1002B00040084FEA4101F7D151B1914202D14FF0CC
+:1002C000004105E002D24FF0010101E06FF00101B1
+:1002D00003EBC450284430BC00F091BA2DE9FE4F26
+:1002E000804681EA0300C00F0C46009021F00041D7
+:1002F00023F00045B8EB0200A94105D24046214653
+:1003000090461C460B46024623F00040104347D05F
+:10031000270DC7F30A00C3F30A510290401A019057
+:1003200040286BDAC3F3130040F4801B0098924618
+:1003300020B10023D2EB030A63EB0B0B0198594663
+:10034000C0F14002504600F029FA06460D465046DC
+:100350005946019A00F041FA10EB0800614100246F
+:1003600087EA115284EAE7731A4340D0009A62B3D5
+:10037000019A012A4FEA075215DC001B61EB0201CA
+:100380004FF0004202EA0752CDE90042001C41F55D
+:10039000801132462B4600F078FA03B0BDE8F08FAA
+:1003A00040462146F9E7001B61EB0201001C41F5C4
+:1003B000801300185B412018A2F5001747EB0301DA
+:1003C00040EAD570B6196D4111E06D084FEA360666
+:1003D00045EAC0754FEA0752001B61EB0201001CA1
+:1003E00041F5801149084FEA300000195141324669
+:1003F0002B4603B0BDE8F04F00F038BA0098012258
+:1004000040000023D0EB020263EBE073009821462A
+:100410004FEAE074B8EB000061EB0401E9E783F018
+:1004200000435BE781F0004158E72DE9FE4F81EA88
+:10043000030404F0004421F0004100944FF0000B4D
+:1004400023F0004350EA01045ED052EA03045BD07B
+:10045000C3F30A54C1F30A552C44A4F2F3340194B3
+:10046000A0FB0254C1F3130141F48011C3F3130341
+:1004700043F4801301FB024400FB034E840A970AF5
+:1004800044EA815447EA8357A4FB076802958D0A22
+:1004900005FB07854FEA932C04FB0C542705029DAE
+:1004A0004FEA065847EA1637B5EB08056EEB070C1E
+:1004B000870E920E47EA811742EA8312A7FB0201D8
+:1004C000B6EB0B0164EB00042B0D43EA0C335E1812
+:1004D00044EB1C50DA465146E7FB0201C5F3130416
+:1004E0004FEA0B3343EA14534FEA0432019C43EAC8
+:1004F0000603A4F10C040294009CCDE900B400F0C2
+:10050000C4F903B0BDE8F08F00200146F9E72DE9FA
+:10051000F04D81EA030404F0004B21F0004514463D
+:100520004FF0000A23F0004150EA050220D054EABF
+:1005300001021DD0C5F30A570246C5F31303C1F3E8
+:100540001300C1F30A5640F4801543F48013A7EB5F
+:100550000608101BD64608F2FD3873EB050002D3DF
+:1005600008F1010801E092185B41B8F1000F03DACD
+:1005700000200146BDE8F08D00204FF480110646B2
+:1005800084460EE0171B73EB050705D3121B63EBC4
+:10059000050306434CEA010C49084FEA3000921863
+:1005A0005B4150EA0107EDD152EA030012D082EA22
+:1005B000040083EA0501084305D0101BAB4106D2B5
+:1005C0000122002306E000224FF0004302E06FF01A
+:1005D000010253101AEB06004CEB085110EB0A0015
+:1005E00041EB0B01BDE8F04D00F040B9C10F80EACE
+:1005F000E0700844CA079623002100F009B9962349
+:100600000022114600F004B90EB5C10F80EAE07077
+:100610000844CA07002140F233438DE80E000A4621
+:100620000B4600F032F903B000BD00F0004220F0AC
+:100630000040C10DC0F3160040F400007F2901DA2C
+:1006400000207047962903DCC1F19601C84001E003
+:1006500096398840002AF4D04042704720F000408C
+:10066000C10DC0F3160040F400007F2901DA00201C
+:100670007047962903DCC1F19601C840704796394E
+:1006800088407047C1F30A5210B5C1F3130140F21C
+:10069000FF3341F480119A4201DA002010BD40F28C
+:1006A00033439A42A2F2334203DC524200F085F80F
+:1006B00010BD904010BD00F0004230F000400AD064
+:1006C000C10D01F56071C0F3160042EA0151C20884
+:1006D00040071143704700200146704730B5041EA3
+:1006E00071F1000404DB4FF00044404264EB01016F
+:1006F000141E73F1000405DB1C464FF00043524208
+:1007000063EB04038B4208BF824230BD30B5041E48
+:1007100071F1000404DB4FF00044404264EB01013E
+:10072000141E73F1000405DB1C464FF000435242D7
+:1007300063EB0403994208BF904230BD01F00043CF
+:1007400030B421F0004150EA010206D00A0DA2F5B2
+:100750006072C1F31301002A02DC30BC0020704734
+:10076000440F44EAC104C100E01830BC00EBC250A1
+:1007700000F045B8002801DBC0F10040002901DB92
+:10078000C1F1004181427047002801DBC0F1004007
+:10079000002901DBC1F1004188427047202A04DBB7
+:1007A000203A00FA02F1002070479140C2F1200384
+:1007B00020FA03F3194390407047202A04DB203AC3
+:1007C00021FA02F00021704721FA02F3D040C2F171
+:1007D00020029140084319467047202A06DBCB17B8
+:1007E000203A41FA02F043EAE07306E041FA02F3EC
+:1007F000D040C2F1200291400843194670470029B9
+:10080000A8BF7047401C490008BF20F00100704796
+:1008100010B4B0FA80FC00FA0CF050EA010404BFF6
+:1008200010BC704749B1CCF1200421FA04F411FA4C
+:100830000CF118BF012121430843A3EB0C01CB1D90
+:100840004FEA00614FEA102042BF002010BC704701
+:1008500000EBC35010440029A4BF10BC7047401CDB
+:10086000490008BF20F0010010BC704710B5141EED
+:1008700073F1000408DA401C41F1000192185B4159
+:100880001A4301D120F0010010BD2DE9F04D924630
+:100890009B4611B1B1FA81F202E0B0FA80F2203247
+:1008A0009046FFF77BFF04460F4640EA0A0041EA04
+:1008B0000B0153465A46084313D0114653EA010030
+:1008C00019D0C8F140025046FFF777FF05460E46A3
+:1008D000504659464246FFF761FF084305D00120C4
+:1008E00004E020463946BDE8F08D0020054346EA85
+:1008F000E0762C4337430A986305E40AA0EB08002E
+:100900000022FD0A44EA47540A3002D5002001467D
+:10091000E9E7010510196941DDE908450019694158
+:10092000BDE8F04DA2E70000064C074D06E0E06888
+:1009300040F0010394E8070098471034AC42F6D326
+:10094000FFF7D8FB805B0008A05B000800BFFEE754
+:1009500070B504460D4600BF2CB903F03BFF01E023
+:1009600000BF00BFFCE700BF012070BD10B502480A
+:10097000006803F0BEFF10BD6400002010B50248FF
+:10098000006803F0B6FF10BD64000020704700004F
+:1009900010B50120074909680140814200D100E0FB
+:1009A000002129B101200349086000BF04F066FA64
+:1009B00010BD00001404014000BFFEE708B5054962
+:1009C000C9690143034AD1611146C96901400091D7
+:1009D00000BF08BD0010024008B505498969014300
+:1009E000034A9161114689690140009100BF08BD29
+:1009F0000010024008B5054989690143034A916125
+:100A0000114689690140009100BF08BD00100240F5
+:100A100008B5054989690143034A9161114689690D
+:100A20000140009100BF08BD0010024010B54A1EF1
+:100A3000044B9A5C825822F001034A1E014CA25CCE
+:100A4000835010BD6850000810B54A1E044B9A5CD4
+:100A5000825842F001034A1E014CA25C835010BD33
+:100A60006850000810B54A1E044B9A5C825842F048
+:100A700002034A1E014CA25C835010BD685000085E
+:100A800030B54B1E054CE35CC35823F4405313436D
+:100A90004C1E024D2C5D035130BD00002650000855
+:100AA00030B54B1E064CE35C03445B686FF30F03E9
+:100AB00013434C1E024D2C5D0444636030BD0000A6
+:100AC0006850000830B54B1E054CE35CC35844F237
+:100AD0001004A34313434C1E014D2C5D035130BD44
+:100AE0002650000810B54B1E024CE35C0344DA604C
+:100AF00010BD00006850000830B54B1E054CE35C8B
+:100B0000C35823F0800313434C1E024D2C5D035148
+:100B100030BD00002650000830B54B1E054CE35C8C
+:100B2000C35823F4406313434C1E024D2C5D035104
+:100B300030BD00002650000830B54B1E054CE35C6C
+:100B4000C35823F0200313434C1E024D2C5D035168
+:100B500030BD00002650000810B54B1E024CE35C6F
+:100B600003449A6010BD00006850000830B54B1E69
+:100B7000054CE35CC35823F0400313434C1E024D65
+:100B80002C5D035130BD00002650000830B54B1ECF
+:100B9000054CE35CC35823F4407313434C1E024DD1
+:100BA0002C5D035130BD0000265000080249096841
+:100BB0008143014A116070470404014002490968F9
+:100BC0008143014A116070470004014002490968ED
+:100BD0000143014A11607047040401400249096859
+:100BE0000143014A116070470C0401400249096841
+:100BF0000143014A1160704700040140024909683D
+:100C00000143014A116070470804014070B5044671
+:100C10000025207900284DD02068002850D0607928
+:100C200020B1012809D0022815D10DE02068FFF776
+:100C3000BDFF2068FFF7DAFF0FE02068FFF7BEFF77
+:100C40002068FFF7C3FF08E02068FFF7CFFF2068A8
+:100C5000FFF7BCFF01E0012500BF00BFA07940B352
+:100C6000A079012804D002280DD003281FD117E055
+:100C70002068144909688143124A116000BF206846
+:100C8000FFF7BCFF15E020680E49091F0968814382
+:100C90000C4A121F116000BF2068FFF79FFF08E099
+:100CA0002068FFF7ABFF2068FFF798FF01E0012500
+:100CB00000BF05E02068FFF781FF2068FFF776FF9F
+:100CC000284670BD0C0401402DE9F04102460B4658
+:100CD0001868C0F30F2595FAA5F0B0FA80F480E00B
+:100CE0000120A040284000287AD0082C04D240F2ED
+:100CF000011000FA04F106E0A4F108004FF001161B
+:100D0000864046F08061586808280ED11869D66878
+:100D100026EA11260F0A97FAA7F7B7FA87F700FA1B
+:100D200007F73E43D66000BF00BF586802EB11666C
+:100D300091FAA1FCBCFA8CFC4FEA8C084FF00F0C26
+:100D40000CFA08FC376827EA0C0791FAA1FCBCFAF8
+:100D50008CFC4FEA8C0C00FA0CFC47EA0C0737605D
+:100D600000BF5868012802D05868092838D198680F
+:100D700002EB116691FAA1FCBCFA8CFC4FEA8C08DC
+:100D80004FF0030C0CFA08FC376827EA0C0791FABD
+:100D9000A1FCBCFA8CFC4FEA8C0C00FA0CFC47EA74
+:100DA0000C07376000BFD86802EB116691FAA1FC0E
+:100DB000BCFA8CFC4FEA8C084FF0040C0CFA08FCCF
+:100DC000376827EA0C0791FAA1FCBCFA8CFC4FEAC1
+:100DD0008C0C00FA0CFC47EA0C07376000BF00BF20
+:100DE000641C25FA04F000287FF47AAFBDE8F08196
+:100DF00002469068C1F30F231840C1F30F239842B5
+:100E000001D1012070470020FCE702469068C1F341
+:100E10000F231840C1F30F23984201D101207047DE
+:100E20000020FCE7C1F30F2242617047C1F30F229B
+:100E300042617047C1F30F2242617047C1F30F2234
+:100E400002617047C1F30F220261704770B500EB79
+:100E5000116391FAA1F5B5FA85F5AE000F25B540FD
+:100E60001C68AC4391FAA1F5B5FA85F5AD0002FA1C
+:100E700005F52C431C6070BD70B500EB116391FA51
+:100E8000A1F5B5FA85F5AE000F25B5401C68AC4359
+:100E900091FAA1F5B5FA85F5AD0002FA05F52C43F6
+:100EA0001C6070BD02480068401C01490860704722
+:100EB000240000204FF47A71B0FBF1F2521E4FF083
+:100EC000E0235A6100229A6105221A6100BF70472F
+:100ED00010B5044600F0FEFE2060206800F0C6FE5B
+:100EE0006060606800F0D2FEA060606800F0E0FE24
+:100EF000E06010BD0149086070470000000000205C
+:100F0000016821F0800101607047816821F0800153
+:100F100081607047016841F0010101607047C1685C
+:100F200041F00101C160704710B5024613681C48CA
+:100F3000824208D0B2F1804F05D01A48824202D0D6
+:100F40001948824204D123F070004C6840EA04033F
+:100F50001348824208D0B2F1804F05D01148824236
+:100F600002D01148824204D123F44070CC6840EA98
+:100F7000040313608868D06200BF0888906200BFD5
+:100F80000748824203D10869106300BF00BF00BF59
+:100F9000506940F00100506100BF002010BD00000A
+:100FA000002C014000040040000800400146086990
+:100FB000C0F34000704701460869C0F380007047E5
+:100FC00001460869C0F3C000704701460869C0F3D4
+:100FD000001070470146086900F0010070470146A3
+:100FE000C868C0F3400070470146C868C0F380007D
+:100FF00070470146C868C0F3C00070470146C86822
+:10100000C0F3001070470146C86800F00100704747
+:1010100070B50246012901D1002416E0042901D14E
+:10102000012412E0102901D102240EE0402901D14F
+:1010300003240AE0B1F5807F01D1042405E0B1F575
+:10104000806F01D1052400E006242346064CE55CB0
+:1010500002F1180428190468044DEE5C0425B5401B
+:101060002C43046070BD0000035000080A500008C3
+:1010700070B50246012901D1002416E0042901D1EE
+:10108000012412E0102901D102240EE0402901D1EF
+:1010900003240AE0B1F5807F01D1042405E0B1F515
+:1010A000806F01D1052400E006242346064CE55C50
+:1010B00002F1180428190468044DEE5C0825B540B7
+:1010C0002C43046070BD0000035000080A50000863
+:1010D0002DE9F04106460C4615460127012C08D0A3
+:1010E000102C0CD0B4F5807F0FD0B4F5805F18D1F0
+:1010F00011E02946304600F081FC074612E02946FF
+:10110000304600F0B7FC07460CE02946304600F0B8
+:10111000F3FC074606E02946304600F029FD074665
+:1011200000E000BF00BF3846BDE8F0818163704732
+:10113000826844F207039A430A4382607047426818
+:1011400022F070020A434260704708B501680091BE
+:1011500000BF4168009100BF08BD6FF04001016011
+:10116000704700002DE9FF4104460D460127002687
+:10117000204600F055F8002833D1E9686868084334
+:1011800029690843E16841F20C6291430843E06039
+:10119000A868216921F440510143216100BF6869B9
+:1011A000616921F440710143616100BF6846FFF746
+:1011B0008FFE0E48844201D1039E08E00C48844211
+:1011C00001D1029E03E00B48844200D1029E46B149
+:1011D000286830B10027314620462A6800F025F8FB
+:1011E00000BF384604B0BDE8F0810000003801407F
+:1011F000004400400048004001460868C0F3400039
+:10120000704701460868C0F38000704701460868CF
+:10121000C0F3C000704701460868C0F380107047F3
+:101220000146C868C0F34030704770B501EBC10398
+:1012300003EB01139400B3FBF4F301EBC10404EBE3
+:1012400001149500B4FBF5F46425B4FBF5F404EB4C
+:10125000C40505EB0414A3EB8403322404EB03134D
+:101260006424B3FBF4F303F0F00301EBC10404EBDB
+:1012700001149500B4FBF5F46425B4FBF5F403EB1D
+:10128000041401EBC10303EB01139500B3FBF5F369
+:1012900001EBC10505EB01159600B5FBF6F56426DB
+:1012A000B5FBF6F505EBC50606EB0515A3EB8503C7
+:1012B000322505EB03136425B3FBF5F303F00F03AD
+:1012C00023449BB2836070BD38B50120144949693D
+:1012D0000143134A5161114649690140009100BF21
+:1012E00000BF00F04FFF05460022114600F00AFB48
+:1012F000044621460E2000F055FF0E2000F028FF86
+:1013000000F040FF05460022114600F0FBFA0446BB
+:1013100021460F2000F046FF0F2000F019FF38BDD6
+:10132000001002402DE9F04188B00020069007909F
+:10133000142101A8FEF7FFFE1020FFF74DFB20202F
+:10134000FFF74AFB0420FFF747FB0820FFF744FBA9
+:101350007C497D48FFF766FD43F230017B48FFF78B
+:1013600061FD7B497B48FFF75DFD764801900120D8
+:101370000290022003900020049001A97248FFF718
+:10138000A3FC754801900020029001A96E48FFF768
+:101390009BFC724801900420029001A96A48FFF763
+:1013A00093FC6F4801900020029001A96748FFF765
+:1013B0008BFC43F230000190012002900220039048
+:1013C000002004900120059001A96048FFF77CFCF3
+:1013D0004CF2C0000190082002900020059001A965
+:1013E0005A48FFF771FC40F201100190082002906A
+:1013F0000020059001A95748FFF766FC5948019065
+:101400000020029001A95348FFF75EFC504801906C
+:1014100001200290032003900020049001A94D4870
+:10142000FFF752FC00214FF470204F4AC3B252F82C
+:10143000232022EA1042030C93FAA3F3B3FA83F3B6
+:1014400001FA03F31A43484BC4B243F8242000BF07
+:10145000012006908DF81C0000208DF81D00012051
+:101460008DF81E0006A8FFF7D1FB384940F20110A5
+:10147000042201EB106390FAA0F5B5FA85F5AE00F1
+:101480000F25B5401C68AC4390FAA0F5B5FA85F578
+:10149000AD0002FA05F52C431C6000BF0621334B5A
+:1014A0001B68C3F30220002425460346C3F1070C42
+:1014B000BCF1040F02D94FF0040C01E0C3F1070C9A
+:1014C000674603F1040CBCF1070F02D24FF0000C89
+:1014D00001E0A3F1030C66464FF0010C0CFA07FC87
+:1014E000ACF1010C0CEA040C0CFA06FC4FF00108FC
+:1014F00008FA06F8A8F1010808EA05084CEA08020B
+:1015000000BF002904DB1007030E1948435407E00D
+:101510001007040E15480C3001F00F031B1FC454B4
+:1015200000BF0620002809DB00F01F0201219140C6
+:101530004209920002F1E022C2F8001100BF08B097
+:10154000BDE8F081200020040010014000080140A7
+:1015500030003004000C0140400040048000800452
+:101560009D0C9904FFFECF04080001400CED00E043
+:1015700000E400E030B585B014216846FEF7DBFDDD
+:101580004FF40060FFF736FA00F004FE0546002233
+:10159000032100F0D7F904462146192000F016FE79
+:1015A000192000F0E2FD41F61F40ADF800000020D8
+:1015B000019063200290002003900490694609483E
+:1015C000FFF7B2FC0748FFF79BFC00210548FFF737
+:1015D000AFFD00210348FFF7B2FD0248FFF795FC7D
+:1015E00005B030BD002C014000B593B014210EA809
+:1015F000FEF7A1FD202106A8FEF79DFD142101A8FC
+:10160000FEF799FD0120FFF7D9F90020ADF8380069
+:101610000F9041F61F401090002011900EA94FF03E
+:101620008040FFF781FC00BF4FF08040006840F031
+:1016300080004FF08041086000BF00214FF08040E3
+:10164000FFF776FD10218806FFF712FD7020069047
+:10165000002007900890099002200A9006AA102105
+:101660004007FFF735FD10218806FFF7D1FC002168
+:101670004FF08040FFF763FD4FF08040FFF745FCDF
+:101680000420FFF7B7F940F20220019009200290F0
+:10169000022003900020049001A90248FFF714FBE8
+:1016A00013B000BD0008014030B585B01421684674
+:1016B000FEF741FD0220FFF781F900F06BFD0546C2
+:1016C0000022012100F03EF9044621461D2000F0D1
+:1016D0007DFD1D2000F049FD41F61F40ADF80000E2
+:1016E0000020019063200290002003906946094881
+:1016F000FFF71AFC0748FFF703FC00210548FFF736
+:1017000017FD00210348FFF71AFD0248FFF7FDFB14
+:1017100005B030BD000400402DE9F0418CB01C2123
+:1017200005A8FEF708FD14216846FEF704FD4FF4F6
+:101730008040FFF76DF90420FFF76AF968480090D0
+:10174000092001900320029000200390694665481B
+:10175000FFF7BAFA64480090042001906946614896
+:10176000FFF7B2FA002205216048FFF7ABF900222B
+:1017700005215E48FFF784F9002205215B48FFF749
+:10178000DBF9002205215948FFF7F0F980220521F5
+:101790005648FFF7B1F9002205215448FFF7F6F942
+:1017A000002205215148FFF7B7F9102204214F48C4
+:1017B000FFF788F9002204214C48FFF761F9002265
+:1017C00004214A48FFF7B8F9002204214748FFF7EF
+:1017D000CDF9802204214548FFF78EF9002204212B
+:1017E0004248FFF7D3F9002204214048FFF794F95B
+:1017F00025213F4B1B68C3F3022005240025034627
+:10180000C3F1070CBCF1040F02D94FF0040C01E046
+:10181000C3F1070C674603F1040CBCF1070F02D2B9
+:101820004FF0000C01E0A3F1030C66464FF0010CF1
+:101830000CFA07FCACF1010C0CEA040C0CFA06FCE7
+:101840004FF0010808FA06F8A8F1010808EA0508AF
+:101850004CEA080200BF002904DB1007030E2548EC
+:10186000435407E01007040E21480C3001F00F0329
+:101870001B1FC45400BF2520002809DB00F01F02F5
+:10188000012191404209920002F1E022C2F80011C8
+:1018900000BF4FF4E13005900020069007900890BB
+:1018A0000C20099000200A900B9005A91248FFF720
+:1018B00059FC00BF1048006920F490400E490861AF
+:1018C0000846406920F02A00486100BF00BF084672
+:1018D000C06840F40050C86000BF0CB0BDE8F081A3
+:1018E0000200020400080140040004040000024059
+:1018F0000CED00E000E400E00038014000BFFEE72E
+:1019000000BFFEE7F0B503460C4603F00701C1F146
+:101910000700042801D9042001E0C1F107000646B0
+:10192000081D072801D2002000E0C81E054601203E
+:10193000B040401E2040A8400127AF407F1E174006
+:101940003843F0BDF0B503460C4603F00701C1F182
+:101950000700042801D9042001E0C1F10700064670
+:10196000081D072801D2002000E0C81E05460120FE
+:10197000B040401E2040A8400127AF407F1E1740C6
+:101980003843F0BD2DE9F04704460F4616461D4684
+:101990003946E069FEF732FC82463146FEF72EFCFE
+:1019A00081462968FEF72AFC8046616CFEF7CEFB73
+:1019B00060643946A069FEF721FC82463146FEF795
+:1019C0001DFC81466968FEF719FC8046216CFEF714
+:1019D000BDFB20643946206AFEF710FC8246314682
+:1019E000FEF70CFC8146A968FEF708FC8046A16C56
+:1019F000FEF7ACFBA064BDE8F087000070B50246BE
+:101A0000106A20F001001062136A5568946924F08E
+:101A1000030424F070000E6840EA060423F002007C
+:101A20000E6940EA060323F001004E6840EA06030F
+:101A30000F48824213D123F008004E6940EA860322
+:101A400023F004008E6840EA860325F480708E69D6
+:101A500040EA060525F40070CE6940EA4605556067
+:101A60009461C868506300BF1362002070BD00001D
+:101A7000002C01402DE9F04104460D46206A20F07B
+:101A800010002062266AD4F80480A76927F4407702
+:101A900027F4E040296840EA012726F02000296960
+:101AA00040EA011626F01000696840EA0116114864
+:101AB000844213D126F08000696940EA811626F03D
+:101AC0004000A96840EA811628F48060A96940EACC
+:101AD000810828F40060E96940EAC108C4F804807C
+:101AE000A7612046E968FFF721FB26620020BDE8D8
+:101AF000F0810000002C014070B50246106A20F40D
+:101B000080701062136A5568D46924F0030424F0CD
+:101B100070000E6840EA060423F400700E6940EA83
+:101B2000062323F480704E6840EA06230F48824261
+:101B300013D123F400604E6940EA862323F48060C9
+:101B40008E6840EA862325F480508E6940EA0615A7
+:101B500025F40050CE6940EA46155560D461C86846
+:101B6000D06300BF1362002070BD0000002C014054
+:101B700070B50246106A20F480501062146A5568ED
+:101B8000D36923F4407323F4E0400E6840EA06234F
+:101B900024F400500E6940EA063424F480504E6864
+:101BA00040EA06340748824204D125F480408E6919
+:101BB00040EA86155560D361C868106400BF14629E
+:101BC000002070BD002C014070B503460C46DD6A54
+:101BD00055436426B5FBF6F5A8B2012C08D0102CAD
+:101BE0000AD0B4F5807F0BD0B4F5805F10D10BE044
+:101BF00000BF586300BF0CE000BF986300BF08E05F
+:101C000000BFD86300BF04E000BF186400BF00E05D
+:101C100000BF00BF00BF70BD70B503460C46DD6A53
+:101C200055436426B5FBF6F5A8B2012C08D0102C5C
+:101C30000AD0B4F5807F0BD0B4F5805F10D10BE0F3
+:101C400000BF586300BF0CE000BF986300BF08E00E
+:101C500000BFD86300BF04E000BF186400BF00E00D
+:101C600000BF00BF00BF70BD70470000014600BF4D
+:101C70000448406800F0F0000009034A125C21FAB1
+:101C800002F070470010024050500008014600BFAB
+:101C90000548406800F4E060044A02EB1020027836
+:101CA00021FA02F070470000001002406050000866
+:101CB000014600BF0548406800F46050044A02EB4A
+:101CC000D020027821FA02F0704700000010024094
+:101CD0006050000810B5002400BF0B48406800F0B9
+:101CE0000C0020B1042804D0082808D103E0074CD8
+:101CF00007E0064C05E000F00BF8044601E0034C59
+:101D000000BF00BF204610BD0010024000127A0044
+:101D10000021002200BF1148406800F480300246D4
+:101D20001AB1B2F5803F0CD101E00D490BE000BFC4
+:101D30000A484068C0F34040401C0A4BB3FBF0F136
+:101D400001E0074900BF00BF00BF0448406800F43D
+:101D50007010022303EB904048437047001002408C
+:101D600000093D0000127A007047704710B502204C
+:101D70003749096821F007010143354A116000BF66
+:101D800000BF00BF3248006800F007000228F8D109
+:101D900000BF3048006840F480302E49086000BF22
+:101DA00000BF00BF2B480068C0F340400028F8D0B7
+:101DB0004FF480304FF4E011264A526822F47C122E
+:101DC00000F440330B431A43224B5A6000BF00BF5C
+:101DD0001846006840F080701946086000BF00BFD8
+:101DE00000BF1C480068C0F340600028F8D0002005
+:101DF0001849496821F0F0010143164A516000BFBB
+:101E000010151146496821F4E0610143516000BF9B
+:101E100000201146496821F460510143516000BF20
+:101E200002201146496821F003010143516000BFBF
+:101E300000BF00BF0748406800F00C000828F8D138
+:101E40000548FFF737F80448FFF754F810BD0000C5
+:101E5000002002400010024000A24A047047000027
+:101E600010B53248FFF7B6F801285ED100BF2F4801
+:101E7000FFF79CF801280AD12C48FFF7B0F8012899
+:101E800005D100BF001F2949086100BF00BF2748D6
+:101E9000FFF791F801280AD12448FFF7A5F8012897
+:101EA00005D100BF801F2149086100BF00BF1F4846
+:101EB000FFF786F801280BD11C48FFF79AF8012894
+:101EC00006D100BF6FF008001849086100BF00BFCD
+:101ED0001648FFF77AF801280BD11448FFF78EF85F
+:101EE000012806D100BF6FF010001049086100BF43
+:101EF00000BF0E48FFF76EF801280AD10B48FFF724
+:101F000082F8012805D100BFC01E0849086100BF42
+:101F100000BF00BFFEF7C6FF00F0B4FF00BF0448DB
+:101F20000068401C0249086000BF10BD002C014041
+:101F30006000002010B52E48FFF74CF8012855D15D
+:101F400000BF2B48FFF732F801280AD12848FFF7D5
+:101F500046F8012805D100BF001F2549086100BFD0
+:101F600000BF2348FFF727F801280AD12048FFF7D0
+:101F70003BF8012805D100BF801F1D49086100BF43
+:101F800000BF1B48FFF71CF801280BD11848FFF7CA
+:101F900030F8012806D100BF6FF00800144908612D
+:101FA00000BF00BF1248FFF710F801280BD11048FE
+:101FB000FFF724F8012806D100BF6FF010000C498C
+:101FC000086100BF00BF0A48FFF704F801280AD1E2
+:101FD0000748FFF718F8012805D100BFC01E0449C3
+:101FE000086100BF00BF00BF02F0F0FF10BD00009D
+:101FF0000004004010B50248006802F0A5FD10BDC5
+:102000006400002000BFFEE72DE9F04F91B00446C8
+:1020100088469146C4F8108049462069FEF7E8F8E2
+:102020000546276BE06AFEF746FBCDE90801284626
+:10203000FEF741FB21F00041CDE90601DDE908236F
+:10204000FEF764FB62D20D952846616AFEF7D0F870
+:102050000E904FF08041606AFEF7D0F82946099053
+:10206000FEF7C9F88346A16AFEF770F80F90A06CDE
+:10207000FEF721FB21F00041CDE90601206CFEF7BF
+:102080001AFB21F00041CDE90201606CFEF713FB61
+:1020900021F00041CDE90001DDE90223FEF71EF940
+:1020A000CDE90401DDE90623FEF718F9CDE90801C1
+:1020B000FEF744FB82465146606CFEF7D1F80A9069
+:1020C0005146206CFEF7CCF80B905146A06CFEF701
+:1020D000C7F80C900F990C98FEF790F809900E999C
+:1020E0000B98FEF78BF807900D990A98FEF786F883
+:1020F00006900799FEF72AF808900999FEF726F846
+:1021000083466169FEF77AF8064600E0002631460C
+:102110003846FEF71BF807463846A16BFEF734FB3E
+:1021200000D2A76B3846E16BFEF724FB00D2E76BC9
+:102130002763216B61630DAB3A4629462046FFF7C2
+:1021400021FC616AA1626562606B11B0BDE8F08F2D
+:10215000002809DB00F01F02012191404209920092
+:1021600002F1E022C2F800117047002809DB00F0FC
+:102170001F02012191404209920002F1E022C2F8BF
+:102180000011704702480068C0F302207047000049
+:102190000CED00E002480068C0F302207047000028
+:1021A0000CED00E010B5002804DB0A07130E054A09
+:1021B000135406E00A07140E034A00F00F031B1F16
+:1021C000D45410BD00E400E018ED00E010B5002884
+:1021D00004DB0A07130E054A135406E00A07140E1F
+:1021E000034A00F00F031B1FD45410BD00E400E0AD
+:1021F00018ED00E002E008C8121F08C1002AFAD159
+:1022000070477047002001E001C1121F002AFBD176
+:102210007047000070B50446A06B01280AD106483B
+:10222000D4F88811FDF7EAFF0546D4F88C11FDF7C4
+:10223000E5FF70BD0020FCE79A99993D70B5044612
+:10224000A06B01280AD10C48D4F88811FDF7D6FFFD
+:102250000646D4F88C11FEF703F809E00748D4F8D5
+:102260008811FDF7CBFF0646D4F88C11FDF7F8FF77
+:102270000546284670BD00009A99993F8FC2F53EE9
+:1022800070B50446A06B012805D10748D4F8881121
+:10229000FDF7B4FF04E00548D4F88811FDF7AEFF60
+:1022A0000546284670BD00009A99193FCDCCCC3E1A
+:1022B000014601F1100000E0001D02681AB9024A4F
+:1022C00012689042F8D37047380000202DE9F0479B
+:1022D00004464FF000080025A946002794F898000E
+:1022E00058B9002604F14406D6F84C80B56AD6E900
+:1022F0000010FDF77DFF81460BE0002604F1440647
+:10230000D6F82880756AD6E90010FDF771FF81467E
+:1023100000BF41464846FDF719FF074694F89B0069
+:10232000012817D100213846FEF72EFA10D80021D7
+:102330002846FEF71FFA02D285F0004000E028464A
+:1023400006463946FEF720FA02D80120BDE8F0879C
+:102350000020FBE794F89B0002280DD100213846AD
+:10236000FEF708FA06D829463846FEF70DFA01D8D6
+:102370000120EBE70020E9E700212846FEF7FAF903
+:1023800002D285F0004000E028460646002138468B
+:10239000FEF7F0F902D287F0004000E038468246AE
+:1023A0003146FEF7E7F901D80120CFE70020CDE75D
+:1023B00010B50648046803E02046FFF779FF04469D
+:1023C000034800688442F7D310BD000034000020A9
+:1023D0003800002010B504462146002001F0BAFB69
+:1023E00010BD10B501E000F8011B131EA2F101049D
+:1023F000A2B2F8D110BD10B501E000F8011B131E08
+:10240000A2F10104A2B2F8D110BD10B501E000F8AC
+:10241000011B131EA2F10104A2B2F8D110BD70B5C8
+:1024200004460D46164694F8980028B932462946C7
+:10243000204601F049FC70BD32462946204601F095
+:102440003DF9F8E7024692F8980040B9002002F101
+:102450004400002303614364416341640AE00020B7
+:1024600002F1440000238361C3610362036481605D
+:10247000816300BF704700002DE9F04F87B004462C
+:1024800002F0A0F98246A06CAAEB0001E06C814248
+:1024900003D2022007B0BDE8F08FC4F848A0A06ABC
+:1024A000D0F800903C20005DE8B900216165C4F8D7
+:1024B0005811C4F878112164616484F87C11C4F85F
+:1024C000309001213C200155E06A0168C4F8841174
+:1024D000D4F88001FEF78AF80746D4F88411FDF796
+:1024E00035FEE16A0860606BFEF780F88046216B7C
+:1024F000FDF72CFE07464946FEF73CF90BD2D4F80F
+:102500008001FEF773F80746D4F88411FDF773FED7
+:10251000E16A086016E0606BFEF768F88046216BA0
+:10252000FDF769FE07464946FEF72EF90AD2D4F8B0
+:102530008001FEF75BF80746D4F88411FDF706FE2C
+:10254000E16A0860012084F824000121252001555A
+:10255000206D451E2BE004F1580050F8257094F8CA
+:10256000240060B13846FEF741F880464946FEF740
+:1025700001F901D2012000E0002084F82400252088
+:10258000005D60B13846FEF731F880464946FEF7F7
+:10259000FBF801D2012100E000212520015504F1C2
+:1025A000580050F82520691C40F821206D1E002D90
+:1025B000D1DA4846FEF739F8A06594F8240070B3E4
+:1025C000606D08B901216165606D401CD0B90121C1
+:1025D0006165D4F85801401CC4F8580184F87C1196
+:1025E000606C68B1D4E91010091A04F5AE70D4F823
+:1025F000782140F82210D4F87801401CC4F8780102
+:10260000216C6164C4F840A04846FEF70EF801460C
+:1026100004F59270D4F8582140F8221023E0FFE727
+:102620002520005DF8B1606D10B94FF0FF31616594
+:10263000606D012809D1811E6165D4F85801401CE4
+:10264000C4F85801012184F87C11D4F858010A28F3
+:1026500009DA4846FDF7E9FF014604F59270D4F81F
+:10266000582140F8221094F87C01002863D0D4F857
+:1026700058010C285FD1002602251AE004F592705B
+:1026800050F82520691C50F82100101A07D504F5D0
+:10269000927050F8211050F82500081A07E004F550
+:1026A000927050F82520691C50F82100101A064439
+:1026B0006D1C0A2DE2DD092096FBF0F63046FDF791
+:1026C000A3FF1F4A1F4BCDE90001FDF7AEFE0746F1
+:1026D0008846D4F88011C800FDF788FF8346FDF7CF
+:1026E000EAFF3A464346CDE90201FDF710FFCDE986
+:1026F0000401FEF723F8C4F888010026012505E04F
+:1027000004F5AE7050F8250006446D1C052DF7DD6C
+:10271000052096FBF0F63046FDF768FF07460A49AC
+:10272000FDF79EFDC4F88C010021E06A01603C20A9
+:1027300001550120AEE6002184F87C110020A9E6B5
+:102740006E861BF0F921094000007A4410B590F81C
+:10275000983053B9002300F1440319620AB10124EF
+:1027600000E0002483F824400AE0002300F1440341
+:10277000D9640AB1012400E0002483F8504000BF6E
+:1027800010BD8163704770B504460D461646A562BC
+:10279000E6620021A1630121616300213C20015513
+:1027A0000121C4F880110821204601F035FC02F017
+:1027B00009F8A06470BD00002DE9F05F05460E46E3
+:1027C00017469846DDE90BABDDF82890012085F827
+:1027D00099002449A82041510021AC204151B0204A
+:1027E00041512149B82041512049B420415195F827
+:1027F0009800E0B9002405F1440454220021204649
+:10280000FFF703FE6661A761C4F81C80C4F8289036
+:10281000C4F84CA00D98A063C4F83CB0002084F824
+:10282000240084F84800012084F8490017E00024BF
+:1028300005F14404542200212046FFF7E6FDE6603E
+:102840002761C4F81480C4F82490C4F828A00D9817
+:10285000E062C4F830B0012084F8450000BFBDE854
+:10286000F09F000000004040000020C10000204117
+:102870002DE9F04104460D46164625610E49616179
+:102880000E49A1610E49E161002121626162A162EC
+:1028900025636163A663E56329463046FDF7A8FC1E
+:1028A00007460849FDF7AAFCE06207492164616414
+:1028B000A164BDE8F08100008FC2F53D6666E63E8A
+:1028C000CDCC4C3D6F12033ACDCCCC3D90F8982046
+:1028D00022B9002200F14402916204E0002200F1DA
+:1028E0004402516200BF7047B8231950B4231A50F4
+:1028F000704790F8982022B9002200F144025164F8
+:1029000004E0002200F14402916300BF704790F898
+:10291000982022B9002200F14402D16104E0002293
+:1029200000F14402516100BF704790F8982022B92D
+:10293000002200F14402D16204E0002200F14402CE
+:10294000D16300BF704790F898202AB9002200F1A7
+:10295000440282F84A1005E0002200F1440282F8A5
+:10296000461000BF704790F8982022B9002200F16D
+:102970004402916104E0002200F14402116100BFB1
+:10298000704790F898202AB9002200F1440282F89A
+:10299000491005E0002200F1440282F8451000BF12
+:1029A000704790F8982022B9002200F1440251614A
+:1029B00004E0002200F14402D16000BF704770B50E
+:1029C00004460D462946204601F026FB70BD4163B2
+:1029D00070478263C1637047C0F88011704710B5BB
+:1029E00090F898302BB9002300F144039A63D9631F
+:1029F00005E0002300F14403DA62196300BF10BD53
+:102A000010B590F8983033B9002300F1440383F8EF
+:102A100048101A6406E0002300F1440383F84410D0
+:102A20009A6400BF10BD2DE9F05F05460F46904641
+:102A30001E46DDE90BABDDF8289095F89800F0B95B
+:102A4000002405F144046761C4F81880E661C4F805
+:102A50002890C4F838B0C4F83CA0002084F82400C2
+:102A600084F8480000213046FDF78EFE03D2012095
+:102A700084F84A0002E0002084F84A0019E00024AB
+:102A800005F14404E760C4F810806661C4F824903E
+:102A9000C4F82CB0C4F830A000213046FDF774FE15
+:102AA00003D2012084F8460002E0002084F84600AA
+:102AB00000BFBDE8F09F000010B500F0EFFE02F08F
+:102AC000FDF900200A4908600A49086000BF0A4869
+:102AD000FEF720FA0848FEF722FA00BF00BF0748B9
+:102AE000FEF718FA0548FEF71AFA00BF10BD0000FD
+:102AF000040000200C000020002C014000040040D5
+:102B000010B5034800F010F8024800F0A1FD10BD18
+:102B1000040000200C00002010B501F0E5FF01F0DA
+:102B2000D9FD00F06FFF10BD38B5044600200090BD
+:102B3000206810B1232830D125E000BF1948007863
+:102B400020B1012813D0022813D111E001F052FB6B
+:102B500015A20021084601F06FFD12480023194616
+:102B60008268582001F050FB01F00AFE02E001E00B
+:102B700000E000BF00BF00BF0E480068606000BFFB
+:102B80002320206000BF0B4960680968081A0A28E2
+:102B900001D2002038BD00BFD0E7002020600090A7
+:102BA0000320F7E7800100202050455243454E5452
+:102BB0003A0000006000002000F10C0343F82120DF
+:102BC000704770B504462079A16888470546E078CB
+:102BD00000F00700002802DD2088401C2080E078FB
+:102BE000B5EBD01F13D0E078C008401CE17860F34B
+:102BF000C501E170C1F3C20003280CDBE07865F386
+:102C0000C710E070E07820F03800E07003E0E07872
+:102C100020F03800E070E07800F00700062876D257
+:102C2000DFE800F00326529DE7C6E078C0F380108D
+:102C3000E178B0EBD11F15D1A07820F0F000A070A2
+:102C4000E06810B12046E168884700202080A07825
+:102C500020F00F00401CA070E07820F00700401C1E
+:102C6000E07004E0A07820F0F0008030A070C5E0B3
+:102C7000E078C0F38010E178B0EBD11F11D0A078DC
+:102C800020F0F0001030A070206910B120462169BA
+:102C9000884700202080E07820F00700801CE0704A
+:102CA00011E0208832280EDDA07820F0F0005030AE
+:102CB000A070206A10B12046216A8847E07820F091
+:102CC0000700401DE07099E0E078C0F38010E178E3
+:102CD000B0EBD11F1CD1A07820F0F000A070E0680C
+:102CE00010B12046E1688847A078401CA17860F3C5
+:102CF0000301A170606910B1204661698847002016
+:102D00002080E07820F00700C01CE07026E070E032
+:102D10002088032822DDA07800F00F0001280AD1C6
+:102D2000A07820F0F0003030A070A06990B120466B
+:102D3000A16988470EE0A07800F00F00022809D1B1
+:102D4000A07820F0F0004030A070E06910B120467B
+:102D5000E1698847E07820F00700E0704EE0E07815
+:102D6000C0F38010E178B0EBD11F19D0A07820F02B
+:102D7000F0001030A070206910B12046216988470A
+:102D80002088032807DA00202080E07820F0070060
+:102D9000801CE0700BE0E07820F00700E07006E0B7
+:102DA0002088032803DDE07820F00700E07025E0AC
+:102DB000E078C0F38010E178B0EBD11F0AD1A078A1
+:102DC00020F0F0006030A070606A88B12046616A2F
+:102DD00088470DE0A07820F0F0001030A070206946
+:102DE00010B1204621698847E07820F00700E070A4
+:102DF00004E0E07820F00700E07000BF00BF70BD85
+:102E00002DE9F04104460E4617461D46DDF81880B0
+:102E1000204600212C2201E000F8011B131EA2F124
+:102E2000010C1FFA8CF2F7D100BFA07820F0F0005F
+:102E30008030A070A6602846A1688847E17860F3DA
+:102E4000C711E170E07867F38610E070257184F8AF
+:102E50000580BDE8F081000001460948026805E0F0
+:102E60008A4202D14FF0FF307047926A002AF7D1B0
+:102E7000034800688862024801600020F4E700000F
+:102E80001C00002010B50548046803E02046FFF749
+:102E900098FEA46A002CF9D110BD00001C0000208F
+:102EA0002DE9F84F04460025A9464FF07E56DFF87D
+:102EB000BCA00020009094F8980030B9002004F1E4
+:102EC0004400C568D0F8449006E0002004F14400B6
+:102ED0008569D0F8389000BF49462846FDF78EF93D
+:102EE00007460021FDF750FC3DD200212846FDF7A2
+:102EF00041FC02D285F0004000E0284607463146FA
+:102F0000FDF738FC03D84FF07E5000902BE051467F
+:102F10003046FDF71BF9804600212846FDF72AFCC4
+:102F200002D285F0004000E0284607464146FDF702
+:102F300021FC16D800212846FDF71CFC02D285F0A2
+:102F4000004000E0284683465146FDF754F980468C
+:102F50003146FDF7FBF807465146FDF781F9009031
+:102F600001E0002000900098BDE8F88F00002041AB
+:102F700070B504460D46164632462946204600F0F6
+:102F80002BF870BD01490860704700002000002048
+:102F900070B5034600224FF0E02675690D4E366885
+:102FA00003FB06F44FF0E026B16910E04FF0E02695
+:102FB000B06988420BD0884202D20E1A324402E035
+:102FC0002E1A0E4432440146A24200D300E0EDE73F
+:102FD00000BF70BD200000202DE9F04F8DB081466C
+:102FE0008A4614464846E169FDF7C4FB01D2E06910
+:102FF00000E048468346A169FDF7BCFB08D248467D
+:10300000E169FDF7B7FB01D2E06902E0484600E064
+:10301000A0698146FE495046FDF7ACFB01D2FC4851
+:1030200000E050468346FB49FDF7A4FB08D2F8496F
+:103030005046FDF79FFB01D2F54802E0504600E004
+:10304000F4488246F4494846FDF7D8F88346F149EA
+:10305000FDF706F98146F0495046FDF7CFF8834663
+:10306000EC49FDF7FDF88246EB494846FDF78CFB3D
+:1030700001D2002038E0E9494846FDF77BFB01D248
+:10308000002031E000214846FDF77EFB13D84FF0C9
+:1030900080414846FDF778FB01D8E14824E04FF035
+:1030A0007E514846FDF770FB02D84FF07F501BE081
+:1030B0004FF07C5018E0DB494846FDF765FB02D82D
+:1030C0004FF03F4010E04FF040414846FDF75CFBB9
+:1030D00002D8D148404207E0D0494846FDF754FBAA
+:1030E00001D8D14800E000200C904FF07C510C98A2
+:1030F000FDF77EF8C8490690FDF728F88346FDF7EE
+:1031000094FA05464FF07C510C98FDF71FF8C24920
+:103110000690FDF71BF88346FDF787FA0746002166
+:103120000C98FDF727FB01D1002008E04FF07C51FF
+:103130000C98FDF70BF883464946FDF759F80A90BD
+:1031400000210C98FDF716FB01D1002008E04FF09C
+:103150007C510C98FDF74CF883464946FDF74BF837
+:103160000890AD495046FDF70FFB01D2002038E032
+:10317000AA495046FDF7FEFA01D2002031E00021B5
+:103180005046FDF701FB13D84FF080415046FDF744
+:10319000FBFA01D8A24824E04FF07E515046FDF7DB
+:1031A000F3FA02D84FF07F501BE04FF07C5018E04C
+:1031B0009C495046FDF7E8FA02D84FF03F4010E036
+:1031C0004FF040415046FDF7DFFA02D892484042A6
+:1031D00007E092495046FDF7D7FA01D8924800E03F
+:1031E00000200B904FF07C510B98FDF701F88A49B5
+:1031F0000690FCF7ABFF8346FDF717FA06464FF043
+:103200007C510B98FCF7A2FF83490690FCF79EFFC8
+:103210008346FDF70AFA804600210B98FDF7AAFACB
+:1032200001D1002008E04FF07C510B98FCF78EFF95
+:1032300083465146FCF7DCFF099000210B98FDF70F
+:1032400099FA01D1002008E04FF07C510B98FCF76F
+:10325000CFFF83465146FCF7CEFF0790DDE907100C
+:10326000FCF7CCFF0590C7EBC700704A02EB80006B
+:1032700050F828100598FCF7C1FF8346DDE90801E6
+:10328000FCF7BCFF0390C7EBC700684A02EB800065
+:1032900050F826100398FCF7B1FF059007990A989B
+:1032A000FCF7ACFF0190C5EBC500604A02EB800063
+:1032B00050F828100198FCF7A1FF0390DDE90910F0
+:1032C000FCF79CFF0190C5EBC500584A02EB80005B
+:1032D00050F826100198FCF791FF02900399FCF733
+:1032E00035FF04900599FCF731FF59460690FCF72D
+:1032F0002DFF2060DDE90710FCF780FF8346C7EB58
+:10330000C7004B4A02EB800050F828105846FCF7E3
+:1033100075FF0690DDE90801FCF770FF0390C7EB2D
+:10332000C700434A02EB800050F826100398FCF7D0
+:1033300065FF834607990A98FCF760FF0190C5EB8B
+:10334000C5003B4A02EB800050F828100198FCF7BA
+:1033500055FF0390DDE90910FCF750FF0190C5EB24
+:10336000C500334A02EB800050F826100198FCF7A4
+:1033700045FF02900399FCF7E9FE59460490FCF7DB
+:10338000E5FE05900699FCF7E1FE6060DDE90710B7
+:10339000FCF734FF8346C7EBC700264A02EB8000E8
+:1033A00050F828105846FCF729FF0690DDE908017F
+:1033B000FCF724FF8346C7EBC7001E4A02EB8000E0
+:1033C00050F826105846FCF719FF049007990A9800
+:1033D000FCF714FF0190C5EBC500164A02EB800014
+:1033E00050F828100198FCF709FF8346DDE9091021
+:1033F000FCF704FF0190C5EBC5000E4A02EB80000C
+:1034000050F826100198FCF7F9FE5946029013E097
+:10341000000020C10000204100004040000040C0EA
+:1034200000002040000080BF000020C03459000888
+:10343000F8590008BC5A0008FCF788FE039004996C
+:10344000FCF784FE05900699FCF780FEA060E16819
+:103450002068FCF7D3FE206021696068FCF7CEFE8F
+:1034600060606169A068FCF7C9FEA0600DB0BDE8AE
+:10347000F08F000010B500BF01220E490E48FDF785
+:10348000FBFC00BF0B490C48FDF7DCFC0B490A486C
+:10349000FDF7D8FC0420FFF77BFD06490648FDF741
+:1034A000C9FC0420FFF774FD04490348FDF7C2FC82
+:1034B00010BD000010001004000C0140200020048A
+:1034C00010B500BF01220E490E48FDF7D5FC00BF24
+:1034D0000D490C48FDF7AEFC09490A48FDF7AAFC66
+:1034E0000420FFF755FD08490648FDF7ABFC0449E9
+:1034F0000448FDF7A7FC0420FFF74AFD10BD0000BB
+:1035000010001004000C01402000200410B500241D
+:10351000082213491348FDF7AFFC11491148FDF784
+:1035200091FC0420FFF734FD0F490E48FDF78AFC9B
+:103530000420FFF72DFD07E0601CC4B2FA2C03DD68
+:10354000FFF7BEFF002010BD05490648FDF75DFCF2
+:103550000028F1D104490348FDF76CFC0120F2E793
+:1035600010001004000C01402000200470B5044637
+:10357000002500BF012217491748FDF77DFC00BF59
+:1035800016491548FDF756FC00BF1FE0E00920B1C1
+:1035900010491148FDF756FC03E00E490E48FDF7AF
+:1035A00049FC6006040E0220FFF7F2FC0B490A48B2
+:1035B000FDF748FC0220FFF7EBFC08490648FDF741
+:1035C00039FC0220FFF7E4FC681CC5B2082DDDDBE6
+:1035D00070BD000010001004000C01402000200409
+:1035E00038B5044600208DF800008DF80140FFF743
+:1035F00041FF7820FFF7BAFFFFF788FF9DF8000032
+:10360000FFF7B4FFFFF782FF9DF80100FFF7AEFF61
+:10361000FFF77CFFFFF754FF38BD38B50446402064
+:103620008DF800008DF80140FFF724FF7820FFF7A8
+:103630009DFFFFF76BFF9DF80000FFF797FFFFF777
+:1036400065FF9DF80100FFF791FFFFF75FFF38BDB1
+:1036500038B5014600200090086810B1362821D105
+:1036600016E000BF124B134CE068C3F30F2222EAAE
+:10367000000400EA020544EA05440E4D2C6100BF37
+:1036800000BF0D480068486000BF3620086000BFDA
+:10369000094A48681268101A642801D2002038BD0F
+:1036A00000BFDFE70020086000900320F7E700007C
+:1036B0002000200400100140600000202DE9F04FA0
+:1036C00085B005460F4690464FF0000B05F14404C7
+:1036D000C4F80480D4E90001FCF78AFDA0616449C4
+:1036E000A069FDF751F803D8E06A05B0BDE8F08F96
+:1036F0006049A069FDF73EF801D8206BF5E7606AE4
+:10370000FCF7D9FFCDE90201A069FCF7D4FF21F055
+:103710000041CDE90001DDE90223FCF7DFFF01D81C
+:103720000020A061D4E90601FCF762FD0490D4F802
+:1037300018904FF08040E169FCF760FD0290A169AC
+:10374000FCF759FD0390216AFCF700FD064695F849
+:103750009900012805D105F19C02A0690499FFF7A1
+:1037600007FC94F84400012804D13946284600F0AB
+:103770009BFC00E0276000BF95F89A0001282CD13F
+:103780000021A069FCF7F6FF03D2A06980F0004099
+:1037900000E0A06936490390FCF7F6FF0AD2A022A8
+:1037A00051592069FCF7D2FC49460390FCF726FDED
+:1037B000A0631CE02846FFF773FBA0220390515939
+:1037C0002069FCF7C3FC49460190FCF717FD029005
+:1037D0000399FCF713FDA06309E0A0225159206969
+:1037E000FCF7B4FC49460390FCF708FDA06394F88D
+:1037F000460008B94FF0000B94F8450008B90020C6
+:10380000A063D5F89C10E068FCF7A0FC0190049937
+:10381000FCF7F4FC0290A16BFCF798FC594603906E
+:10382000FCF794FC8246E0692062A069E061C4F87C
+:1038300040B05146A068FCF789FCA060216BA068ED
+:10384000FCF798FF01D2206B00E0A0680390E16ACA
+:10385000FCF790FF08D2216BA068FCF78BFF01D228
+:10386000206B02E0A06800E0E06AA060A0683CE78E
+:1038700000002041000020C110B50446012001F0E5
+:1038800085FB10BD10B50446022001F07FFB10BD82
+:1038900010B50446032001F079FB10BD08B50822DD
+:1038A00044F240011F48FDF7D1FA082248F2800196
+:1038B0001C48FDF7CBFA082240F201111A48FDF727
+:1038C000C5FA012003460022184900901848FFF766
+:1038D00097FA022003460022144900901548FFF78A
+:1038E0008FFA032003460022104900901248FFF788
+:1038F00087FA124A00210E48FFF75EF9104A0021AC
+:103900000C48FFF759F90F4A00210B48FFF754F90B
+:103910000748FFF7A1FA0748FFF79EFA0648FFF7A6
+:103920009BFA08BD00080140000C0140D13F00088F
+:1039300078000020A4000020D00000207938000882
+:10394000853800089138000808B5012027498969A1
+:103950000143264A9161114689690140009100BFE7
+:1039600000BF00071146C9690143D1611146C96909
+:103970000140009100BF00BF032002461C4B1968A4
+:103980004FF6FF0319401B4B0B4343EA0221184B30
+:10399000196000BF00BF1848406820F0E06040F0A8
+:1039A00000701549486000BFFEF7E0F91348006851
+:1039B0001349B0FBF1F084B22046FFF7E3FAFDF7BC
+:1039C000B1FCFDF781FCFDF70FFEFDF7A5FEFDF74D
+:1039D000D1FDFDF769FE002000F026F8FFF79CF806
+:1039E000FFF76AF801E0FFF78BF8FCE700100240F0
+:1039F0000CED00E00000FA0500000140000000208E
+:103A000040420F0010B541F210010448FDF70EFAD4
+:103A100042F220010148FDF709FA10BD00080140FB
+:103A2000704770477047704710B504460C4951F80D
+:103A300024104A000B4951F82400002100F09EF8A0
+:103A4000094951F824200749083951F82400002178
+:103A500000F094F8012103480830015510BD000022
+:103A6000AC50000854000020BC5000082DE9F0477D
+:103A700004460F460025A9462348005D20B9224888
+:103A800018380168204688471FB94FF0FF30BDE85D
+:103A9000F0871E4850F82400B7FBF0F61B4850F89A
+:103AA0002400B7FBF0F100FB117000B1761C184840
+:103AB00050F82400451E22E01348083850F824002E
+:103AC00030F8150010B909F1010901E04FF00009C3
+:103AD000B14513D14FF0000809E00B48083850F801
+:103AE000240005EB080220F8126008F10108B04537
+:103AF000F3D3064850F824006843C8E76D1E002D34
+:103B0000DADA4FF0FF30C2E75C000020B450000862
+:103B1000AC50000810B501460023002207E00B4816
+:103B200050F8210030F8120000B15B1C521C08480C
+:103B300050F821009042F2D864205843044C54F8C5
+:103B40002140B0FBF4F0C0B210BD000054000020D2
+:103B5000AC50000870B504460E4631462046FFF7CB
+:103B600085FF0546681C08B9002070BD024850F862
+:103B700024002844F9E700004C00002030B503463B
+:103B800001E003F8011B141EA2F10102F9D130BDBE
+:103B90000949016009494160094981600949C160D9
+:103BA0000949016109494161094981610949C161C5
+:103BB000094901627047000087270008792400083E
+:103BC000D929000883270008CF290008BF29000849
+:103BD000812200083D2200081522000810B5044685
+:103BE000607890B1012804D0022803D0032811D1B5
+:103BF00004E010E0201D00F059F80CE0A17884F8F2
+:103C00009C10201D00F00CF805E004F1C000FFF747
+:103C1000BFFF00E000BF00BF0120207010BD00000A
+:103C200011490160114941601149816011490161E7
+:103C3000114941611149C161114901621149416252
+:103C4000114981621149C1621149016311494163FE
+:103C50001149C160114981631149816111490164B0
+:103C60001149C16370470000B9270008E92800081E
+:103C7000272A00084D270008012A0008CD2800083F
+:103C8000A32900088329000867290008472900089C
+:103C90000F2900082B290008DF2900084524000807
+:103CA000F3280008CD2200081F24000803494160C2
+:103CB000034981600349C160704700007128000812
+:103CC000D3290008092000082DE9F04F87B00546E8
+:103CD000894692460026002005900490039005F145
+:103CE0004404E069049094F84800012804D149464E
+:103CF000284600F0D9F901E0C4F80090C4F804A007
+:103D0000D4E90001FCF774FA06462846296C884776
+:103D1000012803D1002684F8500002E0002084F836
+:103D20005000E66030462169FCF762FA059095F88C
+:103D30009900012805D105F19C0230460599FFF74D
+:103D400017F995F89A00012812D12846FFF7A8F82C
+:103D50008046A0225159A069FCF7F8F98346314604
+:103D6000FCF74CFA07464146FCF748FA60649EE0CF
+:103D70004FF0000B00200290D4E90D01FCF704FD88
+:103D800029D8206AFCF797FC074688463046FCF79E
+:103D900092FC21F000413A464346CDE90001FCF790
+:103DA000B5FC05D294F8240010B10020029064E024
+:103DB0004FF07E50029000213046FCF7DBFC5CD2D5
+:103DC000A0225159A069FCF7C1F907463146FCF71A
+:103DD00015FA834651E0E16B606BFCF7CBFC29D808
+:103DE000206AFCF768FC074688463046FCF763FC0F
+:103DF00021F000413A464346CDE90001FCF786FC3C
+:103E000005D294F8240010B10020029035E04FF064
+:103E10007E50029000213046FCF7B6FC2DD2A02245
+:103E20005159A069FCF792F907463146FCF7E6F9CB
+:103E3000834622E0206AFCF73EFCCDE900013046D3
+:103E4000FCF739FC21F000410746DDE90023FCF7CF
+:103E50005DFC05D294F8240010B1002002900CE023
+:103E60004FF07E500290A0225159A069FCF76EF9E4
+:103E700007463146FCF7C2F983465946606CFCF7A9
+:103E800065F96064A16B606CFCF77EFC02D2A06BEC
+:103E9000606406E0E16B606CFCF76CFC01D2E06BE7
+:103EA0006064606C0299FCF7A9F9606400BF304659
+:103EB0002169FCF79DF907460499FCF79FF90390E7
+:103EC00094F84A0008B90020039094F8490008B912
+:103ED00000206064D5F89C106069FCF737F98346D0
+:103EE0003146FCF78BF98046616CFCF72FF90746E9
+:103EF0000399FCF72BF9606326616068A060E16BB1
+:103F0000606BFCF737FC01D2E06B00E0606B0746AA
+:103F1000A16BFCF72FFC08D2E16B606BFCF72AFC6D
+:103F200001D2E06B02E0606B00E0A06B6063606B4D
+:103F300007B0BDE8F08F000010B50249886800F0B6
+:103F400081F810BD800100202DE9F04104466FF09A
+:103F5000630564260A27012C04D0022C18D0032CF8
+:103F600030D12BE03046FCF741FB80461748816892
+:103F70004046FCF709FC0AD23846FCF737FB80467E
+:103F8000124881684046FCF7E1F8104988601AE061
+:103F90002846FCF72BFB80460C4881684046FCF71E
+:103FA000E9FB0AD23846FCF721FB804607488168C6
+:103FB0004046FCF720F90549886004E000200349E9
+:103FC000886000E000BF00BFBDE8F08180010020F4
+:103FD00010B50446012C04D0022C09D0032C15D1B5
+:103FE0000DE044F240010A48FCF702FFC0B210BDE8
+:103FF00048F280010648FCF7FBFEC0B2F7E740F24A
+:1040000001110448FCF7F4FEC0B2F0E70120EEE72E
+:1040100000080140000C0140022900DA0221282991
+:1040200000DD2821282906DA0C23036501EB810233
+:104030005300C36405E001F1320202654FF47A6374
+:10404000C364704770B5044600212046FCF79CFB12
+:104050000AD241F210011348FCF7F0FE42F22001AF
+:104060001048FCF7E3FE09E041F210010D48FCF7AF
+:10407000DDFE42F220010B48FCF7E0FE0021204665
+:10408000FCF778FB02D284F0004000E020460646B0
+:10409000FCF7E4FA85B22A4610218806FDF7BCFD3C
+:1040A00070BD0000000801402DE9FC5F0446894610
+:1040B00094F8980000284AD1824604F1440A4B49FA
+:1040C000DAF84000FCF79AF801904FF0000B0198E5
+:1040D000FCF7F1FA05460E464946DAF80000FCF70F
+:1040E00087F80090FCF7E7FA21F0004107462A46DE
+:1040F0003346FCF7F3FA02D8CAF8009026E04946A6
+:10410000DAF80000FCF774F805460021FCF73CFBE8
+:1041100002D2DFF8DCB00EE04946DAF80000FCF726
+:1041200067F805460021FCF725FB02D24FF07E5BC5
+:1041300001E04FF0000B58460199FCF75FF8054687
+:10414000DAF80010FCF702F8CAF800004BE04FF074
+:10415000000A04F1440A2549DAF84800FCF74EF851
+:1041600001904FF0000B0198FCF7A5FA05460E46AA
+:104170004946DAF80000FCF73BF80090FCF79BFAA0
+:1041800021F0004107462A463346FCF7A7FA02D839
+:10419000CAF8009026E04946DAF80000FCF728F853
+:1041A00005460021FCF7F0FA02D2DFF844B00EE039
+:1041B0004946DAF80000FCF71BF805460021FCF739
+:1041C000D9FA02D24FF07E5B01E04FF0000B584667
+:1041D0000199FCF713F80546DAF80010FBF7B6FF73
+:1041E000CAF8000000BFBDE8FC9F0000CDCCCC3D6C
+:1041F000000080BF10B54FF4806200210148FEF737
+:10420000FAF810BD001800202DE9F04F87B00546E0
+:104210000E46174698460020049005900690814669
+:104220000024824600213846FCF7A4FA07D22D224A
+:104230002046611CCCB204A90A5487F00047F54916
+:104240003846FCF7A1FA02D207B0BDE8F08FC4F1FE
+:10425000080000F0FF09F0493846FCF795FA5DD8F0
+:10426000ED493846FBF7FCFFEC490390FBF76EFF86
+:104270008346FCF7F3F9C2B22046611CCCB204A914
+:104280000A543846FCF7EAF9C0B242F2107190FBCA
+:10429000F1F201FB12004FF47A7190FBF1F0303033
+:1042A000C2B22046611CCCB204A90A543846FCF7BD
+:1042B000D5F9C0B24FF47A7190FBF1F201FB120014
+:1042C000642190FBF1F03030C2B22046611CCCB2C8
+:1042D00004A90A543846FCF7C1F9C0B2642190FB26
+:1042E000F1F201FB12000A2190FBF1F03030C2B272
+:1042F0002046611CCCB204A90A543846FCF7AEF93A
+:10430000C0B20A2190FBF1F201FB12003030C2B2C0
+:104310002046611CCCB204A90A54CCE0C0493846FE
+:10432000FCF732FA4CD83846FCF798F9C0B242F2A2
+:10433000107190FBF1F201FB12004FF47A7190FBC7
+:10434000F1F03030C2B22046611CCCB204A90A544C
+:104350003846FCF783F9C0B24FF47A7190FBF1F262
+:1043600001FB1200642190FBF1F03030C2B2204614
+:10437000611CCCB204A90A543846FCF76FF9C0B2EC
+:10438000642190FBF1F201FB12000A2190FBF1F095
+:104390003030C2B22046611CCCB204A90A5438465F
+:1043A000FCF75CF9C0B20A2190FBF1F201FB1200AC
+:1043B0003030C2B22046611CCCB204A90A547AE063
+:1043C00098493846FCF7E0F937D83846FCF746F903
+:1043D000C0B24FF47A7190FBF1F201FB120064213C
+:1043E00090FBF1F03030C2B22046611CCCB204A97F
+:1043F0000A543846FCF732F9C0B2642190FBF1F25E
+:1044000001FB12000A2190FBF1F03030C2B22046CD
+:10441000611CCCB204A90A543846FCF71FF9C0B29B
+:104420000A2190FBF1F201FB12003030C2B22046AB
+:10443000611CCCB204A90A543DE07B493846FCF724
+:10444000A3F923D83846FCF709F9C0B2642190FBE0
+:10445000F1F201FB12000A2190FBF1F03030C2B200
+:104460002046611CCCB204A90A543846FCF7F6F881
+:10447000C0B20A2190FBF1F201FB12003030C2B24F
+:104480002046611CCCB204A90A5414E0002138462D
+:10449000FCF77AF90FD83846FCF7E0F8C0B20A21E9
+:1044A00090FBF1F201FB12003030C2B22046611CD9
+:1044B000CCB204A90A54B8F1000F71DD072C6FDAF1
+:1044C0002E222046611CCCB204A90A543846FCF7BF
+:1044D000C5F800F0FF0B5846FCF791F839460390F9
+:1044E000FBF789FE0746B8F1010F20D1082C1EDA30
+:1044F0004D493846FBF782FE07463846FCF7DBF8A5
+:1045000000224A4BCDE90001FBF7E8FECDE90201AC
+:10451000FCF7B8F8C0B20A2190FBF1F201FB1200DF
+:104520003030C2B22046611CCCB204A90A54B8F1A2
+:10453000020F35DB082C33DA3A493846FBF75EFECA
+:1045400007463846FCF78AF8C0B2642190FBF1F2C6
+:1045500001FB12000A2190FBF1F03030C2B220467C
+:10456000611CCCB204A90A54082C19DA3846FCF7AD
+:10457000A2F800222D4BCDE90001FBF7AFFECDE9FB
+:104580000201FCF77FF8C0B20A2190FBF1F201FBB7
+:1045900012003030C2B22046611CCCB204A90A54C9
+:1045A00031E004A810F80A00203800F0FF09782D47
+:1045B00002DD0025701CC6B200240AE004EB0910DD
+:1045C0001B49085C05EBC61121441A4A5054601C73
+:1045D000C4B2082CF2DB00240CE004EB0910083014
+:1045E0001349095C701C05EBC0102044114A11549A
+:1045F000601CC4B2082CF0DB05F10800C5B20AF15A
+:10460000010000F0FF0A04A810F80A000028C8D131
+:1046100000BF19E60000FA4600401C460000404278
+:1046200000007A440000C842000020410000E03F42
+:104630001653000800180020F0B503461446002267
+:104640000020002530E0665D203EF2B2782B02DDCE
+:1046500000234E1CF1B200200CE000EB0216144FB8
+:10466000BE5D03EBC1170744DFF848C00CF80760D4
+:10467000461CF0B20828F0DB00200EE000EB02162A
+:1046800008360B4FBF5D4E1C03EBC6160644DFF821
+:1046900024C00CF80670461CF0B20828EEDB03F1CB
+:1046A0000806F3B26E1CF5B2665D002ECBD1F0BDEC
+:1046B000165300080018002010B504464FF480621D
+:1046C00021460348FDF797FE00F05AF810BD0000A0
+:1046D0000018002010B5AE20FEF782FF2020FEF764
+:1046E0007FFF1020FEF77CFFC820FEF779FF002037
+:1046F000FEF776FF1020FEF773FF4020FEF770FFF5
+:104700008120FEF76DFFFF20FEF76AFFA120FEF774
+:1047100067FFA620FEF764FFA820FEF761FF3F2099
+:10472000FEF75EFFA420FEF75BFFD320FEF758FFE5
+:104730000020FEF755FFD520FEF752FFF020FEF7D0
+:104740004FFFD920FEF74CFF2220FEF749FFDA2069
+:10475000FEF746FF1220FEF743FFDB20FEF740FF87
+:104760002020FEF73DFF8D20FEF73AFF1420FEF7D4
+:1047700037FFAF20FEF734FF0020FFF79DFF10BD8D
+:1047800070B5002418E004F1B001C8B2FEF728FFAC
+:104790000120FEF725FF1020FEF722FF002507E08D
+:1047A00005EBC411064A505CFEF737FF681CC5B222
+:1047B000802DF5DB601CC4B2082CE4DB70BD00006A
+:1047C000001800200248006800EB8000400070479D
+:1047D0002400002000BF00BF00BF00BF00BFBFF328
+:1047E0004F8F00BF00BF00BF0948006800F4E060C1
+:1047F00008490843001D0649086000BF00BF00BF0C
+:10480000BFF34F8F00BF00BF00BF00BF00BFFDE779
+:104810000CED00E00000FA0510B5044604B910BD27
+:1048200000202085A07D012808D1606A30B1218C4C
+:1048300089040A0C0021606AFDF7D3FD00BFEEE792
+:104840002DE9F05F0646884615469946DDE90B7B63
+:10485000DDF828A00EB1012100E000210846292141
+:10486000FCF776F84420FDF7B5FD04460CB10121B4
+:1048700000E0002108462C21FCF76AF80120E075D1
+:1048800000202076C4F83C902584C4F840B0A78668
+:10489000002D0CDD2846FDF79DFDE061E16909B1C1
+:1048A000012100E0002108463E21FCF751F8002FCD
+:1048B0000CDD3846FDF78EFD2063216B09B1012127
+:1048C00000E0002108464521FCF742F884F81580F5
+:1048D00084F82CA066602046BDE8F09F10B5044621
+:1048E00004B910BD002060852046FFF795FF00BF8A
+:1048F000F7E710B504460CB1012100E0002108469D
+:1049000040F2D711FCF724F8012084F8380021691F
+:10491000A068FCF78BF82069082865D2DFE800F072
+:104920006404111E2C3A485600BFA0680168C1F308
+:10493000400121B1A0680221416000BF00BF00BF5B
+:1049400053E000BFA0680168C1F3401121B1A06825
+:104950002021416000BF00BF00BF46E000BFA0684B
+:104960000168C1F3402129B1A0684FF40071416092
+:1049700000BF00BF00BF38E000BFA0680168C1F3FE
+:10498000403129B1A0684FF40051416000BF00BF21
+:1049900000BF2AE000BFA0680168C1F3404129B10F
+:1049A000A0684FF40031416000BF00BF00BF1CE0B1
+:1049B00000BFA0680168C1F3405129B1A0684FF45D
+:1049C0000011416000BF00BF00BF0EE000BFA06843
+:1049D0000168C1F3406129B1A0684FF000714160E6
+:1049E00000BF00BF00BF00E000BF00BF606800BFA5
+:1049F00000BF00BF00F10C0252E8002F42F040015E
+:104A000000F10C0242E80013002BF3D100BF00BFFD
+:104A10002069082865D2DFE800F06404111E2C3AF2
+:104A2000485600BFA0680168C1F3C00121B1A06869
+:104A30000821416000BF00BF00BF53E000BFA06875
+:104A40000168C1F3C01121B1A0688021416000BF9D
+:104A500000BF00BF46E000BFA0680168C1F3C021ED
+:104A600029B1A0684FF40061416000BF00BF00BFE2
+:104A700038E000BFA0680168C1F3C03129B1A06867
+:104A80004FF40041416000BF00BF00BF2AE000BFFB
+:104A9000A0680168C1F3C04129B1A0684FF40021AA
+:104AA000416000BF00BF00BF1CE000BFA0680168FC
+:104AB000C1F3C05129B1A0684FF40001416000BFAB
+:104AC00000BF00BF0EE000BFA0680168C1F3C06175
+:104AD00029B1A0684FF00061416000BF00BF00BF76
+:104AE00000E000BF00BF10BD0EB51348006808BB52
+:104AF0000020F0210122114BCDE9002102900A464D
+:104B000001210F48FFF79CFE0B490860002009684F
+:104B100008700C480849096888600520064909683A
+:104B2000C86004200449096808610021024800683F
+:104B300000F0E2F80EBD0000640000207B4E00088B
+:104B4000003801400000024038B5044604B938BDC1
+:104B50006068C168C1F34011B9B160680168C1F310
+:104B6000401191B1608D218C884202DB2046FFF715
+:104B7000B5FE61684A68D2B2608D411C6185E16909
+:104B80000A5400202076E0753FE06068C168C1F3F8
+:104B90000011002939D060680168C1F300110029B3
+:104BA00033D0607D01282BD1D4E902014A1E514B3C
+:104BB0009A5C02445268208C801A6085207DF8B986
+:104BC000D4E90201FBF732FFE06B80B1608D002871
+:104BD0000DDD608D218C884209DC628D2078E36BCD
+:104BE000E1699847228C0021E069FDF7FAFB228CED
+:104BF000D4E90201FBF754FFD4E90201FBF724FFDB
+:104C0000002060856068FCF7A0FA6068C168C1F3A5
+:104C1000801151B16068FCF7FEFA30B1206C08B128
+:104C2000206C80476068FCF798FAA07D01285ED16F
+:104C300001256068C168C1F3002171B16068016835
+:104C400001F0010149B1022560680168009100BFCF
+:104C50004168009100BF00BF00BF6068FCF7CCFA5C
+:104C600068B16068FCF7C8FA48B10425606801685B
+:104C7000009100BF4168009100BF00BF00BF6068A5
+:104C8000FCF7BFFA60B16068FCF7BBFA40B160683E
+:104C90000168009100BF4168009100BF00BF00BFE4
+:104CA0006068FCF7B3FA68B16068FCF7AFFA48B126
+:104CB000102560680168009100BF4168009100BF45
+:104CC00000BF00BF012D11D0606A78B1618D491E0F
+:104CD00088B2228D616A01EB82014880228D616A6F
+:104CE00001F82250218D491C218500BF00BF00BF63
+:104CF0002DE700006850000870B504460D46607D41
+:104D000090B9A575606800BF00BF00BF00F10C023C
+:104D100052E8002F42F0200100F10C0242E800139B
+:104D2000002BF3D100BF70E00020A0756068FCF795
+:104D30000CFA2169A068FBF779FED4E90201FBF7C0
+:104D400075FE6068011D0E463246D4E90201FBF78C
+:104D500003FFE269D4E90201FBF7C4FE228CD4E927
+:104D60000201FBF79DFED4E90201FBF77BFED4E9CB
+:104D70000201FBF769FE606800BF00BF00BF00F1E1
+:104D8000140252E8002F42F0400100F1140242E800
+:104D90000013002BF3D100BF00BF606800BF00BF4D
+:104DA00000BF00F10C0252E8002F42F0100100F1A8
+:104DB0000C0242E80013002BF3D100BF00BF606873
+:104DC000011D0E4632462169A068FBF7C5FE226B25
+:104DD0002169A068FBF786FE2169A068FBF742FE07
+:104DE000606800BF00BF00BF00F1140252E8002F4E
+:104DF00042F0800100F1140242E80013002BF3D1CD
+:104E000000BF00BF012084F83800A07D012833D105
+:104E1000606A68B9218C8800FDF7DCFA6062616A1B
+:104E200009B1012100E0002108468221FBF790FD35
+:104E3000606800BF00BF00BF00F10C0252E8002F05
+:104E400042F4807100F10C0242E80013002BF3D110
+:104E500000BF00BF606800BF00BF00BF00F11402C8
+:104E600052E8002F42F0010100F1140242E8001361
+:104E7000002BF3D100BF00BF70BD70470C480D4937
+:104E80008968C0F30F221140C0F30F22914201D173
+:104E9000012100E0002129B107484068401C064973
+:104EA000486004E004484068401E03494860704779
+:104EB0008000800400100140800100201FB500BF69
+:104EC00000BF4FF08040006840F001004FF080418B
+:104ED000086000BF1020096A01438206116200BF0A
+:104EE00000BF002210218006FCF76EFE00BF00BF4D
+:104EF0004FF08040806A401C1E490968B1FBF0F108
+:104F00004FF08040C06A401CB1FBF0F01A49C86005
+:104F1000002008701948C1F8600219491648C0F805
+:104F200064121849C0F868120021C0F86C120321FD
+:104F300041740021817480F8AF101030FEF74EFEEE
+:104F40000E49114A00230C48D0F86C02CDE9013219
+:104F5000039100900848D0F86832D0F86422D0F865
+:104F6000601244691430A04703480121026C1430D8
+:104F700090471FBD00000020800100200000C842B3
+:104F80000AD7233C000048420000C8C210B50446BE
+:104F90000D48007820B1012806D002280CD107E086
+:104FA0002046FEF7D1FF0CE02046FEF73CFD08E06E
+:104FB0002046FEF737FD04E044210020FBF7C8FC43
+:104FC00000BF00BF10BD00008001002010B50A48DE
+:104FD000007820B1012805D0022809D105E0FEF7AC
+:104FE000ABFF06E0FEF71CFD03E0FEF71AFD00E054
+:104FF00000BF00BF10BD000080010020081C30442D
+:10500000586C800000000004040400000800000048
+:10501000080000080000000800020406080A0C004E
+:10502000010203040506081C3044586C800000008F
+:10503000000404040000080000000800000800004C
+:10504000000800020406080A0C0001020304050619
+:105050000000000000000000010203040607080928
+:105060000000000001020304081C3044586C80005A
+:10507000000000040404000008000000080000080C
+:105080000000000800020406080A0C0001020304E4
+:1050900005065F6C697374006C69737420616C6CD5
+:1050A00020636F6D6D616E640000000000020000FF
+:1050B00000000000080000000800000000100000D0
+:1050C00000000000081C3044586C80000000000400
+:1050D00004040000080000000800000800000008A8
+:1050E00000020406080A0C00010203040506000081
+:1050F000000000000000002F000000000700070073
+:1051000000147F147F1400242A7F2A12006264088E
+:10511000132300364955225000000503000000000B
+:105120001C224100000041221C000014083E08140B
+:105130000008083E0808000000A0600000080808F9
+:105140000808000060600000002010080402003E13
+:105150005149453E0000427F4000004261514946AE
+:10516000002141454B31001814127F10002745459E
+:105170004539003C4A4949300001710905030036B0
+:105180004949493600064949291E000036360000C3
+:1051900000005636000000081422410000141414C8
+:1051A00014140000412214080002015109060032C3
+:1051B0004959513E007C1211127C007F4949493601
+:1051C000003E41414122007F4141221C007F49496C
+:1051D0004941007F09090901003E4149497A007FA0
+:1051E0000808087F0000417F4100002040413F0146
+:1051F000007F08142241007F40404040007F020CA5
+:10520000027F007F0408107F003E4141413E007F45
+:1052100009090906003E4151215E007F091929460E
+:105220000046494949310001017F0101003F4040EA
+:10523000403F001F2040201F003F4038403F006398
+:1052400014081463000708700807006151494543BA
+:1052500000007F41410000552A552A550000414178
+:105260007F00000402010204004040404040000072
+:1052700001020400002054545478007F484444380C
+:1052800000384444442000384444487F0038545493
+:10529000541800087E0901020018A4A4A47C007F11
+:1052A000080404780000447D4000004080847D00B4
+:1052B000007F102844000000417F4000007C04185B
+:1052C0000478007C0804047800384444443800FC26
+:1052D000242424180018242418FC007C0804040842
+:1052E00000485454542000043F444020003C4040B7
+:1052F000207C001C2040201C003C4030403C0044EE
+:1053000028102844001CA0A0A07C004464544C44F5
+:105310001414141414140000000000000000000015
+:10532000000000000000000000F800000000000085
+:1053300000333000000000100C06100C06000000C6
+:1053400000000000000040C07840C0784000043FEA
+:1053500004043F040400007088FC083000000018BA
+:1053600020FF211E0000F008F000E01800000021DE
+:105370001C031E211E0000F00888700000001E2182
+:1053800023241927211010160E0000000000000031
+:10539000000000000000000000E01804020000000F
+:1053A00000071820400000020418E0000000004040
+:1053B000201807000000404080F0804040000202BA
+:1053C000010F01020200000000F0000000000101D6
+:1053D000011F01010100000000000000000080B07A
+:1053E000700000000000000000000000000000014C
+:1053F0000101010101010000000000000000003077
+:105400003000000000000000000080601804006010
+:1054100018060100000000E010080810E000000F6E
+:10542000102020100F00001010F8000000000020D5
+:10543000203F20200000007008080888700000301D
+:1054400028242221300000300888884830000018C5
+:10545000202020110E000000C02010F800000007DE
+:105460000424243F240000F8088888080800001954
+:10547000212020110E0000E0108888180000000F85
+:10548000112020110E0000380808C838080000005C
+:10549000003F000000000070880808887000001CB1
+:1054A000222121221C0000E010080810E00000006A
+:1054B000312222110F00000000C0C00000000000D7
+:1054C00000303000000000000080000000000000FC
+:1054D00080600000000000008040201008000001F3
+:1054E00002040810200040404040404040000404B6
+:1054F0000404040404000008102040800000002080
+:10550000100804020100007048080808F0000000BC
+:10551000003036010000C030C828E810E00007184D
+:10552000272423140B000000C038E0000000203CBA
+:1055300023020227382008F8888888700000203F5E
+:10554000202020110E00C030080808083800071875
+:1055500020202010080008F808080810E000203F6C
+:10556000202020100F0008F88888E8081000203F4D
+:1055700020202320180008F88888E8081000203F21
+:10558000200003000000C030080808380000071899
+:105590002020221E020008F808000008F808203F1A
+:1055A000210101213F20000808F808080000002020
+:1055B000203F2020000000000808F8080800C080F4
+:1055C00080807F00000008F888C028180800203F6D
+:1055D00020012638200008F8080000000000203FC5
+:1055E00020202020300008F8F800F8F80800203FBC
+:1055F000003F003F200008F830C00008F808203FB6
+:10560000200007183F00E01008080810E0000F1005
+:10561000202020100F0008F808080808F000203F9C
+:10562000210101010000E01008080810E0000F1837
+:10563000242438504F0008F8888888887000203F5C
+:105640002000030C3020007088080808380000385B
+:10565000202121221C00180808F808081800000062
+:10566000203F2000000008F808000008F808001F8C
+:10567000202020201F000878880000C8380800007B
+:1056800007380E010000F80800F80008F800033C95
+:105690000700073C0300081868808068180820305D
+:1056A0002C03032C30200838C800C838080000003C
+:1056B000203F2000000010080808C83808002038E3
+:1056C000262120201800000000FE02020200000037
+:1056D000007F40404000000C30C00000000000008F
+:1056E00000010638C00000020202FE000000004077
+:1056F00040407F000000000004020202040000009D
+:105700000000000000000000000000000000808099
+:105710008080808080800002020400000000000081
+:105720000000000000000000808080800000001960
+:10573000242222223F2008F8008080000000003F41
+:10574000112020110E000000008080800000000E5B
+:10575000112020201100000000808088F800000E39
+:10576000112020103F200000808080800000001F5A
+:10577000222222221300008080F0888888180020CE
+:10578000203F202000000000808080808000006B8F
+:1057900094949493600008F8008080800000203F7B
+:1057A000210000203F200080989800000000002089
+:1057B000203F20200000000000809898000000C0DA
+:1057C0008080807F000008F8000080808000203FFB
+:1057D00024022D302000000808F8000000000020FE
+:1057E000203F202000008080808080808000203F3B
+:1057F00020003F20003F8080008080800000203F0C
+:10580000210000203F200000808080800000001FD9
+:10581000202020201F00808000808000000080FF6A
+:10582000A12020110E000000008080808000000E6A
+:10583000112020A0FF8080808000808080002020B8
+:105840003F21200001000000808080808000003324
+:10585000242424241900008080E0808000000000BF
+:10586000001F202000008080000000808000001FBA
+:10587000202020103F208080800000808080000158
+:105880000E300806010080800080008080800F308C
+:105890000C030C300F00008080008080800000200E
+:1058A000312E0E3120008080800000808080808139
+:1058B0008E701806010000808080808080000021AA
+:1058C000302C2221300000000000807C0202000009
+:1058D0000000003F404000000000FF00000000000A
+:1058E0000000FF0000000002027C80000000004079
+:1058F000403F000000000006010102020404000015
+:105900000000000000000000081C3044586C8000BB
+:105910000000000404040000080000000800000863
+:105920000000000800020406080A0C00010203043B
+:10593000050600000000404000004040000000401C
+:10594000000040400000803F000000400000404058
+:105950000000404000000040000000400000004007
+:105960000000803F00000040000040400000004078
+:105970000000803F0000803F0000803F0000803F2B
+:105980000000803F00000040000000400000803F19
+:105990000000000000000000000000000000803F48
+:1059A000000000400000803F0000803F0000803F7A
+:1059B0000000803F0000803F0000004000000040E9
+:1059C00000000040000000400000004000000040D7
+:1059D0000000404000004040000040400000004007
+:1059E00000004040000040400000404000004040B7
+:1059F0000000404000004040000040C0000040C0A7
+:105A0000000040C0000040C0000000C0000040C0D6
+:105A1000000040C0000040C0000040C0000000C0C6
+:105A2000000000C0000000C0000040C0000040C0F6
+:105A3000000000C0000000C0000080BF000080BF68
+:105A4000000080BF000000C0000000C0000000C0D7
+:105A5000000080BF00000000000000000000000007
+:105A6000000080BF000000C0000000C0000080BF38
+:105A7000000080BF000080BF000080BF000000C0A9
+:105A8000000000C0000000C0000000C0000080BF97
+:105A9000000000C0000000C0000040C0000040C086
+:105AA000000000C0000040C0000000C0000040C076
+:105AB000000040C0000040C0000040C00000803F27
+:105AC0000000803F00000000000000000000000017
+:105AD0000000404000004040000080BF000080BF48
+:105AE000000080BF000080BF00000000000080BFF9
+:105AF00000000040000040C0000040C0000000C0A6
+:105B0000000080BF000000000000803F0000004057
+:105B1000000040C0000000C0000000C0000080BFC6
+:105B2000000000000000803F00000040000040C076
+:105B3000000000C0000080BF000080BF0000000027
+:105B40000000803F0000803F000000C0000080BFD8
+:105B5000000080BF000080BF000000000000803F08
+:105B60000000803F0000803F0000000000000000B7
+:105B70000000000000000000000040400000404025
+:105B8000A05B00080000002078000000F42100085D
+:105B9000185C000878000020881F0000042200081C
+:105BA0000024F400000000000000000000000000DD
+:105BB00000000000000000000000000000000000E5
+:105BC00000000000000000000000000000000000D5
+:105BD00000000000000000000000000000000000C5
+:105BE00000000000293A0008153B000800040020CE
+:105BF00040000020001400204200002000000000AF
+:105C000000000000000000009250000898500008BA
+:085C1000C6E533B4B12300081E
:04000005080000ED02
:00000001FF
diff --git a/MDK-ARM/startup_stm32f103xb.s b/MDK-ARM/startup_stm32f103xb.s
index fd82d4f..1e792eb 100644
--- a/MDK-ARM/startup_stm32f103xb.s
+++ b/MDK-ARM/startup_stm32f103xb.s
@@ -129,7 +129,7 @@ Reset_Handler PROC
EXPORT Reset_Handler [WEAK]
IMPORT __main
IMPORT SystemInit
- LDR R0, =SystemInit
+ LDR R0, =SystemInit
BLX R0
LDR R0, =__main
BX R0
diff --git a/User/application/app.c b/User/application/app.c
index d23631b..2283ef5 100644
--- a/User/application/app.c
+++ b/User/application/app.c
@@ -2,6 +2,9 @@
#include "app.h"
#include "board.h"
#include "flow.h"
+#include "key.h"
+#include "work.h"
+
static struct flow business_fw; // 业务流程
static struct flow idle_fw; // 空闲任务
@@ -12,18 +15,24 @@ static uint8_t business_inspection(struct flow *fl)
FL_HEAD(fl);
for (;;)
{
- if (app.pwm_percent > 0)
+ switch (work.type)
{
- GPIO_SET(AIN1_GPIO_Port, AIN1_Pin);
- GPIO_RESET(AIN2_GPIO_Port, AIN2_Pin);
+ case WORK_PWM_MAP:
+ ssd1306_clear_buffer();
+ ssd1306_f8x16_string(0, 0, " PERCENT:");
+ ssd1306_f8x16_number(88, 0, work.pwm_percent, 0);
+ ssd1306_update_screen();
+ break;
+ case WORK_MOTOR_POS:
+ /* code */
+ break;
+ case WORK_MOTOR_SPEED:
+ /* code */
+ break;
+ default:
+ break;
}
- else
- {
- GPIO_RESET(AIN1_GPIO_Port, AIN1_Pin);
- GPIO_SET(AIN2_GPIO_Port, AIN2_Pin);
- }
- PWM_SET_DUTY(PWM_TIM, PWM_CHANNEL, ABS(app.pwm_percent));
- FL_LOCK_DELAY(fl, FL_CLOCK_SEC*2);
+ FL_LOCK_DELAY(fl, FL_CLOCK_100MSEC);
}
FL_TAIL(fl);
}
@@ -67,13 +76,12 @@ void app_run(void)
*/
void app_init(void)
{
+ key_init();
+ work_init();
+
FL_INIT(&business_fw); // 业务流程
FL_INIT(&idle_fw); // 空闲任务
ENABLE_TIM(TASK_TIM);
- ENABLE_TIM(PWM_TIM);
- PWM_START(PWM_TIM, PWM_CHANNEL);
- PWM_SET_DUTY(PWM_TIM, PWM_CHANNEL, 0);
-
- app.pwm_feq = PWM_GET_FREQ(PWM_TIM);
+ ENABLE_TIM(WORK_TIM);
}
diff --git a/User/application/key.c b/User/application/key.c
new file mode 100644
index 0000000..ca5939c
--- /dev/null
+++ b/User/application/key.c
@@ -0,0 +1,59 @@
+#include "key.h"
+#include "btn.h"
+#include "work.h"
+/* 按钮 */
+struct Button key_1;
+struct Button key_2;
+struct Button key_3;
+struct Button key_4;
+struct Button key_5;
+struct Button key_6;
+
+static uint8_t read_button_gpio(button_id_e button_id)
+{
+ switch (button_id)
+ {
+ case KEY_ADD:
+ return GPIO_READ(KEY_ADD_GPIO_Port, KEY_ADD_Pin);
+ case KEY_SUB:
+ return GPIO_READ(KEY_SUB_GPIO_Port, KEY_SUB_Pin);
+ case KEY_S:
+ return GPIO_READ(KEY_S_GPIO_Port, KEY_S_Pin);
+ default:
+ return ACTIVE_LEVEL_HIGH;
+ }
+}
+
+static void key_1_press_down_handler(void *btn)
+{
+ work_key_handle_cb(KEY_ADD);
+}
+
+static void key_2_press_down_handler(void *btn)
+{
+ work_key_handle_cb(KEY_SUB);
+}
+
+static void key_3_press_down_handler(void *btn)
+{
+ work_key_handle_cb(KEY_S);
+}
+
+void key_init(void)
+{
+ GPIO_SET_INPUT(KEY_ADD_GPIO_Port, KEY_ADD_Pin);
+ GPIO_SET_INPUT(KEY_SUB_GPIO_Port, KEY_SUB_Pin);
+ GPIO_SET_INPUT(KEY_S_GPIO_Port, KEY_S_Pin);
+
+ button_init(&key_1, read_button_gpio, ACTIVE_LEVEL_LOW, KEY_ADD, KEY_ADD);
+ button_init(&key_2, read_button_gpio, ACTIVE_LEVEL_LOW, KEY_SUB, KEY_SUB);
+ button_init(&key_3, read_button_gpio, ACTIVE_LEVEL_LOW, KEY_S, KEY_S);
+
+ button_attach(&key_1, PRESS_DOWN, key_1_press_down_handler);
+ button_attach(&key_2, PRESS_DOWN, key_2_press_down_handler);
+ button_attach(&key_3, PRESS_DOWN, key_3_press_down_handler);
+
+ button_start(&key_1);
+ button_start(&key_2);
+ button_start(&key_3);
+}
diff --git a/User/application/key.h b/User/application/key.h
new file mode 100644
index 0000000..7d4c92c
--- /dev/null
+++ b/User/application/key.h
@@ -0,0 +1,13 @@
+#ifndef _KEY_H_
+#define _KEY_H_
+#include "main.h"
+
+typedef enum
+{
+ KEY_ADD = 1,
+ KEY_SUB,
+ KEY_S,
+} button_id_e;
+
+void key_init(void);
+#endif // _KEY_H_
diff --git a/User/application/work.c b/User/application/work.c
new file mode 100644
index 0000000..98d29c3
--- /dev/null
+++ b/User/application/work.c
@@ -0,0 +1,130 @@
+#include "work.h"
+#include "board.h"
+
+work_t work;
+
+static void pwm_map(void)
+{
+ set_motor_pwm(work.pwm_percent);
+}
+
+static void motor_pos(void)
+{
+ work.pid.sub_type = PID_SUB_TYPE_POSITION;
+}
+
+static void motor_speed(void)
+{
+ work.pid.sub_type = PID_SUB_TYPE_INCREMENT;
+}
+
+static void pwm_map_key_handle(button_id_e id)
+{
+ int8_t min = -100, max = 100;
+ int8_t step = 10;
+ switch (id)
+ {
+ case KEY_ADD:
+ if (work.pwm_percent < max)
+ {
+ work.pwm_percent += step;
+ }
+ break;
+ case KEY_SUB:
+ if (work.pwm_percent > min)
+ {
+ work.pwm_percent -= step;
+ }
+ break;
+ case KEY_S:
+ work.pwm_percent = 0;
+ break;
+ default:
+ break;
+ }
+}
+
+static void motot_pos_key_handle(button_id_e id)
+{
+}
+
+static void motor_speed_key_handle(button_id_e id)
+{
+}
+
+void work_key_handle_cb(button_id_e id)
+{
+
+ switch (work.type)
+ {
+ case WORK_PWM_MAP:
+ pwm_map_key_handle(id);
+ break;
+ case WORK_MOTOR_POS:
+ motot_pos_key_handle(id);
+ break;
+ case WORK_MOTOR_SPEED:
+ motor_speed_key_handle(id);
+ break;
+ default:
+ DBG_ASSERT(FALSE __DBG_LINE);
+ break;
+ }
+}
+
+void work_process(void)
+{
+ switch (work.type)
+ {
+ case WORK_PWM_MAP:
+ pwm_map();
+ break;
+ case WORK_MOTOR_POS:
+ motor_pos();
+ break;
+ case WORK_MOTOR_SPEED:
+ motor_speed();
+ break;
+ default:
+ break;
+ }
+ return;
+}
+
+void work_encoder_exti(void)
+{
+ if (GPIO_READ(MOTOR_B_GPIO_Port, MOTOR_B_Pin))
+ {
+ work.encoder_cnt++;
+ }
+ else
+ {
+ work.encoder_cnt--;
+ }
+}
+
+void work_init(void)
+{
+ osel_memset((uint8_t *)&work, 0, sizeof(work_t));
+ PWM_START(PWM_TIM, PWM_CHANNEL);
+ PWM_SET_DUTY(PWM_TIM, PWM_CHANNEL, 0);
+ work.pwm_feq = PWM_GET_FREQ(PWM_TIM);
+
+ work.type = WORK_PWM_MAP;
+ work.pid_params.kp = 100;
+ work.pid_params.ki = 0.01;
+ work.pid_params.kd = 50;
+ work.pid_params.dead_zone = 0;
+ // PID初始化
+
+ {
+ work.pid.type = PID_TYPE_FUZZY;
+ work.pid.sub_type = PID_SUB_TYPE_POSITION;
+ work.pid.pid_u.fuzzy.deadzone_dir = DEAD_ZONE_BOTH;
+ pid_constructor(&work.pid);
+ work.pid.pid_u.fuzzy.set_ctrl_prm(&work.pid.pid_u.fuzzy, work.pid_params.kp, work.pid_params.ki,
+ work.pid_params.kd, work.pid_params.dead_zone, 0, -100, 100);
+ work.pid.pid_u.fuzzy.set_kd_enable(&work.pid.pid_u.fuzzy, TRUE);
+ }
+ return;
+}
diff --git a/User/application/work.h b/User/application/work.h
new file mode 100644
index 0000000..355f1d4
--- /dev/null
+++ b/User/application/work.h
@@ -0,0 +1,41 @@
+#ifndef __WORK_H__
+#define __WORK_H__
+
+#include "main.h"
+#include "key.h"
+#include "pid.h"
+
+typedef enum
+{
+ // PWM占空比映射到电机
+ WORK_PWM_MAP = 0,
+ // 电机位置控制
+ WORK_MOTOR_POS = 1,
+ // 电机速度控制
+ WORK_MOTOR_SPEED = 2,
+} work_e;
+
+typedef struct
+{
+ work_e type;
+ int32_t encoder_cnt; // 编码器位置
+ float32 pwm_percent; // PWM占空比
+ uint32_t pwm_feq; // PWM频率
+
+ pid_t pid;
+
+ struct
+ {
+ float32 kp;
+ float32 ki;
+ float32 kd;
+ float32 dead_zone;
+ } pid_params;
+} work_t;
+extern work_t work;
+
+void work_init(void);
+void work_process(void);
+void work_key_handle_cb(button_id_e id);
+void work_encoder_exti(void);
+#endif // __WORK_H__
diff --git a/User/board/board.c b/User/board/board.c
index 961e3d0..5bfae4c 100644
--- a/User/board/board.c
+++ b/User/board/board.c
@@ -24,6 +24,29 @@ static void motor_init(void)
GPIO_RESET(AIN2_GPIO_Port, AIN2_Pin);
}
+/**
+ * @brief 设置电机PWM占空比
+ *
+ * 根据给定的百分比设置电机的PWM占空比,以控制电机的转速。
+ *
+ * @param percent PWM占空比百分比,范围应在[-100, 100]之间。
+ * -100%表示反转最大速度,0%表示停止,100%表示正转最大速度。
+ */
+void set_motor_pwm(float32 percent)
+{
+ if (percent > 0)
+ {
+ GPIO_SET(AIN1_GPIO_Port, AIN1_Pin);
+ GPIO_RESET(AIN2_GPIO_Port, AIN2_Pin);
+ }
+ else
+ {
+ GPIO_RESET(AIN1_GPIO_Port, AIN1_Pin);
+ GPIO_SET(AIN2_GPIO_Port, AIN2_Pin);
+ }
+ PWM_SET_DUTY(PWM_TIM, PWM_CHANNEL, ABS(percent));
+}
+
/**
* @brief 通过UART发送数据
*
diff --git a/User/board/board.h b/User/board/board.h
index d715b3a..fc76f88 100644
--- a/User/board/board.h
+++ b/User/board/board.h
@@ -8,9 +8,12 @@
#define TASK_TIM TIM1
#define PWM_TIM TIM2
#define PWM_CHANNEL LL_TIM_CHANNEL_CH2
+#define WORK_TIM TIM3
extern uart_t *uart;
void board_init(void);
void uart_send(uint8_t *data, uint16_t len);
+void set_motor_pwm(float32 percent);
+
#endif
diff --git a/User/board/ssd1306_oled.c b/User/board/ssd1306_oled.c
index 193be97..cf0240b 100644
--- a/User/board/ssd1306_oled.c
+++ b/User/board/ssd1306_oled.c
@@ -410,7 +410,7 @@ void ssd1306_init(void)
i2c_write_command(SSD1306_CMD_DISPLAY_ON); //--turn on oled panel
ssd1306_fill(0);
-// ssd1306_test();
+ // ssd1306_test();
}
void ssd1306_display_on(void)
@@ -482,11 +482,16 @@ void ssd1306_clear(void)
ssd1306_update_screen();
}
+void ssd1306_clear_buffer(void)
+{
+ osel_memset(_buffer, 0, ARRAY_LEN(_buffer));
+}
+
/**
* @brief 在指定区域内绘制BMP
*
* 在指定坐标区域内绘制一个BMP,使用SSD1306 OLED显示屏
- * ssd1306_draw_bmp(0, 0, 128, 2);
+ * ssd1306_draw_bmp(0, 0, SSD1306_WIDTH, 2);
* @param x0 BMP绘制的起始X坐标
* @param y0 BMP绘制的起始Y坐标
* @param x1 BMP绘制的结束X坐标
@@ -532,7 +537,7 @@ void ssd1306_f6x8_string(uint8_t x, uint8_t y, const uint8_t *ch)
y++;
}
for (i = 0; i < 6; i++)
- _buffer[(y * 128) + x + i] = F6x8[c][i];
+ _buffer[(y * SSD1306_WIDTH) + x + i] = F6x8[c][i];
x += 6;
j++;
}
@@ -564,7 +569,7 @@ void ssd1306_f6x8_string_number(uint8_t x, uint8_t y, const uint8_t *ch, uint8_t
y++;
}
for (i = 0; i < 6; i++)
- _buffer[(y * 128) + x + i] = F6x8[c][i];
+ _buffer[(y * SSD1306_WIDTH) + x + i] = F6x8[c][i];
x += 6;
j++;
}
@@ -600,7 +605,7 @@ void ssd1306_f6x8_string_number(uint8_t x, uint8_t y, const uint8_t *ch, uint8_t
y++;
}
for (i = 0; i < 6; i++)
- _buffer[(y * 128) + x + i] = F6x8[c][i];
+ _buffer[(y * SSD1306_WIDTH) + x + i] = F6x8[c][i];
x += 6;
j++;
}
@@ -608,7 +613,7 @@ void ssd1306_f6x8_string_number(uint8_t x, uint8_t y, const uint8_t *ch, uint8_t
{
c = unit - 32;
for (i = 0; i < 6; i++)
- _buffer[(y * 128) + x + i] = F6x8[c][i];
+ _buffer[(y * SSD1306_WIDTH) + x + i] = F6x8[c][i];
}
}
@@ -633,9 +638,9 @@ void ssd1306_f8x16_string(uint8_t x, uint8_t y, const uint8_t *ch)
y++;
}
for (i = 0; i < 8; i++)
- _buffer[(y * 128) + x + i] = F8X16[c * 16 + i];
+ _buffer[(y * SSD1306_WIDTH) + x + i] = F8X16[c * 16 + i];
for (i = 0; i < 8; i++)
- _buffer[((y + 1) * 128) + x + i] = F8X16[c * 16 + i + 8];
+ _buffer[((y + 1) * SSD1306_WIDTH) + x + i] = F8X16[c * 16 + i + 8];
x += 8;
j++;
}
@@ -665,7 +670,7 @@ void ssd1306_f8x16_number(uint8_t x, uint8_t y, float32 num, uint8_t dot_num)
c = 8 - i;
- if (num > 10000)
+ if (num >= 10000)
{
ch[i++] = num / 10000 + 48;
ch[i++] = (uint8_t)(num) % 10000 / 1000 + 48;
@@ -673,20 +678,20 @@ void ssd1306_f8x16_number(uint8_t x, uint8_t y, float32 num, uint8_t dot_num)
ch[i++] = (uint8_t)(num) % 100 / 10 + 48;
ch[i++] = (uint8_t)(num) % 10 + 48;
}
- else if (num > 1000)
+ else if (num >= 1000)
{
ch[i++] = (uint8_t)(num) % 10000 / 1000 + 48;
ch[i++] = (uint8_t)(num) % 1000 / 100 + 48;
ch[i++] = (uint8_t)(num) % 100 / 10 + 48;
ch[i++] = (uint8_t)(num) % 10 + 48;
}
- else if (num > 100)
+ else if (num >= 100)
{
ch[i++] = (uint8_t)(num) % 1000 / 100 + 48;
ch[i++] = (uint8_t)(num) % 100 / 10 + 48;
ch[i++] = (uint8_t)(num) % 10 + 48;
}
- else if (num > 10)
+ else if (num >= 10)
{
ch[i++] = (uint8_t)(num) % 100 / 10 + 48;
ch[i++] = (uint8_t)(num) % 10 + 48;
@@ -723,9 +728,9 @@ void ssd1306_f8x16_number(uint8_t x, uint8_t y, float32 num, uint8_t dot_num)
y++;
}
for (i = 0; i < 8; i++)
- _buffer[(y * 128) + x + i] = F8X16[c * 16 + i];
+ _buffer[(y * SSD1306_WIDTH) + x + i] = F8X16[c * 16 + i];
for (i = 0; i < 8; i++)
- _buffer[((y + 1) * 128) + x + i] = F8X16[c * 16 + i + 8];
+ _buffer[((y + 1) * SSD1306_WIDTH) + x + i] = F8X16[c * 16 + i + 8];
x += 8;
j++;
}
diff --git a/User/board/ssd1306_oled.h b/User/board/ssd1306_oled.h
index 2355bb5..013ea30 100644
--- a/User/board/ssd1306_oled.h
+++ b/User/board/ssd1306_oled.h
@@ -59,6 +59,7 @@ void ssd1306_update_screen(void);
void ssd1306_fill(uint8_t color);
void ssd1306_clear(void);
+void ssd1306_clear_buffer(void);
void ssd1306_draw_bmp(uint8_t x0, uint8_t y0, uint8_t x1, uint8_t y1, uint8_t *bmp);
void ssd1306_f6x8_string(uint8_t x, uint8_t y, const uint8_t *ch);
void ssd1306_f6x8_string_number(uint8_t x, uint8_t y, const uint8_t *ch, uint8_t unit, float32 num);
diff --git a/User/lib/control/custom/pid_c.c b/User/lib/control/custom/pid_c.c
deleted file mode 100644
index 4354fbc..0000000
--- a/User/lib/control/custom/pid_c.c
+++ /dev/null
@@ -1,38 +0,0 @@
-#include "pid_c.h"
-
-/**
- * @brief 设置PID控制器参数
- * @param {PID_C} *self - PID控制器结构体指针
- * @param {float32} kp - 比例系数
- * @param {float32} ki - 积分系数
- * @param {float32} kd - 微分系数
- * @param {float32} out_min - 最小输出
- * @param {float32} out_max - 最大输出
- * @return {*} - 空
- */
-static void _set_ctrl_prm(struct PID_C *self, float32 kp, float32 ki, float32 kd, float32 out_min, float32 out_max)
-{
- self->pri.kp = kp; /*比例系数*/
- self->pri.ki = ki; /*积分系数*/
- self->pri.kd = kd; /*微分系数*/
-
- self->pri.deadband = 0.5; /*死区*/
- self->pri.maximum = out_max; /*最大输出*/
- self->pri.minimum = out_min; /*最小输出*/
- self->pri.last_error = 0; /*上一次误差*/
- self->pri.prev_error = 0; /*上上次误差*/
-}
-
-static float32 _PID(struct PID_C *self, float32 target, float32 feedback)
-{
- /**
- * 实现PID算法
- */
- return 0;
-}
-
-void pid_c_constructor(struct PID_C *self)
-{
- self->set_ctrl_prm = _set_ctrl_prm;
- self->PID = _PID;
-}
diff --git a/User/lib/control/custom/pid_c.h b/User/lib/control/custom/pid_c.h
deleted file mode 100644
index ccc7e86..0000000
--- a/User/lib/control/custom/pid_c.h
+++ /dev/null
@@ -1,34 +0,0 @@
-#ifndef __PID_C_H__
-#define __PID_C_H__
-#include "lib.h"
-
-typedef struct PID_C
-{
- /* 设置PID三个参数 */
- void (*set_ctrl_prm)(struct PID_C *self, float32 kp, float32 ki, float32 kd, float32 out_min, float32 out_max);
- /* 控制接口 */
- float32 (*PID)(struct PID_C *self, float32 target, float32 feedback);
-
- // 自定义参数
- /* 实际值与目标值之间的误差 */
- float32 err;
- /* 输出值 */
- float32 out;
- /* private */
- struct
- {
- float32 kp; /*比例学习速度*/
- float32 ki; /*积分学习速度*/
- float32 kd; /*微分学习速度*/
- float32 ki_error; /*积分误差*/
- float32 last_error; /*前一拍偏差*/
- float32 prev_error; /*前两拍偏差*/
- float32 deadband; /*死区*/
- float32 maximum; /*输出值的上限*/
- float32 minimum; /*输出值的下限*/
- } pri;
-} pid_c_t;
-
-extern void pid_c_constructor(struct PID_C *self);
-
-#endif // __PID_C_H__
diff --git a/User/lib/control/custom/pid_g.c b/User/lib/control/custom/pid_g.c
deleted file mode 100644
index 615ec17..0000000
--- a/User/lib/control/custom/pid_g.c
+++ /dev/null
@@ -1,285 +0,0 @@
-#include "pid_g.h"
-#include
-
-/**
- * @brief 复位PID积分及微分控制数据
- * @param {PID_G} *self
- * @return {*}
- */
-static void _restctrl(struct PID_G *self)
-{
- self->pri.pre_error = 0;
- self->pri.sum_iterm = 0;
-}
-
-/**
- * @brief 更新控制区间
- * @param {PID_G} *self
- * @param {float32} out_min
- * @param {float32} out_max
- * @return {*}
- * @note
- */
-static void _set_range(struct PID_G *self, float32 out_min, float32 out_max)
-{
- self->pri.out_max = out_max;
- self->pri.out_min = out_min;
-}
-
-/**
- * @brief 更新kp
- * @param {PID_G} *self
- * @param {float32} kp
- * @return {*}
- * @note
- */
-static void _set_kp(struct PID_G *self, float32 kp)
-{
- self->pri.kp = kp;
-}
-
-/**
- * @brief 更新ki
- * @param {PID_G} *self
- * @param {float32} ki
- * @return {*}
- * @note
- */
-static void _set_ki(struct PID_G *self, float32 ki)
-{
- self->pri.ki = ki;
-}
-
-/**
- * @brief 更新kd
- * @param {PID_G} *self
- * @param {float32} kd
- * @return {*}
- * @note
- */
-static void _set_kd(struct PID_G *self, float32 kd)
-{
- self->pri.kd = kd;
-}
-
-/**
- * @brief 使能积分控制
- * @param {PID_G} *self
- * @param {BOOL} enable
- * @return {*}
- * @note
- */
-static void _set_ki_enable(struct PID_G *self, BOOL enable)
-{
- self->pri.ki_enable = enable;
-}
-
-/**
- * @brief 使能微分控制
- * @param {PID_G} *self
- * @param {BOOL} enable
- * @return {*}
- * @note
- */
-static void _set_kd_enable(struct PID_G *self, BOOL enable)
-{
- self->pri.kd_enable = enable;
-}
-
-/**
- * @brief 初始化控制参数
- * @return {*}
- * @note
- */
-static void _set_ctrl_prm(struct PID_G *self, float32 kp, float32 ki, float32 kd, float32 err_dead, float32 out_min, float32 out_max)
-{
- g_param_t *pri = &self->pri;
- osel_memset((uint8_t *)pri, 0, sizeof(pid_g_t));
- pri->kp = kp;
- pri->ki = ki;
- pri->kd = kd;
- pri->err_dead = err_dead;
- pri->out_max = out_max;
- pri->out_min = out_min;
- pri->detach = FALSE;
-}
-
-static void _update_ctrl_prm(struct PID_G *self, float32 kp, float32 ki, float32 kd, float32 err_dead, float32 out_min, float32 out_max)
-{
- g_param_t *pri = &self->pri;
- pri->kp = kp;
- pri->ki = ki;
- pri->kd = kd;
- pri->err_dead = err_dead;
- pri->out_max = out_max;
- pri->out_min = out_min;
- pri->detach = FALSE;
-}
-
-/**
- * @brief 非0时配置为积分分离+抗积分饱和PID,否则为普通抗积分饱和PID
- * @param {PID_G} *self
- * @param {float32} max_err
- * @param {BOOL} mode
- * @return {*}
- */
-static void _set_cfg(struct PID_G *self, float32 max_err, BOOL mode)
-{
- self->pri.err_limit = max_err;
- self->pri.detach = mode == FALSE ? FALSE : TRUE;
-}
-
-/**
- * @brief 设置积分权重
- * @param {PID_G} *self
- * @param {float32} max_weight
- * @return {*}
- * @note
- */
-static void _set_weight(struct PID_G *self, float32 max_ratio, BOOL mode)
-{
- self->pri.ui_ratio = max_ratio;
- self->pri.weight = mode == FALSE ? FALSE : TRUE;
-}
-
-/**
- * @brief PID算法函数
- * @param {PID_G} *self
- * @param {float32} target 目标位置
- * @param {float32} feedback 实际位置
- * @return {*}
- * @note
- */
-static float32 _PID(struct PID_G *self, float32 target, float32 feedback)
-{
- float32 error = 0.0f;
- float32 insert = 0.0f; ///< 该值为0时积分不介入计算
- float32 temp_iterm = 0.0f;
- float32 temp_kd = 0.0f;
-
- g_param_t *pri = &self->pri;
-
- pri->ref = target; ///< 目标位置
- pri->feed_back = feedback; ///< 实际位置
- pri->error = pri->ref - pri->feed_back; /// 误差
- error = pri->error;
- if (fabs(pri->error) <= pri->err_dead) ///< 误差小于死区,不计算
- {
- error = 0;
- }
-
- /*根据PID配置的模式,获取积分数据,进行积分累加*/
- if (pri->out >= pri->out_max) ///< 到达输出上限
- {
- if (fabs(error) > pri->err_limit && pri->detach) ///< 误差大于积分介入区间,积分不介入计算
- {
- insert = 0;
- }
- else
- {
- insert = 1;
- if (error < 0)
- {
- temp_iterm = pri->ki * error;
- }
- }
- }
- else if (pri->out <= pri->out_min) ///< 到达输出下限
- {
- if (fabs(error) > pri->err_limit && pri->detach) ///< 误差大于积分介入区间,积分不介入计算
- {
- insert = 0;
- }
- else
- {
- insert = 1;
- if (error > 0)
- {
- temp_iterm = pri->ki * error;
- }
- }
- }
- else
- {
- if (fabs(error) > pri->err_limit && pri->detach)
- {
- insert = 0;
- }
- else
- {
- insert = 1;
- temp_iterm = pri->ki * error;
- }
- }
- if (pri->ki_enable == FALSE)
- {
- temp_iterm = 0;
- insert = 0;
- }
-
- /* integral */
- pri->sum_iterm += temp_iterm;
-
- if (pri->weight == TRUE)
- {
- if (pri->sum_iterm > pri->ui_ratio)
- {
- pri->sum_iterm = pri->ui_ratio;
- }
- else if (pri->sum_iterm < -pri->ui_ratio)
- {
- pri->sum_iterm = -pri->ui_ratio;
- }
- }
- else
- {
- if (pri->sum_iterm > pri->out_max)
- {
- pri->sum_iterm = pri->out_max;
- }
- else if (pri->sum_iterm < pri->out_min)
- {
- pri->sum_iterm = pri->out_min;
- }
- }
-
- /* differential */
- if (pri->kd_enable == TRUE)
- {
- temp_kd = pri->kd;
- }
- else
- {
- temp_kd = 0;
- }
-
- pri->out = pri->kp * pri->error + pri->sum_iterm * insert + (pri->error - pri->pre_error) * temp_kd;
- pri->pre_error = pri->error; ///< 记录这次误差,为下次微分计算做准备
- pri->pre_feed_back = pri->feed_back;
-
- /*limt pid output*/
- pri->out = RANGE(pri->out, pri->out_min, pri->out_max); ///< 限制输出
- return pri->out;
-}
-
-/**
- * @brief PID接口
- * @param {PID_G} *self
- * @return {*}
- * @note
- */
-void pid_g_constructor(struct PID_G *self)
-{
- self->set_ctrl_prm = _set_ctrl_prm;
- self->update_ctrl_prm = _update_ctrl_prm;
- self->set_cfg = _set_cfg;
- self->set_kp = _set_kp;
- self->set_ki_enable = _set_ki_enable;
- self->set_ki = _set_ki;
- self->set_kd_enable = _set_kd_enable;
- self->set_kd = _set_kd;
- self->set_range = _set_range;
- self->restctrl = _restctrl;
- self->PID = _PID;
- self->set_weight = _set_weight;
-}
diff --git a/User/lib/control/custom/pid_g.h b/User/lib/control/custom/pid_g.h
deleted file mode 100644
index 143051d..0000000
--- a/User/lib/control/custom/pid_g.h
+++ /dev/null
@@ -1,65 +0,0 @@
-#ifndef __PID_G_H__
-#define __PID_G_H__
-#include "lib.h"
-
-typedef struct
-{
- float32 ref; /*目标*/
- float32 feed_back; /*实际*/
- float32 pre_feed_back; /*上一次实际*/
- float32 kp; /*比例学习速度*/
- float32 ki; /*积分学习速度*/
- float32 kd; /*微分学习速度*/
- float32 ki_error; /*积分误差*/
- float32 error; /*误差*/
- float32 pre_error; /*前一拍偏差*/
- float32 prev_error; /*前两拍偏差*/
- float32 err_dead; /*死区*/
- float32 err_limit; /*积分分离上限*/
- float32 maximum; /*输出值的上限*/
- float32 minimum; /*输出值的下限*/
- float32 out; /*输出值*/
- float32 sum_iterm; /*积分累加*/
- float32 ui_ratio; /*积分权重*/
- BOOL ki_enable; /*积分使能*/
- BOOL kd_enable; /*微分使能*/
- BOOL detach; /*积分分离标志*/
- BOOL weight; /*积分权重标志*/
- float32 out_max; /*输出最大值*/
- float32 out_min; /*输出最小值*/
-} g_param_t;
-
-typedef struct PID_G
-{
- /* 设置PID三个参数 */
- void (*set_ctrl_prm)(struct PID_G *self, float32 kp, float32 ki, float32 kd, float32 err_dead, float32 out_min, float32 out_max);
- /* 更新PID参数 */
- void (*update_ctrl_prm)(struct PID_G *self, float32 kp, float32 ki, float32 kd, float32 err_dead, float32 out_min, float32 out_max);
- /* 控制接口 */
- float32 (*PID)(struct PID_G *self, float32 target, float32 feedback);
- /* 更新控制区间 */
- void (*set_range)(struct PID_G *self, float32 out_min, float32 out_max);
- /* 设置积分分离 */
- void (*set_cfg)(struct PID_G *self, float32 max_err, BOOL mode);
- /* 设置积分权重 */
- void (*set_weight)(struct PID_G *self, float32 max_ratio, BOOL mode);
- /* 更新kp */
- void (*set_kp)(struct PID_G *self, float32 kp);
- /* 使能ki */
- void (*set_ki_enable)(struct PID_G *self, BOOL enable);
- /* 更新ki */
- void (*set_ki)(struct PID_G *self, float32 ki);
- /* 使能kd */
- void (*set_kd_enable)(struct PID_G *self, BOOL enable);
- /* 更新kd */
- void (*set_kd)(struct PID_G *self, float32 kd);
- /* 复位PID积分及微分控制数据 */
- void (*restctrl)(struct PID_G *self);
-
- /* private */
- g_param_t pri;
-
-} pid_g_t;
-
-extern void pid_g_constructor(struct PID_G *self);
-#endif // __PID_G_H__
diff --git a/User/lib/control/custom/pid_hd.c b/User/lib/control/custom/pid_hd.c
deleted file mode 100644
index 0a98366..0000000
--- a/User/lib/control/custom/pid_hd.c
+++ /dev/null
@@ -1,166 +0,0 @@
-#include "pid_hd.h"
-#include
-#include "sys.h"
-#include "app.h"
-
-#if INCOMPLETE_DIFFEREN_HD == 1 // 积分分离
-/*计算微分项,使用追随误差微分项*/
-static float32 td_derivative(struct PID_HD *self, float32 current_err, float32 pre_err, float32 dt)
-{
- pid_hd_position_t *pri = &self->pri_u.position;
- float32 derivative = (current_err - pre_err) / dt; // 计算积分项
- derivative = pri->td_alpha * derivative + (1 - pri->td_alpha) * pri->td_beta * pri->pre_derivative; // 追随误差微分器平滑输出
- pri->pre_derivative = derivative; // 更新上一次误差
- return derivative;
-}
-#endif
-
-/*杭电:设置位置式PID参数*/
-static void _set_ctrl_prm_position(struct PID_HD *self, float32 kp, float32 ki, float32 kd)
-{
- pid_hd_position_t *pri = &self->pri_u.position;
- osel_memset((uint8_t *)pri, 0, sizeof(pid_hd_position_t));
-
- /*观测传进来的Kp、Ki、Kd*/
-
- pri->kp = kp;
- pri->ki = ki;
- pri->kd = kd;
- pri->ki_limit = 10; // 积分分离界限
- pri->err_dead = 0.5; // 控制死区范围
-#if INCOMPLETE_DIFFEREN_HD == 1
- /*不完全微分系数*/
- pri->td_alpha = 0.5;
- pri->td_beta = 0.5;
-#endif
-}
-
-/*杭电:设置输出限幅参数*/
-static void _set_out_prm_position(struct PID_HD *self, float32 maximum, float32 minimum)
-{
- self->pri_u.position.out_max = maximum;
- self->pri_u.position.out_min = minimum;
-}
-
-/*杭电:位置式PID控制算法*/
-static float32 _pid_position(struct PID_HD *self, float32 err)
-{
- /*计算控制的运行时间*/
- // sys_millis_reset();
- self->pri_u.position.control_time = sys_millis();
- self->pri_u.position.tmp_time = 0;
-
- /*测试:4.18*/
- if (fabs(err) < 0.1)
- {
- err = 0;
- }
-
- float32 x[3];
- self->pri_u.position.err = err;
-
- /*抗积分饱和*/
-#if INTEGRAL_SEPARATION == 1 // 积分分离
- if (self->pri_u.position.out > self->pri_u.position.out_max)
- {
- if (self->pri_u.position.err > self->pri_u.position.ki_limit) // 积分分离
- {
- self->pri_u.position.ki_error += 0;
- }
- else
- {
- if (self->pri_u.position.err < 0) // 若偏差为负值,执行负偏差的累加
- {
- self->pri_u.position.ki_error += self->pri_u.position.err;
- }
- }
- }
- else if (self->pri_u.position.out < self->pri_u.position.out_min)
- {
- if (self->pri_u.position.err > self->pri_u.position.ki_limit) // 若偏差为负值,停止积分
- {
- self->pri_u.position.ki_error += 0;
- }
- else
- {
- if (self->pri_u.position.err > 0) // 若偏差为正值,执行正偏差的累加
- {
- self->pri_u.position.ki_error += self->pri_u.position.err;
- }
- }
- }
- else
- {
- if (fabs(err) > self->pri_u.position.ki_limit || fabs(err) < 0.5)
- {
- self->pri_u.position.ki_error += 0;
- }
- else
- {
- self->pri_u.position.ki_error += self->pri_u.position.err;
- }
- }
-#else /*无积分分离操作*/
- if (fabs(err) < 0.4)
- {
- self->pri_u.position.ki_error += 0;
- }
- else
- {
- self->pri_u.position.ki_error += self->pri_u.position.err;
- }
-#endif
-
- /*输出*/
- if (fabs(err) < self->pri_u.position.err_dead)
- {
- /*输出上一次的值*/
- // self->pri_u.position.out = self->pri_u.position.pre_out;
- x[0] = self->pri_u.position.err;
- x[1] = self->pri_u.position.ki_error;
- self->pri_u.position.out = self->pri_u.position.kp * x[0] + self->pri_u.position.ki * x[1] + self->pri_u.position.kd * x[2];
- }
- else
- {
- x[0] = self->pri_u.position.err;
- x[1] = self->pri_u.position.ki_error;
-
-#if INCOMPLETE_DIFFEREN_HD == 1
- /*不完全微分项,为了解决普通PID为微分环节容易振荡的问题*/
- self->pri_u.position.tmp_time = sys_millis();
- self->pri_u.position.control_time -= self->pri_u.position.tmp_time;
- self->pri_u.position.control_time /= 1000.0; // 将单位转换为秒
- x[2] = td_derivative(&_pid.pid_u.hd, err, self->pri_u.position.pre_error, self->pri_u.position.control_time);
-#else
- // 普通的微分环节
- x[2] = self->pri_u.position.err - self->pri_u.position.pre_error;
-#endif
-
- self->pri_u.position.out = self->pri_u.position.kp * x[0] + self->pri_u.position.ki * x[1] + self->pri_u.position.kd * x[2];
- }
-
- /*输出限幅*/
- if (self->pri_u.position.out > self->pri_u.position.out_max)
- {
- self->pri_u.position.out = self->pri_u.position.out_max;
- }
- if (self->pri_u.position.out < self->pri_u.position.out_min)
- {
- self->pri_u.position.out = self->pri_u.position.out_min;
- }
-
- // 更新误差历史
- self->pri_u.position.pre_error = self->pri_u.position.err; /*上一次误差值*/
- // 更新输出历史
- self->pri_u.position.pre_out = self->pri_u.position.out; /*上一次输出值*/
-
- return self->pri_u.position.out;
-}
-
-/*杭电:参数控制器*/
-void pid_hd_constructor(struct PID_HD *self)
-{
- self->set_ctrl_prm_position = _set_ctrl_prm_position;
- self->set_out_prm_position = _set_out_prm_position;
- self->pid_position = _pid_position;
-}
diff --git a/User/lib/control/custom/pid_hd.h b/User/lib/control/custom/pid_hd.h
deleted file mode 100644
index 2fa96f0..0000000
--- a/User/lib/control/custom/pid_hd.h
+++ /dev/null
@@ -1,66 +0,0 @@
-#ifndef __PID_HD__
-#define __PID_HD__
-#include "lib.h"
-
-#define INTEGRAL_SEPARATION 1 // 积分分离
-#define INCOMPLETE_DIFFEREN_HD 1 // 不完全微分
-
-typedef struct
-{
- float32 ref;
- float32 feed_back;
- float32 pre_feed_back;
- float32 pre_error;
- float32 ki_error; /*积分误差*/
- float32 ki_limit; /*积分分离界限*/
- float32 ki_alpha; /*变积分的系数*/
- float32 err;
- float32 sum_iterm;
- float32 kp;
- float32 kp_small; /*在接近稳态时的Kp*/
- float32 kp_big; /*在大范围时的Kp*/
- float32 ki;
- float32 kd;
- float32 err_limit;
- BOOL detach;
- float32 err_dead;
-#if INCOMPLETE_DIFFEREN_HD == 1
- float32 td_alpha; /*不完全微分系数*/
- float32 td_beta; /*不完全微分系数beta*/
- float32 pre_derivative; /*上一次微分值*/
-#endif
- float32 out;
- float32 pre_out;
- float32 out_max;
- float32 out_min;
- BOOL sm;
- float32 sv_range;
- uint32_t control_time; /*控制算法运行一次花费的时间*/
- uint32_t tmp_time; /*临时用来记录控制的运行时间*/
-} pid_hd_position_t; // 位置式PID
-
-typedef struct PID_HD
-{
- /* 设置PID三个参数 */
- void (*set_ctrl_prm_position)(struct PID_HD *self, float32 kp, float32 ki, float32 kd);
- /* 设置输出范围 */
- void (*set_out_prm_position)(struct PID_HD *self, float32 maximum, float32 minimum);
-
- /* 控制接口 */
- float32 (*pid_position)(struct PID_HD *self, float32 err);
-
- // 自定义参数
- /* 实际值与目标值之间的误差 */
- float32 err;
- /* 输出值 */
- float32 out;
- /* private */
- struct
- {
- pid_hd_position_t position;
- } pri_u;
-} pid_hd_t;
-
-extern void pid_hd_constructor(struct PID_HD *self);
-
-#endif // __PID_HD__
diff --git a/User/lib/control/custom/pid_x.c b/User/lib/control/custom/pid_x.c
deleted file mode 100644
index 747049c..0000000
--- a/User/lib/control/custom/pid_x.c
+++ /dev/null
@@ -1,481 +0,0 @@
-#include "pid_x.h"
-#include "math.h"
-#define LAG_PHASE (6) // 迟滞相位,单位:拍
-
-#ifndef PI
-#define PI 3.14159265358979f
-#endif
-// 注1:自适应模糊pid最重要的就是论域的选择,要和你应该控制的对象相切合
-// 注2:以下各阀值、限幅值、输出值均需要根据具体的使用情况进行更改
-// 注3:因为我的控制对象惯性比较大,所以以下各部分取值较小
-// 论域e:[-5,5] ec:[-0.5,0.5]
-
-// 误差的阀值,小于这个数值的时候,不做PID调整,避免误差较小时频繁调节引起震荡
-#define Emin 0.3f
-#define Emid 1.0f
-#define Emax 5.0f
-// 调整值限幅,防止积分饱和
-#define Umax 1
-#define Umin -1
-
-#define NB 0
-#define NM 1
-#define NS 2
-#define ZO 3
-#define PS 4
-#define PM 5
-#define PB 6
-
-int32_t kp[7][7] = {{PB, PB, PM, PM, PS, ZO, ZO},
- {PB, PB, PM, PS, PS, ZO, ZO},
- {PM, PM, PM, PS, ZO, NS, NS},
- {PM, PM, PS, ZO, NS, NM, NM},
- {PS, PS, ZO, NS, NS, NM, NM},
- {PS, ZO, NS, NM, NM, NM, NB},
- {ZO, ZO, NM, NM, NM, NB, NB}};
-
-int32_t kd[7][7] = {{PS, NS, NB, NB, NB, NM, PS},
- {PS, NS, NB, NM, NM, NS, ZO},
- {ZO, NS, NM, NM, NS, NS, ZO},
- {ZO, NS, NS, NS, NS, NS, ZO},
- {ZO, ZO, ZO, ZO, ZO, ZO, ZO},
- {PB, NS, PS, PS, PS, PS, PB},
- {PB, PM, PM, PM, PS, PS, PB}};
-
-int32_t ki[7][7] = {{NB, NB, NM, NM, NS, ZO, ZO},
- {NB, NB, NM, NS, NS, ZO, ZO},
- {NB, NM, NS, NS, ZO, PS, PS},
- {NM, NM, NS, ZO, PS, PM, PM},
- {NM, NS, ZO, PS, PS, PM, PB},
- {ZO, ZO, PS, PS, PM, PB, PB},
- {ZO, ZO, PS, PM, PM, PB, PB}};
-
-static float32 ec; // 误差变化率
-/**************求隶属度(三角形)***************/
-float32 FTri(float32 x, float32 a, float32 b, float32 c) // FuzzyTriangle
-{
- if (x <= a)
- return 0;
- else if ((a < x) && (x <= b))
- return (x - a) / (b - a);
- else if ((b < x) && (x <= c))
- return (c - x) / (c - b);
- else if (x > c)
- return 0;
- else
- return 0;
-}
-/*****************求隶属度(梯形左)*******************/
-float32 FTraL(float32 x, float32 a, float32 b) // FuzzyTrapezoidLeft
-{
- if (x <= a)
- return 1;
- else if ((a < x) && (x <= b))
- return (b - x) / (b - a);
- else if (x > b)
- return 0;
- else
- return 0;
-}
-/*****************求隶属度(梯形右)*******************/
-float32 FTraR(float32 x, float32 a, float32 b) // FuzzyTrapezoidRight
-{
- if (x <= a)
- return 0;
- if ((a < x) && (x < b))
- return (x - a) / (b - a);
- if (x >= b)
- return 1;
- else
- return 1;
-}
-/****************三角形反模糊化处理**********************/
-float32 uFTri(float32 x, float32 a, float32 b, float32 c)
-{
- float32 y, z;
- z = (b - a) * x + a;
- y = c - (c - b) * x;
- return (y + z) / 2;
-}
-/*******************梯形(左)反模糊化***********************/
-float32 uFTraL(float32 x, float32 a, float32 b)
-{
- return b - (b - a) * x;
-}
-/*******************梯形(右)反模糊化***********************/
-float32 uFTraR(float32 x, float32 a, float32 b)
-{
- return (b - a) * x + a;
-}
-/**************************求交集****************************/
-float32 fand(float32 a, float32 b)
-{
- return (a < b) ? a : b;
-}
-/**************************求并集****************************/
-float32 forr(float32 a, float32 b)
-{
- return (a < b) ? b : a;
-}
-
-static float32 _PID(struct PID_X *self, float32 target, float32 feedback)
-{
- float32 pwm_var; // pwm调整量
- float32 iError; // 当前误差
- float32 set, input;
- CLASSICPID *pri = &self->pri;
- // 计算隶属度表
- float32 es[7], ecs[7], e;
- float32 form[7][7];
- int i = 0, j = 0;
- int MaxX = 0, MaxY = 0;
-
- // 记录隶属度最大项及相应推理表的p、i、d值
- float32 lsd;
- int temp_p, temp_d, temp_i;
- float32 detkp, detkd, detki; // 推理后的结果
-
- // 输入格式的转化及偏差计算
- set = target;
- input = feedback;
- iError = set - input; // 偏差
-
- e = iError;
- ec = iError - pri->lasterror;
-
- // 当温度差的绝对值小于Emax时,对pid的参数进行调整
- if (fabs(iError) <= Emax)
- {
- // 计算iError在es与ecs中各项的隶属度
- es[NB] = FTraL(e * 5, -3, -1); // e
- es[NM] = FTri(e * 5, -3, -2, 0);
- es[NS] = FTri(e * 5, -3, -1, 1);
- es[ZO] = FTri(e * 5, -2, 0, 2);
- es[PS] = FTri(e * 5, -1, 1, 3);
- es[PM] = FTri(e * 5, 0, 2, 3);
- es[PB] = FTraR(e * 5, 1, 3);
-
- ecs[NB] = FTraL(ec * 30, -3, -1); // ec
- ecs[NM] = FTri(ec * 30, -3, -2, 0);
- ecs[NS] = FTri(ec * 30, -3, -1, 1);
- ecs[ZO] = FTri(ec * 30, -2, 0, 2);
- ecs[PS] = FTri(ec * 30, -1, 1, 3);
- ecs[PM] = FTri(ec * 30, 0, 2, 3);
- ecs[PB] = FTraR(ec * 30, 1, 3);
-
- // 计算隶属度表,确定e和ec相关联后表格各项隶属度的值
- for (i = 0; i < 7; i++)
- {
- for (j = 0; j < 7; j++)
- {
- form[i][j] = fand(es[i], ecs[j]);
- }
- }
-
- // 取出具有最大隶属度的那一项
- for (i = 0; i < 7; i++)
- {
- for (j = 0; j < 7; j++)
- {
- if (form[MaxX][MaxY] < form[i][j])
- {
- MaxX = i;
- MaxY = j;
- }
- }
- }
- // 进行模糊推理,并去模糊
- lsd = form[MaxX][MaxY];
- temp_p = kp[MaxX][MaxY];
- temp_d = kd[MaxX][MaxY];
- temp_i = ki[MaxX][MaxY];
-
- if (temp_p == NB)
- detkp = uFTraL(lsd, -0.3, -0.1);
- else if (temp_p == NM)
- detkp = uFTri(lsd, -0.3, -0.2, 0);
- else if (temp_p == NS)
- detkp = uFTri(lsd, -0.3, -0.1, 0.1);
- else if (temp_p == ZO)
- detkp = uFTri(lsd, -0.2, 0, 0.2);
- else if (temp_p == PS)
- detkp = uFTri(lsd, -0.1, 0.1, 0.3);
- else if (temp_p == PM)
- detkp = uFTri(lsd, 0, 0.2, 0.3);
- else if (temp_p == PB)
- detkp = uFTraR(lsd, 0.1, 0.3);
-
- if (temp_d == NB)
- detkd = uFTraL(lsd, -3, -1);
- else if (temp_d == NM)
- detkd = uFTri(lsd, -3, -2, 0);
- else if (temp_d == NS)
- detkd = uFTri(lsd, -3, 1, 1);
- else if (temp_d == ZO)
- detkd = uFTri(lsd, -2, 0, 2);
- else if (temp_d == PS)
- detkd = uFTri(lsd, -1, 1, 3);
- else if (temp_d == PM)
- detkd = uFTri(lsd, 0, 2, 3);
- else if (temp_d == PB)
- detkd = uFTraR(lsd, 1, 3);
-
- if (temp_i == NB)
- detki = uFTraL(lsd, -0.06, -0.02);
- else if (temp_i == NM)
- detki = uFTri(lsd, -0.06, -0.04, 0);
- else if (temp_i == NS)
- detki = uFTri(lsd, -0.06, -0.02, 0.02);
- else if (temp_i == ZO)
- detki = uFTri(lsd, -0.04, 0, 0.04);
- else if (temp_i == PS)
- detki = uFTri(lsd, -0.02, 0.02, 0.06);
- else if (temp_i == PM)
- detki = uFTri(lsd, 0, 0.04, 0.06);
- else if (temp_i == PB)
- detki = uFTraR(lsd, 0.02, 0.06);
-
- // pid三项系数的修改
- pri->pKp += detkp;
- pri->pKi += detki;
- if (pri->kd_e)
- {
- pri->pKd += detkd;
- }
- else
- {
- pri->pKd = 0; // 取消微分作用
- }
-
- // 对Kp,Ki进行限幅
- if (pri->pKp < 0)
- {
- pri->pKp = 0;
- }
- if (pri->pKi < 0)
- {
- pri->pKi = 0;
- }
-
- // 计算新的K1,nKi,nKd
- pri->nKp = pri->pKp + pri->pKi + pri->pKd;
- pri->nKi = -(pri->pKp + 2 * pri->pKd);
- pri->nKd = pri->pKd;
- }
-
- if (iError > Emax)
- {
- pri->out = pri->max;
- pwm_var = 0;
- pri->flag = 1; // 设定标志位,如果误差超过了门限值,则认为当控制量第一次到达给定值时,应该采取下面的 抑制超调 的措施
- }
- else if (iError < -Emax)
- {
- pri->out = pri->min;
- pwm_var = 0;
- }
- else if (fabsf(iError) <= Emin)
- {
- pwm_var = 0;
- }
- else
- {
- if (iError < Emid && pri->flag == 1) // 第一次超过(设定值-Emid(-0.08)摄氏度),是输出为零,防止超调,也可以输出其他值,不至于太小而引起震荡
- {
- pri->out = 0;
- pri->flag = 0;
- }
- else if (-iError > Emid) // 超过(设定+Emid(+0.08)摄氏度)
- {
- pwm_var = -1;
- }
- else
- {
- // 增量计算
- pwm_var = (pri->nKp * iError // e[k]
- + pri->nKi * pri->lasterror // e[k-1]
- + pri->nKd * pri->preverror); // e[k-2]
- }
- if (pwm_var >= Umax)
- pwm_var = Umax; // 调整值限幅,防止积分饱和
- if (pwm_var <= Umin)
- pwm_var = Umin; // 调整值限幅,防止积分饱和
- }
- pri->preverror = pri->lasterror;
- pri->lasterror = iError;
-
- pri->out += pwm_var; // 调整PWM输出
-
- if (pri->out > pri->max)
- pri->out = pri->max; // 输出值限幅
- if (pri->out < pri->min)
- pri->out = pri->min; // 输出值限幅
-
- return pri->out;
-}
-
-/*整定开始前的预处理,判断状态及初始化变量*/
-static void tune_pretreatment(struct PID_X *self)
-{
- CLASSIC_AUTOTUNE *tune = &self->tune;
- CLASSICPID *vPID = &self->pri;
-
- tune->tuneTimer = 0;
- tune->startTime = 0;
- tune->endTime = 0;
- tune->outputStep = 100;
-
- if (*vPID->pSV >= *vPID->pPV)
- {
- tune->initialStatus = 1;
- tune->outputStatus = 0;
- }
- else
- {
- tune->initialStatus = 0;
- tune->outputStatus = 1;
- }
- tune->tuneEnable = 1;
- tune->preEnable = 0;
- tune->zeroAcrossCounter = 0;
- tune->riseLagCounter = 0;
- tune->fallLagCounter = 0;
-}
-
-/*计算PID参数值*/
-static void calculation_parameters(struct PID_X *self)
-{
- CLASSIC_AUTOTUNE *tune = &self->tune;
- CLASSICPID *vPID = &self->pri;
- float32 kc = 0.0f;
- float32 tc = 0.0f;
- float32 zn[3][3] = {{0.5f, 100000.0f, 0.0f}, {0.45f, 0.8f, 0.0f}, {0.6f, 0.5f, 0.125f}};
-
- tc = (tune->endTime - tune->startTime) * tune->tunePeriod / 1000.0;
- kc = (8.0f * tune->outputStep) / (PI * (tune->maxPV - tune->minPV));
-
- vPID->pKp = zn[tune->controllerType][0] * kc; // 比例系数
- vPID->pKi = vPID->pKp * tune->tunePeriod / (zn[tune->controllerType][1] * tc); // 积分系数
- vPID->pKd = vPID->pKp * zn[tune->controllerType][2] * tc / tune->tunePeriod; // 微分系数
-}
-
-/**
- * @brief 自整定函数
- * @param {PID_X} *self
- * @return {*}
- * @note 成员变量tuneEnable、preEnable和controllerType需要提前赋值。tuneEnable变量值为0时是使用PID控制器,而tuneEnable变量值为1时是开启整定过程,当tuneEnable变量值为2时是指示整定失败。preEnable变量在整定前赋值为1,表示先做预处理。而controllerType则根据所整定的控制器的类型来定,主要用于参数的计算。
- */
-static uint8_t _auto_tune(struct PID_X *self)
-{
- CLASSIC_AUTOTUNE *tune = &self->tune;
- CLASSICPID *vPID = &self->pri;
- /*整定开始前的预处理,只执行一次*/
- if (tune->preEnable == 1)
- {
- tune_pretreatment(self);
- }
-
- uint32_t tuneDuration = 0;
- tune->tuneTimer++;
- tuneDuration = (tune->tuneTimer * tune->tunePeriod) / 1000;
- if (tuneDuration > (10 * 60)) // 整定过程持续超过10分钟,未能形成有效振荡,整定失败
- {
- tune->tuneEnable = 2;
- tune->preEnable = 1;
- return tune->tuneEnable;
- }
-
- if (*vPID->pSV >= *vPID->pPV) // 设定值大于测量值,则开执行单元
- {
- tune->riseLagCounter++;
- tune->fallLagCounter = 0;
-
- if (tune->riseLagCounter > LAG_PHASE)
- {
- *vPID->pMV = vPID->max;
- if (tune->outputStatus == 0)
- {
- tune->outputStatus = 1;
- tune->zeroAcrossCounter++;
-
- if (tune->zeroAcrossCounter == 3)
- {
- tune->startTime = tune->tuneTimer;
- }
- }
- }
- }
- else
- {
- tune->riseLagCounter = 0;
- tune->fallLagCounter++;
-
- if (tune->fallLagCounter > LAG_PHASE)
- {
- *vPID->pMV = vPID->min;
- if (tune->outputStatus == 1)
- {
- tune->outputStatus = 0;
- tune->zeroAcrossCounter++;
-
- if (tune->zeroAcrossCounter == 3)
- {
- tune->startTime = tune->tuneTimer;
- }
- }
- }
- }
-
- if (tune->zeroAcrossCounter == 3) // 已经两次过零,可以记录波形数据
- {
- if (tune->initialStatus == 1) // 初始设定值大于测量值,则区域3出现最小值
- {
- if (*vPID->pPV < tune->minPV)
- {
- tune->minPV = *vPID->pPV;
- }
- }
- else if (tune->initialStatus == 0) // 初始设定值小于测量值,则区域3出现最大值
- {
- if (*vPID->pPV > tune->maxPV)
- {
- tune->maxPV = *vPID->pPV;
- }
- }
- }
- else if (tune->zeroAcrossCounter == 4) // 已经三次过零,记录另半波的数据
- {
- if (tune->initialStatus == 1) // 初始设定值大于测量值,则区域4出现最大值
- {
- if (*vPID->pPV > tune->maxPV)
- {
- tune->maxPV = *vPID->pPV;
- }
- }
- else if (tune->initialStatus == 0) // 初始设定值小于测量值,则区域4出现最小值
- {
- if (*vPID->pPV < tune->minPV)
- {
- tune->minPV = *vPID->pPV;
- }
- }
- }
- else if (tune->zeroAcrossCounter == 5) // 已经四次过零,振荡已形成可以整定参数
- {
- calculation_parameters(self);
-
- tune->tuneEnable = 0;
- tune->preEnable = 1;
- }
-
- return tune->tuneEnable;
-}
-
-void pid_x_constructor(struct PID_X *self)
-{
- self->PID = _PID;
- self->AUTO_TUNE = _auto_tune;
- self->pri.flag = 0;
- self->pri.out = 0;
- self->tune.preEnable = 1;
-}
diff --git a/User/lib/control/custom/pid_x.h b/User/lib/control/custom/pid_x.h
deleted file mode 100644
index 2be7c04..0000000
--- a/User/lib/control/custom/pid_x.h
+++ /dev/null
@@ -1,71 +0,0 @@
-#ifndef __PID_X_H__
-#define __PID_X_H__
-#include "lib.h"
-
-/*定义PID对象类型*/
-typedef struct CLASSIC
-{
- float32 *pPV; // 测量值指针
- float32 *pSV; // 设定值指针
- float32 *pMV; // 输出值指针
- BOOL *pMA; // 手自动操作指针
-
- float32 out; // 输出值
- float32 setpoint; // 设定值
- float32 lasterror; // 前一拍偏差
- float32 preverror; // 前两拍偏差
- float32 max; // 输出值上限
- float32 min; // 输出值下限
-
- uint16_t flag; // 状态标志位
-
- float32 pKp; // 比例系数
- float32 pKi; // 积分系数
- float32 pKd; // 微分系数
-
- float32 nKp; // 比例系数
- float32 nKi; // 积分系数
- float32 nKd; // 微分系数
-
- BOOL direct; // 正反作用
- BOOL sm; // 设定值平滑
- BOOL cas; // 串级设定
- BOOL pac; // 输出防陡变
- BOOL kd_e; // 微分使能
-} CLASSICPID;
-
-// 定义整定参数
-typedef struct
-{
- uint8_t tuneEnable : 2; // 整定与PID控制开关,0:PID控制;1:参数整定;2:整定失败
- uint8_t preEnable : 2; // 预处理使能,在开始整定前置位
- uint8_t initialStatus : 1; // 记录开始整定前偏差的初始状态
- uint8_t outputStatus : 1; // 记录输出的初始状态,0允许上升过零计数;1允许下降过零计数
- uint8_t controllerType : 2; // 控制器类型:0,P控制器;1,PI控制器;2,PID控制器
-
- uint8_t zeroAcrossCounter; // 过零点计数器,每次输出改变加1,比实际过零次数多1
- uint8_t riseLagCounter; // 上升迟滞时间计数器
- uint8_t fallLagCounter; // 下降迟滞时间计数器
-
- uint16_t tunePeriod; // 整定采样周期
- uint32_t tuneTimer; // 整定计时器
- uint32_t startTime; // 记录波形周期起始时间
- uint32_t endTime; // 记录波形周期结束时间
-
- float32 outputStep; // 输出阶跃d
- float32 maxPV; // 振荡波形中测量值的最大值
- float32 minPV; // 振荡波形中测量值的最小值
-} CLASSIC_AUTOTUNE;
-
-typedef struct PID_X
-{
- /* 控制接口 */
- float32 (*PID)(struct PID_X *self, float32 target, float32 feedback);
- uint8_t (*AUTO_TUNE)(struct PID_X *self);
- /* private */
- CLASSICPID pri;
- CLASSIC_AUTOTUNE tune;
-} pid_x_t;
-
-extern void pid_x_constructor(struct PID_X *self);
-#endif // __PID_X_H__
diff --git a/User/lib/control/custom/pid_zh.c b/User/lib/control/custom/pid_zh.c
deleted file mode 100644
index 2156d3a..0000000
--- a/User/lib/control/custom/pid_zh.c
+++ /dev/null
@@ -1,467 +0,0 @@
-#include "pid_zh.h"
-#include "sys.h"
-#include
-
-// 定义输出量比例因子
-#ifdef GPS3000
-#define KUP 0.0f // #define KUP 3.0f
-#define KUI 0.00f
-#define KUD 0.0f // #define KUP 3.0f
-#else
-#define KUP 3.0f
-#define KUI 0.0f
-#define KUD 0.0f
-#endif
-
-// 模糊集合
-#define NL -3
-#define NM -2
-#define NS -1
-#define ZE 0
-#define PS 1
-#define PM 2
-#define PL 3
-
-// 定义偏差E的范围,因为设置了非线性区间,误差在10时才开始进行PID调节,这里E的范围为10
-#define MAXE (10)
-#define MINE (-MAXE)
-// 定义EC的范围,因为变化非常缓慢!,每次的EC都非常小,这里可以根据实际需求来调整,
-#define MAXEC (10)
-#define MINEC (-MAXEC)
-// 定义e,ec的量化因子
-#define KE 3 / MAXE
-#define KEC 3 / MAXEC
-
-static const float32 fuzzyRuleKp[7][7] = {
- PL, PL, PM, PL, PS, PM, PL,
- PL, PM, PM, PM, PS, PM, PL,
- PM, PS, PS, PS, PS, PS, PM,
- PM, PS, ZE, ZE, ZE, PS, PM,
- PS, PS, PS, PS, PS, PM, PM,
- PM, PM, PM, PM, PL, PL, PL,
- PM, PL, PL, PL, PL, PL, PL};
-
-static const float32 fuzzyRuleKi[7][7] = {
- PL, PL, PL, PL, PM, PL, PL,
- PL, PL, PM, PM, PM, PL, PL,
- PM, PM, PS, PS, PS, PM, PM,
- PM, PS, ZE, ZE, ZE, PS, PM,
- PM, PS, PS, PS, PS, PM, PM,
- PM, PM, PS, PM, PM, PL, PL,
- PM, PL, PM, PL, PL, PL, PL};
-
-/*
-static const float32 fuzzyRuleKi[7][7] = {
- NL, NL, NL, NL, NM, NL, NL,
- NL, NL, NM, NM, NM, NL, NL,
- NM, NM, NS, NS, NS, NM, NM,
- NM, NS, ZE, ZE, ZE, NS, NM,
- NM, NS, NS, NS, NS, NM, NM,
- NM, NM, NS, NM, NM, NL, NL,
- NM, NL, NM, NL, NL, NL, NL};
-*/
-
-static const float32 fuzzyRuleKd[7][7] = {
- PS, PS, ZE, ZE, ZE, PL, PL,
- PS, PS, PS, PS, ZE, PS, PM,
- PL, PL, PM, PS, ZE, PS, PM,
- PL, PM, PM, PS, ZE, PS, PM,
- PL, PM, PS, PS, ZE, PS, PS,
- PM, PS, PS, PS, ZE, PS, PS,
- PS, ZE, ZE, ZE, ZE, PL, PL};
-
-/*
-static const float32 fuzzyRuleKp[7][7] = {
- PL, PL, PM, PM, PS, ZE, ZE,
- PL, PL, PM, PS, PS, ZE, NS,
- PM, PM, PM, PS, ZE, NS, NS,
- PM, PM, PS, ZE, NS, NM, NM,
- PS, PS, ZE, NS, NS, NM, NM,
- PS, ZE, NS, NM, NM, NM, NL,
- ZE, ZE, NM, NM, NM, NL, NL};
-
-static const float32 fuzzyRuleKi[7][7] = {
- NL, NL, NM, NM, NS, ZE, ZE,
- NL, NL, NM, NS, NS, ZE, ZE,
- NL, NM, NS, NS, ZE, PS, PS,
- NM, NM, NS, ZE, PS, PM, PM,
- NM, NS, ZE, PS, PS, NM, PL,
- ZE, ZE, PS, PS, PM, PL, PL,
- ZE, ZE, PS, PM, PM, PL, PL};
-
-static const float32 fuzzyRuleKd[7][7] = {
- PS, NS, NL, NL, NL, NM, PS,
- PS, NS, NL, NM, NM, NS, ZE,
- ZE, NS, NM, NM, NS, NS, ZE,
- ZE, NS, NS, NS, NS, NS, ZE,
-
- ZE, ZE, ZE, ZE, ZE, ZE, ZE,
- PL, NS, PS, PS, PS, PS, PL,
- PL, PM, PM, PM, PS, PS, PL};
-*/
-
-static void fuzzy(float32 e, float32 ec, FUZZY_PID_ZH_t *fuzzy_pid)
-{
-
- float32 etemp, ectemp;
- float32 eLefttemp, ecLefttemp; // ec,e,左隶属度
- float32 eRighttemp, ecRighttemp;
-
- int eLeftIndex, ecLeftIndex; // 模糊位置标号
- int eRightIndex, ecRightIndex;
- e = RANGE(e, MINE, MAXE);
- ec = RANGE(ec, MINEC, MAXEC);
- e = e * KE;
- ec = ec * KEC;
-
- etemp = e > 3.0f ? 0.0f : (e < -3.0f ? 0.0f : (e >= 0.0f ? (e >= 2.0f ? 2.5f : (e >= 1.0f ? 1.5f : 0.5f)) : (e >= -1.0f ? -0.5f : (e >= -2.0f ? -1.5f : (e >= -3.0f ? -2.5f : 0.0f)))));
- eLeftIndex = (int)((etemp - 0.5f) + 3); //[-3,2] -> [0,5]
- eRightIndex = (int)((etemp + 0.5f) + 3);
- eLefttemp = etemp == 0.0f ? 0.0f : ((etemp + 0.5f) - e);
- eRighttemp = etemp == 0.0f ? 0.0f : (e - (etemp - 0.5f));
-
- ectemp = ec > 3.0f ? 0.0f : (ec < -3.0f ? 0.0f : (ec >= 0.0f ? (ec >= 2.0f ? 2.5f : (ec >= 1.0f ? 1.5f : 0.5f)) : (ec >= -1.0f ? -0.5f : (ec >= -2.0f ? -1.5f : (ec >= -3.0f ? -2.5f : 0.0f)))));
- ecLeftIndex = (int)((ectemp - 0.5f) + 3); //[-3,2] -> [0,5]
- ecRightIndex = (int)((ectemp + 0.5f) + 3);
- ecLefttemp = ectemp == 0.0f ? 0.0f : ((ectemp + 0.5f) - ec);
- ecRighttemp = ectemp == 0.0f ? 0.0f : (ec - (ectemp - 0.5f));
-
- /*************************************反模糊*************************************/
-
- fuzzy_pid->kp = (eLefttemp * ecLefttemp * fuzzyRuleKp[eLeftIndex][ecLeftIndex] + eLefttemp * ecRighttemp * fuzzyRuleKp[eLeftIndex][ecRightIndex] + eRighttemp * ecLefttemp * fuzzyRuleKp[eRightIndex][ecLeftIndex] + eRighttemp * ecRighttemp * fuzzyRuleKp[eRightIndex][ecRightIndex]);
-
- fuzzy_pid->ki = (eLefttemp * ecLefttemp * fuzzyRuleKi[eLeftIndex][ecLeftIndex] + eLefttemp * ecRighttemp * fuzzyRuleKi[eLeftIndex][ecRightIndex] + eRighttemp * ecLefttemp * fuzzyRuleKi[eRightIndex][ecLeftIndex] + eRighttemp * ecRighttemp * fuzzyRuleKi[eRightIndex][ecRightIndex]);
-
- fuzzy_pid->kd = (eLefttemp * ecLefttemp * fuzzyRuleKd[eLeftIndex][ecLeftIndex] + eLefttemp * ecRighttemp * fuzzyRuleKd[eLeftIndex][ecRightIndex] + eRighttemp * ecLefttemp * fuzzyRuleKd[eRightIndex][ecLeftIndex] + eRighttemp * ecRighttemp * fuzzyRuleKd[eRightIndex][ecRightIndex]);
- // 对解算出的KP,KI,KD进行量化映射
- fuzzy_pid->kp = fuzzy_pid->kp * fuzzy_pid->kup;
- fuzzy_pid->ki = fuzzy_pid->ki * fuzzy_pid->kui;
- fuzzy_pid->kd = fuzzy_pid->kd * fuzzy_pid->kud;
-}
-
-static void smoothSetpoint(struct PID_FUZZY_ZH *self, float32 target_sv)
-{
-#if FUZZY_SUB_TYPE == PID_SUB_TYPE_POSITION
- pid_zh_position_t *pri = &self->pri;
-#else
- pid_common_increment_t *pri = &self->pri;
-#endif
- float32 stepIn = (pri->sv_range) * 0.1f;
- float32 kFactor = 0.0f;
- if (fabs(pri->ref - target_sv) <= stepIn)
- {
- pri->ref = target_sv;
- }
- else
- {
- if (pri->ref - target_sv > 0)
- {
- kFactor = -1.0f;
- }
- else if (pri->ref - target_sv < 0)
- {
- kFactor = 1.0f;
- }
- else
- {
- kFactor = 0.0f;
- }
- pri->ref = pri->ref + kFactor * stepIn;
- }
-}
-
-/*封装模糊接口*/
-static void compensate(float32 e, float32 ec, FUZZY_PID_ZH_t *fuzzy_d)
-{
- fuzzy(e, ec, fuzzy_d);
-}
-
-/**
- * @brief 复位PID积分及微分控制数据
- * @param {PID_FUZZY_ZH} *self
- * @return {*}
- */
-static void _restctrl(struct PID_FUZZY_ZH *self)
-{
- self->pri.pre_error = 0;
- self->pri.sum_iterm = 0;
-#if INCOMPLETE_DIFFEREN == 1
- self->pri.lastdev = 0;
-#endif
-}
-
-/**
- * @brief 更新最大最小值
- * @param {PID_FUZZY_ZH} *self
- * @param {float32} out_min
- * @param {float32} out_max
- * @return {*}
- * @note
- */
-static void _set_range(struct PID_FUZZY_ZH *self, float32 out_min, float32 out_max)
-{
- self->pri.out_max = out_max;
- self->pri.out_min = out_min;
-}
-
-/**
- * @brief 使能积分控制
- * @param {PID_FUZZY_ZH} *self
- * @param {BOOL} enable
- * @return {*}
- * @note
- */
-// static void _set_ki_enable(struct PID_FUZZY_ZH *self, BOOL enable)
-// {
-// self->pri.ki_enable = enable;
-// }
-
-/**
- * @brief 使能微分控制
- * @param {PID_FUZZY_ZH} *self
- * @param {BOOL} enable
- * @return {*}
- * @note
- */
-static void _set_kd_enable(struct PID_FUZZY_ZH *self, BOOL enable)
-{
- self->pri.kd_enable = enable;
-}
-
-/*
- * Function:使能平滑控制
- * parameter:*pid需要配,PID参数结构指针,sv_range控制范围sv的范围
- * return:无
- */
-static void _set_smooth_enable(struct PID_FUZZY_ZH *self, BOOL enable, float32 sv_range)
-{
-#if FUZZY_SUB_TYPE == PID_SUB_TYPE_POSITION
- pid_zh_position_t *pri = &self->pri;
-#else
- pid_common_increment_t *pri = &self->pri;
-#endif
- pri->sm = enable;
- pri->sv_range = sv_range;
-}
-
-// 设置控制参数
-static void _set_ctrl_prm(struct PID_FUZZY_ZH *self, float32 kp, float32 ki, float32 kd, float32 err_dead,
- float32 out_min, float32 out_max)
-{
- self->open = TRUE;
- self->fuzzy.kup = KUP;
- self->fuzzy.kui = KUI;
- self->fuzzy.kud = KUD;
-#if FUZZY_SUB_TYPE == PID_SUB_TYPE_POSITION
- pid_zh_position_t *pri = &self->pri;
- osel_memset((uint8_t *)pri, 0, sizeof(pid_zh_position_t));
- pri->kp = kp;
- pri->ki = ki;
- pri->kd = kd;
- pri->err_dead = err_dead;
- pri->out_max = out_max;
- pri->out_min = out_min;
- pri->detach = FALSE;
- pri->sm = FALSE;
-#else
- pid_common_increment_t *pri = &self->pri;
- osel_memset((uint8_t *)pri, 0, sizeof(pid_common_increment_t));
- pri->kp = kp;
- pri->ki = ki;
- pri->kd = kd;
- pri->err_dead = err_dead;
- pri->out_max = out_max;
- pri->out_min = out_min;
-#endif
-
- if (kd > 0)
- {
- pri->kd_enable = TRUE;
- }
- else
- {
- pri->kd_enable = FALSE;
- }
-}
-
-static void _update_ctrl_prm(struct PID_FUZZY_ZH *self, float32 kp, float32 ki, float32 kd, float32 err_dead,
- float32 out_min, float32 out_max)
-{
-#if FUZZY_SUB_TYPE == PID_SUB_TYPE_POSITION
- pid_zh_position_t *pri = &self->pri;
- pri->kp = kp;
- pri->ki = ki;
- pri->kd = kd;
- pri->err_dead = err_dead;
- pri->out_max = out_max;
- pri->out_min = out_min;
- pri->detach = FALSE;
- pri->sm = FALSE;
-#else
- pid_common_increment_t *pri = &self->pri;
- pri->kp = kp;
- pri->ki = ki;
- pri->kd = kd;
- pri->err_dead = err_dead;
- pri->out_max = out_max;
- pri->out_min = out_min;
-#endif
-
- if (kd > 0)
- {
- pri->kd_enable = TRUE;
- }
- else
- {
- pri->kd_enable = FALSE;
- }
-}
-
-/**
- * @brief 非0时配置为积分分离+抗积分饱和PID,否则为普通抗积分饱和PID
- * @param {PID_FUZZY_ZH} *self
- * @param {float32} max_err
- * @param {BOOL} mode
- * @return {*}
- */
-static void _set_cfg(struct PID_FUZZY_ZH *self, float32 max_err, BOOL mode)
-{
- self->pri.err_limit = max_err;
- self->pri.detach = mode == FALSE ? FALSE : TRUE;
-}
-
-#if FUZZY_SUB_TYPE == PID_SUB_TYPE_POSITION
-static float32 _PID(struct PID_FUZZY_ZH *self, float32 target, float32 feedback)
-{
- float32 error = 0;
- float32 insert = 0;
- float32 ec = 0;
- float32 kd = 0;
-#if INCOMPLETE_DIFFEREN == 1
- float32 thisdev = 0;
-#else
- // float32 dinput = 0.0f;
-#endif
- float32 temp_iterm = 0.0f;
- pid_zh_position_t *pri = &self->pri;
-
- /*获取期望值与实际值,进行偏差计算*/
- if (pri->sm == 1)
- {
- smoothSetpoint(self, target);
- }
- else
- {
- pri->ref = target;
- }
-
- pri->feed_back = feedback;
- error = pri->ref - pri->feed_back;
- if (fabs(error) <= pri->err_dead)
- error = 0;
-
- /* fuzzy control caculate */
- ec = error - pri->pre_error;
- if (self->open == TRUE)
- {
- compensate(error, ec, &self->fuzzy);
- }
-
- /*根据PID配置的模式,获取积分数据,进行积分累加*/
- if (pri->out >= pri->out_max)
- {
- if (fabs(error) > pri->err_limit && pri->detach)
- {
- insert = 0;
- }
- else
- {
- insert = 1;
- if (error < 0)
- {
- temp_iterm = (pri->ki + self->fuzzy.ki) * error;
- }
- }
- }
- else if (pri->out <= pri->out_min)
- {
- if (fabs(error) > pri->err_limit && pri->detach)
- {
- insert = 0;
- }
- else
- {
- insert = 1;
- if (error > 0)
- {
- temp_iterm = (pri->ki + self->fuzzy.ki) * error;
- }
- }
- }
- else
- {
- if (fabs(error) > pri->err_limit && pri->detach)
- {
- insert = 0;
- }
- else
- {
- insert = 1;
- temp_iterm = (pri->ki + self->fuzzy.ki) * error;
- }
- }
- pri->sum_iterm += temp_iterm;
- /* limt integral */
- pri->sum_iterm = RANGE(pri->sum_iterm, pri->out_min, pri->out_max);
- /*
- if (pri->sum_ref)
- pri->sum_iterm = RANGE(pri->sum_iterm, pri->sum_ref - 1.0f, pri->sum_ref + 1.0f);
- else
- pri->sum_iterm = RANGE(pri->sum_iterm, pri->out_min, pri->out_max);
- */
-#if INCOMPLETE_DIFFEREN == 1
- /*不完全微分*/
- thisdev = (pri->kd + self->fuzzy.kd) * (1.0 - pri->alpha) * (error - pri->pre_error) + pri->alpha * pri->lastdev;
- /*caculate pid out*/
- pri->out = (pri->kp + self->fuzzy.kp) * error + pri->sum_iterm * insert + thisdev;
-
- /*record last dev result*/
- pri->lastdev = thisdev;
-#else
-
- if (pri->kd_enable == TRUE)
- {
- kd = pri->kd + self->fuzzy.kd;
- }
- else
- {
- kd = 0;
- }
-
- pri->out = (pri->kp + self->fuzzy.kp) * error + pri->sum_iterm * insert + (error - pri->pre_error) * (kd);
- // pri->out += pri->sum_ref;
-
-#endif
-
- pri->pre_error = error;
- /*record last feedback sensor result*/
- pri->pre_feed_back = pri->feed_back;
- /*limt pid output*/
- pri->out = RANGE(pri->out, pri->out_min, pri->out_max);
- return pri->out;
-}
-#else
-#endif
-
-void pid_zh_constructor(struct PID_FUZZY_ZH *self)
-{
- self->set_ctrl_prm = _set_ctrl_prm;
- self->update_ctrl_prm = _update_ctrl_prm;
- self->set_cfg = _set_cfg;
- self->set_smooth_enable = _set_smooth_enable;
- // self->set_ki_enable = _set_ki_enable;
- self->set_kd_enable = _set_kd_enable;
- self->set_range = _set_range;
- self->restctrl = _restctrl;
- self->PID = _PID;
-}
diff --git a/User/lib/control/custom/pid_zh.h b/User/lib/control/custom/pid_zh.h
deleted file mode 100644
index 06f551a..0000000
--- a/User/lib/control/custom/pid_zh.h
+++ /dev/null
@@ -1,73 +0,0 @@
-#ifndef __PID_ZH_H__
-#define __PID_ZH_H__
-#include "lib.h"
-#include "pid_auto_tune.h"
-
-#define GPS2000
-
-typedef struct
-{
- float32 ref;
- float32 feed_back;
- float32 pre_feed_back;
- float32 pre_error;
- float32 sum_ref;
- float32 sum_iterm;
- float32 kp;
- float32 ki;
- float32 kd;
- float32 err_limit;
- BOOL detach;
- float32 err_dead;
-#if INCOMPLETE_DIFFEREN == 1
- float32 alpha;
- float32 lastdev;
-#endif
- float32 out;
- float32 out_max;
- float32 out_min;
- float32 sv_range;
- BOOL sm;
- BOOL ki_enable;
- BOOL kd_enable;
-} pid_zh_position_t; // 位置式PID
-
-typedef struct
-{
- float32 kp;
- float32 ki;
- float32 kd;
-
- float32 kup;
- float32 kui;
- float32 kud;
-} FUZZY_PID_ZH_t;
-
-// 模糊PID
-typedef struct PID_FUZZY_ZH
-{
- /* 设置PID三个参数 */
- void (*set_ctrl_prm)(struct PID_FUZZY_ZH *self, float32 kp, float32 ki, float32 kd, float32 err_dead,
- float32 out_min, float32 out_max); // 设置PID参数
- void (*update_ctrl_prm)(struct PID_FUZZY_ZH *self, float32 kp, float32 ki, float32 kd, float32 err_dead,
- float32 out_min, float32 out_max); // 更新PID参数
- void (*set_range)(struct PID_FUZZY_ZH *self, float32 out_min, float32 out_max); // 更新最大最小值
- void (*set_cfg)(struct PID_FUZZY_ZH *self, float32 max_err, BOOL mode); // 配置PID模式,默认不使用积分分离
- void (*set_smooth_enable)(struct PID_FUZZY_ZH *self, BOOL enable, float32 sv_range); // 设置平滑范围
- // void (*set_ki_enable)(struct PID_FUZZY *self, BOOL enable);
- // 微分开启使能
- void (*set_kd_enable)(struct PID_FUZZY_ZH *self, BOOL enable);
- void (*restctrl)(struct PID_FUZZY_ZH *self); // 复位PID积分及微分控制数据
- /* 控制接口 */
- float32 (*PID)(struct PID_FUZZY_ZH *self, float32 target, float32 feedback);
-
- pid_zh_position_t pri;
-
- BOOL open; // 是否使用模糊PID控制
-
- FUZZY_PID_ZH_t fuzzy;
-
-} pid_zh_t; // 模糊PID
-
-extern void pid_zh_constructor(struct PID_FUZZY_ZH *self);
-#endif
diff --git a/User/lib/control/custom/pid_zh1.c b/User/lib/control/custom/pid_zh1.c
deleted file mode 100644
index 977f169..0000000
--- a/User/lib/control/custom/pid_zh1.c
+++ /dev/null
@@ -1,619 +0,0 @@
-
-#include
-#include "pid_zh1.h"
-
-// 定义输出量比例因子
-#define KUP 1.0f
-#define KUI 1.0f
-#define KUD 1.0f
-
-// 模糊集合
-#define NL -3
-#define NM -2
-#define NS -1
-#define ZE 0
-#define PS 1
-#define PM 2
-#define PL 3
-
-// 定义偏差E的范围,因为设置了非线性区间,误差在10时才开始进行PID调节,这里E的范围为10
-#define MAXE (10)
-#define MINE (-MAXE)
-// 定义EC的范围,因为变化非常缓慢!,每次的EC都非常小,这里可以根据实际需求来调整,
-#define MAXEC (10)
-#define MINEC (-MAXEC)
-// 定义e,ec的量化因子
-#define KE 3 / MAXE
-#define KEC 3 / MAXEC
-/*
-static const float fuzzyRuleKp[7][7] = {
- PL, PL, PM, PL, PS, PM, PL,
- PL, PM, PM, PM, PS, PM, PL,
- PM, PS, PS, PS, PS, PS, PM,
- PM, PS, ZE, ZE, ZE, PS, PM,
- PS, PS, PS, PS, PS, PM, PM,
- PM, PM, PM, PM, PL, PL, PL,
- PM, PL, PL, PL, PL, PL, PL};
-
-static const float fuzzyRuleKi[7][7] = {
- PL, PL, PL, PL, PM, PL, PL,
- PL, PL, PM, PM, PM, PL, PL,
- PM, PM, PS, PS, PS, PM, PM,
- PM, PS, ZE, ZE, ZE, PS, PM,
- PM, PS, PS, PS, PS, PM, PM,
- PM, PM, PS, PM, PM, PL, PL,
- PM, PL, PM, PL, PL, PL, PL};
-
-static const float fuzzyRuleKd[7][7] = {
- PS, PS, ZE, ZE, ZE, PL, PL,
- PS, PS, PS, PS, ZE, PS, PM,
- PL, PL, PM, PS, ZE, PS, PM,
- PL, PM, PM, PS, ZE, PS, PM,
- PL, PM, PS, PS, ZE, PS, PS,
- PM, PS, PS, PS, ZE, PS, PS,
- PS, ZE, ZE, ZE, ZE, PL, PL};
-*/
-static const float fuzzyRuleKp[7][7] = {
- PL, PL, PM, PL, PS, PM, PL,
- PL, PM, PM, PM, PS, PM, PL,
- PM, PS, PS, PS, PS, PS, PM,
- PM, PS, ZE, ZE, ZE, PS, PM,
- PS, PS, PS, PS, PS, PM, PM,
- PM, PM, PM, PM, PL, PL, PL,
- PM, PL, PL, PL, PL, PL, PL};
-
-static const float fuzzyRuleKi[7][7] = {
- PL, PL, PL, PL, PM, PL, PL,
- PL, PL, PM, PM, PM, PL, PL,
- PM, PM, PS, PS, PS, PM, PM,
- PM, PS, ZE, ZE, ZE, PS, PM,
- PM, PS, PS, PS, PS, PM, PM,
- PM, PM, PS, PM, PM, PL, PL,
- PM, PL, PM, PL, PL, PL, PL};
-
-static const float fuzzyRuleKd[7][7] = {
- PS, PS, ZE, ZE, ZE, PL, PL,
- PS, PS, PS, PS, ZE, PS, PM,
- PL, PL, PM, PS, ZE, PS, PM,
- PL, PM, PM, PS, ZE, PS, PM,
- PL, PM, PS, PS, ZE, PS, PS,
- PM, PS, PS, PS, ZE, PS, PS,
- PS, ZE, ZE, ZE, ZE, PL, PL};
-
-static void fuzzy(float e, float ec, fuzzy_pid_t *fuzzy_pid)
-{
-
- float etemp, ectemp;
- float eLefttemp, ecLefttemp; // 左隶属度
- float eRighttemp, ecRighttemp; // 右隶属度
-
- int eLeftIndex, ecLeftIndex; // 模糊位置标号
- int eRightIndex, ecRightIndex;
- e = RANGE(e, MINE, MAXE);
- ec = RANGE(ec, MINEC, MAXEC);
- e = e * KE;
- ec = ec * KEC;
-
- etemp = e > 3.0f ? 0.0f : (e < -3.0f ? 0.0f : (e >= 0.0f ? (e >= 2.0f ? 2.5f : (e >= 1.0f ? 1.5f : 0.5f)) : (e >= -1.0f ? -0.5f : (e >= -2.0f ? -1.5f : (e >= -3.0f ? -2.5f : 0.0f)))));
- eLeftIndex = (int)((etemp - 0.5f) + 3);
- eRightIndex = (int)((etemp + 0.5f) + 3);
- eLefttemp = etemp == 0.0f ? 0.0f : ((etemp + 0.5f) - e);
- eRighttemp = etemp == 0.0f ? 0.0f : (e - (etemp - 0.5f));
-
- ectemp = ec > 3.0f ? 0.0f : (ec < -3.0f ? 0.0f : (ec >= 0.0f ? (ec >= 2.0f ? 2.5f : (ec >= 1.0f ? 1.5f : 0.5f)) : (ec >= -1.0f ? -0.5f : (ec >= -2.0f ? -1.5f : (ec >= -3.0f ? -2.5f : 0.0f)))));
- ecLeftIndex = (int)((ectemp - 0.5f) + 3);
- ecRightIndex = (int)((ectemp + 0.5f) + 3);
- ecLefttemp = ectemp == 0.0f ? 0.0f : ((ectemp + 0.5f) - ec);
- ecRighttemp = ectemp == 0.0f ? 0.0f : (ec - (ectemp - 0.5f));
-
- /*************************************反模糊*************************************/
-
- fuzzy_pid->kp = (eLefttemp * ecLefttemp * fuzzyRuleKp[eLeftIndex][ecLeftIndex] + eLefttemp * ecRighttemp * fuzzyRuleKp[eLeftIndex][ecRightIndex] + eRighttemp * ecLefttemp * fuzzyRuleKp[eRightIndex][ecLeftIndex] + eRighttemp * ecRighttemp * fuzzyRuleKp[eRightIndex][ecRightIndex]);
-
- fuzzy_pid->ki = (eLefttemp * ecLefttemp * fuzzyRuleKi[eLeftIndex][ecLeftIndex] + eLefttemp * ecRighttemp * fuzzyRuleKi[eLeftIndex][ecRightIndex] + eRighttemp * ecLefttemp * fuzzyRuleKi[eRightIndex][ecLeftIndex] + eRighttemp * ecRighttemp * fuzzyRuleKi[eRightIndex][ecRightIndex]);
-
- fuzzy_pid->kd = (eLefttemp * ecLefttemp * fuzzyRuleKd[eLeftIndex][ecLeftIndex] + eLefttemp * ecRighttemp * fuzzyRuleKd[eLeftIndex][ecRightIndex] + eRighttemp * ecLefttemp * fuzzyRuleKd[eRightIndex][ecLeftIndex] + eRighttemp * ecRighttemp * fuzzyRuleKd[eRightIndex][ecRightIndex]);
- // 对解算出的KP,KI,KD进行量化映射
- fuzzy_pid->kp = fuzzy_pid->kp * fuzzy_pid->kup;
- fuzzy_pid->ki = fuzzy_pid->ki * fuzzy_pid->kui;
- fuzzy_pid->kd = fuzzy_pid->kd * fuzzy_pid->kud;
-}
-
-static void smooth_init(smart_pid_t *pid, BOOL sm_open, float maxTarget)
-{
- if (!pid)
- return;
-
- pid->sm_open = sm_open;
- pid->maxTarget = maxTarget;
-}
-
-static void smooth_target(smart_pid_t *pid, float *target)
-{
-
- if ((!pid) || (!target))
- return;
-
- if (!pid->maxTarget)
- return;
-
- float sm_step = (pid->maxTarget) * 0.1f;
- float k = 0.0f;
-
- if (fabs(pid->target - *target) <= sm_step)
- {
- pid->target = *target;
- }
- else
- {
- if (pid->target - *target > 0)
- {
- k = -1.0f;
- }
- else if (pid->target - *target < 0)
- {
- k = 1.0f;
- }
- else
- {
- k = 0.0f;
- }
- pid->target += k * sm_step;
- }
-}
-
-static void smart_pid_init(smart_pid_t *pid, float *duty, float *kp, float *ki, float *kd, float *errorDead, float *iDetachCondation, float *maxOut)
-{
- if ((!pid) || (!duty) || (!kp) || (!ki) || (!kd) || (!iDetachCondation) || (!maxOut))
- return;
-
- pid->duty = *duty;
- pid->kp = *kp;
- pid->ki = *ki;
- pid->kd = *kd;
- pid->errorDead = *errorDead;
- pid->iDetachCondation = *iDetachCondation;
- pid->maxOutput = *maxOut;
-}
-
-void cascade_pid_init(cascade_pid_t *pid, smart_pid_t *pid_outer, smart_pid_t *pid_inner)
-{
-
- smooth_init(&pid->outer, pid_outer->sm_open, pid_outer->maxTarget);
- smooth_init(&pid->inner, pid_inner->sm_open, pid_inner->maxTarget);
-
- smart_pid_init(&pid->outer, &pid_outer->duty, &pid_outer->kp, &pid_outer->ki, &pid_outer->kd, &pid_outer->errorDead, &pid_outer->iDetachCondation, &pid_outer->maxOutput);
- smart_pid_init(&pid->inner, &pid_inner->duty, &pid_inner->kp, &pid_inner->ki, &pid_inner->kd, &pid_inner->errorDead, &pid_inner->iDetachCondation, &pid_inner->maxOutput);
-}
-
-void smart_pid_calc(smart_pid_t *pid, float *target, float *feedback)
-{
- // 将旧error存起来
- pid->lastError = pid->error;
- // 平滑处理目标值
- if (pid->sm_open == TRUE)
- smooth_target(pid, target);
- else
- pid->target = *target;
- // 计算新error
- pid->error = pid->target - *feedback;
- if (fabs(pid->error) <= pid->errorDead)
- pid->error = 0.0f;
- // 计算误差变化
- pid->dError = pid->error - pid->lastError;
- // 选用模糊规则
- if (pid->fuzzy_open == TRUE)
- {
- fuzzy(pid->error, pid->dError, &pid->fuzzy_pid);
- }
- // 计算微分
- float dout = pid->dError * (pid->kd + pid->fuzzy_pid.kd);
- // 计算比例
- float pout = pid->error * (pid->kp + pid->fuzzy_pid.kp);
- // 积分分离
- if (fabs(pid->error) <= pid->iDetachCondation)
- {
- pid->integral += pid->error * (pid->ki + pid->fuzzy_pid.ki);
- pid->iDetach = FALSE;
- }
- else
- {
- pid->iDetach = TRUE;
- pid->integral = 0;
- }
- // 积分限幅
- if (pid->integral > pid->maxOutput)
- pid->integral = pid->maxOutput;
- else if (pid->integral < -pid->maxOutput)
- pid->integral = -pid->maxOutput;
- // 计算输出
- pid->output = pout + dout + pid->integral * (!pid->iDetach);
- // 输出限幅
- if (pid->output > pid->maxOutput)
- pid->output = pid->maxOutput;
- else if (pid->output < -pid->maxOutput)
- pid->output = -pid->maxOutput;
-}
-
-void cascade_pid_calc(struct CascadePID *pid, float *outerRef, float *outerFdb, float *innerFdb)
-{
- // 外环位置控制
- smart_pid_calc(&pid->cascade_pid.outer, outerRef, outerFdb);
- // 内环速度控制
- smart_pid_calc(&pid->cascade_pid.inner, &pid->cascade_pid.outer.output, innerFdb);
- // 内环输出就是串级PID的输出
- // pid->cascade_pid.output = pid->cascade_pid.inner.output;
- pid->cascade_pid.output = pid->cascade_pid.outer.output;
-}
-
-void pid_zh_constructor1(struct CascadePID *pid)
-{
- pid->smart_pid_init = smart_pid_init;
- pid->smart_pid_calc = smart_pid_calc;
- pid->cascade_pid_init = cascade_pid_init;
- pid->cascade_pid_calc = cascade_pid_calc;
-}
-
-/*
-典型输入信号
-L[1] -> 1/s
-L[t] -> 1/s^2
-L[1/2t^2] -> 1/s^3
-系统传递函数
-G(s) = k/(TS+1)
-G(s) = k/S^i(TS+1)
-i = 0 0型系统 i = 1 I 型系统 I = 2 II 型系统
-系统开环传递函数: G(s)
-系统闭环传递函数: G闭(s) = G(s) / 1 + G(s)
-系统静差: R(s) = 1/1+G(s)
-终值定理:limf(t) = lim s*G(s)
- t->无穷 s->0
-o型系统,单位输入:r/s
- e = lim f(t) = lim s*G(s) = G(s) = k/1+G(s) = k/ 1 + (Ts+1+k)..
- t->无穷 s->0 s->0 s->0 = s->0
-*系统误差有给定和扰动引起的
-*线性系统符合叠加原理
-*动态性能指标
-超调 、过度过程时间、上升时间 tr 延迟时间 td 峰值指标tp
-误差积分指标大 好小 好?
-典型二阶系统
-G(s) = 1/ s^2 *(2ξwn)s + wn^2
-ξ:阻尼系统
-wn = 1/T:震荡频率
-如果有一个极点和零点很接近,可以忽略该极点。
-主导极点用二阶系统定义的
-开环传递函数 K T
-复变函数
-频率特性
-阻容RC电路 一阶低通滤波器 一阶惰性系统
-Gs = 1/Ts+1
-正弦稳态
-
-控制系统设计依据:
-考虑到被控对象包含 弹簧储能、填料阻尼、EPM气压控制等主导环节,忽略其它非主导惯性、阻尼环节,将被控系统模型归纳为典型二阶阻尼震荡系统:
-被控对象开环传递函数:G(s) = wn^2/ s*( s + 2ξwn)
-未加控制器被控对象闭环传递函数:G(s) = wn^2/ (s^2 + (2ξwn)s + wn^2)
- ξ :为系统阻尼比。跟阀座填料材、压力正相关(忽略其他非主导阻尼环节)
- Wn :无阻尼自然震荡角频率。跟弹簧的固有振荡频率正相关(忽略其他非主导惯性环节)
-
-阀杆填料阻尼比: 0 < ξ < 1
-
-系统特征方程s^2 + (2ξwn)s + wn^2 = 0 时,有两个共轭复根,要想系统稳定,根的实部要远离虚轴,且在允许情况下,越远越稳定。
-标准二阶系统是零型系统,存在静差。而且,考虑气体压缩比大,导致系统的惯性环节增大。
-因此需要控制器将系统变为I型系统来消除静差(增加积分环节),而且需要在控制器传递函数的零点增加最小项来克服系统的大惯性(增加微分环节)。因此,设计控制器类型为PID控制器。
-
-※ 难点在于系统的无阻尼自然震荡角频率和阀座阻尼系数无法准确获得,整定算法计算的特性参数不一定合理。
-※ 另一个难点在于EPM本身的控制特性线性度差,会导致控制器的矫正环节达不到理想效果或在部分区间达不到理想效果,因此,
- 系统会不稳定或在部分区间不稳定。
-※ EMP本身的控制线性度差,通过控制器弥补EPM性能的不足。
-(因为阀杆速度变化快慢,直接由EPM IP开度大小决定,因此考虑增加阀杆速度环控制来弥补EPM本身的不足)
-
-算法核心原理说明 :
-核心算法: PID
- u(t) = k*(e(t) +∫e(t)dt + de(t)dt)
- u(n) = k*(e(n) + ∑e(n)/Ti + Td*(e(n) - e(n-1)))
-
-位置控制:PID + PD控制
- 误差在[-5%,5%] 内 PID 控制,控制静差 < 0.3%
- 误差在[-100%,5%] 或 [5%,100%] 时,PD控制,防止积分引起的系统不稳定
-
- 积分分离:当误差<= 5% 时,加入积分
- 当误差> 5%时,积分分离、积分项清零
- 积分限幅:
- 当积分项 >= 100% 积分项 = 100%
- 当积分项 <= -100% 积分项 = -100%
-
-整定算法: 继电反馈整定
- 设定目标位置:额定行程 60%
- 控制初始位置: < 60%
- 施加最大控制量 ->检测实时位置->过零,计t0、上冲峰值 -> 施加最小控制量 -> 检测实时位置 -> 过零,计t1、下冲峰值— ↓
- ↑ <—————————————————————————————————————————————————————————————————————————————————————————————————|
-
- 循环三次,记录系统稳态下波峰、波谷,和震荡周期Tu
- 计算: Ku = (控制量最大值 - 控制量最小值)/ (位置波峰 - 位置波谷)
- 查表:Kp = 0.8 * Ku
- Ti = 0.6 * Tu
- Td = 0.125 * Tu
- Ki = Kp / Ti = Kp / (0.6 * Tu)
- Kd = Kp * Td = Kp * 0.125 * Td
-
-速度控制算法:
- s1:初始位置AD值
- s2:单位时间位置移动后AD值
- v1:当前速度
- v2: 前速度
- v: 实时速度
-a:实时加速度
-t: 速度计算周期
-v = (s2 - s1) / t
-a = (v2 - v1) / t
-
- 整定过程,分别整定上升过程平均速度和下降过程平均速度。
- 分别以上升和下降速度为PID 内环参考速度,计算速度控制量。
- 速度偏差 = 当前速度 - 参考速度
- 加速度 = 速度偏差变化(即位置的二阶导数)
-速度控制量 = Kp*速度偏差 + Ki * ∑速度偏差 + Kd * 加速度
-
-串级控制
- 外环位置检测,进行速度控制
- 内环速度检测,进行位置控制
- 位置偏差 = 位置给定 - 位置反馈
- 位置偏差变化 = 位置偏差 - 上次位置偏差
- 速度控制量 = Kp1*位置偏差 + Ki1 * ∑位置偏差 + Kd1 * 位置偏差变化
- 速度偏差 = 速度控制量 - 速度反馈
- 速度偏差变化 = 速度偏差 - 上次速度偏差
- 位置控制量 = Kp2*速度偏差 + Ki2 * ∑速度偏差 + Kd2 * 速度偏差变化
-串级速度整定:???
-
-automatic control theory
-control system
-linear and nonlinear system
-线性连续系统
-离散系统
-modelling
-analysis
-矫正
-分析 时域分析方法 微分方程 传递函数 一阶系统 二阶系统
-频域分析方法 闭环特性 低频特性 高频特性
-根轨迹
-建模 分析 矫正
-离散系统
-非线性控制理论
-L变换 Z变换
-采样控制系统 数字控制系统
-条件稳定系统
-problems
-time consuming
-行列式计算
-相对稳定性
-劳斯准则只能判断系统是否稳定,不能判断稳定程度
-伯德图
-nyquist 图
-相位裕度
-闭环特征方程的根闭,开环增益0到无穷 特征方程根的变化规律
-root locus
-单位负反馈
-G(s) = k/s(s+1)
-复角条件复值条件
-渐近线与实轴交点
-出射角p-n/n-m
-
-lambda
-大纯滞后
-积分对象
-lambda
-纯滞后 tao/t
-斯密斯预估 闭环传递函数 整定方法
-阶跃响应 鲁棒性 积分过程 输入干扰
-执行机构偏离,不确定不准确,调整速度
-PI 为主 D
-两自由度PID 比例积分先行
-鲁棒性 性能不完全微分
-负载扰
-
-makefile 工作原理:
-1、可执行文件生成过程:预处理->编译->链接
-#source object target
-SRC := *.c
-OBJ := *.o
-TARGET := mqtt_test
-
-#compile library include
-CC := cc
-LIB:= -lpthread
-LDFLAG := -L. libmosquitto.so
-CFLAG :=
-CXXFLAG :=
-#link
-$(TARGET):$(OBJ)
- $(CC) -o $(TARGET) $(BOJ) $(LIB) $(LDFLAG)
- $(CC) -o $@ $^ $(LIB) $(LDFLAG)
-$(OBJ):$(SRC)
- $(CC) -c $(SRC)
-#all
-all:$(TARGET)
- $(CC) -o $(TARGET) $(SRC) $(LIB) $(LDFLAG)
-#clean
-clean:
- rm -rf *.o $(TARGET)
-*/
-// ————————————————————————————————————
-
-/*
-typedef struct
-{
- int argc;
- char **argv;
- int sock;
-}st_app_param;
-
-const char *g_version = "V1.0.0 24.08.16";
-int child_mian_ini()
-{
- int i_re;
- i_re = gw_support_init();
- if(i_re < 0)
- {
- printf("解析支持文件错误.\n");
- return -1;
- }
-
- i_re = gw_config_init();
- if(i_re < 0)
- {
- printf("解析配置文件错误.\n");
- return -1;
- }
-
- i_re = gw_data_init();
- if(i_re < 0)
- {
- printf("数据初始化错误.\n");
- return -1;
- }
-
- i_re = gw_modol_init();
- if(i_re < 0)
- {
- printf("解析模型文件错误.\n");
- return -1;
- }
-
- i_re = gw_stat_init();
- if(i_re < 0)
- {
- printf("数据统计初始化错误.\n");
- return -1;
- }
-
- i_re = gw_process_init();
- if(i_re < 0)
- {
- printf("规约初始化错误.\n");
- return -1;
- }
-
- i_re = gw_manage_init();
- if(i_re < 0)
- {
- printf("界面通讯初始化错误.\n");
- return -1;
- }
-
-
- pthread_create(tid,thread_task1,p_param);
-
- while(1)
- {
- get_sys_time();
- sleep(1);
- }
-}
-
-int child_main(int argc,char **argv)
-{
-
- if((argc == 2)&&(strcasecmp(argv[1],"-version") == 0))
- {
- printf("version [%s]",g_version);
- }
-
- child_mian_ini();
-
-}
-
-static int run_child_process_thread((void *)param)
-{
- st_app_param *p_param;
-
- p_param = param;
- chlid_main(p_parm->argc,p_param->argv);
-}
-
-static int run_child_process(int argc,char **argv,int sock)
-{
- int i_re;
- pthread_t *tid;
- st_app_param p_param;
-
- p_param.argc = argc;
- p_param.argv = argv;
- p_param.sock = sock;
-
- pthread_creat(tid,run_child_process_thread,(void *)p_param);
- i_re = recv(sock,..,0);//阻塞接收
- send(sock,'q',0);
-}
-
-int main(int argc,char**argv)
-{
- int i_re,fd,pid;
- char lock_file[16];
- socketpair sockpaire[2];
-
- sprintf(lock_file,"%s.lock",argv[0]);
-
- fd = open(lock_file,_O_WRONLY|_EXC,0777);
- if(fd < 0)
- {
- printf("应用:[%s]已运行.\n",argv[0]);
- return 0;
- }
-
- sockpaire[0] = -1;
-
- while(1)
- {
- i_re = socketpaire(sockpaire,AN_UNIX,..);
- if(i_re < 0)
- {
- printf("[%d]创建sockpaire失败.\n",getpid());
- return 0;
- }
-
- pid = fork();
-
- if(pid < 0)
- {
- printf("[%d]创建进程失败.\n",getpid());
- close(sockpaire[0]);
- sockpaire[0] = -1
- close(sockpaire[1]);
- return 0;
- }
-
- if(pid == 0)//child process
- {
- close(sockpair[0]);
- return run_child_process(argc,argv,sockpair[1]);
- }
-
- printf("[%d]创建子进程成功.\n",getpid());
- close(sockpair[1]);
- while(1)//father process
- {
- i_re = recv(sockpaire[0],....,0);//阻塞接收
- if(i_re <= 0)
- {
- //连接中断,重连
- sockpaire[0] = -1;
- break;
- }
- else
- {
- //正常退出
- goto EXIT:
- }
- }
-
-EXIT:
- //退出操作
- if(sockpaire[0] == -1)
- {
- //有子进程,关闭子进程
- }
- close(fd);
- unlink(file_lock);
- }
-}
-*/
diff --git a/User/lib/control/custom/pid_zh1.h b/User/lib/control/custom/pid_zh1.h
deleted file mode 100644
index addfbe8..0000000
--- a/User/lib/control/custom/pid_zh1.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * @Author: 张小明 zxm5337@163.com
- * @Date: 2024-06-25 10:26:36
- * @LastEditors: DaMingSY zxm5337@163.com
- * @LastEditTime: 2024-09-03 09:19:23
- * @FilePath: \controller-v2\User\lib\control\custom\cascade_pid_zh.h
- * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
- */
-#ifndef __CASCADE_PID_ZH__
-#define __CASCADE_PID_ZH__
-
-#include "data_type_def.h"
-
-typedef enum
-{
- TARGET_DIR_ADD,
- TARGET_DIR_SUB,
-} target_dir_e;
-
-typedef struct
-{
- float kp;
- float ki;
- float kd;
-
- float kup;
- float kui;
- float kud;
-} fuzzy_pid_t;
-
-typedef struct
-{
- BOOL iDetach, sm_open, fuzzy_open;
- float feedBack;
- float target, maxTarget;
- float duty, kp, ki, kd;
- float error, dError, lastError, errorDead;
- float integral, iDetachCondation;
- float output, maxOutput;
- fuzzy_pid_t fuzzy_pid;
-} smart_pid_t;
-
-typedef struct
-{
- smart_pid_t inner;
- smart_pid_t outer;
- float output;
-} cascade_pid_t;
-
-typedef struct CascadePID
-{
- void (*smart_pid_init)(smart_pid_t *pid, float *duty, float *kp, float *ki, float *kd, float *errorDead, float *iDetachCondation, float *maxOut);
- void (*cascade_pid_init)(cascade_pid_t *pid, smart_pid_t *pid_outer, smart_pid_t *pid_inner);
- void (*smart_pid_calc)(smart_pid_t *pid, float *target, float *feedback);
- void (*cascade_pid_calc)(struct CascadePID *pid, float *outerRef, float *outerFdb, float *innerFdb);
-
- smart_pid_t smart_pid;
- cascade_pid_t cascade_pid;
-} pid_zh1_t; // PID_t;
-
-extern void pid_zh_constructor1(struct CascadePID *pid);
-
-#endif
diff --git a/User/lib/control/custom/独立PID算法开发.md b/User/lib/control/custom/独立PID算法开发.md
deleted file mode 100644
index 7d32003..0000000
--- a/User/lib/control/custom/独立PID算法开发.md
+++ /dev/null
@@ -1,26 +0,0 @@
-# 架构
-|文件|路径| 说明
|
-|:--|:--|:--|
-|pid|User\lib\control\src|PID算法模块|
-|execute|User\application\src|执行器|
-|app_flow|User|任务流程控制|
-
-## APP_FLOW任务流程控制
-> adjust_inspection 中在没有检测到调试信号时执行execute_dac,EXECUTE_PLAN定义了需要执行的算法任务计划
-
-## PID算法模块
-文件内容:
-|文件| 说明
|
-|:--|:--|
-|pid.c|构造算法的入口|
-|pid_common.c|普通算法|
-|pid_neural.c|神经网络算法|
-|pid_fuzzy.c|模糊算法|
-
-custom 目录下为各自算法实现
-
-
-## EXECUTE执行器
-> execute_pid_init中定义了初始化参数
-> execute_dac中定义了执行器
-
diff --git a/User/lib/control/inc/pid.h b/User/lib/control/inc/pid.h
index 3a9274b..b0a4263 100644
--- a/User/lib/control/inc/pid.h
+++ b/User/lib/control/inc/pid.h
@@ -1,16 +1,8 @@
#ifndef __PID_H__
#define __PID_H__
#include "lib.h"
-
#include "pid_auto_tune.h"
-#include "pid_c.h"
-#include "pid_g.h"
-#include "pid_x.h"
-#include "pid_zh.h"
-#include "pid_zh1.h"
-#include "pid_hd.h"
-
#define INCOMPLETE_DIFFEREN 0 // 不完全微分
typedef enum
@@ -227,14 +219,6 @@ typedef struct
pid_common_t common;
pid_neural_t neural;
pid_fuzzy_t fuzzy;
-
- // 自定义PID
- pid_c_t cao;
- pid_g_t gao;
- pid_x_t xu;
- pid_zh_t zhang;
- pid_zh1_t zhang1;
- pid_hd_t hd;
} pid_u;
pid_auto_tune_t auto_tune;
} pid_t;
diff --git a/User/lib/control/src/pid.c b/User/lib/control/src/pid.c
index 64f2240..fb228ef 100644
--- a/User/lib/control/src/pid.c
+++ b/User/lib/control/src/pid.c
@@ -19,22 +19,6 @@ void pid_constructor(pid_t *self)
case PID_TYPE_AUTO_TUNE:
pid_auto_tune_constructor(&self->auto_tune);
break;
- case PID_TYPE_CUSTOM_CAO:
- pid_c_constructor(&self->pid_u.cao);
- break;
- case PID_TYPE_CUSTOM_GAO:
- pid_g_constructor(&self->pid_u.gao);
- break;
- case PID_TYPE_CUSTOM_XU:
- pid_x_constructor(&self->pid_u.xu);
- break;
- case PID_TYPE_CUSTOM_ZHANG:
- // pid_zh_constructor(&self->pid_u.zhang);
- pid_zh_constructor1(&self->pid_u.zhang1);
- break;
- case PID_TYPE_CUSTOM_HANGDIAN:
- pid_hd_constructor(&self->pid_u.hd);
- break;
default:
break;
}
diff --git a/User/system/inc/btn.h b/User/system/inc/btn.h
index c78b8bb..a92e576 100644
--- a/User/system/inc/btn.h
+++ b/User/system/inc/btn.h
@@ -47,8 +47,8 @@ while(1) {
// 根据您的需求修改常量。
#define TICKS_INTERVAL 10 // 按钮扫描间隔,单位ms
-#define DEBOUNCE_TICKS 20 / TICKS_INTERVAL // 按键去抖动时间,单位ms
-#define SHORT_TICKS (100 / TICKS_INTERVAL) // 短按时间阈值,单位ms
+#define DEBOUNCE_TICKS 30 / TICKS_INTERVAL // 按键去抖动时间,单位ms
+#define SHORT_TICKS (30 / TICKS_INTERVAL) // 短按时间阈值,单位ms
#define LONG_TICKS (500 / TICKS_INTERVAL) // 长按时间阈值,单位ms
typedef void (*BtnCallback)(void *);
diff --git a/motor.ioc b/motor.ioc
index 83fa72b..90a4b8f 100644
--- a/motor.ioc
+++ b/motor.ioc
@@ -34,28 +34,33 @@ Mcu.IP2=RCC
Mcu.IP3=SYS
Mcu.IP4=TIM1
Mcu.IP5=TIM2
-Mcu.IP6=USART1
-Mcu.IPNb=7
+Mcu.IP6=TIM3
+Mcu.IP7=USART1
+Mcu.IPNb=8
Mcu.Name=STM32F103C(8-B)Tx
Mcu.Package=LQFP48
Mcu.Pin0=PC13-TAMPER-RTC
Mcu.Pin1=PC15-OSC32_OUT
-Mcu.Pin10=PA9
-Mcu.Pin11=PA10
-Mcu.Pin12=PA13
-Mcu.Pin13=PA14
-Mcu.Pin14=VP_SYS_VS_Systick
-Mcu.Pin15=VP_TIM1_VS_ClockSourceINT
-Mcu.Pin16=VP_TIM2_VS_ClockSourceINT
+Mcu.Pin10=PB0
+Mcu.Pin11=PB12
+Mcu.Pin12=PB13
+Mcu.Pin13=PA9
+Mcu.Pin14=PA10
+Mcu.Pin15=PA13
+Mcu.Pin16=PA14
+Mcu.Pin17=VP_SYS_VS_Systick
+Mcu.Pin18=VP_TIM1_VS_ClockSourceINT
+Mcu.Pin19=VP_TIM2_VS_ClockSourceINT
Mcu.Pin2=PD0-OSC_IN
+Mcu.Pin20=VP_TIM3_VS_ClockSourceINT
Mcu.Pin3=PD1-OSC_OUT
Mcu.Pin4=PA0-WKUP
Mcu.Pin5=PA1
Mcu.Pin6=PA4
Mcu.Pin7=PA5
-Mcu.Pin8=PB12
-Mcu.Pin9=PB13
-Mcu.PinsNb=17
+Mcu.Pin8=PA6
+Mcu.Pin9=PA7
+Mcu.PinsNb=21
Mcu.ThirdParty0=RealThread.RT-Thread.3.1.5
Mcu.ThirdPartyNb=1
Mcu.UserConstants=
@@ -66,6 +71,7 @@ NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false
NVIC.DMA1_Channel4_IRQn=true\:0\:0\:false\:false\:true\:false\:true\:true
NVIC.DMA1_Channel5_IRQn=true\:0\:0\:false\:false\:true\:false\:true\:true
NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false
+NVIC.EXTI0_IRQn=true\:0\:0\:false\:false\:true\:true\:true\:true
NVIC.ForceEnableDMAVector=true
NVIC.HardFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false
NVIC.MemoryManagement_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false
@@ -74,11 +80,13 @@ 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.TIM1_UP_IRQn=true\:3\:0\:true\:false\:true\:true\:true\:true
+NVIC.TIM3_IRQn=true\:1\:0\:true\:false\:true\:true\:true\:true
+NVIC.USART1_IRQn=true\:5\:0\:true\:false\:true\:true\:true\:true
NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false
-PA0-WKUP.Signal=GPIO_Input
+PA0-WKUP.GPIOParameters=GPIO_Label
+PA0-WKUP.GPIO_Label=MOTOR_A
+PA0-WKUP.Signal=GPXTI0
PA1.Signal=S_TIM2_CH2
PA10.Mode=Asynchronous
PA10.Signal=USART1_RX
@@ -96,8 +104,20 @@ PA5.GPIO_Label=AIN2
PA5.GPIO_ModeDefaultOutputPP=GPIO_MODE_OUTPUT_PP
PA5.GPIO_PuPd=GPIO_PULLUP
PA5.Signal=GPIO_Output
+PA6.GPIOParameters=GPIO_PuPd,GPIO_Label
+PA6.GPIO_Label=KEY_ADD
+PA6.GPIO_PuPd=GPIO_PULLDOWN
+PA6.Signal=GPIO_Input
+PA7.GPIOParameters=GPIO_PuPd,GPIO_Label
+PA7.GPIO_Label=KEY_SUB
+PA7.GPIO_PuPd=GPIO_PULLDOWN
+PA7.Signal=GPIO_Input
PA9.Mode=Asynchronous
PA9.Signal=USART1_TX
+PB0.GPIOParameters=GPIO_PuPd,GPIO_Label
+PB0.GPIO_Label=KEY_S
+PB0.GPIO_PuPd=GPIO_PULLDOWN
+PB0.Signal=GPIO_Input
PB12.GPIOParameters=GPIO_Speed,PinState,GPIO_PuPd,GPIO_Label,GPIO_ModeDefaultOutputPP
PB12.GPIO_Label=OLED_SDA
PB12.GPIO_ModeDefaultOutputPP=GPIO_MODE_OUTPUT_PP
@@ -115,6 +135,8 @@ PB13.Signal=GPIO_Output
PC13-TAMPER-RTC.GPIOParameters=GPIO_Label
PC13-TAMPER-RTC.GPIO_Label=LED_BLUE
PC13-TAMPER-RTC.Signal=GPIO_Output
+PC15-OSC32_OUT.GPIOParameters=GPIO_Label
+PC15-OSC32_OUT.GPIO_Label=MOTOR_B
PC15-OSC32_OUT.Signal=GPIO_Input
PD0-OSC_IN.Mode=HSE-External-Oscillator
PD0-OSC_IN.Signal=RCC_OSC_IN
@@ -151,7 +173,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,6-MX_TIM1_Init-TIM1-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,7-MX_TIM3_Init-TIM3-false-LL-true
RCC.ADCFreqValue=36000000
RCC.AHBFreq_Value=72000000
RCC.APB1CLKDivider=RCC_HCLK_DIV2
@@ -181,12 +203,14 @@ 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;
+SH.GPXTI0.0=GPIO_EXTI0
+SH.GPXTI0.ConfNb=1
SH.S_TIM2_CH2.0=TIM2_CH2,PWM Generation2 CH2
SH.S_TIM2_CH2.ConfNb=1
TIM1.IPParameters=Prescaler,Period
TIM1.Period=99
TIM1.Prescaler=7199
-TIM2.AutoReloadPreload=TIM_AUTORELOAD_PRELOAD_DISABLE
+TIM2.AutoReloadPreload=TIM_AUTORELOAD_PRELOAD_ENABLE
TIM2.Channel-PWM\ Generation2\ CH2=TIM_CHANNEL_2
TIM2.CounterMode=TIM_COUNTERMODE_UP
TIM2.IPParameters=Prescaler,Period,CounterMode,AutoReloadPreload,OCPolarity_2,TIM_MasterOutputTrigger,Channel-PWM Generation2 CH2,OCFastMode_PWM-PWM Generation2 CH2,OCMode_PWM-PWM Generation2 CH2
@@ -196,6 +220,9 @@ TIM2.OCPolarity_2=TIM_OCPOLARITY_LOW
TIM2.Period=7199
TIM2.Prescaler=0
TIM2.TIM_MasterOutputTrigger=TIM_TRGO_RESET
+TIM3.IPParameters=Prescaler,Period
+TIM3.Period=99
+TIM3.Prescaler=7199
USART1.IPParameters=VirtualMode
USART1.VirtualMode=VM_ASYNC
VP_SYS_VS_Systick.Mode=SysTick
@@ -204,4 +231,6 @@ 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
+VP_TIM3_VS_ClockSourceINT.Mode=Internal
+VP_TIM3_VS_ClockSourceINT.Signal=TIM3_VS_ClockSourceINT
board=custom