Nulo/qmk_firmware
1
0
Fork 0
Code Releases Activity

Refactor and Configurator update for Christmas Tree (#3100)

Browse source 
* Refactor

* Configurator update
This commit is contained in:
noroadsleft 2018-06-01 08:56:39 -07:00 committed by Drashna Jaelre
parent 7624a4e57e
commit 0aaff74b39
3 changed files with 41 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
keyboards/christmas_tree/christmas_tree.h
View file

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

3
keyboards/christmas_tree/info.json
View file

@ -7,7 +7,8 @@
"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}]
} }
} }
} }

18
keyboards/christmas_tree/keymaps/default/keymap.c
View file

@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * 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; extern keymap_config_t keymap_config;
@ -32,7 +32,7 @@ enum custom_keycodes {
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Base /* Base
* ,------. * ,------.
* | 1 | * | 1 |
* ,------+------. * ,------+------.
@ -41,9 +41,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | 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|
* ,------+------. * ,------+------.
@ -52,7 +56,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | 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
)
}; };