更新：采样间隔与深度

.mxproject

@@ -5,13 +5,13 @@ LibFiles=Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_i2c.h;Drivers\STM32F1xx_
 SourceFiles=;;
 
 [PreviousUsedKeilFiles]
-SourceFiles=..\Src\main.c;..\Src\gpio.c;..\Src\i2c.c;..\Src\spi.c;..\Src\tim.c;..\Src\usart.c;..\Src\stm32f1xx_it.c;..\Src\stm32f1xx_hal_msp.c;..\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_gpio_ex.c;..\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_i2c.c;..\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal.c;..\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_rcc.c;..\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_rcc_ex.c;..\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_gpio.c;..\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_dma.c;..\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_cortex.c;..\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_pwr.c;..\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_flash.c;..\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_flash_ex.c;..\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_exti.c;..\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_spi.c;..\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_tim.c;..\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_tim_ex.c;..\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_uart.c;..\Drivers\CMSIS\Device\ST\STM32F1xx\Source\Templates\system_stm32f1xx.c;..\\Src\system_stm32f1xx.c;..\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_gpio_ex.c;..\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_i2c.c;..\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal.c;..\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_rcc.c;..\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_rcc_ex.c;..\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_gpio.c;..\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_dma.c;..\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_cortex.c;..\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_pwr.c;..\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_flash.c;..\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_flash_ex.c;..\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_exti.c;..\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_spi.c;..\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_tim.c;..\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_tim_ex.c;..\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_uart.c;..\Drivers\CMSIS\Device\ST\STM32F1xx\Source\Templates\system_stm32f1xx.c;..\\Src\system_stm32f1xx.c;;;
+SourceFiles=..\Src\main.c;..\Src\gpio.c;..\Src\dma.c;..\Src\i2c.c;..\Src\spi.c;..\Src\tim.c;..\Src\usart.c;..\Src\stm32f1xx_it.c;..\Src\stm32f1xx_hal_msp.c;..\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_gpio_ex.c;..\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_i2c.c;..\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal.c;..\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_rcc.c;..\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_rcc_ex.c;..\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_gpio.c;..\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_dma.c;..\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_cortex.c;..\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_pwr.c;..\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_flash.c;..\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_flash_ex.c;..\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_exti.c;..\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_spi.c;..\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_tim.c;..\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_tim_ex.c;..\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_uart.c;..\Drivers\CMSIS\Device\ST\STM32F1xx\Source\Templates\system_stm32f1xx.c;..\\Src\system_stm32f1xx.c;..\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_gpio_ex.c;..\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_i2c.c;..\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal.c;..\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_rcc.c;..\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_rcc_ex.c;..\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_gpio.c;..\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_dma.c;..\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_cortex.c;..\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_pwr.c;..\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_flash.c;..\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_flash_ex.c;..\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_exti.c;..\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_spi.c;..\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_tim.c;..\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_tim_ex.c;..\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_uart.c;..\Drivers\CMSIS\Device\ST\STM32F1xx\Source\Templates\system_stm32f1xx.c;..\\Src\system_stm32f1xx.c;;;
 HeaderPath=..\Drivers\STM32F1xx_HAL_Driver\Inc;..\Drivers\STM32F1xx_HAL_Driver\Inc\Legacy;..\Drivers\CMSIS\Device\ST\STM32F1xx\Include;..\Drivers\CMSIS\Include;..\Inc;
 CDefines=USE_HAL_DRIVER;STM32F103xE;USE_HAL_DRIVER;USE_HAL_DRIVER;
 
 [PreviousGenFiles]
 HeaderPath=..\Inc
-HeaderFiles=gpio.h;i2c.h;spi.h;tim.h;usart.h;stm32f1xx_it.h;stm32f1xx_hal_conf.h;main.h;
+HeaderFiles=gpio.h;dma.h;i2c.h;spi.h;tim.h;usart.h;stm32f1xx_it.h;stm32f1xx_hal_conf.h;main.h;
 SourcePath=..\Src
-SourceFiles=gpio.c;i2c.c;spi.c;tim.c;usart.c;stm32f1xx_it.c;stm32f1xx_hal_msp.c;main.c;
+SourceFiles=gpio.c;dma.c;i2c.c;spi.c;tim.c;usart.c;stm32f1xx_it.c;stm32f1xx_hal_msp.c;main.c;
 

App/Inc/motor.h

@@ -32,7 +32,7 @@ extern uint16_t OBJ_DEVICE_ADDR;  //
 //void REV(void);						//反转
 void ClrRunmotorStep(void);			//清除电机标记
 void Deal_Motor(void);				//处理马达运行
-//void mov_loop1(void);				//电机连续运行，方案一（直行程）
+void mov_loop1(void);				//电机连续运行，方案一（直行程）
 //void mov_loop1_ang(void);			//电机连续运行，方案一（角行程）
 //void mov_loop2(void);				//电机连续运行，方案二（直行程）
 //void mov_loop2_ang(void);			//电机连续运行，方案二（角行程）

App/Inc/oled2.h

@@ -6,6 +6,15 @@
 #define         MAX_COLUMN	  128
 #define         MAX_ROW		  64
 
+extern char oled_p;
+extern char oled_s[2];
+extern char oled_s_p6[2];
+extern char oled_s_p10[2];
+extern char oled_en;
+extern unsigned int step_temp[2];
+extern char run_mode_temp[2];
+
+
 void OLED2_Send(unsigned char *data, unsigned char len);
 void OLED2_Init(void);
 void OLED_DisplayTest(void);

App/Src/ads1220.c

@@ -315,7 +315,7 @@ float Xads1220_filter(char head, char tail)			//
 	{
 		filter_result += X_ads1220_temp[i];
 	}
-	filter_result /= (tail - head);
+	filter_result /= (tail - head + 1);
 
 	return filter_result;
 } 

App/Src/app.c

@@ -3,8 +3,8 @@
 
 //绿灯 NOR ;蓝灯 ERR
 float X_ads1220 = 0;			//读到的电压值
-float X_ads1220_L = 36.875;		//电压值上限
+float X_ads1220_L = 15.0;		//电压值上限
-float X_ads1220_H = 1311.150;	//电压值下限
+float X_ads1220_H = 1320.0;	//电压值下限
 float X_ads1220_prc = 0;		//电压百分比（即位移百分比）
 float TEMP_M1820 = 0;					//温度
 uint32_t move_step_5mm = 0x0000C800;
@@ -12,7 +12,9 @@ uint32_t move_step_1mm = 0x00002800;
 char ocin1 = 0,ocin2 = 0;       //位置开关，远离为1接近为0
 char oled_init_flag = 0,oled_init_result = 0;
 //int i2c_error_temp = 0;
+uint8_t magnet_tx[7] = {0x05,0x01,0x00,0x0A,0x00,0x0A,0xFF}; 
 
