ollien
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "mcp23018: add return status to init (#18178)" (#18709) 

This reverts commit 3fffa51554.
master
Joel Challis 2022-10-29 22:33:47 +01:00 committed by GitHub
parent c78dc85a1a
commit c63e2e378d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/gpio/mcp23018.c
View File

@ -18,20 +18,14 @@ enum {
CMD_GPIOB = 0x13, CMD_GPIOB = 0x13,
}; };
bool mcp23018_init(uint8_t slave_addr) { void mcp23018_init(uint8_t addr) {
static uint8_t s_init = 0; static uint8_t s_init = 0;
uint8_t addr = SLAVE_TO_ADDR(slave_addr); if (!s_init) {
if (0 == s_init) {
i2c_init(); i2c_init();
wait_ms(100); wait_ms(1000);
// probe that the expander is actually connected by reading from it s_init = 1;
uint8_t data = 0;
if (I2C_STATUS_SUCCESS == i2c_readReg(addr, 0, &data, sizeof(data), 150)) {
s_init = 1;
}
} }
return (s_init > 0);
} }
bool mcp23018_set_config(uint8_t slave_addr, mcp23018_port_t port, uint8_t conf) { bool mcp23018_set_config(uint8_t slave_addr, mcp23018_port_t port, uint8_t conf) {

2
drivers/gpio/mcp23018.h
View File

@ -33,7 +33,7 @@ enum {
/** /**
* Init expander and any other dependent drivers * Init expander and any other dependent drivers
*/ */
bool mcp23018_init(uint8_t slave_addr); void mcp23018_init(uint8_t slave_addr);
/** /**
* Configure input/output to a given port * Configure input/output to a given port