Jelajahi Sumber

1、开机进入TURBO。

Dail 1 tahun lalu
induk
melakukan
65a73c768f

+ 1 - 0
Core/Src/main.c

@@ -234,6 +234,7 @@ int main(void)
 			
 			//无码表模式初始化处理
 			NoPBUMode_Ini();	
+			
 			//CAN数据解析及处理
 			CanRx_Process();
 			

+ 4 - 9
MDK-ARM/QD007A_CTL_APP.uvprojx

@@ -14,8 +14,6 @@
         <TargetCommonOption>
           <Device>STM32F103RB</Device>
           <Vendor>STMicroelectronics</Vendor>
-          <PackID>Keil.STM32F1xx_DFP.1.1.0</PackID>
-          <PackURL>http://www.keil.com/pack/</PackURL>
           <Cpu>IROM(0x08000000,0x20000) IRAM(0x20000000,0x5000) CPUTYPE("Cortex-M3") CLOCK(12000000) ELITTLE</Cpu>
           <FlashUtilSpec></FlashUtilSpec>
           <StartupFile></StartupFile>
@@ -84,8 +82,6 @@
             <UserProg2Name>.\crc_gen_keil.bat</UserProg2Name>
             <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
             <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
-            <nStopA1X>0</nStopA1X>
-            <nStopA2X>0</nStopA2X>
           </AfterMake>
           <SelectedForBatchBuild>0</SelectedForBatchBuild>
           <SVCSIdString></SVCSIdString>
@@ -129,7 +125,7 @@
             <LoadApplicationAtStartup>1</LoadApplicationAtStartup>
             <RunToMain>1</RunToMain>
             <RestoreBreakpoints>1</RestoreBreakpoints>
-            <RestoreWatchpoints>1</RestoreWatchpoints>
+            <RestoreWatchpoints>0</RestoreWatchpoints>
             <RestoreMemoryDisplay>1</RestoreMemoryDisplay>
             <RestoreFunctions>1</RestoreFunctions>
             <RestoreToolbox>1</RestoreToolbox>
@@ -147,9 +143,10 @@
             <RestoreToolbox>1</RestoreToolbox>
             <RestoreTracepoints>1</RestoreTracepoints>
             <RestoreSysVw>1</RestoreSysVw>
+            <UsePdscDebugDescription>1</UsePdscDebugDescription>
           </Target>
           <RunDebugAfterBuild>0</RunDebugAfterBuild>
-          <TargetSelection>1</TargetSelection>
+          <TargetSelection>6</TargetSelection>
           <SimDlls>
             <CpuDll></CpuDll>
             <CpuDllArguments></CpuDllArguments>
@@ -163,7 +160,7 @@
             <PeripheralDll></PeripheralDll>
             <PeripheralDllArguments></PeripheralDllArguments>
             <InitializationFile></InitializationFile>
-            <Driver>BIN\UL2CM3.DLL</Driver>
+            <Driver>Segger\JL2CM3.dll</Driver>
           </TargetDlls>
         </DebugOption>
         <Utilities>
@@ -363,8 +360,6 @@
             <uSurpInc>0</uSurpInc>
             <uC99>1</uC99>
             <useXO>0</useXO>
-            <v6Lang>0</v6Lang>
-            <v6LangP>0</v6LangP>
             <VariousControls>
               <MiscControls></MiscControls>
               <Define>USE_HAL_DRIVER,STM32F103xB,PEGASI_48V,BARD_250K</Define>

File diff ditekan karena terlalu besar
+ 1801 - 1801
MDK-ARM/QD007A_CTL_APP/QD007A_CTL_APP_CRC.hex


TEMPAT SAMPAH
MDK-ARM/bin/QD007A_CTL_APP.bin


+ 1 - 1
User/Src/cadence_sensor.c

@@ -135,7 +135,7 @@ void CadenceSensor_Process(MC_CadenceResult_Struct_t* p_MC_CadenceResult, uint16
 		if(p_MC_CadenceResult->Cadence_Dir == MC_Cadence_Forward)
 		{
 		  CadenceStarFlagCnt++;
-			if(CadenceStarFlagCnt >= CadenceStartThresholdValue)
+			if(CadenceStarFlagCnt >= 1) //CadenceStartThresholdValue)
 			{
 			  p_MC_CadenceResult->IsStopFlag = FALSE;
 			}

+ 1 - 0
User/Src/can_process.c

@@ -688,6 +688,7 @@ void DataProcess(uint16_t ID, uint8_t Mode, uint16_t Cmd, uint8_t* Data)
 					MC_RunInfo.GearSt = MC_ControlCode.GearSt;//뎠품燎제도貫뫘劤
 					MC_RunInfo.LightSwitch = MC_ControlCode.LightSwitch;
 					SendData(ID_MC_BC, MODE_REPORT, 0x1020, (uint8_t*)&MC_RunInfo.BikeSpeed);
+					SendData(ID_MC_TO_CDL, MODE_REPORT, 0xA903, (uint8_t*)"ACK");
 					break;
 				}
 				case 0x2900://꿴璂제앤눈먁포叫攣斤口

+ 1 - 1
User/Src/motor_control.c

@@ -1026,7 +1026,7 @@ MC_CalParam_Struct_t MC_AssistRunMode_Torque_Process(uint16_t SenorData, MC_Gear
 	#endif
 		
 	//µÍÁ¦¾ØÍ£»ú
-	TorqueStopData = (TorqueSensorStartData < 200) ? 100 : (TorqueSensorStartData >> 1);
+	TorqueStopData = (TorqueSensorStartData < 400) ? 100 : (TorqueSensorStartData >> 2);
 	if(MC_TorqueProcess_Param.TorqueApp >= (TorqueStopData))
 	{
 	  TorqueStopDelayTimeCnt = HAL_GetTick();

+ 3 - 2
User/Src/tasks.c

@@ -1027,9 +1027,10 @@ void NoPBUMode_Ini( void )
 		if( NoPBUModeIniFinishedFlag== FALSE )
 		{
 			NoPBUModeIniFinishedFlag = TRUE;
-			if(MC_ConfigParam1.NoPBU_Flag == MC_SUPPORT_ENABLE)
+			if(1) //(MC_ConfigParam1.NoPBU_Flag == MC_SUPPORT_ENABLE)
 			{
-				MC_ControlCode.GearSt = MC_GearSt_SMART;
+				MC_ControlCode.GearSt = MC_GearSt_Torque_TURBO;//MC_GearSt_SMART;
+				MC_ControlCode.LightSwitch = MC_LightSwitch_ON;
 				Update_MC_ControlCode_Back();
 			}
 		}

+ 1 - 1
User/Src/var.c

@@ -689,7 +689,7 @@ void Var_Init(void)
 	MC_VerInfo.FW_Version[15] = '.';
   #endif
 	//Èí¼þ±êʶ
-	strncpy(Firmware_Special, (char*)"TC011000-MS0000-V0r0.           ", 32);
+	strncpy(Firmware_Special, (char*)"TC013039-MB2106-V1r2.           ", 32);
 	//±àÒëʱ¼ä
 	do
 	{

Beberapa file tidak ditampilkan karena terlalu banyak file yang berubah dalam diff ini