Bläddra i källkod

更改波特率宏定义方式。

Dail 1 år sedan
förälder
incheckning
10c4bf22c0

+ 0 - 1
Core/Inc/main.h

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

+ 4 - 2
Core/Src/can.c

@@ -66,10 +66,12 @@ void MX_CAN_Init(void)
 {
 
   hcan.Instance = CAN1;
-	#if BaudRate250K
+	#if defined BARD_250K
 	hcan.Init.Prescaler = 18;
-	#else
+	#elif defined BARD_125K
 	hcan.Init.Prescaler = 36;
+	#else
+	Error();
 	#endif
   hcan.Init.Mode = CAN_MODE_NORMAL;
   hcan.Init.SJW = CAN_SJW_1TQ;

+ 1 - 1
MDK-ARM/QD007A_CTL_APP.uvprojx

@@ -362,7 +362,7 @@
             <useXO>0</useXO>
             <VariousControls>
               <MiscControls></MiscControls>
-              <Define>USE_HAL_DRIVER,STM32F103xB,PEGASI_48V</Define>
+              <Define>USE_HAL_DRIVER,STM32F103xB,PEGASI_48V,BARD_125K</Define>
               <Undefine></Undefine>
               <IncludePath>../Core/Inc;../Drivers/STM32F1xx_HAL_Driver/Inc;../Drivers/STM32F1xx_HAL_Driver/Inc/Legacy;../Drivers/CMSIS/Device/ST/STM32F1xx/Include;../Drivers/CMSIS/Include;..\User\Inc;..\SEGGER_RTT\Inc;..\SelfTestUser\Inc</IncludePath>
             </VariousControls>

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

@@ -217,11 +217,11 @@
 :204AE00003480078044909780840207038BD00002A040020501D00202B040020641D00208D
 :204B000000BFFEE710B5024804F062FF10BD00002C24002000B58BB00020069007900120F2
 :204B200008904CF220000190002002904DF2E01003904FF6FF7004900020059001200990C3
-:204B400001A9244804F0A4FE20B14FF4A37122A011F070FD0120069000200790012008902A
+:204B400001A9244804F0A4FE20B14FF4A47122A011F070FD01200690002007900120089029
 :204B60004FF460400190002002904CF2E01003904FF6FF700490002005900120099001A9ED
-:204B8000144804F085FE20B140F25B1112A011F051FD0220069000200790012008904FF269
+:204B8000144804F085FE20B140F25D1112A011F051FD0220069000200790012008904FF267
 :204BA00040500190002002904FF6C07003904FF6FF70049001200590099001A9054804F098
-:204BC00067FE20B14FF4B87103A011F033FD0BB000BD00002C2400202E2E5C436F72655CDA
+:204BC00067FE20B14FF4B97103A011F033FD0BB000BD00002C2400202E2E5C436F72655CD9
 :204BE0005372635C63616E2E630000002DE9F04104460D46002700260DB9666B00E0A66BB5
 :204C0000206800F5D87000EB0510006800F00400B060B06858B9206800F5D87000EB051075
 :204C2000006840F2FF7101EA505030600AE0206800F5D87000EB051000686FF0604101EA4D
@@ -1867,8 +1867,8 @@
 :2019000007900690049001A91148F6F7D1FE18B1EB2110A004F08EFE02200190029001A953
 :201920000B48F6F7C5FE18B1F4210AA004F082FE03200190029001A90548F6F7B9FE18B1FE
 :20194000FD2104A004F076FE09B000BD00280140201F00202E2E5C436F72655C5372635CFE
-:201960006164632E6300000010B50F480F4908601220486000210D488160C1604FF4A0217C
-:2019800001610021416181610121C1610021016241628162C162F8F745F918B1562104A0BE
+:201960006164632E6300000010B50F480F4908602420486000210D488160C1604FF4A0216A
+:2019800001610021416181610121C1610021016241628162C162F8F745F918B1582104A0BC
 :2019A00004F048FE10BD0000006400402C2400202E2E5C436F72655C5372635C63616E2E8B
 :2019C0006300000008B500BF0A48406940F00100084948610846406900F00100009000BFCB
 :2019E00000BF022211460B20F9F7CDF90B20F9F7BDF908BD0010024000B585B000BF3A48B9
@@ -2465,10 +2465,10 @@
 :2063C00000F0B0F85548007B544991F91B100844524989794843C0EB001001034F48C079B8
 :2063E00041F2C6125043B1FBF0F04D49888108468089C88107B000BD840100209C0100205E
 :20640000E803002088010020C4080020D0090020B8090020D0760108DC0800208901002005
-:20642000AC77010854544B5A303130442E2020202020202000000000740800205637723233
+:20642000AC77010854544B5A303130442E2020202020202000000000740800205633723435
 :2064400072335F3230323331313138430000000054433031313030302D4D53303030302DF0
 :20646000563072302E202020202020202020202000000000940800204465632032372032C3
-:206480003032330030393A31323A3334000000004A616E00466562004D6172004170720057
+:206480003032330031343A35363A3336000000004A616E00466562004D6172004170720051
 :2064A0004D6179004A756E004A756C0041756700536570004F6374004E6F760044656300B3
 :2064C000D00100205047383058582026205053583058582E0000000030303030303030302D
 :2064E0003030303030303030000000004D4F54494E4F564100000000780A002057554841D8
@@ -2792,6 +2792,6 @@
 :208CA000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD4
 :208CC000FFFFFFFFFFFFFFFF0000000000000000000000000000000000000000000000009C
 :208CE000000000000000000000000000000000000000000000000000000000000000000074
-:048D0000F6FD34C880
+:048D0000F645845759
 :04000005080030EDD2
 :00000001FF

BIN
MDK-ARM/bin/QD007A_CTL_APP.bin


+ 4 - 2
User/Src/var.c

@@ -677,10 +677,12 @@ void Var_Init(void)
 	//MC版本信息初始化,Mode和SN从EEPROM读取
 	strncpy(MC_VerInfo.HW_Version, (char*)"TTKZ010D.       ", 16);
 	
-	#if BaudRate250K
+	#if defined BARD_250K
   strncpy(MC_VerInfo.FW_Version, (char*)"V7r2r3_20231118C", 16);
-	#else
+	#elif defined BARD_125K
 	strncpy(MC_VerInfo.FW_Version, (char*)"V3r4r3_20231118C", 16);
+	#else
+	Error();
 	#endif
 	
   #if NormalWork