summaryrefslogtreecommitdiff
path: root/keyboards/25keys/zinc
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/25keys/zinc')
-rw-r--r--keyboards/25keys/zinc/keymaps/default/keymap.c10
-rw-r--r--keyboards/25keys/zinc/keymaps/default/rules.mk2
-rw-r--r--keyboards/25keys/zinc/keymaps/ginjake/keymap.c12
-rw-r--r--keyboards/25keys/zinc/keymaps/ginjake/rules.mk2
-rw-r--r--keyboards/25keys/zinc/keymaps/monks/keymap.c10
-rw-r--r--keyboards/25keys/zinc/keymaps/monks/rules.mk2
-rw-r--r--keyboards/25keys/zinc/keymaps/toshi0383/keymap.c6
-rw-r--r--keyboards/25keys/zinc/keymaps/toshi0383/rules.mk2
-rw-r--r--keyboards/25keys/zinc/keymaps/via/config.h20
-rw-r--r--keyboards/25keys/zinc/keymaps/via/keymap.c12
-rw-r--r--keyboards/25keys/zinc/keymaps/via/rules.mk2
-rw-r--r--keyboards/25keys/zinc/rev1/config.h1
-rw-r--r--keyboards/25keys/zinc/rev1/post_config.h2
-rw-r--r--keyboards/25keys/zinc/reva/config.h1
-rw-r--r--keyboards/25keys/zinc/reva/post_config.h2
15 files changed, 37 insertions, 49 deletions
diff --git a/keyboards/25keys/zinc/keymaps/default/keymap.c b/keyboards/25keys/zinc/keymaps/default/keymap.c
index 925d252247..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
)
@@ -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/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/keymap.c b/keyboards/25keys/zinc/keymaps/ginjake/keymap.c
index 93dfc590e9..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\
)
@@ -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;
@@ -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;
}
}
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/keymap.c b/keyboards/25keys/zinc/keymaps/monks/keymap.c
index 8670a58efb..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\
)
@@ -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/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/keymap.c b/keyboards/25keys/zinc/keymaps/toshi0383/keymap.c
index 122ecd3611..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, _______, _______, _______, _______
@@ -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/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 <http://www.gnu.org/licenses/>.
// 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/keymap.c b/keyboards/25keys/zinc/keymaps/via/keymap.c
index 22c08b0abb..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
)
@@ -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:
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/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 <http://www.gnu.org/licenses/>.
#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/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 <http://www.gnu.org/licenses/>.
*/
// 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/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 <http://www.gnu.org/licenses/>.
#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/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 <http://www.gnu.org/licenses/>.
*/
// 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-19 15:36:16 +0000