Moving current development work/refactor to a develop branch

examples/Example_01_BasicReadings/Example_01_BasicReadings.ino

@@ -10,7 +10,7 @@
   SparkFun Electronics
   Date: September, 2024
   SparkFun code, firmware, and software is released under the MIT License.
-	Please see LICENSE.md for further details.
+    Please see LICENSE.md for further details.
 
   Hardware Connections:
   IoT RedBoard --> BMV080
@@ -21,48 +21,55 @@
   Serial.print it out at 115200 baud to serial monitor.
 
   Feel like supporting our work? Buy a board from SparkFun!
-  https://www.sparkfun.com/products/?????
+  https://www.sparkfun.com/products/26554
 */
 
-#include <Wire.h>
 #include "SparkFun_BMV080_Arduino_Library.h" // CTRL+Click here to get the library: http://librarymanager/All#SparkFun_BMV080
+#include <Wire.h>
 
-Bmv080 bmv080; // Create an instance of the BMV080 class
+SparkFunBMV080I2C bmv080; // Create an instance of the BMV080 class
 #define BMV080_ADDR 0x57  // SparkFun BMV080 Breakout defaults to 0x57
 
-i2c_device_t i2c_device = {}; // I2C device struct instance for Bosch API
+// Some Dev boards have their QWIIC connector on Wire or Wire1
+// This #ifdef will help this sketch work across more products
+
+#ifdef ARDUINO_SPARKFUN_THINGPLUS_RP2040
+#define wirePort Wire1
+#else
+#define wirePort Wire
+#endif
 
 void setup()
 {
     Serial.begin(115200);
 
-    while(!Serial) delay(10); // Wait for Serial to become available.
+    while (!Serial)
+        delay(10); // Wait for Serial to become available.
     // Necessary for boards with native USB (like the SAMD51 Thing+).
     // For a final version of a project that does not need serial debug (or a USB cable plugged in),
     // Comment out this while loop, or it will prevent the remaining code from running.
 
     Serial.println();
     Serial.println("BMV080 Example 1 - Basic Readings");
 
-    Wire.begin();
+    wirePort.begin();
 
-    if (bmv080.begin(BMV080_ADDR, Wire) == false) {
-        Serial.println("BMV080 not detected at default I2C address. Check your jumpers and the hookup guide. Freezing...");
+    if (bmv080.begin(BMV080_ADDR, wirePort) == false)
+    {
+        Serial.println(
+            "BMV080 not detected at default I2C address. Check your jumpers and the hookup guide. Freezing...");
         while (1)
-        ;
+            ;
     }
     Serial.println("BMV080 found!");
 
-    // Wire.setClock(400000); //Increase I2C data rate to 400kHz
-
-    /* Communication interface initialization */
-    i2c_init(&i2c_device);
+    // wirePort.setClock(400000); //Increase I2C data rate to 400kHz
 
     /* Initialize the Sensor (read driver, open, reset, id etc.)*/
-    bmv080.init(&i2c_device);
+    bmv080.init();
 
     /* Set the sensor mode to continuous mode */
-    if(bmv080.setMode(SFE_BMV080_MODE_CONTINUOUS) == true)
+    if (bmv080.setMode(SFE_BMV080_MODE_CONTINUOUS) == true)
     {
         Serial.println("BMV080 set to continuous mode");
     }
@@ -74,13 +81,16 @@ void setup()
 
 void loop()
 {
-    if(bmv080.dataAvailable())
+    if (bmv080.readSensor())
     {
-        float pm25 = bmv080.getPM25();
+        float pm25 = bmv080.PM25();
+        float pm1 = bmv080.PM1();
 
         Serial.print(pm25);
+        Serial.print("\t");
+        Serial.print(pm1);
 
-        if(bmv080.getIsObstructed() == true)
+        if (bmv080.isObstructed() == true)
         {
             Serial.print("\tObstructed");
         }

examples/Example_02_DutyCycle/Example_02_DutyCycle.ino

@@ -21,16 +21,23 @@
   Serial.print it out at 115200 baud to serial monitor.
 
   Feel like supporting our work? Buy a board from SparkFun!
-  https://www.sparkfun.com/products/?????
+  https://www.sparkfun.com/products/26554
 */
 
 #include <Wire.h>
 #include "SparkFun_BMV080_Arduino_Library.h" // CTRL+Click here to get the library: http://librarymanager/All#SparkFun_BMV080
 
-Bmv080 bmv080; // Create an instance of the BMV080 class
+SparkFunBMV080I2C bmv080; // Create an instance of the BMV080 class
 #define BMV080_ADDR 0x57  // SparkFun BMV080 Breakout defaults to 0x57
 
-i2c_device_t i2c_device = {}; // I2C device struct instance for Bosch API
+// Some Dev boards have their QWIIC connector on Wire or Wire1
+// This #ifdef will help this sketch work across more products
+
+#ifdef ARDUINO_SPARKFUN_THINGPLUS_RP2040
+#define wirePort   Wire1
+#else
+#define wirePort  Wire
+#endif
 
 void setup()
 {
@@ -44,22 +51,19 @@ void setup()
     Serial.println();
     Serial.println("BMV080 Example 2 - Duty Cycle");
 
-    Wire.begin();
+    wirePort.begin();
 
-    if (bmv080.begin(BMV080_ADDR, Wire) == false) {
+    if (bmv080.begin(BMV080_ADDR, wirePort) == false) {
         Serial.println("BMV080 not detected at default I2C address. Check your jumpers and the hookup guide. Freezing...");
         while (1)
         ;
     }
     Serial.println("BMV080 found!");
 
-    // Wire.setClock(400000); //Increase I2C data rate to 400kHz
-
-    /* Communication interface initialization */
-    i2c_init(&i2c_device);
+    // wirePort.setClock(400000); //Increase I2C data rate to 400kHz
 
     /* Initialize the Sensor (read driver, open, reset, id etc.)*/
-    bmv080.init(&i2c_device);
+    bmv080.init();
 
     /* Set the sensor Duty Cycling Period (seconds)*/
     uint16_t duty_cycling_period = 20;
@@ -85,13 +89,13 @@ void setup()
 
 void loop()
 {
-    if(bmv080.dataAvailable())
+    if(bmv080.readSensor())
     {
-        float pm25 = bmv080.getPM25();
+        float pm25 = bmv080.PM25();
 
         Serial.print(pm25);
 
-        if(bmv080.getIsObstructed() == true)
+        if(bmv080.isObstructed() == true)
         {
             Serial.print("\tObstructed");
         }

examples/Example_03_Interrupt/Example_03_Interrupt.ino

@@ -25,20 +25,27 @@
   Serial.print it out at 115200 baud to serial monitor.
 
   Feel like supporting our work? Buy a board from SparkFun!
-  https://www.sparkfun.com/products/?????
+  https://www.sparkfun.com/products/26554
 */
 
 #include <Wire.h>
 #include "SparkFun_BMV080_Arduino_Library.h" // CTRL+Click here to get the library: http://librarymanager/All#SparkFun_BMV080
 
-Bmv080 bmv080; // Create an instance of the BMV080 class
+SparkFunBMV080I2C bmv080; // Create an instance of the BMV080 class
 #define BMV080_ADDR 0x57  // SparkFun BMV080 Breakout defaults to 0x57
 #define IRQ_Pin 14
 
-i2c_device_t i2c_device = {}; // I2C device struct instance for Bosch API
-
 bool int_flag = false;
 
+// Some Dev boards have their QWIIC connector on Wire or Wire1
+// This #ifdef will help this sketch work across more products
+
+#ifdef ARDUINO_SPARKFUN_THINGPLUS_RP2040
+#define wirePort   Wire1
+#else
+#define wirePort  Wire
+#endif
+
 void setup()
 {
     Serial.begin(115200);
@@ -51,22 +58,19 @@ void setup()
     Serial.println();
     Serial.println("BMV080 Example 3 - Interrupt");
 
-    Wire.begin();
+    wirePort.begin();
 
-    if (bmv080.begin(BMV080_ADDR, Wire) == false) {
+    if (bmv080.begin(BMV080_ADDR, wirePort) == false) {
         Serial.println("BMV080 not detected at default I2C address. Check your jumpers and the hookup guide. Freezing...");
         while (1)
         ;
     }
     Serial.println("BMV080 found!");
 
-    // Wire.setClock(400000); //Increase I2C data rate to 400kHz
-
-    /* Communication interface initialization */
-    i2c_init(&i2c_device);
+    // wirePort.setClock(400000); //Increase I2C data rate to 400kHz
 
     /* Initialize the Sensor (read driver, open, reset, id etc.)*/
-    bmv080.init(&i2c_device);
+    bmv080.init();
 
     /* Set the sensor mode to continuous mode */
     // The hardware interrupt of the BMV080 sensor unit cannot be used as trigger 
@@ -91,11 +95,11 @@ void loop()
         int_flag = false; // Reset the flag
         do{
             Serial.println("Reading BMV080");
-            if(bmv080.dataAvailable())
+            if(bmv080.readSensor())
             {
-                float pm25 = bmv080.getPM25();
+                float pm25 = bmv080.PM25();
                 Serial.print(pm25);
-                if(bmv080.getIsObstructed() == true)
+                if(bmv080.isObstructed() == true)
                 {
                     Serial.print("\tObstructed");
                 }

examples/Example_04_SPI/Example_04_SPI.ino

@@ -29,15 +29,14 @@
   Serial.print it out at 115200 baud to serial monitor.
 
   Feel like supporting our work? Buy a board from SparkFun!
-  https://www.sparkfun.com/products/?????
+  https://www.sparkfun.com/products/26554
 */
 
 #include <Wire.h>
 #include "SparkFun_BMV080_Arduino_Library.h" // CTRL+Click here to get the library: http://librarymanager/All#SparkFun_BMV080
 
-Bmv080 bmv080; // Create an instance of the BMV080 class
-
-spi_device_t spi_device = {}; // SPI device struct instance for Bosch API
+SparkFunBMV080SPI bmv080; // Create an instance of the BMV080 class
+#define CS_PIN 15 // Define the chip select pin
 
 void setup()
 {
@@ -48,19 +47,26 @@ void setup()
     // For a final version of a project that does not need serial debug (or a USB cable plugged in),
     // Comment out this while loop, or it will prevent the remaining code from running.
 
+    pinMode(CS_PIN, OUTPUT);
+    pinMode(MOSI, OUTPUT);
+    pinMode(SCK, OUTPUT);
+    pinMode(MISO, INPUT);
+    digitalWrite(CS_PIN, HIGH);
+
     Serial.println();
     Serial.println("BMV080 Example 4 - SPI");
 
-    /* Communication interface initialization */
-    spi_init(&spi_device);
-
-    if (bmv080.initSPI(&spi_device) == false) {
+    if (bmv080.begin(CS_PIN, SPI) == false) {
         Serial.println("SPI init failure. Check your jumpers and the hookup guide. Freezing...");
         while (1)
         ;
     }
     Serial.println("BMV080 SPI init successful");
 
+
+    /* Initialize the Sensor (read driver, open, reset, id etc.)*/
+    bmv080.init();
+
     /* Set the sensor mode to continuous mode */
     if(bmv080.setMode(SFE_BMV080_MODE_CONTINUOUS) == true)
     {
@@ -74,13 +80,13 @@ void setup()
 
 void loop()
 {
-    if(bmv080.dataAvailable())
+    if(bmv080.readSensor())
     {
-        float pm25 = bmv080.getPM25();
+        float pm25 = bmv080.PM25();
 
         Serial.print(pm25);
 
-        if(bmv080.getIsObstructed() == true)
+        if(bmv080.isObstructed() == true)
         {
             Serial.print("\tObstructed");
         }