diff --git a/Board/Board.h b/Board/Board.h index 853a064..ddf41d2 100644 --- a/Board/Board.h +++ b/Board/Board.h @@ -5,34 +5,35 @@ #ifndef _BOARD_H #define _BOARD_H +/* Voilet Bsp */ +#include "VoiletPort.h" + /* Chip Library Enable */ /* Extra Library Enable */ #define TTY_COM COM1 #define TTY_BAUD 115200 -//GPIO -//数组信号输入/出开关 -#define DI_ON 1 -#define DI_OFF 0 -#define DO_ON 1 -#define DO_OFF 0 -//LED灯开关 -#define LED_ON 0 -#define LED_OFF 1 - #define LED_NUM 2 //LED灯数量 -#if (LED_NUM != 0) -#define LED0 0 -#define LED1 1 -#endif +enum { + LED0 = 0, + LED1 +}; -#define DI_NUM 0 -#if (DI_NUM != 0) -#endif +#define DI_NUM 0 //数字信号输入通道数量 +// enum { +// +// }; -#define DO_NUM 0 -#if (DO_NUM != 0) -#endif +#define DO_NUM 0 //数字信号输出通道数量 +// enum { +// +// }; + +#define RS485_1 COM1 +// #define RS485_2 +// #define RS485_3 +// #define RS485_4 +// #define RS485_5 #endif //_BOARD_H diff --git a/VoiletBspStm32F10x b/VoiletBspStm32F10x index 9f38c6e..0516210 160000 --- a/VoiletBspStm32F10x +++ b/VoiletBspStm32F10x @@ -1 +1 @@ -Subproject commit 9f38c6ea75a693fdd9f164e8ebced450e7ebeb23 +Subproject commit 0516210c95dba317ee670cfa66e3c26dfb809564