解决合并冲突: 统一配置和任务定义

.gitattributes

@@ -0,0 +1 @@
+* text=auto

.mxproject

@@ -43,4 +43,3 @@ SourceFiles#10=..\Core\Src\main.c
 SourceFolderListSize=1
 SourcePath#0=..\Core\Src
 SourceFiles=;
-

CMakeLists.txt

@@ -63,7 +63,6 @@ target_sources(${CMAKE_PROJECT_NAME} PRIVATE
     User/component/user_math.c
     User/component/crc16.c
     User/component/PowerControl.c
-# /home/shentou/workspace/SuperCap/god-yuan-hero/User/component/PowerControl.c
     # User/device sources
     User/device/dr16.c
     User/device/AT9S_Pro.c
@@ -73,7 +72,6 @@ target_sources(${CMAKE_PROJECT_NAME} PRIVATE
     User/device/motor_rm.c
     User/device/vofa.c
     User/device/supercap.c
-# /home/shentou/workspace/SuperCap/god-yuan-hero/User/device/supercap.c
     # User/module sources
     User/module/chassis.c
     User/module/config.c
@@ -91,7 +89,6 @@ target_sources(${CMAKE_PROJECT_NAME} PRIVATE
     User/task/rc.c
     User/task/user_task.c
     User/task/supercap.c
-# /home/shentou/workspace/SuperCap/god-yuan-hero/User/task/supercap.c
 )
 
 # Add include paths

User/component/PowerControl.h

@@ -27,4 +27,3 @@ void power_out_calu(power_model_t* param,float scale,float* in_array,float* rpm_
 #endif
 
 #endif
-