20221104

1 250K和125K程序共用，通过宏定义来生成不同的文件；

Core/Inc/main.h

@@ -50,6 +50,7 @@
 /* Private define ------------------------------------------------------------*/
 #define DEBUG 1
 #define NormalWork 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

Core/Src/can.c

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

MDK-ARM/QD007A_CTL_APP/QD007A_CTL_APP_CRC.hex

@@ -206,9 +206,9 @@
 :20498000002264210090084807F092F803480078044909780840207038BD00008A03002004
 :2049A000841200208B0300209812002000BFFEE700B58BB0002006900790012008904CF2F1
 :2049C00020000190002002904CF2E01003904FF6FF700490002005900120099001A91548F5
-:2049E00003F0CAFE20B140F2231113A00FF07EFA0120069000200790012008904FF4604091
+:2049E00003F0CAFE20B140F2271113A00FF07EFA0120069000200790012008904FF460408D
 :204A00000190002002904CF2E01003904FF6FF700490002005900120099001A9054803F0F1
-:204A2000ABFE20B14FF49C7103A00FF05FFA0BB000BD0000181900202E2E5C436F72655C4B
+:204A2000ABFE20B14FF49E7103A00FF05FFA0BB000BD0000181900202E2E5C436F72655C49
 :204A40005372635C63616E2E630000002DE9F04104460D46002700260DB9666B00E0A66B56
 :204A6000206800F5D87000EB0510006800F00400B060B06858B9206800F5D87000EB051017
 :204A8000006840F2FF7101EA505030600AE0206800F5D87000EB051000686FF0604101EAEF
@@ -1606,8 +1606,8 @@
 :20F8800007900690049001A91148F8F70DF818B1D52110A004F02AFB02200190029001A939
 :20F8A0000B48F8F701F818B1DE210AA004F01EFB03200190029001A90548F7F7F5FF18B1A6
 :20F8C000E72104A004F012FB09B000BD00280140381400202E2E5C436F72655C5372635C0F
-:20F8E0006164632E6300000010B50F480F4908601820486000210D488160C1604FF4403167
-:20F9000001610021416181610121C1610021016241628162C162F9F7F3F818B1502104A0B6
+:20F8E0006164632E6300000010B50F480F4908603020486000210D488160C1604FF440314F
+:20F9000001610021416181610121C1610021016241628162C162F9F7F3F818B1542104A0B2
 :20F9200004F0E4FA10BD000000640040181900202E2E5C436F72655C5372635C63616E2EB2
 :20F940006300000008B500BF0A48406940F00100084948610846406900F00100009000BF6B
 :20F9600000BF022211460B20FAF72FF90B20FAF71FF908BD0010024000B585B000BF3A4893
@@ -2156,7 +2156,7 @@
 :203D2000EFF7E1FE082237A135480830EFF7DBFE082237A132481030EFF7D5FE3748384BD1
 :203D40000ECB0EC000F094F800F06CF810BD000048010020640100204C010020900700200D
 :203D6000D0070020B80700205C4F0108A80700204D0100206C4F01085144303037482E20F6
-:203D80002020202020200000400700205636723372305F32303232313032384300000000F6
+:203D80002020202020200000400700205632723372305F32303232313130344300000000FF
 :203DA00054433031313030302D4D53303030302D563072302E2020202020202020202020DA
 :203DC000000000006007002098010020564C363530302026205653373530302E000000002D
 :203DE00030303030303030303030303030303030000000004D4F54494E4F56410000000056
@@ -2588,6 +2588,6 @@
 :20732000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF6D
 :20734000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF4D
 :20736000FFFFFFFF0000000000000000000000000000000000000000000000000000000011
-:04738000DA4A09409C
+:04738000F40F72D1C3
 :04000005080030EDD2
 :00000001FF

User/Src/var.c

@@ -503,7 +503,12 @@ void Var_Init(void)
 		
 	//MC版本信息初始化，Mode和SN从EEPROM读取
 	strncpy(MC_VerInfo.HW_Version, (char*)"QD007H.       ", 16);
-	strncpy(MC_VerInfo.FW_Version, (char*)"V6r3r0_20221028C", 16);
+	#if BaudRate250K
+  strncpy(MC_VerInfo.FW_Version, (char*)"V6r2r0_20221104C", 16);
+	#else
+	strncpy(MC_VerInfo.FW_Version, (char*)"V2r3r0_20221104C", 16);
+	#endif
+	
 	#if NormalWork
 	MC_VerInfo.FW_Version[15] = '.';
 	#endif