+HAL_StatusTypeDef hal_check_tx;
 void app_act (void)
 {
 	//1 按键操作
@@ -24,9 +26,10 @@ void app_act (void)
 	{
 		it_1000ms_flag = 0;
 		
-//		OLED_Act();		//OLED显示,操作显存后统一发送
+		HAL_GPIO_WritePin(RS485_EN1_GPIO_Port,RS485_EN1_Pin,GPIO_PIN_SET); 	//使能485发送，发送结束后在回调函数中拉低
-//		OLED_DisplayTest();						//OLED显示，只发送需要显示的部分
+
-		OLED_MenuTest();
+		hal_check_tx = HAL_UART_Transmit_IT(&huart2, magnet_tx ,7);			//485发送
+
 		
 	}
 
@@ -38,8 +41,12 @@ void app_act (void)
 	{
 		it_100ms_flag  = 0;
 		
+		OLED_MenuTest();						//OLED显示
+//		OLED_Act();								//OLED显示,操作显存后统一发送
+//		OLED_DisplayTest();						//OLED显示，只发送需要显示的部分
+		
 		TEMP_M1820 = M1820_Get_Temp();			//温度采集
-		X_ads1220 = Xads1220_filter(4,16);		//电阻尺滤波结果（电压值，mv）
+		X_ads1220 = Xads1220_filter(5,16);		//电阻尺滤波结果（电压值，mv）
 		X_ads1220_prc =(X_ads1220 - X_ads1220_L)/(X_ads1220_H - X_ads1220_L);
 				
 		// 串口计时
@@ -57,11 +64,16 @@ void app_act (void)
 //	motor_protect_ocin();							//根据位置开关限位
 //	tmc5160_operate(tmc5160_sw, move_step_5mm); 	//第一个参数代表模式选择，第二个参数为步长，电机转动一圈滑块移动5mm
 	
-	Deal_Motor();
+//	Deal_Motor();
 	
 	//7 串口数据处理
 	Deal_Uart_Data_For_Module();
-
+	motor_data[4] = rx_data2[1];  							//磁条485
+	motor_data[5] = rx_data2[2];
+	motor_data[6] = rx_data2[3];
+	motor_data[7] = rx_data2[4];
+	motor_data[8] = ( (uint8_t)X_ads1220 & 0xff00 ) >> 8;	//磁条长度高8位
+	motor_data[9] = ( (uint8_t)X_ads1220 & 0x00ff );		//磁条长度低8位
 	
 	//8 位置开关
 	ocin1 = HAL_GPIO_ReadPin(OCIN1_GPIO_Port,OCIN1_Pin); //低电平接近，高电平远离

App/Src/delay.c

@@ -1,6 +1,4 @@
 #include "delay.h"
-#include "main.h"
-#include "tim.h" 
 #include "app.h"
 
  

App/Src/key.c

@@ -1,8 +1,4 @@
 #include "key.h"
-#include "main.h"
-#include "tmc5160.h"
-//#include "oled.h"
-#include "delay.h"
 #include "app.h"
 
 unsigned char key_i = 0;
@@ -10,7 +6,7 @@ unsigned int key_cnt[3] = {0};		//延时用计数
 unsigned char key_msg[3] = {0};		//按键事件
 unsigned char key_val[3] = {0};		//按键值
 
-#define KEY_CNT 50
+#define KEY_CNT 5
 
 void Key_Scan(void) // 扫描K1-K3的状态
 {
@@ -20,21 +16,20 @@ void Key_Scan(void) // 扫描K1-K3的状态
 	
 	//检测按键
 	if(key_i >= 3) key_i = 0;
-	if (key_val[key_i] == 0 && key_msg[key_i] == 0)		//按键按下
+	if(key_val[key_i] == 0 && key_msg[key_i] == 0)		//按键按下
 	{
 
 		key_cnt[key_i]++;		
 		if(key_cnt[key_i] > KEY_CNT)
 		{
 		key_cnt[key_i] = 0;
-		key_msg[key_i] = 1;														//按键按下，触发事件1
+		key_msg[key_i] = 1;								//按键按下，触发事件1
 		}
 	}
   
-	if (key_val[key_i] == 1 && key_msg[key_i] == 2)		//按键抬起
+	if( key_msg[key_i] == 2  &&  key_val[key_i] == 1 )	
 	{
-		key_msg[key_i] = 0;														//完成抬起动作后，再清空事件
+		key_msg[key_i] = 0;								//完成对应功能后，再清空事件
-		
 	}
 	
 	//按键按顺序增加		
@@ -54,8 +49,6 @@ void key_act(void)
 {
 	if(key_msg[0] == 1)					//K1完成按下后
 	{
-//		tmc5160_sw = 3*(tmc5160_sw != 3);
-		
 		oled_en = 1;
 		
 		key_msg[0] = 2;
@@ -63,35 +56,139 @@ void key_act(void)
 	
 	if(key_msg[1] == 1)					//K2完成按下后
 	{
-//		tmc5160_sw = 2*(tmc5160_sw == 0)+2*(tmc5160_sw == 3);
+		switch(oled_p)
-		
-		if(oled_p == 2)
 		{
-			oled_s[0] = oled_s[1];
+			case 2:	//菜单选择
-			oled_s[1] = oled_s[1] + (oled_s[1] < 2) - (oled_s[1] == 2);
+			{
-		}
+				if( oled_s[0] < 2 )
-		
+				{
-		if(oled_p == 4)//步长调节
+					oled_s[0]++;
-		{
+				}else
-			Run_mm = Run_mm - (Run_mm > 1) + 14*(Run_mm == 1);
+				{
+					oled_s[0] = 0;
+				}
+			}
+			break;
+			case 4:	//运行模式切换
+			{
+				run_mode_temp[0] = !run_mode_temp[0];
+			}
+			break;
+			case 5:	//运行步长调节
+			{
+				if(step_temp[0] > 1)
+				{
+					step_temp[0]--;
+				}else
+				{
+					step_temp[0] = 15;
+				}
+			}
+			break;
+			case 6:	//Cancel & OK 切换
+			{
+				oled_s_p6[0] = !oled_s_p6[0];
+			}
+			break;
+			case 8:
+			{
+				if(smp_intr_temp[0] > 5)
+				{
+					smp_intr_temp[0]--;
+				}else
+				{
+					smp_intr_temp[0] = 10;
+				}
+			}
+			break;
+			case 9:
+			{
+				if(smp_dpth_temp[0] > 10)
+				{
+					smp_dpth_temp[0]--;
+				}else
+				{
+					smp_dpth_temp[0] = 20;
+				}
+			}
+			break;
+			case 10:
+			{
+				oled_s_p10[0] = !oled_s_p10[0];
+			}
+			break;
 		}
+
 		
 		key_msg[1] = 2;	
 	}
 	
 	if(key_msg[2] == 1)//K3完成按下后
 	{
-//		tmc5160_sw = (tmc5160_sw == 0);//+(tmc5160_sw == 3);
-		if(oled_p == 2)//主界面菜单
-		{
-			oled_s[0] = oled_s[1];
-			oled_s[1] = oled_s[1] -(oled_s[1] >1) + (oled_s[1] == 1);
-		}
 		
-		if(oled_p == 4)//步长调节
+		switch(oled_p)
 		{
-			Run_mm = Run_mm + (Run_mm < 15) - 14*(Run_mm == 15);
+			case 2:	//菜单选择
+			{
+				if( oled_s[0] > 0 )
+				{
+					oled_s[0]--;
+				}else
+				{
+					oled_s[0] = 2;
+				}
+			}
+			break;
+			case 4:	//运行模式切换
+			{
+				run_mode_temp[0] = !run_mode_temp[0];
+			}
+			break;
+			case 5:	//运行步长调节
+			{
+				if(step_temp[0] < 15)
+				{
+					step_temp[0]++;
+				}else
+				{
+					step_temp[0] = 1;
+				}
+			}
+			break;
+			case 6:	//Cancel & OK 切换
+			{
+				oled_s_p6[0] = !oled_s_p6[0];
+			}
+			break;
+			case 8:
+			{
+				if(smp_intr_temp[0] <10 )
+				{
+					smp_intr_temp[0]++;
+				}else
+				{
+					smp_intr_temp[0] = 5;
+				}
+			}
+			break;
+			case 9:
+			{
+				if(smp_dpth_temp[0] < 20)
+				{
+					smp_dpth_temp[0]++;
+				}else
+				{
+					smp_dpth_temp[0] = 10;
+				}
+			}
+			break;
+			case 10:
+			{
+				oled_s_p10[0] = !oled_s_p10[0];
+			}
+			break;
 		}
+
 		
 		key_msg[2] = 2;	
 	}

App/Src/m1820.c

@@ -1,6 +1,6 @@
 #include "m1820.h"
-#include "main.h"
+#include "app.h"
-#include "delay.h"
+
 
 #define IO_H HAL_GPIO_WritePin(GPIOC,GPIO_PIN_10,GPIO_PIN_SET)      //PC10 Tx
 #define IO_L HAL_GPIO_WritePin(GPIOC,GPIO_PIN_10,GPIO_PIN_RESET)    //PC10 Tx

App/Src/motor.c

@@ -16,7 +16,7 @@ char Run_Mode = 0;          	//0
 unsigned int Run_Step = 0;  	//电机运行步长
 unsigned int Run_Inter = 0; 	//电机运行间隔时长
 unsigned int Run_Stop = 0;  	//到“结束点”后，停止时间
-unsigned int Run_mm = 5;	  	//行进长度（mm）/转动角度（°）
+unsigned int Run_mm = 1;	  	//行进长度（mm）/转动角度（°）
 unsigned int Run_num = 0;	  	//角行程电机转动圈数
 unsigned int ct_num = 0;	  	//磁条长度
 
@@ -77,11 +77,11 @@ void Deal_Motor(void)
 				motor_data[2] = 0x00;//发送时反馈的数据	
 				mov_step();//点动
 			}
-//			else if(Run_Mode == 1)//连续（方案一）“步长过大可能会越过限位开关”
+			else if(Run_Mode == 1)//连续（方案一）“步长过大可能会越过限位开关”
-//			{
+			{
-//				motor_data[2] = 0x01;//发送时反馈的数据
+				motor_data[2] = 0x01;//发送时反馈的数据
-//				mov_loop1();//方案一
+				mov_loop1();//方案一
-//			}
+			}
 //			else if(Run_Mode == 2)//连续（方案二）“步长过大可能会越过限位开关”
 //			{
 //				motor_data[2] = 0x02;//发送时反馈的数据
@@ -265,3 +265,146 @@ void mov_step(void)
 			break;								
 	}				
 }
+
+#define magnet_start 200
+#define magnet_end 800
+//电机连续运行，方案一（直行程）
+void mov_loop1(void)
+{
+	switch(Runmotor_step)
+	{
+		case 1 : //电机运行准备
+			{
+				
+				motor_direc = MOTOR_POS;					//正转
+				motor_dire = 1;
+				Run_mm = 0;
+				Run_num = 0;
+				motor_data[2] = 0x00;	//发送时反馈的数据	
+				Runmotor_Nums = 0;   	//运行次数	
+                mov_flag = 0;		 
+                Runmotor_step++; 					
+			}
+			break;
+		case 2 : //电机运行过程，运行至磁条所在范围				
+			{
+				if( X_ads1220 > magnet_start )			//电阻尺位置判断
+				{
+					tmc5160_operate(MOTOR_STOP,0);
+					if(it_1000ms_flag)		//检查1ms定时标志
+					{
+						it_1000ms_flag = 0;//定时标志清零
+						Runmotor_Nums++;
+					}
+					if(Runmotor_Nums >= Run_Stop)//时间
+					{
+						Runmotor_step++;
+//						motor_data[8] = ((Run_mm * Run_Step) & 0xff00) >> 8;//磁条长度高8位
+//						motor_data[9] = (Run_mm * Run_Step) & 0x00ff;		//磁条长度低8位
+						//motor_seat();	//读取电机当前位置
+						send_set_resp(0xF001, OBJ_DEVICE_ADDR, DATA_LEN, motor_data);//数据发送
+					}
+				}
+				else
+				{
+					if(send_flag == 0)
+					{
+						send_flag = 1;
+						//motor_seat();//读取电机当前位置
+						send_set_resp(0xF001, OBJ_DEVICE_ADDR, DATA_LEN, motor_data);//数据发送
+					}
+					//进入磁条范围前，以大步长进行运动，单位为mm，5mm转一圈
+					tmc5160_operate( motor_direc, 51200*3 );
+					Runmotor_step = 6;
+				}
+			}
+			break;
+		case 3 : //延时
+			{
+				//进入磁条范围后，以小步长进行运动，单位为mm
+				if(Run_Step == 0)
+				{
+					tmc5160_operate(motor_direc,Run_mm*10240);//5mm-51200，1mm-10240
+				}else
+				{
+					tmc5160_operate(motor_direc,Run_Step*10240);
+				}
+				if(busy_flag == 0)
+				{
+					Runmotor_step++; 
+				}
+			}
+			break;
+		case 4 : //延时
+			{	
+				if(it_1ms_flag)		//检查1ms定时标志
+					{
+						it_1ms_flag = 0;//定时标志清零
+						Runmotor_Nums++;
+					}
+				if(Runmotor_Nums >= Run_Inter)//时间
+				{
+					
+					Runmotor_Nums = 0;
+					Runmotor_step++;
+					send_flag = 0;
+					//motor_seat();	//读取电机当前位置
+					send_set_resp(0xF001, OBJ_DEVICE_ADDR, DATA_LEN, motor_data);//数据发送
+				}
+				
+			}
+			break;
+		case 5 :
+			{
+				if(X_ads1220 > magnet_end)//超出磁条范围判断
+				{
+					if(flag == 0)
+					{
+						Runmotor_Nums = 0;
+						Runmotor_step = 3;	
+						if(motor_dire == 1)
+						{
+							motor_direc = MOTOR_REV;//反转
+							flag = 1;
+							motor_dire = 0;
+						}
+						else
+						{
+							Motor_Run = 2;   //运行标记改变，电机回到初始位
+						}
+					}
+					else
+					{
+						Runmotor_step = 3;
+					}	
+				}
+				else
+				{
+					Runmotor_step = 3;
+					flag = 0 ;
+				}
+			}
+			break;
+		case 6 :
+			{
+				if( (ocin1 == 0) && (motor_direc != MOTOR_POS) )//判断是否到达始限位
+				{
+					motor_direc = MOTOR_POS;
+					tmc5160_operate(MOTOR_STOP,0);
+				}
+				if( (ocin2 == 0) && (motor_direc != MOTOR_REV) )//判断是否到达终限位
+				{
+					motor_direc = MOTOR_REV;
+					tmc5160_operate(MOTOR_STOP,0);
+				}
+				
+				Runmotor_step = 2;
+			}
+			break;			
+		default :	
+			{
+				
+			}
+			break;								
+	}				
+}

App/Src/oled2.c

@@ -399,7 +399,7 @@ void OLED_ShowCN(uint8_t x,uint8_t y,uint8_t index)
   }					
 }
 
-char str_print2[16] = {0};
+char str_print2[16] = {0},str_print3[16] = {0};
 float Xads_temp2[2] = {0},T_temp2[2] = {0},OC1_temp[2] = {0},OC2_temp[2] = {0};
 char disp_step2 = 0;
 void OLED_DisplayTest(void)
@@ -424,7 +424,7 @@ void OLED_DisplayTest(void)
 		{
 			//位置
 			Xads_temp2[0] = X_ads1220_prc;
-			if(Xads_temp2[1] != Xads_temp2[0] )
+			if(Xads_temp2[1] - Xads_temp2[0] > 0.001 )
 			{
 				OLED_ShowString(40,2," ",16,0);              
 				sprintf(str_print2, "%.2f",Xads_temp2[0]*100 ); // 电阻尺
@@ -453,8 +453,10 @@ void OLED_DisplayTest(void)
 	}
 }
 
