MC_VS7500-TC033001-MS2001-V2.1.5.0.5_20210427

1、增加MC_GearSt_SMART_T = 0x05档位体验，配合大石定制仪表，T Smart档位发送0x05；
2、增加对T Smart档位平均功耗的存储，对于旧的样车，需要维持在其它档位骑行超过5km后，才会更新并保存T Smart档位的平均功耗。

User/Inc/motor_control.h

@@ -44,6 +44,7 @@ typedef enum
 	MC_GearSt_Torque_NORM = 0x02,
 	MC_GearSt_Torque_SPORT = 0x03,
 	MC_GearSt_Torque_TURBO = 0x04,
+	MC_GearSt_SMART_T = 0x05,
 	MC_GearSt_Cadence_ECO = 0x11,
 	MC_GearSt_Cadence_NORM = 0x12,
 	MC_GearSt_Cadence_SPORT = 0x13,

User/Inc/var.h

@@ -409,7 +409,8 @@ typedef struct
 	uint16_t GearSt_SPORT;  //SPORTⅸ歙髡瘧ㄛ等弇mAh/km
 	uint16_t GearSt_TURBO;  //TURBOⅸ歙髡瘧ㄛ等弇mAh/km
 	uint16_t GearSt_SMART;  //SMARTⅸ歙髡瘧ㄛ等弇mAh/km
-	uint16_t Rs[3];
+	uint16_t GearSt_SMART_T;//SMART_Tⅸ歙髡瘧ㄛ等弇mAh/km
+	uint16_t Rs[2];
 }MC_AvgPower_Struct_t;
 
 /******************************濬倰隅砱End***************************/

User/Src/motor_control.c

@@ -1518,9 +1518,7 @@ MC_CalParam_Struct_t MC_AssistRunMode_Torque_Process(MC_CadenceResult_Struct_t C
 					break;
 				}
 				case MC_GearSt_Torque_TURBO:
-				{
-					#if 0 //原TURBO模式
-					
+				{					
 					//控制输入给定加速斜率
 					if(MC_ConfigParam1.UserAdjParam_TURBO.StarModel_GAIN <= 90)
 					{
@@ -1552,9 +1550,10 @@ MC_CalParam_Struct_t MC_AssistRunMode_Torque_Process(MC_CadenceResult_Struct_t C
 					PID_IMax.hUpper_Limit_Output = 0; //Upper Limit for Output limitation
 					PID_IMax.wLower_Limit_Integral = -(MC_AssisParam.Gear_TURBO.Upper_Iq << 10); // 放大1024
 					PID_IMax.wUpper_Limit_Integral = 0; // 放大1024
-					
-					#else //客户需求，新增长续航Smart模式，要求降低最大电流，先按照TURBO模拟用于测试
-					
+					break;
+				}
+				case MC_GearSt_SMART:
+				{
 					//控制输入给定加速斜率
 					if(MC_ConfigParam1.UserAdjParam_SMART.StarModel_GAIN <= 90)
 					{
@@ -1572,7 +1571,7 @@ MC_CalParam_Struct_t MC_AssistRunMode_Torque_Process(MC_CadenceResult_Struct_t C
 					//控制输入给定减速斜率
 					TorqueDecStep = MC_AssisParam.Gear_SMART.DecCnt;
 					//助力比控制系数
-					Torque_Temp = (uint32_t)(MC_TorqueProcess_Param.TorqueApp * MC_TorqueProcess_Param.TorqueApp) / ((MC_AssisParam.Gear_SMART.TorqueApp_TH * 6) >> 2);
+					Torque_Temp = (uint32_t)(MC_TorqueProcess_Param.TorqueApp * MC_TorqueProcess_Param.TorqueApp) / (MC_AssisParam.Gear_SMART.TorqueApp_TH);
 					//根据助力增益调节助力比
 					Torque_Temp = Torque_Temp * MC_ConfigParam1.UserAdjParam_SMART.Assist_K_GAIN / 100;
 					//给定下限
@@ -1580,19 +1579,17 @@ MC_CalParam_Struct_t MC_AssistRunMode_Torque_Process(MC_CadenceResult_Struct_t C
 					//给定上限
 					Torque_Temp = (Torque_Temp > MC_AssisParam.Gear_SMART.Upper_Iq) ? MC_AssisParam.Gear_SMART.Upper_Iq : Torque_Temp;
 					//限流参数设置
-					CurrentLimitSet = (uint32_t)(((MC_AssisParam.Gear_SMART.CurrentMax_K * 3) >> 2) * MC_ConfigParam1.CurrentLimit * 1000 >> 17) * MC_CadenceLimit_K;
+					CurrentLimitSet = (uint32_t)(MC_AssisParam.Gear_SMART.CurrentMax_K * MC_ConfigParam1.CurrentLimit * 1000 >> 17) * MC_CadenceLimit_K;
 					CurrentLimitPresent = MC_DataSet_Linear_Process(CurrentLimitSet, CurrentLimitPresent, 5 ,1);
 					PID_IMax.hLower_Limit_Output = -(MC_AssisParam.Gear_SMART.Upper_Iq);   //Lower Limit for Output limitation
 					PID_IMax.hUpper_Limit_Output = 0; //Upper Limit for Output limitation
 					PID_IMax.wLower_Limit_Integral = -(MC_AssisParam.Gear_SMART.Upper_Iq << 10); // 放大1024
 					PID_IMax.wUpper_Limit_Integral = 0; // 放大1024
-					
-					#endif
 					break;
 				}
-				case MC_GearSt_SMART:
+				case MC_GearSt_SMART_T: //客户需求，新增长续航Smart模式，要求降低最大电流，与Smart区别是助力比曲线调整，限流降低为75%
 				{
-					//控制输入给定加速斜率
+				  //控制输入给定加速斜率
 					if(MC_ConfigParam1.UserAdjParam_SMART.StarModel_GAIN <= 90)
 					{
 						TorqueAccStep = MC_AssisParam.Gear_SMART.AccCnt - 1;
@@ -1609,7 +1606,7 @@ MC_CalParam_Struct_t MC_AssistRunMode_Torque_Process(MC_CadenceResult_Struct_t C
 					//控制输入给定减速斜率
 					TorqueDecStep = MC_AssisParam.Gear_SMART.DecCnt;
 					//助力比控制系数
-					Torque_Temp = (uint32_t)(MC_TorqueProcess_Param.TorqueApp * MC_TorqueProcess_Param.TorqueApp) / (MC_AssisParam.Gear_SMART.TorqueApp_TH);
+					Torque_Temp = (uint32_t)(MC_TorqueProcess_Param.TorqueApp * MC_TorqueProcess_Param.TorqueApp) / ((MC_AssisParam.Gear_SMART.TorqueApp_TH * 6) >> 2);//助力比曲线调整
 					//根据助力增益调节助力比
 					Torque_Temp = Torque_Temp * MC_ConfigParam1.UserAdjParam_SMART.Assist_K_GAIN / 100;
 					//给定下限
@@ -1617,12 +1614,12 @@ MC_CalParam_Struct_t MC_AssistRunMode_Torque_Process(MC_CadenceResult_Struct_t C
 					//给定上限
 					Torque_Temp = (Torque_Temp > MC_AssisParam.Gear_SMART.Upper_Iq) ? MC_AssisParam.Gear_SMART.Upper_Iq : Torque_Temp;
 					//限流参数设置
-					CurrentLimitSet = (uint32_t)(MC_AssisParam.Gear_SMART.CurrentMax_K * MC_ConfigParam1.CurrentLimit * 1000 >> 17) * MC_CadenceLimit_K;
+					CurrentLimitSet = (uint32_t)(((MC_AssisParam.Gear_SMART.CurrentMax_K * 3) >> 2) * MC_ConfigParam1.CurrentLimit * 1000 >> 17) * MC_CadenceLimit_K;//限流降低为75%
 					CurrentLimitPresent = MC_DataSet_Linear_Process(CurrentLimitSet, CurrentLimitPresent, 5 ,1);
 					PID_IMax.hLower_Limit_Output = -(MC_AssisParam.Gear_SMART.Upper_Iq);   //Lower Limit for Output limitation
 					PID_IMax.hUpper_Limit_Output = 0; //Upper Limit for Output limitation
 					PID_IMax.wLower_Limit_Integral = -(MC_AssisParam.Gear_SMART.Upper_Iq << 10); // 放大1024
-					PID_IMax.wUpper_Limit_Integral = 0; // 放大1024
+					PID_IMax.wUpper_Limit_Integral = 0; // 放大1024		
 					break;
 				}
 				default: 

User/Src/remain_distance.c

@@ -388,6 +388,8 @@ void RD_SaveAndUpdateInfo(MC_GearSt_Struct_t GearSt, MC_AssistRunMode_Struct_t M
 						MC_AvgPower.GearSt_TURBO = ltmp * ( 100 +  sPercent ) / 100;
 						ltmp = MC_AvgPower_Default.GearSt_SMART;
 						MC_AvgPower.GearSt_SMART = ltmp * ( 100 +  sPercent ) / 100;
+						ltmp = MC_AvgPower_Default.GearSt_SMART_T;
+						MC_AvgPower.GearSt_SMART_T = ltmp * ( 100 +  sPercent ) / 100;
 						
 						/*保存所有档位的更新数据*/
 						SaveParamToEEprom_24C02(&I2C_Handle_EEPROM, EEPROM_24C02_ADDR_AVG_POWER, sizeof(MC_AvgPower_Struct_t), (uint8_t*)&MC_AvgPower.GearSt_ECO);
@@ -423,7 +425,11 @@ void RD_SaveAndUpdateInfo(MC_GearSt_Struct_t GearSt, MC_AssistRunMode_Struct_t M
 				case MC_GearSt_SMART:
 					RemainDis.Power_per_km_average = MC_AvgPower.GearSt_SMART;
 					powerDefaultCurrentMode = MC_AvgPower_Default.GearSt_SMART;
-					break;			
+					break;	
+				case MC_GearSt_SMART_T:
+					RemainDis.Power_per_km_average = MC_AvgPower.GearSt_SMART_T;
+					powerDefaultCurrentMode = MC_AvgPower_Default.GearSt_SMART_T;
+				  break;
 				default:
 					RemainDis.Power_per_km_average = 0;
 					powerDefaultCurrentMode = 0;

User/Src/var.c

@@ -161,7 +161,8 @@ const MC_AvgPower_Struct_t MC_AvgPower_Default =
 	(uint16_t)160,
 	(uint16_t)190,
 	(uint16_t)270,
-	(uint16_t)180
+	(uint16_t)180,
+	(uint16_t)170
 };
 
 //MC骑行历史信息，占用32bytes
@@ -489,8 +490,8 @@ void Var_Init(void)
 		
 	//MC版本信息初始化，Mode和SN从EEPROM读取
   strncpy(MC_VerInfo.HW_Version, (char*)"QD007H.         ", 16);
-	strncpy(MC_VerInfo.FW_Version, (char*)"V2r1r6_20210416.", 16);
-	strncpy(Firmware_Special, (char*)"TC033001-MS2001-V0r4.           ", 32);
+	strncpy(MC_VerInfo.FW_Version, (char*)"V2r1r6_20210427.", 16);
+	strncpy(Firmware_Special, (char*)"TC033001-MS2001-V0r5.           ", 32);
 		
 	//电机型号
 	strncpy(MC_VerInfo.Mode, (char*)"VL6500 & VS7500.", 16);

修改说明.txt

@@ -371,7 +371,6 @@ MC_VS7500-TC033001-MS2001-V2.1.5.0.2_20210115
 MC_VS7500-TC033001-MS2001-V2.1.5.0.3_20210129
 1、限流调整为15A。
 
-
 MC_VS7500-TC033001-MS2001-V2.1.5.0.4_20210130
 1、上电时增加转把是否接入的检测，解决上电时未接入转把，上电后接入转把会启动电机的问题；
 2、修改关机前掉电临时存储空间地址，单独开辟1K字节；
@@ -380,6 +379,21 @@ MC_VS7500-TC033001-MS2001-V2.1.5.0.4_20210130
 5、低压保护检测增加根据BMS通信状态采用BMS的电压或电机的电压；
 6、优化续航里程的显示算法。
 
+MC_VS7500-TC033001-MS2001-V2.1.5.0.4_20210416
+1、转把模式还原到V2.1.5.0.3_20210129版本；
+2、配合客户需求，将TURBO档临时调整为Smart长续航的体验。
+
+MC_VS7500-TC033001-MS2001-V2.1.5.0.5_20210427
+1、增加MC_GearSt_SMART_T = 0x05档位体验，配合大石定制仪表，T Smart档位发送0x05；
+2、增加对T Smart档位平均功耗的存储，对于旧的样车，需要维持在其它档位骑行超过5km后，才会更新并保存T Smart档位的平均功耗。
+
+
+
+
+
+
+
+