优化设置菜单的多语言控制

新增显示亮度控制页面
Signed-off-by: kevin <kevin@lmve.net>

f103c8t6_keil/Core/Inc/main.h

@@ -63,10 +63,8 @@ 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
@@ -75,7 +73,6 @@ void Error_Handler(void);
 #define pwr_en_GPIO_Port GPIOA
 #define en_c_Pin GPIO_PIN_3
 #define en_c_GPIO_Port GPIOB
-#define en_c_EXTI_IRQn EXTI3_IRQn
 #define en_a_Pin GPIO_PIN_4
 #define en_a_GPIO_Port GPIOB
 #define en_a_EXTI_IRQn EXTI4_IRQn

f103c8t6_keil/Core/Inc/stm32f1xx_it.h

@@ -55,9 +55,6 @@ 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 EXTI3_IRQHandler(void);
 void EXTI4_IRQHandler(void);
 void TIM2_IRQHandler(void);
 void TIM3_IRQHandler(void);

f103c8t6_keil/Core/Src/main.c

@@ -320,9 +320,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_a_Pin */
+  /*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_a_Pin;
+  GPIO_InitStruct.Pin = tack_a_Pin|tack_b_Pin|en_c_Pin|en_b_Pin;
-  GPIO_InitStruct.Mode = GPIO_MODE_IT_RISING_FALLING;
+  GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
   GPIO_InitStruct.Pull = GPIO_PULLUP;
   HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
 
@@ -347,22 +347,13 @@ static void MX_GPIO_Init(void)
   GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
   HAL_GPIO_Init(pwr_en_GPIO_Port, &GPIO_InitStruct);
 
-  /*Configure GPIO pin : en_b_Pin */
+  /*Configure GPIO pin : en_a_Pin */
-  GPIO_InitStruct.Pin = en_b_Pin;
+  GPIO_InitStruct.Pin = en_a_Pin;
-  GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
+  GPIO_InitStruct.Mode = GPIO_MODE_IT_RISING_FALLING;
   GPIO_InitStruct.Pull = GPIO_PULLUP;
-  HAL_GPIO_Init(en_b_GPIO_Port, &GPIO_InitStruct);
+  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(EXTI3_IRQn, 0, 0);
-  HAL_NVIC_EnableIRQ(EXTI3_IRQn);
-
   HAL_NVIC_SetPriority(EXTI4_IRQn, 0, 0);
   HAL_NVIC_EnableIRQ(EXTI4_IRQn);
 

f103c8t6_keil/Core/Src/stm32f1xx_it.c

@@ -199,48 +199,6 @@ 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 line3 interrupt.
-  */
-void EXTI3_IRQHandler(void)
-{
-  /* USER CODE BEGIN EXTI3_IRQn 0 */
-
-  /* USER CODE END EXTI3_IRQn 0 */
-  HAL_GPIO_EXTI_IRQHandler(en_c_Pin);
-  /* USER CODE BEGIN EXTI3_IRQn 1 */
-
-  /* USER CODE END EXTI3_IRQn 1 */
-}
-
 /**
   * @brief This function handles EXTI line4 interrupt.
   */

f103c8t6_keil/MDK-ARM/MYDEIVERS/mymain.c

@@ -16,7 +16,9 @@
 
 char config_buzzer_for_button_pass=1;
 char config_buzzer_for_button_longpass=1;
-char config_buzzer_for_sele_change=1;
+char config_buzzer_for_sele_change=0;
+
+int config_oled_luminance=100;
 
 
 
@@ -26,7 +28,7 @@ button  B1,TACKA,TACKB;//创建一个按钮
 encoder E1;//创建一个编码器
 int mode=0;
 uint32_t run_tick=0,jump_tick=0;
-char str[32];
+
 uint16_t fps=0,fps_=0;
 char sys_lan=0;
 
@@ -34,25 +36,9 @@ int encode_c=0;
 
 int test_code=0;
 
-menu menu_main=
-{
-			0,0,
-		"Main GUI\nInput mode\nBuzzer\nDisplay\nLanguage\nAbout",
-	"主页\n输入模式\n蜂鸣器\n显示\n语言\n关于",5,
-	NULL
-
-
-};
-
-menu buzzer_setting=
-{
-			0,0,
-		"Back\nClick\nPress\nSele change",
-	"返回\n点击\n长按\n选择切换",3,
 
 
 
-};
 
 word turnon=
 {
@@ -66,6 +52,20 @@ word turnoff=
 	"关"
 };
 
+const char * GET_WORD(word*word,char lan)
+{
+	switch(lan)
+	{
+		case 0:
+			return word->en;
+			break;
+		case 1:
+			return word->ch;
+			break;
+	}
+	
+}
+
 
 int SHOW_MENU(menu *m,int encoder,char button,char lan,char dismode)
 {
@@ -101,7 +101,7 @@ int SHOW_MENU(menu *m,int encoder,char button,char lan,char dismode)
 	
 	if(m->r_sw_list!=NULL)
 	{
-		OLED_Str_list(96,0,16,m->r_sw_list,m->list_dis_top,4,1);
+		OLED_Str_list(95,0,16,m->r_sw_list,m->list_dis_top,4,1);
 	}
 	
 	if(dismode==1)
@@ -139,71 +139,10 @@ void da()
 	BUZZER_PLAY_NOTES(0,morse_play_t1,0);
 	mo_da();
 }
-
+//papers
-void mymain()
+void main_gui()
 {
-	PWR_EN(1);
+	char str[32];
-	
-
-	
-	
-	OLED_Init();//屏幕初始化
-	HAL_TIM_PWM_Start(&htim2,TIM_CHANNEL_3);//启动n通道的pwm
-	HAL_TIM_Base_Start_IT(&htim3);
-	BUZZER_PLAY_INIT();
-	MUTE(0);
-
-	BUZZER_PLAY_NOTES(1000,1000,50);
-	BUZZER_PLAY_NOTES(0,1000,50);
-	
-	B1.config_longtimes=1;//启用B1按钮的长按检测
-	
-	while(1)
-	{
-		GEI_BUTTON_CODE(&B1,en_c());//循环更新按钮
-		encode_c=GET_ENCODE(&E1);   //更新编码器
-		
-		//蜂鸣器控制
-		if(B1.code>0)
-		{
-			if(B1.code<255)//1-254
-			{
-				if(config_buzzer_for_button_pass==1)
-				{
-					BUZZER_PLAY_NOTES(1000,100,50);
-					BUZZER_PLAY_NOTES(0,0,0);
-				}
-			}else
-			{
-
-			}
-
-		}
-		
-		if(encode_c!=0)
-		{
-			jump_tick=HAL_GetTick()+10000;
-			
-			
-				if(config_buzzer_for_sele_change==1&&(mode==2||mode==3))
-				{
-					BUZZER_PLAY_NOTES(1000,50,50);
-					BUZZER_PLAY_NOTES(0,0,0);
-				}
-			
-		}		
-		
-		
-		switch(mode)
-		{
-			case 0:
-				//启动跳转模式
-				//用于读取系统配置后跳转到其他程序
-				//OLED_Str_list(0,0,8,"123\n456\n789",1,2,1);
-				mode=1;
-				break;
-			case 1:
-				//主界面
 	GEI_BUTTON_CODE(&TACKA,tack_a());
 	GEI_BUTTON_CODE(&TACKB,tack_b());
 	if(encode_c>0||TACKB.code!=0)
@@ -231,13 +170,20 @@ void mymain()
 		}					
 		
 		mode=2;
-					jump_tick=HAL_GetTick()+10000;
+		
 	}
 
-				break;
+}
-			case 2:
-				//菜单界面
 
+void main_menu()
+{
+	static menu menu_main=
+	{
+				0,0,
+			"Main GUI\nInput mode\nBuzzer\nDisplay\nLanguage\nAbout",
+		"主页\n输入模式\n蜂鸣器\n显示\n语言\n关于",5,
+		NULL
+	};
 	switch(SHOW_MENU(&menu_main,encode_c,B1.code,sys_lan,1))
 	{
 		case 0:
@@ -250,34 +196,47 @@ void mymain()
 			//jump to buzzer setting
 			mode=3;
 			break;
+		case 3:
+			mode=4;
+			break;
 	}
 	if(HAL_GetTick()>jump_tick){mode=1;}
-				break;
 
-			case 3:
+}
-				//buzzer setting
+
+void buzzer_settings()
+{
+	static menu buzzer_setting=
+	{
+				0,0,
+			"Back\nClick\nPress\nSele change",
+		"返回\n点击\n长按\n选择切换",3,NULL
+	};
+	
+	char str[32];
+	
 		buzzer_setting.r_sw_list=&str;
 		sprintf(str,"../");
 		if(config_buzzer_for_button_pass)
 		{
-					sprintf(str,"%s%s",str,"\non");
+			sprintf(str,"%s\n%s",str,GET_WORD(&turnon,sys_lan));
 		}else
 		{
-					sprintf(str,"%s%s",str,"\nof");
+			sprintf(str,"%s\n%s",str,GET_WORD(&turnoff,sys_lan));
 		}
 		if(config_buzzer_for_button_longpass)
 		{
-					sprintf(str,"%s%s",str,"\non");
+			sprintf(str,"%s\n%s",str,GET_WORD(&turnon,sys_lan));
 		}else
 		{
-					sprintf(str,"%s%s",str,"\nof");
+			sprintf(str,"%s\n%s",str,GET_WORD(&turnoff,sys_lan));
 		}
 		if(config_buzzer_for_sele_change)
 		{
-					sprintf(str,"%s%s",str,"\non");
+			sprintf(str,"%s\n%s",str,GET_WORD(&turnon,sys_lan));
 		}else
 		{
-					sprintf(str,"%s%s",str,"\nof");
+			sprintf(str,"%s\n%s",str,GET_WORD(&turnoff,sys_lan));
 		}				
 		switch(SHOW_MENU(&buzzer_setting,encode_c,B1.code,sys_lan,0))
 		{
@@ -296,7 +255,126 @@ void mymain()
 				break;
 
 		}
-				if(HAL_GetTick()>jump_tick){mode=1;}
+		if(HAL_GetTick()>jump_tick){mode=2;}
+}
+
+
+void display_settings()
+{
+	static menu display_setting=
+	{
+				0,0,
+			"Back\nluminance\nSpin",
+		"返回\n亮度\n旋转",2,NULL
+	};
+	static char config_oled_luminance_sele=0;
+	char str[32];
+	display_setting.r_sw_list=&str;
+	
+	
+	if(config_oled_luminance_sele)
+	{
+		if(B1.code!=0)
+		{
+			config_oled_luminance_sele=0;
+		}
+		if(encode_c!=0)
+		{
+			config_oled_luminance+=encode_c;
+			if(config_oled_luminance>100){config_oled_luminance=100;}
+			if(config_oled_luminance<0){config_oled_luminance=0;}
+			OLED_Setting_luminance(config_oled_luminance);
+			
+		}
+		sprintf(str,"../\n%3d%%",config_oled_luminance);
+		SHOW_MENU(&display_setting,0,0,sys_lan,0);
+		OLED_square(0,16,95,32,2);
+		
+	}else
+	{
+		sprintf(str,"../\n%3d%%",config_oled_luminance);
+		switch(SHOW_MENU(&display_setting,encode_c,B1.code,sys_lan,0))
+		{
+			case 0:
+				mode=2;
+				break;
+			case 1:
+				config_oled_luminance_sele=1;
+				break;
+		}	
+	}
+
+	
+	if(HAL_GetTick()>jump_tick){config_oled_luminance_sele=0;mode=2;}
+}
+
+void mymain()
+{
+	PWR_EN(1);
+	
+
+	
+	
+	
+	HAL_TIM_PWM_Start(&htim2,TIM_CHANNEL_3);//启动n通道的pwm
+	HAL_TIM_Base_Start_IT(&htim3);
+	OLED_Init();//屏幕初始化
+	OLED_Setting_luminance(config_oled_luminance);
+	
+	BUZZER_PLAY_INIT();
+	MUTE(0);
+	
+	BUZZER_PLAY_NOTES(1000,1000,50);
+	BUZZER_PLAY_NOTES(0,1000,50);
+	
+	B1.config_longtimes=1;//启用B1按钮的长按检测
+	
+	while(1)
+	{
+		GEI_BUTTON_CODE(&B1,en_c());//循环更新按钮
+		encode_c=GET_ENCODE(&E1);   //更新编码器
+		
+		//蜂鸣器控制
+		if(B1.code>0)
+		{
+			if(B1.code<255)//1-254
+			{
+				if(config_buzzer_for_button_pass==1)
+				{
+					BUZZER_PLAY_NOTES(1000,100,50);
+					BUZZER_PLAY_NOTES(0,0,0);
+				}
+			}else
+			{
+
+			}
+			jump_tick=HAL_GetTick()+10000;
+		}
+			
+		switch(mode)
+		{
+			case 0:
+				//启动跳转模式
+				//用于读取系统配置后跳转到其他程序
+				//OLED_Str_list(0,0,8,"123\n456\n789",1,2,1);
+				mode=1;
+				break;
+			case 1:
+				//主界面
+				main_gui();			
+				break;
+			case 2:
+				//菜单界面
+				main_menu();
+				break;
+				
+			case 3:
+				//buzzer setting
+				buzzer_settings();
+				break;
+			
+			case 4:
+				display_settings();
 				break;
 		
 		}
@@ -331,6 +409,7 @@ void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin)
 					{
 						E1.code+=1;
 						E1.move_flag=1;//发生旋转的标记
+						jump_tick=HAL_GetTick()+10000;
 					}					
 					break;
 				case 0:
@@ -338,48 +417,14 @@ void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin)
 					{
 						E1.code-=1;
 						E1.move_flag=1;//发生旋转的标记
+						jump_tick=HAL_GetTick()+10000;
 					}				
 					break;
 			}
 		break;
