Ver Fonte

[bt6708]add init pins

balbekova há 6 anos atrás
pai
commit
2951c36d07

+ 3 - 1
config/board.h

@@ -3,8 +3,10 @@
 
 #if defined HARDWARE_BT6702
 #include "board_bt6702.h"
-#elif defined HARDWARE_BT6706 || HARDWARE_BT6708
+#elif defined HARDWARE_BT6706
 #include "board_bt6706.h"
+#elif defined HARDWARE_BT6708
+#include "board_bt6708.h"
 #endif
 
 #define EXPAND_AS_ENUM(name, ...) name,

+ 49 - 0
config/board_bt6708.h

@@ -0,0 +1,49 @@
+#ifndef BOARD_BT6708_H
+#define BOARD_BT6708_H
+
+#define SERVICE_RS232_UART_TABLE(X)     \
+X( SERVICE_TXDINT,   GPIOD,   5, AF_USART1) \
+X( SERVICE_RXDINT,   GPIOD,   6, AF_USART1)
+
+#define RS232_UART_TABLE(X)     \
+X( TXDINT,   GPIOA,   9, AF_USART2) \
+X( RXDINT,   GPIOA,   10, AF_USART2)
+
+#define SPI2_TABLE(X) \
+X( SPI2_MISO,   GPIOB,  14, AF_SPI2) \
+X( SPI2_MOSI,   GPIOB,  15, AF_SPI2) \
+X( SPI2_SCK,    GPIOB,  10, AF_SPI2) \
+X( SPI2_NSS,    GPIOB,  9,  GPIO_OUT | GPIO_SET)
+
+#define MCU_PERIPHERALS(X)  \
+SERVICE_RS232_UART_TABLE(X)\
+RS232_UART_TABLE(X) \
+SPI2_TABLE(X)
+
+#define LEDS(X) \
+X( LED_INIT_R,  GPIOA,  4,  GPIO_OUT | GPIO_INV) \
+X( LED_INIT_G,  GPIOA,  3,  GPIO_OUT | GPIO_INV) \
+X( LED_MAJOR_R, GPIOA,  5,  GPIO_OUT | GPIO_INV) \
+X( LED_MINOR_G, GPIOE,  11, GPIO_OUT | GPIO_INV) \
+X( LED_MINOR_R, GPIOE,  12, GPIO_OUT | GPIO_INV)
+
+#define JUMPERS(X) \
+X( MODE_JUMPER, GPIOE,  6,  GPIO_IN_PU | GPIO_INV)
+
+#define BUTTONS(X) \
+X( KEY_DEF,     GPIOE,  7,  GPIO_IN )//| GPIO_INV
+
+#define WDG_PIN(X) \
+X( _WDG,     GPIOE,   15, GPIO_OUT)
+
+#define GPIO_TABLE(X)   \
+MCU_PERIPHERALS(X)  \
+LEDS(X)             \
+JUMPERS(X) \
+BUTTONS(X)      \
+WDG_PIN(X)
+
+
+#define MAX_IRQ_HANDLERS 4
+
+#endif /* BOARD_PRS_H */

+ 2 - 1
modules/d_inouts/d_inouts.c

@@ -11,7 +11,7 @@
 #ifdef PRINTF_CUSTOM
 #include "tinystdio.h"
 #endif
-
+#ifndef HARDWARE_BT6708
 #define INOUTS_EXPAND_AS_GPIO_GET(id, ...) 		\
 		inputs[id - DIN1] = gpio_get(id);
 
@@ -119,3 +119,4 @@ void d_inouts_test(void *arg) {
 	}
 }
 	
+#endif

+ 2 - 2
modules/d_inouts/d_inouts.h

@@ -3,7 +3,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdlib.h>
-
+#ifndef HARDWARE_BT6708
 #define INOUTS_EXPAND_AS_ENUM(name, ...) name ## _,
 
 
@@ -27,5 +27,5 @@ bool set_outputs(uint8_t *outputs_p);
 
 uint8_t get_state_din_outs(gpio_t pin);
 void set_state_douts(gpio_t pin, uint8_t value);
-
+#endif
 #endif /* D_INOUTS_H */

+ 4 - 4
service_hw/Commands/bt_6701_commands.c

@@ -98,14 +98,14 @@ void Test_U232(void)
     printf("U232 OK\r\n");
     TEST_SetTest(TEST_WAIT);
 }
-
+#ifndef HARDWARE_BT6708
 /**
   * @brief  
   */
 void Test_DRY(void)
 {
     uint8_t inputState;
-#if defined HARDWARE_BT6706 || HARDWARE_BT6708
+#if defined HARDWARE_BT6706
     uint8_t start_state = 0;
     uint8_t end_state = 1;
     set_state_douts(DOUT1, 1);
@@ -163,7 +163,7 @@ void Test_DRY(void)
 	}
 
 	vTaskDelay(10);
-#if defined HARDWARE_BT6706 || HARDWARE_BT6708
+#if defined HARDWARE_BT6706
     inputState = get_state_din_outs(DIN1);
 
 	set_state_douts(DOUT3, start_state);
@@ -192,7 +192,7 @@ void Test_DRY(void)
     printf("DRY OK\r\n");
     TEST_SetTest(TEST_WAIT);
 }
-
+#endif
 /**
   * @brief  
   */

+ 2 - 2
service_hw/Commands/commands_api.c

@@ -132,11 +132,11 @@ void vTestCommands(void *params)
             case TEST_U232 :
                 Test_U232();
             break;
-          
+#ifndef HARDWARE_BT6708
             case TEST_DRY :
                 Test_DRY();
             break;
-
+#endif
             case TEST_DEF :
                 if (!ifTest_DEF) {
                     ifTest_DEF = true;

+ 2 - 0
service_hw/Commands/commands_api.h

@@ -50,7 +50,9 @@ typedef enum
 void TestProcessing(void);
 
 void Test_U232U485(void);
+#ifndef HARDWARE_BT6708
 void Test_DRY(void);
+#endif
 void Test_U232F(void);
 void vTest_DEF(void *params);
 void vTest_SET(void *params);