diff options
| author | fauxpark <fauxpark@gmail.com> | 2019-08-03 06:12:56 +1000 |
|---|---|---|
| committer | skullydazed <skullydazed@users.noreply.github.com> | 2019-08-30 15:01:52 -0700 |
| commit | 3619678b10c772c15dd348dce3d2991e178d7a3d (patch) | |
| tree | 93344474ea226bf2fd0b63dbcd4f84c43f7b6447 /keyboards/kc60 | |
| parent | 267a85c885a97219b544a3c706809821c4f28344 (diff) | |
| download | qmk_firmware-3619678b10c772c15dd348dce3d2991e178d7a3d.tar.gz qmk_firmware-3619678b10c772c15dd348dce3d2991e178d7a3d.zip | |
Migrate ACTION_BACKLIGHT_* to BL_* (#6299)
* Branch point for 2019 Aug 30 Breaking Change
* LUFA USB descriptor cleanup (#4871)
* Fix indentation
* Fix braces
* Expand descriptor headers
* Align descriptor elements
* Nicer formatting
* Tidy up preprocessor statements
* Remove VERSION_BCD redefine - LUFA_VERSION_INTEGER is currently 0x170418
* Tidy up comments
* Tweak ordering of HID report elements (no functional changes)
* We don't need all of these newlines
* Move default USB_MAX_POWER_CONSUMPTION closer to where it makes sense
* Ask nicely
* Add some more comments
* Change indentation back to 4 spaces
* Add changelog entry
* Language Keymap extras backport from ZSA fork (#6198)
* Swedish extra keymap refactor
* Fix swedish $ sign definition (#81)
* Fix br abnt2 keymap compilation error
* Add PR changelog doc
* Update PR6198.md
* Enforce clang-format (#6293)
* Enforce clang-format on commit for core files
* forgot about tests
* Migrate ACTION_LAYER_MOMENTARYs to MO() (#5176)
* Migrate ACTION_LAYER_MOMENTARYs to MO()
* Add changelog entry
* Update docs/ChangeLog/20190830/PR5176.md
Co-Authored-By: skullydazed <skullydazed@users.noreply.github.com>
* Migrate ACTION_BACKLIGHT_* to BL_*
* Add changelog
* Update docs/ChangeLog/20190830/PR6299.md
Co-Authored-By: skullydazed <skullydazed@users.noreply.github.com>
Diffstat (limited to 'keyboards/kc60')
| -rw-r--r-- | keyboards/kc60/keymaps/dbroqua/keymap.c | 14 | ||||
| -rw-r--r-- | keyboards/kc60/keymaps/dbroqua_hhkb/keymap.c | 14 |
2 files changed, 2 insertions, 26 deletions
diff --git a/keyboards/kc60/keymaps/dbroqua/keymap.c b/keyboards/kc60/keymaps/dbroqua/keymap.c index a70e1017e..f7aa36dab 100644 --- a/keyboards/kc60/keymaps/dbroqua/keymap.c +++ b/keyboards/kc60/keymaps/dbroqua/keymap.c | |||
| @@ -8,18 +8,6 @@ | |||
| 8 | // Fillers to make layering more clear | 8 | // Fillers to make layering more clear |
| 9 | #define ______ KC_TRNS | 9 | #define ______ KC_TRNS |
| 10 | 10 | ||
| 11 | // Func macro definitions. | ||
| 12 | #define S_LED FUNC(0) | ||
| 13 | #define S_LEDI FUNC(1) | ||
| 14 | #define S_LEDD FUNC(2) | ||
| 15 | |||
| 16 | // Enable these functions using FUNC(n) macro. | ||
| 17 | const uint16_t PROGMEM fn_actions[] = { | ||
| 18 | [0] = ACTION_BACKLIGHT_TOGGLE(), | ||
| 19 | [1] = ACTION_BACKLIGHT_INCREASE(), | ||
| 20 | [2] = ACTION_BACKLIGHT_DECREASE() | ||
| 21 | }; | ||
| 22 | |||
| 23 | /* | 11 | /* |
| 24 | * | | | | 12 | * | | | |
| 25 | * | | | | 13 | * | | | |
| @@ -67,7 +55,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 67 | ______, 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_INS, \ | 55 | ______, 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_INS, \ |
| 68 | ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, \ | 56 | ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, \ |
| 69 | ______, ______, ______, ______, ______, ______, ______, KC_PSCR,______, ______, ______, ______, ______, ______, \ | 57 | ______, ______, ______, ______, ______, ______, ______, KC_PSCR,______, ______, ______, ______, ______, ______, \ |
| 70 | ______, ______, S_LED, S_LEDI, S_LEDD,______,KC_MUTE,KC_VOLU,KC_VOLD,______, ______, ______, ______,KC_MPLY, \ | 58 | ______, ______, BL_TOGG, BL_INC, BL_DEC, ______,KC_MUTE,KC_VOLU,KC_VOLD,______, ______, ______, ______,KC_MPLY, \ |
| 71 | ______, ______, ______, ______, KC_DEL, ______, KC_MPRV, KC_MSTP, KC_MNXT \ | 59 | ______, ______, ______, ______, KC_DEL, ______, KC_MPRV, KC_MSTP, KC_MNXT \ |
| 72 | ), | 60 | ), |
| 73 | 61 | ||
diff --git a/keyboards/kc60/keymaps/dbroqua_hhkb/keymap.c b/keyboards/kc60/keymaps/dbroqua_hhkb/keymap.c index af758ae16..fe5a9c4a8 100644 --- a/keyboards/kc60/keymaps/dbroqua_hhkb/keymap.c +++ b/keyboards/kc60/keymaps/dbroqua_hhkb/keymap.c | |||
| @@ -7,18 +7,6 @@ | |||
| 7 | // Fillers to make layering more clear | 7 | // Fillers to make layering more clear |
| 8 | #define ______ KC_TRNS | 8 | #define ______ KC_TRNS |
| 9 | 9 | ||
| 10 | // Func macro definitions. | ||
| 11 | #define S_LED FUNC(0) | ||
| 12 | #define S_LEDI FUNC(1) | ||
| 13 | #define S_LEDD FUNC(2) | ||
| 14 | |||
| 15 | // Enable these functions using FUNC(n) macro. | ||
| 16 | const uint16_t PROGMEM fn_actions[] = { | ||
| 17 | [0] = ACTION_BACKLIGHT_TOGGLE(), | ||
| 18 | [1] = ACTION_BACKLIGHT_INCREASE(), | ||
| 19 | [2] = ACTION_BACKLIGHT_DECREASE() | ||
| 20 | }; | ||
| 21 | |||
| 22 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 10 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 23 | /* Qwerty | 11 | /* Qwerty |
| 24 | * ,-----------------------------------------------------------------------------------------. | 12 | * ,-----------------------------------------------------------------------------------------. |
| @@ -56,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 56 | */ | 44 | */ |
| 57 | [_FN] = LAYOUT( /* Layer 1 */ | 45 | [_FN] = LAYOUT( /* Layer 1 */ |
| 58 | ______, 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_INS, \ | 46 | ______, 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_INS, \ |
| 59 | KC_CAPS, S_LED, S_LEDI, S_LEDD, ______, ______, ______, ______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, ______, ______, \ | 47 | KC_CAPS, BL_TOGG, BL_INC, BL_DEC, ______, ______, ______, ______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, ______, ______, \ |
| 60 | ______, KC_VOLD, KC_VOLU, KC_MUTE, ______, ______, KC_PAST, KC_PSLS,KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, ______, ______, \ | 48 | ______, KC_VOLD, KC_VOLU, KC_MUTE, ______, ______, KC_PAST, KC_PSLS,KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, ______, ______, \ |
| 61 | ______, ______, KC_MPRV, KC_MPLY, KC_MNXT,______,______,KC_PPLS,KC_PMNS,KC_END, KC_PGDN, KC_DOWN, ______,______, \ | 49 | ______, ______, KC_MPRV, KC_MPLY, KC_MNXT,______,______,KC_PPLS,KC_PMNS,KC_END, KC_PGDN, KC_DOWN, ______,______, \ |
| 62 | ______, ______, ______, ______, KC_DEL, KC_MSTP, ______, ______, ______ \ | 50 | ______, ______, ______, ______, KC_DEL, KC_MSTP, ______, ______, ______ \ |
