sfe toolkit back in

-using SFE toolkit for I2C begin stuff again
-removed some un-used code

Author: lewispg228

examples/Example_01_BasicReadings/Example_01_BasicReadings.ino

@@ -29,47 +29,38 @@
 #include <Wire.h>
 #include "SparkFun_BMV080_Arduino_Library.h" // CTRL+Click here to get the library: http://librarymanager/All#SparkFun_BMV080
 
-Bmv080 bmv080;
-#define BMV080_IRQ  14 // The BMV080 interrupt pin
+Bmv080 bmv080; // Create an instance of the BMV080 class
 #define BMV080_ADDR 0x57  // SparkFun BMV080 Breakout defaults to 0x57
 
-i2c_device_t i2c_device = {};
-
-#define IRQ_Pin 14
-
-bool int_flag = false;
+i2c_device_t i2c_device = {}; // I2C device struct instance for Bosch API
 
 void setup()
 {
-    // // Start serial
-    // Serial.begin(115200);
+    Serial.begin(115200);
 
-    // 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.
+    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");
+    Serial.println();
+    Serial.println("BMV080 Example 1 - Basic Readings");
 
-    // Wire.begin();
+    Wire.begin();
 
-    // if (bmv080.begin(BMV080_ADDR, Wire, BMV080_IRQ) == false) {
-    //     Serial.println("BMV080 not detected at default I2C address. Check your jumpers and the hookup guide. Freezing...");
-    //     while (1)
-    //     ;
-    // }
-    // Serial.println("BMV080 found!");
+    if (bmv080.begin(BMV080_ADDR, Wire) == 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
-    
-    Serial.begin(115200);
-    Serial.println("Starting BMV080 example...");
 
     /* Communication interface initialization */
-
     i2c_init(&i2c_device);
 
+    /* Initialize the Sensor (read driver, open, reset, id etc.)*/
     bmv080.init(&i2c_device);
 
     /* Set the sensor mode to continuous mode */

src/SparkFun_BMV080_Arduino_Library.h

@@ -27,7 +27,7 @@
 
 // TODO: Add includes as needed (e.g. #include <Wire.h>, #include <SPI.h>)
 #include "sfeBmv080.h"
-//#include <SparkFun_Toolkit.h>
+#include <SparkFun_Toolkit.h>
 
 // #include "Arduino.h"
 #include <bmv080.h>
@@ -41,26 +41,26 @@ SET_LOOP_TASK_STACK_SIZE(60 * 1024);  // 60KB
 class Bmv080 : public sfeBmv080
 {
   public:
-    // /// @brief Begins the Device
-    // /// @param address I2C device address to use for the sensor
-    // /// @param wirePort Wire port to use for I2C communication
-    // /// @return True if successful, false otherwise
-    // bool begin(const uint8_t address = SFE_BMV080_DEFAULT_ADDRESS, TwoWire &wirePort = Wire, const uint8_t irqPin = SFE_BMV080_DEFAULT_IRQ_PIN)
-    // {
-    //     // Setup Arudino I2C bus
-    //     _theI2CBus.init(wirePort, address);
+    /// @brief Begins the Device
+    /// @param address I2C device address to use for the sensor
+    /// @param wirePort Wire port to use for I2C communication
+    /// @return True if successful, false otherwise
+    bool begin(const uint8_t address = SFE_BMV080_DEFAULT_ADDRESS, TwoWire &wirePort = Wire)
+    {
+        // Setup Arudino I2C bus
+        _theI2CBus.init(wirePort, address);
 
-    //     // Begin the sensor
-    //     return sfeBmv080::begin(&_theI2CBus) == kSTkErrOk;
-    // }
+        // Begin the sensor
+        return sfeBmv080::begin(&_theI2CBus) == kSTkErrOk;
+    }
 
-    // /// @brief Checks if the Device is connected
-    // /// @return True if the sensor is connected, false otherwise
-    // bool isConnected()
-    // {
-    //     return sfeBmv080::isConnected() == kSTkErrOk;
-    // }
+    /// @brief Checks if the Device is connected
+    /// @return True if the sensor is connected, false otherwise
+    bool isConnected()
+    {
+        return sfeBmv080::isConnected() == kSTkErrOk;
+    }
 
-//   private:
-//     sfeTkArdI2C _theI2CBus;
+  private:
+    sfeTkArdI2C _theI2CBus;
 };

src/sfeBmv080.cpp

@@ -75,30 +75,35 @@ void bmv080_service_routine(const bmv080_handle_t handle, void* callback_paramet
 #endif
 
 
-// sfeTkError_t sfeBmv080::begin(sfeTkII2C *theBus)
-// {
-//     // Nullptr check
-//     if (theBus == nullptr)
-//         return kSTkErrFail;
-
-//     // Set bus pointer
-//     _theBus = theBus;
-
-//     sfeTkError_t err;
-//     err = isConnected();
-//     // Check whether the ping was successful
-//     if (err != kSTkErrOk)
-//         return err;
-
-//     // Done!
-//     return kSTkErrOk;
-// }
-
-// sfeTkError_t sfeBmv080::isConnected()
-// {
-//     // Just ping the device address
-//     return _theBus->ping();
-// }
+sfeTkError_t sfeBmv080::begin(sfeTkII2C *theBus)
+{
+    // Nullptr check
+    if (theBus == nullptr)
+        return kSTkErrFail;
+
+    // Set bus pointer
+    _theBus = theBus;
+
+    // Set the bus pointer for the I2C device struct instance member
+    //_i2c_device.instance = theBus;
+
+    i2c_init(&_i2c_device);
+
+    sfeTkError_t err;
+    err = isConnected();
+    // Check whether the ping was successful
+    if (err != kSTkErrOk)
+        return err;
+
+    // Done!
+    return kSTkErrOk;
+}
+
+sfeTkError_t sfeBmv080::isConnected()
+{
+    // Just ping the device address
+    return _theBus->ping();
+}
 
 float sfeBmv080::getPM25()
 {
@@ -143,18 +148,6 @@ bool sfeBmv080::setMode(uint8_t mode)
     }
 }
 
-// void print_to_serial(const char *format, ...) 
-// {
-//     char print_buffer[1024];
-//     va_list args;
-//     va_start(args, format);
-//     vsnprintf(print_buffer, sizeof(print_buffer), format, args);
-//     va_end(args);
-//     Serial.print(print_buffer);
-// }
-
-//print_function_t print_handle = (const print_function_t)print_to_serial;
-
 bool sfeBmv080::dataAvailable()
 {
     bmv080_service_routine(bmv080_handle_class, this);

src/sfeBmv080.h

@@ -40,18 +40,18 @@ class sfeBmv080
 {
   public:
     /// @brief Default constructor
-    sfeBmv080()// : _theBus{nullptr}
+    sfeBmv080() : _theBus{nullptr}
     {
     }
 
-    // /// @brief Begins the Device
-    // /// @param theBus I2C bus to use for communication
-    // /// @return 0 for succuss, negative for errors, positive for warnings
-    // sfeTkError_t begin(sfeTkII2C *theBus = nullptr);
+    /// @brief Begins the Device
+    /// @param theBus I2C bus to use for communication
+    /// @return 0 for succuss, negative for errors, positive for warnings
+    sfeTkError_t begin(sfeTkII2C *theBus = nullptr);
 
-    // /// @brief Checks if the Device is connected
-    // /// @return 0 for succuss, negative for errors, positive for warnings
-    // sfeTkError_t isConnected();
+    /// @brief Checks if the Device is connected
+    /// @return 0 for succuss, negative for errors, positive for warnings
+    sfeTkError_t isConnected();
 
     /// @brief Initialize the sensor
     /// @details This function initializes the sensor and should be called 
@@ -99,14 +99,11 @@ class sfeBmv080
     /// @return True if new data is available, false otherwise
     bool dataAvailable();
 
-
-    
-
   private:
     bmv080_handle_t bmv080_handle_class = NULL;
     bool _dataAvailable = false;
     bmv080_output_t _sensorValue;
 
-  // protected:
-  //   sfeTkII2C *_theBus;
+  protected:
+    sfeTkII2C *_theBus;
 };