gitbot/qmk_firmware
0
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2025-04-05 05:15:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into xap

Browse Source
This commit is contained in:
QMK Bot 2022-10-29 21:34:27 +00:00
commit 74897f0187
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/gpio/mcp23018.c
View File

@ -18,20 +18,14 @@ enum {
CMD_GPIOB = 0x13,
};
bool mcp23018_init(uint8_t slave_addr) {
void mcp23018_init(uint8_t addr) {
static uint8_t s_init = 0;
uint8_t addr = SLAVE_TO_ADDR(slave_addr);
if (0 == s_init) {
if (!s_init) {
i2c_init();
wait_ms(100);
wait_ms(1000);
// probe that the expander is actually connected by reading from it
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) {

2
drivers/gpio/mcp23018.h
View File

@ -33,7 +33,7 @@ enum {
/**
* 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