Revision 3:9a2779957e46, committed 2015-03-17

Comitter:

tpowell33

Date:

Tue Mar 17 05:46:34 2015 +0000

Parent:

2:97ef32687eba

Commit message:

Second publishing, fixed errors

Changed in this revision

diff -r 97ef32687eba -r 9a2779957e46 NeoMatrix.cpp
--- a/NeoMatrix.cpp	Tue Mar 17 05:43:30 2015 +0000
+++ b/NeoMatrix.cpp	Tue Mar 17 05:46:34 2015 +0000
@@ -1,5 +1,5 @@
 /**********************************************
- * NeoArray.cpp
+ * NeoMatrix.cpp
  *
  * Taylor Powell
  * March 2015
@@ -12,7 +12,7 @@
  */
 
 #include "mbed.h"
-#include "NeoArray.h"
+#include "NeoMatrix.h"
 #include "font.h"
 
 

diff -r 97ef32687eba -r 9a2779957e46 NeoMatrix.h
--- a/NeoMatrix.h	Tue Mar 17 05:43:30 2015 +0000
+++ b/NeoMatrix.h	Tue Mar 17 05:46:34 2015 +0000
@@ -1,5 +1,5 @@
 /**
- * NeoArray.h
+ * NeoMatrix.h
  *
  * Taylor Powell
  * March 2015

diff -r 97ef32687eba -r 9a2779957e46 font.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/font.h	Tue Mar 17 05:46:34 2015 +0000
@@ -0,0 +1,107 @@
+/**********************************************
+ * font.h
+ *
+ * Taylor Powell
+ * March 2015
+ * 
+ * font used is the free BMplain, which can be replaced with any 6x8 font array
+ */
+
+const unsigned char font[96][6] = {
+    {0x00,0x00,0x00,0x00,0x00,0x00}, //  
+    {0x2e,0x00,0x00,0x00,0x00,0x00}, // !
+    {0x03,0x00,0x03,0x00,0x00,0x00}, // "
+    {0x0a,0x1f,0x0a,0x1f,0x0a,0x00}, // #
+    {0x2e,0x2a,0x6b,0x2a,0x3a,0x00}, // $
+    {0x0e,0x2a,0x1e,0x08,0x3c,0x2a}, // %
+    {0x3e,0x2a,0x2a,0x22,0x38,0x08}, // &
+    {0x03,0x00,0x00,0x00,0x00,0x00}, // '
+    {0x1c,0x22,0x00,0x00,0x00,0x00}, // (
+    {0x22,0x1c,0x00,0x00,0x00,0x00}, // )
+    {0x15,0x0e,0x04,0x0e,0x15,0x00}, // *
+    {0x08,0x08,0x3e,0x08,0x08,0x00}, // +
+    {0x60,0x00,0x00,0x00,0x00,0x00}, // ,
+    {0x08,0x08,0x08,0x08,0x08,0x00}, // -
+    {0x20,0x00,0x00,0x00,0x00,0x00}, // .
+    {0x20,0x10,0x08,0x04,0x02,0x00}, // /
+    {0x3e,0x22,0x2a,0x22,0x3e,0x00}, // 0
+    {0x04,0x3e,0x00,0x00,0x00,0x00}, // 1
+    {0x3a,0x2a,0x2a,0x2a,0x2e,0x00}, // 2
+    {0x2a,0x2a,0x2a,0x2a,0x3e,0x00}, // 3
+    {0x0e,0x08,0x08,0x08,0x3e,0x00}, // 4
+    {0x2e,0x2a,0x2a,0x2a,0x3a,0x00}, // 5
+    {0x3e,0x2a,0x2a,0x2a,0x3a,0x00}, // 6
+    {0x02,0x02,0x02,0x02,0x3e,0x00}, // 7
+    {0x3e,0x2a,0x2a,0x2a,0x3e,0x00}, // 8
+    {0x2e,0x2a,0x2a,0x2a,0x3e,0x00}, // 9
+    {0x14,0x00,0x00,0x00,0x00,0x00}, // :
+    {0x34,0x00,0x00,0x00,0x00,0x00}, // ;
+    {0x08,0x14,0x22,0x00,0x00,0x00}, // <
+    {0x14,0x14,0x14,0x14,0x14,0x00}, // =
+    {0x22,0x14,0x08,0x00,0x00,0x00}, // >
+    {0x06,0x02,0x2a,0x0a,0x0e,0x00}, // ?
+    {0x3e,0x02,0x3a,0x2a,0x3e,0x00}, // @
+    {0x3e,0x12,0x12,0x12,0x3e,0x00}, // A
+    {0x3e,0x2a,0x2a,0x2a,0x36,0x00}, // B
+    {0x3e,0x22,0x22,0x22,0x22,0x00}, // C
+    {0x3e,0x22,0x22,0x22,0x1c,0x00}, // D
+    {0x3e,0x2a,0x2a,0x2a,0x22,0x00}, // E
+    {0x3e,0x0a,0x0a,0x0a,0x02,0x00}, // F
+    {0x3e,0x22,0x2a,0x2a,0x3a,0x00}, // G
+    {0x3e,0x08,0x08,0x08,0x3e,0x00}, // H
+    {0x22,0x3e,0x22,0x00,0x00,0x00}, // I
+    {0x38,0x20,0x20,0x20,0x3e,0x00}, // J
+    {0x3e,0x08,0x08,0x14,0x22,0x00}, // K
+    {0x3e,0x20,0x20,0x20,0x20,0x00}, // L
+    {0x3e,0x04,0x38,0x04,0x3e,0x00}, // M
+    {0x3e,0x04,0x08,0x10,0x3e,0x00}, // N
+    {0x3e,0x22,0x22,0x22,0x3e,0x00}, // O
+    {0x3e,0x0a,0x0a,0x0a,0x0e,0x00}, // P
+    {0x3e,0x22,0x72,0x22,0x3e,0x00}, // Q
+    {0x3e,0x0a,0x0a,0x1a,0x2e,0x00}, // R
+    {0x2e,0x2a,0x2a,0x2a,0x3a,0x00}, // S
+    {0x02,0x02,0x3e,0x02,0x02,0x00}, // T
+    {0x1e,0x20,0x20,0x20,0x1e,0x00}, // U
+    {0x0e,0x10,0x20,0x10,0x0e,0x00}, // V
+    {0x3e,0x10,0x0e,0x10,0x3e,0x00}, // W
+    {0x22,0x14,0x08,0x14,0x22,0x00}, // X
+    {0x02,0x04,0x38,0x04,0x02,0x00}, // Y
+    {0x3a,0x2a,0x2a,0x2a,0x2e,0x00}, // Z
+    {0x3e,0x22,0x00,0x00,0x00,0x00}, // [
+    {0x3f,0x21,0x3f,0x00,0x00,0x00}, // "\"
+    {0x22,0x3e,0x00,0x00,0x00,0x00}, // ]
+    {0x0c,0x1e,0x3c,0x1e,0x0c,0x00}, // ^
+    {0x20,0x20,0x20,0x20,0x20,0x00}, // _
+    {0x1c,0x3e,0x3e,0x3e,0x1c,0x00}, // `
+    {0x3c,0x24,0x24,0x24,0x3c,0x20}, // a
+    {0x3e,0x24,0x24,0x24,0x3c,0x00}, // b
+    {0x3c,0x24,0x24,0x24,0x24,0x00}, // c
+    {0x3c,0x24,0x24,0x24,0x3e,0x00}, // d
+    {0x3c,0x24,0x34,0x2c,0x24,0x00}, // e
+    {0x08,0x3e,0x0a,0x0a,0x00,0x00}, // f
+    {0x1c,0x54,0x54,0x54,0x7c,0x00}, // g
+    {0x3e,0x04,0x04,0x04,0x3c,0x00}, // h
+    {0x3a,0x00,0x00,0x00,0x00,0x00}, // i
+    {0x20,0x40,0x7a,0x00,0x00,0x00}, // j
+    {0x3e,0x08,0x14,0x22,0x00,0x00}, // k
+    {0x02,0x3e,0x00,0x00,0x00,0x00}, // l
+    {0x3c,0x04,0x3c,0x04,0x3c,0x00}, // m
+    {0x3c,0x04,0x04,0x04,0x3c,0x00}, // n
+    {0x3c,0x24,0x24,0x24,0x3c,0x00}, // o
+    {0x7c,0x24,0x24,0x24,0x3c,0x00}, // p
+    {0x3c,0x24,0x24,0x24,0x7c,0x00}, // q
+    {0x3c,0x04,0x04,0x04,0x00,0x00}, // r
+    {0x24,0x2c,0x34,0x24,0x00,0x00}, // s
+    {0x04,0x3e,0x24,0x24,0x00,0x00}, // t
+    {0x3c,0x20,0x20,0x20,0x3c,0x00}, // u
+    {0x0c,0x10,0x20,0x10,0x0c,0x00}, // v
+    {0x3c,0x20,0x3c,0x20,0x3c,0x00}, // w
+    {0x24,0x24,0x18,0x24,0x24,0x00}, // x
+    {0x1c,0x50,0x50,0x50,0x7c,0x00}, // y
+    {0x24,0x34,0x2c,0x24,0x00,0x00}, // z
+    {0x08,0x3e,0x22,0x00,0x00,0x00}, // {
+    {0x1c,0x22,0x22,0x22,0x1c,0x00}, // |
+    {0x22,0x3e,0x08,0x00,0x00,0x00}, // }
+    {0x01,0x01,0x01,0x00,0x00,0x00}, // ~
+    {0x00,0x00,0x00,0x00,0x00,0x00}
+};