From 3364334bfd6d1ea1c8ea6010163341c7618f9d53 Mon Sep 17 00:00:00 2001
From: noroadsleft <18669334+noroadsleft@users.noreply.github.com>
Date: Fri, 1 Jun 2018 12:08:41 -0700
Subject: Refactor and Configurator update for Chocopad (#3099)

* Refactor for Chocopad

* Configurator update
---
 keyboards/chocopad/chocopad.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/keyboards/chocopad/chocopad.h b/keyboards/chocopad/chocopad.h
index 329e2d56f..a0c0baaf6 100644
--- a/keyboards/chocopad/chocopad.h
+++ b/keyboards/chocopad/chocopad.h
@@ -3,7 +3,7 @@
 
 #include "quantum.h"
 
-#define KEYMAP( \
+#define LAYOUT( \
     A1, A2, A3, A4, \
     B1, B2, B3, B4, \
     C1, C2, C3, C4, \
@@ -16,13 +16,13 @@
 }
 
 // Used to create a keymap using only KC_ prefixed keys
-#define KC_KEYMAP( \
+#define LAYOUT_kc( \
     A1, A2, A3, A4, \
     B1, B2, B3, B4, \
     C1, C2, C3, C4, \
     D1, D2, D3, D4 \
 ) \
-    KEYMAP( \
+    LAYOUT( \
         KC_##A1, KC_##A2, KC_##A3, KC_##A4, \
         KC_##B1, KC_##B2, KC_##B3, KC_##B4, \
         KC_##C1, KC_##C2, KC_##C3, KC_##C4, \
-- 
cgit v1.2.3


From 692a77c2dd8a369f6ae6efa22270d1bdeb551f0b Mon Sep 17 00:00:00 2001
From: noroadsleft <18669334+noroadsleft@users.noreply.github.com>
Date: Sat, 2 Jun 2018 09:15:52 -0700
Subject: Refactor Chocopad to support LAYOUT_ortho_4x4 macro (#3106)

* Refactor for Chocopad

* Configurator update

* Chocopad refactor for LAYOUT_ortho_4x4

* info.json update
---
 keyboards/chocopad/chocopad.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/keyboards/chocopad/chocopad.h b/keyboards/chocopad/chocopad.h
index a0c0baaf6..ec73b1465 100644
--- a/keyboards/chocopad/chocopad.h
+++ b/keyboards/chocopad/chocopad.h
@@ -3,7 +3,7 @@
 
 #include "quantum.h"
 
-#define LAYOUT( \
+#define LAYOUT_ortho_4x4( \
     A1, A2, A3, A4, \
     B1, B2, B3, B4, \
     C1, C2, C3, C4, \
@@ -22,7 +22,7 @@
     C1, C2, C3, C4, \
     D1, D2, D3, D4 \
 ) \
-    LAYOUT( \
+    LAYOUT_ortho_4x4( \
         KC_##A1, KC_##A2, KC_##A3, KC_##A4, \
         KC_##B1, KC_##B2, KC_##B3, KC_##B4, \
         KC_##C1, KC_##C2, KC_##C3, KC_##C4, \
-- 
cgit v1.2.3