aboutsummaryrefslogtreecommitdiffstats
path: root/keyboards/minidox/i2c.h
diff options
context:
space:
mode:
authorJack Humbert <jack.humb@gmail.com>2017-07-14 22:04:18 -0400
committerGitHub <noreply@github.com>2017-07-14 22:04:18 -0400
commit7c0610b4117b17b24f9a53c0f9d237175a4a3d25 (patch)
tree0bf188370d603eeab2d872cf376b8a3e19c664c5 /keyboards/minidox/i2c.h
parent6ed8ce4f598f838b971aa290a499f852827e1b58 (diff)
parentb6d74b9bb90303f11796b8ccf8b98e2f532351ac (diff)
downloadfirmware-7c0610b4117b17b24f9a53c0f9d237175a4a3d25.tar.gz
firmware-7c0610b4117b17b24f9a53c0f9d237175a4a3d25.tar.bz2
firmware-7c0610b4117b17b24f9a53c0f9d237175a4a3d25.zip
Merge pull request #1498 from That-Canadian/minidox
Minidox
Diffstat (limited to 'keyboards/minidox/i2c.h')
-rw-r--r--keyboards/minidox/i2c.h20
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