From 9632360caa5e6511b0ec13cb4c55eb64408232b5 Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Tue, 30 Aug 2022 03:20:04 -0500 Subject: Use a macro to compute the size of arrays at compile time (#18044) * Add ARRAY_SIZE and CEILING utility macros * Apply a coccinelle patch to use ARRAY_SIZE * fix up some straggling items * Fix 'make test:secure' * Enhance ARRAY_SIZE macro to reject acting on pointers The previous definition would not produce a diagnostic for ``` int *p; size_t num_elem = ARRAY_SIZE(p) ``` but the new one will. * explicitly get definition of ARRAY_SIZE * Convert to ARRAY_SIZE when const is involved The following spatch finds additional instances where the array is const and the division is by the size of the type, not the size of the first element: ``` @ rule5a using "empty.iso" @ type T; const T[] E; @@ - (sizeof(E)/sizeof(T)) + ARRAY_SIZE(E) @ rule6a using "empty.iso" @ type T; const T[] E; @@ - sizeof(E)/sizeof(T) + ARRAY_SIZE(E) ``` * New instances of ARRAY_SIZE added since initial spatch run * Use `ARRAY_SIZE` in docs (found by grep) * Manually use ARRAY_SIZE hs_set is expected to be the same size as uint16_t, though it's made of two 8-bit integers * Just like char, sizeof(uint8_t) is guaranteed to be 1 This is at least true on any plausible system where qmk is actually used. Per my understanding it's universally true, assuming that uint8_t exists: https://stackoverflow.com/questions/48655310/can-i-assume-that-sizeofuint8-t-1 * Run qmk-format on core C files touched in this branch Co-authored-by: Stefan Kerkmann --- keyboards/25keys/zinc/keymaps/ginjake/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'keyboards/25keys/zinc') diff --git a/keyboards/25keys/zinc/keymaps/ginjake/keymap.c b/keyboards/25keys/zinc/keymaps/ginjake/keymap.c index 93dfc590e9..26190a2a91 100644 --- a/keyboards/25keys/zinc/keymaps/ginjake/keymap.c +++ b/keyboards/25keys/zinc/keymaps/ginjake/keymap.c @@ -333,7 +333,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { aqours_num++; aqours_next_color_timer_count = 0; target_col = 0; - if (aqours_num == sizeof(aqours_h) / sizeof(int)) { + if (aqours_num == ARRAY_SIZE(aqours_h)) { aqours_num = 0; } } -- cgit v1.2.3 From dc4af81e0b375b559d270bbeb3495d61933f8c54 Mon Sep 17 00:00:00 2001 From: Dasky <32983009+daskygit@users.noreply.github.com> Date: Tue, 6 Sep 2022 18:46:34 +0100 Subject: Remove legacy USE_SERIAL define (#18292) * Remove legacy USE_SERIAL define * tidy up missed comments --- keyboards/25keys/zinc/rev1/config.h | 1 - keyboards/25keys/zinc/reva/config.h | 1 - 2 files changed, 2 deletions(-) (limited to 'keyboards/25keys/zinc') diff --git a/keyboards/25keys/zinc/rev1/config.h b/keyboards/25keys/zinc/rev1/config.h index 1b2ae25cd8..947f5ccfb1 100644 --- a/keyboards/25keys/zinc/rev1/config.h +++ b/keyboards/25keys/zinc/rev1/config.h @@ -21,7 +21,6 @@ along with this program. If not, see . #define TAPPING_TERM 100 /* Use I2C or Serial */ -#define USE_SERIAL #define SOFT_SERIAL_PIN D2 /* Select hand configuration */ diff --git a/keyboards/25keys/zinc/reva/config.h b/keyboards/25keys/zinc/reva/config.h index f740f4d011..54a26cd5bc 100644 --- a/keyboards/25keys/zinc/reva/config.h +++ b/keyboards/25keys/zinc/reva/config.h @@ -21,7 +21,6 @@ along with this program. If not, see . #define TAPPING_TERM 100 /* Use I2C or Serial */ -#define USE_SERIAL #define SOFT_SERIAL_PIN D2 /* Select hand configuration */ -- cgit v1.2.3 From 4b2d71de52b561c77da4bdb2275b1c6bb2415f54 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sun, 9 Oct 2022 14:51:09 +1100 Subject: Remove legacy international keycodes (#18588) --- keyboards/25keys/zinc/keymaps/default/keymap.c | 8 ++++---- keyboards/25keys/zinc/keymaps/ginjake/keymap.c | 8 ++++---- keyboards/25keys/zinc/keymaps/monks/keymap.c | 8 ++++---- keyboards/25keys/zinc/keymaps/toshi0383/keymap.c | 4 ++-- keyboards/25keys/zinc/keymaps/via/keymap.c | 8 ++++---- 5 files changed, 18 insertions(+), 18 deletions(-) (limited to 'keyboards/25keys/zinc') diff --git a/keyboards/25keys/zinc/keymaps/default/keymap.c b/keyboards/25keys/zinc/keymaps/default/keymap.c index 925d252247..5c3fcd53de 100644 --- a/keyboards/25keys/zinc/keymaps/default/keymap.c +++ b/keyboards/25keys/zinc/keymaps/default/keymap.c @@ -271,24 +271,24 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { case EISU: if (record->event.pressed) { if(keymap_config.swap_lalt_lgui==false){ - register_code(KC_LANG2); + register_code(KC_LNG2); }else{ SEND_STRING(SS_LALT("`")); } } else { - unregister_code(KC_LANG2); + unregister_code(KC_LNG2); } return false; break; case KANA: if (record->event.pressed) { if(keymap_config.swap_lalt_lgui==false){ - register_code(KC_LANG1); + register_code(KC_LNG1); }else{ SEND_STRING(SS_LALT("`")); } } else { - unregister_code(KC_LANG1); + unregister_code(KC_LNG1); } return false; break; diff --git a/keyboards/25keys/zinc/keymaps/ginjake/keymap.c b/keyboards/25keys/zinc/keymaps/ginjake/keymap.c index 26190a2a91..7bf5974974 100644 --- a/keyboards/25keys/zinc/keymaps/ginjake/keymap.c +++ b/keyboards/25keys/zinc/keymaps/ginjake/keymap.c @@ -283,24 +283,24 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { case EISU: if (record->event.pressed) { if(keymap_config.swap_lalt_lgui==false){ - register_code(KC_LANG2); + register_code(KC_LNG2); }else{ SEND_STRING(SS_LALT("`")); } } else { - unregister_code(KC_LANG2); + unregister_code(KC_LNG2); } return false; break; case KANA: if (record->event.pressed) { if(keymap_config.swap_lalt_lgui==false){ - register_code(KC_LANG1); + register_code(KC_LNG1); }else{ SEND_STRING(SS_LALT("`")); } } else { - unregister_code(KC_LANG1); + unregister_code(KC_LNG1); } return false; break; diff --git a/keyboards/25keys/zinc/keymaps/monks/keymap.c b/keyboards/25keys/zinc/keymaps/monks/keymap.c index 8670a58efb..d0fae14177 100644 --- a/keyboards/25keys/zinc/keymaps/monks/keymap.c +++ b/keyboards/25keys/zinc/keymaps/monks/keymap.c @@ -212,24 +212,24 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { case EISU: if (record->event.pressed) { if(keymap_config.swap_lalt_lgui==false){ - register_code(KC_LANG2); + register_code(KC_LNG2); }else{ SEND_STRING(SS_LALT("`")); } } else { - unregister_code(KC_LANG2); + unregister_code(KC_LNG2); } return false; break; case KANA: if (record->event.pressed) { if(keymap_config.swap_lalt_lgui==false){ - register_code(KC_LANG1); + register_code(KC_LNG1); }else{ SEND_STRING(SS_LALT("`")); } } else { - unregister_code(KC_LANG1); + unregister_code(KC_LNG1); } return false; break; diff --git a/keyboards/25keys/zinc/keymaps/toshi0383/keymap.c b/keyboards/25keys/zinc/keymaps/toshi0383/keymap.c index 122ecd3611..1f7bd727c1 100644 --- a/keyboards/25keys/zinc/keymaps/toshi0383/keymap.c +++ b/keyboards/25keys/zinc/keymaps/toshi0383/keymap.c @@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_ADJUST] = LAYOUT_ortho_4x12( RGB_VAI, RGB_SAI, RGB_HUI, RGB_MOD, XXXXXXX, RGB_TOG, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, XXXXXXX, RGB_VAD, RGB_SAD, RGB_HUD, RGB_RMOD, XXXXXXX, XXXXXXX, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, XXXXXXX, - KC_MUTE, KC_VOLD, KC_VOLU, KC_BRID, KC_BRIU, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LANG1, KC_LANG2, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_KANA + KC_MUTE, KC_VOLD, KC_VOLU, KC_BRID, KC_BRIU, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LNG1, KC_LNG2, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INT2 ), }; diff --git a/keyboards/25keys/zinc/keymaps/via/keymap.c b/keyboards/25keys/zinc/keymaps/via/keymap.c index 22c08b0abb..29a4bdc5bd 100644 --- a/keyboards/25keys/zinc/keymaps/via/keymap.c +++ b/keyboards/25keys/zinc/keymaps/via/keymap.c @@ -154,23 +154,23 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { case EISU: if (record->event.pressed) { if(keymap_config.swap_lalt_lgui==false){ - register_code(KC_LANG2); + register_code(KC_LNG2); } else { SEND_STRING(SS_LALT("`")); } } else { - unregister_code(KC_LANG2); + unregister_code(KC_LNG2); } return false; case KANA: if (record->event.pressed) { if(keymap_config.swap_lalt_lgui==false){ - register_code(KC_LANG1); + register_code(KC_LNG1); } else { SEND_STRING(SS_LALT("`")); } } else { - unregister_code(KC_LANG1); + unregister_code(KC_LNG1); } return false; case RGBRST: -- cgit v1.2.3 From 5629ba18077ee5dcde72e497ddf46d848817dd5c Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 14 Oct 2022 04:28:14 +1100 Subject: Remove legacy keycodes, part 4 (#18683) * `KC_PGDOWN` -> `KC_PGDN` * `KC_PSCREEN` -> `KC_PSCR` * `KC_SCOLON` -> `KC_SCLN` * `KC_BSLASH` -> `KC_BSLS` * `KC_BSPACE` -> `KC_BSPC` --- keyboards/25keys/zinc/keymaps/toshi0383/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'keyboards/25keys/zinc') diff --git a/keyboards/25keys/zinc/keymaps/toshi0383/keymap.c b/keyboards/25keys/zinc/keymaps/toshi0383/keymap.c index 1f7bd727c1..e76f95983d 100644 --- a/keyboards/25keys/zinc/keymaps/toshi0383/keymap.c +++ b/keyboards/25keys/zinc/keymaps/toshi0383/keymap.c @@ -15,7 +15,7 @@ enum layer_names { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_BASE] = LAYOUT_ortho_4x12( - KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPACE, + KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, SFT_T(KC_SCLN), KC_RGUI, KC_SPC, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_RCTL, KC_DOT, KC_RALT, RGUI(KC_RSFT), KC_LGUI, KC_LALT, _______, _______, LOWER, KC_ENT, KC_ENT, RAISE, _______, _______, _______, _______ -- cgit v1.2.3 From d021bedf50801161a49812f63c425b372347055b Mon Sep 17 00:00:00 2001 From: Drashna Jaelre Date: Sat, 15 Oct 2022 09:55:12 -0700 Subject: Remove RGBLIGHT_ANIMTION and clean up effect defines for 0-F (#18725) --- keyboards/25keys/zinc/keymaps/default/rules.mk | 2 -- keyboards/25keys/zinc/keymaps/ginjake/rules.mk | 2 -- keyboards/25keys/zinc/keymaps/monks/rules.mk | 2 -- keyboards/25keys/zinc/keymaps/toshi0383/rules.mk | 2 -- keyboards/25keys/zinc/keymaps/via/config.h | 20 ++++++++++---------- keyboards/25keys/zinc/keymaps/via/rules.mk | 2 -- keyboards/25keys/zinc/rev1/post_config.h | 2 +- keyboards/25keys/zinc/reva/post_config.h | 2 +- 8 files changed, 12 insertions(+), 22 deletions(-) (limited to 'keyboards/25keys/zinc') diff --git a/keyboards/25keys/zinc/keymaps/default/rules.mk b/keyboards/25keys/zinc/keymaps/default/rules.mk index 09b121d26f..1b53ec4c16 100644 --- a/keyboards/25keys/zinc/keymaps/default/rules.mk +++ b/keyboards/25keys/zinc/keymaps/default/rules.mk @@ -106,9 +106,7 @@ ifeq ($(strip $(IOS_DEVICE_ENABLE)), yes) endif ifeq ($(strip $(LED_ANIMATIONS)), yes) -# OPT_DEFS += -DRGBLIGHT_ANIMATIONS OPT_DEFS += -DLED_ANIMATIONS - endif ifeq ($(strip $(RGB_MATRIX_SPLIT_RIGHT)), yes) diff --git a/keyboards/25keys/zinc/keymaps/ginjake/rules.mk b/keyboards/25keys/zinc/keymaps/ginjake/rules.mk index f2cb3633c6..4bbd3e582c 100644 --- a/keyboards/25keys/zinc/keymaps/ginjake/rules.mk +++ b/keyboards/25keys/zinc/keymaps/ginjake/rules.mk @@ -99,9 +99,7 @@ ifeq ($(strip $(IOS_DEVICE_ENABLE)), yes) endif ifeq ($(strip $(LED_ANIMATIONS)), yes) -# OPT_DEFS += -DRGBLIGHT_ANIMATIONS OPT_DEFS += -DLED_ANIMATIONS - endif # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE diff --git a/keyboards/25keys/zinc/keymaps/monks/rules.mk b/keyboards/25keys/zinc/keymaps/monks/rules.mk index 46646f919c..d37d2b6d1f 100644 --- a/keyboards/25keys/zinc/keymaps/monks/rules.mk +++ b/keyboards/25keys/zinc/keymaps/monks/rules.mk @@ -99,9 +99,7 @@ ifeq ($(strip $(IOS_DEVICE_ENABLE)), yes) endif ifeq ($(strip $(LED_ANIMATIONS)), yes) -# OPT_DEFS += -DRGBLIGHT_ANIMATIONS OPT_DEFS += -DLED_ANIMATIONS - endif # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE diff --git a/keyboards/25keys/zinc/keymaps/toshi0383/rules.mk b/keyboards/25keys/zinc/keymaps/toshi0383/rules.mk index 9fef6963a1..8fe697932e 100644 --- a/keyboards/25keys/zinc/keymaps/toshi0383/rules.mk +++ b/keyboards/25keys/zinc/keymaps/toshi0383/rules.mk @@ -113,9 +113,7 @@ ifeq ($(strip $(IOS_DEVICE_ENABLE)), yes) endif ifeq ($(strip $(LED_ANIMATIONS)), yes) -# OPT_DEFS += -DRGBLIGHT_ANIMATIONS OPT_DEFS += -DLED_ANIMATIONS - endif ifeq ($(strip $(RGB_MATRIX_SPLIT_RIGHT)), yes) diff --git a/keyboards/25keys/zinc/keymaps/via/config.h b/keyboards/25keys/zinc/keymaps/via/config.h index 233977feaf..58c1081559 100644 --- a/keyboards/25keys/zinc/keymaps/via/config.h +++ b/keyboards/25keys/zinc/keymaps/via/config.h @@ -28,14 +28,14 @@ along with this program. If not, see . // place overrides here // Selection of RGBLIGHT MODE to use. #if defined(LED_ANIMATIONS) - #define RGBLIGHT_ANIMATIONS -// #define RGBLIGHT_EFFECT_BREATHINGtt -// #define RGBLIGHT_EFFECT_RAINBOW_MOOD -// #define RGBLIGHT_EFFECT_RAINBOW_SWIRL -// #define RGBLIGHT_EFFECT_SNAKE -// #define RGBLIGHT_EFFECT_KNIGHT -// #define RGBLIGHT_EFFECT_CHRISTMAS -// #define RGBLIGHT_EFFECT_STATIC_GRADIENT -// #define RGBLIGHT_EFFECT_RGB_TEST -// #define RGBLIGHT_EFFECT_ALTERNATING +# define RGBLIGHT_EFFECT_BREATHING +# define RGBLIGHT_EFFECT_RAINBOW_MOOD +# define RGBLIGHT_EFFECT_RAINBOW_SWIRL +# define RGBLIGHT_EFFECT_SNAKE +# define RGBLIGHT_EFFECT_KNIGHT +# define RGBLIGHT_EFFECT_CHRISTMAS +# define RGBLIGHT_EFFECT_STATIC_GRADIENT +# define RGBLIGHT_EFFECT_RGB_TEST +# define RGBLIGHT_EFFECT_ALTERNATING +# define RGBLIGHT_EFFECT_TWINKLE #endif diff --git a/keyboards/25keys/zinc/keymaps/via/rules.mk b/keyboards/25keys/zinc/keymaps/via/rules.mk index 0ea4be9c04..dfd1d5bfeb 100644 --- a/keyboards/25keys/zinc/keymaps/via/rules.mk +++ b/keyboards/25keys/zinc/keymaps/via/rules.mk @@ -98,9 +98,7 @@ ifeq ($(strip $(IOS_DEVICE_ENABLE)), yes) endif ifeq ($(strip $(LED_ANIMATIONS)), yes) -# OPT_DEFS += -DRGBLIGHT_ANIMATIONS OPT_DEFS += -DLED_ANIMATIONS - endif ifeq ($(strip $(RGB_MATRIX_SPLIT_RIGHT)), yes) diff --git a/keyboards/25keys/zinc/rev1/post_config.h b/keyboards/25keys/zinc/rev1/post_config.h index b0254f6bab..54608f8f67 100644 --- a/keyboards/25keys/zinc/rev1/post_config.h +++ b/keyboards/25keys/zinc/rev1/post_config.h @@ -16,7 +16,7 @@ along with this program. If not, see . */ // RGB LED support -//#define RGBLIGHT_ANIMATIONS : see ./rules.mk: LED_ANIMATIONS = yes or no +// see ./rules.mk: LED_ANIMATIONS = yes or no // see ./rules.mk: LED_BACK_ENABLE or LED_UNDERGLOW_ENABLE set yes #ifdef RGBLIGHT_ENABLE #define RGBLIGHT_SPLIT diff --git a/keyboards/25keys/zinc/reva/post_config.h b/keyboards/25keys/zinc/reva/post_config.h index b0254f6bab..54608f8f67 100644 --- a/keyboards/25keys/zinc/reva/post_config.h +++ b/keyboards/25keys/zinc/reva/post_config.h @@ -16,7 +16,7 @@ along with this program. If not, see . */ // RGB LED support -//#define RGBLIGHT_ANIMATIONS : see ./rules.mk: LED_ANIMATIONS = yes or no +// see ./rules.mk: LED_ANIMATIONS = yes or no // see ./rules.mk: LED_BACK_ENABLE or LED_UNDERGLOW_ENABLE set yes #ifdef RGBLIGHT_ENABLE #define RGBLIGHT_SPLIT -- cgit v1.2.3 From 5e4b076af3c99d36632d6b92f3ddd046f38a01af Mon Sep 17 00:00:00 2001 From: Ryan Date: Sun, 16 Oct 2022 08:29:43 +1100 Subject: Remove legacy keycodes, part 5 (#18710) * `KC_SLCK` -> `KC_SCRL` * `KC_NLCK` -> `KC_NUM` --- keyboards/25keys/zinc/keymaps/default/keymap.c | 2 +- keyboards/25keys/zinc/keymaps/ginjake/keymap.c | 2 +- keyboards/25keys/zinc/keymaps/monks/keymap.c | 2 +- keyboards/25keys/zinc/keymaps/via/keymap.c | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'keyboards/25keys/zinc') diff --git a/keyboards/25keys/zinc/keymaps/default/keymap.c b/keyboards/25keys/zinc/keymaps/default/keymap.c index 5c3fcd53de..4673b8071b 100644 --- a/keyboards/25keys/zinc/keymaps/default/keymap.c +++ b/keyboards/25keys/zinc/keymaps/default/keymap.c @@ -146,7 +146,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_ADJUST] = LAYOUT_ortho_4x12( _______, QK_BOOT, RGBRST, _______, _______, _______, _______, QWERTY, COLEMAK, DVORAK, _______, KC_INS, - _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, AG_NORM, AG_SWAP, KC_MINS, KC_EQL, KC_PSCR, KC_SLCK, KC_PAUS, + _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, AG_NORM, AG_SWAP, KC_MINS, KC_EQL, KC_PSCR, KC_SCRL, KC_PAUS, RGB_RMOD,RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, KC_PGUP, _______, _______, _______, _______, EISU, EISU, EISU, KANA, KANA, KANA, KC_HOME, KC_PGDN, KC_END ) diff --git a/keyboards/25keys/zinc/keymaps/ginjake/keymap.c b/keyboards/25keys/zinc/keymaps/ginjake/keymap.c index 7bf5974974..88ada9fc93 100644 --- a/keyboards/25keys/zinc/keymaps/ginjake/keymap.c +++ b/keyboards/25keys/zinc/keymaps/ginjake/keymap.c @@ -170,7 +170,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { \ */ [_ADJUST] = LAYOUT_ortho_4x12( \ _______, QK_BOOT, RGBRST, _______, _______, _______, _______, QWERTY, COLEMAK, DVORAK, _______, KC_INS, \ - AQOURS, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, AG_NORM, AG_SWAP, KC_MINS, KC_EQL, KC_PSCR, KC_SLCK, KC_PAUS,\ + AQOURS, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, AG_NORM, AG_SWAP, KC_MINS, KC_EQL, KC_PSCR, KC_SCRL, KC_PAUS,\ _______, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______,\ _______, _______, _______, EISU, EISU, EISU, KANA, KANA, KC_HOME, KC_PGDN, KC_PGUP, KC_END\ ) diff --git a/keyboards/25keys/zinc/keymaps/monks/keymap.c b/keyboards/25keys/zinc/keymaps/monks/keymap.c index d0fae14177..d4c092595c 100644 --- a/keyboards/25keys/zinc/keymaps/monks/keymap.c +++ b/keyboards/25keys/zinc/keymaps/monks/keymap.c @@ -110,7 +110,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { \ */ [_ADJUST] = LAYOUT_ortho_4x12( \ _______, QK_BOOT, RGBRST, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS, \ - _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, AG_NORM, AG_SWAP, KC_MINS, KC_EQL, KC_PSCR, KC_SLCK, KC_PAUS,\ + _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, AG_NORM, AG_SWAP, KC_MINS, KC_EQL, KC_PSCR, KC_SCRL, KC_PAUS,\ _______, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, KC_PGUP, _______,\ _______, _______, _______, EISU, EISU, EISU, KANA, KANA, KANA, KC_HOME, KC_PGDN, KC_END\ ) diff --git a/keyboards/25keys/zinc/keymaps/via/keymap.c b/keyboards/25keys/zinc/keymaps/via/keymap.c index 29a4bdc5bd..22e362c257 100644 --- a/keyboards/25keys/zinc/keymaps/via/keymap.c +++ b/keyboards/25keys/zinc/keymaps/via/keymap.c @@ -135,14 +135,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_ADJUST] = LAYOUT_ortho_4x12( _______, QK_BOOT, RGBRST, _______, _______, _______, _______, QWERTY, _______, _______, _______, KC_INS, - _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, AG_NORM, AG_SWAP, KC_MINS, KC_EQL, KC_PSCR, KC_SLCK, KC_PAUS, + _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, AG_NORM, AG_SWAP, KC_MINS, KC_EQL, KC_PSCR, KC_SCRL, KC_PAUS, RGB_RMOD,RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, KC_PGUP, _______, _______, _______, _______, EISU, EISU, EISU, KANA, KANA, KANA, KC_HOME, KC_PGDN, KC_END ), [_ADJUST2] = LAYOUT_ortho_4x12( _______, QK_BOOT, RGBRST, _______, _______, _______, _______, QWERTY, _______, _______, _______, KC_INS, - _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, AG_NORM, AG_SWAP, KC_MINS, KC_EQL, KC_PSCR, KC_SLCK, KC_PAUS, + _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, AG_NORM, AG_SWAP, KC_MINS, KC_EQL, KC_PSCR, KC_SCRL, KC_PAUS, RGB_RMOD,RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, KC_PGUP, _______, _______, _______, _______, EISU, EISU, EISU, KANA, KANA, KANA, KC_HOME, KC_PGDN, KC_END ) -- cgit v1.2.3 From fe577daf966f34ae056f685c5a260473635c5ec8 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Mon, 21 Nov 2022 02:03:38 +0000 Subject: Remove .noci functionality (#19122) --- keyboards/25keys/zinc/.noci | 0 keyboards/25keys/zinc/rev1/.noci | 0 keyboards/25keys/zinc/reva/.noci | 0 3 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 keyboards/25keys/zinc/.noci delete mode 100644 keyboards/25keys/zinc/rev1/.noci delete mode 100644 keyboards/25keys/zinc/reva/.noci (limited to 'keyboards/25keys/zinc') diff --git a/keyboards/25keys/zinc/.noci b/keyboards/25keys/zinc/.noci deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/keyboards/25keys/zinc/rev1/.noci b/keyboards/25keys/zinc/rev1/.noci deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/keyboards/25keys/zinc/reva/.noci b/keyboards/25keys/zinc/reva/.noci deleted file mode 100644 index e69de29bb2..0000000000 -- cgit v1.2.3