소스 검색

适用于大牙盘和轮毂的系统,需配合修改硬件。

Dail 2 년 전
부모
커밋
f89f35acc9
7개의 변경된 파일57개의 추가작업 그리고 20개의 파일을 삭제
  1. 42 14
      MDK-ARM/ZB002B20190430.uvprojx
  2. 7 4
      Src/main.c
  3. 5 0
      Src_app/functional_safety_key.c
  4. 1 0
      Src_app/key_drivers.c
  5. 2 2
      Src_app/var.c
  6. BIN
      硬件处理/IMG20230308-190806321.jpg
  7. BIN
      硬件处理/IMG20230308-19080750.jpg

+ 42 - 14
MDK-ARM/ZB002B20190430.uvprojx

@@ -10,13 +10,10 @@
       <TargetName>ZB002B20190410</TargetName>
       <ToolsetNumber>0x4</ToolsetNumber>
       <ToolsetName>ARM-ADS</ToolsetName>
-      <pCCUsed>5060422::V5.06 update 4 (build 422)::ARMCC</pCCUsed>
       <TargetOption>
         <TargetCommonOption>
           <Device>STM32F103C8</Device>
           <Vendor>STMicroelectronics</Vendor>
-          <PackID>Keil.STM32F1xx_DFP.2.3.0</PackID>
-          <PackURL>http://www.keil.com/pack/</PackURL>
           <Cpu>IRAM(0x20000000-0x20004FFF) IROM(0x8000000-0x800FFFF)  CLOCK(8000000) CPUTYPE("Cortex-M3")</Cpu>
           <FlashUtilSpec></FlashUtilSpec>
           <StartupFile></StartupFile>
@@ -85,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>
@@ -125,6 +120,48 @@
             <HexOffset>0</HexOffset>
             <Oh166RecLen>16</Oh166RecLen>
           </OPTHX>
+          <Simulator>
+            <UseSimulator>0</UseSimulator>
+            <LoadApplicationAtStartup>1</LoadApplicationAtStartup>
+            <RunToMain>1</RunToMain>
+            <RestoreBreakpoints>1</RestoreBreakpoints>
+            <RestoreWatchpoints>1</RestoreWatchpoints>
+            <RestoreMemoryDisplay>1</RestoreMemoryDisplay>
+            <RestoreFunctions>1</RestoreFunctions>
+            <RestoreToolbox>1</RestoreToolbox>
+            <LimitSpeedToRealTime>0</LimitSpeedToRealTime>
+            <RestoreSysVw>1</RestoreSysVw>
+          </Simulator>
+          <Target>
+            <UseTarget>1</UseTarget>
+            <LoadApplicationAtStartup>1</LoadApplicationAtStartup>
+            <RunToMain>1</RunToMain>
+            <RestoreBreakpoints>1</RestoreBreakpoints>
+            <RestoreWatchpoints>1</RestoreWatchpoints>
+            <RestoreMemoryDisplay>1</RestoreMemoryDisplay>
+            <RestoreFunctions>0</RestoreFunctions>
+            <RestoreToolbox>1</RestoreToolbox>
+            <RestoreTracepoints>1</RestoreTracepoints>
+            <RestoreSysVw>1</RestoreSysVw>
+            <UsePdscDebugDescription>1</UsePdscDebugDescription>
+          </Target>
+          <RunDebugAfterBuild>0</RunDebugAfterBuild>
+          <TargetSelection>12</TargetSelection>
+          <SimDlls>
+            <CpuDll></CpuDll>
+            <CpuDllArguments></CpuDllArguments>
+            <PeripheralDll></PeripheralDll>
+            <PeripheralDllArguments></PeripheralDllArguments>
+            <InitializationFile></InitializationFile>
+          </SimDlls>
+          <TargetDlls>
+            <CpuDll></CpuDll>
+            <CpuDllArguments></CpuDllArguments>
+            <PeripheralDll></PeripheralDll>
+            <PeripheralDllArguments></PeripheralDllArguments>
+            <InitializationFile></InitializationFile>
+            <Driver>BIN\CMSIS_AGDI.dll</Driver>
+          </TargetDlls>
         </DebugOption>
         <Utilities>
           <Flash1>
@@ -189,7 +226,6 @@
             <useUlib>1</useUlib>
             <EndSel>0</EndSel>
             <uLtcg>0</uLtcg>
-            <nSecure>0</nSecure>
             <RoSelD>3</RoSelD>
             <RwSelD>3</RwSelD>
             <CodeSel>0</CodeSel>
@@ -324,13 +360,6 @@
             <uSurpInc>0</uSurpInc>
             <uC99>1</uC99>
             <useXO>0</useXO>
-            <v6Lang>0</v6Lang>
-            <v6LangP>0</v6LangP>
-            <vShortEn>1</vShortEn>
-            <vShortWch>1</vShortWch>
-            <v6Lto>0</v6Lto>
-            <v6WtE>0</v6WtE>
-            <v6Rtti>0</v6Rtti>
             <VariousControls>
               <MiscControls></MiscControls>
               <Define>USE_HAL_DRIVER,STM32F103xB</Define>