-/*
-		//外部电键输入
-		case tack_a_Pin:
-			switch(tack_a())
-			{
-				case 0:
-					//di();
-					break;
-				case 1:
-					break;
-			}
-		break;
-		case tack_b_Pin:
-			switch(tack_b())
-			{
-				case 0:
-					//da();
-					break;
-				case 1:
-					break;
-			}
-		break;
 
 
-		case en_c_Pin://编码器C脚 按钮
-			switch(en_c())//监测是上升沿还是下降沿
-			{
-				case 0:
 			
-					//mo_one_tick(0);
-					break;
-				case 1:
-					
-					//mo_one_tick(1);
-					break;
-			}
-			break;
-*/			
 
   	default:
   	break;

f103c8t6_keil/MDK-ARM/MYDEIVERS/mymain.h

@@ -28,8 +28,8 @@ typedef struct
 
 typedef struct
 {
-	const char *list_en;
+	const char *en;
-	const char *list_ch;
+	const char *ch;
 }word;
 
 

f103c8t6_keil/MDK-ARM/MYDEIVERS/oled.h

@@ -25,6 +25,8 @@ void OLED_Init(void);
 
 void OLED_Cache_to_hardware();
 
+void OLED_Setting_luminance(unsigned char a);
+
 void OLED_set_dot(unsigned char x,unsigned char y,unsigned char dot_type);
 void OLED_Pix(unsigned char x,unsigned char y,unsigned char w,unsigned char h,const char *p,unsigned char type);
 

f103c8t6_keil/MDK-ARM/f103c8t6_KEIL.uvoptx

@@ -463,7 +463,7 @@
       <GroupNumber>5</GroupNumber>
       <FileNumber>21</FileNumber>
       <FileType>1</FileType>
-      <tvExp>1</tvExp>
+      <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
       <PathWithFileName>.\MYDEIVERS\mymain.c</PathWithFileName>

f103c8t6_keil/MDK-ARM/f103c8t6_KEIL/f103c8t6_KEIL.build_log.htm

@@ -22,30 +22,36 @@ Dialog DLL:      TCM.DLL V1.53.0.0
  
 <h2>Project:</h2>
 C:\Users\kevin\Desktop\morse_code_trainer\f103c8t6_keil\MDK-ARM\f103c8t6_KEIL.uvprojx
-Project File Date:  08/11/2022
+Project File Date:  08/12/2022
 
 <h2>Output:</h2>
 *** Using Compiler 'V6.16', folder: 'C:\Keil_v5\ARM\ARMCLANG\Bin'
 Build target 'f103c8t6_KEIL'
+MYDEIVERS/mymain.c(67): warning: non-void function does not return a value in all control paths [-Wreturn-type]
+}
+^
 MYDEIVERS/mymain.c(100): warning: passing 'const char *' to parameter of type 'char *' discards qualifiers [-Wincompatible-pointer-types-discards-qualifiers]
         OLED_Str_list(0,0,16,list,m->list_dis_top,4,1);
                              ^~~~
