Browse Source

1、修改波特率;
2、修改客户号。

Dail 2 năm trước cách đây
mục cha
commit
8152904fbf

+ 1 - 1
Core/Src/can.c

@@ -64,7 +64,7 @@ void MX_CAN_Init(void)
 {
 
   hcan.Instance = CAN1;
-  hcan.Init.Prescaler = 24;
+  hcan.Init.Prescaler = 48;
   hcan.Init.Mode = CAN_MODE_NORMAL;
   hcan.Init.SJW = CAN_SJW_1TQ;
   hcan.Init.BS1 = CAN_BS1_4TQ;

+ 1 - 6
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>
@@ -147,6 +143,7 @@
             <RestoreToolbox>1</RestoreToolbox>
             <RestoreTracepoints>1</RestoreTracepoints>
             <RestoreSysVw>1</RestoreSysVw>
+            <UsePdscDebugDescription>1</UsePdscDebugDescription>
           </Target>
           <RunDebugAfterBuild>0</RunDebugAfterBuild>
           <TargetSelection>6</TargetSelection>
@@ -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</Define>

+ 4 - 4
MDK-ARM/QD007A_CTL_APP/QD007A_CTL_APP_CRC.hex

@@ -1621,7 +1621,7 @@
 :20FA60004FF480500890002007900690049001A91148F8F709F818B1D42110A004F0C2FAE9
 :20FA800002200190029001A90B48F7F7FDFF18B1DD210AA004F0B6FA03200190029001A935
 :20FAA0000548F7F7F1FF18B1E62104A004F0AAFA09B000BD00280140141400202E2E5C43ED
-:20FAC0006F72655C5372635C6164632E6300000010B50F480F4908601820486000210D4815
+:20FAC0006F72655C5372635C6164632E6300000010B50F480F4908603020486000210D48FD
 :20FAE0008160C1604FF4403101610021416181610121C1610021016241628162C162F9F7E8
 :20FB00005FF818B1502104A004F07CFA10BD000000640040F41800202E2E5C436F72655C0C
 :20FB20005372635C63616E2E6300000008B500BF0A48406940F001000849486108464069E5
@@ -2165,8 +2165,8 @@
 :203E4000082232A13448EFF74EFE082233A132480830EFF748FE082233A12F481030EFF740
 :203E600042FE3448344B0ECB0EC000F08DF800F065F810BD3C01002058010020400100209A
 :203E80006C070020AC07002094070020145001088407002041010020245001085144303015
-:203EA00037482E001C0700205636723172305F32303232303830332E00000000544330312B
-:203EC000333035302D4D4252323131332D563072312E202020202020202020200000000081
+:203EA00037482E001C0700205632723272315F32303232303930362E000000005443303426
+:203EC000333030392D4D5330303030302D563072312E202020202020202020200000000095
 :203EE0003C070020564C363558582026205653373558582E000000003030303030303030C9
 :203F0000303030303030303000000000545449554D2E20200000000054080020575548416F
 :203F20004E2E202000000000323032313031303100000000CC080020E8F7FF1F10B5302236
@@ -2580,6 +2580,6 @@
 :20722000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF6E
 :20724000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF4E
 :20726000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000016
-:04728000D4D9C0DCC1
+:04728000B19F059124
 :04000005080030EDD2
 :00000001FF

BIN
MDK-ARM/bin/QD007A_CTL_APP.bin


+ 2 - 2
User/Src/var.c

@@ -498,8 +498,8 @@ void Var_Init(void)
 		
 	//MC版本信息初始化,Mode和SN从EEPROM读取
   strncpy(MC_VerInfo.HW_Version, (char*)"QD007H.", 7);//长度不超过10
-	strncpy(MC_VerInfo.FW_Version, (char*)"V6r1r0_20220803.", 16);
-	strncpy(Firmware_Special, (char*)"TC013050-MBR2113-V0r1.          ", 32);
+	strncpy(MC_VerInfo.FW_Version, (char*)"V2r2r1_20220906.", 16);
+	strncpy(Firmware_Special, (char*)"TC043009-MS00000-V0r1.          ", 32);
 		
 	//电机型号
 	strncpy(MC_VerInfo.Mode, (char*)"VL65XX & VS75XX.", 16);