Add readBytes and readString methods

Author: bparks13

Source/I2CRegisterContext.cpp

@@ -30,6 +30,11 @@ I2CRegisterContext::I2CRegisterContext (uint32_t address_, const oni_dev_idx_t d
     i2cContext = ctx_;
 }
 
+oni_dev_idx_t I2CRegisterContext::getDeviceIndex() const
+{
+    return deviceIndex;
+}
+
 int I2CRegisterContext::WriteByte (uint32_t address, uint32_t value, bool sixteenBitAddress)
 {
     uint32_t registerAddress = (address << 7) | (i2cAddress & 0x7F);
@@ -43,6 +48,25 @@ int I2CRegisterContext::ReadByte (uint32_t address, oni_reg_val_t* value, bool s
     return ReadWord (address, 1, value, sixteenBitAddress);
 }
 
+int I2CRegisterContext::readBytes (uint32_t address, int count, std::vector<oni_reg_val_t>& value, bool sixteenBitAddress)
+{
+    value.clear();
+
+    oni_reg_val_t val;
+    int rc = 0;
+
+    for (uint16_t i = 0; i < count; i++)
+    {
+        rc = ReadByte (address + i, &val, sixteenBitAddress);
+        if (rc != ONI_ESUCCESS)
+            return rc;
+
+        value.push_back (val);
+    }
+
+    return rc;
+}
+
 int I2CRegisterContext::ReadWord (uint32_t address, uint32_t numBytes, uint32_t* value, bool sixteenBitAddress)
 {
     if (numBytes < 1 || numBytes > 4)
@@ -58,6 +82,26 @@ int I2CRegisterContext::ReadWord (uint32_t address, uint32_t numBytes, uint32_t*
     return i2cContext->readRegister (deviceIndex, registerAddress, value);
 }
 
+int I2CRegisterContext::readString (uint32_t address, int count, std::string& str, bool sixteenBitAddress)
+{
+    std::vector<oni_dev_idx_t> data;
+    str = "";
+
+    int rc = readBytes (address, count, data, sixteenBitAddress);
+
+    if (rc != ONI_ESUCCESS)
+    {
+        Onix1::showWarningMessageBoxAsync ("Error Reading String", "Could not read the string at address " + std::to_string (address));
+        return rc;
+    }
+
+    auto it = std::find (data.begin(), data.end(), 0u);
+    size_t len = (it != data.end()) ? (size_t) std::distance (data.begin(), it) : data.size();
+    str = std::string (data.begin(), data.begin() + len);
+
+    return ONI_ESUCCESS;
+}
+
 int I2CRegisterContext::set933I2cRate (double rate)
 {
     auto sclTimes = (uint32_t) (std::round (1.0 / (100e-9 * rate)));

Source/I2CRegisterContext.h

@@ -37,18 +37,23 @@ class I2CRegisterContext
     I2CRegisterContext (uint32_t address, const oni_dev_idx_t, std::shared_ptr<Onix1>);
 
     int WriteByte (uint32_t address, uint32_t value, bool sixteenBitAddress = false);
-    int WriteWord (uint32_t address, uint32_t value, uint32_t numBytes, bool sixteenBitAddress = false);
+
     int ReadByte (uint32_t address, oni_reg_val_t* value, bool sixteenBitAddress = false);
+    int readBytes (uint32_t address, int count, std::vector<oni_reg_val_t>& value, bool sixteenBitAddress = false);
     int ReadWord (uint32_t address, uint32_t numBytes, uint32_t* value, bool sixteenBitAddress = false);
 
+    int readString (uint32_t address, int count, std::string& str, bool sixteenBitAddress = false);
+
     int set933I2cRate (double);
 
+    oni_dev_idx_t getDeviceIndex() const;
+
 protected:
     std::shared_ptr<Onix1> i2cContext;
 
 private:
-    const oni_dev_idx_t deviceIndex;
 
+    const oni_dev_idx_t deviceIndex;
     const uint32_t i2cAddress;
 
     JUCE_LEAK_DETECTOR (I2CRegisterContext);