Added OLED SSD1306 support to I2C

8 files changed, 908 insertions, 21 deletions

diff --git a/keyboards/lets_split/common/glcdfont.c b/keyboards/lets_split/common/glcdfont.c
new file mode 100644
index 000000000..6f88bd23a
--- /dev/null
+++ b/keyboards/lets_split/common/glcdfont.c
@@ -0,0 +1,276 @@
+// This is the 'classic' fixed-space bitmap font for Adafruit_GFX since 1.0.
+// See gfxfont.h for newer custom bitmap font info.
+
+#ifndef FONT5X7_H
+#define FONT5X7_H
+
+#ifdef __AVR__
+ #include <avr/io.h>
+ #include <avr/pgmspace.h>
+#elif defined(ESP8266)
+ #include <pgmspace.h>
+#else
+ #define PROGMEM
+#endif
+
+// Standard ASCII 5x7 font
+
+static const unsigned char font[] PROGMEM = {
+        0x00, 0x00, 0x00, 0x00, 0x00,
+        0x3E, 0x5B, 0x4F, 0x5B, 0x3E,
+        0x3E, 0x6B, 0x4F, 0x6B, 0x3E,
+        0x1C, 0x3E, 0x7C, 0x3E, 0x1C,
+        0x18, 0x3C, 0x7E, 0x3C, 0x18,
+        0x1C, 0x57, 0x7D, 0x57, 0x1C,
+        0x1C, 0x5E, 0x7F, 0x5E, 0x1C,
+        0x00, 0x18, 0x3C, 0x18, 0x00,
+        0xFF, 0xE7, 0xC3, 0xE7, 0xFF,
+        0x00, 0x18, 0x24, 0x18, 0x00,
+        0xFF, 0xE7, 0xDB, 0xE7, 0xFF,
+        0x30, 0x48, 0x3A, 0x06, 0x0E,
+        0x26, 0x29, 0x79, 0x29, 0x26,
+        0x40, 0x7F, 0x05, 0x05, 0x07,
+        0x40, 0x7F, 0x05, 0x25, 0x3F,
+        0x5A, 0x3C, 0xE7, 0x3C, 0x5A,
+        0x7F, 0x3E, 0x1C, 0x1C, 0x08,
+        0x08, 0x1C, 0x1C, 0x3E, 0x7F,
+        0x14, 0x22, 0x7F, 0x22, 0x14,
+        0x5F, 0x5F, 0x00, 0x5F, 0x5F,
+        0x06, 0x09, 0x7F, 0x01, 0x7F,
+        0x00, 0x66, 0x89, 0x95, 0x6A,
+        0x60, 0x60, 0x60, 0x60, 0x60,
+        0x94, 0xA2, 0xFF, 0xA2, 0x94,
+        0x08, 0x04, 0x7E, 0x04, 0x08,
+        0x10, 0x20, 0x7E, 0x20, 0x10,
+        0x08, 0x08, 0x2A, 0x1C, 0x08,
+        0x08, 0x1C, 0x2A, 0x08, 0x08,
+        0x1E, 0x10, 0x10, 0x10, 0x10,
+        0x0C, 0x1E, 0x0C, 0x1E, 0x0C,
+        0x30, 0x38, 0x3E, 0x38, 0x30,
+        0x06, 0x0E, 0x3E, 0x0E, 0x06,
+        0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x5F, 0x00, 0x00,
+        0x00, 0x07, 0x00, 0x07, 0x00,
+        0x14, 0x7F, 0x14, 0x7F, 0x14,
+        0x24, 0x2A, 0x7F, 0x2A, 0x12,
+        0x23, 0x13, 0x08, 0x64, 0x62,
+        0x36, 0x49, 0x56, 0x20, 0x50,
+        0x00, 0x08, 0x07, 0x03, 0x00,
+        0x00, 0x1C, 0x22, 0x41, 0x00,
+        0x00, 0x41, 0x22, 0x1C, 0x00,
+        0x2A, 0x1C, 0x7F, 0x1C, 0x2A,
+        0x08, 0x08, 0x3E, 0x08, 0x08,
+        0x00, 0x80, 0x70, 0x30, 0x00,
+        0x08, 0x08, 0x08, 0x08, 0x08,
+        0x00, 0x00, 0x60, 0x60, 0x00,
+        0x20, 0x10, 0x08, 0x04, 0x02,
+        0x3E, 0x51, 0x49, 0x45, 0x3E,
+        0x00, 0x42, 0x7F, 0x40, 0x00,
+        0x72, 0x49, 0x49, 0x49, 0x46,
+        0x21, 0x41, 0x49, 0x4D, 0x33,
+        0x18, 0x14, 0x12, 0x7F, 0x10,
+        0x27, 0x45, 0x45, 0x45, 0x39,
+        0x3C, 0x4A, 0x49, 0x49, 0x31,
+        0x41, 0x21, 0x11, 0x09, 0x07,
+        0x36, 0x49, 0x49, 0x49, 0x36,
+        0x46, 0x49, 0x49, 0x29, 0x1E,
+        0x00, 0x00, 0x14, 0x00, 0x00,
+        0x00, 0x40, 0x34, 0x00, 0x00,
+        0x00, 0x08, 0x14, 0x22, 0x41,
+        0x14, 0x14, 0x14, 0x14, 0x14,
+        0x00, 0x41, 0x22, 0x14, 0x08,
+        0x02, 0x01, 0x59, 0x09, 0x06,
+        0x3E, 0x41, 0x5D, 0x59, 0x4E,
+        0x7C, 0x12, 0x11, 0x12, 0x7C,
+        0x7F, 0x49, 0x49, 0x49, 0x36,
+        0x3E, 0x41, 0x41, 0x41, 0x22,
+        0x7F, 0x41, 0x41, 0x41, 0x3E,
+        0x7F, 0x49, 0x49, 0x49, 0x41,
+        0x7F, 0x09, 0x09, 0x09, 0x01,
+        0x3E, 0x41, 0x41, 0x51, 0x73,
+        0x7F, 0x08, 0x08, 0x08, 0x7F,
+        0x00, 0x41, 0x7F, 0x41, 0x00,
+        0x20, 0x40, 0x41, 0x3F, 0x01,
+        0x7F, 0x08, 0x14, 0x22, 0x41,
+        0x7F, 0x40, 0x40, 0x40, 0x40,
+        0x7F, 0x02, 0x1C, 0x02, 0x7F,
+        0x7F, 0x04, 0x08, 0x10, 0x7F,
+        0x3E, 0x41, 0x41, 0x41, 0x3E,
+        0x7F, 0x09, 0x09, 0x09, 0x06,
+        0x3E, 0x41, 0x51, 0x21, 0x5E,
+        0x7F, 0x09, 0x19, 0x29, 0x46,
+        0x26, 0x49, 0x49, 0x49, 0x32,
+        0x03, 0x01, 0x7F, 0x01, 0x03,
+        0x3F, 0x40, 0x40, 0x40, 0x3F,
+        0x1F, 0x20, 0x40, 0x20, 0x1F,
+        0x3F, 0x40, 0x38, 0x40, 0x3F,
+        0x63, 0x14, 0x08, 0x14, 0x63,
+        0x03, 0x04, 0x78, 0x04, 0x03,
+        0x61, 0x59, 0x49, 0x4D, 0x43,
+        0x00, 0x7F, 0x41, 0x41, 0x41,
+        0x02, 0x04, 0x08, 0x10, 0x20,
+        0x00, 0x41, 0x41, 0x41, 0x7F,
+        0x04, 0x02, 0x01, 0x02, 0x04,
+        0x40, 0x40, 0x40, 0x40, 0x40,
+        0x00, 0x03, 0x07, 0x08, 0x00,
+        0x20, 0x54, 0x54, 0x78, 0x40,
+        0x7F, 0x28, 0x44, 0x44, 0x38,
+        0x38, 0x44, 0x44, 0x44, 0x28,
+        0x38, 0x44, 0x44, 0x28, 0x7F,
+        0x38, 0x54, 0x54, 0x54, 0x18,
+        0x00, 0x08, 0x7E, 0x09, 0x02,
+        0x18, 0xA4, 0xA4, 0x9C, 0x78,
+        0x7F, 0x08, 0x04, 0x04, 0x78,
+        0x00, 0x44, 0x7D, 0x40, 0x00,
+        0x20, 0x40, 0x40, 0x3D, 0x00,
+        0x7F, 0x10, 0x28, 0x44, 0x00,
+        0x00, 0x41, 0x7F, 0x40, 0x00,
+        0x7C, 0x04, 0x78, 0x04, 0x78,
+        0x7C, 0x08, 0x04, 0x04, 0x78,
+        0x38, 0x44, 0x44, 0x44, 0x38,
+        0xFC, 0x18, 0x24, 0x24, 0x18,
+        0x18, 0x24, 0x24, 0x18, 0xFC,
+        0x7C, 0x08, 0x04, 0x04, 0x08,
+        0x48, 0x54, 0x54, 0x54, 0x24,
+        0x04, 0x04, 0x3F, 0x44, 0x24,
+        0x3C, 0x40, 0x40, 0x20, 0x7C,
+        0x1C, 0x20, 0x40, 0x20, 0x1C,
+        0x3C, 0x40, 0x30, 0x40, 0x3C,
+        0x44, 0x28, 0x10, 0x28, 0x44,
+        0x4C, 0x90, 0x90, 0x90, 0x7C,
+        0x44, 0x64, 0x54, 0x4C, 0x44,
+        0x00, 0x08, 0x36, 0x41, 0x00,
+        0x00, 0x00, 0x77, 0x00, 0x00,
+        0x00, 0x41, 0x36, 0x08, 0x00,
+        0x02, 0x01, 0x02, 0x04, 0x02,
+        0x3C, 0x26, 0x23, 0x26, 0x3C,
+        0x1E, 0xA1, 0xA1, 0x61, 0x12,
+        0x3A, 0x40, 0x40, 0x20, 0x7A,
+        0x38, 0x54, 0x54, 0x55, 0x59,
+        0x21, 0x55, 0x55, 0x79, 0x41,
+        0x22, 0x54, 0x54, 0x78, 0x42, // a-umlaut
+        0x21, 0x55, 0x54, 0x78, 0x40,
+        0x20, 0x54, 0x55, 0x79, 0x40,
+        0x0C, 0x1E, 0x52, 0x72, 0x12,
+        0x39, 0x55, 0x55, 0x55, 0x59,
+        0x39, 0x54, 0x54, 0x54, 0x59,
+        0x39, 0x55, 0x54, 0x54, 0x58,
+        0x00, 0x00, 0x45, 0x7C, 0x41,
+        0x00, 0x02, 0x45, 0x7D, 0x42,
+        0x00, 0x01, 0x45, 0x7C, 0x40,
+        0x7D, 0x12, 0x11, 0x12, 0x7D, // A-umlaut
+        0xF0, 0x28, 0x25, 0x28, 0xF0,
+        0x7C, 0x54, 0x55, 0x45, 0x00,
+        0x20, 0x54, 0x54, 0x7C, 0x54,
+        0x7C, 0x0A, 0x09, 0x7F, 0x49,
+        0x32, 0x49, 0x49, 0x49, 0x32,
+        0x3A, 0x44, 0x44, 0x44, 0x3A, // o-umlaut
+        0x32, 0x4A, 0x48, 0x48, 0x30,
+        0x3A, 0x41, 0x41, 0x21, 0x7A,
+        0x3A, 0x42, 0x40, 0x20, 0x78,
+        0x00, 0x9D, 0xA0, 0xA0, 0x7D,
+        0x3D, 0x42, 0x42, 0x42, 0x3D, // O-umlaut
+        0x3D, 0x40, 0x40, 0x40, 0x3D,
+        0x3C, 0x24, 0xFF, 0x24, 0x24,
+        0x48, 0x7E, 0x49, 0x43, 0x66,
+        0x2B, 0x2F, 0xFC, 0x2F, 0x2B,
+        0xFF, 0x09, 0x29, 0xF6, 0x20,
+        0xC0, 0x88, 0x7E, 0x09, 0x03,
+        0x20, 0x54, 0x54, 0x79, 0x41,
+        0x00, 0x00, 0x44, 0x7D, 0x41,
+        0x30, 0x48, 0x48, 0x4A, 0x32,
+        0x38, 0x40, 0x40, 0x22, 0x7A,
+        0x00, 0x7A, 0x0A, 0x0A, 0x72,
+        0x7D, 0x0D, 0x19, 0x31, 0x7D,
+        0x26, 0x29, 0x29, 0x2F, 0x28,
+        0x26, 0x29, 0x29, 0x29, 0x26,
+        0x30, 0x48, 0x4D, 0x40, 0x20,
+        0x38, 0x08, 0x08, 0x08, 0x08,
+        0x08, 0x08, 0x08, 0x08, 0x38,
+        0x2F, 0x10, 0xC8, 0xAC, 0xBA,
+        0x2F, 0x10, 0x28, 0x34, 0xFA,
+        0x00, 0x00, 0x7B, 0x00, 0x00,
+        0x08, 0x14, 0x2A, 0x14, 0x22,
+        0x22, 0x14, 0x2A, 0x14, 0x08,
+        0x55, 0x00, 0x55, 0x00, 0x55, // #176 (25% block) missing in old code
+        0xAA, 0x55, 0xAA, 0x55, 0xAA, // 50% block
+        0xFF, 0x55, 0xFF, 0x55, 0xFF, // 75% block
+        0x00, 0x00, 0x00, 0xFF, 0x00,
+        0x10, 0x10, 0x10, 0xFF, 0x00,
+        0x14, 0x14, 0x14, 0xFF, 0x00,
+        0x10, 0x10, 0xFF, 0x00, 0xFF,
+        0x10, 0x10, 0xF0, 0x10, 0xF0,
+        0x14, 0x14, 0x14, 0xFC, 0x00,
+        0x14, 0x14, 0xF7, 0x00, 0xFF,
+        0x00, 0x00, 0xFF, 0x00, 0xFF,
+        0x14, 0x14, 0xF4, 0x04, 0xFC,
+        0x14, 0x14, 0x17, 0x10, 0x1F,
+        0x10, 0x10, 0x1F, 0x10, 0x1F,
+        0x14, 0x14, 0x14, 0x1F, 0x00,
+        0x10, 0x10, 0x10, 0xF0, 0x00,
+        0x00, 0x00, 0x00, 0x1F, 0x10,
+        0x10, 0x10, 0x10, 0x1F, 0x10,
+        0x10, 0x10, 0x10, 0xF0, 0x10,
+        0x00, 0x00, 0x00, 0xFF, 0x10,
+        0x10, 0x10, 0x10, 0x10, 0x10,
+        0x10, 0x10, 0x10, 0xFF, 0x10,
+        0x00, 0x00, 0x00, 0xFF, 0x14,
+        0x00, 0x00, 0xFF, 0x00, 0xFF,
+        0x00, 0x00, 0x1F, 0x10, 0x17,
+        0x00, 0x00, 0xFC, 0x04, 0xF4,
+        0x14, 0x14, 0x17, 0x10, 0x17,
+        0x14, 0x14, 0xF4, 0x04, 0xF4,
+        0x00, 0x00, 0xFF, 0x00, 0xF7,
+        0x14, 0x14, 0x14, 0x14, 0x14,
+        0x14, 0x14, 0xF7, 0x00, 0xF7,
+        0x14, 0x14, 0x14, 0x17, 0x14,
+        0x10, 0x10, 0x1F, 0x10, 0x1F,
+        0x14, 0x14, 0x14, 0xF4, 0x14,
+        0x10, 0x10, 0xF0, 0x10, 0xF0,
+        0x00, 0x00, 0x1F, 0x10, 0x1F,
+        0x00, 0x00, 0x00, 0x1F, 0x14,
+        0x00, 0x00, 0x00, 0xFC, 0x14,
+        0x00, 0x00, 0xF0, 0x10, 0xF0,
+        0x10, 0x10, 0xFF, 0x10, 0xFF,
+        0x14, 0x14, 0x14, 0xFF, 0x14,
+        0x10, 0x10, 0x10, 0x1F, 0x00,
+        0x00, 0x00, 0x00, 0xF0, 0x10,
+        0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+        0xF0, 0xF0, 0xF0, 0xF0, 0xF0,
+        0xFF, 0xFF, 0xFF, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0xFF, 0xFF,
+        0x0F, 0x0F, 0x0F, 0x0F, 0x0F,
+        0x38, 0x44, 0x44, 0x38, 0x44,
+        0xFC, 0x4A, 0x4A, 0x4A, 0x34, // sharp-s or beta
+        0x7E, 0x02, 0x02, 0x06, 0x06,
+        0x02, 0x7E, 0x02, 0x7E, 0x02,
+        0x63, 0x55, 0x49, 0x41, 0x63,
+        0x38, 0x44, 0x44, 0x3C, 0x04,
+        0x40, 0x7E, 0x20, 0x1E, 0x20,
+        0x06, 0x02, 0x7E, 0x02, 0x02,
+        0x99, 0xA5, 0xE7, 0xA5, 0x99,
+        0x1C, 0x2A, 0x49, 0x2A, 0x1C,
+        0x4C, 0x72, 0x01, 0x72, 0x4C,
+        0x30, 0x4A, 0x4D, 0x4D, 0x30,
+        0x30, 0x48, 0x78, 0x48, 0x30,
+        0xBC, 0x62, 0x5A, 0x46, 0x3D,
+        0x3E, 0x49, 0x49, 0x49, 0x00,
+        0x7E, 0x01, 0x01, 0x01, 0x7E,
+        0x2A, 0x2A, 0x2A, 0x2A, 0x2A,
+        0x44, 0x44, 0x5F, 0x44, 0x44,
+        0x40, 0x51, 0x4A, 0x44, 0x40,
+        0x40, 0x44, 0x4A, 0x51, 0x40,
+        0x00, 0x00, 0xFF, 0x01, 0x03,
+        0xE0, 0x80, 0xFF, 0x00, 0x00,
+        0x08, 0x08, 0x6B, 0x6B, 0x08,
+        0x36, 0x12, 0x36, 0x24, 0x36,
+        0x06, 0x0F, 0x09, 0x0F, 0x06,
+        0x00, 0x00, 0x18, 0x18, 0x00,
+        0x00, 0x00, 0x10, 0x10, 0x00,
+        0x30, 0x40, 0xFF, 0x01, 0x01,
+        0x00, 0x1F, 0x01, 0x01, 0x1E,
+        0x00, 0x19, 0x1D, 0x17, 0x12,
+        0x00, 0x3C, 0x3C, 0x3C, 0x3C,
+        0x00, 0x00, 0x00, 0x00, 0x00  // #255 NBSP
+};
+#endif // FONT5X7_H
diff --git a/keyboards/lets_split/i2c.c b/keyboards/lets_split/i2c.c
index 084c890c4..038f37a4b 100644
--- a/keyboards/lets_split/i2c.c
+++ b/keyboards/lets_split/i2c.c
@@ -48,7 +48,7 @@ void i2c_master_init(void) {
 // returns: 0 => success
 //          1 => error
 uint8_t i2c_master_start(uint8_t address) {
-  TWCR = (1<<TWINT) | (1<<TWEN) | (1<<TWSTA);
+  TWCR = (1<<TWINT) | (1<<TWSTA) | (1<<TWEN);
 
   i2c_delay();
 
@@ -56,6 +56,7 @@ uint8_t i2c_master_start(uint8_t address) {
   if ( (TW_STATUS != TW_START) && (TW_STATUS != TW_REP_START))
     return 1;
 
+  // send device address
   TWDR = address;
   TWCR = (1<<TWINT) | (1<<TWEN);
 
@@ -159,4 +160,95 @@ ISR(TWI_vect) {
   // Reset everything, so we are ready for the next TWI interrupt
   TWCR |= (1<<TWIE) | (1<<TWINT) | (ack<<TWEA) | (1<<TWEN);
 }
+
+// from SSD1306
+/*
+void i2c_start_wait(unsigned char address)
+{
+    uint8_t   twst;
+
+
+    while ( 1 )
+    {
+      // send START condition
+      TWCR = (1<<TWINT) | (1<<TWSTA) | (1<<TWEN);
+
+      // wait until transmission completed
+      while(!(TWCR & (1<<TWINT)));
+
+      // check value of TWI Status Register. Mask prescaler bits.
+      twst = TW_STATUS & 0xF8;
+      if ( (twst != TW_START) && (twst != TW_REP_START)) continue;
+
+      // send device address
+      TWDR = address;
+      TWCR = (1<<TWINT) | (1<<TWEN);
+
+      // wail until transmission completed
+      while(!(TWCR & (1<<TWINT)));
+
+      // check value of TWI Status Register. Mask prescaler bits.
+      twst = TW_STATUS & 0xF8;
+      if ( (twst == TW_MT_SLA_NACK )||(twst ==TW_MR_DATA_NACK) )
+      {
+          // device busy, send stop condition to terminate write operation
+          TWCR = (1<<TWINT) | (1<<TWEN) | (1<<TWSTO);
+
+          // wait until stop condition is executed and bus released
+          while(TWCR & (1<<TWSTO));
+
+          continue;
+      }
+      //if( twst != TW_MT_SLA_ACK) return 1;
+      break;
+     }
+
+}// i2c_start_wait
+*/
+/*************************************************************************
+ Issues a repeated start condition and sends address and transfer direction
+
+ Input:   address and transfer direction of I2C device
+
+ Return:  0 device accessible
+          1 failed to access device
+*************************************************************************/
+/*
+unsigned char i2c_rep_start(unsigned char address)
+{
+    return i2c_master_start( address );
+
+}/* i2c_rep_start */
+/*************************************************************************
+ Read one byte from the I2C device, request more data from device
+
+ Return:  byte read from I2C device
+*************************************************************************/
+/*
+unsigned char i2c_readAck(void)
+{
+  TWCR = (1<<TWINT) | (1<<TWEN) | (1<<TWEA);
+  while(!(TWCR & (1<<TWINT)));
+
+  return TWDR;
+
+}/* i2c_readAck */
+
+
+/*************************************************************************
+ Read one byte from the I2C device, read is followed by a stop condition
+
+ Return:  byte read from I2C device
+*************************************************************************
+unsigned char i2c_readNak(void)
+{
+  TWCR = (1<<TWINT) | (1<<TWEN);
+  while(!(TWCR & (1<<TWINT)));
+
+  return TWDR;
+
+}/* i2c_readNak */
+
+
+
 #endif
diff --git a/keyboards/lets_split/i2c.h b/keyboards/lets_split/i2c.h
index 08ce4b009..c15b6bc50 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
diff --git a/keyboards/lets_split/matrix.c b/keyboards/lets_split/matrix.c
index 138969004..b6e59cb7f 100644
--- a/keyboards/lets_split/matrix.c
+++ b/keyboards/lets_split/matrix.c
@@ -210,8 +210,9 @@ uint8_t matrix_scan(void)
     if( serial_transaction() ) {
 #endif
         // turn on the indicator led when halves are disconnected
-        TXLED1;
-
+//        TXLED1;
+        TXLED0;
+        
         error_count++;
 
         if (error_count > ERROR_DISCONNECT_COUNT) {
@@ -226,9 +227,7 @@ uint8_t matrix_scan(void)
         TXLED0;
         error_count = 0;
     }
-
     matrix_scan_quantum();
-
     return ret;
 }
 
diff --git a/keyboards/lets_split/rules.mk b/keyboards/lets_split/rules.mk
index 0efa78550..ff159e0f0 100644
--- a/keyboards/lets_split/rules.mk
+++ b/keyboards/lets_split/rules.mk
@@ -1,7 +1,8 @@
 SRC += matrix.c \
            i2c.c \
            split_util.c \
-           serial.c
+           serial.c\
+           ssd1306.c
 
 # MCU name
 #MCU = at90usb1287
@@ -73,15 +74,3 @@ USE_I2C ?= yes
 SLEEP_LED_ENABLE ?= no    # Breathing sleep LED during USB suspend
 
 CUSTOM_MATRIX = yes
-
-avrdude: build
-        ls /dev/tty* > /tmp/1; \
-        echo "Reset your Pro Micro now"; \
-        while [[ -z $$USB ]]; do \
-          sleep 1; \
-          ls /dev/tty* > /tmp/2; \
-          USB=`diff /tmp/1 /tmp/2 | grep -o '/dev/tty.*'`; \
-        done; \
-        avrdude -p $(MCU) -c avr109 -P $$USB -U flash:w:$(BUILD_DIR)/$(TARGET).hex
-
-.PHONY: avrdude
diff --git a/keyboards/lets_split/split_util.c b/keyboards/lets_split/split_util.c
index 226dc1881..b87bae38b 100644
--- a/keyboards/lets_split/split_util.c
+++ b/keyboards/lets_split/split_util.c
@@ -21,8 +21,8 @@ static void setup_handedness(void) {
   #ifdef EE_HANDS
     isLeftHand = eeprom_read_byte(EECONFIG_HANDEDNESS);
   #else
-    // I2C_MASTER_RIGHT is deprecated use MASTER_RIGHT instead since this works for both serial and i2c
-    #if defined(I2C_MASTER_RIGHT) || defined(MASTER_RIGHT)
+    // I2c_MASTER_RIGHT ish deprecate use MASTER_RIGHT instead since this works for both serial and i2c:
+    #if defined (I2C_MASTER_RIGHT) || defined (MASTER_RIGHT)
       isLeftHand = !has_usb();
     #else
       isLeftHand = has_usb();
@@ -33,6 +33,9 @@ static void setup_handedness(void) {
 static void keyboard_master_setup(void) {
 #ifdef USE_I2C
     i2c_master_init();
+#ifdef SSD1306OLED
+    matrix_master_OLED_init ();
+#endif
 #else
     serial_master_init();
 #endif
diff --git a/keyboards/lets_split/split_util.h b/keyboards/lets_split/split_util.h
index 6b896679c..3ae76c209 100644
--- a/keyboards/lets_split/split_util.h
+++ b/keyboards/lets_split/split_util.h
@@ -19,4 +19,6 @@ void split_keyboard_setup(void);
 bool has_usb(void);
 void keyboard_slave_loop(void);
 
+void matrix_master_OLED_init (void);
+
 #endif
diff --git a/keyboards/lets_split/ssd1306.c b/keyboards/lets_split/ssd1306.c
new file mode 100644
index 000000000..c25a355bf
--- /dev/null
+++ b/keyboards/lets_split/ssd1306.c
@@ -0,0 +1,508 @@
+#include "config.h"
+#include "i2c.h"
+#include <stdbool.h>
+#include <string.h>
+#include <stdio.h>
+#include "print.h"
+#include "lets_split.h"
+#include "common/glcdfont.c"
+#ifdef ADAFRUIT_BLE_ENABLE
+#include "adafruit_ble.h"
+#endif
+#ifdef PROTOCOL_LUFA
+#include "lufa.h"
+#endif
+#include "sendchar.h"
+#include "pincontrol.h"
+
+//assign the right code to your layers
+#define _BASE 0
+#define _LOWER 8
+#define _RAISE 16
+#define _FNLAYER 64
+#define _NUMLAY 128
+#define _NLOWER 136
+#define _NFNLAYER 192
+#define _MOUSECURSOR 256
+#define _ADJUST 65560
+
+// Set this to 1 to help diagnose early startup problems
+// when testing power-on with ble.  Turn it off otherwise,
+// as the latency of printing most of the debug info messes
+// with the matrix scan, causing keys to drop.
+#define DEBUG_TO_SCREEN 0
+
+// Controls the SSD1306 128x32 OLED display via i2c
+
+#define i2cAddress 0x3C
+
+#define DisplayHeight 32
+#define DisplayWidth 128
+
+#define FontHeight 8
+#define FontWidth 6
+
+#define MatrixRows (DisplayHeight / FontHeight)
+#define MatrixCols (DisplayWidth / FontWidth)
+
+struct CharacterMatrix {
+  uint8_t display[MatrixRows][MatrixCols];
+  uint8_t *cursor;
+  bool dirty;
+};
+
+static struct CharacterMatrix display;
+//static uint16_t last_battery_update;
+//static uint32_t vbat;
+//#define BatteryUpdateInterval 10000 /* milliseconds */
+#define ScreenOffInterval 300000 /* milliseconds */
+#if DEBUG_TO_SCREEN
+static uint8_t displaying;
+#endif
+static uint16_t last_flush;
+
+enum ssd1306_cmds {
+  DisplayOff = 0xAE,
+  DisplayOn = 0xAF,
+
+  SetContrast = 0x81,
+  DisplayAllOnResume = 0xA4,
+
+  DisplayAllOn = 0xA5,
+  NormalDisplay = 0xA6,
+  InvertDisplay = 0xA7,
+  SetDisplayOffset = 0xD3,
+  SetComPins = 0xda,
+  SetVComDetect = 0xdb,
+  SetDisplayClockDiv = 0xD5,
+  SetPreCharge = 0xd9,
+  SetMultiPlex = 0xa8,
+  SetLowColumn = 0x00,
+  SetHighColumn = 0x10,
+  SetStartLine = 0x40,
+
+  SetMemoryMode = 0x20,
+  ColumnAddr = 0x21,
+  PageAddr = 0x22,
+
+  ComScanInc = 0xc0,
+  ComScanDec = 0xc8,
+  SegRemap = 0xa0,
+  SetChargePump = 0x8d,
+  ExternalVcc = 0x01,
+  SwitchCapVcc = 0x02,
+
+  ActivateScroll = 0x2f,
+  DeActivateScroll = 0x2e,
+  SetVerticalScrollArea = 0xa3,
+  RightHorizontalScroll = 0x26,
+  LeftHorizontalScroll = 0x27,
+  VerticalAndRightHorizontalScroll = 0x29,
+  VerticalAndLeftHorizontalScroll = 0x2a,
+};
+
+
+// Write command sequence.
+// Returns true on success.
+static inline bool _send_cmd1(uint8_t cmd) {
+  bool res = false;
+
+  if (i2c_start_write(i2cAddress)) {
+    xprintf("failed to start write to %d\n", i2cAddress);
+    goto done;
+  }
+
+  if (i2c_master_write(0x0 /* command byte follows */)) {
+    print("failed to write control byte\n");
+
+    goto done;
+  }
+
+  if (i2c_master_write(cmd)) {
+    xprintf("failed to write command %d\n", cmd);
+    goto done;
+  }
+  res = true;
+done:
+  i2c_master_stop();
+  return res;
+}
+
+// Write 2-byte command sequence.
+// Returns true on success
+static inline bool _send_cmd2(uint8_t cmd, uint8_t opr) {
+  if (!_send_cmd1(cmd)) {
+    return false;
+  }
+  return _send_cmd1(opr);
+}
+
+// Write 3-byte command sequence.
+// Returns true on success
+static inline bool _send_cmd3(uint8_t cmd, uint8_t opr1, uint8_t opr2) {
+  if (!_send_cmd1(cmd)) {
+    return false;
+  }
+  if (!_send_cmd1(opr1)) {
+    return false;
+  }
+  return _send_cmd1(opr2);
+}
+
+#define send_cmd1(c) if (!_send_cmd1(c)) {goto done;}
+#define send_cmd2(c,o) if (!_send_cmd2(c,o)) {goto done;}
+#define send_cmd3(c,o1,o2) if (!_send_cmd3(c,o1,o2)) {goto done;}
+
+static void matrix_clear(struct CharacterMatrix *matrix);
+
+static void clear_display(void) {
+  matrix_clear(&display);
+
+  // Clear all of the display bits (there can be random noise
+  // in the RAM on startup)
+  send_cmd3(PageAddr, 0, (DisplayHeight / 8) - 1);
+  send_cmd3(ColumnAddr, 0, DisplayWidth - 1);
+
+  if (i2c_start_write(i2cAddress)) {
+    goto done;
+  }
+  if (i2c_master_write(0x40)) {
+    // Data mode
+    goto done;
+  }
+  for (uint8_t row = 0; row < MatrixRows; ++row) {
+    for (uint8_t col = 0; col < DisplayWidth; ++col) {
+      i2c_master_write(0);
+    }
+  }
+
+  display.dirty = false;
+
+done:
+  i2c_master_stop();
+}
+
+#if DEBUG_TO_SCREEN
+#undef sendchar
+static int8_t capture_sendchar(uint8_t c) {
+  sendchar(c);
+  iota_gfx_write_char(c);
+
+  if (!displaying) {
+    iota_gfx_flush();
+  }
+  return 0;
+}
+#endif
+
+bool iota_gfx_init(void) {
+  bool success = false;
+
+  send_cmd1(DisplayOff);
+  send_cmd2(SetDisplayClockDiv, 0x80);
+  send_cmd2(SetMultiPlex, DisplayHeight - 1);
+
+  send_cmd2(SetDisplayOffset, 0);
+
+
+  send_cmd1(SetStartLine | 0x0);
+  send_cmd2(SetChargePump, 0x14 /* Enable */);
+  send_cmd2(SetMemoryMode, 0 /* horizontal addressing */);
+
+/* Flips the display orientation 0 degrees
+  send_cmd1(SegRemap | 0x1);
+  send_cmd1(ComScanDec);
+*/
+// the following Flip the display orientation 180 degrees */
+  send_cmd1(SegRemap);
+  send_cmd1(ComScanInc);
+//end flip
+  send_cmd2(SetComPins, 0x2);
+  send_cmd2(SetContrast, 0x8f);
+  send_cmd2(SetPreCharge, 0xf1);
+  send_cmd2(SetVComDetect, 0x40);
+  send_cmd1(DisplayAllOnResume);
+  send_cmd1(NormalDisplay);
+  send_cmd1(DeActivateScroll);
+  send_cmd1(DisplayOn);
+
+  send_cmd2(SetContrast, 0); // Dim
+
+  clear_display();
+
+  success = true;
+
+  iota_gfx_flush();
+
+#if DEBUG_TO_SCREEN
+  print_set_sendchar(capture_sendchar);
+#endif
+
+done:
+  return success;
+}
+
+bool iota_gfx_off(void) {
+  bool success = false;
+
+  send_cmd1(DisplayOff);
+  success = true;
+
+done:
+  return success;
+} 
+
+bool iota_gfx_on(void) {
+  bool success = false;
+
+  send_cmd1(DisplayOn);
+  success = true;
+
+done:
+  return success;
+}
+
+static void matrix_write_char_inner(struct CharacterMatrix *matrix, uint8_t c) {
+  *matrix->cursor = c;
+  ++matrix->cursor;
+
+  if (matrix->cursor - &matrix->display[0][0] == sizeof(matrix->display)) {
+    // We went off the end; scroll the display upwards by one line
+    memmove(&matrix->display[0], &matrix->display[1],
+            MatrixCols * (MatrixRows - 1));
+    matrix->cursor = &matrix->display[MatrixRows - 1][0];
+    memset(matrix->cursor, ' ', MatrixCols);
+  }
+}
+
+static void matrix_write_char(struct CharacterMatrix *matrix, uint8_t c) {
+  matrix->dirty = true;
+
+  if (c == '\n') {
+    // Clear to end of line from the cursor and then move to the
+    // start of the next line
+    uint8_t cursor_col = (matrix->cursor - &matrix->display[0][0]) % MatrixCols;
+
+    while (cursor_col++ < MatrixCols) {
+      matrix_write_char_inner(matrix, ' ');
+    }
+    return;
+  }
+
+  matrix_write_char_inner(matrix, c);
+}
+
+void iota_gfx_write_char(uint8_t c) {
+  matrix_write_char(&display, c);
+}
+
+static void matrix_write(struct CharacterMatrix *matrix, const char *data) {
+  const char *end = data + strlen(data);
+  while (data < end) {
+    matrix_write_char(matrix, *data);
+    ++data;
+  }
+}
+
+void iota_gfx_write(const char *data) {
+  matrix_write(&display, data);
+}
+
+static void matrix_write_P(struct CharacterMatrix *matrix, const char *data) {
+  while (true) {
+    uint8_t c = pgm_read_byte(data);
+    if (c == 0) {
+      return;
+    }
+    matrix_write_char(matrix, c);
+    ++data;
+  }
+}
+
+void iota_gfx_write_P(const char *data) {
+  matrix_write_P(&display, data);
+}
+
+static void matrix_clear(struct CharacterMatrix *matrix) {
+  memset(matrix->display, ' ', sizeof(matrix->display));
+  matrix->cursor = &matrix->display[0][0];
+  matrix->dirty = true;
+}
+
+void iota_gfx_clear_screen(void) {
+  matrix_clear(&display);
+}
+
+static void matrix_render(struct CharacterMatrix *matrix) {
+  last_flush = timer_read();
+  iota_gfx_on();
+#if DEBUG_TO_SCREEN
+  ++displaying;
+#endif
+
+  // Move to the home position
+  send_cmd3(PageAddr, 0, MatrixRows - 1);
+  send_cmd3(ColumnAddr, 0, (MatrixCols * FontWidth) - 1);
+
+  if (i2c_start_write(i2cAddress)) {
+    goto done;
+  }
+  if (i2c_master_write(0x40)) {
+    // Data mode
+    goto done;
+  }
+
+  for (uint8_t row = 0; row < MatrixRows; ++row) {
+    for (uint8_t col = 0; col < MatrixCols; ++col) {
+      const uint8_t *glyph = font + (matrix->display[row][col] * (FontWidth - 1));
+
+      for (uint8_t glyphCol = 0; glyphCol < FontWidth - 1; ++glyphCol) {
+        uint8_t colBits = pgm_read_byte(glyph + glyphCol);
+        i2c_master_write(colBits);
+      }
+
+      // 1 column of space between chars (it's not included in the glyph)
+      i2c_master_write(0);
+    }
+  }
+
+  matrix->dirty = false;
+
+done:
+  i2c_master_stop();
+#if DEBUG_TO_SCREEN
+  --displaying;
+#endif
+}
+
+void iota_gfx_flush(void) {
+  matrix_render(&display);
+}
+
+//#include "LUFA/Drivers/Peripheral/ADC.h"
+
+/* Returns the battery voltage; returns the number of millivolts
+static uint32_t read_battery_voltage(void) {
+  if (last_battery_update == 0 ||
+      timer_elapsed(last_battery_update) > BatteryUpdateInterval) {
+    ADC_Init(ADC_SINGLE_CONVERSION | ADC_PRESCALE_32);
+    ADC_SetupChannel(12);
+    vbat = 2 * 3.3 * ADC_GetChannelReading(ADC_REFERENCE_AVCC | ADC_CHANNEL12);
+
+    last_battery_update = timer_read();
+  }
+  return vbat;
+} */
+
+static void matrix_update(struct CharacterMatrix *dest,
+                          const struct CharacterMatrix *source) {
+  if (memcmp(dest->display, source->display, sizeof(dest->display))) {
+    memcpy(dest->display, source->display, sizeof(dest->display));
+    dest->dirty = true;
+  }
+}
+
+static void render_status_info(void) {
+#if DEBUG_TO_SCREEN
+  if (debug_enable) {
+    return;
+  }
+#endif
+
+  struct CharacterMatrix matrix;
+
+  matrix_clear(&matrix);
+  matrix_write_P(&matrix, PSTR("USB: "));
+#ifdef PROTOCOL_LUFA
+  switch (USB_DeviceState) {
+    case DEVICE_STATE_Unattached:
+      matrix_write_P(&matrix, PSTR("Unattached"));
+      break;
+    case DEVICE_STATE_Suspended:
+      matrix_write_P(&matrix, PSTR("Suspended"));
+      break;
+    case DEVICE_STATE_Configured:
+      matrix_write_P(&matrix, PSTR("Connected"));
+      break;
+    case DEVICE_STATE_Powered:
+      matrix_write_P(&matrix, PSTR("Powered"));
+      break;
+    case DEVICE_STATE_Default:
+      matrix_write_P(&matrix, PSTR("Default"));
+      break;
+    case DEVICE_STATE_Addressed:
+      matrix_write_P(&matrix, PSTR("Addressed"));
+      break;
+    default:
+      matrix_write_P(&matrix, PSTR("Invalid"));
+  }
+#endif
+
+    // matrix_write_P(&matrix, (host_keyboard_leds() & (1<<USB_LED_NUM_LOCK)) ? PSTR("\n            NUMLOCK") : PSTR("\n"));
+//  matrix_write_P(&matrix, PSTR("\nBLE: "));
+//#ifdef ADAFRUIT_BLE_ENABLE
+//  matrix_write_P(&matrix, adafruit_ble_is_connected() ? PSTR("Connected")
+//      : PSTR("Not Connected"));
+//#endif
+
+//  char buf[40];
+//  snprintf(buf, sizeof(buf), "VBat: %4lumV\nLayer: 0x%04lx  %s",
+//           read_battery_voltage(), layer_state,
+//           (host_keyboard_leds() & USB_LED_CAPS_LOCK) ? "CAPS" : "");
+//  matrix_write(&matrix, buf);
+
+  char buf[40];
+  snprintf(buf,sizeof(buf), "Undef-%ld", layer_state);
+  matrix_write_P(&matrix, PSTR("\n\nLayer: "));
+    switch (layer_state) {
+        case _BASE:
+           matrix_write_P(&matrix, PSTR("Default"));
+           break;
+        case _RAISE:
+           matrix_write_P(&matrix, PSTR("Raise"));
+           break;
+        case _LOWER:
+           matrix_write_P(&matrix, PSTR("Lower"));
+           break;
+        case _MOUSECURSOR:
+           matrix_write_P(&matrix, PSTR("Mouse/Macro"));
+           break;
+        case _FNLAYER:
+           matrix_write_P(&matrix, PSTR("Symbols/Fn"));
+           break;
+        case _NUMLAY:
+           matrix_write_P(&matrix, PSTR("Numbers"));
+           break;
+        case _NLOWER:
+           matrix_write_P(&matrix, PSTR("Num + Lower"));
+           break;
+        case _NFNLAYER:
+           matrix_write_P(&matrix, PSTR("Num + FN"));
+           break;
+        case _ADJUST:
+           matrix_write_P(&matrix, PSTR("ADJUST"));
+           break;
+        default:
+           matrix_write(&matrix, buf);
+ }
+  
+  char led[40];
+    snprintf(led, sizeof(led), "\n%s  %s  %s",
+            (host_keyboard_leds() & (1<<USB_LED_NUM_LOCK)) ? "NUMLOCK" : "       ",
+            (host_keyboard_leds() & (1<<USB_LED_CAPS_LOCK)) ? "CAPS" : "    ",
+            (host_keyboard_leds() & (1<<USB_LED_SCROLL_LOCK)) ? "SCLK" : "    ");
+  matrix_write(&matrix, led);
+  matrix_update(&display, &matrix);
+}
+
+void iota_gfx_task(void) {
+  render_status_info();
+
+  if (display.dirty) {
+    iota_gfx_flush();
+  }
+
+  if (timer_elapsed(last_flush) > ScreenOffInterval) {
+    iota_gfx_off();
+  }
+}