-./MYDEIVERS/oled.h(33): note: passing argument to parameter 'str' here
+./MYDEIVERS/oled.h(35): note: passing argument to parameter 'str' here
 void OLED_Str_list(unsigned char x,unsigned char y,unsigned char size,char *str,unsigned char lenstard,unsigned char lenconst,unsigned char type);
                                                                             ^
 MYDEIVERS/mymain.c(109): warning: implicitly declaring library function 'sprintf' with type 'int (char *, const char *, ...)' [-Wimplicit-function-declaration]
                 sprintf(temp,"%d/%d",m->sele,m->list_const);
                 ^
 MYDEIVERS/mymain.c(109): note: include the header <stdio.h> or explicitly provide a declaration for 'sprintf'
-MYDEIVERS/mymain.c(259): warning: incompatible pointer types assigning to 'char *' from 'char (*)[32]' [-Wincompatible-pointer-types]
+MYDEIVERS/mymain.c(218): warning: incompatible pointer types assigning to 'char *' from 'char (*)[32]' [-Wincompatible-pointer-types]
                 buzzer_setting.r_sw_list=&str;
                                         ^~~~~
-3 warnings generated.
+MYDEIVERS/mymain.c(272): warning: incompatible pointer types assigning to 'char *' from 'char (*)[32]' [-Wincompatible-pointer-types]
+        display_setting.r_sw_list=&str;
+                                 ^~~~~
+5 warnings generated.
 compiling mymain.c...
 linking...
-Program Size: Code=15516 RO-data=4024 RW-data=64 ZI-data=4216  
+Program Size: Code=16656 RO-data=4080 RW-data=108 ZI-data=4188  
 FromELF: creating hex file...
-"f103c8t6_KEIL\f103c8t6_KEIL.axf" - 0 Error(s), 3 Warning(s).
+"f103c8t6_KEIL\f103c8t6_KEIL.axf" - 0 Error(s), 5 Warning(s).
 
 <h2>Software Packages used:</h2>
 

f103c8t6_keil/MDK-ARM/f103c8t6_KEIL/f103c8t6_KEIL_f103c8t6_KEIL.dep

@@ -1,10 +1,10 @@
 Dependencies for Project 'f103c8t6_KEIL', Target 'f103c8t6_KEIL': (DO NOT MODIFY !)
 CompilerVersion: 6160000::V6.16::ARMCLANG
-F (startup_stm32f103xb.s)(0x62F4E435)(--target=arm-arm-none-eabi -mcpu=cortex-m3 -masm=auto -c
+F (startup_stm32f103xb.s)(0x62F5F331)(--target=arm-arm-none-eabi -mcpu=cortex-m3 -masm=auto -c
-
+
--gdwarf-4 -Wa,armasm,--pd,"__EVAL SETA 1"
+-gdwarf-4 -Wa,armasm,--pd,"__EVAL SETA 1"
 
--I./RTE/_f103c8t6_KEIL
+-I./RTE/_f103c8t6_KEIL
 
 -IC:/Users/kevin/AppData/Local/Arm/Packs/ARM/CMSIS/5.8.0/CMSIS/Core/Include
 
@@ -32,16 +32,16 @@ I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_i2c.h)(0x626A2FD0)
 I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal.h)(0x626A2FD0)
 I (..\Core\Inc\stm32f1xx_hal_conf.h)(0x62F5F329)
 I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_rcc.h)(0x626A2FD0)
-I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_def.h)(0x626A2FD0)
+I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_def.h)(0x626A2FD0)
-I (..\Drivers\CMSIS\Device\ST\STM32F1xx\Include\stm32f1xx.h)(0x626A2FD0)
+I (..\Drivers\CMSIS\Device\ST\STM32F1xx\Include\stm32f1xx.h)(0x626A2FD0)
 I (..\Drivers\CMSIS\Device\ST\STM32F1xx\Include\stm32f103xb.h)(0x626A2FD0)
 I (..\Drivers\CMSIS\Include\core_cm3.h)(0x626A2FC1)
 I (C:\Keil_v5\ARM\ARMCLANG\include\stdint.h)(0x603507D0)
 I (..\Drivers\CMSIS\Include\cmsis_version.h)(0x626A2FC1)
-I (..\Drivers\CMSIS\Include\cmsis_compiler.h)(0x626A2FC1)
+I (..\Drivers\CMSIS\Include\cmsis_compiler.h)(0x626A2FC1)
-I (..\Drivers\CMSIS\Include\cmsis_armclang.h)(0x626A2FC1)
+I (..\Drivers\CMSIS\Include\cmsis_armclang.h)(0x626A2FC1)
 I (C:\Keil_v5\ARM\ARMCLANG\include\arm_compat.h)(0x602A3B7E)
-I (C:\Keil_v5\ARM\ARMCLANG\include\arm_acle.h)(0x603507C4)
+I (C:\Keil_v5\ARM\ARMCLANG\include\arm_acle.h)(0x603507C4)
 I (..\Drivers\CMSIS\Device\ST\STM32F1xx\Include\system_stm32f1xx.h)(0x626A2FD0)
 I (..\Drivers\STM32F1xx_HAL_Driver\Inc\Legacy\stm32_hal_legacy.h)(0x626A2FD0)
 I (C:\Keil_v5\ARM\ARMCLANG\include\stddef.h)(0x603507D0)
