Refactor and Configurator update for Christmas Tree (#3100)

* Refactor

* Configurator update

keyboards/christmas_tree/christmas_tree.h

@@ -3,7 +3,7 @@
 #include "quantum.h"
 
 
-#define KEYMAP( \
+#define LAYOUT( \
 	k00, k01, k02, k03, k04, k05 \
 ) \
 { \

keyboards/christmas_tree/info.json

@@ -1,13 +1,14 @@
 {
-    "keyboard_name": "Christmas Tree",
+  "keyboard_name": "Christmas Tree",
-    "keyboard_folder": "christmas_tree",
+  "keyboard_folder": "christmas_tree",
-    "url": "https://www.reddit.com/r/MechanicalKeyboards/comments/7cqxpf/gb_christmas_tree_pcb_gb_now_live/",
+  "url": "https://www.reddit.com/r/MechanicalKeyboards/comments/7cqxpf/gb_christmas_tree_pcb_gb_now_live/",
-    "maintainer": "That-Canadian",
+  "maintainer": "That-Canadian",
-    "width": 3,
+  "width": 3,
-    "height": 3,
+  "height": 3,
-    "layouts": {
+  "layouts": {
-        "2017": {
+    "2017": {
-            "key_count": 6
+      "key_count": 6,
-        }
+      "layout": [{"x":1, "y":0}, {"x":0.5, "y":1}, {"x":1.5, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}]
     }
+  }
 }

keyboards/christmas_tree/keymaps/default/keymap.c

@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "christmas_tree.h"
+#include QMK_KEYBOARD_H
 
 extern keymap_config_t keymap_config;
 
@@ -32,27 +32,35 @@ enum custom_keycodes {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-/* Base
+  /* Base
- *         ,------.
+   *         ,------.
- *         |   1  |
+   *         |   1  |
- *     ,------+------.
+   *     ,------+------.
- *     |   2  |   3  |
+   *     |   2  |   3  |
- * ,------+------+------.
+   * ,------+------+------.
- * |   4  | FUNC |   6  |
+   * |   4  | FUNC |   6  |
- * `--------------------'
+   * `--------------------'
- */
+   */
-[_BASE] = KEYMAP(KC_1, KC_2, KC_3, KC_4, MO(_FUNC), KC_6),
+  [_BASE] = LAYOUT(
+            KC_1,
+         KC_2, KC_3,
+    KC_4, MO(_FUNC), KC_6
+  ),
 
-/* Func
+  /* Func
- *         ,------.
+   *         ,------.
- *         |BCKLIT|
+   *         |BCKLIT|
- *     ,------+------.
+   *     ,------+------.
- *     |   8  |   9  |
+   *     |   8  |   9  |
- * ,------+------+------.
+   * ,------+------+------.
- * |   0  | FUNC | RESET|
+   * |   0  | FUNC | RESET|
- * `--------------------'
+   * `--------------------'
- */
+   */
-[_FUNC] = KEYMAP(BACKLIT, KC_8, KC_9, KC_0, _______, RESET)
+  [_FUNC] = LAYOUT(
+            BACKLIT,
+         KC_8, KC_9,
+    KC_0, _______, RESET
+  )
 
 
 };