Revision 5:6d2aded0cf41, committed 2013-01-29

Comitter:

pegcjs

Date:

Tue Jan 29 09:56:25 2013 +0000

Parent:

4:a675a19c16f0

Commit message:

Library updated to allow page mode driving on a unigraphics OLED

Changed in this revision

diff -r a675a19c16f0 -r 6d2aded0cf41 4spi_oled_ssd1305.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/4spi_oled_ssd1305.cpp	Tue Jan 29 09:56:25 2013 +0000
@@ -0,0 +1,670 @@
+// OLED display using SSD1305 driver
+// A library by *spark audio-visual
+
+/* Copyright (c) 2011 Toby Harris, MIT License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software
+ * and associated documentation files (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge, publish, distribute,
+ * sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or
+ * substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
+ * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include "4spi_oled_ssd1305.h"
+#include "mbed.h"
+
+// re written to handle page mode on ssd1305 128x64 unit CJS 2013
+
+// nice logo - note the typo....
+static unsigned char logo_bits[] = {
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE0, 0xE0, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE0, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFE, 0xFE, 0x00, 0x04, 0x06,
+0x06, 0xFC, 0xF8, 0x00, 0x04, 0x06, 0x06, 0xFC, 0xF0, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00,
+0x04, 0x06, 0x06, 0x04, 0xFC, 0x60, 0x00, 0x60, 0xF8, 0x6C, 0x64, 0x66, 0x66, 0x64, 0x64, 0x78,
+0x60, 0x00, 0x60, 0xFC, 0x04, 0x06, 0x06, 0x04, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x00, 0x00, 0x00,
+0x00, 0x07, 0x07, 0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x00,
+0x02, 0x06, 0x06, 0x02, 0x03, 0x00, 0x00, 0x00, 0x01, 0x03, 0x02, 0x06, 0x06, 0x06, 0x02, 0x02,
+0x02, 0x00, 0x00, 0x03, 0x02, 0x06, 0x06, 0x02, 0x00, 0x07, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x20, 0x20, 0xF0, 0xF0,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x20, 0x20, 0x30, 0x20, 0x20, 0xE0, 0x80, 0x00, 0x00, 0x00,
+0x80, 0xE0, 0x20, 0x30, 0x30, 0x20, 0x20, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0xC0, 0x60, 0x20, 0x30, 0x30, 0x20, 0x20, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x20, 0xF0, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
+0x40, 0x60, 0x20, 0x30, 0x30, 0x30, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 0xF0, 0xF0, 0x00, 0x00,
+0x80, 0xE0, 0x20, 0x20, 0x30, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0xFF, 0xFF,
+0x80, 0x80, 0x80, 0x00, 0x00, 0x80, 0xC0, 0xE0, 0xB0, 0x98, 0x8C, 0x87, 0x81, 0x00, 0x00, 0x00,
+0x01, 0x87, 0x84, 0x8C, 0x8C, 0x84, 0xC0, 0x7F, 0x0E, 0x00, 0x00, 0x00, 0x81, 0xC3, 0x34, 0x00,
+0x10, 0x34, 0xC3, 0x80, 0x00, 0x00, 0x0E, 0x7F, 0x80, 0x84, 0x86, 0x86, 0x84, 0xFC, 0x30, 0x00,
+0x00, 0x30, 0x38, 0x32, 0x31, 0x30, 0x30, 0xFF, 0xFF, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x3F,
+0x40, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
+0x80, 0x83, 0x82, 0x86, 0x84, 0x84, 0x84, 0xF8, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01,
+0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x18, 0x18, 0x08, 0x0F, 0x01, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+
+
+static unsigned char font[]= {
+    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,
+    0x21, 0x54, 0x54, 0x78, 0x41,
+    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,
+    0xF0, 0x29, 0x24, 0x29, 0xF0,
+    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,
+    0x32, 0x48, 0x48, 0x48, 0x32,
+    0x32, 0x4A, 0x48, 0x48, 0x30,
+    0x3A, 0x41, 0x41, 0x21, 0x7A,
+    0x3A, 0x42, 0x40, 0x20, 0x78,
+    0x00, 0x9D, 0xA0, 0xA0, 0x7D,
+    0x39, 0x44, 0x44, 0x44, 0x39,
+    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,
+    0xAA, 0x00, 0x55, 0x00, 0xAA,
+    0xAA, 0x55, 0xAA, 0x55, 0xAA,
+    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,
+    0x7C, 0x2A, 0x2A, 0x3E, 0x14,
+    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,
+};
+
+
+SPKDisplay::SPKDisplay(PinName mosiPin, PinName clkPin, PinName csPin, PinName dcPin, PinName resPin, Serial *debugSerial)
+{
+    bufferHasChanged = false;
+
+    fontStartCharacter = NULL;
+    fontEndCharacter = NULL;
+    fontCharacters = NULL;
+
+    spi = new SPI(mosiPin, NC, clkPin);
+    spi->format(8,3);
+    // changed to 9600 to test
+    spi->frequency(1000000);
+
+    cs = new DigitalOut(csPin);
+    dc = new DigitalOut(dcPin);
+    res = new DigitalOut(resPin);
+
+    // Link up debug Serial object
+    // Passing in shared object as debugging is shared between all DVI mixer functions
+    debug = debugSerial;
+
+    setup();
+
+    clearBuffer();
+
+    if (debug) debug->printf("SPKDisplay loaded\n\r");
+}
+
+// set display for black on white
+void SPKDisplay::inverse()
+{
+    *dc=0;
+    *cs=0;
+    spi->write(0xA7);
+    *dc=1;
+    *cs=1;
+}
+
+//set display for white on black (normal state after reset)
+void SPKDisplay::normal()
+{
+    *dc=0;
+    *cs=0;
+    spi->write(0xA6);
+    *dc=1;
+    *cs=1;
+}
+
+void SPKDisplay::displayPower(int P)
+{
+    *dc=0;
+    *cs=0;
+    if(P==0) spi->write(0xAE);
+    else spi->write(0xAF);
+    *dc=1;
+    *cs=1;
+
+}
+
+
+void SPKDisplay::clearBuffer()
+{
+    memset(buffer, 0, bufferCount);
+    bufferHasChanged = true;
+}
+
+void SPKDisplay::imageToBuffer(const uint8_t* image)
+{
+    memcpy(buffer, image, bufferCount);
+    bufferHasChanged = true;
+}
+
+void SPKDisplay::clearBufferRow(int row)
+{
+    // Range check
+    if (row >= 8) {
+        if (debug) debug->printf("SPKDisplay::clearBufferRow sent out of bounds row");
+        return;
+    }
+    int bStart = row*bufferWidth;
+    int bEnd = bStart + pixelWidth;
+
+    for (int bPos = bStart; bPos <= bEnd; bPos++) {
+        buffer[bPos] = 0x00;
+    }
+
+    bufferHasChanged = true;
+}
+
+void SPKDisplay::horizLineToBuffer(int y)
+{
+    if (y >= pixelHeight) {
+        if (debug) debug->printf("SPKDisplay::clearBufferRow sent out of bounds y");
+        return;
+    }
+
+    int row = (y*pixInPage) / pixelHeight;
+    int posInRow = y % pixInPage;
+
+    int bStart = row*bufferWidth;
+    int bEnd = bStart + pixelWidth;
+
+    for (int bPos = bStart; bPos <= bEnd; bPos++) {
+        // Need to bitwise OR as setting single bit (the line) in byte (the row)
+        buffer[bPos] = buffer[bPos] | 0x01 << posInRow;
+    }
+
+    bufferHasChanged = true;
+}
+
+
+void SPKDisplay::textToBuffer(char *message, int row)
+{
+   char character;
+    // Range check
+    if (row >= 8) row = 7;
+    int bStart = row*bufferWidth;
+    int bEnd = bStart + pixelWidth;
+ 
+    int bPos = bStart;
+    for (int i = 0; i < 21; i++)
+    {
+       character=message[i];
+         
+            // Shift into our array's indexing
+      //      character -= *fontStartCharacter;
+            
+            // Write each byte's vertical column of 8bits into the buffer.
+            for (int j = 0; j < 5;j++)
+            {
+                if (bPos >= bEnd) break;
+                buffer[bPos++] = font[character*5+j];
+            }
+            
+            // Put 1px letter spacing at end
+            if (bPos >= bEnd) break;
+            buffer[bPos++] = 0x00; // 1 px letter spacing
+        
+    }
+    
+    bufferHasChanged = true;
+}
+
+
+// rewritten to cope with the paging
+void SPKDisplay::sendBuffer()
+{
+    if (bufferHasChanged) {
+        // Select the device by seting chip select low
+        *cs = 0; // select chip
+        *dc = 0; // comand mode
+
+
+        unsigned char i=0,j=0;
+        for(i=0; i<8; i++) {
+            *dc=0; // command mode
+            spi->write(0xB0+i); //Set display position - paged display
+            spi->write(0x00); //Set display position - low column address
+            spi->write(0x10);//Set the display position - high column address
+
+            *dc=1; // data mode
+            for(j=0; j<128; j++) {
+                spi->write(buffer[i*128+j]); //copy buffer into ram
+
+            }
+
+        }
+
+        *cs = 1;
+
+        bufferHasChanged = false;
+    }
+}
+
+// display a welcome message encoded in tab0 in  spk_ole_ssd1305.h
+void SPKDisplay::welcome()
+{
+// Select the device by seting chip select low
+    *cs = 0; // select chip
+    *dc = 0; // comand mode
+
+
+    unsigned char i=0,j=0;
+    for(i=0; i<8; i++) {
+        *dc=0; // command mode
+        spi->write(0xB0+i); //Set display position - paged display
+        spi->write(0x00); //Set display position - low column address
+        spi->write(0x10);//Set the display position - high column address
+
+        *dc=1; // data mode
+        for(j=0; j<128; j++) {
+            // spi->write(tab0[i*128+j]); //copy buffer into ram
+            spi->write(logo_bits[i*128+j]); //copy buffer into ram
+        }
+
+    }
+
+    *cs = 1;
+
+}
+
+
+
+//================
+// display a welcome message encoded in tab0 in  spk_ole_ssd1305.h
+void SPKDisplay::fontdemo()
+{
+// Select the device by seting chip select low
+    *cs = 0; // select chip
+    *dc = 0; // comand mode
+
+
+    unsigned char i=0,j=0;
+    for(i=0; i<8; i++) {
+        *dc=0; // command mode
+        spi->write(0xB0+i); //Set display position - paged display
+        spi->write(0x00); //Set display position - low column address
+        spi->write(0x10);//Set the display position - high column address
+
+        *dc=1; // data mode
+        for(j=0; j<128; j++) {
+            // spi->write(tab0[i*128+j]); //copy buffer into ram
+            spi->write(font[i*128+j]); //copy buffer into ram
+        }
+
+    }
+
+    *cs = 1;
+
+}
+//=================
+
+void SPKDisplay::setup()
+{
+    // TASK: SCREEN OFF, Run pre-flight
+
+    // Hard reset the OLED
+    *res=1;
+    wait_ms(1);
+    *res = 0;
+    wait_ms(1);
+    *res = 1;
+
+    // Select the device by seting chip select low
+    *cs = 0;
+
+    // Set to receive COMMANDS not data
+    *dc = 0;
+//=======ALL THESE TAKEN FROM THE UNIVISION DATASHEET UNCHANGED==========
+
+    spi->write(0x20); // set addressing mode
+    spi->write(0x10); // paged adressign mode
+
+    spi->write(0x00); // set lower nyble column address
+    spi->write(0x10); // set higher column adress
+    spi->write(0x40);  //set display start line to 0
+    spi->write(0x81); // set contrast control register
+    spi->write(0xFF); // set contrast to maximum
+
+    spi->write(0xA0); // [A0]:column address 0 is map to SEG0 ,
+    //[A1]: columnaddress 131 is map to SEG0*/
+
+    spi->write(0xA4); // entire display ON - means that dispaly constaly matched to RAM content
+
+    spi->write(0xA6); //normal display - white on black
+
+    spi->write(0xA8); // set MUX ratio command
+    spi->write(0x3F); // MUX set to 36
+
+    spi->write(0x8D); //set DC-DC
+    spi->write(0x14);   // 0x14=ON
+
+    spi->write(0xAE); // set display off - sleep mode
+
+    spi->write(0xD3); // set display offset
+    spi->write(0x00); // to no offset
+
+    spi->write(0xD5); //set clock divide
+    spi->write(0x20); // to get clock at 80Hz
+
+//spi->write(0xD8); // set area color
+//spi->write(0x00);
+
+    spi->write(0xDA); // set pins configuration
+    spi->write(0x12); // com left - right remap , alternaitve com config - realtes to hardware settings on board
+
+    spi->write(0xDB); // set VCOMHH level
+    spi->write(0x00); // to 0.65*Vcc
+
+    spi->write(0xD9); // set pre charge period
+    spi->write(0x22); // P1=2, P2=2
+
+    spi->write(0xC0); // set COM ouptut scan normal
+
+//INI_DIS - initialise the display as per manufacturers example prog
+
+    unsigned char i=0,j=0;
+    for(i=0; i<8; i++) {
+        *dc=0; // command mode
+        spi->write(0xB0+i); //Set display position - paged display
+        spi->write(0x02); //Set display position - low column address
+        spi->write(0x10);//Set the display position - high column address
+
+        *dc=1; // set to receive data no commands
+
+        for(j=0; j<128; j++) {
+            spi->write(0x00); //Screen display initial setting
+
+        }
+        *dc=0;
+        spi->write(0xaf); // screen on
+    }
+
+
+
+}
\ No newline at end of file

