diff --git a/BLE/DLD154Pro_Peripheral_28K/APP/include/cmcng.h b/BLE/DLD154Pro_Peripheral_28K/APP/include/cmcng.h index eeb96e2..9a5b9d1 100644 --- a/BLE/DLD154Pro_Peripheral_28K/APP/include/cmcng.h +++ b/BLE/DLD154Pro_Peripheral_28K/APP/include/cmcng.h @@ -17,10 +17,10 @@ */ #define PRODUCT_MODEL "DLD154Pro" -#define FIRMWARE_VER "3.01" +#define FIRMWARE_VER "3.02" #define HARDWARE_VER "3.01" #define FIRMWARE_VER_MAIN 3 -#define FIRMWARE_VER_SUB 1 +#define FIRMWARE_VER_SUB 2 #define HARDWARE_VER_MAIN 3 #define HARDWARE_VER_SUB 1 diff --git a/BLE/DLD154Pro_Peripheral_28K/APP/peripheral_main.c b/BLE/DLD154Pro_Peripheral_28K/APP/peripheral_main.c index cac4880..a79e426 100644 --- a/BLE/DLD154Pro_Peripheral_28K/APP/peripheral_main.c +++ b/BLE/DLD154Pro_Peripheral_28K/APP/peripheral_main.c @@ -393,9 +393,9 @@ void tm_init(void){ void gpio_uart_init(void) { - /*--- RS485 通信 (PA14=TX, PA15=RX, PA13=RE) ---*/ - rs485_init(); /* 初始化 UART0 + GPIO + 中断 */ - modbus_init(); /* 初始化 Modbus 协议状态 */ + // /*--- RS485 通信 (PA14=TX, PA15=RX, PA13=RE) ---*/ + // rs485_init(); /* 初始化 UART0 + GPIO + 中断 */ + // modbus_init(); /* 初始化 Modbus 协议状态 */ /*--- 光耦输入 (PB10=IN_1) ---*/ R32_PIN_CONFIG2 &= ~(1UL << 26); // 使能 PB10 数字输入 (默认关闭省电) @@ -1083,6 +1083,9 @@ int main(void) g_loop_sens_list.total = MAX_LOOP_SENS_AMOUNT; // max INIT_VD(); para_store_init(); + /*--- RS485 通信 (PA14=TX, PA15=RX, PA13=RE) ---*/ + rs485_init(); /* 初始化 UART0 + GPIO + 中断 */ + modbus_init(); /* 初始化 Modbus 协议状态 */ tm_init();