From 82d61d36d54cc0b2fb79b5a3390c3b5a834bda21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Monda?= <laci@monda.hu>
Date: Wed, 21 Dec 2016 09:06:05 +0100
Subject: [PATCH] Add updated key matrix for the left half of the 7th
 generation prototype.

---
 .../build/kds/.settings/language.settings.xml |  4 ++--
 left/src/main.c                               | 19 +++++++++++++++++++
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/left/build/kds/.settings/language.settings.xml b/left/build/kds/.settings/language.settings.xml
index 2fd83ce..d46a003 100644
--- a/left/build/kds/.settings/language.settings.xml
+++ b/left/build/kds/.settings/language.settings.xml
@@ -5,7 +5,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-452732215601217275" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings Cross ARM" parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="1289194706066968877" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings Cross ARM" parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
@@ -16,7 +16,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-460380576276138715" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings Cross ARM" parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="1350840576572231949" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings Cross ARM" parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
diff --git a/left/src/main.c b/left/src/main.c
index 51d23e6..612e4fe 100644
--- a/left/src/main.c
+++ b/left/src/main.c
@@ -14,6 +14,24 @@
 key_matrix_t keyMatrix = {
     .colNum = KEYBOARD_MATRIX_COLS_NUM,
     .rowNum = KEYBOARD_MATRIX_ROWS_NUM,
+#ifdef PROTOTYPE_VERSION_7
+    .cols = (key_matrix_pin_t[]){
+        {PORTB, GPIOB, kCLOCK_PortB, 11},
+        {PORTA, GPIOA, kCLOCK_PortA, 6},
+        {PORTA, GPIOA, kCLOCK_PortA, 8},
+        {PORTB, GPIOB, kCLOCK_PortB, 0},
+        {PORTB, GPIOB, kCLOCK_PortB, 6},
+        {PORTA, GPIOA, kCLOCK_PortA, 3},
+        {PORTA, GPIOA, kCLOCK_PortA, 12}
+    },
+    .rows = (key_matrix_pin_t[]){
+        {PORTB, GPIOB, kCLOCK_PortB, 7},
+        {PORTB, GPIOB, kCLOCK_PortB, 10},
+        {PORTA, GPIOA, kCLOCK_PortA, 5},
+        {PORTA, GPIOA, kCLOCK_PortA, 7},
+        {PORTA, GPIOA, kCLOCK_PortA, 4}
+    }
+#else
     .cols = (key_matrix_pin_t[]){
         {PORTB, GPIOB, kCLOCK_PortB, 11},
         {PORTA, GPIOA, kCLOCK_PortA, 6},
@@ -30,6 +48,7 @@ key_matrix_t keyMatrix = {
         {PORTA, GPIOA, kCLOCK_PortA, 7},
         {PORTA, GPIOA, kCLOCK_PortA, 4}
     }
+#endif
 };
 uint8_t IsoJumperState;