Merge branch 'prepare_for_master' of https://git.trustie.net/xuos/xiuos into wgz

2022-03-23 15:16:11 +08:00
parent 40d0320ef8 0340217e24
commit 3d647fc6e6
114 changed files with 6991 additions and 1190 deletions
--- a/APP_Framework/Applications/sensor_app/SConscript
+++ b/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")