设置默认参数。

Core/Src/main.c

@@ -209,6 +209,18 @@ int main(void)
 	//初始化完成标志
 	IsInitFinish_Flag = TRUE;	 
 	
+  //针对售后Pegasi系列电机售后处理
+	MC_ConfigParam1.SerialNum = 4;
+	PID_Init(MC_ConfigParam1.SerialNum);
+	UpdateGearParam(MC_ConfigParam1.SerialNum);
+	MC_ConfigParam1.SpeedLimit = 37;
+	MC_ConfigParam1.GasCtrlMode_Param = 0x81;
+	MC_ConfigParam1.WheelSize = 225;
+	MC_ConfigParam2.HeadLightVol = 12;
+	MC_ConfigParam2.TailLightVol = 12;
+	MC_MotorParam.Rate_Power = 500;
+	MC_MotorParam.Rate_Voltage = 48;
+		
   /* USER CODE END 2 */
 
   /* Infinite loop */

MDK-ARM/stm32f1xx_stucpuregsaddressing.lst

@@ -121,13 +121,21 @@ ARM Macro Assembler    Page 2
                                                             ler
    98 00000096                 ENDP
    99 00000096                 END
-Command Line: --debug --xref --cpu=Cortex-M3 --apcs=interwork --depend=.\qd007a
-_ctl_app\stm32f1xx_stucpuregsaddressing.d -o.\qd007a_ctl_app\stm32f1xx_stucpure
-gsaddressing.o -ID:\SoftDesign\20190311_QD007A_CTL\TT-KZ-010A_CTRL_APP\TT-KZ-01
-0A_CTRL_APP\MDK-ARM\RTE -IC:\Keil_v5\ARM\PACK\ARM\CMSIS\4.1.0\CMSIS\Include -IC
-:\Keil_v5\ARM\PACK\Keil\STM32F1xx_DFP\1.0.4\Device\Include --predefine="__MICRO
-LIB SETA 1" --list=stm32f1xx_stucpuregsaddressing.lst ..\SelfTestUser\src_speci
-fic\stm32f1xx_STUCpuRegsAddressing.s
+Command Line: --debug --xref --diag_suppress=9931 --cpu=Cortex-M3 --apcs=interw
+ork --depend=.\qd007a_ctl_app\stm32f1xx_stucpuregsaddressing.d -o.\qd007a_ctl_a
+pp\stm32f1xx_stucpuregsaddressing.o -ID:\SoftDesign\20190311_QD007A_CTL\TT-KZ-0
+10A_CTRL_APP\TT-KZ-010A_CTRL_APP\MDK-ARM\RTE -IC:\Keil_v5\ARM\PACK\ARM\CMSIS\5.
+6.0\CMSIS\Core\Include -IC:\Keil_v5\ARM\PACK\Keil\STM32F1xx_DFP\2.3.0\Device\In
+clude --predefine="__MICROLIB SETA 1" --predefine="__UVISION_VERSION SETA 515" 
+--predefine="_RTE_ SETA 1" --predefine="STM32F10X_MD SETA 1" --list=stm32f1xx_s
+
+
+
+ARM Macro Assembler    Page 3 
+
+
+tucpuregsaddressing.lst ..\SelfTestUser\src_specific\stm32f1xx_STUCpuRegsAddres
+sing.s
 
 
 
@@ -239,4 +247,4 @@ ssing.s
 ssing.s
 Comment: FailSafePOR used once
 3 symbols
-338 symbols in table
+341 symbols in table

MDK-ARM/stm32f1xx_stucpuwalkpatkeil.lst

@@ -1591,13 +1591,14 @@ ARM Macro Assembler    Page 25
  1170 000006D0         
  1171 000006D0         
  1172 000006D0                 END