-char oled_p = 0,oled_s[2] = {1,1},oled_en = 0,para_flag = 0,motor_flag1 = 0,motor_flag2 = 0;
+char oled_p = 0,oled_s[2] = {0},oled_en = 0,oled_s_p6[2] = {0},oled_s_p10[2] = {0};
-unsigned int step_temp[2] = {0};;
+char para_flag = 0,motor_flag1 = 0,motor_flag2 = 0,magnet_flag = 0;
+unsigned int step_temp[2] = {1,1},smp_intr_temp[2] = {0},smp_dpth_temp[2] = {0};
+char run_mode_temp[2] = {0};
 void OLED_MenuTest(void)
 {
 	switch(oled_p)
@@ -468,38 +470,65 @@ void OLED_MenuTest(void)
 		case 1:		//显示不动的内容
 		{
 			OLED_Clear(); 
-			OLED_ShowString(0,0,"Menu",16,0);
+			OLED_ShowString(48,0,"Menu",16,1);
 			OLED_ShowString(0,2,"Parameter ",16,0);
-			OLED_ShowString(0,4,"Motor Control",16,0);  
+			OLED_ShowString(0,4,"Motor Control",16,0); 
+			OLED_ShowString(0,6,"Magnet Sample",16,0);  
+			if(oled_s[0] == 0) OLED_ShowChar(112,2,'<',16,0);
+			if(oled_s[0] == 1) OLED_ShowChar(112,4,'<',16,0);	
+			if(oled_s[0] == 2) OLED_ShowChar(112,6,'<',16,0);				
 			oled_p++;
 		}
 		break;
 		case 2:		//菜单选择
 		{
 
-			if(oled_s[1] == 1)
+			if(oled_s[0] == 0)  			//当前选择第0行
 			{
-				OLED_ShowString(0,2,"Parameter ",16,1);
+				if(oled_s[0] != oled_s[1])	//是否发生变化
-				if(oled_s[0] == 2) OLED_ShowString(0,4,"Motor Control",16,0); 
+				{
-				oled_s[0] =	oled_s[1];	
+					OLED_ShowChar(112,2,'<',16,0);
+					if(oled_s[1] == 1) OLED_ShowChar(112,4,' ',16,0); //刷新之前所在行1
+					if(oled_s[1] == 2) OLED_ShowChar(112,6,' ',16,0); //刷新之前所在行2
+					oled_s[1] =	oled_s[0];	
+				}
 			}
-			if(oled_s[1] == 2)
+			if(oled_s[0] == 1)
 			{
-				OLED_ShowString(0,4,"Motor Control",16,1);  
+				if(oled_s[0] != oled_s[1])	//是否发生变化
-				if(oled_s[0] == 1) OLED_ShowString(0,2,"Parameter ",16,0);
+				{
-				oled_s[0] =	oled_s[1];	
+					OLED_ShowChar(112,4,'<',16,0);
+					if(oled_s[1] == 0) OLED_ShowChar(112,2,' ',16,0); 
+					if(oled_s[1] == 2) OLED_ShowChar(112,6,' ',16,0); 
+					oled_s[1] =	oled_s[0];	
+				}
+			}
+			if(oled_s[0] == 2)
+			{
+				if(oled_s[0] != oled_s[1])	//是否发生变化
+				{
+					OLED_ShowChar(112,6,'<',16,0);
+					if(oled_s[1] == 0) OLED_ShowChar(112,2,' ',16,0);  
+					if(oled_s[1] == 1) OLED_ShowChar(112,4,' ',16,0); 
+					oled_s[1] =	oled_s[0];
+				}	
 			}
 			
-			if( (oled_s[1] == 1) && (oled_en == 1) )	//进入参数观测
+			if( (oled_s[0] == 0) && (oled_en == 1) )	//进入参数观测
 			{
 				oled_en = 0;
 				oled_p = 3;
 			}
-			if( (oled_s[1] == 2) && (oled_en == 1) ) 	//进入电机控制
+			if( (oled_s[0] == 1) && (oled_en == 1) ) 	//进入电机控制
 			{
 				oled_en = 0;
 				oled_p = 4;
 			}
+			if( (oled_s[0] == 2) && (oled_en == 1) ) 	//进入磁性传感器采样设置
+			{
+				oled_en = 0;
+				oled_p = 8;
+			}
 		}
 		break;
 		case 3:
@@ -509,9 +538,13 @@ void OLED_MenuTest(void)
 				para_flag = 1;
 				OLED_Clear(); 
 				
-				OLED_ShowString(0,0,(char *)("Pos"),16,0);			//(x,y,char,size,color), color{0正常，1反显},x{0-128},y{}
+				OLED_ShowString(0,0,(char *)("Pos"),16,0);	//(x,y,char,size,color), color{0正常，1反显},x{0-128},y{}
+				sprintf(str_print2, "%.2f",X_ads1220_prc*100 ); 
+				OLED_ShowString(0,2,str_print2,16,0);
 				OLED_ShowString(72,0,(char *)("OC1"),16,0);
 				OLED_ShowString(0,4,(char *)("Temp"),16,0);
+				sprintf(str_print3, "%.2f",TEMP_M1820 );  		
+				OLED_ShowString(0,6,str_print3,16,0);
 				OLED_ShowString(72,4,(char *)("OC2"),16,0);
 				OLED_ShowString(48,2,(char *)("%"),16,0);
 				if(ocin1 == 1)
@@ -532,7 +565,7 @@ void OLED_MenuTest(void)
 			{
 				//位置
 				Xads_temp2[0] = X_ads1220_prc;
-				if(Xads_temp2[1] != Xads_temp2[0] )
+				if( (Xads_temp2[1] - Xads_temp2[0] > 0.001) || (Xads_temp2[0] - Xads_temp2[1] > 0.001))
 				{
 					OLED_ShowString(40,2," ",16,0);              
 					sprintf(str_print2, "%.2f",Xads_temp2[0]*100 ); // 电阻尺
@@ -544,9 +577,9 @@ void OLED_MenuTest(void)
 				T_temp2[0] = TEMP_M1820;
 				if(T_temp2[1] != T_temp2[0])
 				{    
-					sprintf(str_print2, "%.2f",T_temp2[1] );  		//温度
 					OLED_ShowString(40,6," ",16,0);
-					OLED_ShowString(0,6,str_print2,16,0);
+					sprintf(str_print3, "%.2f",T_temp2[1] );  		//温度
+					OLED_ShowString(0,6,str_print3,16,0);
 					T_temp2[1] = T_temp2[0];
 				}
 
@@ -583,6 +616,7 @@ void OLED_MenuTest(void)
 			{
 				oled_en = 0;
 				oled_p = 1;
+				para_flag = 0;
 			}
 		}
 		break;
@@ -594,33 +628,132 @@ void OLED_MenuTest(void)
 				OLED_Clear(); 
 				
 				OLED_ShowString(0,0,"Motor Control",16,0);
-				OLED_ShowString(0,2,"Run Mode: STEP",16,0);
+				OLED_ShowString(0,2,"Run Mode:",16,0);
+				if(Run_Mode == 0) OLED_ShowString(80,2,"STEP",16,1);
+				if(Run_Mode == 1) OLED_ShowString(80,2,"LOOP",16,1);
 				OLED_ShowString(0,4,"Run Step:",16,0);
 				sprintf(str_print2, "%d",Run_mm );
-				OLED_ShowString(80,4,str_print2,16,1);
+				OLED_ShowString(80,4,str_print2,16,0);
 				OLED_ShowString(100,4,"mm",16,0);
+				OLED_ShowString(0,6,"Cancel",16,0);
+				OLED_ShowString(80,6,"OK",16,0);
 				
 			}else
 			{
-				step_temp[0] = Run_mm;
+				if(run_mode_temp[0] != run_mode_temp[1])	//运动模式变化时刷新
-				if(step_temp[0] != step_temp[1])
 				{
-					sprintf(str_print2, "%d",step_temp[0] );
+					if(run_mode_temp[0] == 0) OLED_ShowString(80,2,"STEP",16,1);
-					OLED_ShowString(80,4,str_print2,16,1);
+					if(run_mode_temp[0] == 1) OLED_ShowString(80,2,"LOOP",16,1);
+					run_mode_temp[1] = run_mode_temp[0];
 				}
-				step_temp[1] = step_temp[0];
 			}
-			
+			if( oled_en == 1 )	//运动模式确认后取消反显
-			if(oled_en == 1)
 			{
 				oled_en = 0;
-				OLED_ShowString(80,4,str_print2,16,0);
+				motor_flag1 = 0;
-				Motor_Run = 1;
+				
+				if(run_mode_temp[0] == 0) OLED_ShowString(80,2,"STEP",16,0);
+				if(run_mode_temp[0] == 1) OLED_ShowString(80,2,"LOOP",16,0);
+				
 				oled_p = 5;
 			}
+
+			
 		}
 		break;
 		case 5:
