Просмотр исходного кода

change SP600 15HA define for uart&capacity

Signed-off-by: huhui <huhui@sharkgulf.com>
huhui 5 лет назад
Родитель
Сommit
4e16b91073
3 измененных файлов с 14 добавлено и 7 удалено
  1. 6 5
      Application/bsp/shark_bsp.h
  2. 7 1
      Application/bsp/uart.c
  3. 1 1
      Project/SP600_15AH.uvprojx

+ 6 - 5
Application/bsp/shark_bsp.h

@@ -28,16 +28,17 @@
 #define MAX_HA (30.0f)
 #define MAX_SOFT_CURRENT (45)
 #define MAX_I2T  (2500.0f)
+#define UART_NUM 2
 #elif (CONFIG_BOARD_TYPE==SHARK_BOARD_SP600)
 #define r_resistor 2.0f
-#define MAX_HA (22.5f)
-#define MAX_SOFT_CURRENT (23)
-#define MAX_I2T  (900.0f)
-#elif (CONFIG_BOARD_TYPE==SHARK_BOARD_SP600_15AH)
-#define r_resistor 2.0f
+#ifdef CONFIG_CAP_15AH
 #define MAX_HA (15.0f)
+#else
+#define MAX_HA (22.5f)
+#endif
 #define MAX_SOFT_CURRENT (23)
 #define MAX_I2T  (900.0f)
+#define UART_NUM 1
 #endif
 
 #define CELLS_NUM 15

+ 7 - 1
Application/bsp/uart.c

@@ -40,9 +40,11 @@
 // ================================================================================
 
 static u8 shark_uart0_tx_cache[SHARK_UART_TX_MEM_SIZE];
+#if UART_NUM==2
 static u8 shark_uart1_tx_cache[SHARK_UART_TX_MEM_SIZE];
+#endif
 static u8 shark_uart_rx_cache[SHARK_UART_RX_MEM_SIZE];
-static shark_uart_t _shark_uart[2];
+static shark_uart_t _shark_uart[UART_NUM];
 static shark_task_t _uart_task;
 static u64 _rx_time;
 ///static bool uart_no_data = false;
@@ -328,7 +330,11 @@ void DMA_Channel3_4_IRQHandler(void){
 #endif
 
 static u8 *tx_cache_addr(uart_enum_t uart_no){
+#if UART_NUM==2
 	return (uart_no == SHARK_UART0)?shark_uart0_tx_cache:shark_uart1_tx_cache;
+#else
+	return shark_uart0_tx_cache;
+#endif
 }
 
 void shark_uart_deinit(uart_enum_t uart_no){

+ 1 - 1
Project/SP600_15AH.uvprojx

@@ -337,7 +337,7 @@
             <v6Rtti>0</v6Rtti>
             <VariousControls>
               <MiscControls></MiscControls>
-              <Define>CONFIG_BOARD_SP600,CONFIG_CAN_IAP</Define>
+              <Define>CONFIG_BOARD_SP600,CONFIG_CAN_IAP,CONFIG_CAP_15AH</Define>
               <Undefine></Undefine>
               <IncludePath>..\Librarys\CMSIS\5.7.0\Include;..\Librarys\CMSIS\GD32F3x0\Include;..\Librarys\GD32F3x0_Drivers\include;..\Application\app;..\Application</IncludePath>
             </VariousControls>