diff options
Diffstat (limited to 'keyboards/xd96/pca9555.c')
| -rw-r--r-- | keyboards/xd96/pca9555.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/keyboards/xd96/pca9555.c b/keyboards/xd96/pca9555.c index 960df4f4e..b0e542d8d 100644 --- a/keyboards/xd96/pca9555.c +++ b/keyboards/xd96/pca9555.c | |||
| @@ -18,7 +18,7 @@ | |||
| 18 | 18 | ||
| 19 | #include "debug.h" | 19 | #include "debug.h" |
| 20 | 20 | ||
| 21 | #define SLAVE_TO_ADDR(n) (n<<1) | 21 | #define SLAVE_TO_ADDR(n) (n << 1) |
| 22 | #define TIMEOUT 100 | 22 | #define TIMEOUT 100 |
| 23 | 23 | ||
| 24 | enum { | 24 | enum { |
| @@ -29,7 +29,7 @@ enum { | |||
| 29 | CMD_INVERSION_0, | 29 | CMD_INVERSION_0, |
| 30 | CMD_INVERSION_1, | 30 | CMD_INVERSION_1, |
| 31 | CMD_CONFIG_0, | 31 | CMD_CONFIG_0, |
| 32 | CMD_CONFIG_1 | 32 | CMD_CONFIG_1, |
| 33 | }; | 33 | }; |
| 34 | 34 | ||
| 35 | void pca9555_init(uint8_t slave_addr) { | 35 | void pca9555_init(uint8_t slave_addr) { |
| @@ -37,17 +37,17 @@ void pca9555_init(uint8_t slave_addr) { | |||
| 37 | if (!s_init) { | 37 | if (!s_init) { |
| 38 | i2c_init(); | 38 | i2c_init(); |
| 39 | 39 | ||
| 40 | s_init=1; | 40 | s_init = 1; |
| 41 | } | 41 | } |
| 42 | 42 | ||
| 43 | // TODO: could check device connected | 43 | // TODO: could check device connected |
| 44 | //i2c_start(SLAVE_TO_ADDR(slave) | I2C_WRITE); | 44 | // i2c_start(SLAVE_TO_ADDR(slave) | I2C_WRITE); |
| 45 | //i2c_stop(); | 45 | // i2c_stop(); |
| 46 | } | 46 | } |
| 47 | 47 | ||
| 48 | void pca9555_set_config(uint8_t slave_addr, uint8_t port, uint8_t conf) { | 48 | void pca9555_set_config(uint8_t slave_addr, uint8_t port, uint8_t conf) { |
| 49 | uint8_t addr = SLAVE_TO_ADDR(slave_addr); | 49 | uint8_t addr = SLAVE_TO_ADDR(slave_addr); |
| 50 | uint8_t cmd = port ? CMD_OUTPUT_1 : CMD_OUTPUT_0; | 50 | uint8_t cmd = port ? CMD_CONFIG_1 : CMD_CONFIG_0; |
| 51 | 51 | ||
| 52 | i2c_status_t ret = i2c_writeReg(addr, cmd, &conf, sizeof(conf), TIMEOUT); | 52 | i2c_status_t ret = i2c_writeReg(addr, cmd, &conf, sizeof(conf), TIMEOUT); |
| 53 | if (ret != I2C_STATUS_SUCCESS) { | 53 | if (ret != I2C_STATUS_SUCCESS) { |
| @@ -57,7 +57,7 @@ void pca9555_set_config(uint8_t slave_addr, uint8_t port, uint8_t conf) { | |||
| 57 | 57 | ||
| 58 | void pca9555_set_output(uint8_t slave_addr, uint8_t port, uint8_t conf) { | 58 | void pca9555_set_output(uint8_t slave_addr, uint8_t port, uint8_t conf) { |
| 59 | uint8_t addr = SLAVE_TO_ADDR(slave_addr); | 59 | uint8_t addr = SLAVE_TO_ADDR(slave_addr); |
| 60 | uint8_t cmd = port ? CMD_CONFIG_1 : CMD_CONFIG_0; | 60 | uint8_t cmd = port ? CMD_OUTPUT_1 : CMD_OUTPUT_0; |
| 61 | 61 | ||
| 62 | i2c_status_t ret = i2c_writeReg(addr, cmd, &conf, sizeof(conf), TIMEOUT); | 62 | i2c_status_t ret = i2c_writeReg(addr, cmd, &conf, sizeof(conf), TIMEOUT); |
| 63 | if (ret != I2C_STATUS_SUCCESS) { | 63 | if (ret != I2C_STATUS_SUCCESS) { |
| @@ -67,10 +67,10 @@ void pca9555_set_output(uint8_t slave_addr, uint8_t port, uint8_t conf) { | |||
| 67 | 67 | ||
| 68 | uint8_t pca9555_readPins(uint8_t slave_addr, uint8_t port) { | 68 | uint8_t pca9555_readPins(uint8_t slave_addr, uint8_t port) { |
| 69 | uint8_t addr = SLAVE_TO_ADDR(slave_addr); | 69 | uint8_t addr = SLAVE_TO_ADDR(slave_addr); |
| 70 | uint8_t cmd = port ? CMD_INPUT_1 : CMD_INPUT_0; | 70 | uint8_t cmd = port ? CMD_INPUT_1 : CMD_INPUT_0; |
| 71 | 71 | ||
| 72 | uint8_t data = 0; | 72 | uint8_t data = 0; |
| 73 | i2c_status_t ret = i2c_readReg(addr, cmd, &data, sizeof(data), TIMEOUT); | 73 | i2c_status_t ret = i2c_readReg(addr, cmd, &data, sizeof(data), TIMEOUT); |
| 74 | if (ret != I2C_STATUS_SUCCESS) { | 74 | if (ret != I2C_STATUS_SUCCESS) { |
| 75 | print("pca9555_readPins::FAILED\n"); | 75 | print("pca9555_readPins::FAILED\n"); |
| 76 | } | 76 | } |