@@ -69,11 +69,11 @@ I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_i2c.h)(0x626A2FD0)
 -fno-rtti -funsigned-char -fshort-enums -fshort-wchar
 
 -D__EVAL -gdwarf-4 -O3 -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -I ../Core/Inc -I ../Drivers/STM32F1xx_HAL_Driver/Inc -I ../Drivers/STM32F1xx_HAL_Driver/Inc/Legacy -I ../Drivers/CMSIS/Device/ST/STM32F1xx/Include -I ../Drivers/CMSIS/Include -I ./MYDEIVERS
-
+
 -I./RTE/_f103c8t6_KEIL
-
+
 -IC:/Users/kevin/AppData/Local/Arm/Packs/ARM/CMSIS/5.8.0/CMSIS/Core/Include
-
+
 -IC:/Users/kevin/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include
 
 -D__UVISION_VERSION="536" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -DUSE_HAL_DRIVER -DSTM32F103xB
@@ -103,7 +103,7 @@ I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_tim.h)(0x626A2FD0)
 I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_dma.h)(0x626A2FD0)
 I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_dma_ex.h)(0x626A2FD0)
 I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_cortex.h)(0x626A2FD0)
-I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_flash.h)(0x626A2FD0)
+I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_flash.h)(0x626A2FD0)
 I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_flash_ex.h)(0x626A2FD0)
 I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_i2c.h)(0x626A2FD0)
 I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_pwr.h)(0x626A2FD0)
@@ -133,7 +133,7 @@ I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_tim.h)(0x626A2FD0)
 I (..\Drivers\CMSIS\Device\ST\STM32F1xx\Include\stm32f1xx.h)(0x626A2FD0)
 I (..\Drivers\CMSIS\Device\ST\STM32F1xx\Include\stm32f103xb.h)(0x626A2FD0)
 I (..\Drivers\CMSIS\Include\core_cm3.h)(0x626A2FC1)
-I (C:\Keil_v5\ARM\ARMCLANG\include\stdint.h)(0x603507D0)
+I (C:\Keil_v5\ARM\ARMCLANG\include\stdint.h)(0x603507D0)
 I (..\Drivers\CMSIS\Include\cmsis_version.h)(0x626A2FC1)
 I (..\Drivers\CMSIS\Include\cmsis_compiler.h)(0x626A2FC1)
 I (..\Drivers\CMSIS\Include\cmsis_armclang.h)(0x626A2FC1)
@@ -163,7 +163,7 @@ I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_tim.h)(0x626A2FD0)
 
 -I./RTE/_f103c8t6_KEIL
 
--IC:/Users/kevin/AppData/Local/Arm/Packs/ARM/CMSIS/5.8.0/CMSIS/Core/Include
+-IC:/Users/kevin/AppData/Local/Arm/Packs/ARM/CMSIS/5.8.0/CMSIS/Core/Include
 
 -IC:/Users/kevin/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include
 
@@ -193,7 +193,7 @@ I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_tim.h)(0x626A2FD0)
 I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_dma.h)(0x626A2FD0)
 I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_dma_ex.h)(0x626A2FD0)
 I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_cortex.h)(0x626A2FD0)
-I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_flash.h)(0x626A2FD0)
+I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_flash.h)(0x626A2FD0)
 I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_flash_ex.h)(0x626A2FD0)
 I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_i2c.h)(0x626A2FD0)
 I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_pwr.h)(0x626A2FD0)
@@ -223,7 +223,7 @@ I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_tim.h)(0x626A2FD0)
 I (..\Drivers\CMSIS\Include\core_cm3.h)(0x626A2FC1)
 I (C:\Keil_v5\ARM\ARMCLANG\include\stdint.h)(0x603507D0)
 I (..\Drivers\CMSIS\Include\cmsis_version.h)(0x626A2FC1)
-I (..\Drivers\CMSIS\Include\cmsis_compiler.h)(0x626A2FC1)
+I (..\Drivers\CMSIS\Include\cmsis_compiler.h)(0x626A2FC1)
 I (..\Drivers\CMSIS\Include\cmsis_armclang.h)(0x626A2FC1)
 I (C:\Keil_v5\ARM\ARMCLANG\include\arm_compat.h)(0x602A3B7E)
 I (C:\Keil_v5\ARM\ARMCLANG\include\arm_acle.h)(0x603507C4)
@@ -253,7 +253,7 @@ I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_tim.h)(0x626A2FD0)
 
 -IC:/Users/kevin/AppData/Local/Arm/Packs/ARM/CMSIS/5.8.0/CMSIS/Core/Include
 
--IC:/Users/kevin/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include
+-IC:/Users/kevin/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include
 
 -D__UVISION_VERSION="536" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -DUSE_HAL_DRIVER -DSTM32F103xB
 
@@ -283,7 +283,7 @@ I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_tim.h)(0x626A2FD0)
 I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_cortex.h)(0x626A2FD0)
 I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_flash.h)(0x626A2FD0)
 I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_flash_ex.h)(0x626A2FD0)
-I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_i2c.h)(0x626A2FD0)
+I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_i2c.h)(0x626A2FD0)
 I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_pwr.h)(0x626A2FD0)
 I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_tim.h)(0x626A2FD0)
 I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_tim_ex.h)(0x626A2FD0)
@@ -313,7 +313,7 @@ I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_tim.h)(0x626A2FD0)
 I (..\Drivers\CMSIS\Include\cmsis_version.h)(0x626A2FC1)
 I (..\Drivers\CMSIS\Include\cmsis_compiler.h)(0x626A2FC1)
 I (..\Drivers\CMSIS\Include\cmsis_armclang.h)(0x626A2FC1)
