autotest/xiuos
1
0
Fork 0
forked from xuos/xiuos
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

modify sensor framework extuart path configure

Browse Source
This commit is contained in:
Liu_Weichao
2021-09-08 16:23:08 +08:00
parent 281482855d
commit 7f5192351a
8 changed files with 63 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
APP_Framework/Framework/sensor/co2/Kconfig
+17 -6
View File
@@ -13,13 +13,24 @@ config SENSOR_ZG09
default "co2_1"
if ADD_XIUOS_FETURES
config SENSOR_DEVICE_ZG09_DEV
string "zg09 device name"
default "/dev/uart2_dev2"
config SENSOR_ZG09_DRIVER_EXTUART
bool "Using extra uart to support zg09"
default y
config SENSOR_DEVICE_ZG09_DEV_EXT_PORT
int "if ZG09 device using extuart, choose port"
default "4"
config SENSOR_DEVICE_ZG09_DEV
string "zg09 device uart path"
default "/dev/uart2_dev2"
depends on !SENSOR_ZG09_DRIVER_EXTUART
if SENSOR_ZG09_DRIVER_EXTUART
config SENSOR_DEVICE_ZG09_DEV
string "zg09 device extra uart path"
default "/dev/extuart_dev4"
config SENSOR_DEVICE_ZG09_DEV_EXT_PORT
int "if ZG09 device using extuart, choose port"
default "4"
endif
endif
if ADD_NUTTX_FETURES
APP_Framework/Framework/sensor/co2/zg09/zg09.c
+5 -3
View File
@@ -40,7 +40,7 @@ static struct SensorProductInfo info =
*/
static int SensorDeviceOpen(struct SensorDevice *sdev)
{
int result = 1;
int result = 0;
sdev->fd = PrivOpen(SENSOR_DEVICE_ZG09_DEV, O_RDWR);
@@ -52,8 +52,10 @@ static int SensorDeviceOpen(struct SensorDevice *sdev)
cfg.serial_parity_mode = PARITY_NONE;
cfg.serial_bit_order = 0;
cfg.serial_invert_mode = 0;
#ifdef SENSOR_ZG09_DRIVER_EXTUART
cfg.ext_uart_no = SENSOR_DEVICE_ZG09_DEV_EXT_PORT;
cfg.port_configure = PORT_CFG_INIT;
#endif
struct PrivIoctlCfg ioctl_cfg;
ioctl_cfg.ioctl_driver_type = SERIAL_TYPE;
@@ -115,7 +117,7 @@ static int SensorDeviceIoctl(struct SensorDevice *sdev, int cmd)
sdev->done->read(sdev, 8);
if (memcmp(sdev->buffer, zg09_set_passive, 8) == 0) {
sdev->status = SENSOR_DEVICE_PASSIVE;
return 1;
return 0;
}
break;
@@ -124,7 +126,7 @@ static int SensorDeviceIoctl(struct SensorDevice *sdev, int cmd)
sdev->done->read(sdev, 8);
if (memcmp(sdev->buffer, zg09_set_active, 8) == 0) {
sdev->status = SENSOR_DEVICE_ACTIVE;
return 1;
return 0;
}
break;