Преглед изворни кода

修改autohold的最大扭矩为20N.M,修改芯片为303RC

Signed-off-by: huhui <huhui@sharkgulf.com>
huhui пре 3 година
родитељ
комит
68126d1054

+ 1 - 0
Applications/bsp/board_mc100_v1.h

@@ -16,6 +16,7 @@
 #define CONFIG_MAX_PHASE_CURR   500.0F
 #define CONFIG_MAX_PHASE_CURR   500.0F
 #define CONFIG_MAX_PHASE_VOL    (CONFIG_MOS_MAX_VOL - 20.0F)
 #define CONFIG_MAX_PHASE_VOL    (CONFIG_MOS_MAX_VOL - 20.0F)
 #define CONFIG_MAX_TORQUE       CONFIG_MAX_PHASE_CURR
 #define CONFIG_MAX_TORQUE       CONFIG_MAX_PHASE_CURR
+#define CONFIG_MAX_LOCK_TORQUE  20
 
 
 //#define CONFIG_BEEP 
 //#define CONFIG_BEEP 
 #define CONFIG_STALL_MAX_CURRENT 100.0f //最大堵转相电流电流
 #define CONFIG_STALL_MAX_CURRENT 100.0f //最大堵转相电流电流

+ 1 - 0
Applications/bsp/board_mc105_v3.h

@@ -16,6 +16,7 @@
 #define CONFIG_MAX_PHASE_CURR   500.0F
 #define CONFIG_MAX_PHASE_CURR   500.0F
 #define CONFIG_MAX_PHASE_VOL    (CONFIG_MOS_MAX_VOL - 20.0F)
 #define CONFIG_MAX_PHASE_VOL    (CONFIG_MOS_MAX_VOL - 20.0F)
 #define CONFIG_MAX_TORQUE       CONFIG_MAX_PHASE_CURR
 #define CONFIG_MAX_TORQUE       CONFIG_MAX_PHASE_CURR
+#define CONFIG_MAX_LOCK_TORQUE  20
 
 
 //#define CONFIG_BEEP 
 //#define CONFIG_BEEP 
 #define CONFIG_STALL_MAX_CURRENT 100.0f //最大堵转相电流电流
 #define CONFIG_STALL_MAX_CURRENT 100.0f //最大堵转相电流电流

+ 2 - 2
Applications/foc/core/PMSM_FOC_Core.c

@@ -581,8 +581,8 @@ static __INLINE void PMSM_FOC_idq_Assign(void) {
 /*called in media task */
 /*called in media task */
 void PMSM_FOC_idqCalc(void) {
 void PMSM_FOC_idqCalc(void) {
 	if (gFoc_Ctrl.in.b_AutoHold) {
 	if (gFoc_Ctrl.in.b_AutoHold) {
-		gFoc_Ctrl.pi_lock.max = CONFIG_DEFAULT_LOCK_TORQUE_LIM;
-		gFoc_Ctrl.pi_lock.min = -CONFIG_DEFAULT_LOCK_TORQUE_LIM;
+		gFoc_Ctrl.pi_lock.max = CONFIG_MAX_LOCK_TORQUE;
+		gFoc_Ctrl.pi_lock.min = -CONFIG_MAX_LOCK_TORQUE;
 		float vel_count = motor_encoder_get_vel_count();
 		float vel_count = motor_encoder_get_vel_count();
 		float errRef = 0 - vel_count;
 		float errRef = 0 - vel_count;
 		gFoc_Ctrl.in.s_targetTorque = PI_Controller_Run(&gFoc_Ctrl.pi_lock ,errRef);
 		gFoc_Ctrl.in.s_targetTorque = PI_Controller_Run(&gFoc_Ctrl.pi_lock ,errRef);

+ 0 - 1
Applications/foc/foc_config.h

@@ -5,7 +5,6 @@
 
 
 #define CONFIG_DEFAULT_IDC_LIM 45
 #define CONFIG_DEFAULT_IDC_LIM 45
 #define CONFIG_DEFAULT_RPM_LIM       CONFIG_MAX_MOT_RPM
 #define CONFIG_DEFAULT_RPM_LIM       CONFIG_MAX_MOT_RPM
-#define CONFIG_DEFAULT_LOCK_TORQUE_LIM 20
 
 
 #define CONFIG_DEFAULT_EPM_PHASE_CURR 50
 #define CONFIG_DEFAULT_EPM_PHASE_CURR 50
 #define CONFIG_DEFAULT_EPM_RPM        200
 #define CONFIG_DEFAULT_EPM_RPM        200

+ 1 - 1
Project/MC100.uvoptx

@@ -22,7 +22,7 @@
   </DaveTm>
   </DaveTm>
 
 
   <Target>
   <Target>
-    <TargetName>GD32F303CC</TargetName>
+    <TargetName>GD32F303RC</TargetName>
     <ToolsetNumber>0x4</ToolsetNumber>
     <ToolsetNumber>0x4</ToolsetNumber>
     <ToolsetName>ARM-ADS</ToolsetName>
     <ToolsetName>ARM-ADS</ToolsetName>
     <TargetOption>
     <TargetOption>

+ 1 - 1
Project/MC100.uvprojx

@@ -7,7 +7,7 @@
 
 
   <Targets>
   <Targets>
     <Target>
     <Target>
-      <TargetName>GD32F303CC</TargetName>
+      <TargetName>GD32F303RC</TargetName>
       <ToolsetNumber>0x4</ToolsetNumber>
       <ToolsetNumber>0x4</ToolsetNumber>
       <ToolsetName>ARM-ADS</ToolsetName>
       <ToolsetName>ARM-ADS</ToolsetName>
       <pCCUsed>5060750::V5.06 update 6 (build 750)::.\ARMCC</pCCUsed>
       <pCCUsed>5060750::V5.06 update 6 (build 750)::.\ARMCC</pCCUsed>

+ 1 - 1
Project/MC105_V3.uvoptx

@@ -22,7 +22,7 @@
   </DaveTm>
   </DaveTm>
 
 
   <Target>
   <Target>
-    <TargetName>GD32F303CC</TargetName>
+    <TargetName>GD32F303RC</TargetName>
     <ToolsetNumber>0x4</ToolsetNumber>
     <ToolsetNumber>0x4</ToolsetNumber>
     <ToolsetName>ARM-ADS</ToolsetName>
     <ToolsetName>ARM-ADS</ToolsetName>
     <TargetOption>
     <TargetOption>

+ 1 - 1
Project/MC105_V3.uvprojx

@@ -7,7 +7,7 @@
 
 
   <Targets>
   <Targets>
     <Target>
     <Target>
-      <TargetName>GD32F303CC</TargetName>
+      <TargetName>GD32F303RC</TargetName>
       <ToolsetNumber>0x4</ToolsetNumber>
       <ToolsetNumber>0x4</ToolsetNumber>
       <ToolsetName>ARM-ADS</ToolsetName>
       <ToolsetName>ARM-ADS</ToolsetName>
       <pCCUsed>5060750::V5.06 update 6 (build 750)::.\ARMCC</pCCUsed>
       <pCCUsed>5060750::V5.06 update 6 (build 750)::.\ARMCC</pCCUsed>