Align existing pca9555 driver to better match mcp23018 API (#16277)
This commit is contained in:
parent
96afc7a03a
commit
1f67de2001
6 changed files with 113 additions and 62 deletions
|
@ -51,11 +51,14 @@ static void select_row(uint8_t row) {
|
|||
|
||||
static uint32_t read_cols(void) {
|
||||
//Read column inputs. Pins 13-31 are used. Split across both ICs but they are sequential
|
||||
uint32_t state_1 = pca9555_readPins(IC1, PCA9555_PORT1);
|
||||
uint32_t state_2 = pca9555_readPins(IC2, PCA9555_PORT0);
|
||||
uint32_t state_3 = pca9555_readPins(IC2, PCA9555_PORT1);
|
||||
uint8_t state_1 = 0;
|
||||
uint8_t state_2 = 0;
|
||||
uint8_t state_3 = 0;
|
||||
pca9555_readPins(IC2, PCA9555_PORT0, &state_1);
|
||||
pca9555_readPins(IC2, PCA9555_PORT1, &state_2);
|
||||
pca9555_readPins(IC1, PCA9555_PORT1, &state_3);
|
||||
|
||||
uint32_t state = (((state_3 & 0b01111111) << 12) | (state_2 << 4) | ((state_1 & 0b11110000) >> 4));
|
||||
uint32_t state = ((((uint32_t)state_3 & 0b01111111) << 12) | ((uint32_t)state_2 << 4) | (((uint32_t)state_1 & 0b11110000) >> 4));
|
||||
return ~state;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue