summaryrefslogtreecommitdiff
path: root/keyboards/lets_split/i2c.h
diff options
context:
space:
mode:
authorStick <nstickney@gmail.com>2017-04-03 16:59:27 -0500
committerStick <nstickney@gmail.com>2017-04-03 16:59:27 -0500
commitbee9183e7fae7c739b9c42dd4dc759783ac80e46 (patch)
tree690f17486c2e57175bbd36152d685ebedc7c9439 /keyboards/lets_split/i2c.h
parentb6280d0cac59c741db62a63072efd5de4887fc01 (diff)
parent3ac9259742bfd428f71c31dbf2bfedace2a7f91b (diff)
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'keyboards/lets_split/i2c.h')
-rw-r--r--keyboards/lets_split/i2c.h20
1 files changed, 19 insertions, 1 deletions
diff --git a/keyboards/lets_split/i2c.h b/keyboards/lets_split/i2c.h
index 08ce4b0093..c15b6bc506 100644
--- a/keyboards/lets_split/i2c.h
+++ b/keyboards/lets_split/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