@@ -348,7 +377,6 @@
             <NoWarn>0</NoWarn>
             <uSurpInc>0</uSurpInc>
             <useXO>0</useXO>
-            <uClangAs>0</uClangAs>
             <VariousControls>
               <MiscControls></MiscControls>
               <Define></Define>

+ 7 - 4
Src/main.c

@@ -106,7 +106,6 @@ int main(void)
 //	MX_RTC_Init();	
 	STU_InitRunTimeChecks();
 
-
 	/* USER CODE BEGIN Init */
 	HAL_TIM_Base_Start(&htim2);
 	ADC_Start();		//ADC启动
@@ -114,6 +113,7 @@ int main(void)
 	EEPROM_Check();	//EEPROM参数检测
 
  	KeyInitial();
+	#if 0
 	//第一次发送握手指令给TE
 	SendUartDataToTE(ID_CDL_TO_PBU_TE, MODE_REPORT, 0x8800, (uint8_t*)NULL);
 	PBU_PowerOn_Process.PowerOnTimeCnt=SysTime_5ms;
@@ -140,11 +140,14 @@ int main(void)
 			}
 		}		
 	}while(PBU_PowerOn_Process.PowerKeyStatus == 0);
+	#endif
   /* USER CODE END Init */	
 		
   /* USER CODE BEGIN SysInit */
-	HAL_Delay(1000);
+	HAL_Delay(1500);
+	#if 0
 	SendCfgToMC();	//发送电机配置参数
+	#endif
 	MC_Online_TimeCnt=SysTime_5ms;
 	BMS_Online_TimeCnt=SysTime_5ms;
 	Vin_test_TimeCnt=SysTime_5ms;
@@ -167,8 +170,8 @@ int main(void)
 			CanRx_Process();
 			Battery_Information_Process();
 			Uart_RxData_Process(&UART_RxBuff_Struct1, 200);
-			PBU_PowerOn_Judge();
-			AutoPowerOff_Process();
+			//PBU_PowerOn_Judge();
+			//AutoPowerOff_Process();
 			PBU_Error_Process();
 			HAL_IWDG_Refresh(&hiwdg1);		
 			STU_TimeBase();

+ 5 - 0
Src_app/functional_safety_key.c

@@ -186,6 +186,7 @@ void Error_Key_Process(void)
 	static uint8_t 	Flag6_1 = 0;
 	
 	/* Processing power key */
+	#if 0
 	if(*(Key_On_Off.ADC_result)<1000)	
 	{
 		if(Flag1_1 == 0)
@@ -208,6 +209,7 @@ void Error_Key_Process(void)
 		Key_Flag.power_long_press = 0;
 		Flag1_1 = 0;
 	}
+	#endif
 	
 	/* Processing Walk key */
 	if(*(Key_Walk.ADC_result)<1000)
@@ -318,6 +320,8 @@ void Scan_Key_ADC_Error(void)
 	static uint16_t Up_error_cnt  = 0;
 	static uint16_t Down_error_cnt  = 0;
 	static uint16_t Light_error_cnt  = 0;	
+	
+	#if 0
 ////////////On_OffÅжÏ////////////////////////	
 	if((*(Key_On_Off.ADC_result)>1000)&&(*(Key_On_Off.ADC_result)<3000))
 	{
@@ -332,6 +336,7 @@ void Scan_Key_ADC_Error(void)
 	{
 		PBU_hardwareErrorCode.ERROR_Bit.Key_Power = 0x01;
 	}
+	#endif
 ////////////WalkÅжÏ////////////////////////	
 	if((*(Key_Walk.ADC_result)>1000)&&(*(Key_Walk.ADC_result)<3000))
 	{

+ 1 - 0
Src_app/key_drivers.c

@@ -59,6 +59,7 @@ void KeyInitial(void)
 	//³õʼ»¯Key_Down
 	Key_Down.ADC_result =&ADC_Result[4] ;	
 	KeyParamInit(&Key_Down);	
+	
 	//³õʼ»¯Key_Up
 	Key_Up.ADC_result =&ADC_Result[5] ;
 	KeyParamInit(&Key_Up);

+ 2 - 2
Src_app/var.c

@@ -77,8 +77,8 @@ void Var_Init(void)
 	PBU_Test_Process.SendCodeTimeCnt = 0;
 	
 	//PBU版本信息,Mode和SN从EEPROM读取
-	strcpy(PBU_VerInfo.HW_Version, (char*)"ZB002D_20190905.");//长度为16bytes
-	strcpy(PBU_VerInfo.FW_Version, (char*)"V3r1r0_20220617.");//长度为16bytes
+	strcpy(PBU_VerInfo.HW_Version, (char*)"TT-YB-001A.");//长度为16bytes
+	strcpy(PBU_VerInfo.FW_Version, (char*)"V4r0r0_20230309.");//长度为16bytes
 
   //PBU校验信息,校验码从EEPROM读取
 	PBU_CheckInfo.MAC_ID[0] = *(__IO uint32_t*)(0x1FFFF7AC);

BIN
硬件处理/IMG20230308-190806321.jpg


BIN
硬件处理/IMG20230308-19080750.jpg