From abe15281a192328ee305efe37397eae513549de0 Mon Sep 17 00:00:00 2001
From: andreas <andreas@wellenvogel.de>
Date: Fri, 15 Nov 2024 18:39:38 +0100
Subject: [PATCH] #71: add BMP280 and env IV to cibuild

---
 lib/hardware/GwM5Grove.in  | 46 ++++++++++++++++++++++--------------
 lib/iictask/GwBMP280.cpp   |  3 +--
 lib/iictask/platformio.ini | 12 +++++++++-
 webinstall/build.yaml      | 48 ++++++++++++++++++++++++++++++++++++++
 4 files changed, 89 insertions(+), 20 deletions(-)

diff --git a/lib/hardware/GwM5Grove.in b/lib/hardware/GwM5Grove.in
index 75dad36a..9c05fbf0 100644
--- a/lib/hardware/GwM5Grove.in
+++ b/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
 
diff --git a/lib/iictask/GwBMP280.cpp b/lib/iictask/GwBMP280.cpp
index 11878bfd..a9efe480 100644
--- a/lib/iictask/GwBMP280.cpp
+++ b/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);
diff --git a/lib/iictask/platformio.ini b/lib/iictask/platformio.ini
index a7857972..09151617 100644
--- a/lib/iictask/platformio.ini
+++ b/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
diff --git a/webinstall/build.yaml b/webinstall/build.yaml
index 569c95cd..176dc6f2 100644
--- a/webinstall/build.yaml
+++ b/webinstall/build.yaml
@@ -51,6 +51,16 @@ types:
           - value: M5_ENV3#grv#
             key: true
             resource: qmp69881#grv#1,sht3x#grv#1
+      - label: "M5 ENV4"
+        type: checkbox
+        key: m5env4#grv#
+        target: define
+        url: "https://docs.m5stack.com/en/unit/ENV%E2%85%A3%20Unit"
+        description: "M5 sensor module temperature, humidity, pressure"
+        values:
+          - value: M5_ENV4#grv#
+            key: true
+            resource: bmp280#grv#1,sht3x#grv#1
       - type: checkbox
         label: SHT3X-1
         description: "SHT30 temperature and humidity sensor 0x44"
@@ -111,6 +121,26 @@ types:
           - key: true
             value: GWBME280G2#grv#
             resource: bme280#grv#2
+      - type: checkbox
+        label: BMP280-1
+        description: "BMP280 temperature/humidity/pressure sensor 0x76"
+        key: bmp2801g1
+        target: define
+        url: "https://www.bosch-sensortec.com/media/boschsensortec/downloads/datasheets/bst-bmp280-ds001.pdf"
+        values: 
+          - key: true
+            value: GWBMP280G1#grv#
+            resource: bmp280#grv#1
+      - type: checkbox
+        label: BMP280-2
+        description: "BMP280 temperature/humidity/pressure sensor 0x77"
+        key: bmp2802
+        target: define
+        url: "https://www.bosch-sensortec.com/media/boschsensortec/downloads/datasheets/bst-bmp280-ds001.pdf"
+        values: 
+          - key: true
+            value: GWBMP280G2#grv#
+            resource: bmp280#grv#2
   
 
   - &m5groovecan
@@ -498,6 +528,24 @@ types:
             values: 
               - key: true
                 value: GWBME280#busname#2
+          - type: checkbox
+            label: BMP280-#busname#-1
+            description: "BMP280 temperature/humidity/pressure sensor 0x76"
+            key: bmp2801
+            target: define
+            url: "https://www.bosch-sensortec.com/media/boschsensortec/downloads/datasheets/bst-bmp280-ds001.pdf"
+            values: 
+              - key: true
+                value: GWBMP280#busname#1
+          - type: checkbox
+            label: BMP280-#busname#-2
+            description: "BME280 temperature/humidity/pressure sensor 0x77"
+            key: bmp2802
+            target: define
+            url: "https://www.bosch-sensortec.com/media/boschsensortec/downloads/datasheets/bst-bmp280-ds001.pdf"
+            values: 
+              - key: true
+                value: GWBMP280#busname#2
   
   - &spisensors
     type: checkbox