+		{
+			if(run_mode_temp[0] == 0)
+			{
+				if(motor_flag1 == 0)
+				{
+					motor_flag1 = 1;
+					sprintf(str_print2, "%d",Run_mm );
+					OLED_ShowString(80,4,str_print2,16,1);
+				}else
+				{
+					if(step_temp[0] != step_temp[1])	//步长变动时刷新
+					{
+						OLED_ShowString(80,4,"  ",16,0);
+						sprintf(str_print2, "%d",step_temp[0] );
+						OLED_ShowString(80,4,str_print2,16,1);
+					}
+					step_temp[1] = step_temp[0];
+				}
+				if(oled_en == 1)   						//步长确定后取消反显
+				{
+					oled_en = 0;
+					motor_flag1 = 0;
+					
+					OLED_ShowString(80,4,str_print2,16,0);
+					
+					oled_p = 6;
+				}
+			}
+			if(run_mode_temp[0] == 1)
+			{
+				step_temp[0] = 1;
+				OLED_ShowString(80,4,"  ",16,0);
+				sprintf(str_print2, "%d",step_temp[0] );
+				OLED_ShowString(80,4,str_print2,16,0);
+				oled_p = 6;
+			}
+
+
+		}
+		break;	
+		case 6:
+		{
+			if(motor_flag1 == 0)
+			{
+				motor_flag1 = 1;
+				oled_s_p6[0] = 0;
+				oled_s_p6[1] = 0;
+				OLED_ShowString(0,6,"Cancel",16,1);
+			}else
+			{
+				if(oled_s_p6[0] != oled_s_p6[1])
+				{
+					if(oled_s_p6[0] == 0)
+					{
+						OLED_ShowString(0,6,"Cancel",16,1);
+						OLED_ShowString(80,6,"OK",16,0);
+					}
+					if(oled_s_p6[0] == 1)
+					{
+						OLED_ShowString(0,6,"Cancel",16,0);
+						OLED_ShowString(80,6,"OK",16,1);
+					}
+				}
+			}
+			
+			if((oled_en == 1) && (oled_s_p6[0] == 0))	//取消后初始化暂存数据
+			{
+				oled_en = 0;
+				motor_flag1 = 0;
+				
+				Motor_Run = 0;
+				run_mode_temp[0] = 0;
+				run_mode_temp[1] = 0;
+				step_temp[0] = 1;
+				step_temp[1] = 1;
+				
+				oled_p = 1;
+			}
+			if((oled_en == 1) && (oled_s_p6[0] == 1))	//确认后将暂存数据写入对应参数
+			{
+				oled_en = 0;
+				motor_flag1 = 0;
+				
+				Motor_Run = 1;
+				Run_Mode = run_mode_temp[0];
+				Run_mm = step_temp[0];
+				
+				oled_p = 7;
+			}
+		}
+		break;
+		case 7:
 		{
 			if(motor_flag2 == 0)
 			{
@@ -649,7 +782,7 @@ void OLED_MenuTest(void)
 			{
 				//位置
 				Xads_temp2[0] = X_ads1220_prc;
-				if(Xads_temp2[1] != Xads_temp2[0] )
+				if( (Xads_temp2[1] - Xads_temp2[0] > 0.001) || (Xads_temp2[0] - Xads_temp2[1] > 0.001))
 				{
 					OLED_ShowString(80,2," ",16,0);              
 					sprintf(str_print2, "%.2f",Xads_temp2[0]*100 ); // 电阻尺
@@ -689,10 +822,146 @@ void OLED_MenuTest(void)
 			if(oled_en == 1)
 			{
 				Motor_Run = 0;
+				
 				oled_en = 0;
 				oled_p = 1;
+				motor_flag2 = 0;
 			}
 		}
+		break;
+		case 8:
+		{
+			if(magnet_flag == 0)
+			{
+				magnet_flag = 1;
+				OLED_Clear();
+				
+				OLED_ShowString(0,0,"Sample Set",16,0);
+				OLED_ShowString(0,2,"Interval:",16,0);
+				OLED_ShowString(100,2,"ms",16,0);
+				OLED_ShowString(0,4,"Deepth:",16,0);
+				smp_intr_temp[0] = magnet_tx[3];
+				smp_intr_temp[1] = magnet_tx[3];
+				smp_dpth_temp[0] = magnet_tx[5];
+				smp_dpth_temp[1] = magnet_tx[5];
+				sprintf(str_print2, "%d",smp_intr_temp[0] );
+				OLED_ShowString(80,2,str_print2,16,1);
+				sprintf(str_print2, "%d",smp_dpth_temp[0] );
+				OLED_ShowString(80,4,str_print2,16,0);
+				OLED_ShowString(0,6,"Cancel",16,0);
+				OLED_ShowString(80,6,"OK",16,0);
+			}else
+			{
+				if(smp_intr_temp[0] != smp_intr_temp[1])
+				{
+					OLED_ShowString(88,2," ",16,0);
+					sprintf(str_print2, "%d",smp_intr_temp[0] );
+					OLED_ShowString(80,2,str_print2,16,1);	//反显
+					smp_intr_temp[1] = smp_intr_temp[0];
+				}
+				
+			}
+			
+			if(oled_en == 1)
+			{
+				oled_en = 0;
+				magnet_flag = 0;
+				
+				OLED_ShowString(80,2,"  ",16,0);	
+				sprintf(str_print2, "%d",smp_intr_temp[0] );
+				OLED_ShowString(80,2,str_print2,16,0);    	//取消反显
+				
+				oled_p = 9;
+			}
+		}
+		break;
+		case 9:
+		{
+			if(magnet_flag == 0)
+			{
+				magnet_flag = 1;
+				
+				sprintf(str_print2, "%d",smp_dpth_temp[0] );
+				OLED_ShowString(80,4,str_print2,16,1);
+			}else
+			{
+				if(smp_dpth_temp[0] != smp_dpth_temp[1])
+				{
+					OLED_ShowString(88,4," ",16,0);	
+					sprintf(str_print2, "%d",smp_dpth_temp[0] );
+					OLED_ShowString(80,4,str_print2,16,1);	//反显
+					smp_dpth_temp[1] = smp_dpth_temp[0];
+				}
+			}
+			
+			if(oled_en == 1)
+			{
+				oled_en = 0;
+				magnet_flag = 0;
+				
+				OLED_ShowString(80,4,"  ",16,0);	
+				sprintf(str_print2, "%d",smp_dpth_temp[0] );
+				OLED_ShowString(80,4,str_print2,16,0);		//取消反显
+				
+				oled_p = 10;
+			}
+		}
+		break;
+		case 10:
+		{
+			if(magnet_flag == 0)
+			{
+				magnet_flag = 1;
+				oled_s_p10[0] = 0;
+				oled_s_p10[1] = 0;
+				OLED_ShowString(0,6,"Cancel",16,1);
+			}else
+			{
+				if(oled_s_p10[0] != oled_s_p10[1])
+				{
+					if(oled_s_p10[0] == 0) 
+					{
+						OLED_ShowString(0,6,"Cancel",16,1);
+						OLED_ShowString(80,6,"OK",16,0);
+					}
+					if(oled_s_p10[0] == 1) 
+					{
+						OLED_ShowString(0,6,"Cancel",16,0);
+						OLED_ShowString(80,6,"OK",16,1);
+					}
+					oled_s_p10[1] = oled_s_p10[0];
+				}
+			}
+			if(oled_en == 1)
+			{
+				if(oled_s_p10[0] == 0)
+				{
+					oled_en = 0;
+					magnet_flag = 0;
+					
+					smp_intr_temp[0] = magnet_tx[3];
+					smp_intr_temp[1] = magnet_tx[3];
+					smp_dpth_temp[0] = magnet_tx[5];
+					smp_dpth_temp[1] = magnet_tx[5];
+					
+					oled_p = 1;
+				}
+				if(oled_s_p10[0] == 1)
+				{
+					oled_en = 0;
+					magnet_flag = 0;
+					
+					magnet_tx[3] = smp_intr_temp[0];
+					magnet_tx[5] = smp_dpth_temp[0];
+					
+					oled_p = 1;
+				}
+			}
+		}
+		break;
+		default:
+		{
+		}
 	}
 }
 

Inc/app.h

@@ -33,17 +33,18 @@ extern int it_100ms_cnt ,it_100ms_flag;
 extern int it_300ms_cnt ,it_300ms_flag;
 extern int it_500ms_cnt ,it_500ms_flag;
 extern int it_1000ms_cnt ,it_1000ms_flag;
-extern int I2C_ERROR_TIMES ,I2C_BUSY_TIMES ,I2C_TIMEOUT_TIMES ,I2C_OK_TIMES ;
+extern uint8_t rx_data2[6];
+extern uint8_t magnet_tx[7];
+extern unsigned int smp_intr_temp[2];
+extern unsigned int smp_dpth_temp[2];
+//extern int I2C_ERROR_TIMES ,I2C_BUSY_TIMES ,I2C_TIMEOUT_TIMES ,I2C_OK_TIMES ;
 
 extern float X_ads1220;
 extern float TEMP_M1820;
 extern float X_ads1220_prc;
 extern char ocin1;
 extern char ocin2;
-extern char oled_p;
+
-extern char oled_s[2];
-extern char oled_en;
-extern unsigned int step_temp[2];
 
 #endif
 

Inc/dma.h

@@ -0,0 +1,52 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    dma.h
+  * @brief   This file contains all the function prototypes for
+  *          the dma.c file
+  ******************************************************************************
+  * @attention
+  *
+  * Copyright (c) 2024 STMicroelectronics.
+  * All rights reserved.
+  *
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __DMA_H__
+#define __DMA_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+
+/* DMA memory to memory transfer handles -------------------------------------*/
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* USER CODE BEGIN Private defines */
+
+/* USER CODE END Private defines */
+
+void MX_DMA_Init(void);
+
+/* USER CODE BEGIN Prototypes */
+
+/* USER CODE END Prototypes */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __DMA_H__ */
+

Inc/stm32f1xx_hal_conf.h

@@ -42,7 +42,7 @@
 /*#define HAL_CORTEX_MODULE_ENABLED   */
 /*#define HAL_CRC_MODULE_ENABLED   */
 /*#define HAL_DAC_MODULE_ENABLED   */
-/*#define HAL_DMA_MODULE_ENABLED   */
+#define HAL_DMA_MODULE_ENABLED
 /*#define HAL_ETH_MODULE_ENABLED   */
 /*#define HAL_FLASH_MODULE_ENABLED   */
 #define HAL_GPIO_MODULE_ENABLED

Inc/stm32f1xx_it.h

@@ -55,6 +55,7 @@ void SVC_Handler(void);
 void DebugMon_Handler(void);
 void PendSV_Handler(void);
 void SysTick_Handler(void);
+void DMA1_Channel6_IRQHandler(void);
 void TIM1_UP_IRQHandler(void);
 void I2C1_EV_IRQHandler(void);
 void I2C1_ER_IRQHandler(void);

MDK-ARM/mfps.uvoptx

@@ -223,17 +223,47 @@
         <Ww>
           <count>14</count>
           <WinNumber>1</WinNumber>
-          <ItemText>oled_s</ItemText>
+          <ItemText>Run_mm</ItemText>
         </Ww>
         <Ww>
           <count>15</count>
           <WinNumber>1</WinNumber>
-          <ItemText>Run_mm</ItemText>
+          <ItemText>step_temp</ItemText>
         </Ww>
         <Ww>
           <count>16</count>
           <WinNumber>1</WinNumber>
-          <ItemText>step_temp</ItemText>
+          <ItemText>rx_data2</ItemText>
+        </Ww>
+        <Ww>
+          <count>17</count>
+          <WinNumber>1</WinNumber>
+          <ItemText>it_5000ms_flag</ItemText>
+        </Ww>
+        <Ww>
+          <count>18</count>
+          <WinNumber>1</WinNumber>
+          <ItemText>oled_s</ItemText>
+        </Ww>
+        <Ww>
+          <count>19</count>
+          <WinNumber>1</WinNumber>
+          <ItemText>Motor_Run</ItemText>
+        </Ww>
+        <Ww>
+          <count>20</count>
+          <WinNumber>1</WinNumber>
+          <ItemText>Run_Mode</ItemText>
+        </Ww>
+        <Ww>
+          <count>21</count>
+          <WinNumber>1</WinNumber>
+          <ItemText>Run_mm</ItemText>
+        </Ww>
+        <Ww>
+          <count>22</count>
+          <WinNumber>1</WinNumber>
+          <ItemText>magnet_tx</ItemText>
         </Ww>
       </WatchWindow1>
       <Tracepoint>
@@ -345,6 +375,18 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
+      <PathWithFileName>../Src/dma.c</PathWithFileName>
+      <FilenameWithoutPath>dma.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>5</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
       <PathWithFileName>../Src/i2c.c</PathWithFileName>
       <FilenameWithoutPath>i2c.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
@@ -352,7 +394,7 @@
     </File>
     <File>
       <GroupNumber>2</GroupNumber>
-      <FileNumber>5</FileNumber>
+      <FileNumber>6</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -364,7 +406,7 @@
     </File>
     <File>
       <GroupNumber>2</GroupNumber>
-      <FileNumber>6</FileNumber>
+      <FileNumber>7</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -376,7 +418,7 @@
     </File>
     <File>
       <GroupNumber>2</GroupNumber>
-      <FileNumber>7</FileNumber>
+      <FileNumber>8</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -388,7 +430,7 @@
     </File>
     <File>
       <GroupNumber>2</GroupNumber>
-      <FileNumber>8</FileNumber>
+      <FileNumber>9</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -400,7 +442,7 @@
     </File>
     <File>
       <GroupNumber>2</GroupNumber>
-      <FileNumber>9</FileNumber>
+      <FileNumber>10</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -420,7 +462,7 @@
     <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>3</GroupNumber>
-      <FileNumber>10</FileNumber>
+      <FileNumber>11</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -432,7 +474,7 @@
     </File>
     <File>
       <GroupNumber>3</GroupNumber>
-      <FileNumber>11</FileNumber>
+      <FileNumber>12</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -444,7 +486,7 @@
     </File>
     <File>
       <GroupNumber>3</GroupNumber>
-      <FileNumber>12</FileNumber>
+      <FileNumber>13</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -456,7 +498,7 @@
     </File>
     <File>
       <GroupNumber>3</GroupNumber>
-      <FileNumber>13</FileNumber>
+      <FileNumber>14</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -468,7 +510,7 @@
     </File>
     <File>
       <GroupNumber>3</GroupNumber>
-      <FileNumber>14</FileNumber>
+      <FileNumber>15</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -480,7 +522,7 @@
     </File>
     <File>
       <GroupNumber>3</GroupNumber>
-      <FileNumber>15</FileNumber>
+      <FileNumber>16</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -492,7 +534,7 @@
     </File>
     <File>
       <GroupNumber>3</GroupNumber>
-      <FileNumber>16</FileNumber>
+      <FileNumber>17</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -504,7 +546,7 @@
     </File>
     <File>
       <GroupNumber>3</GroupNumber>
-      <FileNumber>17</FileNumber>
+      <FileNumber>18</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -516,7 +558,7 @@
     </File>
     <File>
       <GroupNumber>3</GroupNumber>
-      <FileNumber>18</FileNumber>
+      <FileNumber>19</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -528,7 +570,7 @@
     </File>
     <File>
       <GroupNumber>3</GroupNumber>
-      <FileNumber>19</FileNumber>
+      <FileNumber>20</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -540,7 +582,7 @@
     </File>
     <File>
       <GroupNumber>3</GroupNumber>
-      <FileNumber>20</FileNumber>
+      <FileNumber>21</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -552,7 +594,7 @@
     </File>
     <File>
       <GroupNumber>3</GroupNumber>
-      <FileNumber>21</FileNumber>
+      <FileNumber>22</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -564,7 +606,7 @@
     </File>
     <File>
       <GroupNumber>3</GroupNumber>
-      <FileNumber>22</FileNumber>
+      <FileNumber>23</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -576,7 +618,7 @@
     </File>
     <File>
       <GroupNumber>3</GroupNumber>
-      <FileNumber>23</FileNumber>
+      <FileNumber>24</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -588,7 +630,7 @@
     </File>
     <File>
       <GroupNumber>3</GroupNumber>
-      <FileNumber>24</FileNumber>
+      <FileNumber>25</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -600,7 +642,7 @@
     </File>
     <File>
       <GroupNumber>3</GroupNumber>
-      <FileNumber>25</FileNumber>
+      <FileNumber>26</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -620,7 +662,7 @@
     <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>4</GroupNumber>
-      <FileNumber>26</FileNumber>
+      <FileNumber>27</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -640,7 +682,7 @@
     <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>27</FileNumber>
+      <FileNumber>28</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -652,7 +694,7 @@
     </File>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>28</FileNumber>
+      <FileNumber>29</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -664,7 +706,7 @@
     </File>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>29</FileNumber>
+      <FileNumber>30</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -676,7 +718,7 @@
     </File>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>30</FileNumber>
+      <FileNumber>31</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -688,7 +730,7 @@
     </File>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>31</FileNumber>
+      <FileNumber>32</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -700,7 +742,7 @@
     </File>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>32</FileNumber>
+      <FileNumber>33</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -712,7 +754,7 @@
     </File>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>33</FileNumber>
+      <FileNumber>34</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -724,7 +766,7 @@
     </File>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>34</FileNumber>
+      <FileNumber>35</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -736,7 +778,7 @@
     </File>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>35</FileNumber>
+      <FileNumber>36</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -748,7 +790,7 @@
     </File>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>36</FileNumber>
+      <FileNumber>37</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -760,7 +802,7 @@
     </File>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>37</FileNumber>
+      <FileNumber>38</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -772,7 +814,7 @@
     </File>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>38</FileNumber>
+      <FileNumber>39</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -784,7 +826,7 @@
     </File>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>39</FileNumber>
+      <FileNumber>40</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>

MDK-ARM/mfps.uvprojx

@@ -341,7 +341,7 @@
               <MiscControls></MiscControls>
               <Define>STM32F103xE,USE_HAL_DRIVER</Define>
               <Undefine></Undefine>
-              <IncludePath>../Drivers/STM32F1xx_HAL_Driver/Inc;../Drivers/CMSIS/Device/ST/STM32F1xx/Include;../Drivers/CMSIS/Include;../Drivers/STM32F1xx_HAL_Driver/Inc/Legacy;..\Inc;..\Src;..\App\Inc;..\App\Src</IncludePath>
+              <IncludePath>../Drivers/STM32F1xx_HAL_Driver/Inc;../Drivers/CMSIS/Device/ST/STM32F1xx/Include;../Drivers/CMSIS/Include;../Drivers/STM32F1xx_HAL_Driver/Inc/Legacy;../Inc;../Src;../App/Inc;../App/Src</IncludePath>
             </VariousControls>
           </Cads>
           <Aads>
@@ -405,6 +405,62 @@
               <FileType>1</FileType>
               <FilePath>../Src/gpio.c</FilePath>
             </File>
+            <File>
+              <FileName>dma.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/dma.c</FilePath>
+              <FileOption>
+                <CommonProperty>
+                  <UseCPPCompiler>2</UseCPPCompiler>
+                  <RVCTCodeConst>0</RVCTCodeConst>
+                  <RVCTZI>0</RVCTZI>
+                  <RVCTOtherData>0</RVCTOtherData>
+                  <ModuleSelection>0</ModuleSelection>
+                  <IncludeInBuild>1</IncludeInBuild>
+                  <AlwaysBuild>2</AlwaysBuild>
+                  <GenerateAssemblyFile>2</GenerateAssemblyFile>
+                  <AssembleAssemblyFile>2</AssembleAssemblyFile>
+                  <PublicsOnly>2</PublicsOnly>
+                  <StopOnExitCode>11</StopOnExitCode>
+                  <CustomArgument></CustomArgument>
+                  <IncludeLibraryModules></IncludeLibraryModules>
+                  <ComprImg>1</ComprImg>
+                </CommonProperty>
+                <FileArmAds>
+                  <Cads>
+                    <interw>2</interw>
+                    <Optim>0</Optim>
+                    <oTime>2</oTime>
+                    <SplitLS>2</SplitLS>
+                    <OneElfS>2</OneElfS>
+                    <Strict>2</Strict>
+                    <EnumInt>2</EnumInt>
+                    <PlainCh>2</PlainCh>
+                    <Ropi>2</Ropi>
+                    <Rwpi>2</Rwpi>
+                    <wLevel>0</wLevel>
+                    <uThumb>2</uThumb>
+                    <uSurpInc>2</uSurpInc>
+                    <uC99>2</uC99>
+                    <uGnu>2</uGnu>
+                    <useXO>2</useXO>
+                    <v6Lang>0</v6Lang>
+                    <v6LangP>0</v6LangP>
+                    <vShortEn>2</vShortEn>
+                    <vShortWch>2</vShortWch>
+                    <v6Lto>2</v6Lto>
+                    <v6WtE>2</v6WtE>
+                    <v6Rtti>2</v6Rtti>
+                    <VariousControls>
+                      <MiscControls></MiscControls>
+                      <Define></Define>
+                      <Undefine></Undefine>
+                      <IncludePath></IncludePath>
+                    </VariousControls>
+                  </Cads>
+                </FileArmAds>
+              </FileOption>
+            </File>
             <File>
               <FileName>i2c.c</FileName>
               <FileType>1</FileType>

MDK-ARM/mfps/ads1220.d

@@ -1,7 +1,7 @@
 mfps\ads1220.o: ..\App\Src\ads1220.c
-mfps\ads1220.o: ..\App\Inc\ads1220.h
+mfps\ads1220.o: ../App/Inc/ads1220.h
 mfps\ads1220.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal.h
-mfps\ads1220.o: ..\Inc\stm32f1xx_hal_conf.h
+mfps\ads1220.o: ../Inc/stm32f1xx_hal_conf.h
 mfps\ads1220.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rcc.h
 mfps\ads1220.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_def.h
 mfps\ads1220.o: ../Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f1xx.h
@@ -30,24 +30,24 @@ mfps\ads1220.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_spi.h
 mfps\ads1220.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_tim.h
 mfps\ads1220.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_tim_ex.h
 mfps\ads1220.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_uart.h
-mfps\ads1220.o: ..\Inc\app.h
+mfps\ads1220.o: ../Inc/app.h
-mfps\ads1220.o: ..\App\Inc\serial_port.h
+mfps\ads1220.o: ../App/Inc/serial_port.h
-mfps\ads1220.o: ..\App\Inc\m1820.h
+mfps\ads1220.o: ../App/Inc/m1820.h
-mfps\ads1220.o: ..\Inc\main.h
+mfps\ads1220.o: ../Inc/main.h
-mfps\ads1220.o: ..\App\Inc\oled.h
+mfps\ads1220.o: ../App/Inc/oled.h
-mfps\ads1220.o: ..\App\Inc\MyLib.h
+mfps\ads1220.o: ../App/Inc/MyLib.h
-mfps\ads1220.o: ..\App\Inc\oled2.h
+mfps\ads1220.o: ../App/Inc/oled2.h
 mfps\ads1220.o: E:\Softwares\Keil_v5\ARM\ARMCC\Bin\..\include\inttypes.h
-mfps\ads1220.o: ..\App\Inc\tmc5160.h
+mfps\ads1220.o: ../App/Inc/tmc5160.h
-mfps\ads1220.o: ..\Inc\i2c.h
+mfps\ads1220.o: ../Inc/i2c.h
-mfps\ads1220.o: ..\Inc\spi.h
+mfps\ads1220.o: ../Inc/spi.h
-mfps\ads1220.o: ..\Inc\tim.h
+mfps\ads1220.o: ../Inc/tim.h
-mfps\ads1220.o: ..\Inc\usart.h
+mfps\ads1220.o: ../Inc/usart.h
-mfps\ads1220.o: ..\Inc\Uart1.h
+mfps\ads1220.o: ../Inc/Uart1.h
-mfps\ads1220.o: ..\Inc\gpio.h
+mfps\ads1220.o: ../Inc/gpio.h
-mfps\ads1220.o: ..\App\Inc\key.h
+mfps\ads1220.o: ../App/Inc/key.h
-mfps\ads1220.o: ..\App\Inc\motor.h
+mfps\ads1220.o: ../App/Inc/motor.h
-mfps\ads1220.o: ..\App\Inc\delay.h
+mfps\ads1220.o: ../App/Inc/delay.h
 mfps\ads1220.o: E:\Softwares\Keil_v5\ARM\ARMCC\Bin\..\include\stdio.h
 mfps\ads1220.o: E:\Softwares\Keil_v5\ARM\ARMCC\Bin\..\include\stdlib.h
 mfps\ads1220.o: E:\Softwares\Keil_v5\ARM\ARMCC\Bin\..\include\string.h

MDK-ARM/mfps/app.d

@@ -1,10 +1,10 @@
 mfps\app.o: ..\App\Src\app.c
-mfps\app.o: ..\Inc\app.h
+mfps\app.o: ../Inc/app.h
-mfps\app.o: ..\App\Inc\serial_port.h
+mfps\app.o: ../App/Inc/serial_port.h
-mfps\app.o: ..\App\Inc\m1820.h
+mfps\app.o: ../App/Inc/m1820.h
-mfps\app.o: ..\Inc\main.h
+mfps\app.o: ../Inc/main.h
 mfps\app.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal.h
-mfps\app.o: ..\Inc\stm32f1xx_hal_conf.h
+mfps\app.o: ../Inc/stm32f1xx_hal_conf.h
 mfps\app.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rcc.h
 mfps\app.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_def.h
 mfps\app.o: ../Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f1xx.h
@@ -33,21 +33,21 @@ mfps\app.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_spi.h
 mfps\app.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_tim.h
 mfps\app.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_tim_ex.h
 mfps\app.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_uart.h
-mfps\app.o: ..\App\Inc\oled.h
+mfps\app.o: ../App/Inc/oled.h
-mfps\app.o: ..\App\Inc\MyLib.h
+mfps\app.o: ../App/Inc/MyLib.h
-mfps\app.o: ..\App\Inc\oled2.h
+mfps\app.o: ../App/Inc/oled2.h
 mfps\app.o: E:\Softwares\Keil_v5\ARM\ARMCC\Bin\..\include\inttypes.h
-mfps\app.o: ..\App\Inc\ads1220.h
+mfps\app.o: ../App/Inc/ads1220.h
-mfps\app.o: ..\App\Inc\tmc5160.h
+mfps\app.o: ../App/Inc/tmc5160.h
-mfps\app.o: ..\Inc\i2c.h
+mfps\app.o: ../Inc/i2c.h
-mfps\app.o: ..\Inc\spi.h
+mfps\app.o: ../Inc/spi.h
-mfps\app.o: ..\Inc\tim.h
+mfps\app.o: ../Inc/tim.h
-mfps\app.o: ..\Inc\usart.h
+mfps\app.o: ../Inc/usart.h
-mfps\app.o: ..\Inc\Uart1.h
+mfps\app.o: ../Inc/Uart1.h
-mfps\app.o: ..\Inc\gpio.h
+mfps\app.o: ../Inc/gpio.h
-mfps\app.o: ..\App\Inc\key.h
+mfps\app.o: ../App/Inc/key.h
-mfps\app.o: ..\App\Inc\motor.h
+mfps\app.o: ../App/Inc/motor.h
-mfps\app.o: ..\App\Inc\delay.h
+mfps\app.o: ../App/Inc/delay.h
 mfps\app.o: E:\Softwares\Keil_v5\ARM\ARMCC\Bin\..\include\stdio.h
 mfps\app.o: E:\Softwares\Keil_v5\ARM\ARMCC\Bin\..\include\stdlib.h
 mfps\app.o: E:\Softwares\Keil_v5\ARM\ARMCC\Bin\..\include\string.h

MDK-ARM/mfps/delay.d

@@ -1,8 +1,8 @@
 mfps\delay.o: ..\App\Src\delay.c
-mfps\delay.o: ..\App\Inc\delay.h
+mfps\delay.o: ../App/Inc/delay.h
-mfps\delay.o: ..\Inc\main.h
+mfps\delay.o: ../Inc/main.h
 mfps\delay.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal.h
-mfps\delay.o: ..\Inc\stm32f1xx_hal_conf.h
+mfps\delay.o: ../Inc/stm32f1xx_hal_conf.h
 mfps\delay.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rcc.h
 mfps\delay.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_def.h
 mfps\delay.o: ../Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f1xx.h
@@ -31,23 +31,23 @@ mfps\delay.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_spi.h
 mfps\delay.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_tim.h
 mfps\delay.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_tim_ex.h
 mfps\delay.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_uart.h
-mfps\delay.o: ..\Inc\tim.h
+mfps\delay.o: ../Inc/app.h
-mfps\delay.o: ..\Inc\app.h
+mfps\delay.o: ../App/Inc/serial_port.h
-mfps\delay.o: ..\App\Inc\serial_port.h
+mfps\delay.o: ../App/Inc/m1820.h
-mfps\delay.o: ..\App\Inc\m1820.h
+mfps\delay.o: ../App/Inc/oled.h
-mfps\delay.o: ..\App\Inc\oled.h
+mfps\delay.o: ../App/Inc/MyLib.h
-mfps\delay.o: ..\App\Inc\MyLib.h
+mfps\delay.o: ../App/Inc/oled2.h
-mfps\delay.o: ..\App\Inc\oled2.h
 mfps\delay.o: E:\Softwares\Keil_v5\ARM\ARMCC\Bin\..\include\inttypes.h
-mfps\delay.o: ..\App\Inc\ads1220.h
+mfps\delay.o: ../App/Inc/ads1220.h
-mfps\delay.o: ..\App\Inc\tmc5160.h
+mfps\delay.o: ../App/Inc/tmc5160.h
-mfps\delay.o: ..\Inc\i2c.h
+mfps\delay.o: ../Inc/i2c.h
-mfps\delay.o: ..\Inc\spi.h
+mfps\delay.o: ../Inc/spi.h
-mfps\delay.o: ..\Inc\usart.h
+mfps\delay.o: ../Inc/tim.h
-mfps\delay.o: ..\Inc\Uart1.h
+mfps\delay.o: ../Inc/usart.h
-mfps\delay.o: ..\Inc\gpio.h
+mfps\delay.o: ../Inc/Uart1.h
-mfps\delay.o: ..\App\Inc\key.h
+mfps\delay.o: ../Inc/gpio.h
-mfps\delay.o: ..\App\Inc\motor.h
+mfps\delay.o: ../App/Inc/key.h
+mfps\delay.o: ../App/Inc/motor.h
 mfps\delay.o: E:\Softwares\Keil_v5\ARM\ARMCC\Bin\..\include\stdio.h
 mfps\delay.o: E:\Softwares\Keil_v5\ARM\ARMCC\Bin\..\include\stdlib.h
 mfps\delay.o: E:\Softwares\Keil_v5\ARM\ARMCC\Bin\..\include\string.h

MDK-ARM/mfps/dma.d

@@ -0,0 +1,33 @@
+mfps\dma.o: ../Src/dma.c
+mfps\dma.o: ../Inc/dma.h
+mfps\dma.o: ../Inc/main.h
+mfps\dma.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal.h
+mfps\dma.o: ../Inc/stm32f1xx_hal_conf.h
+mfps\dma.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rcc.h
+mfps\dma.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_def.h
+mfps\dma.o: ../Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f1xx.h
+mfps\dma.o: ../Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f103xe.h
+mfps\dma.o: ../Drivers/CMSIS/Include/core_cm3.h
+mfps\dma.o: E:\Softwares\Keil_v5\ARM\ARMCC\Bin\..\include\stdint.h
+mfps\dma.o: ../Drivers/CMSIS/Include/cmsis_version.h
+mfps\dma.o: ../Drivers/CMSIS/Include/cmsis_compiler.h
+mfps\dma.o: ../Drivers/CMSIS/Include/cmsis_armcc.h
+mfps\dma.o: ../Drivers/CMSIS/Device/ST/STM32F1xx/Include/system_stm32f1xx.h
+mfps\dma.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal.h
+mfps\dma.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/Legacy/stm32_hal_legacy.h
+mfps\dma.o: E:\Softwares\Keil_v5\ARM\ARMCC\Bin\..\include\stddef.h
+mfps\dma.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rcc_ex.h
+mfps\dma.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_gpio.h
+mfps\dma.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_gpio_ex.h
+mfps\dma.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_exti.h
+mfps\dma.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_dma.h
+mfps\dma.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_dma_ex.h
+mfps\dma.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_cortex.h
+mfps\dma.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_flash.h
+mfps\dma.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_flash_ex.h
+mfps\dma.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_i2c.h
+mfps\dma.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_pwr.h
+mfps\dma.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_spi.h
+mfps\dma.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_tim.h
+mfps\dma.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_tim_ex.h
+mfps\dma.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_uart.h

MDK-ARM/mfps/gpio.d

@@ -1,8 +1,8 @@
 mfps\gpio.o: ../Src/gpio.c
-mfps\gpio.o: ..\Inc\gpio.h
+mfps\gpio.o: ../Inc/gpio.h
-mfps\gpio.o: ..\Inc\main.h
+mfps\gpio.o: ../Inc/main.h
 mfps\gpio.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal.h
-mfps\gpio.o: ..\Inc\stm32f1xx_hal_conf.h
+mfps\gpio.o: ../Inc/stm32f1xx_hal_conf.h
 mfps\gpio.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rcc.h
 mfps\gpio.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_def.h
 mfps\gpio.o: ../Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f1xx.h

MDK-ARM/mfps/i2c.d

@@ -1,8 +1,8 @@
 mfps\i2c.o: ../Src/i2c.c
-mfps\i2c.o: ..\Inc\i2c.h
+mfps\i2c.o: ../Inc/i2c.h
-mfps\i2c.o: ..\Inc\main.h
+mfps\i2c.o: ../Inc/main.h
 mfps\i2c.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal.h
-mfps\i2c.o: ..\Inc\stm32f1xx_hal_conf.h
+mfps\i2c.o: ../Inc/stm32f1xx_hal_conf.h
 mfps\i2c.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rcc.h
 mfps\i2c.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_def.h
 mfps\i2c.o: ../Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f1xx.h

MDK-ARM/mfps/key.d

@@ -1,8 +1,8 @@
 mfps\key.o: ..\App\Src\key.c
-mfps\key.o: ..\App\Inc\key.h
+mfps\key.o: ../App/Inc/key.h
-mfps\key.o: ..\Inc\main.h
+mfps\key.o: ../Inc/main.h
 mfps\key.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal.h
-mfps\key.o: ..\Inc\stm32f1xx_hal_conf.h
+mfps\key.o: ../Inc/stm32f1xx_hal_conf.h
 mfps\key.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rcc.h
 mfps\key.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_def.h
 mfps\key.o: ../Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f1xx.h
@@ -31,23 +31,23 @@ mfps\key.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_spi.h
 mfps\key.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_tim.h
 mfps\key.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_tim_ex.h
 mfps\key.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_uart.h
-mfps\key.o: ..\App\Inc\tmc5160.h
+mfps\key.o: ../Inc/app.h
-mfps\key.o: ..\App\Inc\delay.h
+mfps\key.o: ../App/Inc/serial_port.h
-mfps\key.o: ..\Inc\app.h
+mfps\key.o: ../App/Inc/m1820.h
-mfps\key.o: ..\App\Inc\serial_port.h
+mfps\key.o: ../App/Inc/oled.h
-mfps\key.o: ..\App\Inc\m1820.h
+mfps\key.o: ../App/Inc/MyLib.h
-mfps\key.o: ..\App\Inc\oled.h
+mfps\key.o: ../App/Inc/oled2.h
-mfps\key.o: ..\App\Inc\MyLib.h
-mfps\key.o: ..\App\Inc\oled2.h
 mfps\key.o: E:\Softwares\Keil_v5\ARM\ARMCC\Bin\..\include\inttypes.h
-mfps\key.o: ..\App\Inc\ads1220.h
+mfps\key.o: ../App/Inc/ads1220.h
-mfps\key.o: ..\Inc\i2c.h
+mfps\key.o: ../App/Inc/tmc5160.h
-mfps\key.o: ..\Inc\spi.h
+mfps\key.o: ../Inc/i2c.h
-mfps\key.o: ..\Inc\tim.h
+mfps\key.o: ../Inc/spi.h
-mfps\key.o: ..\Inc\usart.h
+mfps\key.o: ../Inc/tim.h
-mfps\key.o: ..\Inc\Uart1.h
+mfps\key.o: ../Inc/usart.h
-mfps\key.o: ..\Inc\gpio.h
+mfps\key.o: ../Inc/Uart1.h
-mfps\key.o: ..\App\Inc\motor.h
+mfps\key.o: ../Inc/gpio.h
+mfps\key.o: ../App/Inc/motor.h
+mfps\key.o: ../App/Inc/delay.h
 mfps\key.o: E:\Softwares\Keil_v5\ARM\ARMCC\Bin\..\include\stdio.h
 mfps\key.o: E:\Softwares\Keil_v5\ARM\ARMCC\Bin\..\include\stdlib.h
 mfps\key.o: E:\Softwares\Keil_v5\ARM\ARMCC\Bin\..\include\string.h

MDK-ARM/mfps/m1820.d

@@ -1,8 +1,8 @@
 mfps\m1820.o: ..\App\Src\m1820.c
-mfps\m1820.o: ..\App\Inc\m1820.h
+mfps\m1820.o: ../App/Inc/m1820.h
-mfps\m1820.o: ..\Inc\main.h
+mfps\m1820.o: ../Inc/main.h
 mfps\m1820.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal.h
-mfps\m1820.o: ..\Inc\stm32f1xx_hal_conf.h
+mfps\m1820.o: ../Inc/stm32f1xx_hal_conf.h
 mfps\m1820.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rcc.h
 mfps\m1820.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_def.h
 mfps\m1820.o: ../Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f1xx.h
@@ -31,4 +31,23 @@ mfps\m1820.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_spi.h
 mfps\m1820.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_tim.h
 mfps\m1820.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_tim_ex.h
 mfps\m1820.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_uart.h
-mfps\m1820.o: ..\App\Inc\delay.h
+mfps\m1820.o: ../Inc/app.h
+mfps\m1820.o: ../App/Inc/serial_port.h
+mfps\m1820.o: ../App/Inc/oled.h
+mfps\m1820.o: ../App/Inc/MyLib.h
+mfps\m1820.o: ../App/Inc/oled2.h
+mfps\m1820.o: E:\Softwares\Keil_v5\ARM\ARMCC\Bin\..\include\inttypes.h
+mfps\m1820.o: ../App/Inc/ads1220.h
+mfps\m1820.o: ../App/Inc/tmc5160.h
+mfps\m1820.o: ../Inc/i2c.h
+mfps\m1820.o: ../Inc/spi.h
+mfps\m1820.o: ../Inc/tim.h
+mfps\m1820.o: ../Inc/usart.h
+mfps\m1820.o: ../Inc/Uart1.h
+mfps\m1820.o: ../Inc/gpio.h
+mfps\m1820.o: ../App/Inc/key.h
+mfps\m1820.o: ../App/Inc/motor.h
+mfps\m1820.o: ../App/Inc/delay.h
+mfps\m1820.o: E:\Softwares\Keil_v5\ARM\ARMCC\Bin\..\include\stdio.h
+mfps\m1820.o: E:\Softwares\Keil_v5\ARM\ARMCC\Bin\..\include\stdlib.h
+mfps\m1820.o: E:\Softwares\Keil_v5\ARM\ARMCC\Bin\..\include\string.h

MDK-ARM/mfps/main.d

@@ -1,7 +1,7 @@
 mfps\main.o: ../Src/main.c
-mfps\main.o: ..\Inc\main.h
+mfps\main.o: ../Inc/main.h
 mfps\main.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal.h
-mfps\main.o: ..\Inc\stm32f1xx_hal_conf.h
+mfps\main.o: ../Inc/stm32f1xx_hal_conf.h
 mfps\main.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rcc.h
 mfps\main.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_def.h
 mfps\main.o: ../Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f1xx.h
@@ -30,24 +30,25 @@ mfps\main.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_spi.h
 mfps\main.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_tim.h
 mfps\main.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_tim_ex.h
 mfps\main.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_uart.h
-mfps\main.o: ..\Inc\i2c.h
+mfps\main.o: ../Inc/dma.h
-mfps\main.o: ..\Inc\spi.h
+mfps\main.o: ../Inc/i2c.h
-mfps\main.o: ..\Inc\tim.h
+mfps\main.o: ../Inc/spi.h
-mfps\main.o: ..\Inc\usart.h
+mfps\main.o: ../Inc/tim.h
-mfps\main.o: ..\Inc\gpio.h
+mfps\main.o: ../Inc/usart.h
-mfps\main.o: ..\Inc\app.h
+mfps\main.o: ../Inc/gpio.h
-mfps\main.o: ..\App\Inc\serial_port.h
+mfps\main.o: ../Inc/app.h
-mfps\main.o: ..\App\Inc\m1820.h
+mfps\main.o: ../App/Inc/serial_port.h
-mfps\main.o: ..\App\Inc\oled.h
+mfps\main.o: ../App/Inc/m1820.h
-mfps\main.o: ..\App\Inc\MyLib.h
+mfps\main.o: ../App/Inc/oled.h
-mfps\main.o: ..\App\Inc\oled2.h
+mfps\main.o: ../App/Inc/MyLib.h
+mfps\main.o: ../App/Inc/oled2.h
 mfps\main.o: E:\Softwares\Keil_v5\ARM\ARMCC\Bin\..\include\inttypes.h
-mfps\main.o: ..\App\Inc\ads1220.h
+mfps\main.o: ../App/Inc/ads1220.h
-mfps\main.o: ..\App\Inc\tmc5160.h
+mfps\main.o: ../App/Inc/tmc5160.h
-mfps\main.o: ..\Inc\Uart1.h
+mfps\main.o: ../Inc/Uart1.h
-mfps\main.o: ..\App\Inc\key.h
+mfps\main.o: ../App/Inc/key.h
-mfps\main.o: ..\App\Inc\motor.h
+mfps\main.o: ../App/Inc/motor.h
-mfps\main.o: ..\App\Inc\delay.h
+mfps\main.o: ../App/Inc/delay.h
 mfps\main.o: E:\Softwares\Keil_v5\ARM\ARMCC\Bin\..\include\stdio.h
 mfps\main.o: E:\Softwares\Keil_v5\ARM\ARMCC\Bin\..\include\stdlib.h
 mfps\main.o: E:\Softwares\Keil_v5\ARM\ARMCC\Bin\..\include\string.h

MDK-ARM/mfps/mfps.build_log.htm

@@ -21,15 +21,15 @@ Target DLL:      STLink\ST-LINKIII-KEIL_SWO.dll V3.2.0.0
 Dialog DLL:      TCM.DLL V1.56.4.0
  
 <h2>Project:</h2>
-F:\Desktop\Work\2024.05\2024.05.01\mfps\MDK-ARM\mfps.uvprojx
+F:\Desktop\Work\2024.05\2024.05.09\mfps\MDK-ARM\mfps.uvprojx
-Project File Date:  05/06/2024
+Project File Date:  05/09/2024
 
 <h2>Output:</h2>
 *** Using Compiler 'V5.06 update 7 (build 960)', folder: 'E:\Softwares\Keil_v5\ARM\ARMCC\Bin'
 Build target 'mfps'
-compiling oled2.c...
+compiling app.c...
 linking...
-Program Size: Code=27190 RO-data=2626 RW-data=324 ZI-data=2276  
+Program Size: Code=29474 RO-data=2626 RW-data=356 ZI-data=2356  
 FromELF: creating hex file...
 "mfps\mfps.axf" - 0 Error(s), 0 Warning(s).
 

MDK-ARM/mfps/mfps.lnp

@@ -2,6 +2,7 @@
 "mfps\startup_stm32f103xe.o"
 "mfps\main.o"
 "mfps\gpio.o"
+"mfps\dma.o"
 "mfps\i2c.o"
 "mfps\spi.o"
 "mfps\tim.o"

MDK-ARM/mfps/misc.d

@@ -1,7 +1,7 @@
 mfps\misc.o: ..\App\Src\misc.c
-mfps\misc.o: ..\Inc\misc.h
+mfps\misc.o: ../Inc/misc.h
 mfps\misc.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal.h
-mfps\misc.o: ..\Inc\stm32f1xx_hal_conf.h
+mfps\misc.o: ../Inc/stm32f1xx_hal_conf.h
 mfps\misc.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rcc.h
 mfps\misc.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_def.h
 mfps\misc.o: ../Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f1xx.h

MDK-ARM/mfps/motor.d

@@ -1,8 +1,8 @@
 mfps\motor.o: ..\App\Src\motor.c
-mfps\motor.o: ..\App\Inc\motor.h
+mfps\motor.o: ../App/Inc/motor.h
-mfps\motor.o: ..\Inc\main.h
+mfps\motor.o: ../Inc/main.h
 mfps\motor.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal.h
-mfps\motor.o: ..\Inc\stm32f1xx_hal_conf.h
+mfps\motor.o: ../Inc/stm32f1xx_hal_conf.h
 mfps\motor.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rcc.h
 mfps\motor.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_def.h
 mfps\motor.o: ../Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f1xx.h
@@ -31,23 +31,23 @@ mfps\motor.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_spi.h
 mfps\motor.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_tim.h
 mfps\motor.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_tim_ex.h
 mfps\motor.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_uart.h
-mfps\motor.o: ..\Inc\app.h
+mfps\motor.o: ../Inc/app.h
-mfps\motor.o: ..\App\Inc\serial_port.h
+mfps\motor.o: ../App/Inc/serial_port.h
-mfps\motor.o: ..\App\Inc\m1820.h
+mfps\motor.o: ../App/Inc/m1820.h
-mfps\motor.o: ..\App\Inc\oled.h
+mfps\motor.o: ../App/Inc/oled.h
-mfps\motor.o: ..\App\Inc\MyLib.h
+mfps\motor.o: ../App/Inc/MyLib.h
-mfps\motor.o: ..\App\Inc\oled2.h
+mfps\motor.o: ../App/Inc/oled2.h
 mfps\motor.o: E:\Softwares\Keil_v5\ARM\ARMCC\Bin\..\include\inttypes.h
-mfps\motor.o: ..\App\Inc\ads1220.h
+mfps\motor.o: ../App/Inc/ads1220.h
-mfps\motor.o: ..\App\Inc\tmc5160.h
+mfps\motor.o: ../App/Inc/tmc5160.h
-mfps\motor.o: ..\Inc\i2c.h
+mfps\motor.o: ../Inc/i2c.h
-mfps\motor.o: ..\Inc\spi.h
+mfps\motor.o: ../Inc/spi.h
-mfps\motor.o: ..\Inc\tim.h
+mfps\motor.o: ../Inc/tim.h
-mfps\motor.o: ..\Inc\usart.h
+mfps\motor.o: ../Inc/usart.h
-mfps\motor.o: ..\Inc\Uart1.h
+mfps\motor.o: ../Inc/Uart1.h
-mfps\motor.o: ..\Inc\gpio.h
+mfps\motor.o: ../Inc/gpio.h
-mfps\motor.o: ..\App\Inc\key.h
+mfps\motor.o: ../App/Inc/key.h
-mfps\motor.o: ..\App\Inc\delay.h
+mfps\motor.o: ../App/Inc/delay.h
 mfps\motor.o: E:\Softwares\Keil_v5\ARM\ARMCC\Bin\..\include\stdio.h
 mfps\motor.o: E:\Softwares\Keil_v5\ARM\ARMCC\Bin\..\include\stdlib.h
 mfps\motor.o: E:\Softwares\Keil_v5\ARM\ARMCC\Bin\..\include\string.h

MDK-ARM/mfps/mylib.d

@@ -1,8 +1,8 @@
 mfps\mylib.o: ..\App\Src\myLib.c
-mfps\mylib.o: ..\App\Inc\myLib.h
+mfps\mylib.o: ../App/Inc/myLib.h
-mfps\mylib.o: ..\Inc\main.h
+mfps\mylib.o: ../Inc/main.h
 mfps\mylib.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal.h
-mfps\mylib.o: ..\Inc\stm32f1xx_hal_conf.h
+mfps\mylib.o: ../Inc/stm32f1xx_hal_conf.h
 mfps\mylib.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rcc.h
 mfps\mylib.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_def.h
 mfps\mylib.o: ../Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f1xx.h

MDK-ARM/mfps/oled.d

@@ -1,8 +1,8 @@
 mfps\oled.o: ..\App\Src\oled.c
-mfps\oled.o: ..\App\Inc\oled.h
+mfps\oled.o: ../App/Inc/oled.h
-mfps\oled.o: ..\Inc\main.h
+mfps\oled.o: ../Inc/main.h
 mfps\oled.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal.h
-mfps\oled.o: ..\Inc\stm32f1xx_hal_conf.h
+mfps\oled.o: ../Inc/stm32f1xx_hal_conf.h
 mfps\oled.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rcc.h
 mfps\oled.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_def.h
 mfps\oled.o: ../Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f1xx.h
@@ -31,23 +31,23 @@ mfps\oled.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_spi.h
 mfps\oled.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_tim.h
 mfps\oled.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_tim_ex.h
 mfps\oled.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_uart.h
-mfps\oled.o: ..\App\Inc\MyLib.h
+mfps\oled.o: ../App/Inc/MyLib.h
-mfps\oled.o: ..\Inc\app.h
+mfps\oled.o: ../Inc/app.h
-mfps\oled.o: ..\App\Inc\serial_port.h
+mfps\oled.o: ../App/Inc/serial_port.h
-mfps\oled.o: ..\App\Inc\m1820.h
+mfps\oled.o: ../App/Inc/m1820.h
-mfps\oled.o: ..\App\Inc\oled2.h
+mfps\oled.o: ../App/Inc/oled2.h
 mfps\oled.o: E:\Softwares\Keil_v5\ARM\ARMCC\Bin\..\include\inttypes.h
-mfps\oled.o: ..\App\Inc\ads1220.h
+mfps\oled.o: ../App/Inc/ads1220.h
-mfps\oled.o: ..\App\Inc\tmc5160.h
+mfps\oled.o: ../App/Inc/tmc5160.h
-mfps\oled.o: ..\Inc\i2c.h
+mfps\oled.o: ../Inc/i2c.h
-mfps\oled.o: ..\Inc\spi.h
+mfps\oled.o: ../Inc/spi.h
-mfps\oled.o: ..\Inc\tim.h
+mfps\oled.o: ../Inc/tim.h
-mfps\oled.o: ..\Inc\usart.h
+mfps\oled.o: ../Inc/usart.h
-mfps\oled.o: ..\Inc\Uart1.h
+mfps\oled.o: ../Inc/Uart1.h
-mfps\oled.o: ..\Inc\gpio.h
+mfps\oled.o: ../Inc/gpio.h
-mfps\oled.o: ..\App\Inc\key.h
+mfps\oled.o: ../App/Inc/key.h
-mfps\oled.o: ..\App\Inc\motor.h
+mfps\oled.o: ../App/Inc/motor.h
-mfps\oled.o: ..\App\Inc\delay.h
+mfps\oled.o: ../App/Inc/delay.h
 mfps\oled.o: E:\Softwares\Keil_v5\ARM\ARMCC\Bin\..\include\stdio.h
 mfps\oled.o: E:\Softwares\Keil_v5\ARM\ARMCC\Bin\..\include\stdlib.h
 mfps\oled.o: E:\Softwares\Keil_v5\ARM\ARMCC\Bin\..\include\string.h

MDK-ARM/mfps/oled2.d

@@ -1,10 +1,10 @@
 mfps\oled2.o: ..\App\Src\oled2.c
-mfps\oled2.o: ..\App\Inc\oled2.h
+mfps\oled2.o: ../App/Inc/oled2.h
 mfps\oled2.o: E:\Softwares\Keil_v5\ARM\ARMCC\Bin\..\include\inttypes.h
 mfps\oled2.o: E:\Softwares\Keil_v5\ARM\ARMCC\Bin\..\include\stdint.h
-mfps\oled2.o: ..\Inc\main.h
+mfps\oled2.o: ../Inc/main.h
 mfps\oled2.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal.h
-mfps\oled2.o: ..\Inc\stm32f1xx_hal_conf.h
+mfps\oled2.o: ../Inc/stm32f1xx_hal_conf.h
 mfps\oled2.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rcc.h
 mfps\oled2.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_def.h
 mfps\oled2.o: ../Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f1xx.h
@@ -32,22 +32,22 @@ mfps\oled2.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_spi.h
 mfps\oled2.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_tim.h
 mfps\oled2.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_tim_ex.h
 mfps\oled2.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_uart.h
-mfps\oled2.o: ..\Inc\app.h
+mfps\oled2.o: ../Inc/app.h
-mfps\oled2.o: ..\App\Inc\serial_port.h
+mfps\oled2.o: ../App/Inc/serial_port.h
-mfps\oled2.o: ..\App\Inc\m1820.h
+mfps\oled2.o: ../App/Inc/m1820.h
-mfps\oled2.o: ..\App\Inc\oled.h
+mfps\oled2.o: ../App/Inc/oled.h
-mfps\oled2.o: ..\App\Inc\MyLib.h
+mfps\oled2.o: ../App/Inc/MyLib.h
-mfps\oled2.o: ..\App\Inc\ads1220.h
+mfps\oled2.o: ../App/Inc/ads1220.h
-mfps\oled2.o: ..\App\Inc\tmc5160.h
+mfps\oled2.o: ../App/Inc/tmc5160.h
-mfps\oled2.o: ..\Inc\i2c.h
+mfps\oled2.o: ../Inc/i2c.h
-mfps\oled2.o: ..\Inc\spi.h
+mfps\oled2.o: ../Inc/spi.h
-mfps\oled2.o: ..\Inc\tim.h
+mfps\oled2.o: ../Inc/tim.h
-mfps\oled2.o: ..\Inc\usart.h
+mfps\oled2.o: ../Inc/usart.h
-mfps\oled2.o: ..\Inc\Uart1.h
+mfps\oled2.o: ../Inc/Uart1.h
-mfps\oled2.o: ..\Inc\gpio.h
+mfps\oled2.o: ../Inc/gpio.h
-mfps\oled2.o: ..\App\Inc\key.h
+mfps\oled2.o: ../App/Inc/key.h
-mfps\oled2.o: ..\App\Inc\motor.h
+mfps\oled2.o: ../App/Inc/motor.h
-mfps\oled2.o: ..\App\Inc\delay.h
+mfps\oled2.o: ../App/Inc/delay.h
 mfps\oled2.o: E:\Softwares\Keil_v5\ARM\ARMCC\Bin\..\include\stdio.h
 mfps\oled2.o: E:\Softwares\Keil_v5\ARM\ARMCC\Bin\..\include\stdlib.h
 mfps\oled2.o: E:\Softwares\Keil_v5\ARM\ARMCC\Bin\..\include\string.h

MDK-ARM/mfps/serial_port.d

@@ -1,8 +1,8 @@
 mfps\serial_port.o: ..\App\Src\serial_port.c
-mfps\serial_port.o: ..\App\Inc\serial_port.h
+mfps\serial_port.o: ../App/Inc/serial_port.h
-mfps\serial_port.o: ..\Inc\main.h
+mfps\serial_port.o: ../Inc/main.h
 mfps\serial_port.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal.h
-mfps\serial_port.o: ..\Inc\stm32f1xx_hal_conf.h
+mfps\serial_port.o: ../Inc/stm32f1xx_hal_conf.h
 mfps\serial_port.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rcc.h
 mfps\serial_port.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_def.h
 mfps\serial_port.o: ../Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f1xx.h
@@ -31,24 +31,24 @@ mfps\serial_port.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_spi.h
 mfps\serial_port.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_tim.h
 mfps\serial_port.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_tim_ex.h
 mfps\serial_port.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_uart.h
-mfps\serial_port.o: ..\Inc\usart.h
+mfps\serial_port.o: ../Inc/usart.h
 mfps\serial_port.o: E:\Softwares\Keil_v5\ARM\ARMCC\Bin\..\include\string.h
-mfps\serial_port.o: ..\Inc\app.h
+mfps\serial_port.o: ../Inc/app.h
-mfps\serial_port.o: ..\App\Inc\m1820.h
+mfps\serial_port.o: ../App/Inc/m1820.h
-mfps\serial_port.o: ..\App\Inc\oled.h
+mfps\serial_port.o: ../App/Inc/oled.h
-mfps\serial_port.o: ..\App\Inc\MyLib.h
+mfps\serial_port.o: ../App/Inc/MyLib.h
-mfps\serial_port.o: ..\App\Inc\oled2.h
+mfps\serial_port.o: ../App/Inc/oled2.h
 mfps\serial_port.o: E:\Softwares\Keil_v5\ARM\ARMCC\Bin\..\include\inttypes.h
-mfps\serial_port.o: ..\App\Inc\ads1220.h
+mfps\serial_port.o: ../App/Inc/ads1220.h
-mfps\serial_port.o: ..\App\Inc\tmc5160.h
+mfps\serial_port.o: ../App/Inc/tmc5160.h
-mfps\serial_port.o: ..\Inc\i2c.h
+mfps\serial_port.o: ../Inc/i2c.h
-mfps\serial_port.o: ..\Inc\spi.h
+mfps\serial_port.o: ../Inc/spi.h
-mfps\serial_port.o: ..\Inc\tim.h
+mfps\serial_port.o: ../Inc/tim.h
-mfps\serial_port.o: ..\Inc\Uart1.h
+mfps\serial_port.o: ../Inc/Uart1.h
-mfps\serial_port.o: ..\Inc\gpio.h
+mfps\serial_port.o: ../Inc/gpio.h
-mfps\serial_port.o: ..\App\Inc\key.h
+mfps\serial_port.o: ../App/Inc/key.h
-mfps\serial_port.o: ..\App\Inc\motor.h
+mfps\serial_port.o: ../App/Inc/motor.h
-mfps\serial_port.o: ..\App\Inc\delay.h
+mfps\serial_port.o: ../App/Inc/delay.h
 mfps\serial_port.o: E:\Softwares\Keil_v5\ARM\ARMCC\Bin\..\include\stdio.h
 mfps\serial_port.o: E:\Softwares\Keil_v5\ARM\ARMCC\Bin\..\include\stdlib.h
-mfps\serial_port.o: ..\Inc\Uart1.h
+mfps\serial_port.o: ../Inc/Uart1.h

MDK-ARM/mfps/spi.d

@@ -1,8 +1,8 @@
 mfps\spi.o: ../Src/spi.c
-mfps\spi.o: ..\Inc\spi.h
+mfps\spi.o: ../Inc/spi.h
-mfps\spi.o: ..\Inc\main.h
+mfps\spi.o: ../Inc/main.h
 mfps\spi.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal.h
-mfps\spi.o: ..\Inc\stm32f1xx_hal_conf.h
+mfps\spi.o: ../Inc/stm32f1xx_hal_conf.h
 mfps\spi.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rcc.h
 mfps\spi.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_def.h
 mfps\spi.o: ../Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f1xx.h

MDK-ARM/mfps/stm32f1xx_hal.d

@@ -1,6 +1,6 @@
 mfps\stm32f1xx_hal.o: ../Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal.c
 mfps\stm32f1xx_hal.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal.h
-mfps\stm32f1xx_hal.o: ..\Inc\stm32f1xx_hal_conf.h
+mfps\stm32f1xx_hal.o: ../Inc/stm32f1xx_hal_conf.h
 mfps\stm32f1xx_hal.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rcc.h
 mfps\stm32f1xx_hal.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_def.h
 mfps\stm32f1xx_hal.o: ../Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f1xx.h

MDK-ARM/mfps/stm32f1xx_hal_cortex.d

@@ -1,6 +1,6 @@
 mfps\stm32f1xx_hal_cortex.o: ../Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_cortex.c
 mfps\stm32f1xx_hal_cortex.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal.h
-mfps\stm32f1xx_hal_cortex.o: ..\Inc\stm32f1xx_hal_conf.h
+mfps\stm32f1xx_hal_cortex.o: ../Inc/stm32f1xx_hal_conf.h
 mfps\stm32f1xx_hal_cortex.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rcc.h
 mfps\stm32f1xx_hal_cortex.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_def.h
 mfps\stm32f1xx_hal_cortex.o: ../Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f1xx.h

MDK-ARM/mfps/stm32f1xx_hal_dma.d

@@ -1,6 +1,6 @@
 mfps\stm32f1xx_hal_dma.o: ../Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_dma.c
 mfps\stm32f1xx_hal_dma.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal.h
-mfps\stm32f1xx_hal_dma.o: ..\Inc\stm32f1xx_hal_conf.h
+mfps\stm32f1xx_hal_dma.o: ../Inc/stm32f1xx_hal_conf.h
 mfps\stm32f1xx_hal_dma.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rcc.h
 mfps\stm32f1xx_hal_dma.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_def.h
 mfps\stm32f1xx_hal_dma.o: ../Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f1xx.h

MDK-ARM/mfps/stm32f1xx_hal_exti.d

@@ -1,6 +1,6 @@
 mfps\stm32f1xx_hal_exti.o: ../Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_exti.c
 mfps\stm32f1xx_hal_exti.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal.h
-mfps\stm32f1xx_hal_exti.o: ..\Inc\stm32f1xx_hal_conf.h
+mfps\stm32f1xx_hal_exti.o: ../Inc/stm32f1xx_hal_conf.h
 mfps\stm32f1xx_hal_exti.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rcc.h
 mfps\stm32f1xx_hal_exti.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_def.h
 mfps\stm32f1xx_hal_exti.o: ../Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f1xx.h

MDK-ARM/mfps/stm32f1xx_hal_flash.d

@@ -1,6 +1,6 @@
 mfps\stm32f1xx_hal_flash.o: ../Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_flash.c
 mfps\stm32f1xx_hal_flash.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal.h
-mfps\stm32f1xx_hal_flash.o: ..\Inc\stm32f1xx_hal_conf.h
+mfps\stm32f1xx_hal_flash.o: ../Inc/stm32f1xx_hal_conf.h
 mfps\stm32f1xx_hal_flash.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rcc.h
 mfps\stm32f1xx_hal_flash.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_def.h
 mfps\stm32f1xx_hal_flash.o: ../Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f1xx.h

MDK-ARM/mfps/stm32f1xx_hal_flash_ex.d

@@ -1,6 +1,6 @@
 mfps\stm32f1xx_hal_flash_ex.o: ../Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_flash_ex.c
 mfps\stm32f1xx_hal_flash_ex.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal.h
-mfps\stm32f1xx_hal_flash_ex.o: ..\Inc\stm32f1xx_hal_conf.h
+mfps\stm32f1xx_hal_flash_ex.o: ../Inc/stm32f1xx_hal_conf.h
 mfps\stm32f1xx_hal_flash_ex.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rcc.h
 mfps\stm32f1xx_hal_flash_ex.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_def.h
 mfps\stm32f1xx_hal_flash_ex.o: ../Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f1xx.h

MDK-ARM/mfps/stm32f1xx_hal_gpio.d

@@ -1,6 +1,6 @@
 mfps\stm32f1xx_hal_gpio.o: ../Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio.c
 mfps\stm32f1xx_hal_gpio.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal.h
-mfps\stm32f1xx_hal_gpio.o: ..\Inc\stm32f1xx_hal_conf.h
+mfps\stm32f1xx_hal_gpio.o: ../Inc/stm32f1xx_hal_conf.h
 mfps\stm32f1xx_hal_gpio.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rcc.h
 mfps\stm32f1xx_hal_gpio.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_def.h
 mfps\stm32f1xx_hal_gpio.o: ../Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f1xx.h

MDK-ARM/mfps/stm32f1xx_hal_gpio_ex.d

@@ -1,6 +1,6 @@
 mfps\stm32f1xx_hal_gpio_ex.o: ../Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio_ex.c
 mfps\stm32f1xx_hal_gpio_ex.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal.h
-mfps\stm32f1xx_hal_gpio_ex.o: ..\Inc\stm32f1xx_hal_conf.h
+mfps\stm32f1xx_hal_gpio_ex.o: ../Inc/stm32f1xx_hal_conf.h
 mfps\stm32f1xx_hal_gpio_ex.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rcc.h
 mfps\stm32f1xx_hal_gpio_ex.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_def.h
 mfps\stm32f1xx_hal_gpio_ex.o: ../Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f1xx.h

MDK-ARM/mfps/stm32f1xx_hal_i2c.d

@@ -1,6 +1,6 @@
 mfps\stm32f1xx_hal_i2c.o: ../Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_i2c.c
 mfps\stm32f1xx_hal_i2c.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal.h
-mfps\stm32f1xx_hal_i2c.o: ..\Inc\stm32f1xx_hal_conf.h
+mfps\stm32f1xx_hal_i2c.o: ../Inc/stm32f1xx_hal_conf.h
 mfps\stm32f1xx_hal_i2c.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rcc.h
 mfps\stm32f1xx_hal_i2c.o: ../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_def.h
 mfps\stm32f1xx_hal_i2c.o: ../Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f1xx.h