Add support for the pressure sensor on GIGA R1

alranel · alranel · commit 7dddcc9a907e · 2023-12-15T13:52:58.000+01:00
diff --git a/src/Arduino_SensorKit.cpp b/src/Arduino_SensorKit.cpp
@@ -18,4 +18,4 @@ U8X8_SSD1306_128X64_NONAME_HW_I2C Oled_HW(U8X8_PIN_NONE, _PIN_SCL, _PIN_SDA);
 SensorKit_DHT Environment(3,DHT11);
 DHT Environment_I2C(DHT20);
 SensorKit_LIS3DHTR Accelerometer(_WIRE);
-SensorKit_BMP280 Pressure;
+SensorKit_BMP280 Pressure(_WIRE);
diff --git a/src/Arduino_SensorKit_BMP280.cpp b/src/Arduino_SensorKit_BMP280.cpp
@@ -1,11 +1,7 @@
 #include "Arduino_SensorKit_BMP280.h"
 
-SensorKit_BMP280::SensorKit_BMP280(){
-
-}
-
 bool SensorKit_BMP280::begin(){
-    return BMP.init();
+    return BMP.init(*_wire);
 }
 
 float SensorKit_BMP280::readTemperature(){
diff --git a/src/Arduino_SensorKit_BMP280.h b/src/Arduino_SensorKit_BMP280.h
@@ -1,20 +1,22 @@
 #ifndef Arduino_SensorKit_BMP280_h
 #define Arduino_SensorKit_BMP280_h
 
-#include "Seeed_BMP280.h"
+#include "Grove_-_Barometer_Sensor_BMP280/Seeed_BMP280.h"
 
 class SensorKit_BMP280 {
 
     BMP280 BMP;
 
     public:
-        SensorKit_BMP280();
+        SensorKit_BMP280(TwoWire& w) : _wire(&w) {};
         bool begin();
         void end();
 
         float readTemperature();
         uint32_t readPressure();
         float readAltitude();
+    private:
+        TwoWire* _wire;
 };
 
 #endif
diff --git a/src/Grove_-_Barometer_Sensor_BMP280/License.txt b/src/Grove_-_Barometer_Sensor_BMP280/License.txt
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2016 Seeed Technology Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/src/Grove_-_Barometer_Sensor_BMP280/README.md b/src/Grove_-_Barometer_Sensor_BMP280/README.md
@@ -0,0 +1,27 @@
+# Grove_BMP280
+------------
+
+<img src=https://raw.githubusercontent.com/SeeedDocument/Grove-Barometer_Sensor-BMP280/master/img/Grove-Barometer_Sensor-BMP280-Components_1200_s.jpg width=auto>
+
+[Grove - Barometer Sensor (BMP280)](https://www.seeedstudio.com/s/Grove-Temp%26Humi%26Barometer-Sensor-(BME280)-p-2653.html)
+
+Thanks to Bosch, now we’ve got a high-precision environmental sensor at even lower cost, the Grove – Barometer Sensor(BMP280). It is based on their new BMP280 sensor, which is an upgraded version of the old BMP180 used in Grove – Barometer Sensor (BMP180). The module provides precise measurement of barometric pressure and temperature in the environment. The air pressure can be measured in a range from 300 hPa to 1100hPa with ±1.0 hPa absolute accuracy. As for the temperature the sensor works perfectly for temperatures between - 40 and 85 with an accuracy of ±1.
+
+Owing to its high accuracy on measuring the pressure, and the pressure changes with altitude, we can calculate the altitude with ±1 meter accuracy, which makes it a precise altimeter as well. Another great thing about this module is that, you don’t even need to worry about the I2C collisions as it provides both I2C and SPI interfaces. To use SPI, simply de-solder the bonding pads on the back. If you go with I2C, the board also provides 2 I2C addresses for you to select as you want.
+
+More information please visit [wiki page](http://wiki.seeedstudio.com/Grove-Barometer_Sensor-BMP280/).
+
+----
+
+This software is written by Lambor Fang (shijian.fanG@seeed.cc) for seeed studio<br>
+and is licensed under [The MIT License](http://opensource.org/licenses/mit-license.php). Check License.txt for more information.<br>
+
+
+Seeed Studio is an open hardware facilitation company based in Shenzhen, China. <br>
+Benefiting from local manufacture power and convenient global logistic system, <br>
+we integrate resources to serve new era of innovation. Seeed also works with <br>
+global distributors and partners to push open hardware movement.<br>
+
+
+[![Analytics](https://ga-beacon.appspot.com/UA-46589105-3/Grove_BMP280)](https://github.com/igrigorik/ga-beacon)
+
diff --git a/src/Grove_-_Barometer_Sensor_BMP280/Seeed_BMP280.cpp b/src/Grove_-_Barometer_Sensor_BMP280/Seeed_BMP280.cpp
@@ -0,0 +1,153 @@
+#include "Seeed_BMP280.h"
+
+bool BMP280::init(TwoWire& w)
+{
+  _wire = &w;
+  _wire->begin();
+
+  if(bmp280Read8(BMP280_REG_CHIPID) != 0x58)
+    return false;
+
+  dig_T1 = bmp280Read16LE(BMP280_REG_DIG_T1);
+  dig_T2 = bmp280ReadS16LE(BMP280_REG_DIG_T2);
+  dig_T3 = bmp280ReadS16LE(BMP280_REG_DIG_T3);
+
+  dig_P1 = bmp280Read16LE(BMP280_REG_DIG_P1);
+  dig_P2 = bmp280ReadS16LE(BMP280_REG_DIG_P2);
+  dig_P3 = bmp280ReadS16LE(BMP280_REG_DIG_P3);
+  dig_P4 = bmp280ReadS16LE(BMP280_REG_DIG_P4);
+  dig_P5 = bmp280ReadS16LE(BMP280_REG_DIG_P5);
+  dig_P6 = bmp280ReadS16LE(BMP280_REG_DIG_P6);
+  dig_P7 = bmp280ReadS16LE(BMP280_REG_DIG_P7);
+  dig_P8 = bmp280ReadS16LE(BMP280_REG_DIG_P8);
+  dig_P9 = bmp280ReadS16LE(BMP280_REG_DIG_P9);
+
+  writeRegister(BMP280_REG_CONTROL, 0x3F);
+  return true;
+}
+
+float BMP280::getTemperature(void)
+{
+  int32_t var1, var2;
+
+  int32_t adc_T = bmp280Read24(BMP280_REG_TEMPDATA);
+  adc_T >>= 4;
+  var1 = (((adc_T >> 3) - ((int32_t)(dig_T1 << 1))) *
+    ((int32_t)dig_T2)) >> 11;
+
+  var2 = (((((adc_T >> 4) - ((int32_t)dig_T1)) *
+    ((adc_T >> 4) - ((int32_t)dig_T1))) >> 12) *
+    ((int32_t)dig_T3)) >> 14;
+
+  t_fine = var1 + var2;
+  float T = (t_fine * 5 + 128) >> 8;
+  return T/100;
+}
+
+uint32_t BMP280::getPressure(void)
+{
+  int64_t var1, var2, p;
+
+  // Call getTemperature to get t_fine
+  getTemperature();
+
+  int32_t adc_P = bmp280Read24(BMP280_REG_PRESSUREDATA);
+  adc_P >>= 4;
+
+  var1 = ((int64_t)t_fine) - 128000;
+  var2 = var1 * var1 * (int64_t)dig_P6;
+  var2 = var2 + ((var1*(int64_t)dig_P5)<<17);
+  var2 = var2 + (((int64_t)dig_P4)<<35);
+  var1 = ((var1 * var1 * (int64_t)dig_P3)>>8) + ((var1 * (int64_t)dig_P2)<<12);
+  var1 = (((((int64_t)1)<<47)+var1))*((int64_t)dig_P1)>>33;
+  if (var1 == 0)
+  {
+  return 0; // avoid exception caused by division by zero
+  }
+  p = 1048576-adc_P;
+  p = (((p<<31)-var2)*3125)/var1;
+  var1 = (((int64_t)dig_P9) * (p>>13) * (p>>13)) >> 25;
+  var2 = (((int64_t)dig_P8) * p) >> 19;
+  p = ((p + var1 + var2) >> 8) + (((int64_t)dig_P7)<<4);
+  return (uint32_t)p/256;
+}
+
+float BMP280::calcAltitude(float pressure)
+{
+  float A = pressure/101325;
+  float B = 1/5.25588;
+  float C = pow(A,B);
+  C = 1.0 - C;
+  C = C /0.0000225577;
+  return C;
+}
+
+uint8_t BMP280::bmp280Read8(uint8_t reg)
+{
+  _wire->beginTransmission(BMP280_ADDRESS);
+  _wire->write(reg);
+  _wire->endTransmission();
+
+  _wire->requestFrom(BMP280_ADDRESS, 1);
+  while(!_wire->available());
+  return _wire->read();
+}
+
+uint16_t BMP280::bmp280Read16(uint8_t reg)
+{
+  uint8_t msb, lsb;
+
+  _wire->beginTransmission(BMP280_ADDRESS);
+  _wire->write(reg);
+  _wire->endTransmission();
+
+  _wire->requestFrom(BMP280_ADDRESS, 2);
+  while(_wire->available()<2);
+  msb = _wire->read();
+  lsb = _wire->read();
+
+  return (uint16_t) msb<<8 | lsb;
+}
+
+uint16_t BMP280::bmp280Read16LE(uint8_t reg)
+{
+  uint16_t data = bmp280Read16(reg);
+  return (data >> 8) | (data << 8);
+}
+
+int16_t BMP280::bmp280ReadS16(uint8_t reg)
+{
+  return (int16_t)bmp280Read16(reg);
+}
+
+int16_t BMP280::bmp280ReadS16LE(uint8_t reg)
+{
+  return (int16_t)bmp280Read16LE(reg);
+}
+
+uint32_t BMP280::bmp280Read24(uint8_t reg)
+{
+  uint32_t data;
+
+  _wire->beginTransmission(BMP280_ADDRESS);
+  _wire->write(reg);
+  _wire->endTransmission();
+
+  _wire->requestFrom(BMP280_ADDRESS, 3);
+  while(_wire->available()<3);
+  data = _wire->read();
+  data <<= 8;
+  data |= _wire->read();
+  data <<= 8;
+  data |= _wire->read();
+
+  return data;
+}
+
+void BMP280::writeRegister(uint8_t reg, uint8_t val)
+{
+  _wire->beginTransmission(BMP280_ADDRESS); // start transmission to device
+  _wire->write(reg);       // send register address
+  _wire->write(val);         // send value to write
+  _wire->endTransmission();     // end transmission
+}
diff --git a/src/Grove_-_Barometer_Sensor_BMP280/Seeed_BMP280.h b/src/Grove_-_Barometer_Sensor_BMP280/Seeed_BMP280.h
@@ -0,0 +1,69 @@
+#ifndef _SEEED_BMP280_H_
+#define _SEEED_BMP280_H_
+
+#include <Arduino.h>
+#include <Wire.h>
+
+#define BMP280_ADDRESS   0x77
+
+#define BMP280_REG_DIG_T1    0x88
+#define BMP280_REG_DIG_T2    0x8A
+#define BMP280_REG_DIG_T3    0x8C
+
+#define BMP280_REG_DIG_P1    0x8E
+#define BMP280_REG_DIG_P2    0x90
+#define BMP280_REG_DIG_P3    0x92
+#define BMP280_REG_DIG_P4    0x94
+#define BMP280_REG_DIG_P5    0x96
+#define BMP280_REG_DIG_P6    0x98
+#define BMP280_REG_DIG_P7    0x9A
+#define BMP280_REG_DIG_P8    0x9C
+#define BMP280_REG_DIG_P9    0x9E
+
+#define BMP280_REG_CHIPID          0xD0
+#define BMP280_REG_VERSION         0xD1
+#define BMP280_REG_SOFTRESET       0xE0
+
+#define BMP280_REG_CONTROL         0xF4
+#define BMP280_REG_CONFIG          0xF5
+#define BMP280_REG_PRESSUREDATA    0xF7
+#define BMP280_REG_TEMPDATA        0xFA
+
+
+class BMP280
+{
+public:
+  bool init(TwoWire& w = Wire);
+  float getTemperature(void);
+  uint32_t getPressure(void);
+  float calcAltitude(float pressure);
+private:
+  TwoWire* _wire;
+  
+  // Calibratino data
+  uint16_t dig_T1;
+  int16_t dig_T2;
+  int16_t dig_T3;
+
+  uint16_t dig_P1;
+  int16_t dig_P2;
+  int16_t dig_P3;
+  int16_t dig_P4;
+  int16_t dig_P5;
+  int16_t dig_P6;
+  int16_t dig_P7;
+  int16_t dig_P8;
+  int16_t dig_P9;
+
+  int32_t t_fine;
+
+  uint8_t bmp280Read8(uint8_t reg);
+  uint16_t bmp280Read16(uint8_t reg);
+  uint16_t bmp280Read16LE(uint8_t reg);
+  int16_t bmp280ReadS16(uint8_t reg);
+  int16_t bmp280ReadS16LE(uint8_t reg);
+  uint32_t bmp280Read24(uint8_t reg);
+  void writeRegister(uint8_t reg, uint8_t val);
+};
+
+#endif
diff --git a/src/Grove_-_Barometer_Sensor_BMP280/example/bmp280_example/bmp280_example.ino b/src/Grove_-_Barometer_Sensor_BMP280/example/bmp280_example/bmp280_example.ino
@@ -0,0 +1,66 @@
+/*
+ * bmp280_example.ino
+ * Example sketch for BMP280
+ *
+ * Copyright (c) 2016 seeed technology inc.
+ * Website    : www.seeedstudio.com
+ * Author     : Lambor, CHN
+ * Create Time:
+ * Change Log :
+ *
+ * The MIT License (MIT)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#include "Seeed_BMP280.h"
+#include <Wire.h>
+
+BMP280 bmp280;
+
+void setup()
+{
+  Serial.begin(9600);
+  if(!bmp280.init()){
+    Serial.println("Device error!");
+  }
+}
+
+void loop()
+{
+  float pressure;
+  
+  //get and print temperatures
+  Serial.print("Temp: ");
+  Serial.print(bmp280.getTemperature());
+  Serial.println("C"); // The unit for  Celsius because original arduino don't support speical symbols
+  
+  //get and print atmospheric pressure data
+  Serial.print("Pressure: ");
+  Serial.print(pressure = bmp280.getPressure());
+  Serial.println("Pa");
+  
+  //get and print altitude data
+  Serial.print("Altitude: ");
+  Serial.print(bmp280.calcAltitude(pressure));
+  Serial.println("m");
+  
+  Serial.println("\n");//add a line between output of different times.
+
+  delay(1000);
+}
diff --git a/src/Grove_-_Barometer_Sensor_BMP280/keywords.txt b/src/Grove_-_Barometer_Sensor_BMP280/keywords.txt
diff --git a/src/Grove_-_Barometer_Sensor_BMP280/library.properties b/src/Grove_-_Barometer_Sensor_BMP280/library.properties
