#71: add BMP280 and env IV to cibuild

lib/hardware/GwM5Grove.in

@@ -63,6 +63,17 @@
   #define _GWQMP6988
 #endif
 
+#GROVE
+#ifdef M5_ENV4$GS$
+  #ifndef M5_GROOVEIIC$GS$
+    #define M5_GROOVEIIC$GS$
+  #endif
+  GROOVE_IIC(SHT3X,$Z$,1)
+  GROOVE_IIC(BMP280,$Z$,1)
+  #define _GWSHT3X
+  #define _BMP280
+#endif
+
 #GROVE
 //example: -DSHT3XG1_A : defines STH3Xn1 on grove A - x depends on the other devices
 #ifdef GWSHT3XG1$GS$
@@ -118,6 +129,24 @@
   #define _GWBME280
 #endif
 
+#GROVE
+#ifdef GWBMP280G1$GS$
+  #ifndef M5_GROOVEIIC$GS$
+    #define M5_GROOVEIIC$GS$
+  #endif
+  GROOVE_IIC(BMP280,$Z$,1)
+  #define _GWBMP280
+#endif
+
+#GROVE
+#ifdef GWBMP280G2$GS$
+  #ifndef M5_GROOVEIIC$GS$
+    #define M5_GROOVEIIC$GS$
+  #endif
+  GROOVE_IIC(BMP280,$Z$,2)
+  #define _GWBMP280
+#endif
+
 #GROVE
 //select up to 2 IIC devices for grove usage
 #ifdef M5_GROOVEIIC$GS$
@@ -144,21 +173,4 @@
   #endif
 #endif
 
-#GROVE
-#ifdef GWBMP280G1$GS$
-  #ifndef M5_GROOVEIIC$GS$
-    #define M5_GROOVEIIC$GS$
-  #endif
-  GROOVE_IIC(BMP280,$Z$,1)
-  #define _GWBMP280
-#endif
-
-#GROVE
-#ifdef GWBMP280G2$GS$
-  #ifndef M5_GROOVEIIC$GS$
-    #define M5_GROOVEIIC$GS$
-  #endif
-  GROOVE_IIC(BMP280,$Z$,2)
-  #define _GWBMP280
-#endif
 

lib/iictask/GwBMP280.cpp

@@ -39,8 +39,7 @@ class BMP280Config : public IICSensorBase{
         }
     virtual bool isActive(){return prAct||tmAct;}
     virtual bool initDevice(GwApi *api,TwoWire *wire){
-        GwLog *logger=api->getLogger();
-	//Wire.begin(GWIIC_SDA,GWIIC_SCL);        
+        GwLog *logger=api->getLogger();  
         device= new Adafruit_BMP280(wire);
         if (! device->begin(addr)){
             LOG_DEBUG(GwLog::ERROR,"unable to initialize %s at %d",prefix.c_str(),addr);

lib/iictask/platformio.ini

@@ -11,6 +11,17 @@ build_flags=
     -D M5_CAN_KIT
     ${env.build_flags}
 
+[env:m5stack-atom-env4]
+extends = sensors
+board = m5stack-atom
+lib_deps = 
+    ${env.lib_deps}
+    ${sensors.lib_deps}
+build_flags=
+    -D M5_ENV4
+    -D M5_CAN_KIT
+    ${env.build_flags}
+
 [env:m5stack-atom-bme280]
 extends = sensors
 board = m5stack-atom
@@ -43,7 +54,6 @@ lib_deps =
     ${env.lib_deps}
     ${sensors.lib_deps}
 build_flags=
-    #-D M5_ENVBPS
     -D GWBMP280
     -D M5_GROOVEIIC
     -D M5_CAN_KIT