فهرست منبع

针对美轮已出货J01定制程序,修改波特率为125K,增加车速控制车灯。

Dail 1 سال پیش
والد
کامیت
ca5300f24c

+ 1 - 1
Core/Inc/main.h

@@ -50,7 +50,7 @@
 /* Private define ------------------------------------------------------------*/
 #define DEBUG 1
 #define NormalWork 1
-#define BaudRate250K 1
+#define BaudRate250K 0
 #define BREAK_IN_Pin GPIO_PIN_12
 #define BREAK_IN_GPIO_Port GPIOB
 #define BREAK_IN_EXTI_IRQn EXTI15_10_IRQn

+ 3 - 5
MDK-ARM/QD007A_CTL_APP.uvprojx

@@ -14,8 +14,6 @@
         <TargetCommonOption>
           <Device>STM32F103RB</Device>
           <Vendor>STMicroelectronics</Vendor>
-          <PackID>Keil.STM32F1xx_DFP.1.0.4</PackID>
-          <PackURL>http://www.keil.com/pack/</PackURL>
           <Cpu>IROM(0x08000000,0x20000) IRAM(0x20000000,0x5000) CPUTYPE("Cortex-M3") CLOCK(72000000) ELITTLE</Cpu>
           <FlashUtilSpec></FlashUtilSpec>
           <StartupFile></StartupFile>
@@ -127,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>
@@ -148,7 +146,7 @@
             <UsePdscDebugDescription>1</UsePdscDebugDescription>
           </Target>
           <RunDebugAfterBuild>0</RunDebugAfterBuild>
-          <TargetSelection>1</TargetSelection>
+          <TargetSelection>6</TargetSelection>
           <SimDlls>
             <CpuDll></CpuDll>
             <CpuDllArguments></CpuDllArguments>
@@ -162,7 +160,7 @@
             <PeripheralDll></PeripheralDll>
             <PeripheralDllArguments></PeripheralDllArguments>
             <InitializationFile></InitializationFile>
-            <Driver>BIN\UL2CM3.DLL</Driver>
+            <Driver>Segger\JL2CM3.dll</Driver>
           </TargetDlls>
         </DebugOption>
         <Utilities>

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 2451 - 2451
MDK-ARM/QD007A_CTL_APP/QD007A_CTL_APP_CRC.hex


BIN
MDK-ARM/bin/MC_VL6500J01-TC013041-BM2102_V4.1.0.0.0_20230628.bin


BIN
MDK-ARM/bin/QD007A_CTL_APP.bin


+ 2 - 1
User/Src/can_process.c

@@ -152,7 +152,8 @@ void DataProcess(uint16_t ID, uint8_t Mode, uint16_t Cmd, uint8_t* Data)
 				{
 				  if(MC_WorkMode == MC_WorkMode_Run)
 					{
-					  memcpy(&MC_ControlCode.GearSt, Data, DataLength);
+					  //memcpy(&MC_ControlCode.GearSt, Data, DataLength);
+						MC_ControlCode.GearSt = Data[0];
 					  Update_MC_ControlCode_Back();
 					}			
 		      MC_RunInfo.GearSt = MC_ControlCode.GearSt;//µ±Ç°ÖúÁ¦µµÎ»¸üÐÂ

+ 19 - 1
User/Src/tasks.c

@@ -22,7 +22,23 @@
 TrueOrFalse_Flag_Struct_t IsInitFinish_Flag = FALSE;
 To_Te_SendStep IsSendDataToTE_Step = HANDSHAKE;
 /**************************局部函数定义*********************/
-
+static void LightSwitchAutoControl(uint16_t Speed, MC_LightSwitch_Struct_t* Switch)
+{
+  static uint32_t OffDelayTime = 0;
+	
+	//有车速时,自动打开车灯开关
+	if(Speed > 0)
+	{
+	  *Switch = MC_LightSwitch_ON;
+		OffDelayTime = HAL_GetTick();
+		return;
+	}
+	//车速为零,等待2min后关闭车灯
+	if((HAL_GetTick() - OffDelayTime) > 120000)
+	{
+	  *Switch = MC_LightSwitch_OFF;
+	}
+}
 
 /**************************全局函数定义*********************/
 //1ms任务处理函数
@@ -113,6 +129,8 @@ void HAL_SYSTICK_Callback(void)
 	if(TimeCnt_1000ms >= 1000)
 	{
 	  TimeCnt_1000ms = 0;
+		//根据车速自动控制车灯开关
+		LightSwitchAutoControl(MC_RunInfo.BikeSpeed, &MC_ControlCode.LightSwitch);
 		
 	}
 }

+ 4 - 4
User/Src/var.c

@@ -236,10 +236,10 @@ const nGearParam_Struct_t GearParam_Default_SMART_Volans =
   (uint16_t)1000,
 	(uint16_t)2000,
 	(uint16_t)100,
-	(uint16_t)1260,  //800,
-	(uint8_t)2, //1,
-	(uint8_t)1,  //1,
-	(uint16_t)870  //250
+	(uint16_t)1400,  //800,
+	(uint8_t)4,      //1,
+	(uint8_t)2,      //1,
+	(uint16_t)1024   //250
 };
 
 

برخی فایل ها در این مقایسه diff نمایش داده نمی شوند زیرا تعداد فایل ها بسیار زیاد است