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

APP_Framework/Applications/framework_init.c

@@ -32,6 +32,7 @@ extern int Ps5308Pm1_0Init(void);
 extern int Ps5308Pm2_5Init(void);
 extern int Ps5308Pm10Init(void);
 extern int Zg09Co2Init(void);
+extern int G8sCo2Init(void);
 extern int As830Ch4Init(void);
 extern int Tb600bIaq10IaqInit(void);
 extern int Tb600bTvoc10TvocInit(void);
@@ -106,6 +107,10 @@ static struct InitDesc sensor_desc[] =
 	{ "zg09_co2", Zg09Co2Init },
 #endif
 
+#ifdef SENSOR_G8S
+	{ "g8s_co2", G8sCo2Init },
+#endif
+
 #ifdef SENSOR_QS_FX
 	{ "qs_fx_wind_direction", QsFxWindDirectionInit },
 #endif

APP_Framework/Applications/main.c

@@ -24,7 +24,7 @@ int main(void)
 #ifdef APPLICATION_OTA
 	ApplicationOtaTaskInit();
 #endif
-    return 0;
+	return 0;
 }
 // int cppmain(void);
 

APP_Framework/Applications/sensor_app/Makefile

@@ -22,6 +22,11 @@ ifeq ($(CONFIG_ADD_NUTTX_FETURES),y)
     ifeq ($(CONFIG_APPLICATION_SENSOR_CO2_ZG09), y)
         CSRCS += co2_zg09.c
     endif
+    
+    ifeq ($(CONFIG_APPLICATION_SENSOR_CO2_G8S), y)
+        CSRCS += co2_g8s.c
+    endif
+    
 
     ifeq ($(CONFIG_APPLICATION_SENSOR_PM1_0_PS5308), y)
         CSRCS += pm1_0_ps5308.c

APP_Framework/Applications/sensor_app/co2_g8s.c

@@ -17,8 +17,10 @@
  * @author AIIT XUOS Lab
  * @date 2021.12.23
  */
-
-#include <user_api.h>
+//
+#ifdef ADD_XIZI_FETURES
+# include <user_api.h>
+#endif
 #include <sensor.h>
 
 /**