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

Merge branch 'prepare_for_master' of https://gitlink.org.cn/xuos/xiuos into prepare_for_master

Browse Source
This commit is contained in:
wlyu
2022-03-30 18:33:44 +08:00
parent 3b8c9a8ed4 ed3c39c9fd
commit 057a6d6bb4
352 changed files with 31132 additions and 535 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
APP_Framework/Framework/sensor/ch4/Kconfig
View File

@@ -43,6 +43,23 @@ config SENSOR_AS830
endif
if ADD_RTTHREAD_FETURES
config SENSOR_AS830_DRIVER_EXTUART
bool "Using extra uart to support as830"
default y
config SENSOR_DEVICE_AS830_DEV
string "as830 device uart path"
default "/dev/uart2"
depends on !SENSOR_AS830_DRIVER_EXTUART
if SENSOR_AS830_DRIVER_EXTUART
config SENSOR_DEVICE_AS830_DEV
string "as830 device extra uart path"
default "/dev/extuart_dev4"
config SENSOR_DEVICE_AS830_DEV_EXT_PORT
int "if AS830 device using extuart, choose port"
default "4"
endif
endif
endif

14
APP_Framework/Framework/sensor/ch4/SConscript Normal file
View File

@@ -0,0 +1,14 @@
import os
Import('RTT_ROOT')
from building import *
cwd = GetCurrentDir()
objs = []
list = os.listdir(cwd)
for d in list:
path = os.path.join(cwd, d)
if os.path.isfile(os.path.join(path, 'SConscript')):
objs = objs + SConscript(os.path.join(path, 'SConscript'))
Return('objs')

10
APP_Framework/Framework/sensor/ch4/as830/SConscript Normal file
View File

@@ -0,0 +1,10 @@
from building import *
import os
cwd = GetCurrentDir()
src = []
if GetDepend(['SENSOR_AS830']):
src += ['as830.c']
group = DefineGroup('sensor ch4 as830', src, depend = [], CPPPATH = [cwd])
Return('group')

17
APP_Framework/Framework/sensor/co2/Kconfig
View File

@@ -43,7 +43,24 @@ config SENSOR_ZG09
endif
if ADD_RTTHREAD_FETURES
config SENSOR_ZG09_DRIVER_EXTUART
bool "Using extra uart to support zg09"
default y
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
endif

10
APP_Framework/Framework/sensor/co2/zg09/SConscript Normal file
View File

@@ -0,0 +1,10 @@
from building import *
import os
cwd = GetCurrentDir()
src = []
if GetDepend(['SENSOR_ZG09']):
src += ['zg09.c']
group = DefineGroup('sensor co2 zg09', src, depend = [], CPPPATH = [cwd])
Return('group')

17
APP_Framework/Framework/sensor/hcho/Kconfig
View File

@@ -43,6 +43,23 @@ config SENSOR_TB600B_WQ_HCHO1OS
endif
if ADD_RTTHREAD_FETURES
config SENSOR_TB600B_WQ_HCHO1OS_DRIVER_EXTUART
bool "Using extra uart to support tb600b wq_hcho1os"
default y
config SENSOR_DEVICE_TB600B_WQ_HCHO1OS_DEV
string "tb600b wq_hcho1os device uart path"
default "/dev/uart2"
depends on !SENSOR_TB600B_WQ_HCHO1OS_DRIVER_EXTUART
if SENSOR_TB600B_WQ_HCHO1OS_DRIVER_EXTUART
config SENSOR_DEVICE_TB600B_WQ_HCHO1OS_DEV
string "tb600b wq_hcho1os device extra uart path"
default "/dev/extuart_dev1"
config SENSOR_DEVICE_TB600B_WQ_HCHO1OS_DEV_EXT_PORT
int "if TB600B_WQ_HCHO1OS device using extuart, choose port"
default "1"
endif
endif
endif

14
APP_Framework/Framework/sensor/hcho/SConscript Normal file
View File

@@ -0,0 +1,14 @@
import os
Import('RTT_ROOT')
from building import *
cwd = GetCurrentDir()
objs = []
list = os.listdir(cwd)
for d in list:
path = os.path.join(cwd, d)
if os.path.isfile(os.path.join(path, 'SConscript')):
objs = objs + SConscript(os.path.join(path, 'SConscript'))
Return('objs')

10
APP_Framework/Framework/sensor/hcho/tb600b_wq_hcho1os/SConscript Normal file
View File

@@ -0,0 +1,10 @@
from building import *
import os
cwd = GetCurrentDir()
src = []
if GetDepend(['SENSOR_TB600B_WQ_HCHO1OS']):
src += ['tb600b_wq_hcho1os.c']
group = DefineGroup('sensor hcho', src, depend = [], CPPPATH = [cwd])
Return('group')

17
APP_Framework/Framework/sensor/voice/Kconfig
View File

@@ -43,6 +43,23 @@ config SENSOR_D124
endif
if ADD_RTTHREAD_FETURES
config SENSOR_D124_DRIVER_EXTUART
bool "Using extra uart to support D124"
default y
config SENSOR_DEVICE_D124_DEV
string "D124 device name"
default "/dev/uart2_dev2"
depends on !SENSOR_D124_DRIVER_EXTUART
if SENSOR_D124_DRIVER_EXTUART
config SENSOR_DEVICE_D124_DEV
string "D124 device extra uart path"
default "/dev/extuart_dev4"
config SENSOR_DEVICE_D124_DEV_EXT_PORT
int "if D124 device using extuart, choose port"
default "4"
endif
endif
endif

5
APP_Framework/Framework/sensor/winddirection/Kconfig
View File

@@ -34,6 +34,11 @@ config SENSOR_QS_FX
endif
if ADD_NUTTX_FETURES
config SENSOR_DEVICE_QS_FX_DEV
string "qs-fx device name"
default "/dev/ttyS1"
---help---
If USART1 is selected, then fill in /dev/ttyS1 here.
endif

4
APP_Framework/Framework/sensor/winddirection/Make.defs Normal file
View File

@@ -0,0 +1,4 @@
############################################################################
# APP_Framework/Framework/sensor/winddirection/Make.defs
############################################################################
include $(wildcard $(APPDIR)/../../../APP_Framework/Framework/sensor/winddirection/*/Make.defs)

6
APP_Framework/Framework/sensor/winddirection/qs-fx/Make.defs Normal file
View File

@@ -0,0 +1,6 @@
############################################################################
# APP_Framework/Framework/sensor/winddirection/qs-fx/Make.defs
############################################################################
ifneq ($(CONFIG_SENSOR_QS_FX),)
CONFIGURED_APPS += $(APPDIR)/../../../APP_Framework/Framework/sensor/winddirection/qs-fx
endif

12
APP_Framework/Framework/sensor/winddirection/qs-fx/Makefile
View File

@@ -1,3 +1,11 @@
SRC_FILES := qs-fx.c
include $(KERNEL_ROOT)/.config
ifeq ($(CONFIG_ADD_NUTTX_FETURES),y)
include $(APPDIR)/Make.defs
CSRCS += qs-fx.c
include $(APPDIR)/Application.mk
endif
include $(KERNEL_ROOT)/compiler.mk
ifeq ($(CONFIG_ADD_XIZI_FETURES),y)
SRC_FILES := qs-fx.c
include $(KERNEL_ROOT)/compiler.mk
endif

15
APP_Framework/Framework/sensor/winddirection/qs-fx/qs-fx.c
View File

@@ -35,6 +35,18 @@ static struct SensorProductInfo info =
* @param sdev - sensor device pointer
* @return success: 1 , failure: other
*/
#ifdef ADD_NUTTX_FETURES
static int SensorDeviceOpen(struct SensorDevice *sdev)
{
sdev->fd = PrivOpen(SENSOR_DEVICE_QS_FX_DEV, O_RDWR);
if (sdev->fd < 0) {
printf("open %s error\n", SENSOR_DEVICE_QS_FX_DEV);
return -1;
}
return sdev->fd ;
}
#else
static int SensorDeviceOpen(struct SensorDevice *sdev)
{
int result = 0;
@@ -64,7 +76,8 @@ static int SensorDeviceOpen(struct SensorDevice *sdev)
result = PrivIoctl(sdev->fd, OPE_INT, &ioctl_cfg);
return result;
}
}
#endif
/**
* @description: Read sensor device

5
APP_Framework/Framework/sensor/windspeed/Kconfig
View File

@@ -34,6 +34,11 @@ config SENSOR_QS_FS
endif
if ADD_NUTTX_FETURES
config SENSOR_DEVICE_QS_FS_DEV
string "qs-fx device name"
default "/dev/ttyS1"
---help---
If USART1 is selected, then fill in /dev/ttyS1 here.
endif

4
APP_Framework/Framework/sensor/windspeed/Make.defs Normal file
View File

@@ -0,0 +1,4 @@
############################################################################
# APP_Framework/Framework/sensor/windspeed/Make.defs
############################################################################
include $(wildcard $(APPDIR)/../../../APP_Framework/Framework/sensor/windspeed/*/Make.defs)

6
APP_Framework/Framework/sensor/windspeed/qs-fs/Make.defs Normal file
View File

@@ -0,0 +1,6 @@
############################################################################
# APP_Framework/Framework/sensor/windspeed/qs-fs/Make.defs
############################################################################
ifneq ($(CONFIG_SENSOR_QS_FS),)
CONFIGURED_APPS += $(APPDIR)/../../../APP_Framework/Framework/sensor/windspeed/qs-fs
endif

12
APP_Framework/Framework/sensor/windspeed/qs-fs/Makefile
View File

@@ -1,3 +1,11 @@
SRC_FILES := qs-fs.c
include $(KERNEL_ROOT)/.config
ifeq ($(CONFIG_ADD_NUTTX_FETURES),y)
include $(APPDIR)/Make.defs
CSRCS += qs-fs.c
include $(APPDIR)/Application.mk
endif
include $(KERNEL_ROOT)/compiler.mk
ifeq ($(CONFIG_ADD_XIZI_FETURES),y)
SRC_FILES := qs-fs.c
include $(KERNEL_ROOT)/compiler.mk
endif

12
APP_Framework/Framework/sensor/windspeed/qs-fs/qs-fs.c
View File

@@ -35,6 +35,17 @@ static struct SensorProductInfo info =
* @param sdev - sensor device pointer
* @return success: 1 , failure: other
*/
#ifdef ADD_NUTTX_FETURES
static int SensorDeviceOpen(struct SensorDevice *sdev)
{
sdev->fd = PrivOpen(SENSOR_DEVICE_QS_FS_DEV, O_RDWR);
if (sdev->fd < 0) {
printf("open %s error\n", SENSOR_DEVICE_QS_FS_DEV);
return -1;
}
return sdev->fd;
}
#else
static int SensorDeviceOpen(struct SensorDevice *sdev)
{
int result = 0;
@@ -65,6 +76,7 @@ static int SensorDeviceOpen(struct SensorDevice *sdev)
return result;
}
#endif
/**
* @description: Read sensor device