3 files changed, 41 insertions, 32 deletions
diff --git a/keyboards/christmas_tree/christmas_tree.h b/keyboards/christmas_tree/christmas_tree.h
index 1d77fa713..11063c915 100644
--- a/keyboards/christmas_tree/christmas_tree.h
+++ b/keyboards/christmas_tree/christmas_tree.h
@@ -3,7 +3,7 @@
 #include "quantum.h"
-#define KEYMAP( \
+#define LAYOUT( \
        k00, k01, k02, k03, k04, k05 \
 ) \
 { \
diff --git a/keyboards/christmas_tree/info.json b/keyboards/christmas_tree/info.json
index d33f9cc46..bb223b0e0 100644
--- a/keyboards/christmas_tree/info.json
+++ b/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}]
    }
+  }
 }
diff --git a/keyboards/christmas_tree/keymaps/default/keymap.c b/keyboards/christmas_tree/keymaps/default/keymap.c
index 38da32628..7880fd625 100644
--- a/keyboards/christmas_tree/keymaps/default/keymap.c
+++ b/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
+  )
 };

diff --git a/keyboards/christmas_tree/christmas_tree.h b/keyboards/christmas_tree/christmas_tree.h index 1d77fa713..11063c915 100644 --- a/keyboards/christmas_tree/christmas_tree.h +++ b/keyboards/christmas_tree/christmas_tree.h
@@ -3,7 +3,7 @@
3	#include "quantum.h"	3	#include "quantum.h"
4		4
5		5
6	#define KEYMAP( \	6	#define LAYOUT( \
7	k00, k01, k02, k03, k04, k05 \	7	k00, k01, k02, k03, k04, k05 \
8	) \	8	) \
9	{ \	9	{ \


diff --git a/keyboards/christmas_tree/info.json b/keyboards/christmas_tree/info.json index d33f9cc46..bb223b0e0 100644 --- a/keyboards/christmas_tree/info.json +++ b/keyboards/christmas_tree/info.json
@@ -1,13 +1,14 @@
1	{	1	{
2	"keyboard_name": "Christmas Tree",	2	"keyboard_name": "Christmas Tree",
3	"keyboard_folder": "christmas_tree",	3	"keyboard_folder": "christmas_tree",
4	"url": "https://www.reddit.com/r/MechanicalKeyboards/comments/7cqxpf/gb_christmas_tree_pcb_gb_now_live/",	4	"url": "https://www.reddit.com/r/MechanicalKeyboards/comments/7cqxpf/gb_christmas_tree_pcb_gb_now_live/",
5	"maintainer": "That-Canadian",	5	"maintainer": "That-Canadian",
6	"width": 3,	6	"width": 3,
7	"height": 3,	7	"height": 3,
8	"layouts": {	8	"layouts": {
9	"2017": {	9	"2017": {
10	"key_count": 6	10	"key_count": 6,
11	}	11	"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}]
12	}	12	}
		13	}
13	}	14	}


diff --git a/keyboards/christmas_tree/keymaps/default/keymap.c b/keyboards/christmas_tree/keymaps/default/keymap.c index 38da32628..7880fd625 100644 --- a/keyboards/christmas_tree/keymaps/default/keymap.c +++ b/keyboards/christmas_tree/keymaps/default/keymap.c
@@ -14,7 +14,7 @@
14	* along with this program. If not, see <http://www.gnu.org/licenses/>.	14	* along with this program. If not, see <http://www.gnu.org/licenses/>.
15	*/	15	*/
16		16
17	#include "christmas_tree.h"	17	#include QMK_KEYBOARD_H
18		18
19	extern keymap_config_t keymap_config;	19	extern keymap_config_t keymap_config;
20		20
@@ -32,27 +32,35 @@ enum custom_keycodes {
32		32
33	const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {	33	const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
34		34
35	/* Base	35	/* Base
36	* ,------.	36	* ,------.
37	* \| 1 \|	37	* \| 1 \|
38	* ,------+------.	38	* ,------+------.
39	* \| 2 \| 3 \|	39	* \| 2 \| 3 \|
40	* ,------+------+------.	40	* ,------+------+------.
41	* \| 4 \| FUNC \| 6 \|	41	* \| 4 \| FUNC \| 6 \|
42	* `--------------------'	42	* `--------------------'
43	*/	43	*/
44	[_BASE] = KEYMAP(KC_1, KC_2, KC_3, KC_4, MO(_FUNC), KC_6),	44	[_BASE] = LAYOUT(
		45	KC_1,
		46	KC_2, KC_3,
		47	KC_4, MO(_FUNC), KC_6
		48	),
45		49
46	/* Func	50	/* Func
47	* ,------.	51	* ,------.
48	* \|BCKLIT\|	52	* \|BCKLIT\|
49	* ,------+------.	53	* ,------+------.
50	* \| 8 \| 9 \|	54	* \| 8 \| 9 \|
51	* ,------+------+------.	55	* ,------+------+------.
52	* \| 0 \| FUNC \| RESET\|	56	* \| 0 \| FUNC \| RESET\|
53	* `--------------------'	57	* `--------------------'
54	*/	58	*/
55	[_FUNC] = KEYMAP(BACKLIT, KC_8, KC_9, KC_0, _______, RESET)	59	[_FUNC] = LAYOUT(
		60	BACKLIT,
		61	KC_8, KC_9,
		62	KC_0, _______, RESET
		63	)
56		64
57		65
58	};	66	};