github/esphome
2
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-09-27 06:50:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

align

Browse Source
This commit is contained in:
J. Nick Koston
2025-09-04 15:49:10 -05:00
parent bdc299789f
commit 938a3d8188
2 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esphome/components/max6956/max6956.cpp
+21 -16
View File
@@ -51,25 +51,31 @@ bool MAX6956::digital_read_hw(uint8_t pin) {
return false;
}
// Calculate bank index
uint8_t bank_index = (pin - MAX6956_MIN) / MAX6956_BANK_SIZE;
// Calculate bank index based on the base class view (no offset adjustment)
uint8_t bank_index = pin / MAX6956_BANK_SIZE;
// Register addresses for each bank
// Register addresses aligned with base class banks
static const uint8_t bank_regs[4] = {
MAX6956_8PORTS_VALUE_START, // 0x44 - ports 4-11
MAX6956_8PORTS_12_19, // 0x4C - ports 12-19
MAX6956_8PORTS_20_27, // 0x54 - ports 20-27
MAX6956_8PORTS_24_31 // 0x58 - ports 24-31
0x40, // Bank 0: 4 ports 4-7 (bits D0-D3, D4-D7 read as 0)
0x48, // Bank 1: 8 ports 8-15 (bits D0-D7)
0x50, // Bank 2: 8 ports 16-23 (bits D0-D7)
0x58, // Bank 3: 8 ports 24-31 (bits D0-D7)
};
// Read the 8-port bank register
uint8_t bank_value = 0;
if (!this->read_reg_(bank_regs[bank_index], &bank_value)) {
// Read the appropriate register
uint8_t value = 0;
if (!this->read_reg_(bank_regs[bank_index], &value)) {
return false;
}
// Store the bank value in our cache
this->input_banks_[bank_index] = bank_value;
// Store in cache with proper alignment
if (bank_index == 0) {
// Special case for bank 0: pins 4-7 are in bits D0-D3, shift them to bits 4-7
this->input_banks_[0] = value << 4;
} else {
// Banks 1-3 map directly
this->input_banks_[bank_index] = value;
}
return true;
}
@@ -80,10 +86,9 @@ bool MAX6956::digital_read_cache(uint8_t pin) {
return false;
}
// Calculate bank index and bit position
uint8_t adjusted_pin = pin - MAX6956_MIN;
uint8_t bank_index = adjusted_pin / MAX6956_BANK_SIZE;
uint8_t bit_position = adjusted_pin % MAX6956_BANK_SIZE;
// Use the base class's view of banks (no offset adjustment)
uint8_t bank_index = pin / MAX6956_BANK_SIZE;
uint8_t bit_position = pin % MAX6956_BANK_SIZE;
return (this->input_banks_[bank_index] & (1 << bit_position)) != 0;
}
esphome/components/max6956/max6956.h
+5 -2
View File
@@ -78,8 +78,11 @@ class MAX6956 : public Component, public i2c::I2CDevice, public gpio_expander::C
max6956::MAX6956CURRENTMODE brightness_mode_;
uint8_t global_brightness_;
// Cache for the 4 banks of 8 pins each
// Bank 0: pins 4-11, Bank 1: pins 12-19, Bank 2: pins 20-27, Bank 3: pins 24-31
// Cache for the 4 banks of 8 pins each (aligned with base class view)
// Bank 0: bits 0-7 (bits 0-3 unused, bits 4-7 = pins 4-7)
// Bank 1: bits 8-15 (pins 8-15)
// Bank 2: bits 16-23 (pins 16-23)
// Bank 3: bits 24-31 (pins 24-31)
uint8_t input_banks_[4] = {0, 0, 0, 0};
private: