Update to use new architecture for Arduino abstraction

Author: sfe-SparkFro

Examples/Example1_BasicReadings/Example1_BasicReadings.ino

@@ -0,0 +1,20 @@
+#include "SparkFun_STHS34PF80_Arduino_Library.h"
+#include <Wire.h>
+
+STHS34PF80_I2C mySensor;
+// STHS34PF80_SPI mySensor;
+
+void setup()
+{
+    Serial.begin(115200);
+    Serial.println("Exmaple 1! yay");
+
+    Wire.begin()
+
+    mySensor.begin();
+}
+
+void loop()
+{
+    Serial.println(mySensor.getData());
+}

src/SparkFun_STHS34PF80_Arduino_Library.cpp

@@ -0,0 +1,32 @@
+#ifndef __SparkFun_STHS34PF80_Library_H__
+#define __SparkFun_STHS34PF80_Library_H__
+
+#include "SparkFun_STHS34PF80_Arduino_Library.h"
+
+bool STHS34PF80_I2C::begin(uint8_t devAddr)
+{
+    bus.init(devAddr, Wire);
+    sensor.read_reg = read;
+    sensor.write_reg = write;
+    sensor.mdelay = delayMS;
+    sensor.handle = &bus;
+
+    STHS34PF80::begin();
+}
+
+int32_t STHS34PF80_I2C::read(void* bus, uint8_t addr, uint8_t* data, uint16_t numData)
+{
+    ((SFE_BusI2C*) bus)->readRegs(addr, data, numData);
+}
+
+int32_t STHS34PF80_I2C::write(void* bus, uint8_t addr, const uint8_t* data, uint16_t numData)
+{
+    ((SFE_BusI2C*) bus)->writeRegs(addr, data, numData);
+}
+
+void STHS34PF80_I2C::delayMS(uint32_t millisec)
+{
+    delay(millisec);
+}
+
+#endif

src/SparkFun_STHS34PF80_Arduino_Library.h

@@ -15,34 +15,32 @@ Development environment specifics:
 Distributed as-is; no warranty is given.
 ******************************************************************************/
 
-
-#ifndef __SparkFun_STHS34PF80_Arduino_Library_H__
-#define __SparkFun_STHS34PF80_Arduino_Library_H__
-
-#include sths34pf80_reg.h
+#include "sths34pf80_class.h"
+#include "SFE_Bus.h"
 #include <Arduino.h>
 #include <Wire.h>
 
 
-class STHS34PF80
+class STHS34PF80_I2C : public STHS34PF80
 {
     public: 
-    
-    /* 
-        begin()
-        read()
-        write()
-    */
-        
-
-
-    private: 
-        
-
-        /*
-        Bus12C bus; 
-        */
+        bool begin(uint8_t devAddr);
+        static int32_t read(void *, uint8_t, uint8_t *, uint16_t);
+        static int32_t write(void *, uint8_t, const uint8_t *, uint16_t);
+        static void delayMS(uint32_t millisec);
+    private:
+        SFE_BusI2C bus;
 };
 
+// class STHS34PF80_SPI
+// {
+//     public: 
+//         bool begin();
+    
+//     private: 
+        
 
-#endif
+//         /*
+//         Bus12C bus; 
+//         */
+// };

src/sfe_bus.cpp

@@ -1,2 +1,57 @@
-// For general SFE bus needs (I2C, SPI, etc)
+#ifndef __SparkFun_Bus_Library_H__
+#define __SparkFun_Bus_Library_H__
 
+#include "SFE_Bus.h"
+
+bool SFE_BusI2C::init(uint8_t addr, TwoWire& port)
+{
+    devAddr == adrr;
+    devPort = port
+}
+
+bool SFE_BusI2C::readRegs(uint8_t regAddress, uint8_t* dataBuffer, uint8_t numBytes)
+{
+    // Jump to desired register address
+    devPort->beginTransmission(devAddr);
+    devPort->write(regAddress);
+    if(devPort->endTransmission())
+    {
+        return false;
+    }
+
+    // Read bytes from these registers
+    devPort->requestFrom(devAddr, numBytes);
+
+    // Store all requested bytes
+    for(uint32_t i = 0; i < numBytes && devPort->available(); i++)
+    {
+        dataBuffer[i] = devPort->read();
+    }
+
+    return true;
+}
+
+bool SFE_BusI2C::writeRegs(uint8_t regAddress, const uint8_t* dataBuffer, uint8_t numBytes)
+{
+    // Begin transmission
+    devPort->beginTransmission(devAddr);
+
+    // Write the address
+    devPort->write(regAddress);
+    
+    // Write all the data
+    for(uint32_t i = 0; i < numBytes; i++)
+    {
+        devPort->write(dataBuffer[i]);
+    }
+
+    // End transmission
+    if(devPort->endTransmission())
+    {
+        return false;
+    }
+
+    return true;
+}
+
+#endif

src/sfe_bus.h

@@ -0,0 +1,14 @@
+#include <Arduino.h>
+#include <Wire.h>
+
+class SFE_BusI2C
+{
+    public: 
+        bool init(uint8_t addr, TwoWire& port);
+        bool readRegs(uint8_t regAddr, uint8_t* data, uint8_t numData);
+        bool writeRegs(uint8_t regAddr, const uint8_t* data, uint8_t numData);
+
+    private:
+        uint8_t devAddr;
+        TwoWire* devPort;
+};

src/sths34pf80_api/LICENSE.txt

@@ -0,0 +1,29 @@
+BSD 3-Clause License
+
+Copyright (c) 2022, STMicroelectronics
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+* Neither the name of the copyright holder nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

src/sths34pf80_reg.c renamed to src/sths34pf80_api/sths34pf80_reg.c

@@ -0,0 +1,25 @@
+#ifndef __SparkFun_STHS34PF80_Library_H__
+#define __SparkFun_STHS34PF80_Library_H__
+
+#include "sths34pf80_class.h"
+
+bool STHS34PF80::begin()
+{
+    return false;
+}
+
+bool STHS34PF80::getData()
+{
+    return false;
+}
+
+bool STHS34PF80::isConencted()
+{
+    uint8_t devId = 0;
+    int32_t err = sths34pf80_device_id_get(&sensor, &devId);
+    if(err)
+        return false;
+    return devId == STHS34PF80_ID;
+}
+
+#endif

src/sths34pf80_reg.h renamed to src/sths34pf80_api/sths34pf80_reg.h

@@ -1,20 +1,12 @@
-#ifndef __sths34pf80_class_H__
-#define __sths34pf80_class_H__
+#include "sths34pf80_api/sths34pf80_reg.h"
 
-#include SparkFun_STHS34PF80_Arduino_Library.h
-
-
-
-class STHS34PF80_Class
+class STHS34PF80
 {
     public:
-
+        bool begin();
+        bool getData();
+        bool isConencted();
 
     protected: 
-
-};
-
-
-
-
-#endif
+        stmdev_ctx_t sensor;
+};