Skip to content

Commit 7d7f1d7

Browse files
bwisnzykrah
authored andcommitted
[Keyboard] annepro2: match default keymap to stock keycaps (qmk#16724)
1 parent 798023a commit 7d7f1d7

File tree

3 files changed

+74
-6
lines changed

3 files changed

+74
-6
lines changed

keyboards/annepro2/annepro2.c

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ static const SerialConfig ble_uart_config = {
4242

4343
static uint8_t led_mcu_wakeup[11] = {0x7b, 0x10, 0x43, 0x10, 0x03, 0x00, 0x00, 0x7d, 0x02, 0x01, 0x02};
4444

45+
static uint8_t led_enabled = 1;
46+
4547
ble_capslock_t ble_capslock = {._dummy = {0}, .caps_lock = false};
4648

4749
#ifdef RGB_MATRIX_ENABLE
@@ -226,6 +228,68 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
226228
else ap2_led_enable();
227229
return true;
228230
#endif
231+
232+
case KC_AP_RGB_VAI:
233+
if (record->event.pressed) {
234+
if (get_mods() & MOD_MASK_SHIFT) {
235+
rgb_matrix_increase_hue();
236+
return false;
237+
} else if (get_mods() & MOD_MASK_CTRL) {
238+
rgb_matrix_decrease_hue();
239+
return false;
240+
} else {
241+
rgb_matrix_increase_val();
242+
}
243+
}
244+
return true;
245+
246+
case KC_AP_RGB_VAD:
247+
if (record->event.pressed) {
248+
if (get_mods() & MOD_MASK_SHIFT) {
249+
rgb_matrix_increase_sat();
250+
return false;
251+
} else if (get_mods() & MOD_MASK_CTRL) {
252+
rgb_matrix_decrease_sat();
253+
return false;
254+
} else {
255+
rgb_matrix_decrease_val();
256+
}
257+
}
258+
return true;
259+
260+
case KC_AP_RGB_TOG:
261+
if (record->event.pressed) {
262+
if (get_mods() & MOD_MASK_SHIFT) {
263+
rgb_matrix_increase_speed();
264+
return false;
265+
} else if (get_mods() & MOD_MASK_CTRL) {
266+
rgb_matrix_decrease_speed();
267+
return false;
268+
} else {
269+
if (led_enabled) {
270+
ap2_led_disable();
271+
rgb_matrix_disable();
272+
led_enabled = 0;
273+
} else {
274+
ap2_led_enable();
275+
rgb_matrix_enable();
276+
led_enabled = 1;
277+
}
278+
return true;
279+
}
280+
}
281+
return true;
282+
283+
case KC_AP_RGB_MOD:
284+
if (record->event.pressed) {
285+
if (get_mods() & MOD_MASK_CTRL) {
286+
rgb_matrix_step_reverse();
287+
return false;
288+
} else {
289+
rgb_matrix_step();
290+
}
291+
}
292+
return true;
229293

230294
default:
231295
break;

keyboards/annepro2/annepro2.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,10 @@ enum AP2KeyCodes {
5858
KC_AP_LED_PREV_PROFILE,
5959
KC_AP_LED_NEXT_INTENSITY,
6060
KC_AP_LED_SPEED,
61+
KC_AP_RGB_VAI,
62+
KC_AP_RGB_VAD,
63+
KC_AP_RGB_TOG,
64+
KC_AP_RGB_MOD,
6165
AP2_SAFE_RANGE,
6266
};
6367

keyboards/annepro2/keymaps/default/keymap.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ enum anne_pro_layers {
8383
/*
8484
* Layer FN2
8585
* ,-----------------------------------------------------------------------------------------.
86-
* | ~ | BT1 | BT2 | BT3 | BT4 | F5 | F6 | HUE | SAT | BRI | SPD | MOD | TOG | Bksp |
86+
* | ~ | BT1 | BT2 | BT3 | BT4 | F5 | F6 | F7 | F8 | MOD | TOG | BRI- | BRI+ | Bksp |
8787
* |-----------------------------------------------------------------------------------------+
8888
* | Tab | q | UP | e | r | t | y | u | i | o | PS | HOME | END | \ |
8989
* |-----------------------------------------------------------------------------------------+
@@ -96,11 +96,11 @@ enum anne_pro_layers {
9696
*
9797
*/
9898
[FN2] = LAYOUT_60_ansi( /* FN2 */
99-
_______, KC_AP2_BT1, KC_AP2_BT2, KC_AP2_BT3, KC_AP2_BT4, _______, _______, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, RGB_MOD, RGB_TOG, _______,
100-
MO(FN2), _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_HOME, KC_END, _______,
101-
_______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_PGUP, KC_PGDN, _______,
102-
_______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS, KC_DEL, _______,
103-
_______, _______, _______, _______, _______, MO(FN1), MO(FN2), _______
99+
_______, KC_AP2_BT1, KC_AP2_BT2, KC_AP2_BT3, KC_AP2_BT4, _______, _______, _______, _______, KC_AP_RGB_MOD, KC_AP_RGB_TOG, KC_AP_RGB_VAD, KC_AP_RGB_VAI, _______,
100+
MO(FN2), _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_HOME, KC_END, _______,
101+
_______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_PGUP, KC_PGDN, _______,
102+
_______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS, KC_DEL, _______,
103+
_______, _______, _______, _______, _______, MO(FN1), MO(FN2), _______
104104
),
105105
};
106106
// clang-format on

0 commit comments

Comments
 (0)