-I (C:\Keil_v5\ARM\ARMCLANG\include\arm_compat.h)(0x602A3B7E)
+I (C:\Keil_v5\ARM\ARMCLANG\include\arm_compat.h)(0x602A3B7E)
 I (C:\Keil_v5\ARM\ARMCLANG\include\arm_acle.h)(0x603507C4)
 I (..\Drivers\CMSIS\Device\ST\STM32F1xx\Include\system_stm32f1xx.h)(0x626A2FD0)
 I (..\Drivers\STM32F1xx_HAL_Driver\Inc\Legacy\stm32_hal_legacy.h)(0x626A2FD0)
@@ -343,7 +343,7 @@ I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_tim.h)(0x626A2FD0)
 
 -IC:/Users/kevin/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include
 
--D__UVISION_VERSION="536" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -DUSE_HAL_DRIVER -DSTM32F103xB
+-D__UVISION_VERSION="536" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -DUSE_HAL_DRIVER -DSTM32F103xB
 
 -o f103c8t6_keil/stm32f1xx_hal_rcc_ex.o -MD)
 I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal.h)(0x626A2FD0)
@@ -373,7 +373,7 @@ I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_tim.h)(0x626A2FD0)
 I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_flash_ex.h)(0x626A2FD0)
 I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_i2c.h)(0x626A2FD0)
 I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_pwr.h)(0x626A2FD0)
-I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_tim.h)(0x626A2FD0)
+I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_tim.h)(0x626A2FD0)
 I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_tim_ex.h)(0x626A2FD0)
 F (../Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio.c)(0x626A2FD0)(-xc -std=c99 --target=arm-arm-none-eabi -mcpu=cortex-m3 -c
 
@@ -403,7 +403,7 @@ I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_tim.h)(0x626A2FD0)
 I (..\Drivers\CMSIS\Include\cmsis_armclang.h)(0x626A2FC1)
 I (C:\Keil_v5\ARM\ARMCLANG\include\arm_compat.h)(0x602A3B7E)
 I (C:\Keil_v5\ARM\ARMCLANG\include\arm_acle.h)(0x603507C4)
-I (..\Drivers\CMSIS\Device\ST\STM32F1xx\Include\system_stm32f1xx.h)(0x626A2FD0)
+I (..\Drivers\CMSIS\Device\ST\STM32F1xx\Include\system_stm32f1xx.h)(0x626A2FD0)
 I (..\Drivers\STM32F1xx_HAL_Driver\Inc\Legacy\stm32_hal_legacy.h)(0x626A2FD0)
 I (C:\Keil_v5\ARM\ARMCLANG\include\stddef.h)(0x603507D0)
 I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_rcc_ex.h)(0x626A2FD0)
@@ -433,7 +433,7 @@ I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_tim.h)(0x626A2FD0)
 
 -D__UVISION_VERSION="536" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -DUSE_HAL_DRIVER -DSTM32F103xB
 
--o f103c8t6_keil/stm32f1xx_hal_dma.o -MD)
+-o f103c8t6_keil/stm32f1xx_hal_dma.o -MD)
 I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal.h)(0x626A2FD0)
 I (..\Core\Inc\stm32f1xx_hal_conf.h)(0x62F5F329)
 I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_rcc.h)(0x626A2FD0)
@@ -463,7 +463,7 @@ I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_tim.h)(0x626A2FD0)
 I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_pwr.h)(0x626A2FD0)
 I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_tim.h)(0x626A2FD0)
 I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_tim_ex.h)(0x626A2FD0)
-F (../Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_cortex.c)(0x626A2FD0)(-xc -std=c99 --target=arm-arm-none-eabi -mcpu=cortex-m3 -c
+F (../Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_cortex.c)(0x626A2FD0)(-xc -std=c99 --target=arm-arm-none-eabi -mcpu=cortex-m3 -c
 
 -fno-rtti -funsigned-char -fshort-enums -fshort-wchar
 
@@ -493,7 +493,7 @@ I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_tim.h)(0x626A2FD0)
 I (C:\Keil_v5\ARM\ARMCLANG\include\arm_acle.h)(0x603507C4)
 I (..\Drivers\CMSIS\Device\ST\STM32F1xx\Include\system_stm32f1xx.h)(0x626A2FD0)
 I (..\Drivers\STM32F1xx_HAL_Driver\Inc\Legacy\stm32_hal_legacy.h)(0x626A2FD0)
-I (C:\Keil_v5\ARM\ARMCLANG\include\stddef.h)(0x603507D0)
+I (C:\Keil_v5\ARM\ARMCLANG\include\stddef.h)(0x603507D0)
 I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_rcc_ex.h)(0x626A2FD0)
 I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_gpio.h)(0x626A2FD0)
 I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_gpio_ex.h)(0x626A2FD0)
@@ -533,7 +533,7 @@ I (C:\Keil_v5\ARM\ARMCLANG\include\arm_compat.h)(0x602A3B7E)
 I (..\Drivers\CMSIS\Include\cmsis_version.h)(0x626A2FC1)
 I (..\Drivers\CMSIS\Include\cmsis_compiler.h)(0x626A2FC1)
 I (..\Drivers\CMSIS\Include\cmsis_armclang.h)(0x626A2FC1)
-I (C:\Keil_v5\ARM\ARMCLANG\include\arm_compat.h)(0x602A3B7E)
+I (C:\Keil_v5\ARM\ARMCLANG\include\arm_compat.h)(0x602A3B7E)
 I (C:\Keil_v5\ARM\ARMCLANG\include\arm_acle.h)(0x603507C4)
 I (..\Drivers\CMSIS\Device\ST\STM32F1xx\Include\system_stm32f1xx.h)(0x626A2FD0)
 I (..\Drivers\STM32F1xx_HAL_Driver\Inc\Legacy\stm32_hal_legacy.h)(0x626A2FD0)