diff -r a675a19c16f0 -r 6d2aded0cf41 4spi_oled_ssd1305.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/4spi_oled_ssd1305.h	Tue Jan 29 09:56:25 2013 +0000
@@ -0,0 +1,143 @@
+// OLED display using SSD1305 driver
+// A library by *spark audio-visual
+
+/* Copyright (c) 2011 Toby Harris, MIT License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software
+ * and associated documentation files (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge, publish, distribute,
+ * sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or
+ * substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
+ * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+ 
+ 
+ /* rewritten to work with the SSD1306 driver JCY-MCU oled (from ebay). chris stevens 2013
+ 
+ */
+ 
+
+#ifndef SPK_OLED_SSD1305_h
+#define SPK_OLED_SSD1305_h
+
+#include "mbed.h"
+#include <string>
+
+#define bufferCount 1024
+#define bufferWidth 128
+#define pixelWidth 128
+#define pixelHeight 64
+#define pixInPage 8
+#define pageCount 8
+
+
+
+/** Display class for 128x64 OLEDs using the SSD1305 driver, connected via SPI
+  *
+  * Display ie. DENSITRON - DD-12864YO-3A
+  *
+  * This is a ground-up, minimal library. Further functionality as and when its needed or anybody wants to contribute.
+  *
+  * This library includes two processing sketches to create a font and full-screen image in the required byte representations.
+  * Without creating your font and any images, all this library will do is blank the screen and draw horizontal lines. But at least you'll know its working!
+  *
+  * Terminology:
+  * 'rows' are 8 pixel high rows across the display, 0 being the topmost and 7 the bottom.
+  * 'lines' are single pixel lines, origin top left.
+  *
+*/
+class SPKDisplay
+{
+public:
+    /** Create a display object connected via SPI
+     *
+     * @param mosi  SPI MOSI
+     * @param clk   SPI SCK
+     * @param cs    Chip Select - a digital out pin
+     * @param dc    Data/Command - a digital out pin
+     * @param res   Reset - a digital out pin
+     * @param debugSerial An optional serial object to log to
+     */
+    SPKDisplay(PinName mosi, PinName clk, PinName cs, PinName dc, PinName res, Serial *debugSerial = NULL);
+
+    /** Font - Assign the ASCII value of the character at the start of the implemented range */
+    const int *fontStartCharacter;
+
+    /** Font - Assign the ASCII value of the character at the end of the implemented range */
+    const int *fontEndCharacter;
+
+    /** Font - Assign the font, an array of 8x8px characters
+     *
+     * @note The processing sketch spk_oled_fontByteMaker--processing takes characterCount*8px x 8px images and creates the code to declare the font array needed by this method
+     */
+    uint8_t const **fontCharacters;
+
+    // set display for black on white
+    void inverse();
+
+// display a welcopme message encoded in tab0 in  spk_ole_ssd1305.h 
+    void welcome();
+    // output the entire font as a bitmap
+    void fontdemo();
+    
+    //set display for white on black (normal state after reset)
+    void normal();
+
+    // power on / power off the display - this puts the display to sleep - but doesn turn off tha actuall power pin.
+    void displayPower(int P);
+
+    /** Completely clear the object's display representation */
+    void clearBuffer();
+
+    /** Clear a row of the object's display representation
+     *
+     * @param row The row to clear.
+     */
+    void clearBufferRow(int row);
+
+    /** Replace the object\s display representation with the contents of image
+     *
+     * @param image An array of 1056 bytes representing an image.
+     * @note The processing sketch spk_oled_screenByteMaker--processing takes 132x64 images and creates the code to declare such arrays
+     */
+    void imageToBuffer(const uint8_t* image);
+
+    /** Draw a horizontal line in the object's display representation
+     *
+     * @param y The y position of the line to draw
+     */
+    void horizLineToBuffer(int y);
+
+
+    /** Send the object's display representation to the OLED
+     *
+     * You can safely call this once per main loop, it will only transmit the buffer contents if there has been an update
+     */
+    void sendBuffer();
+    
+// send text to the buffer to write inthe tiny 5x7 font
+void textToBuffer(char *message, int row);
+
+private:
+    SPI *spi;
+    DigitalOut *cs;
+    DigitalOut *dc;
+    DigitalOut *res;
+
+    Serial *debug;
+    uint8_t buffer[bufferCount];
+
+    bool bufferHasChanged;
+
+    void setup();
+};
+
+#endif

diff -r a675a19c16f0 -r 6d2aded0cf41 spk_oled_fontByteMaker--processing.h
--- a/spk_oled_fontByteMaker--processing.h	Sun Oct 28 19:53:49 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,116 +0,0 @@
-// OLED display using SSD1305 driver
-// A library by *spark audio-visual
-
-/* Copyright (c) 2011 Toby Harris, MIT License
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this software 
- * and associated documentation files (the "Software"), to deal in the Software without restriction, 
- * including without limitation the rights to use, copy, modify, merge, publish, distribute, 
- * sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is 
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or 
- * substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING 
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-int w = 132;
-int h = 64;
-int scaleFactor = 5;
-
-PImage imgPixel;
-color white = color(255, 255, 255, 255);
-color black = color(0, 0, 0, 255);
-
-void setup()
-{
-  imgPixel = loadImage("spk_dvimxr_font.png");
-  w = imgPixel.width;
-  h = imgPixel.height;
-
-  size(w*scaleFactor, h*scaleFactor);
-
-  noSmooth();
-}
-
-void draw()
-{
-  background(0);
-  image(imgPixel, 0, 0, w*scaleFactor, h*scaleFactor);
-}
-
-void mouseDragged() 
-{
-  int x = mouseX/scaleFactor;
-  int y = mouseY/scaleFactor;
-
-  imgPixel.set(x, y, white);
-}
-
-void mousePressed()
-{
-  int x = mouseX/scaleFactor;
-  int y = mouseY/scaleFactor;
-
-  if (imgPixel.get(x, y) == white)
-  {
-    imgPixel.set(x, y, black);
-  }
-  else
-  {
-    imgPixel.set(x, y, white);
-  }
-}
-
-void keyPressed()
-{
-  int startID = 33;
-  int stopID = 126;
-
-  for (int charID = startID; charID <= stopID; charID++)
-  {
-    boolean blank = false;
-    String output = "";
-    int counter = 0;
-    while (blank == false)
-    {
-      int x = (charID-startID)*8 + counter;
-
-      byte theByte = 0;
-      for (int b = 0; b < 8; b++)
-      {
-        if (imgPixel.get(x, b) == white)
-        {
-          theByte += pow(2, b);
-        }
-      }
-
-      if (theByte > 0)
-      {
-        if (output.length() > 0) output = output + ", ";
-        output = output + "0x" + hex(theByte, 2);
-      } 
-      else
-      {
-        blank = true;
-        println("const uint8_t char" + charID + "[] = {" + counter + ", " + output + "};");
-      }
-      
-      counter++;
-    }
-  }
-  println();
-  println("const int characterBytesStartChar = " + startID + ";");
-  println("const int characterBytesEndChar = " + stopID + ";");
-  print("const uint8_t* characterBytes[] = {");
-  for (int charID = startID; charID <= stopID; charID++)
-  {
-    print("char" + charID + ", ");
-  }
-  println("};");
-}

diff -r a675a19c16f0 -r 6d2aded0cf41 spk_oled_screenByteMaker--processing.h
--- a/spk_oled_screenByteMaker--processing.h	Sun Oct 28 19:53:49 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,88 +0,0 @@
-// OLED display using SSD1305 driver
-// A library by *spark audio-visual
-
-/* Copyright (c) 2011 Toby Harris, MIT License
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this software 
- * and associated documentation files (the "Software"), to deal in the Software without restriction, 
- * including without limitation the rights to use, copy, modify, merge, publish, distribute, 
- * sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is 
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or 
- * substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING 
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-int w = 132;
-int h = 64;
-int scaleFactor = 10;
-
-PImage imgPixel;
-color white = color(255, 255, 255, 255);
-color black = color(0, 0, 0, 255);
-
-void setup()
-{
-  size(w*scaleFactor, h*scaleFactor);
-  imgPixel = loadImage("spk_dvimxr_screen.png");
-
-  noSmooth();
-}
-
-void draw()
-{
-  background(0);
-  image(imgPixel, 0, 0, w*scaleFactor, h*scaleFactor);
-}
-
-void mouseDragged() 
-{
-  int x = mouseX/scaleFactor;
-  int y = mouseY/scaleFactor;
-
-  imgPixel.set(x, y, white);
-}
-
-void mousePressed()
-{
-  int x = mouseX/scaleFactor;
-  int y = mouseY/scaleFactor;
-
-  if (imgPixel.get(x, y) == white)
-  {
-    imgPixel.set(x, y, black);
-  }
-  else
-  {
-    imgPixel.set(x, y, white);
-  }
-}
-
-void keyPressed()
-{
-  println("{");
-  for (int page = 0; page < 8; page++)
-  {
-    for (int i = 0; i < w; i++)
-    {
-      byte theByte = 0;
-      for (int j = 0; j < 8; j++)
-      {
-       if (imgPixel.get(i, (page*8)+j) == white)
-       {
-          theByte += pow(2, j); 
-       }
-      }
-      print("0x" + hex(theByte, 2));
-      print(", ");
-    }
-    println();
-  }
-  println("}");
-}

diff -r a675a19c16f0 -r 6d2aded0cf41 spk_oled_ssd1305.cpp
--- a/spk_oled_ssd1305.cpp	Sun Oct 28 19:53:49 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,297 +0,0 @@
-// OLED display using SSD1305 driver
-// A library by *spark audio-visual
-
-/* Copyright (c) 2011 Toby Harris, MIT License
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this software 
- * and associated documentation files (the "Software"), to deal in the Software without restriction, 
- * including without limitation the rights to use, copy, modify, merge, publish, distribute, 
- * sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is 
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or 
- * substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING 
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
- 
-#include "spk_oled_ssd1305.h"
-#include "mbed.h"
-
-SPKDisplay::SPKDisplay(PinName mosiPin, PinName clkPin, PinName csPin, PinName dcPin, PinName resPin, Serial *debugSerial)
-{
-    bufferHasChanged = false;
-    
-    fontStartCharacter = NULL;
-    fontEndCharacter = NULL;
-    fontCharacters = NULL;
-    
-    spi = new SPI(mosiPin, NC, clkPin);
-    spi->format(8,3);
-    spi->frequency(2000000);
-    
-    cs = new DigitalOut(csPin);
-    dc = new DigitalOut(dcPin);
-    res = new DigitalOut(resPin);
-    
-    // Link up debug Serial object
-    // Passing in shared object as debugging is shared between all DVI mixer functions
-    debug = debugSerial;
-    
-    setup();
-    
-    clearBuffer();
-    
-    if (debug) debug->printf("SPKDisplay loaded\n\r");
-}
-
-void SPKDisplay::clearBuffer()
-{
-    memset(buffer, 0, bufferCount);
-    bufferHasChanged = true;
-}
-
-void SPKDisplay::imageToBuffer(const uint8_t* image)
-{
-    memcpy(buffer, image, bufferCount);
-    bufferHasChanged = true;
-}
-
-void SPKDisplay::clearBufferRow(int row)
-{
-    // Range check
-    if (row >= 8)
-    {
-        if (debug) debug->printf("SPKDisplay::clearBufferRow sent out of bounds row");
-        return;
-    }
-    int bStart = row*bufferWidth;
-    int bEnd = bStart + pixelWidth;
-
-    for (int bPos = bStart; bPos <= bEnd; bPos++)
-    {
-        buffer[bPos] = 0x00;
-    }
-    
-    bufferHasChanged = true;
-}
-
-void SPKDisplay::horizLineToBuffer(int y)
-{
-    if (y >= pixelHeight)
-    {
-        if (debug) debug->printf("SPKDisplay::clearBufferRow sent out of bounds y");
-        return;
-    }
-    
-    int row = (y*pixInPage) / pixelHeight;
-    int posInRow = y % pixInPage;
-    
-    int bStart = row*bufferWidth;
-    int bEnd = bStart + pixelWidth;
-    
-    for (int bPos = bStart; bPos <= bEnd; bPos++)
-    {
-        // Need to bitwise OR as setting single bit (the line) in byte (the row)
-        buffer[bPos] = buffer[bPos] | 0x01 << posInRow;
-    } 
-    
-    bufferHasChanged = true;
-}
-
-void SPKDisplay::textToBuffer(std::string message, int row)
-{
-    // Font check
-    if (NULL == fontCharacters) return;
-    if (NULL == fontStartCharacter || NULL == fontEndCharacter) return;    
-
-    // Range check
-    if (row >= 8) row = 7;
-    int bStart = row*bufferWidth;
-    int bEnd = bStart + pixelWidth;
-
-    int bPos = bStart;
-    for (int i = 0; i < message.size(); i++)
-    {
-        char character = message.at(i);
-        
-        // Is it outside the range we have glyphs for?
-        if ((character < *fontStartCharacter) || (character > *fontEndCharacter))
-        {
-            // Treat as a space
-            for (int j = 0; j < 5; j++)
-            {
-                if (bPos >= bEnd) break;
-                buffer[bPos++] = 0x00;
-            }
-            
-            // Warn if not
-            if (debug)
-            {
-                if (character != ' ') debug->printf("No glyph for character %c at position %i", character, i);
-            }
-        }
-        // If not, typeset it!
-        else 
-        {
-            // Shift into our array's indexing
-            character -= *fontStartCharacter;
-            
-            // Write each byte's vertical column of 8bits into the buffer.
-            for (int j = 0; j < fontCharacters[character][0]; j++)
-            {
-                if (bPos >= bEnd) break;
-                buffer[bPos++] = fontCharacters[character][j+1];
-            }
-            
-            // Put 1px letter spacing at end
-            if (bPos >= bEnd) break;
-            buffer[bPos++] = 0x00; // 1 px letter spacing
-        }
-    }
-    
-    bufferHasChanged = true;
-}
-
-void SPKDisplay::characterToBuffer(char character, int x, int row)
-{
-        // Font check
-    if (NULL == fontCharacters) return;
-    if (NULL == fontStartCharacter || NULL == fontEndCharacter) return;    
-
-    // Range check
-    if (row >= 8) row = 7;
-    int bStart = row*bufferWidth;
-    int bEnd = bStart + pixelWidth;
-
-    int bPos = bStart + x;
-        
-    // Is it outside the range we have glyphs for?
-    if ((character < *fontStartCharacter) || (character > *fontEndCharacter))
-    {
-        if (debug)
-        {
-            if (character != ' ') debug->printf("No glyph for character %c", character);
-        }
-    }
-    // If not, typeset it!
-    else 
-    {
-        // Shift into our array's indexing
-        character -= *fontStartCharacter;
-        
-        // Write each byte's vertical column of 8bits into the buffer.
-        for (int j = 0; j < fontCharacters[character][0]; j++)
-        {
-            if (bPos >= bEnd) break;
-            buffer[bPos++] = fontCharacters[character][j+1];
-        }
-    }
-
-    bufferHasChanged = true;
-}
-
-void SPKDisplay::sendBuffer()
-{
-    if (bufferHasChanged)
-    {
-        // Select the device by seting chip select low
-        *cs = 0;
-    
-        // Set to receive DATA not commands
-        *dc = 1;
-    
-        for (int i = 0; i < bufferCount; i++)
-        {
-            spi->write(buffer[i]);
-        }
-        
-        // Deselect the device
-        *cs = 1;
-        
-        bufferHasChanged = false;
-    }
-}
-
-void SPKDisplay::setup()
-{
-    // TASK: SCREEN OFF, Run pre-flight
-    
-    // Hard reset the OLED
-    *res = 0;
-    wait_ms(1);
-    *res = 1;
-
-    // Select the device by seting chip select low
-    *cs = 0;
-    
-    // Set to receive COMMANDS not data
-    *dc = 0;
-
-    spi->write(0xAE); // set display off
-    spi->write(0xD5); // set display clock divide ratio
-    spi->write(0xA0);
-    spi->write(0xA8); // set multiplex ratio
-    spi->write(0x3F); 
-    spi->write(0xD3); // set display offset
-    spi->write(0x00);
-    spi->write(0x40); // set display start line
-    spi->write(0xAD); // set master configuration
-    spi->write(0x8E);
-    spi->write(0xD8); // set area color mode
-    spi->write(0x05);
-    spi->write(0xA1); // set segment re-map
-    spi->write(0xC8); // set com output scan direction
-    spi->write(0xDA); // set com pins hardware configuration
-    spi->write(0x12);
-    spi->write(0x91); // set look-up table
-    spi->write(0x3F);
-    spi->write(0x3F);
-    spi->write(0x3F);
-    spi->write(0x3F);
-    spi->write(0x81); // set current control for bank 0
-    spi->write(0x8F);
-    spi->write(0xD9); // set pre-charge period
-    spi->write(0xD2);
-    spi->write(0xDB); //set vcomh deselect level
-    spi->write(0x34);
-    spi->write(0xA4); // set entire display on/off
-    spi->write(0xA6); // set normal/inverse display
-    
-    spi->write(0x20); // page mode
-    spi->write(0x00);
-    
-    // TASK: Clear screen's content buffer
-    
-    // Is this neccessary when switching command/data?
-    *cs = 1;
-    wait_ms(1);
-    *cs = 0;
-    
-    // Set to receive DATA not commands
-    *dc = 1;
-        
-    for (int i = 0; i < bufferCount; i++)
-    {
-        spi->write(0x00);
-    }
-    
-    // TASK: SCREEN ON
-    
-    // Is this neccessary when switching command/data?
-    *cs = 1;
-    wait_ms(1);
-    *cs = 0;
-    
-    // Set to receive COMMANDS not data
-    *dc = 0;
-    
-    spi->write(0xAF); // set display on
-  
-    // Deselect the device
-    *cs = 1;
-}
\ No newline at end of file

diff -r a675a19c16f0 -r 6d2aded0cf41 spk_oled_ssd1305.h
--- a/spk_oled_ssd1305.h	Sun Oct 28 19:53:49 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,147 +0,0 @@
-// OLED display using SSD1305 driver
-// A library by *spark audio-visual
-
-/* Copyright (c) 2011 Toby Harris, MIT License
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this software 
- * and associated documentation files (the "Software"), to deal in the Software without restriction, 
- * including without limitation the rights to use, copy, modify, merge, publish, distribute, 
- * sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is 
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or 
- * substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING 
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef SPK_OLED_SSD1305_h
-#define SPK_OLED_SSD1305_h
-
-#include "mbed.h"
-#include <string> 
-
-#define bufferCount 1056
-#define bufferWidth 132
-#define pixelWidth 128
-#define pixelHeight 64
-#define pixInPage 8
-#define pageCount 8
-
-/** Display class for 128x64 OLEDs using the SSD1305 driver, connected via SPI
-  *
-  * Display ie. DENSITRON - DD-12864YO-3A
-  *
-  * This is a ground-up, minimal library. Further functionality as and when its needed or anybody wants to contribute.
-  * 
-  * This library includes two processing sketches to create a font and full-screen image in the required byte representations.
-  * Without creating your font and any images, all this library will do is blank the screen and draw horizontal lines. But at least you'll know its working!
-  * 
-  * Terminology:
-  * 'rows' are 8 pixel high rows across the display, 0 being the topmost and 7 the bottom.
-  * 'lines' are single pixel lines, origin top left. 
-  *
-  * Example:
-  * @code
-  * // Create object and load font
-  * SPKDisplay screen(p5, p7, p8, p10, p9)
-  * screen.fontStartCharacter = &myStartChar;
-  * screen.fontEndCharacter = &myEndChar;
-  * screen.fontCharacters = myFontArray;
-  * // Draw
-  * screen.imageToBuffer(myImageByteArray);
-  * screen.textToBuffer("*spark OLED SSD1305",0);
-  * screen.textToBuffer("v01",1);
-  * screen.sendBuffer
-  * @endcode
-  */
-class SPKDisplay
-{
-  public:
-    /** Create a display object connected via SPI
-     *
-     * @param mosi  SPI MOSI
-     * @param clk   SPI SCK
-     * @param cs    Chip Select - a digital out pin
-     * @param dc    Data/Command - a digital out pin
-     * @param res   Reset - a digital out pin
-     * @param debugSerial An optional serial object to log to
-     */
-    SPKDisplay(PinName mosi, PinName clk, PinName cs, PinName dc, PinName res, Serial *debugSerial = NULL);
-
-    /** Font - Assign the ASCII value of the character at the start of the implemented range */
-    const int *fontStartCharacter;
-    
-    /** Font - Assign the ASCII value of the character at the end of the implemented range */
-    const int *fontEndCharacter;
-    
-    /** Font - Assign the font, an array of 8x8px characters
-     *
-     * @note The processing sketch spk_oled_fontByteMaker--processing takes characterCount*8px x 8px images and creates the code to declare the font array needed by this method
-     */
-    uint8_t const **fontCharacters;
-    
-    /** Completely clear the object's display representation */
-    void clearBuffer();
-    
-    /** Clear a row of the object's display representation
-     *
-     * @param row The row to clear.
-     */
-    void clearBufferRow(int row);
-    
-    /** Replace the object\s display representation with the contents of image
-     *
-     * @param image An array of 1056 bytes representing an image.
-     * @note The processing sketch spk_oled_screenByteMaker--processing takes 132x64 images and creates the code to declare such arrays
-     */ 
-    void imageToBuffer(const uint8_t* image);
-    
-    /** Draw a horizontal line in the object's display representation 
-     * 
-     * @param y The y position of the line to draw
-     */
-    void horizLineToBuffer(int y);
-    
-    /** Write a line of text in the object's display representation
-     * Requires the font to have been set
-     * 
-     * @param message   The text to write. The text will be truncated if longer than the screen's width.
-     * @param row       The row in which to write the text
-     */ 
-    void textToBuffer(std::string message, int row);
-    
-    /** Write a single character in the object's display representation
-     * Requires the font to have been set
-     * 
-     * @param character The character to write.
-     * @param x         The x position to draw the character
-     * @param row       The row in which to write the character
-     */ 
-    void characterToBuffer(char character, int x, int row);
-    
-    /** Send the object's display representation to the OLED
-     * 
-     * You can safely call this once per main loop, it will only transmit the buffer contents if there has been an update
-     */
-    void sendBuffer();
-    
-  private:
-    SPI *spi;
-    DigitalOut *cs;
-    DigitalOut *dc;
-    DigitalOut *res;
-    
-    Serial *debug;
-    uint8_t buffer[bufferCount];
-    
-    bool bufferHasChanged;
-    
-    void setup(); 
-};
-
-#endif