diff --git a/f103c8t6_keil/.mxproject b/f103c8t6_keil/.mxproject
index 5c46cee..b548d8d 100644
--- a/f103c8t6_keil/.mxproject
+++ b/f103c8t6_keil/.mxproject
@@ -9,17 +9,17 @@ CDefines=USE_HAL_DRIVER;STM32F103xB;USE_HAL_DRIVER;USE_HAL_DRIVER;
[PreviousGenFiles]
AdvancedFolderStructure=true
HeaderFileListSize=3
-HeaderFiles#0=C:/Users/kevin/Desktop/morse_code_trainer/f103c8t6_keil/Core/Inc/stm32f1xx_it.h
-HeaderFiles#1=C:/Users/kevin/Desktop/morse_code_trainer/f103c8t6_keil/Core/Inc/stm32f1xx_hal_conf.h
-HeaderFiles#2=C:/Users/kevin/Desktop/morse_code_trainer/f103c8t6_keil/Core/Inc/main.h
+HeaderFiles#0=C:/Users/wuwen/morse_code_trainer/f103c8t6_keil/Core/Inc/stm32f1xx_it.h
+HeaderFiles#1=C:/Users/wuwen/morse_code_trainer/f103c8t6_keil/Core/Inc/stm32f1xx_hal_conf.h
+HeaderFiles#2=C:/Users/wuwen/morse_code_trainer/f103c8t6_keil/Core/Inc/main.h
HeaderFolderListSize=1
-HeaderPath#0=C:/Users/kevin/Desktop/morse_code_trainer/f103c8t6_keil/Core/Inc
+HeaderPath#0=C:/Users/wuwen/morse_code_trainer/f103c8t6_keil/Core/Inc
HeaderFiles=;
SourceFileListSize=3
-SourceFiles#0=C:/Users/kevin/Desktop/morse_code_trainer/f103c8t6_keil/Core/Src/stm32f1xx_it.c
-SourceFiles#1=C:/Users/kevin/Desktop/morse_code_trainer/f103c8t6_keil/Core/Src/stm32f1xx_hal_msp.c
-SourceFiles#2=C:/Users/kevin/Desktop/morse_code_trainer/f103c8t6_keil/Core/Src/main.c
+SourceFiles#0=C:/Users/wuwen/morse_code_trainer/f103c8t6_keil/Core/Src/stm32f1xx_it.c
+SourceFiles#1=C:/Users/wuwen/morse_code_trainer/f103c8t6_keil/Core/Src/stm32f1xx_hal_msp.c
+SourceFiles#2=C:/Users/wuwen/morse_code_trainer/f103c8t6_keil/Core/Src/main.c
SourceFolderListSize=1
-SourcePath#0=C:/Users/kevin/Desktop/morse_code_trainer/f103c8t6_keil/Core/Src
+SourcePath#0=C:/Users/wuwen/morse_code_trainer/f103c8t6_keil/Core/Src
SourceFiles=;
diff --git a/f103c8t6_keil/Core/Inc/main.h b/f103c8t6_keil/Core/Inc/main.h
index c50808a..a202bb0 100644
--- a/f103c8t6_keil/Core/Inc/main.h
+++ b/f103c8t6_keil/Core/Inc/main.h
@@ -63,8 +63,10 @@ void Error_Handler(void);
#define mute_GPIO_Port GPIOA
#define tack_a_Pin GPIO_PIN_0
#define tack_a_GPIO_Port GPIOB
+#define tack_a_EXTI_IRQn EXTI0_IRQn
#define tack_b_Pin GPIO_PIN_1
#define tack_b_GPIO_Port GPIOB
+#define tack_b_EXTI_IRQn EXTI1_IRQn
#define run_led2_Pin GPIO_PIN_12
#define run_led2_GPIO_Port GPIOB
#define run_led_Pin GPIO_PIN_15
diff --git a/f103c8t6_keil/Core/Inc/stm32f1xx_it.h b/f103c8t6_keil/Core/Inc/stm32f1xx_it.h
index 6af45aa..dc8a764 100644
--- a/f103c8t6_keil/Core/Inc/stm32f1xx_it.h
+++ b/f103c8t6_keil/Core/Inc/stm32f1xx_it.h
@@ -55,8 +55,11 @@ void SVC_Handler(void);
void DebugMon_Handler(void);
void PendSV_Handler(void);
void SysTick_Handler(void);
+void EXTI0_IRQHandler(void);
+void EXTI1_IRQHandler(void);
void EXTI4_IRQHandler(void);
void TIM2_IRQHandler(void);
+void TIM3_IRQHandler(void);
/* USER CODE BEGIN EFP */
/* USER CODE END EFP */
diff --git a/f103c8t6_keil/Core/Src/main.c b/f103c8t6_keil/Core/Src/main.c
index aef8059..bb1bc60 100644
--- a/f103c8t6_keil/Core/Src/main.c
+++ b/f103c8t6_keil/Core/Src/main.c
@@ -42,6 +42,7 @@
I2C_HandleTypeDef hi2c1;
TIM_HandleTypeDef htim2;
+TIM_HandleTypeDef htim3;
/* USER CODE BEGIN PV */
@@ -52,6 +53,7 @@ void SystemClock_Config(void);
static void MX_GPIO_Init(void);
static void MX_I2C1_Init(void);
static void MX_TIM2_Init(void);
+static void MX_TIM3_Init(void);
/* USER CODE BEGIN PFP */
/* USER CODE END PFP */
@@ -91,6 +93,7 @@ int main(void)
MX_GPIO_Init();
MX_I2C1_Init();
MX_TIM2_Init();
+ MX_TIM3_Init();
/* USER CODE BEGIN 2 */
mymain();
/* USER CODE END 2 */
@@ -238,6 +241,51 @@ static void MX_TIM2_Init(void)
}
+/**
+ * @brief TIM3 Initialization Function
+ * @param None
+ * @retval None
+ */
+static void MX_TIM3_Init(void)
+{
+
+ /* USER CODE BEGIN TIM3_Init 0 */
+
+ /* USER CODE END TIM3_Init 0 */
+
+ TIM_ClockConfigTypeDef sClockSourceConfig = {0};
+ TIM_MasterConfigTypeDef sMasterConfig = {0};
+
+ /* USER CODE BEGIN TIM3_Init 1 */
+
+ /* USER CODE END TIM3_Init 1 */
+ htim3.Instance = TIM3;
+ htim3.Init.Prescaler = 72-1;
+ htim3.Init.CounterMode = TIM_COUNTERMODE_UP;
+ htim3.Init.Period = 1000-1;
+ htim3.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1;
+ htim3.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_DISABLE;
+ if (HAL_TIM_Base_Init(&htim3) != HAL_OK)
+ {
+ Error_Handler();
+ }
+ sClockSourceConfig.ClockSource = TIM_CLOCKSOURCE_INTERNAL;
+ if (HAL_TIM_ConfigClockSource(&htim3, &sClockSourceConfig) != HAL_OK)
+ {
+ Error_Handler();
+ }
+ sMasterConfig.MasterOutputTrigger = TIM_TRGO_RESET;
+ sMasterConfig.MasterSlaveMode = TIM_MASTERSLAVEMODE_DISABLE;
+ if (HAL_TIMEx_MasterConfigSynchronization(&htim3, &sMasterConfig) != HAL_OK)
+ {
+ Error_Handler();
+ }
+ /* USER CODE BEGIN TIM3_Init 2 */
+
+ /* USER CODE END TIM3_Init 2 */
+
+}
+
/**
* @brief GPIO Initialization Function
* @param None
@@ -269,9 +317,9 @@ static void MX_GPIO_Init(void)
GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
HAL_GPIO_Init(mute_GPIO_Port, &GPIO_InitStruct);
- /*Configure GPIO pins : tack_a_Pin tack_b_Pin en_c_Pin en_b_Pin */
- GPIO_InitStruct.Pin = tack_a_Pin|tack_b_Pin|en_c_Pin|en_b_Pin;
- GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
+ /*Configure GPIO pins : tack_a_Pin tack_b_Pin */
+ GPIO_InitStruct.Pin = tack_a_Pin|tack_b_Pin;
+ GPIO_InitStruct.Mode = GPIO_MODE_IT_RISING_FALLING;
GPIO_InitStruct.Pull = GPIO_PULLUP;
HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
@@ -289,6 +337,12 @@ static void MX_GPIO_Init(void)
GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
HAL_GPIO_Init(run_led_GPIO_Port, &GPIO_InitStruct);
+ /*Configure GPIO pins : en_c_Pin en_b_Pin */
+ GPIO_InitStruct.Pin = en_c_Pin|en_b_Pin;
+ GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
+ GPIO_InitStruct.Pull = GPIO_PULLUP;
+ HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
+
/*Configure GPIO pin : en_a_Pin */
GPIO_InitStruct.Pin = en_a_Pin;
GPIO_InitStruct.Mode = GPIO_MODE_IT_RISING;
@@ -296,6 +350,12 @@ static void MX_GPIO_Init(void)
HAL_GPIO_Init(en_a_GPIO_Port, &GPIO_InitStruct);
/* EXTI interrupt init*/
+ HAL_NVIC_SetPriority(EXTI0_IRQn, 0, 0);
+ HAL_NVIC_EnableIRQ(EXTI0_IRQn);
+
+ HAL_NVIC_SetPriority(EXTI1_IRQn, 0, 0);
+ HAL_NVIC_EnableIRQ(EXTI1_IRQn);
+
HAL_NVIC_SetPriority(EXTI4_IRQn, 0, 0);
HAL_NVIC_EnableIRQ(EXTI4_IRQn);
diff --git a/f103c8t6_keil/Core/Src/stm32f1xx_hal_msp.c b/f103c8t6_keil/Core/Src/stm32f1xx_hal_msp.c
index 8679d81..297a282 100644
--- a/f103c8t6_keil/Core/Src/stm32f1xx_hal_msp.c
+++ b/f103c8t6_keil/Core/Src/stm32f1xx_hal_msp.c
@@ -169,6 +169,20 @@ void HAL_TIM_Base_MspInit(TIM_HandleTypeDef* htim_base)
/* USER CODE END TIM2_MspInit 1 */
}
+ else if(htim_base->Instance==TIM3)
+ {
+ /* USER CODE BEGIN TIM3_MspInit 0 */
+
+ /* USER CODE END TIM3_MspInit 0 */
+ /* Peripheral clock enable */
+ __HAL_RCC_TIM3_CLK_ENABLE();
+ /* TIM3 interrupt Init */
+ HAL_NVIC_SetPriority(TIM3_IRQn, 0, 0);
+ HAL_NVIC_EnableIRQ(TIM3_IRQn);
+ /* USER CODE BEGIN TIM3_MspInit 1 */
+
+ /* USER CODE END TIM3_MspInit 1 */
+ }
}
@@ -218,6 +232,20 @@ void HAL_TIM_Base_MspDeInit(TIM_HandleTypeDef* htim_base)
/* USER CODE END TIM2_MspDeInit 1 */
}
+ else if(htim_base->Instance==TIM3)
+ {
+ /* USER CODE BEGIN TIM3_MspDeInit 0 */
+
+ /* USER CODE END TIM3_MspDeInit 0 */
+ /* Peripheral clock disable */
+ __HAL_RCC_TIM3_CLK_DISABLE();
+
+ /* TIM3 interrupt DeInit */
+ HAL_NVIC_DisableIRQ(TIM3_IRQn);
+ /* USER CODE BEGIN TIM3_MspDeInit 1 */
+
+ /* USER CODE END TIM3_MspDeInit 1 */
+ }
}
diff --git a/f103c8t6_keil/Core/Src/stm32f1xx_it.c b/f103c8t6_keil/Core/Src/stm32f1xx_it.c
index f003dd8..02d9cbd 100644
--- a/f103c8t6_keil/Core/Src/stm32f1xx_it.c
+++ b/f103c8t6_keil/Core/Src/stm32f1xx_it.c
@@ -56,6 +56,7 @@
/* External variables --------------------------------------------------------*/
extern TIM_HandleTypeDef htim2;
+extern TIM_HandleTypeDef htim3;
/* USER CODE BEGIN EV */
/* USER CODE END EV */
@@ -198,6 +199,34 @@ void SysTick_Handler(void)
/* please refer to the startup file (startup_stm32f1xx.s). */
/******************************************************************************/
+/**
+ * @brief This function handles EXTI line0 interrupt.
+ */
+void EXTI0_IRQHandler(void)
+{
+ /* USER CODE BEGIN EXTI0_IRQn 0 */
+
+ /* USER CODE END EXTI0_IRQn 0 */
+ HAL_GPIO_EXTI_IRQHandler(tack_a_Pin);
+ /* USER CODE BEGIN EXTI0_IRQn 1 */
+
+ /* USER CODE END EXTI0_IRQn 1 */
+}
+
+/**
+ * @brief This function handles EXTI line1 interrupt.
+ */
+void EXTI1_IRQHandler(void)
+{
+ /* USER CODE BEGIN EXTI1_IRQn 0 */
+
+ /* USER CODE END EXTI1_IRQn 0 */
+ HAL_GPIO_EXTI_IRQHandler(tack_b_Pin);
+ /* USER CODE BEGIN EXTI1_IRQn 1 */
+
+ /* USER CODE END EXTI1_IRQn 1 */
+}
+
/**
* @brief This function handles EXTI line4 interrupt.
*/
@@ -226,6 +255,20 @@ void TIM2_IRQHandler(void)
/* USER CODE END TIM2_IRQn 1 */
}
+/**
+ * @brief This function handles TIM3 global interrupt.
+ */
+void TIM3_IRQHandler(void)
+{
+ /* USER CODE BEGIN TIM3_IRQn 0 */
+
+ /* USER CODE END TIM3_IRQn 0 */
+ HAL_TIM_IRQHandler(&htim3);
+ /* USER CODE BEGIN TIM3_IRQn 1 */
+
+ /* USER CODE END TIM3_IRQn 1 */
+}
+
/* USER CODE BEGIN 1 */
/* USER CODE END 1 */
diff --git a/f103c8t6_keil/MDK-ARM/MYDEIVERS/buzzer.c b/f103c8t6_keil/MDK-ARM/MYDEIVERS/buzzer.c
index 6017a1f..ac60e37 100644
--- a/f103c8t6_keil/MDK-ARM/MYDEIVERS/buzzer.c
+++ b/f103c8t6_keil/MDK-ARM/MYDEIVERS/buzzer.c
@@ -10,88 +10,3 @@ TIM2->ARR = (uint32_t)((72000000/freq)-1);TIM2->CCR3 = (uint32_t)(((72000000/fr
-void add_a_note(uint16_t freq,uint8_t duty,uint16_t deley)
-{
-struct notes* buff;
-buff = (struct notes*)malloc(sizeof(struct notes));
-if (buff != NULL)
-{
-buff->freq = freq;
-buff->duty = duty;
-buff->deley = deley;
-buff->next_note = NULL;
-
-if (notes == NULL)
-{
-notes = buff;
-}
-else
-{
-struct notes *t = notes;
-while (t->next_note != NULL)
-{
-t = t->next_note;
-}
-t->next_note = buff;
-}
-}
-
-}
-
-void delhead()
-{
-if (notes == NULL)
-{
-return;
-}
-
-
-if (notes->next_note == NULL)
-{
-free(notes);
-notes = NULL;
-}
-else
-{
-struct notes *t = notes;
-notes = notes->next_note;
-free(t);
-
-}
-
-
-
-}
-
-char buzzer_play_server()
-{
-
-
-static char busy_flag=0;
-static uint32_t play_delay;
-
-if(notes == NULL)
-{
- play_ones(0,0);
-}else
-{
- if(busy_flag==0)
- {
- busy_flag=1;
- play_delay=HAL_GetTick()+notes->deley;
- play_ones(notes->freq,notes->duty);
- }
- if(busy_flag==1)
- {
- if(HAL_GetTick()>play_delay)
- {
- busy_flag=0;
- delhead();
- }
- }
-}
-
-
-
-return busy_flag;
-}
\ No newline at end of file
diff --git a/f103c8t6_keil/MDK-ARM/MYDEIVERS/buzzer.h b/f103c8t6_keil/MDK-ARM/MYDEIVERS/buzzer.h
index 3292a8f..aed5485 100644
--- a/f103c8t6_keil/MDK-ARM/MYDEIVERS/buzzer.h
+++ b/f103c8t6_keil/MDK-ARM/MYDEIVERS/buzzer.h
@@ -3,16 +3,9 @@
#include "main.h"
-struct notes
-{
- uint16_t freq;
- uint8_t duty;
- uint16_t deley;
- struct notes *next_note;
-};
+
void play_ones(uint16_t freq,uint8_t dutya);
-void add_a_note(uint16_t freq,uint8_t duty,uint16_t deley);
-char buzzer_play_server();
+
#endif /* BUZZER_H_ */
diff --git a/f103c8t6_keil/MDK-ARM/MYDEIVERS/mymain.c b/f103c8t6_keil/MDK-ARM/MYDEIVERS/mymain.c
index 27221f3..aef9fd2 100644
--- a/f103c8t6_keil/MDK-ARM/MYDEIVERS/mymain.c
+++ b/f103c8t6_keil/MDK-ARM/MYDEIVERS/mymain.c
@@ -177,6 +177,8 @@ char sys_lan=0;
int encode_c=0;
+int test_code=0;
+
menu menu_main=
{
"Back\nInput\nBuzzer\nOLED\nAuto\nType\nLanguage\nAbout",
@@ -194,10 +196,10 @@ void mymain()
OLED_Init();//屏幕初始化
HAL_TIM_PWM_Start(&htim2,TIM_CHANNEL_3);//启动n通道的pwm
- MUTE(1);//静音
- //add_a_note(1000,50,1000);//开机响一声
-
-
+ HAL_TIM_Base_Start_IT(&htim3);
+ MUTE(0);
+
+ //play_ones(1000,50);
while(1)
{
@@ -218,6 +220,9 @@ void mymain()
encode_c+=GET_ENCODE(&E1);
sprintf(str,"ENCODE:%d",encode_c);
OLED_Str(0,8,8,str,1);
+
+ sprintf(str,"testcode:%d",test_code);
+ OLED_Str(0,16,8,str,1);
fps_++;
sprintf(str,"FPS:%d",fps);
@@ -247,7 +252,7 @@ void mymain()
GEI_BUTTON_CODE(&B1);//循环更新按钮
OLED_Cache_to_hardware();//刷新屏幕
- buzzer_play_server();
+
if(HAL_GetTick()>run_tick)
{
run_tick+=1000;
@@ -266,22 +271,40 @@ void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin)
switch (GPIO_Pin)
{
case en_a_Pin:
- switch(HAL_GPIO_ReadPin(en_b_GPIO_Port,en_b_Pin))
- {
- case 1:
- E1.code+=1;
- E1.move_flag=1;
- break;
- case 0:
- E1.code-=1;
- E1.move_flag=1;
- break;
- }
+ switch(HAL_GPIO_ReadPin(en_b_GPIO_Port,en_b_Pin))
+ {
+ case 1:
+ E1.code+=1;
+ E1.move_flag=1;
+ break;
+ case 0:
+ E1.code-=1;
+ E1.move_flag=1;
+ break;
+ }
break;
+
+ case tack_a_Pin:
+ test_code++;
+ break;
+ case tack_b_Pin:
+ test_code--;
+ break;
+
default:
break;
//__HAL_GPIO_EXTI_CLEAR_IT(GPIO_Pin);
}
+}
+
+
+
+void HAL_TIM_PeriodElapsedCallback(TIM_HandleTypeDef *htim)//1ms
+{
+ if (htim == (&htim3))
+ {
+
+ }
}
\ No newline at end of file
diff --git a/f103c8t6_keil/MDK-ARM/MYDEIVERS/mymain.h b/f103c8t6_keil/MDK-ARM/MYDEIVERS/mymain.h
index a0d0570..a38b2ef 100644
--- a/f103c8t6_keil/MDK-ARM/MYDEIVERS/mymain.h
+++ b/f103c8t6_keil/MDK-ARM/MYDEIVERS/mymain.h
@@ -20,6 +20,8 @@ struct morsecode
char letter;
};
+extern TIM_HandleTypeDef htim3;
+
void mymain();
#endif /* MYMAIN_H_ */
diff --git a/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL.uvguix.wuwen b/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL.uvguix.wuwen
index b28e110..32ea775 100644
--- a/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL.uvguix.wuwen
+++ b/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL.uvguix.wuwen
@@ -15,7 +15,7 @@
38003
Registers
- 254 166
+ 210 210
346
@@ -40,7 +40,7 @@
1506
Symbols
- 143 143 143
+ 80 80 80
1936
@@ -90,8 +90,8 @@
44
- 0
- 1
+ 2
+ 3
-32000
-32000
@@ -101,17 +101,17 @@
-1
- 240
- 1003
- 3116
- 1269
+ 184
+ 257
+ 1697
+ 943
0
- 1410
- 0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000000B0000000A0000000100000047433A5C55736572735C777577656E5C4465736B746F705C6D6F7273655F636F64655F747261696E65725C66313033633874365F6B65696C5C436F72655C5372635C6D61696E2E6300000000066D61696E2E6300000000C5D4F200FFFFFFFF52433A5C55736572735C777577656E5C4465736B746F705C6D6F7273655F636F64655F747261696E65725C66313033633874365F6B65696C5C4D444B2D41524D5C4D59444549564552535C6D796D61696E2E6800000000086D796D61696E2E6800000000FFDC7800FFFFFFFF50433A5C55736572735C777577656E5C4465736B746F705C6D6F7273655F636F64655F747261696E65725C66313033633874365F6B65696C5C4D444B2D41524D5C4D59444549564552535C6F6C65642E6300000000066F6C65642E6300000000BECEA100FFFFFFFF5B433A5C55736572735C777577656E5C4465736B746F705C6D6F7273655F636F64655F747261696E65725C66313033633874365F6B65696C5C4D444B2D41524D5C4D59444549564552535C68726561645F696E746572666163652E63000000001168726561645F696E746572666163652E6300000000F0A0A100FFFFFFFF5B433A5C55736572735C777577656E5C4465736B746F705C6D6F7273655F636F64655F747261696E65725C66313033633874365F6B65696C5C4D444B2D41524D5C4D59444549564552535C68726561645F696E746572666163652E68000000001168726561645F696E746572666163652E6800000000BCA8E100FFFFFFFF50433A5C55736572735C777577656E5C4465736B746F705C6D6F7273655F636F64655F747261696E65725C66313033633874365F6B65696C5C4D444B2D41524D5C4D59444549564552535C6F6C65642E6800000000066F6C65642E68000000009CC1B600FFFFFFFF51433A5C55736572735C777577656E5C4465736B746F705C6D6F7273655F636F64655F747261696E65725C66313033633874365F6B65696C5C4D444B2D41524D5C4D59444549564552535C666F6E74732E630000000007666F6E74732E6300000000F7B88600FFFFFFFF52433A5C55736572735C777577656E5C4465736B746F705C6D6F7273655F636F64655F747261696E65725C66313033633874365F6B65696C5C4D444B2D41524D5C4D59444549564552535C62757A7A65722E63000000000862757A7A65722E6300000000D9ADC200FFFFFFFF52433A5C55736572735C777577656E5C4465736B746F705C6D6F7273655F636F64655F747261696E65725C66313033633874365F6B65696C5C4D444B2D41524D5C4D59444549564552535C62757A7A65722E68000000000862757A7A65722E6800000000A5C2D700FFFFFFFF6C433A5C55736572735C777577656E5C4465736B746F705C6D6F7273655F636F64655F747261696E65725C66313033633874365F6B65696C5C447269766572735C53544D3332463178785F48414C5F4472697665725C5372635C73746D3332663178785F68616C5F74696D2E63000000001373746D3332663178785F68616C5F74696D2E6300000000B3A6BE00FFFFFFFF52433A5C55736572735C777577656E5C4465736B746F705C6D6F7273655F636F64655F747261696E65725C66313033633874365F6B65696C5C4D444B2D41524D5C4D59444549564552535C6D796D61696E2E6300000000086D796D61696E2E6300000000EAD6A300FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000A50500005E010000240C000010040000
+ 1409
+ 0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000000C00000009000000010000004A433A5C55736572735C777577656E5C6D6F7273655F636F64655F747261696E65725C66313033633874365F6B65696C5C4D444B2D41524D5C4D59444549564552535C6D796D61696E2E6800000000086D796D61696E2E6800000000C5D4F200FFFFFFFF48433A5C55736572735C777577656E5C6D6F7273655F636F64655F747261696E65725C66313033633874365F6B65696C5C4D444B2D41524D5C4D59444549564552535C6F6C65642E6300000000066F6C65642E6300000000FFDC7800FFFFFFFF53433A5C55736572735C777577656E5C6D6F7273655F636F64655F747261696E65725C66313033633874365F6B65696C5C4D444B2D41524D5C4D59444549564552535C68726561645F696E746572666163652E63000000001168726561645F696E746572666163652E6300000000BECEA100FFFFFFFF53433A5C55736572735C777577656E5C6D6F7273655F636F64655F747261696E65725C66313033633874365F6B65696C5C4D444B2D41524D5C4D59444549564552535C68726561645F696E746572666163652E68000000001168726561645F696E746572666163652E6800000000F0A0A100FFFFFFFF48433A5C55736572735C777577656E5C6D6F7273655F636F64655F747261696E65725C66313033633874365F6B65696C5C4D444B2D41524D5C4D59444549564552535C6F6C65642E6800000000066F6C65642E6800000000BCA8E100FFFFFFFF49433A5C55736572735C777577656E5C6D6F7273655F636F64655F747261696E65725C66313033633874365F6B65696C5C4D444B2D41524D5C4D59444549564552535C666F6E74732E630000000007666F6E74732E63000000009CC1B600FFFFFFFF4A433A5C55736572735C777577656E5C6D6F7273655F636F64655F747261696E65725C66313033633874365F6B65696C5C4D444B2D41524D5C4D59444549564552535C62757A7A65722E63000000000862757A7A65722E6300000000F7B88600FFFFFFFF4A433A5C55736572735C777577656E5C6D6F7273655F636F64655F747261696E65725C66313033633874365F6B65696C5C4D444B2D41524D5C4D59444549564552535C62757A7A65722E68000000000862757A7A65722E6800000000D9ADC200FFFFFFFF64433A5C55736572735C777577656E5C6D6F7273655F636F64655F747261696E65725C66313033633874365F6B65696C5C447269766572735C53544D3332463178785F48414C5F4472697665725C5372635C73746D3332663178785F68616C5F74696D2E63000000001373746D3332663178785F68616C5F74696D2E6300000000A5C2D700FFFFFFFF4A433A5C55736572735C777577656E5C6D6F7273655F636F64655F747261696E65725C66313033633874365F6B65696C5C4D444B2D41524D5C4D59444549564552535C6D796D61696E2E6300000000086D796D61696E2E6300000000B3A6BE00FFFFFFFF3F433A5C55736572735C777577656E5C6D6F7273655F636F64655F747261696E65725C66313033633874365F6B65696C5C436F72655C5372635C6D61696E2E6300000000066D61696E2E6300000000EAD6A300FFFFFFFF3F433A5C55736572735C777577656E5C6D6F7273655F636F64655F747261696E65725C66313033633874365F6B65696C5C436F72655C496E635C6D61696E2E6800000000066D61696E2E6800000000F6FA7D00FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000B2010000660000008007000033030000
@@ -134,7 +134,7 @@
16
- A50500005E010000F70D000024020000
+ B201000066000000040A00002C010000
@@ -150,7 +150,7 @@
0
16
- 0300000066000000AB010000E8020000
+ 0300000066000000AB01000003030000
16
@@ -170,7 +170,7 @@
0
16
- 0300000066000000AB010000E8020000
+ 0300000066000000AB01000003030000
16
@@ -450,7 +450,7 @@
0
16
- 0300000066000000AB010000E8020000
+ 0300000066000000AB01000003030000
16
@@ -470,7 +470,7 @@
0
16
- 0300000066000000AB010000E8020000
+ 0300000066000000AB01000003030000
16
@@ -490,7 +490,7 @@
0
16
- 000000001903000031080000CB030000
+ 000000003403000080070000E6030000
16
@@ -530,7 +530,7 @@
0
16
- 030000001C0300002E080000B2030000
+ 03000000370300007D070000CD030000
16
@@ -1150,7 +1150,7 @@
0
16
- 0300000066000000AB010000E8020000
+ 0300000066000000AB01000003030000
16
@@ -1170,7 +1170,7 @@
0
16
- 030000001C0300002E080000B2030000
+ 03000000370300007D070000CD030000
16
@@ -1190,7 +1190,7 @@
0
16
- 030000001C0300002E080000B2030000
+ 03000000370300007D070000CD030000
16
@@ -1250,7 +1250,7 @@
0
16
- 030000001C0300002E080000B2030000
+ 03000000370300007D070000CD030000
16
@@ -1270,7 +1270,7 @@
0
16
- 030000001C0300002E080000B2030000
+ 03000000370300007D070000CD030000
16
@@ -1730,7 +1730,7 @@
0
16
- 00000000CB03000031080000DE030000
+ 00000000E603000080070000F9030000
16
@@ -1799,7 +1799,7 @@
3312
- 000000000B000000000000000020000000000000FFFFFFFFFFFFFFFFB201000015010000040A000019010000000000000100000004000000010000000000000000000000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E650020000000000000A50500005E010000F70D000024020000B20100004F000000040A0000150100000000000040280046080000000B446973617373656D626C7900000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFF520800004F0000005608000001030000000000000200000004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C3000001800040000000000000490C00005E010000F70D000010040000560800004F000000040A00000103000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFFAE0100004F000000B201000001030000010000000200001004000000010000000000000000000000FFFFFFFF05000000ED0300006D000000C3000000C40000007394000001800010000001000000F30300005E010000A105000010040000000000004F000000AE010000010300000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73010000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7301000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657301000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273000000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000000000000FFFFFFFFFFFFFFFF00000000ED020000040A0000F102000000000000010000000400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB09000001800080000000000000F303000000040000F70D0000DA04000000000000F1020000040A0000CB03000000000000404100460F0000001343616C6C20537461636B202B204C6F63616C73000000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203100000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFFFFFFFFFF0000000001000000000000000000000001000000FFFFFFFF02050000F102000006050000CB03000000000000020000000400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF00000000010300003108000005030000010000000100001004000000010000000000000000000000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF0100007794000001800080000001000000F303000014040000240C0000DA040000000000000503000031080000CB0300000000000040820056060000000C4275696C64204F757470757401000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0742726F77736572000000007794000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000
+ 000000000B000000000000000020000000000000FFFFFFFFFFFFFFFFB201000015010000040A000019010000000000000100000004000000010000000000000000000000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E650020000000000000B201000066000000040A00002C010000B20100004F000000040A0000150100000000000040280046080000000B446973617373656D626C7900000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFF520800004F0000005608000001030000000000000200000004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C30000018000400000000000005608000066000000040A000018030000560800004F000000040A00000103000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFFAE0100004F000000B20100001C030000010000000200001004000000010000000000000000000000FFFFFFFF05000000ED0300006D000000C3000000C400000073940000018000100000010000000000000066000000AE01000033030000000000004F000000AE0100001C0300000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73010000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7301000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657301000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273000000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000000000000FFFFFFFFFFFFFFFF00000000ED020000040A0000F102000000000000010000000400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB090000018000800000000000000000000008030000040A0000E203000000000000F1020000040A0000CB03000000000000404100460F0000001343616C6C20537461636B202B204C6F63616C73000000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203100000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFFFFFFFFFF0000000001000000000000000000000001000000FFFFFFFF02050000F102000006050000CB03000000000000020000000400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF000000001C0300008007000020030000010000000100001004000000010000000000000000000000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF0100007794000001800080000001000000000000003703000080070000FD030000000000002003000080070000E60300000000000040820056060000000C4275696C64204F757470757401000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0742726F77736572000000007794000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000
59392
@@ -1838,7 +1838,7 @@
Debug
2373
- 00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720000000000000000010000000000000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7200000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720000000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720000000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000000000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730000000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72000000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000
+ 00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720100000000000000010000000000000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7201000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720100000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720100000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000000000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730100000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72010000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000
898
@@ -1851,8 +1851,8 @@
0
- 3440
- 1440
+ 1920
+ 1080
@@ -1862,21 +1862,12 @@
0
100
- 10
-
- ../Core/Src/main.c
- 0
- 31
- 44
- 1
-
- 0
-
+ 9
./MYDEIVERS/mymain.h
- 16
+ 31
1
- 15
+ 23
1
0
@@ -1884,10 +1875,10 @@
.\MYDEIVERS\oled.c
0
- 318
+ 1010
1011
1
- 153,348,542
+
0
@@ -1910,9 +1901,9 @@
./MYDEIVERS/oled.h
- 13
- 1
- 25
+ 14
+ 5
+ 26
1
0
@@ -1928,18 +1919,18 @@
.\MYDEIVERS\buzzer.c
- 5
- 58
- 75
+ 0
+ 1
+ 13
1
0
MYDEIVERS\buzzer.h
- 44
+ 0
1
- 14
+ 6
1
0
@@ -1955,13 +1946,31 @@
.\MYDEIVERS\mymain.c
- 29
- 32
- 190
+ 10
+ 134
+ 293
1
21,140
0
+
+ ../Core/Src/main.c
+ 14
+ 1
+ 20
+ 1
+
+ 0
+
+
+ ../Core/Inc/main.h
+ 18
+ 50
+ 64
+ 1
+
+ 0
+
diff --git a/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL/buzzer.crf b/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL/buzzer.crf
index 61eafec..560f427 100644
Binary files a/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL/buzzer.crf and b/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL/buzzer.crf differ
diff --git a/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL/buzzer.o b/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL/buzzer.o
index 31fbaff..10ccf8e 100644
Binary files a/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL/buzzer.o and b/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL/buzzer.o differ
diff --git a/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL/encode.crf b/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL/encode.crf
index 8381093..2097efa 100644
Binary files a/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL/encode.crf and b/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL/encode.crf differ
diff --git a/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL/encode.o b/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL/encode.o
index 3383056..b93af97 100644
Binary files a/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL/encode.o and b/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL/encode.o differ
diff --git a/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL/f103c8t6_KEIL.axf b/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL/f103c8t6_KEIL.axf
index b5721a9..cbcc061 100644
Binary files a/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL/f103c8t6_KEIL.axf and b/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL/f103c8t6_KEIL.axf differ
diff --git a/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL/f103c8t6_KEIL.build_log.htm b/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL/f103c8t6_KEIL.build_log.htm
index f767ce6..6543115 100644
--- a/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL/f103c8t6_KEIL.build_log.htm
+++ b/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL/f103c8t6_KEIL.build_log.htm
@@ -21,30 +21,66 @@ Target DLL: STLink\ST-LINKIII-KEIL_SWO.dll V3.0.9.0
Dialog DLL: TCM.DLL V1.53.0.0
Project:
-C:\Users\kevin\Desktop\morse_code_trainer\f103c8t6_keil\MDK-ARM\f103c8t6_KEIL.uvprojx
-Project File Date: 04/28/2022
+C:\Users\wuwen\morse_code_trainer\f103c8t6_keil\MDK-ARM\f103c8t6_KEIL.uvprojx
+Project File Date: 04/30/2022
Output:
*** Using Compiler 'V5.06 update 7 (build 960)', folder: 'C:\Keil_v5\ARM\ARMCC\Bin'
Build target 'f103c8t6_KEIL'
+assembling startup_stm32f103xb.s...
+compiling stm32f1xx_hal_msp.c...
+compiling stm32f1xx_it.c...
+compiling main.c...
+./MYDEIVERS/oled.h(33): warning: #1295-D: Deprecated declaration OLED_Cache_to_hardware - give arg types
+ void OLED_Cache_to_hardware();
+./MYDEIVERS/mymain.h(25): warning: #1295-D: Deprecated declaration mymain - give arg types
+ void mymain();
+../Core/Src/main.c: 2 warnings, 0 errors
+compiling stm32f1xx_hal_gpio_ex.c...
+compiling stm32f1xx_hal.c...
+compiling stm32f1xx_hal_i2c.c...
+compiling stm32f1xx_hal_rcc_ex.c...
+compiling stm32f1xx_hal_rcc.c...
+compiling stm32f1xx_hal_gpio.c...
+compiling stm32f1xx_hal_cortex.c...
+compiling stm32f1xx_hal_dma.c...
+compiling stm32f1xx_hal_pwr.c...
+compiling stm32f1xx_hal_flash_ex.c...
+compiling stm32f1xx_hal_flash.c...
+compiling stm32f1xx_hal_exti.c...
+compiling system_stm32f1xx.c...
+compiling stm32f1xx_hal_tim_ex.c...
+compiling stm32f1xx_hal_tim.c...
+compiling hread_interface.c...
compiling mymain.c...
MYDEIVERS\oled.h(33): warning: #1295-D: Deprecated declaration OLED_Cache_to_hardware - give arg types
void OLED_Cache_to_hardware();
-MYDEIVERS\buzzer.h(16): warning: #1295-D: Deprecated declaration buzzer_play_server - give arg types
- char buzzer_play_server();
-MYDEIVERS\mymain.h(23): warning: #1295-D: Deprecated declaration mymain - give arg types
+MYDEIVERS\mymain.h(25): warning: #1295-D: Deprecated declaration mymain - give arg types
void mymain();
-MYDEIVERS\mymain.c(197): warning: #188-D: enumerated type mixed with another type
- MUTE(1);//静音
-MYDEIVERS\mymain.c(215): warning: #223-D: function "sprintf" declared implicitly
+MYDEIVERS\mymain.c(200): warning: #188-D: enumerated type mixed with another type
+ MUTE(0);
+MYDEIVERS\mymain.c(217): warning: #223-D: function "sprintf" declared implicitly
sprintf(str,"BUTTON:%d",B1.code);
-MYDEIVERS\mymain.c(287): warning: #1-D: last line of file ends without a newline
+MYDEIVERS\mymain.c(310): warning: #1-D: last line of file ends without a newline
}
-MYDEIVERS\mymain.c: 6 warnings, 0 errors
+MYDEIVERS\mymain.c: 5 warnings, 0 errors
+compiling oled.c...
+MYDEIVERS\oled.h(33): warning: #1295-D: Deprecated declaration OLED_Cache_to_hardware - give arg types
+ void OLED_Cache_to_hardware();
+MYDEIVERS\oled.c(1036): warning: #550-D: variable "absx" was set but never used
+ int dx,dy,absx,absy;
+MYDEIVERS\oled.c(1036): warning: #550-D: variable "absy" was set but never used
+ int dx,dy,absx,absy;
+MYDEIVERS\oled.c: 3 warnings, 0 errors
+compiling buzzer.c...
+compiling encode.c...
+MYDEIVERS\encode.c(62): warning: #1-D: last line of file ends without a newline
+ }
+MYDEIVERS\encode.c: 1 warning, 0 errors
linking...
-Program Size: Code=9832 RO-data=3768 RW-data=76 ZI-data=3876
+Program Size: Code=8984 RO-data=3768 RW-data=68 ZI-data=3948
FromELF: creating hex file...
-"f103c8t6_KEIL\f103c8t6_KEIL.axf" - 0 Error(s), 6 Warning(s).
+"f103c8t6_KEIL\f103c8t6_KEIL.axf" - 0 Error(s), 11 Warning(s).
Software Packages used:
@@ -61,14 +97,14 @@ Package Vendor: Keil
Collection of Component include folders:
.\RTE\_f103c8t6_KEIL
- C:\Users\kevin\AppData\Local\Arm\Packs\ARM\CMSIS\5.8.0\CMSIS\Core\Include
- C:\Users\kevin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include
+ C:\Users\wuwen\AppData\Local\Arm\Packs\ARM\CMSIS\5.8.0\CMSIS\Core\Include
+ C:\Users\wuwen\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include
Collection of Component Files used:
* Component: ARM::CMSIS:CORE:5.5.0
Include file: CMSIS\Core\Include\tz_context.h
-Build Time Elapsed: 00:00:02
+Build Time Elapsed: 00:00:12