@@ -553,9 +553,9 @@ I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_tim.h)(0x626A2FD0)
 I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_tim_ex.h)(0x626A2FD0)
 F (../Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_flash.c)(0x626A2FD0)(-xc -std=c99 --target=arm-arm-none-eabi -mcpu=cortex-m3 -c
 
--fno-rtti -funsigned-char -fshort-enums -fshort-wchar
+-fno-rtti -funsigned-char -fshort-enums -fshort-wchar
 
--D__EVAL -gdwarf-4 -O3 -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -I ../Core/Inc -I ../Drivers/STM32F1xx_HAL_Driver/Inc -I ../Drivers/STM32F1xx_HAL_Driver/Inc/Legacy -I ../Drivers/CMSIS/Device/ST/STM32F1xx/Include -I ../Drivers/CMSIS/Include -I ./MYDEIVERS
+-D__EVAL -gdwarf-4 -O3 -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -I ../Core/Inc -I ../Drivers/STM32F1xx_HAL_Driver/Inc -I ../Drivers/STM32F1xx_HAL_Driver/Inc/Legacy -I ../Drivers/CMSIS/Device/ST/STM32F1xx/Include -I ../Drivers/CMSIS/Include -I ./MYDEIVERS
 
 -I./RTE/_f103c8t6_KEIL
 
@@ -583,11 +583,11 @@ I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_i2c.h)(0x626A2FD0)
 I (..\Drivers\STM32F1xx_HAL_Driver\Inc\Legacy\stm32_hal_legacy.h)(0x626A2FD0)
 I (C:\Keil_v5\ARM\ARMCLANG\include\stddef.h)(0x603507D0)
 I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_rcc_ex.h)(0x626A2FD0)
-I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_gpio.h)(0x626A2FD0)
+I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_gpio.h)(0x626A2FD0)
-I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_gpio_ex.h)(0x626A2FD0)
+I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_gpio_ex.h)(0x626A2FD0)
-I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_exti.h)(0x626A2FD0)
+I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_exti.h)(0x626A2FD0)
 I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_dma.h)(0x626A2FD0)
-I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_dma_ex.h)(0x626A2FD0)
+I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_dma_ex.h)(0x626A2FD0)
 I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_cortex.h)(0x626A2FD0)
 I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_flash.h)(0x626A2FD0)
 I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_flash_ex.h)(0x626A2FD0)
@@ -615,16 +615,16 @@ I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_i2c.h)(0x626A2FD0)
 I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_rcc.h)(0x626A2FD0)
 I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_def.h)(0x626A2FD0)
 I (..\Drivers\CMSIS\Device\ST\STM32F1xx\Include\stm32f1xx.h)(0x626A2FD0)
-I (..\Drivers\CMSIS\Device\ST\STM32F1xx\Include\stm32f103xb.h)(0x626A2FD0)
+I (..\Drivers\CMSIS\Device\ST\STM32F1xx\Include\stm32f103xb.h)(0x626A2FD0)
 I (..\Drivers\CMSIS\Include\core_cm3.h)(0x626A2FC1)
 I (C:\Keil_v5\ARM\ARMCLANG\include\stdint.h)(0x603507D0)
 I (..\Drivers\CMSIS\Include\cmsis_version.h)(0x626A2FC1)
 I (..\Drivers\CMSIS\Include\cmsis_compiler.h)(0x626A2FC1)
 I (..\Drivers\CMSIS\Include\cmsis_armclang.h)(0x626A2FC1)
-I (C:\Keil_v5\ARM\ARMCLANG\include\arm_compat.h)(0x602A3B7E)
+I (C:\Keil_v5\ARM\ARMCLANG\include\arm_compat.h)(0x602A3B7E)
-I (C:\Keil_v5\ARM\ARMCLANG\include\arm_acle.h)(0x603507C4)
+I (C:\Keil_v5\ARM\ARMCLANG\include\arm_acle.h)(0x603507C4)
 I (..\Drivers\CMSIS\Device\ST\STM32F1xx\Include\system_stm32f1xx.h)(0x626A2FD0)
-I (..\Drivers\STM32F1xx_HAL_Driver\Inc\Legacy\stm32_hal_legacy.h)(0x626A2FD0)
+I (..\Drivers\STM32F1xx_HAL_Driver\Inc\Legacy\stm32_hal_legacy.h)(0x626A2FD0)
 I (C:\Keil_v5\ARM\ARMCLANG\include\stddef.h)(0x603507D0)
 I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_rcc_ex.h)(0x626A2FD0)
 I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_gpio.h)(0x626A2FD0)
@@ -656,9 +656,9 @@ I (MYDEIVERS\hread_interface.h)(0x6270CBAF)
 -o f103c8t6_keil/stm32f1xx_hal_exti.o -MD)
 I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal.h)(0x626A2FD0)
 I (..\Core\Inc\stm32f1xx_hal_conf.h)(0x62F5F329)
-I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_rcc.h)(0x626A2FD0)
+I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_rcc.h)(0x626A2FD0)
 I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_def.h)(0x626A2FD0)
-I (..\Drivers\CMSIS\Device\ST\STM32F1xx\Include\stm32f1xx.h)(0x626A2FD0)
+I (..\Drivers\CMSIS\Device\ST\STM32F1xx\Include\stm32f1xx.h)(0x626A2FD0)
 I (..\Drivers\CMSIS\Device\ST\STM32F1xx\Include\stm32f103xb.h)(0x626A2FD0)
 I (..\Drivers\CMSIS\Include\core_cm3.h)(0x626A2FC1)
 I (C:\Keil_v5\ARM\ARMCLANG\include\stdint.h)(0x603507D0)
