Jelajahi Sumber

SIMULATION:
0 - PA19和PA20做前灯DCDC控制时,不可仿真;
1 - PA19和PA20作SWD调试接口时,前灯DCDC不可控制
测试OK。

dd 2 bulan lalu
induk
melakukan
978cf51153

+ 1 - 1
3.BasicFunction/Source/uart_bafang.c

@@ -410,7 +410,7 @@ void Bafang_USART_RxData_Process(USART_Buf_TypeDef* ptUartTx, UBYTE* buf, UWORD
 ****************************************************************/
 void Bafang_SendData_BMS(USART_Buf_TypeDef* ptUartTx, UBYTE Addr, UBYTE Cmd, UBYTE Length)
 {
-#if (SIMULATION == 1)
+#if 0 //(SIMULATION == 1)
     return;
 #else
     UBYTE databuf[255] = {0};

+ 15 - 4
4.BasicHardwSoftwLayer/1.BasicHardwLayer/Include/UserGpio_Config.h

@@ -42,10 +42,21 @@
 
 
 //DC1灯
-#define IO_LED1_6or12V_EN_H()          DL_GPIO_setPins(GPIO_F_LED_PORT, GPIO_F_LED_PIN_LED_F_EN_PIN)//
-#define IO_LED1_6or12V_EN_L()          DL_GPIO_clearPins(GPIO_F_LED_PORT, GPIO_F_LED_PIN_LED_F_EN_PIN)//
-#define IO_LED1_6or12V_Choise_H()      DL_GPIO_setPins(GPIO_F_LED_PORT, GPIO_F_LED_PIN_LED_F_SEL_PIN)//
-#define IO_LED1_6or12V_Choise_L()      DL_GPIO_clearPins(GPIO_F_LED_PORT, GPIO_F_LED_PIN_LED_F_SEL_PIN)//
+#if (SIMULATION  == 0)
+
+#define IO_LED1_6or12V_EN_H()          DL_GPIO_setPins(GPIO_F_LED_PORT, GPIO_F_LED_PIN_LED_F_EN_PIN)
+#define IO_LED1_6or12V_EN_L()          DL_GPIO_clearPins(GPIO_F_LED_PORT, GPIO_F_LED_PIN_LED_F_EN_PIN)
+#define IO_LED1_6or12V_Choise_H()      DL_GPIO_setPins(GPIO_F_LED_PORT, GPIO_F_LED_PIN_LED_F_SEL_PIN)
+#define IO_LED1_6or12V_Choise_L()      DL_GPIO_clearPins(GPIO_F_LED_PORT, GPIO_F_LED_PIN_LED_F_SEL_PIN)
+
+#else
+
+#define IO_LED1_6or12V_EN_H()          1
+#define IO_LED1_6or12V_EN_L()          1
+#define IO_LED1_6or12V_Choise_H()      1
+#define IO_LED1_6or12V_Choise_L()      1
+
+#endif
 
 //DC2灯
 #define IO_LED2_6or12V_EN_H()          DL_GPIO_setPins(GPIO_B_LED_PORT, GPIO_B_LED_PIN_LED_B_EN_PIN)//

+ 1 - 7
4.BasicHardwSoftwLayer/1.BasicHardwLayer/Source/hwsetup.c

@@ -115,12 +115,6 @@ void hw_voInitPeri(void)
 //      wk_exint_config();
       #endif
 
-
-    /* init usart2 function. */
-#if (SIMULATION == 0)
-    //hw_voInitUART2();
-#endif
-
 #if (UART_ID == 3)
     DL_UART_Main_setBaudRateDivisor(UART_HMI_INST, UART_HMI_IBRD_36_MHZ_1200_BAUD, UART_HMI_FBRD_36_MHZ_1200_BAUD);
 
@@ -936,7 +930,7 @@ void hw_voEnInt(void)
 //  usart_interrupt_enable(USART1, USART_RDBF_INT, TRUE);
 //  usart_interrupt_enable(USART1, USART_TDBE_INT, TRUE);
 //
-//#if (SIMULATION == 0)
+//#ifdef SIMULATION
 //  usart_interrupt_enable(USART2, USART_RDBF_INT, TRUE);
 //  usart_interrupt_enable(USART2, USART_TDBE_INT, TRUE);
 //#endif

+ 3 - 4
4.BasicHardwSoftwLayer/2.BasicSoftwLayer/Include/syspar.h

@@ -60,17 +60,16 @@ Update Time
 #define BIKE_THROTTLE_SPEED_LIMIT_45  0x2 
 #define BIKE_THROTTLE_SPEED_LIMIT_SEL    BIKE_THROTTLE_SPEED_LIMIT_25
 /*======================================================================*
-    uart2关闭与打开
-    0-打开LED12v电源  1- 关闭关闭 可仿真
+   0 - PA19和PA20做前灯DCDC控制时,不可仿真;
+   1 - PA19和PA20作SWD调试接口时,前灯DCDC不可控制
 *=======================================================================*/
-#define  SIMULATION        0            
+#define  SIMULATION        0
 /*======================================================================*
    //仪表协议选择
 // //0-5s,1-锂电2号,2-概念智慧, 3-八方,4-澜风2.6,无适配仪表,暂未使用, 5-J协议,6-澜风9.0
 *=======================================================================*/
 #define  UART_ID           0
 
-
 /*======================================================================*
     IntelligenCadGear
    //0-关闭智能踏频  1-打开,车速跟随脚踩频率变化而变化,需要知道牙盘齿轮数

+ 5 - 0
ti_msp_dl_config.c

@@ -39,6 +39,7 @@
  */
 
 #include "ti_msp_dl_config.h"
+#include "syspar.h"
 
 DL_TimerA_backupConfig gMOTOR_PWMBackup;
 DL_TimerG_backupConfig gPWM_FBackup;
@@ -53,7 +54,9 @@ SYSCONFIG_WEAK void SYSCFG_DL_init(void)
     SYSCFG_DL_initPower();
     SYSCFG_DL_GPIO_init();
     /* Module-Specific Initializations*/
+#if (SIMULATION  == 0) //关闭仿真功能,SWD作前灯DCDC控制
     SYSCFG_DL_DEBUG_init();
+#endif
     SYSCFG_DL_SYSCTL_init();
     SYSCFG_DL_MOTOR_PWM_init();
     SYSCFG_DL_PWM_F_init();
@@ -197,6 +200,7 @@ SYSCONFIG_WEAK void SYSCFG_DL_GPIO_init(void)
 
     DL_GPIO_initDigitalOutput(GPIO_B_LED_PIN_LED_B_SEL_IOMUX);
 
+#if (SIMULATION  == 0)
     DL_GPIO_initDigitalOutput(GPIO_F_LED_PIN_LED_F_EN_IOMUX);
 
     DL_GPIO_initDigitalOutput(GPIO_F_LED_PIN_LED_F_SEL_IOMUX);
@@ -205,6 +209,7 @@ SYSCONFIG_WEAK void SYSCFG_DL_GPIO_init(void)
 		GPIO_F_LED_PIN_LED_F_SEL_PIN);
     DL_GPIO_enableOutput(GPIOA, GPIO_F_LED_PIN_LED_F_EN_PIN |
 		GPIO_F_LED_PIN_LED_F_SEL_PIN);
+#endif
     DL_GPIO_setLowerPinsPolarity(GPIOA, DL_GPIO_PIN_8_EDGE_RISE_FALL);
     DL_GPIO_setUpperPinsPolarity(GPIOA, DL_GPIO_PIN_23_EDGE_RISE |
 		DL_GPIO_PIN_28_EDGE_RISE);