36V、48V更换mos内阻，版本升级，屏蔽enviolo

User project/1.FrameLayer/Source/app.c

@@ -184,7 +184,7 @@ void AppLoop()
         }
     }
 
-    GearBox_Loop();
+//    GearBox_Loop();
 }
 
 void PeripheralInit()

User project/3.BasicFunction/Source/canAppl.c

@@ -245,7 +245,7 @@ void Can_voInitMC_Run(void)
     memcpy((uint8_t*)(MC_VerInfo.HW_Version + 12), (uint8_t*)(&MCU_ID_CRC32), 4);
     
     // Software version
-    char chFwVersion[16]="V1r0r4__";
+    char chFwVersion[16]="V1r1r0_";
     strncat(chFwVersion,COMMIT_TIME,8);
     strncpy(MC_VerInfo.FW_Version, (char *)chFwVersion, 16);
     

User project/4.BasicHardwSoftwLayer/2.BasicSoftwLayer/Include/user.h

@@ -55,17 +55,23 @@ Update Time
 /*======================================================================*
    ADC Maximum Value
 *=======================================================================*/
-#if (MOTOR_ID_SEL == MOTOR_WELLING_MTB_36V || MOTOR_ID_SEL == MOTOR_WELLING_CITY_36V)
+//#if (MOTOR_ID_SEL == MOTOR_WELLING_MTB_36V || MOTOR_ID_SEL == MOTOR_WELLING_CITY_36V)
+//#define ADC_IPHASE_CUR_MAX_AP 15600
+//#define ADC_IPHASE_CUR_OVER_K 780 // SWORD最大电流/采样最大电流=120A/156A=0.769=787(Q10)
+//#elif (MOTOR_ID_SEL == MOTOR_WELLING_MTB_48V)
+//#define ADC_IPHASE_CUR_MAX_AP 16500
+//#define ADC_IPHASE_CUR_OVER_K 1024
+//#else
+//#define ADC_IPHASE_CUR_MAX_AP 10355
+//#define ADC_IPHASE_CUR_OVER_K 1024
+//#endif
+#if (MOTOR_ID_SEL == MOTOR_WELLING_MTB_36V)
 #define ADC_IPHASE_CUR_MAX_AP 15600
 #define ADC_IPHASE_CUR_OVER_K 780 // SWORD最大电流/采样最大电流=120A/156A=0.769=787(Q10)
-#elif (MOTOR_ID_SEL == MOTOR_WELLING_MTB_48V)
-#define ADC_IPHASE_CUR_MAX_AP 16500
-#define ADC_IPHASE_CUR_OVER_K 1024
 #else
-#define ADC_IPHASE_CUR_MAX_AP 10355
+#define ADC_IPHASE_CUR_MAX_AP 16500
 #define ADC_IPHASE_CUR_OVER_K 1024
 #endif
-
 /*======================================================================*
     Motor Parameters
 *=======================================================================*/
@@ -129,10 +135,10 @@ Update Time
 
 #elif (MOTOR_ID_SEL == MOTOR_WELLING_CITY_36V)
 #define M_POLE_PAIRS        7       // unit:Null,Pole pairs
-#define M_RS_OHM            150     // unit: 0.1mOhm, Phase resistance
+#define M_RS_OHM            297     // unit: 0.1mOhm, Phase resistance
 #define M_MATERIAL          Al      // unit:Null
-#define M_LD_NOLOAD_MH      7650    // unit: 0.01uH, D axis inductance
-#define M_LQ_NOLOAD_MH      10200   // unit: 0.01uH, Q axis inductance
+#define M_LD_NOLOAD_MH      16000    // unit: 0.01uH, D axis inductance
+#define M_LQ_NOLOAD_MH      16750   // unit: 0.01uH, Q axis inductance
 #define M_LD_TURN1_ID_AP    5000    // unit: 0.01A,
 #define M_LD_TURN1_LD_MH    7650    // unit: 0.01uH,D axis inductance
 #define M_LD_TURN2_ID_AP    700     // unit: 0.01A,
@@ -145,10 +151,10 @@ Update Time
 #define M_LQ_MIN_MH         10200   // unit: 0.01uH,Q axis inductance
 #define M_JD                2500    // unit: 10-7Kg*m2, Rotational inertia
 #define M_MAGNETIC_MATERIAL Ferrite // unit:Null
-#define M_FLUX_WB           4800    // 5056    // unit: 0.001mWb, Flux linkage
+#define M_FLUX_WB           7336    // 5056    // unit: 0.001mWb, Flux linkage
 #define M_ID_MAX_AP         0       //-25      // unit: 0.01A, Max d axis current
-#define M_ID_MIN_AP         -300    // unit: 0.01A, Min d axis current
-#define M_IS_PEAK_MAX_AP    5000    // unit: 0.01A, Max phase current(below base speed)
+#define M_ID_MIN_AP         -600    // unit: 0.01A, Min d axis current
+#define M_IS_PEAK_MAX_AP    3200    // unit: 0.01A, Max phase current(below base speed)
 #define M_POWER_MAX_WT      600     // unit: W, Max power
 #define M_R_SPD_RPM         5000    // unit: r/min, rate spd
 #define M_R_PWR_WT          250     // unit: W, rate power
@@ -158,10 +164,10 @@ Update Time
 
 #elif (MOTOR_ID_SEL == MOTOR_WELLING_CITY_48V)
 #define M_POLE_PAIRS        7       // unit:Null,Pole pairs
-#define M_RS_OHM            150     // unit: 0.1mOhm, Phase resistance
+#define M_RS_OHM            297     // unit: 0.1mOhm, Phase resistance
 #define M_MATERIAL          Al      // unit:Null
-#define M_LD_NOLOAD_MH      7650    // unit: 0.01uH, D axis inductance
-#define M_LQ_NOLOAD_MH      10200   // unit: 0.01uH, Q axis inductance
+#define M_LD_NOLOAD_MH      16000    // unit: 0.01uH, D axis inductance
+#define M_LQ_NOLOAD_MH      16750   // unit: 0.01uH, Q axis inductance
 #define M_LD_TURN1_ID_AP    5000    // unit: 0.01A,
 #define M_LD_TURN1_LD_MH    7650    // unit: 0.01uH,D axis inductance
 #define M_LD_TURN2_ID_AP    700     // unit: 0.01A,
@@ -174,10 +180,10 @@ Update Time
 #define M_LQ_MIN_MH         10200   // unit: 0.01uH,Q axis inductance
 #define M_JD                2500    // unit: 10-7Kg*m2, Rotational inertia
 #define M_MAGNETIC_MATERIAL Ferrite // unit:Null
-#define M_FLUX_WB           4800    // 5056    // unit: 0.001mWb, Flux linkage
+#define M_FLUX_WB           7336    // 5056    // unit: 0.001mWb, Flux linkage
 #define M_ID_MAX_AP         0       //-25      // unit: 0.01A, Max d axis current
 #define M_ID_MIN_AP         -300    // unit: 0.01A, Min d axis current
-#define M_IS_PEAK_MAX_AP    5000    // unit: 0.01A, Max phase current(below base speed)
+#define M_IS_PEAK_MAX_AP    4000    // unit: 0.01A, Max phase current(below base speed)
 #define M_POWER_MAX_WT      600     // unit: W, Max power
 #define M_R_SPD_RPM         5000    // unit: r/min, rate spd
 #define M_R_PWR_WT          250     // unit: W, rate power