1、同步串口错误

pro/src/app.c

@@ -645,29 +645,14 @@ int dev_sensor_init(GlobalDeviceManager *_globalDeviceManager)
 {
     int ret = 0;
 
-    // 初始化modbus,搜寻子设备
-    if (_globalDeviceManager->_global_device_info->product_type == 2 &&
-        _globalDeviceManager->_global_device_info->product_pwr_type == 1)
-    {
-        ret = g_modbus_init(&_globalDeviceManager->sensor_modbus_manager,
-                            INTERL_485_SENSOR_MODBUS_PORT, // _globalSensorMangerTemp->sensor_port_name,
-                            INTERL_485_SENSOR_MODBUS_BAUD, // _globalSensorMangerTemp->sensor_baud,
-                            MASTER_MODE,
-                            0,
-                            "sensor",
-                            1);
-    }
-    else
-    {
+    ret = g_modbus_init(&_globalDeviceManager->sensor_modbus_manager,
+                        INTERL_SENSOR_MODBUS_PORT, // _globalSensorMangerTemp->sensor_port_name,
+                        INTERL_SENSOR_MODBUS_BAUD, // _globalSensorMangerTemp->sensor_baud,
+                        MASTER_MODE,
+                        0,
+                        "sensor",
+                        1);
 
-        ret = g_modbus_init(&_globalDeviceManager->sensor_modbus_manager,
-                            INTERL_SENSOR_MODBUS_PORT, // _globalSensorMangerTemp->sensor_port_name,
-                            INTERL_SENSOR_MODBUS_BAUD, // _globalSensorMangerTemp->sensor_baud,
-                            MASTER_MODE,
-                            0,
-                            "sensor",
-                            1);
-    }
     if (ret != 0)
     {
         log_e("sensor modbus init error.\n");

pro/src/cascade.c

@@ -1029,9 +1029,9 @@ static int set_modbus(cascade_handle_t *cas, ModbusInfo_t *info)
         mb_deinit(cas);
     }
     cas->inited = 0;
-    LOGD("master init modbus:  port: %s, type: %d, baud: %d\n", INTERL_485_CASCADE_PORT, info->product_modbus_type, info->product_modbus_baud);
+    LOGD("master init modbus:  port: %s, type: %d, baud: %d\n", CASCADE_MODBUS_PORT, info->product_modbus_type, info->product_modbus_baud);
 
-    r = mb_init(cas, INTERL_485_CASCADE_PORT, info->product_modbus_type,
+    r = mb_init(cas, CASCADE_MODBUS_PORT, info->product_modbus_type,
                   info->product_modbus_addr, info->product_modbus_baud);
     if(r!=0) {
         LOGE("cascade modbus init error.\n");

pro/src/common.h

@@ -49,16 +49,6 @@
 #define INTERL_SENSOR_MODBUS_PORT "/dev/ttyAS2"
 #define INTERL_SENSOR_MODBUS_BAUD 9600
 
-//IP表头串口定义-----------------------------------------------------
-//485温湿度传感器    选择串口1
-#define INTERL_485_SENSOR_MODBUS_PORT "/dev/ttyS1"
-#define INTERL_485_SENSOR_MODBUS_BAUD 9600
-//485级联选择串口
-#define INTERL_485_CASCADE_PORT "/dev/ttyS5"
-#define INTERL_485_CASCADE_BAUD 115200
-
-
-
 
 #define AC_SINGLE_S_CUR_CHN_NUM 8
 #define AC_SINGLE_B_CUR_CHN_NUM 4