diff options
| author | That-Canadian <poole.chris.11@gmail.com> | 2017-07-15 03:24:58 +0200 |
|---|---|---|
| committer | That-Canadian <poole.chris.11@gmail.com> | 2017-07-15 03:24:58 +0200 |
| commit | 21b63d924327ac404b8592d3c07b3695eb3e235f (patch) | |
| tree | 7a0d3c22652f28cc18b84c27999f2d0a04ee2d70 /keyboards/minidox/i2c.h | |
| parent | d73d30aa846f4378b8f1fa072a4620520b3c1953 (diff) | |
| download | qmk_firmware-21b63d924327ac404b8592d3c07b3695eb3e235f.tar.gz qmk_firmware-21b63d924327ac404b8592d3c07b3695eb3e235f.tar.xz | |
Updated i2c and serial files to most recent from the lets split firmware. Also updated that_canadian keymap
Diffstat (limited to 'keyboards/minidox/i2c.h')
| -rw-r--r-- | keyboards/minidox/i2c.h | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/keyboards/minidox/i2c.h b/keyboards/minidox/i2c.h index 08ce4b009..c15b6bc50 100644 --- a/keyboards/minidox/i2c.h +++ b/keyboards/minidox/i2c.h @@ -16,7 +16,7 @@ #define SLAVE_BUFFER_SIZE 0x10 // i2c SCL clock frequency -#define SCL_CLOCK 100000L +#define SCL_CLOCK 400000L extern volatile uint8_t i2c_slave_buffer[SLAVE_BUFFER_SIZE]; @@ -28,4 +28,22 @@ uint8_t i2c_master_read(int); void i2c_reset_state(void); void i2c_slave_init(uint8_t address); + +static inline unsigned char i2c_start_read(unsigned char addr) { + return i2c_master_start((addr << 1) | I2C_READ); +} + +static inline unsigned char i2c_start_write(unsigned char addr) { + return i2c_master_start((addr << 1) | I2C_WRITE); +} + +// from SSD1306 scrips +extern unsigned char i2c_rep_start(unsigned char addr); +extern void i2c_start_wait(unsigned char addr); +extern unsigned char i2c_readAck(void); +extern unsigned char i2c_readNak(void); +extern unsigned char i2c_read(unsigned char ack); + +#define i2c_read(ack) (ack) ? i2c_readAck() : i2c_readNak(); + #endif |