From 5dc41446aae0b429c72ca020cb20efb3356afee5 Mon Sep 17 00:00:00 2001
From: noroadsleft <18669334+noroadsleft@users.noreply.github.com>
Date: Mon, 22 Oct 2018 14:18:47 -0700
Subject: Keyboard: Chimera LS refactor and Configurator support (#3715)

* Matrix/keymap refactor

- Deleted `KC_KEYMAP` macro
- Renamed `KEYMAP` macro to `LAYOUT_ortho_4x12`
- Default keymap updated to current QMK standards
  - #include QMK_KEYBOARD_H
  - Refactored from `KC_KEYMAP` to `LAYOUT_ortho_4x12` macro
  - `action_get_macro()` deprecated in favor of `process_record_user()`

`rules.mk` *not* updated to include `LAYOUTS = ortho_4x12` because I have no idea if and how that works on a split and/or wireless keyboard.

* readme cleanup: markdown formatting

* Add Configurator support

* added support for ortho_4x12 layout

* Macro and readme updates

Macros updated to use `KC_NO` directly.

Readme updates and cleanup.
---
 keyboards/chimera_ls/chimera_ls.h | 46 +++++++++++++++++++--------------------
 1 file changed, 22 insertions(+), 24 deletions(-)

(limited to 'keyboards/chimera_ls/chimera_ls.h')

diff --git a/keyboards/chimera_ls/chimera_ls.h b/keyboards/chimera_ls/chimera_ls.h
index b39bcf204..bb99684e5 100644
--- a/keyboards/chimera_ls/chimera_ls.h
+++ b/keyboards/chimera_ls/chimera_ls.h
@@ -50,32 +50,30 @@
 // The first section contains all of the arguements
 // The second converts the arguments into a two-dimensional array
 
-#define KC_KEYMAP( \
-  k00, k01, k02, k03, k04, k05,           k06, k07, k08, k09, k10, k11, \
-  k12, k13, k14, k15, k16, k17,           k18, k19, k20, k21, k22, k23, \
-  k24, k25, k26, k27, k28, k29,           k30, k31, k32, k33, k34, k35, \
-  k36, k37, k38, k39, k40, k41,           k42, k43, k44, k45, k46, k47  \
-) \
-{ \
-	{ KC_##k43, KC_##k45, KC_##k34, KC_##k11, KC_##k23, KC_##k40, KC_##k38, KC_##k25, KC_##k00, KC_##k12 }, \
-	{ KC_##k31, KC_##k44, KC_##k46, KC_##k35, KC_##k22, KC_##k28, KC_##k39, KC_##k37, KC_##k24, KC_##k13 }, \
-	{ KC_##k30, KC_##k32, KC_##k33, KC_##k47, KC_##k09, KC_##k29, KC_##k27, KC_##k26, KC_##k36, KC_##k02 }, \
-	{ KC_##k19, KC_##k20, KC_##k21, KC_##k42, KC_##k18, KC_##k16, KC_##k15, KC_##k14, KC_##k41, KC_##k17 },  \
-	{ KC_##k06, KC_##k07, KC_##k08, KC_##k10, KC_NO,    KC_##k05, KC_##k04, KC_##k03, KC_##k01, KC_NO    }, \
+#define LAYOUT_ortho_4x12( \
+    k00, k01, k02, k03, k04, k05,           k06, k07, k08, k09, k10, k11, \
+    k12, k13, k14, k15, k16, k17,           k18, k19, k20, k21, k22, k23, \
+    k24, k25, k26, k27, k28, k29,           k30, k31, k32, k33, k34, k35, \
+    k36, k37, k38, k39, k40, k41,           k42, k43, k44, k45, k46, k47  \
+  ) { \
+    { k43, k45, k34, k11, k23,   k40, k38, k25, k00, k12   }, \
+    { k31, k44, k46, k35, k22,   k28, k39, k37, k24, k13   }, \
+    { k30, k32, k33, k47, k09,   k29, k27, k26, k36, k02   }, \
+    { k19, k20, k21, k42, k18,   k16, k15, k14, k41, k17   }, \
+    { k06, k07, k08, k10, KC_NO, k05, k04, k03, k01, KC_NO }  \
 }
 
-#define KEYMAP( \
-  k00, k01, k02, k03, k04, k05,           k06, k07, k08, k09, k10, k11, \
-  k12, k13, k14, k15, k16, k17,           k18, k19, k20, k21, k22, k23, \
-  k24, k25, k26, k27, k28, k29,           k30, k31, k32, k33, k34, k35, \
-  k36, k37, k38, k39, k40, k41,           k42, k43, k44, k45, k46, k47  \
-) \
-{ \
-	{ k43, k45, k34, k11, k23, k40, k38, k25, k00, k12 }, \
-	{ k31, k44, k46, k35, k22, k28, k39, k37, k24, k13 }, \
-	{ k30, k32, k33, k47, k09, k29, k27, k26, k36, k02 }, \
-	{ k19, k20, k21, k42, k18, k16, k15, k14, k41, k17 },  \
-	{ k06, k07, k08, k10, KC_NO,    k05, k04, k03, k01, KC_NO    }, \
+#define LAYOUT_kc_ortho_4x12( \
+    k00, k01, k02, k03, k04, k05,           k06, k07, k08, k09, k10, k11, \
+    k12, k13, k14, k15, k16, k17,           k18, k19, k20, k21, k22, k23, \
+    k24, k25, k26, k27, k28, k29,           k30, k31, k32, k33, k34, k35, \
+    k36, k37, k38, k39, k40, k41,           k42, k43, k44, k45, k46, k47  \
+  ) { \
+    { KC_##k43, KC_##k45, KC_##k34, KC_##k11, KC_##k23, KC_##k40, KC_##k38, KC_##k25, KC_##k00, KC_##k12 }, \
+    { KC_##k31, KC_##k44, KC_##k46, KC_##k35, KC_##k22, KC_##k28, KC_##k39, KC_##k37, KC_##k24, KC_##k13 }, \
+    { KC_##k30, KC_##k32, KC_##k33, KC_##k47, KC_##k09, KC_##k29, KC_##k27, KC_##k26, KC_##k36, KC_##k02 }, \
+    { KC_##k19, KC_##k20, KC_##k21, KC_##k42, KC_##k18, KC_##k16, KC_##k15, KC_##k14, KC_##k41, KC_##k17 }, \
+    { KC_##k06, KC_##k07, KC_##k08, KC_##k10, KC_NO,    KC_##k05, KC_##k04, KC_##k03, KC_##k01, KC_NO    }  \
 }
 
 
-- 
cgit v1.2.3