summaryrefslogtreecommitdiff
path: root/layouts/community/ortho_4x12/bakingpy
diff options
context:
space:
mode:
authorDanny <nooges@users.noreply.github.com>2018-08-13 15:05:58 -0400
committerDrashna Jaelre <drashna@live.com>2018-08-13 12:05:58 -0700
commit05b7383703d9e7bb68f29765adf865ba78facf2d (patch)
tree63420634e49af91a45a87119fba077ef76cd7f05 /layouts/community/ortho_4x12/bakingpy
parent39256c2449c9c56562f3110f8655fdaf3e2cd5cc (diff)
Keyboard: Refactor Levinson to use split common code (#3639)
* Migrate Levinson to use split_common code * Update keymap
Diffstat (limited to 'layouts/community/ortho_4x12/bakingpy')
-rw-r--r--layouts/community/ortho_4x12/bakingpy/config.h8
-rw-r--r--layouts/community/ortho_4x12/bakingpy/keymap.c76
-rw-r--r--layouts/community/ortho_4x12/bakingpy/rules.mk3
3 files changed, 41 insertions, 46 deletions
diff --git a/layouts/community/ortho_4x12/bakingpy/config.h b/layouts/community/ortho_4x12/bakingpy/config.h
index 77fa69ad78..a90f38001a 100644
--- a/layouts/community/ortho_4x12/bakingpy/config.h
+++ b/layouts/community/ortho_4x12/bakingpy/config.h
@@ -1,7 +1,4 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include QMK_KEYBOARD_CONFIG_H
+#pragma once
/* Use I2C or Serial, not both */
@@ -9,7 +6,6 @@
// #define USE_I2C
/* Select hand configuration */
-
#define MASTER_LEFT
// #define MASTER_RIGHT
// #define EE_HANDS
@@ -26,5 +22,3 @@
#ifdef AUDIO_ENABLE
#define C6_AUDIO
#endif
-
-#endif
diff --git a/layouts/community/ortho_4x12/bakingpy/keymap.c b/layouts/community/ortho_4x12/bakingpy/keymap.c
index b34e57cbeb..e71e5d5d2c 100644
--- a/layouts/community/ortho_4x12/bakingpy/keymap.c
+++ b/layouts/community/ortho_4x12/bakingpy/keymap.c
@@ -1,6 +1,4 @@
#include QMK_KEYBOARD_H
-#include "action_layer.h"
-#include "eeconfig.h"
extern keymap_config_t keymap_config;
@@ -19,6 +17,7 @@ enum custom_keycodes {
LOWER,
RAISE,
ADJUST,
+ PLAY_ALLSTAR,
};
#define KC_ KC_TRNS
@@ -35,79 +34,80 @@ enum custom_keycodes {
#define KC_ENTS MT(MOD_LSFT, KC_ENT)
#define KC_BL_S BL_STEP
#define KC_BL_T BL_TOGG
+#define KC_ALLS PLAY_ALLSTAR
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_QWERTY] = LAYOUT_kc_ortho_4x12(
- //,----+----+----+----+----+----. ,----+----+----+----+----+----.
+ //┌────┬────┬────┬────┬────┬────┐ ┌────┬────┬────┬────┬────┬────┐
TAB , Q , W , E , R , T , Y , U , I , O , P ,MINS,
- //|----+----+----+----+----+----| |----+----+----+----+----+----|
+ //├────┼────┼────┼────┼────┼────┤ ├────┼────┼────┼────┼────┼────┤
ESCC, A , S , D , F , G , H , J , K , L ,SCLN,QUOT,
- //|----+----+----+----+----+----| |----+----+----+----+----+----|
+ //├────┼────┼────┼────┼────┼────┤ ├────┼────┼────┼────┼────┼────┤
LSFT, Z , X , C , V , B , N , M ,COMM,DOT ,SLSH,ENTS,
- //|----+----+----+----+----+----| |----+----+----+----+----+----|
+ //├────┼────┼────┼────┼────┼────┤ ├────┼────┼────┼────┼────┼────┤
GRVF,LCTL,LALT,LGUI,LOWR,SPC , BSPC,RASE,LEFT,DOWN, UP ,RGHT
- //`----+----+----+----+----+----' `----+----+----+----+----+----'
+ //└────┴────┴────┴────┴────┴────┘ └────┴────┴────┴────┴────┴────┘
),
[_COLEMAK] = LAYOUT_kc_ortho_4x12(
- //,----+----+----+----+----+----. ,----+----+----+----+----+----.
+ //┌────┬────┬────┬────┬────┬────┐ ┌────┬────┬────┬────┬────┬────┐
TAB , Q , W , F , P , G , J , L , U , Y ,SCLN,MINS,
- //|----+----+----+----+----+----| |----+----+----+----+----+----|
+ //├────┼────┼────┼────┼────┼────┤ ├────┼────┼────┼────┼────┼────┤
ESCC, A , R , S , T , D , H , N , E , I , O ,QUOT,
- //|----+----+----+----+----+----| |----+----+----+----+----+----|
+ //├────┼────┼────┼────┼────┼────┤ ├────┼────┼────┼────┼────┼────┤
LSFT, Z , X , C , V , B , K , M ,COMM,DOT ,SLSH,ENTS,
- //|----+----+----+----+----+----| |----+----+----+----+----+----|
+ //├────┼────┼────┼────┼────┼────┤ ├────┼────┼────┼────┼────┼────┤
GRVF,LCTL,LALT,LGUI,LOWR,SPC , BSPC,RASE,LEFT,DOWN, UP ,RGHT
- //`----+----+----+----+----+----' `----+----+----+----+----+----'
+ //└────┴────┴────┴────┴────┴────┘ └────┴────┴────┴────┴────┴────┘
),
[_DVORAK] = LAYOUT_kc_ortho_4x12(
- //,----+----+----+----+----+----. ,----+----+----+----+----+----.
+ //┌────┬────┬────┬────┬────┬────┐ ┌────┬────┬────┬────┬────┬────┐
TAB ,QUOT,COMM,DOT , P , Y , F , G , C , R , L ,MINS,
- //|----+----+----+----+----+----| |----+----+----+----+----+----|
+ //├────┼────┼────┼────┼────┼────┤ ├────┼────┼────┼────┼────┼────┤
ESCC, A , O , E , U , I , D , H , T , N , S ,SLSH,
- //|----+----+----+----+----+----| |----+----+----+----+----+----|
+ //├────┼────┼────┼────┼────┼────┤ ├────┼────┼────┼────┼────┼────┤
LSFT,SCLN, Q , J , K , X , B , M , W , V , Z ,ENTS,
- //|----+----+----+----+----+----| |----+----+----+----+----+----|
+ //├────┼────┼────┼────┼────┼────┤ ├────┼────┼────┼────┼────┼────┤
GRVF,LCTL,LALT,LGUI,LOWR,SPC , BSPC,RASE,LEFT,DOWN, UP ,RGHT
- //`----+----+----+----+----+----' `----+----+----+----+----+----'
+ //└────┴────┴────┴────┴────┴────┘ └────┴────┴────┴────┴────┴────┘
),
[_LOWER] = LAYOUT_kc_ortho_4x12(
- //,----+----+----+----+----+----. ,----+----+----+----+----+----.
- ASTR, 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 , 9 , 0 , ,
- //|----+----+----+----+----+----| |----+----+----+----+----+----|
+ //┌────┬────┬────┬────┬────┬────┐ ┌────┬────┬────┬────┬────┬────┐
+ ALLS, 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 , 9 , 0 , ,
+ //├────┼────┼────┼────┼────┼────┤ ├────┼────┼────┼────┼────┼────┤
DEL ,CAPP,LEFT,RGHT, UP ,LBRC, RBRC, P4 , P5 , P6 ,PLUS,PIPE,
- //|----+----+----+----+----+----| |----+----+----+----+----+----|
+ //├────┼────┼────┼────┼────┼────┤ ├────┼────┼────┼────┼────┼────┤
,CPYP, , ,DOWN,LCBR, RCBR, P1 , P2 , P3 ,MINS, ,
- //|----+----+----+----+----+----| |----+----+----+----+----+----|
+ //├────┼────┼────┼────┼────┼────┤ ├────┼────┼────┼────┼────┼────┤
BL_S,BL_T, , , ,DEL , DEL , , P0 ,PDOT, ,
- //`----+----+----+----+----+----' `----+----+----+----+----+----'
+ //└────┴────┴────┴────┴────┴────┘ └────┴────┴────┴────┴────┴────┘
),
[_RAISE] = LAYOUT_kc_ortho_4x12(
- //,----+----+----+----+----+----. ,----+----+----+----+----+----.
+ //┌────┬────┬────┬────┬────┬────┐ ┌────┬────┬────┬────┬────┬────┐
,EXLM, AT ,HASH,DLR ,PERC, CIRC,AMPR,ASTR,LPRN,RPRN, ,
- //|----+----+----+----+----+----| |----+----+----+----+----+----|
+ //├────┼────┼────┼────┼────┼────┤ ├────┼────┼────┼────┼────┼────┤
DEL ,MPRV,MNXT,VOLU,PGUP,UNDS, EQL ,HOME, , , ,BSLS,
- //|----+----+----+----+----+----| |----+----+----+----+----+----|
+ //├────┼────┼────┼────┼────┼────┤ ├────┼────┼────┼────┼────┼────┤
MUTE,MSTP,MPLY,VOLD,PGDN,MINS, PLUS,END , , , , ,
- //|----+----+----+----+----+----| |----+----+----+----+----+----|
+ //├────┼────┼────┼────┼────┼────┤ ├────┼────┼────┼────┼────┼────┤
, , , , , , , , , , ,
- //`----+----+----+----+----+----' `----+----+----+----+----+----'
+ //└────┴────┴────┴────┴────┴────┘ └────┴────┴────┴────┴────┴────┘
),
[_FKEYS] = LAYOUT_kc_ortho_4x12(
- //,----+----+----+----+----+----. ,----+----+----+----+----+----.
+ //┌────┬────┬────┬────┬────┬────┐ ┌────┬────┬────┬────┬────┬────┐
F12 , F1 , F2 , F3 , F4 , F5 , F6 , F7 , F8 , F9 ,F10 ,F11 ,
- //|----+----+----+----+----+----| |----+----+----+----+----+----|
+ //├────┼────┼────┼────┼────┼────┤ ├────┼────┼────┼────┼────┼────┤
, , , , , , , , , , , ,
- //|----+----+----+----+----+----| |----+----+----+----+----+----|
+ //├────┼────┼────┼────┼────┼────┤ ├────┼────┼────┼────┼────┼────┤
, , , , , , , , , , , ,
- //|----+----+----+----+----+----| |----+----+----+----+----+----|
+ //├────┼────┼────┼────┼────┼────┤ ├────┼────┼────┼────┼────┼────┤
, , , , , , , , , , ,
- //`----+----+----+----+----+----' `----+----+----+----+----+----'
+ //└────┴────┴────┴────┴────┴────┘ └────┴────┴────┴────┴────┴────┘
),
/* Adjust (Lower + Raise)
@@ -122,10 +122,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* `-----------------------------------------------------------------------------------'
*/
[_ADJUST] = LAYOUT_ortho_4x12( \
- _______, RESET , RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, _______, _______, \
- _______, _______, _______, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, _______, _______, \
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \
+ _______, RESET , RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, _______, _______, \
+ _______, _______, _______, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, _______, _______, \
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \
)
@@ -200,7 +200,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
}
return false;
break;
- case KC_ASTR:
+ case PLAY_ALLSTAR:
if (record->event.pressed) {
#ifdef AUDIO_ENABLE
PLAY_SONG(all_star_song);
diff --git a/layouts/community/ortho_4x12/bakingpy/rules.mk b/layouts/community/ortho_4x12/bakingpy/rules.mk
index 80e5f82eef..0d568c401a 100644
--- a/layouts/community/ortho_4x12/bakingpy/rules.mk
+++ b/layouts/community/ortho_4x12/bakingpy/rules.mk
@@ -2,4 +2,5 @@
ifeq ($(LAYOUTS_HAS_RGB),yes)
RGBLIGHT_ENABLE = yes
endif
-AUDIO_ENABLE = yes
+AUDIO_ENABLE = no
+BACKLIGHT_ENABLE = yes