@@ -688,9 +688,9 @@ I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_tim.h)(0x626A2FD0)
 -fno-rtti -funsigned-char -fshort-enums -fshort-wchar
 
 -D__EVAL -gdwarf-4 -O3 -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -I ../Core/Inc -I ../Drivers/STM32F1xx_HAL_Driver/Inc -I ../Drivers/STM32F1xx_HAL_Driver/Inc/Legacy -I ../Drivers/CMSIS/Device/ST/STM32F1xx/Include -I ../Drivers/CMSIS/Include -I ./MYDEIVERS
-
+
 -I./RTE/_f103c8t6_KEIL
-
+
 -IC:/Users/kevin/AppData/Local/Arm/Packs/ARM/CMSIS/5.8.0/CMSIS/Core/Include
 
 -IC:/Users/kevin/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include
@@ -720,9 +720,9 @@ I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_tim.h)(0x626A2FD0)
 I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_exti.h)(0x626A2FD0)
 I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_dma.h)(0x626A2FD0)
 I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_dma_ex.h)(0x626A2FD0)
-I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_cortex.h)(0x626A2FD0)
+I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_cortex.h)(0x626A2FD0)
 I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_flash.h)(0x626A2FD0)
-I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_flash_ex.h)(0x626A2FD0)
+I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_flash_ex.h)(0x626A2FD0)
 I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_i2c.h)(0x626A2FD0)
 I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_pwr.h)(0x626A2FD0)
 I (..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_tim.h)(0x626A2FD0)

f103c8t6_keil/f103c8t6_KEIL.ioc

@@ -42,9 +42,6 @@ MxCube.Version=6.5.0
 MxDb.Version=DB.6.0.50
 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:true
 NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:true
-NVIC.EXTI0_IRQn=true\:0\:0\:false\:false\:true\:true\:true\:true
-NVIC.EXTI1_IRQn=true\:0\:0\:false\:false\:true\:true\:true\:true
-NVIC.EXTI3_IRQn=true\:0\:0\:false\:false\:true\:true\:true\:true
 NVIC.EXTI4_IRQn=true\:0\:0\:true\:false\:true\:true\:true\:true
 NVIC.ForceEnableDMAVector=true
 NVIC.HardFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:true
@@ -77,18 +74,16 @@ PA8.GPIO_PuPd=GPIO_PULLDOWN
 PA8.GPIO_Speed=GPIO_SPEED_FREQ_HIGH
 PA8.Locked=true
 PA8.Signal=GPIO_Output
-PB0.GPIOParameters=GPIO_PuPd,GPIO_Label,GPIO_ModeDefaultEXTI
+PB0.GPIOParameters=GPIO_PuPd,GPIO_Label
 PB0.GPIO_Label=tack_a
-PB0.GPIO_ModeDefaultEXTI=GPIO_MODE_IT_RISING_FALLING
 PB0.GPIO_PuPd=GPIO_PULLUP
 PB0.Locked=true
-PB0.Signal=GPXTI0
+PB0.Signal=GPIO_Input
-PB1.GPIOParameters=GPIO_PuPd,GPIO_Label,GPIO_ModeDefaultEXTI
+PB1.GPIOParameters=GPIO_PuPd,GPIO_Label
 PB1.GPIO_Label=tack_b
-PB1.GPIO_ModeDefaultEXTI=GPIO_MODE_IT_RISING_FALLING
 PB1.GPIO_PuPd=GPIO_PULLUP
 PB1.Locked=true
-PB1.Signal=GPXTI1
+PB1.Signal=GPIO_Input
 PB12.GPIOParameters=GPIO_Speed,PinState,GPIO_PuPd,GPIO_Label,GPIO_ModeDefaultOutputPP
 PB12.GPIO_Label=run_led2
 PB12.GPIO_ModeDefaultOutputPP=GPIO_MODE_OUTPUT_PP
@@ -104,12 +99,11 @@ PB15.GPIO_Speed=GPIO_SPEED_FREQ_HIGH
 PB15.Locked=true
 PB15.PinState=GPIO_PIN_SET
 PB15.Signal=GPIO_Output
-PB3.GPIOParameters=GPIO_PuPd,GPIO_Label,GPIO_ModeDefaultEXTI
+PB3.GPIOParameters=GPIO_PuPd,GPIO_Label
 PB3.GPIO_Label=en_c
-PB3.GPIO_ModeDefaultEXTI=GPIO_MODE_IT_RISING_FALLING
 PB3.GPIO_PuPd=GPIO_PULLUP
 PB3.Locked=true
-PB3.Signal=GPXTI3
+PB3.Signal=GPIO_Input
 PB4.GPIOParameters=GPIO_PuPd,GPIO_Label,GPIO_ModeDefaultEXTI
 PB4.GPIO_Label=en_a
 PB4.GPIO_ModeDefaultEXTI=GPIO_MODE_IT_RISING_FALLING
@@ -183,12 +177,6 @@ RCC.SYSCLKSource=RCC_SYSCLKSOURCE_PLLCLK
 RCC.TimSysFreq_Value=72000000
 RCC.USBFreq_Value=72000000
 RCC.VCOOutput2Freq_Value=8000000
-SH.GPXTI0.0=GPIO_EXTI0
-SH.GPXTI0.ConfNb=1
-SH.GPXTI1.0=GPIO_EXTI1
-SH.GPXTI1.ConfNb=1
-SH.GPXTI3.0=GPIO_EXTI3
-SH.GPXTI3.ConfNb=1
 SH.GPXTI4.0=GPIO_EXTI4
 SH.GPXTI4.ConfNb=1
 SH.S_TIM2_CH3.0=TIM2_CH3,PWM Generation3 CH3