-Command Line: --debug --xref --cpu=Cortex-M3 --apcs=interwork --depend=.\qd007a
-_ctl_app\stm32f1xx_stucpuwalkpatkeil.d -o.\qd007a_ctl_app\stm32f1xx_stucpuwalkp
-atkeil.o -ID:\SoftDesign\20190311_QD007A_CTL\TT-KZ-010A_CTRL_APP\TT-KZ-010A_CTR
-L_APP\MDK-ARM\RTE -IC:\Keil_v5\ARM\PACK\ARM\CMSIS\4.1.0\CMSIS\Include -IC:\Keil
-_v5\ARM\PACK\Keil\STM32F1xx_DFP\1.0.4\Device\Include --predefine="__MICROLIB SE
-TA 1" --list=stm32f1xx_stucpuwalkpatkeil.lst ..\SelfTestUser\src_specific\stm32
-f1xx_STUCpuWalkpatKEIL.s
+Command Line: --debug --xref --diag_suppress=9931 --cpu=Cortex-M3 --apcs=interw
+ork --depend=.\qd007a_ctl_app\stm32f1xx_stucpuwalkpatkeil.d -o.\qd007a_ctl_app\
+stm32f1xx_stucpuwalkpatkeil.o -ID:\SoftDesign\20190311_QD007A_CTL\TT-KZ-010A_CT
+RL_APP\TT-KZ-010A_CTRL_APP\MDK-ARM\RTE -IC:\Keil_v5\ARM\PACK\ARM\CMSIS\5.6.0\CM
+SIS\Core\Include -IC:\Keil_v5\ARM\PACK\Keil\STM32F1xx_DFP\2.3.0\Device\Include 
+--predefine="__MICROLIB SETA 1" --predefine="__UVISION_VERSION SETA 515" --pred
+efine="_RTE_ SETA 1" --predefine="STM32F10X_MD SETA 1" --list=stm32f1xx_stucpuw
+alkpatkeil.lst ..\SelfTestUser\src_specific\stm32f1xx_STUCpuWalkpatKEIL.s
 
 
 
@@ -2665,4 +2666,4 @@ KEIL.s
 KEIL.s
 
 1 symbol
-398 symbols in table
+401 symbols in table

MDK-ARM/stm32f1xx_sturamwalkpatkeil.lst

@@ -428,13 +428,14 @@ ARM Macro Assembler    Page 7
   329 000001F2                 ENDP
   330 000001F2         
   331 000001F2                 END
-Command Line: --debug --xref --cpu=Cortex-M3 --apcs=interwork --depend=.\qd007a
-_ctl_app\stm32f1xx_sturamwalkpatkeil.d -o.\qd007a_ctl_app\stm32f1xx_sturamwalkp
-atkeil.o -ID:\SoftDesign\20190311_QD007A_CTL\TT-KZ-010A_CTRL_APP\TT-KZ-010A_CTR
-L_APP\MDK-ARM\RTE -IC:\Keil_v5\ARM\PACK\ARM\CMSIS\4.1.0\CMSIS\Include -IC:\Keil
-_v5\ARM\PACK\Keil\STM32F1xx_DFP\1.0.4\Device\Include --predefine="__MICROLIB SE
-TA 1" --list=stm32f1xx_sturamwalkpatkeil.lst ..\SelfTestUser\src_specific\stm32
-f1xx_STURamWalkpatKEIL.s
+Command Line: --debug --xref --diag_suppress=9931 --cpu=Cortex-M3 --apcs=interw
+ork --depend=.\qd007a_ctl_app\stm32f1xx_sturamwalkpatkeil.d -o.\qd007a_ctl_app\
+stm32f1xx_sturamwalkpatkeil.o -ID:\SoftDesign\20190311_QD007A_CTL\TT-KZ-010A_CT
+RL_APP\TT-KZ-010A_CTRL_APP\MDK-ARM\RTE -IC:\Keil_v5\ARM\PACK\ARM\CMSIS\5.6.0\CM
+SIS\Core\Include -IC:\Keil_v5\ARM\PACK\Keil\STM32F1xx_DFP\2.3.0\Device\Include 
+--predefine="__MICROLIB SETA 1" --predefine="__UVISION_VERSION SETA 515" --pred
+efine="_RTE_ SETA 1" --predefine="STM32F10X_MD SETA 1" --list=stm32f1xx_sturamw
+alkpatkeil.lst ..\SelfTestUser\src_specific\stm32f1xx_STURamWalkpatKEIL.s
 
 
 
@@ -811,4 +812,4 @@ IL.s
       None
 Comment: FailSafePOR unused
 1 symbol
-360 symbols in table
+363 symbols in table

User/Src/can_process.c

