Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add alternate i2c bus support #5

Merged
merged 2 commits into from
Sep 19, 2023
Merged

Add alternate i2c bus support #5

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f6d2fb
Add alternate i2c bus support
tyeth Sep 13, 2023
df21219
Fix signature in header file
tyeth Sep 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 26 additions & 18 deletions src/ScioSense_ENS160.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,25 +12,33 @@
#include "ScioSense_ENS160.h"
#include "math.h"

ScioSense_ENS160::ScioSense_ENS160(TwoWire *i2c, uint8_t slaveaddr) {
this->_slaveaddr = slaveaddr;
this->_i2c = i2c;
this->_ADDR = 0;
this->_nINT = 0;
this->_nCS = 0;
}

ScioSense_ENS160::ScioSense_ENS160(uint8_t slaveaddr) {
this->_slaveaddr = slaveaddr;

this->_i2c = &Wire;
this->_ADDR = 0;
this->_nINT = 0;
this->_nCS = 0;
}

ScioSense_ENS160::ScioSense_ENS160(uint8_t ADDR, uint8_t nCS, uint8_t nINT) {
this->_slaveaddr = ENS160_I2CADDR_0;

this->_i2c = &Wire;
this->_ADDR = ADDR;
this->_nINT = nINT;
this->_nCS = nCS;
}

ScioSense_ENS160::ScioSense_ENS160(uint8_t slaveaddr, uint8_t ADDR, uint8_t nCS, uint8_t nINT) {
this->_slaveaddr = slaveaddr;

this->_i2c = &Wire;
this->_ADDR = ADDR;
this->_nINT = nINT;
this->_nCS = nCS;
Expand All @@ -39,7 +47,7 @@ ScioSense_ENS160::ScioSense_ENS160(uint8_t slaveaddr, uint8_t ADDR, uint8_t nCS,
// Function to redefine I2C pins
void ScioSense_ENS160::setI2C(uint8_t sda, uint8_t scl) {
this->_sdaPin = sda;
this->_sclPin = scl;
this->_sclPin = scl;
}

// Init I2C communication, resets ENS160 and checks its PART_ID. Returns false on I2C problems or wrong PART_ID.
Expand Down Expand Up @@ -373,11 +381,11 @@ bool ScioSense_ENS160::set_envdata210(uint16_t t, uint16_t h) {
/**************************************************************************/

void ScioSense_ENS160::_i2c_init() {
#if defined(ESP32)
if (this->_sdaPin != this->_sclPin) Wire.begin(this->_sdaPin, this->_sclPin);
else
#endif
Wire.begin();
#if defined(ESP32)
if (this->_sdaPin != this->_sclPin) _i2c->begin(this->_sdaPin, this->_sclPin);
else
#endif
_i2c->begin();
}

/**************************************************************************/
Expand All @@ -404,14 +412,14 @@ uint8_t ScioSense_ENS160::read(uint8_t addr, uint8_t reg, uint8_t *buf, uint8_t
while(pos < num){

uint8_t read_now = min((uint8_t)32, (uint8_t)(num - pos));
Wire.beginTransmission((uint8_t)addr);
_i2c->beginTransmission((uint8_t)addr);

Wire.write((uint8_t)reg + pos);
result = Wire.endTransmission();
Wire.requestFrom((uint8_t)addr, read_now);
_i2c->write((uint8_t)reg + pos);
result = _i2c->endTransmission();
_i2c->requestFrom((uint8_t)addr, read_now);

for(int i=0; i<read_now; i++){
buf[pos] = Wire.read();
buf[pos] = _i2c->read();
pos++;
}
}
Expand Down Expand Up @@ -439,10 +447,10 @@ uint8_t ScioSense_ENS160::write(uint8_t addr, uint8_t reg, uint8_t *buf, uint8_t
Serial.println();
}

Wire.beginTransmission((uint8_t)addr);
Wire.write((uint8_t)reg);
Wire.write((uint8_t *)buf, num);
uint8_t result = Wire.endTransmission();
_i2c->beginTransmission((uint8_t)addr);
_i2c->write((uint8_t)reg);
_i2c->write((uint8_t *)buf, num);
uint8_t result = _i2c->endTransmission();
return result;
}

Expand Down
2 changes: 2 additions & 0 deletions src/ScioSense_ENS160.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@
class ScioSense_ENS160 {

public:
ScioSense_ENS160(TwoWire *i2c, u_int8_t slaveaddr = ENS160_I2CADDR_0); // Constructor using slave address (5A or 5B)
tyeth marked this conversation as resolved.
Show resolved Hide resolved
ScioSense_ENS160(uint8_t slaveaddr = ENS160_I2CADDR_0); // Constructor using slave address (5A or 5B)
ScioSense_ENS160(uint8_t ADDR, uint8_t nCS, uint8_t nINT); // Constructor with pin definition
ScioSense_ENS160(uint8_t slaveaddr, uint8_t ADDR, uint8_t nCS, uint8_t nINT); // Constructor with slave address and pin definition
Expand Down Expand Up @@ -136,6 +137,7 @@ class ScioSense_ENS160 {
uint8_t getMISR() { return this->_misr; } // Return status code of sensor

private:
TwoWire *_i2c; // Pointer to I2C interface
uint8_t _ADDR;
uint8_t _nINT;
uint8_t _nCS;
Expand Down