From 4b1f60a3f5ed223e34ae8381e57f600551ccf085 Mon Sep 17 00:00:00 2001
From: noroadsleft <18669334+noroadsleft@users.noreply.github.com>
Date: Tue, 22 May 2018 12:12:50 -0700
Subject: Refactor update for 6ball (#3017)

---
 keyboards/6ball/6ball.h                  |  4 +---
 keyboards/6ball/keymaps/default/keymap.c | 20 +++++++-------------
 2 files changed, 8 insertions(+), 16 deletions(-)

(limited to 'keyboards')

diff --git a/keyboards/6ball/6ball.h b/keyboards/6ball/6ball.h
index 34fcc4e6a..234235341 100644
--- a/keyboards/6ball/6ball.h
+++ b/keyboards/6ball/6ball.h
@@ -3,7 +3,7 @@
 
 #include "quantum.h"
 
-#define KEYMAP( \
+#define LAYOUT( \
       k01, k02, k03, \
       k04, k05, k06 \
 ) \
@@ -11,6 +11,4 @@
     { k02, k03, k06, k05, k04, k01 } \
 } 
 
-#define KC_KEYMAP(k01, k02, k03, k04, k05, k06) KEYMAP(KC_##k01, KC_##k02, KC_##k03, KC_##k04, KC_##k05, KC_##k06)
-
 #endif
diff --git a/keyboards/6ball/keymaps/default/keymap.c b/keyboards/6ball/keymaps/default/keymap.c
index f93587ffc..5081161e3 100644
--- a/keyboards/6ball/keymaps/default/keymap.c
+++ b/keyboards/6ball/keymaps/default/keymap.c
@@ -1,28 +1,22 @@
-#include "6ball.h"
+#include QMK_KEYBOARD_H
 
 #define _MAIN 0
 #define _FN 1
 
-#define KC_ KC_TRNS
-
 #define KC_CAPW LGUI(LSFT(KC_3))        // Capture whole screen
 #define KC_CPYW LGUI(LSFT(LCTL(KC_3)))  // Copy whole screen
 #define KC_CAPP LGUI(LSFT(KC_4))        // Capture portion of screen
 #define KC_CPYP LGUI(LSFT(LCTL(KC_4)))  // Copy portion of screen
 #define KC_X0 LT(_FN, KC_ESC)
-#define KC_RTOG RGB_TOG
-#define KC_RMOD RGB_MOD
-#define KC_RHUI RGB_HUI
-#define KC_RHUD RGB_HUD
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_MAIN] = KC_KEYMAP(
-      F  , X0 ,LCTL,
-      R  , D  , M  
+  [_MAIN] = LAYOUT(
+    KC_F, KC_X0, KC_LCTL,
+    KC_R, KC_D,  KC_M
   ),
 
-  [_FN] = KC_KEYMAP(
-      F  ,    ,RHUI,
-     RTOG,RMOD,RHUD
+  [_FN] = LAYOUT(
+    KC_F,    KC_TRNS, RGB_HUI,
+    RGB_TOG, RGB_MOD, RGB_HUD
   )
 };
-- 
cgit v1.2.3-24-g4f1b