@@ -180,8 +180,8 @@ void DataProcess(uint16_t ID, uint8_t Mode, uint16_t Cmd, uint8_t* Data)
 				}
 				case 0x3300://OBC查询用户参数
 				{
-				  ReadDataFromEEPROM_Flash(EEPROM_FLASH_ADDR_CONFIG_PARAM1, Data, sizeof(MC_ConfigParam1_Struct_t));					
-					memcpy((uint8_t*)&MC_ConfigParam1.GasCtrlMode_Param, Data, sizeof(MC_ConfigParam1_Struct_t));					
+				  //ReadDataFromEEPROM_Flash(EEPROM_FLASH_ADDR_CONFIG_PARAM1, Data, sizeof(MC_ConfigParam1_Struct_t));					
+					//memcpy((uint8_t*)&MC_ConfigParam1.GasCtrlMode_Param, Data, sizeof(MC_ConfigParam1_Struct_t));					
 					Data[0] = MC_ConfigParam1.WheelSize;   //轮胎默认周长
 					Data[1] = MC_ConfigParam1.StarModel;   //启动模式
 					Data[2] = MC_ConfigParam1.SpeedLimit;  //限速值
@@ -396,8 +396,8 @@ void DataProcess(uint16_t ID, uint8_t Mode, uint16_t Cmd, uint8_t* Data)
 					if( VersionIdentifyFinishedFlag == TRUE )
 					{
 						uint32_t MCU_ID_CRC32;
-						ReadDataFromEEPROM_Flash(EEPROM_FLASH_ADDR_MODE, (uint8_t*)MC_VerInfo.Mode, 16);
-						ReadDataFromEEPROM_Flash(EEPROM_FLASH_ADDR_SN, (uint8_t*)MC_VerInfo.SN_Num, 16);
+						//ReadDataFromEEPROM_Flash(EEPROM_FLASH_ADDR_MODE, (uint8_t*)MC_VerInfo.Mode, 16);
+						//ReadDataFromEEPROM_Flash(EEPROM_FLASH_ADDR_SN, (uint8_t*)MC_VerInfo.SN_Num, 16);
 						MCU_ID_CRC32 = CRC32_Calculate(MC_CheckInfo.MAC_ID, 12);
 						memcpy((uint8_t*)(MC_VerInfo.HW_Version + 12), (uint8_t*)(&MCU_ID_CRC32), 4);
 						SendData(ID_MC_BC, MODE_REPORT, 0x1240, (uint8_t*)MC_VerInfo.Mode);
@@ -407,8 +407,8 @@ void DataProcess(uint16_t ID, uint8_t Mode, uint16_t Cmd, uint8_t* Data)
 				}
 				case 0x3100://查询电机配置参数
 				{
-				  ReadDataFromEEPROM_Flash(EEPROM_FLASH_ADDR_CONFIG_PARAM1, Data, sizeof(MC_ConfigParam1_Struct_t));
-					memcpy((uint8_t*)&MC_ConfigParam1.GasCtrlMode_Param, Data, sizeof(MC_ConfigParam1_Struct_t));
+				  //ReadDataFromEEPROM_Flash(EEPROM_FLASH_ADDR_CONFIG_PARAM1, Data, sizeof(MC_ConfigParam1_Struct_t));
+					//memcpy((uint8_t*)&MC_ConfigParam1.GasCtrlMode_Param, Data, sizeof(MC_ConfigParam1_Struct_t));
 					Data[0] = MC_ConfigParam1.WheelSize;   //轮胎默认周长
 					Data[1] = MC_ConfigParam1.StarModel;   //启动模式
 					Data[2] = MC_ConfigParam1.SpeedLimit;  //限速值
@@ -561,7 +561,7 @@ void DataProcess(uint16_t ID, uint8_t Mode, uint16_t Cmd, uint8_t* Data)
 				}
 				case 0x1A00://查询电机控制参数1
 				{
-				  ReadDataFromEEPROM_Flash(EEPROM_FLASH_ADDR_CONFIG_PARAM1, Data, sizeof(MC_ConfigParam1_Struct_t));
+				  //ReadDataFromEEPROM_Flash(EEPROM_FLASH_ADDR_CONFIG_PARAM1, Data, sizeof(MC_ConfigParam1_Struct_t));
 					SendData(ID_MC_TO_CDL, MODE_REPORT, 0xA020, Data);
 					break;
 				}
@@ -761,7 +761,7 @@ void DataProcess(uint16_t ID, uint8_t Mode, uint16_t Cmd, uint8_t* Data)
 				}
 				case 0x3000://查询电机控制参数2
 				{
-				  ReadDataFromEEPROM_Flash(EEPROM_FLASH_ADDR_CONFIG_PARAM2, Data, sizeof(MC_ConfigParam2_Struct_t));
+				  //ReadDataFromEEPROM_Flash(EEPROM_FLASH_ADDR_CONFIG_PARAM2, Data, sizeof(MC_ConfigParam2_Struct_t));
 					SendData(ID_MC_TO_CDL, MODE_REPORT, 0xAD20, Data);
 					break;
 				}