Browse Source

add iaq10 sensor support Nuttx

pull/124/head
wgzAIIT 7 months ago
parent
commit
1f252e418f
  1. 4
      APP_Framework/Applications/sensor_app/iaq_tb600b_iaq10.c
  2. 5
      APP_Framework/Framework/sensor/iaq/Kconfig
  3. 4
      APP_Framework/Framework/sensor/iaq/Make.defs
  4. 6
      APP_Framework/Framework/sensor/iaq/tb600b_iaq10/Make.defs
  5. 13
      APP_Framework/Framework/sensor/iaq/tb600b_iaq10/Makefile
  6. 12
      APP_Framework/Framework/sensor/iaq/tb600b_iaq10/tb600b_iaq10.c
  7. 4
      Ubiquitous/Nuttx/app_match_nuttx/apps/nshlib/Kconfig
  8. 4
      Ubiquitous/Nuttx/app_match_nuttx/apps/nshlib/nsh.h
  9. 15
      Ubiquitous/Nuttx/app_match_nuttx/apps/nshlib/nsh_Applicationscmd.c
  10. 4
      Ubiquitous/Nuttx/app_match_nuttx/apps/nshlib/nsh_command.c

4
APP_Framework/Applications/sensor_app/iaq_tb600b_iaq10.c

@ -18,7 +18,9 @@
* @date 2021.12.14
*/
#include <user_api.h>
#ifdef ADD_XIUOS_FETURES
# include <user_api.h>
#endif
#include <sensor.h>
// struct iaq_data {

5
APP_Framework/Framework/sensor/iaq/Kconfig

@ -34,6 +34,11 @@ config SENSOR_TB600B_IAQ10
endif
if ADD_NUTTX_FETURES
config SENSOR_DEVICE_TB600B_IAQ10_DEV
string "tb600b iaq10 device uart path"
default "/dev/ttyS1"
---help---
If USART1 is selected, then fill in /dev/ttyS1 here.
endif

4
APP_Framework/Framework/sensor/iaq/Make.defs

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

6
APP_Framework/Framework/sensor/iaq/tb600b_iaq10/Make.defs

@ -0,0 +1,6 @@
############################################################################
# APP_Framework/Framework/sensor/iaq/tb600b_iaq10/Make.defs
############################################################################
ifneq ($(CONFIG_SENSOR_TB600B_IAQ10),)
CONFIGURED_APPS += $(APPDIR)/../../../APP_Framework/Framework/sensor/iaq/tb600b_iaq10
endif

13
APP_Framework/Framework/sensor/iaq/tb600b_iaq10/Makefile

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

12
APP_Framework/Framework/sensor/iaq/tb600b_iaq10/tb600b_iaq10.c

@ -43,6 +43,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_TB600B_IAQ10_DEV, O_RDWR);
if (sdev->fd < 0) {
printf("open %s error\n", SENSOR_DEVICE_TB600B_IAQ10_DEV);
}
return sdev->fd;
}
#else
static int SensorDeviceOpen(struct SensorDevice *sdev)
{
int result = 0;
@ -73,6 +84,7 @@ static int SensorDeviceOpen(struct SensorDevice *sdev)
return result;
}
#endif
/**
* @description: Read sensor device

4
Ubiquitous/Nuttx/app_match_nuttx/apps/nshlib/Kconfig

@ -588,6 +588,10 @@ config NSH_DISABLE_XD
default y if DEFAULT_SMALL
default n if !DEFAULT_SMALL
config NSH_DISABLE_TB600B_IAQ10
bool "Disable the air quality function of the sensor TB600B-IAQ-10"
default n
config NSH_DISABLE_CO2ZG09
bool "Disable the co2 function of the sensor zg09"
default n

4
Ubiquitous/Nuttx/app_match_nuttx/apps/nshlib/nsh.h

@ -1403,6 +1403,10 @@ int nsh_foreach_var(FAR struct nsh_vtbl_s *vtbl, nsh_foreach_var_t cb,
FAR void *arg);
#endif
#if defined(CONFIG_APPLICATION_SENSOR_IAQ) && !defined(CONFIG_NSH_DISABLE_TB600B_IAQ10)
int cmd_Iaq10(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv);
#endif
#if defined(CONFIG_APPLICATION_SENSOR_CO2_ZG09) && !defined(CONFIG_NSH_DISABLE_CO2ZG09)
int cmd_Co2Zg09(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv);
#endif

15
Ubiquitous/Nuttx/app_match_nuttx/apps/nshlib/nsh_Applicationscmd.c

@ -52,6 +52,21 @@
extern int FrameworkInit(void);
/****************************************************************************
* Name: cmd_Iaq10
****************************************************************************/
#if defined(CONFIG_APPLICATION_SENSOR_IAQ) && !defined(CONFIG_NSH_DISABLE_TB600B_IAQ10)
extern void IaqTb600bIaq10(void);
int cmd_Iaq10(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
{
printf("Hello, world!\n");
FrameworkInit();
IaqTb600bIaq10();
return 0;
}
#endif
/****************************************************************************
* Name: cmd_Co2Zg09
****************************************************************************/

4
Ubiquitous/Nuttx/app_match_nuttx/apps/nshlib/nsh_command.c

@ -580,6 +580,10 @@ static const struct cmdmap_s g_cmdmap[] =
{ "xd", cmd_xd, 3, 3, "<hex-address> <byte-count>" },
#endif
#if defined(CONFIG_APPLICATION_SENSOR_IAQ) && !defined(CONFIG_NSH_DISABLE_TB600B_IAQ10)
{ "iaq10", cmd_Iaq10, 1, 1, "[get air quality data with sensor Tb600bIaq10.]" },
#endif
#if defined(CONFIG_APPLICATION_SENSOR_CO2_ZG09) && !defined(CONFIG_NSH_DISABLE_CO2ZG09)
{ "zg09", cmd_Co2Zg09, 1, 1, "[get co2 concentration with sensor ZG09.]" },
#endif

Loading…
Cancel
Save