Skip to content

Commit

Permalink
Add 16bit register helper
Browse files Browse the repository at this point in the history
  • Loading branch information
CarsonF committed May 23, 2023
1 parent 12e6c04 commit 43f148f
Show file tree
Hide file tree
Showing 2 changed files with 41 additions and 0 deletions.
21 changes: 21 additions & 0 deletions esphome/components/i2c/i2c.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -78,5 +78,26 @@ uint8_t I2CRegister::get() const {
return value;
}

I2CRegister16 &I2CRegister16::operator=(uint8_t value) {
this->parent_->write_register16(this->register_, &value, 1);
return *this;
}
I2CRegister16 &I2CRegister16::operator&=(uint8_t value) {
value &= get();
this->parent_->write_register16(this->register_, &value, 1);
return *this;
}
I2CRegister16 &I2CRegister16::operator|=(uint8_t value) {
value |= get();
this->parent_->write_register16(this->register_, &value, 1);
return *this;
}

uint8_t I2CRegister16::get() const {
uint8_t value = 0x00;
this->parent_->read_register16(this->register_, &value, 1);
return value;
}

} // namespace i2c
} // namespace esphome
20 changes: 20 additions & 0 deletions esphome/components/i2c/i2c.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,25 @@ class I2CRegister {
uint8_t register_;
};

class I2CRegister16 {
public:
I2CRegister16 &operator=(uint8_t value);
I2CRegister16 &operator&=(uint8_t value);
I2CRegister16 &operator|=(uint8_t value);

explicit operator uint8_t() const { return get(); }

uint8_t get() const;

protected:
friend class I2CDevice;

I2CRegister16(I2CDevice *parent, uint16_t a_register) : parent_(parent), register_(a_register) {}

I2CDevice *parent_;
uint16_t register_;
};

// like ntohs/htons but without including networking headers.
// ("i2c" byte order is big-endian)
inline uint16_t i2ctohs(uint16_t i2cshort) { return convert_big_endian(i2cshort); }
Expand All @@ -44,6 +63,7 @@ class I2CDevice {
void set_i2c_bus(I2CBus *bus) { bus_ = bus; }

I2CRegister reg(uint8_t a_register) { return {this, a_register}; }
I2CRegister16 reg16(uint16_t a_register) { return {this, a_register}; }

ErrorCode read(uint8_t *data, size_t len) { return bus_->read(address_, data, len); }
ErrorCode read_register(uint8_t a_register, uint8_t *data, size_t len, bool stop = true);
Expand Down

0 comments on commit 43f148f

Please sign in to comment.