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

APP_Framework/Applications/app_test/test_spi_flash.c

@@ -1,21 +1,7 @@
 /*
- * File      : spi_flash_sfud.c
- * This file is part of RT-Thread RTOS
- * COPYRIGHT (C) 2006 - 2016, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
  *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Change Logs:
  * Date           Author       Notes

APP_Framework/Applications/sensor_app/Makefile

@@ -47,6 +47,14 @@ ifeq ($(CONFIG_ADD_NUTTX_FETURES),y)
         CSRCS += temperature_hs300x.c
     endif
 
+    ifeq ($(CONFIG_APPLICATION_SENSOR_WINDDIRECTION_QS_FX), y)
+        CSRCS += winddirection_qs_fx.c
+    endif
+
+    ifeq ($(CONFIG_APPLICATION_SENSOR_WINDSPEED_QS_FS), y)
+        CSRCS += windspeed_qs_fs.c
+    endif
+
     include $(APPDIR)/Application.mk
 
 endif

APP_Framework/Applications/sensor_app/SConscript

@@ -15,6 +15,10 @@ if GetDepend(['APPLICATION_SENSOR_HUMIDITY_HS300X']):
     SOURCES = ['humidity_hs300x.c'] + SOURCES
 if GetDepend(['APPLICATION_SENSOR_TEMPERATURE_HS300X']):
     SOURCES = ['temperature_hs300x.c'] + SOURCES
+if GetDepend(['APPLICATION_SENSOR_CH4_AS830']):
+    SOURCES = ['ch4_as830.c'] + SOURCES
+if GetDepend(['APPLICATION_SENSOR_HCHO']):
+    SOURCES = ['hcho_tb600b_wq_hcho1os.c'] + SOURCES
 path =  [cwd]
 objs = DefineGroup('sensor_app', src = SOURCES, depend = DEPENDS,CPPPATH = path) 
 Return("objs") 

APP_Framework/Applications/sensor_app/winddirection_qs_fx.c

@@ -34,5 +34,7 @@ void WindDirectionQsFx(void)
     printf("wind direction : %d degree\n", result);
     SensorQuantityClose(wind_direction);
 }
+#ifdef ADD_XIZI_FETURES
 SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0)|SHELL_CMD_TYPE(SHELL_TYPE_CMD_FUNC)|SHELL_CMD_PARAM_NUM(0)|SHELL_CMD_DISABLE_RETURN, WindDirectionQsFx, WindDirectionQsFx, WindDirectionQsFx function);
+#endif
 

APP_Framework/Applications/sensor_app/windspeed_qs_fs.c

@@ -34,5 +34,7 @@ void WindSpeedQsFs(void)
     printf("wind speed : %d.%d m/s\n", result/10, result%10);
     SensorQuantityClose(wind_speed);
 }
+#ifdef ADD_XIZI_FETURES
 SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0)|SHELL_CMD_TYPE(SHELL_TYPE_CMD_FUNC)|SHELL_CMD_PARAM_NUM(0)|SHELL_CMD_DISABLE_RETURN, WindSpeedQsFs, WindSpeedQsFs, WindSpeedQsFs function);
+#endif