Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
b34d51d08d
1 changed files with 3 additions and 3 deletions
|
@ -54,9 +54,9 @@ static uint32_t read_cols(void) {
|
|||
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);
|
||||
pca9555_readPins(IC1, PCA9555_PORT1, &state_1);
|
||||
pca9555_readPins(IC2, PCA9555_PORT0, &state_2);
|
||||
pca9555_readPins(IC2, PCA9555_PORT1, &state_3);
|
||||
|
||||
uint32_t state = ((((uint32_t)state_3 & 0b01111111) << 12) | ((uint32_t)state_2 << 4) | (((uint32_t)state_1 & 0b11110000) >> 4));
|
||||
return ~state;
|
||||
|
|
Loading…
Reference in a new issue