From 5bb20a3640e98904a7a83a4b928b3e22201e462c Mon Sep 17 00:00:00 2001
From: Max Hunt <max.hunt@emotech.co>
Date: Thu, 27 Sep 2018 14:52:14 +0100
Subject: [PATCH] Upgrades

---
 Design/Layout.xlsx             | Bin 9040 -> 9027 bytes
 firmware/keyboard/keyboard.ino | 121 ++++++++++++++++-----------------
 2 files changed, 60 insertions(+), 61 deletions(-)

diff --git a/Design/Layout.xlsx b/Design/Layout.xlsx
index d226225bccba8f8a3d7efd283a492cc8c32e7471..a41c7337392d5676cf4fe11e922a5de6be4ace56 100644
GIT binary patch
delta 2467
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

delta 2461
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
b00000004KB+af*z^phGRBL=!400000E_b3f

diff --git a/firmware/keyboard/keyboard.ino b/firmware/keyboard/keyboard.ino
index 5dc0a1a..1f78952 100644
--- a/firmware/keyboard/keyboard.ino
+++ b/firmware/keyboard/keyboard.ino
@@ -1,4 +1,4 @@
-#include <Key.h>
+#include <Keyboard.h>
 #include <Keypad.h>
 
 const byte ROWS = 4; // Four rows
@@ -20,17 +20,17 @@ Keypad kpd = Keypad( makeKeymap(keys), rowPins, colPins, ROWS, COLS );
 
 #define ledpin 11
 
-void setup()
-{
-  pinMode(ledpin,OUTPUT);
-  digitalWrite(ledpin, HIGH);
+void setup() {
+	Keyboard.begin();
+	pinMode(ledpin,OUTPUT);
+	digitalWrite(ledpin, HIGH);
                                         Serial.begin(9600);
 }
 
 //funcs:
-void fmtky() {}
-void fmlol() {}
-void fmnws() {}
+void fmf1() {}
+void fmf2() {}
+void fmf3() {}
 void fmfky() {}
 void fmshl() {}
 void fmshg() {}
@@ -48,59 +48,58 @@ void fmexr() {}
 
 
 
-void loop()
-{
-  char key = kpd.getKey();
-  if(key) {
-    switch (key) {
-      case '0':
-        fmtky();
-        break;
-      case '1':
-        fmlol();
-        break;
-      case '2':
-        fmnws();
-        break;
-      case '3':
-        fmfky();
-        break;
-      case '4':
-        fmshl();
-        break;
-      case '5':
-        fmshg();
-        break;
-      case '6':
-        fmgdr();
-        break;
-      case '7':
-        fmezg();
-        break;
-      case '8':
-        fmsbr();
-        break;
-      case '9':
-        fmszr();
-        break;
-      case 'a':
-        fmclb();
-        break;
-      case 'b':
-        fmglp();
-        break;
-      case 'c':
-        fmcbh();
-        break;
-      case 'd':
-        fmcbv();
-        break;
-      case 'e':
-        fmcbs();
-        break;
-      case 'f':
-        fmexr();
-        break;
+void loop() {
+	char key = kpd.getKey();
+	if(key) {
+		switch (key) {
+	      case '0':
+	        fmf1();
+	        break;
+	      case '1':
+	        fmf2();
+	        break;
+	      case '2':
+	        fmf3();
+	        break;
+	      case '3':
+	        fmfky();
+	        break;
+	      case '4':
+	        fmshl();
+	        break;
+	      case '5':
+	        fmshg();
+	        break;
+	      case '6':
+	        fmgdr();
+	        break;
+	      case '7':
+	        fmezg();
+	        break;
+	      case '8':
+	        fmsbr();
+	        break;
+	      case '9':
+	        fmszr();
+	        break;
+	      case 'a':
+	        fmclb();
+	        break;
+	      case 'b':
+	        fmglp();
+	        break;
+	      case 'c':
+	        fmcbh();
+	        break;
+	      case 'd':
+	        fmcbv();
+	        break;
+	      case 'e':
+	        fmcbs();
+	        break;
+	      case 'f':
+	        fmexr();
+	        break;
                                                 default:
                                                   Serial.println(key);
     }