aboutsummaryrefslogtreecommitdiffstats
path: root/keyboards/org60/keymaps
diff options
context:
space:
mode:
authorMechMerlin <30334081+mechmerlin@users.noreply.github.com>2018-06-25 08:11:29 -0700
committerDrashna Jaelre <drashna@live.com>2018-06-25 08:11:29 -0700
commit2f8f26b1e0b538bf407dc71efc1dc80bd10ab206 (patch)
tree4e9b65f8d554cac657117048e0abb3bb53718c73 /keyboards/org60/keymaps
parentae8dfbabf91670d55a0f910c6e28d713a20f41ef (diff)
downloadfirmware-2f8f26b1e0b538bf407dc71efc1dc80bd10ab206.tar.gz
firmware-2f8f26b1e0b538bf407dc71efc1dc80bd10ab206.tar.bz2
firmware-2f8f26b1e0b538bf407dc71efc1dc80bd10ab206.zip
Add QMK Configurator Support for ORG60 (#3228)
* Add additional readme notes on how to fix the flickering backlight issue * Add QMK Configurator support
Diffstat (limited to 'keyboards/org60/keymaps')
-rw-r--r--keyboards/org60/keymaps/boardy/keymap.c6
-rw-r--r--keyboards/org60/keymaps/default/keymap.c6
2 files changed, 6 insertions, 6 deletions
diff --git a/keyboards/org60/keymaps/boardy/keymap.c b/keyboards/org60/keymaps/boardy/keymap.c
index 635838f6c..43994f189 100644
--- a/keyboards/org60/keymaps/boardy/keymap.c
+++ b/keyboards/org60/keymaps/boardy/keymap.c
@@ -1,4 +1,4 @@
-#include "org60.h"
+#include QMK_KEYBOARD_H
#include "action_layer.h"
// Keyboard Layers
@@ -9,7 +9,7 @@ enum keyboard_layers {
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [_BASE] = KEYMAP(
+ [_BASE] = LAYOUT(
/*
0: Base Layer
.--------------------------------------------------------------------------------------------------------------------------------------.
@@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//--------------------------------------------------------------------------------------------------------------------------------------'
- [_FUNCTION] = KEYMAP(
+ [_FUNCTION] = LAYOUT(
/*
1: Function Layer
.--------------------------------------------------------------------------------------------------------------------------------------.
diff --git a/keyboards/org60/keymaps/default/keymap.c b/keyboards/org60/keymaps/default/keymap.c
index 9d18d50e3..ebb377d1d 100644
--- a/keyboards/org60/keymaps/default/keymap.c
+++ b/keyboards/org60/keymaps/default/keymap.c
@@ -1,10 +1,10 @@
-#include "org60.h"
+#include QMK_KEYBOARD_H
#include "action_layer.h"
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// 0: Base Layer
- KEYMAP(
+ LAYOUT(
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC , KC_NO, \
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, \
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NO, KC_ENT, \
@@ -12,7 +12,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RGUI, F(0), KC_LEFT, KC_DOWN, KC_RIGHT),
// 1: Function Layer
- KEYMAP(
+ LAYOUT(
RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NO, KC_NO, \
KC_NO, KC_WH_U, KC_UP, KC_WH_D, KC_BSPC,KC_HOME,KC_CALC,KC_NO, KC_INS, KC_NO, KC_PSCR, KC_SLCK, KC_PAUS, KC_DEL, \
KC_NO, KC_LEFT, KC_DOWN, KC_RIGHT,KC_DEL, KC_END, KC_PGDN,KC_NO, KC_NO, KC_NO, KC_HOME, KC_PGUP, KC_NO, KC_ENT, \