aboutsummaryrefslogtreecommitdiff
path: root/keyboards/zinc/keymaps
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/zinc/keymaps')
-rw-r--r--keyboards/zinc/keymaps/default/config.h2
-rw-r--r--keyboards/zinc/keymaps/default/keymap.c26
-rw-r--r--keyboards/zinc/keymaps/default/readme_en.md131
-rw-r--r--keyboards/zinc/keymaps/default/readme_jp.md48
-rw-r--r--keyboards/zinc/keymaps/default/rules.mk57
-rw-r--r--keyboards/zinc/keymaps/ginjake/config.h2
-rw-r--r--keyboards/zinc/keymaps/ginjake/rules.mk48
-rw-r--r--keyboards/zinc/keymaps/monks/config.h2
-rw-r--r--keyboards/zinc/keymaps/monks/keymap.c3
-rw-r--r--keyboards/zinc/keymaps/monks/readme_jp.md2
-rw-r--r--keyboards/zinc/keymaps/monks/rules.mk50
-rw-r--r--keyboards/zinc/keymaps/toshi0383/config.h2
-rw-r--r--keyboards/zinc/keymaps/toshi0383/rules.mk67
13 files changed, 367 insertions, 73 deletions
diff --git a/keyboards/zinc/keymaps/default/config.h b/keyboards/zinc/keymaps/default/config.h
index 4dcb0724f..2185dc9eb 100644
--- a/keyboards/zinc/keymaps/default/config.h
+++ b/keyboards/zinc/keymaps/default/config.h
@@ -20,8 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
20*/ 20*/
21 21
22#pragma once 22#pragma once
23// if you need more program area, try uncomment follow line
24#include "serial_config_simpleapi.h"
25 23
26// place overrides here 24// place overrides here
27// Selection of RGBLIGHT MODE to use. 25// Selection of RGBLIGHT MODE to use.
diff --git a/keyboards/zinc/keymaps/default/keymap.c b/keyboards/zinc/keymaps/default/keymap.c
index 0f08d21ee..cd1bf0328 100644
--- a/keyboards/zinc/keymaps/default/keymap.c
+++ b/keyboards/zinc/keymaps/default/keymap.c
@@ -139,7 +139,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { \
139 * |------+------+------+------+------+------| |------+------+------+------+------+------| 139 * |------+------+------+------+------+------| |------+------+------+------+------+------|
140 * | |RGB ON| HUE+ | SAT+ | VAL+ | Mac | | Win | - | = |Print |ScLock|Pause | 140 * | |RGB ON| HUE+ | SAT+ | VAL+ | Mac | | Win | - | = |Print |ScLock|Pause |
141 * |------+------+------+------+------+------| |------+------+------+------+------+------| 141 * |------+------+------+------+------+------| |------+------+------+------+------+------|
142 * | | MODE | HUE- | SAT- | VAL- | | | | | | | | | 142 * |MODE R| MODE | HUE- | SAT- | VAL- | | | | | | |PageUp| |
143 * |------+------+------+------+------+------| |------+------+------+------+------+------| 143 * |------+------+------+------+------+------| |------+------+------+------+------+------|
144 * | | | | EISU | EISU | EISU | | KANA | KANA | Home |PageDn|PageUp| End | 144 * | | | | EISU | EISU | EISU | | KANA | KANA | Home |PageDn|PageUp| End |
145 * `-----------------------------------------' `-----------------------------------------' 145 * `-----------------------------------------' `-----------------------------------------'
@@ -147,13 +147,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { \
147 [_ADJUST] = LAYOUT_ortho_4x12( \ 147 [_ADJUST] = LAYOUT_ortho_4x12( \
148 _______, RESET, RGBRST, _______, _______, _______, _______, QWERTY, COLEMAK, DVORAK, _______, KC_INS, \ 148 _______, RESET, RGBRST, _______, _______, _______, _______, QWERTY, COLEMAK, DVORAK, _______, KC_INS, \
149 _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, AG_NORM, AG_SWAP, KC_MINS, KC_EQL, KC_PSCR, KC_SLCK, KC_PAUS,\ 149 _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, AG_NORM, AG_SWAP, KC_MINS, KC_EQL, KC_PSCR, KC_SLCK, KC_PAUS,\
150 _______, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______,\ 150 RGB_RMOD,RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, KC_PGUP, _______,\
151 _______, _______, _______, EISU, EISU, EISU, KANA, KANA, KC_HOME, KC_PGDN, KC_PGUP, KC_END\ 151 _______, _______, _______, EISU, EISU, EISU, KANA, KANA, KANA, KC_HOME, KC_PGDN, KC_END\
152 ) 152 )
153}; 153};
154 154
155// define variables for reactive RGB 155// define variables for reactive RGB
156bool TOG_STATUS = false; 156bool TOG_STATUS = false;
157 157
158// Setting ADJUST layer RGB back to default 158// Setting ADJUST layer RGB back to default
159void update_tri_layer_RGB(uint8_t layer1, uint8_t layer2, uint8_t layer3) { 159void update_tri_layer_RGB(uint8_t layer1, uint8_t layer2, uint8_t layer3) {
@@ -211,7 +211,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
211 } 211 }
212 return false; 212 return false;
213 break; 213 break;
214 214
215 case RAISE: 215 case RAISE:
216 if (record->event.pressed) { 216 if (record->event.pressed) {
217 //not sure how to have keyboard check mode and set it to a variable, so my work around 217 //not sure how to have keyboard check mode and set it to a variable, so my work around
@@ -244,16 +244,28 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
244 } 244 }
245 return false; 245 return false;
246 break; 246 break;
247
247 //led operations - RGB mode change now updates the RGB_current_mode to allow the right RGB mode to be set after reactive keys are released 248 //led operations - RGB mode change now updates the RGB_current_mode to allow the right RGB mode to be set after reactive keys are released
249 case RGB_RMOD:
250 #if defined(RGBLIGHT_ENABLE)
251 if (record->event.pressed) {
252 rgblight_mode_noeeprom(RGB_current_config.mode);
253 rgblight_step_reverse();
254 RGB_current_config.mode = rgblight_config.mode;
255 }
256 return false;
257 #endif
258 break;
259
248 case RGB_MOD: 260 case RGB_MOD:
249 #ifdef RGBLIGHT_ENABLE 261 #if defined(RGBLIGHT_ENABLE)
250 if (record->event.pressed) { 262 if (record->event.pressed) {
251 rgblight_mode_noeeprom(RGB_current_config.mode); 263 rgblight_mode_noeeprom(RGB_current_config.mode);
252 rgblight_step(); 264 rgblight_step();
253 RGB_current_config.mode = rgblight_config.mode; 265 RGB_current_config.mode = rgblight_config.mode;
254 } 266 }
255 #endif
256 return false; 267 return false;
268 #endif
257 break; 269 break;
258 270
259 case EISU: 271 case EISU:
diff --git a/keyboards/zinc/keymaps/default/readme_en.md b/keyboards/zinc/keymaps/default/readme_en.md
new file mode 100644
index 000000000..6447e96ed
--- /dev/null
+++ b/keyboards/zinc/keymaps/default/readme_en.md
@@ -0,0 +1,131 @@
1# The Default Zinc Layout
2## layout
3
4### Qwerty
5
6```
7 ,-----------------------------------------. ,-----------------------------------------.
8 | Tab | Q | W | E | R | T | | Y | U | I | O | P | Bksp |
9 |------+------+------+------+------+------| |------+------+------+------+------+------|
10 | Ctrl | A | S | D | F | G | | H | J | K | L | ; | ' |
11 |------+------+------+------+------+------| |------+------+------+------+------+------|
12 | Shift| Z | X | C | V | B | | N | M | , | . | / |Enter |
13 |------+------+------+------+------+------| |------+------+------+------+------+------|
14 | Esc | Fn | Alt | Win |Lower |Space | | Space| Raise| Left | Down | Up | Right|
15 `------------------------------------------ ------------------------------------------'
16```
17
18### Colemak
19
20```
21 ,-----------------------------------------. ,-----------------------------------------.
22 | Tab | Q | W | F | P | G | | J | L | U | Y | ; | Bksp |
23 |------+------+------+------+------+------| |------+------+------+------+------+------|
24 | Ctrl | A | R | S | T | D | | H | N | E | I | O | ' |
25 |------+------+------+------+------+------| |------+------+------+------+------+------|
26 | Shift| Z | X | C | V | B | | K | M | , | . | / |Enter |
27 |------+------+------+------+------+------| |------+------+------+------+------+------|
28 | Esc |ADJUST| Alt | Win |LOWER |Space | | Space| RAISE| Left | Down | Up | Right|
29 `------------------------------------------ ------------------------------------------'
30```
31
32### Dvorak
33
34```
35 ,-----------------------------------------. ,-----------------------------------------.
36 | Tab | ' | , | . | P | Y | | F | G | C | R | L | Del |
37 |------+------+------+------+------+------| |------+------+------+------+------+------|
38 | Ctrl | A | O | E | U | I | | D | H | T | N | S | / |
39 |------+------+------+------+------+------| |------+------+------+------+------+------|
40 | Shift| ; | Q | J | K | X | | B | M | W | V | Z |Enter |
41 |------+------+------+------+------+------| |------+------+------+------+------+------|
42 | Esc |ADJUST| Alt | Win |LOWER |Space | | Space| RAISE| Left | Down | Up | Right|
43 `-----------------------------------------' `-----------------------------------------'
44```
45
46### Lower
47```
48 ,-----------------------------------------. ,-----------------------------------------.
49 | ~ | ! | @ | # | $ | % | | ^ | & | * | ( | ) | |
50 |------+------+------+------+------+------| |------+------+------+------+------+------|
51 | | | | | | | | - | _ | + | { | } | | |
52 |------+------+------+------+------+------| |------+------+------+------+------+------|
53 | | | | | | | | | | | Home | End | |
54 |------+------+------+------+------+------| |------+------+------+------+------+------|
55 | | | | | | | | | | Next | Vol- | Vol+ | Play |
56 `-----------------------------------------' `-----------------------------------------'
57```
58
59### RAISE
60```
61 ,-----------------------------------------. ,-----------------------------------------.
62 | ` | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | Del |
63 |------+------+------+------+------+------| |------+------+------+------+------+------|
64 | | F1 | F2 | F3 | F4 | F5 | | F6 | - | = | [ | ] | \ |
65 |------+------+------+------+------+------| |------+------+------+------+------+------|
66 | | F7 | F8 | F9 | F10 | F11 | | F12 | | | | |
67 |------+------+------+------+------+------| |------+------+------+------+------+------|
68 | | | | | | | | | | Next | Vol- | Vol+ | Play |
69 `-----------------------------------------' `-----------------------------------------'
70```
71
72### Adjust (Lower + Raise)
73```
74 ,-----------------------------------------. ,-----------------------------------------.
75 | | Reset|RGBRST|Aud on|Audoff| | | |Qwerty|Colemk|Dvorak| | Ins |
76 |------+------+------+------+------+------| |------+------+------+------+------+------|
77 | |RGB ON| HUE+ | SAT+ | VAL+ | Mac | | Win | - | = |Print |ScLock|Pause |
78 |------+------+------+------+------+------| |------+------+------+------+------+------|
79 |MODE R|RGBMOD| HUE- | SAT- | VAL- | | | | | | |PageUp| |
80 |------+------+------+------+------+------| |------+------+------+------+------+------|
81 | | | | EISU | EISU | EISU | | KANA | KANA | KANA | Home |PageDn| End |
82 `-----------------------------------------' `-----------------------------------------'
83```
84
85## Compile
86
87go to qmk top directory.
88
89```
90$ cd qmk_firmware
91```
92make with `zinc:<keymap_name>`
93
94```
95$ make zinc:default
96```
97
98To make and flash with `:flash`
99
100```
101$ make zinc:default:flash
102```
103
104
105## Customize
106
107You can customize from the command line.
108
109```
110# Zinc keyboard 'default' keymap: convenient command line option
111make ZINC=<options> zinc:defualt
112# option= back | under | both | cont | na | ios
113# ex.
114# make ZINC=under zinc:defualt
115# make ZINC=under,ios zinc:defualt
116# make ZINC=back zinc:default
117# make ZINC=back,na zinc:default
118# make ZINC=back,ios zinc:default
119```
120
121Or edit `qmk_firmware/keyboards/zinc/rev1/keymaps/~/rules.mk` directly.
122
123```
124# Zinc keyboard customize
125LED_BACK_ENABLE = no # LED backlight (Enable SK6812mini backlight)
126LED_UNDERGLOW_ENABLE = no # LED underglow (Enable WS2812 RGB underlight)
127LED_BOTH_ENABLE = no # LED backlight and underglow
128LED_RGB_CONT = no # LED continuous backlight or/and underglow between left Zinc and right Zinc
129LED_ANIMATIONS = yes # LED animations
130IOS_DEVICE_ENABLE = no # connect to IOS device (iPad,iPhone)
131```
diff --git a/keyboards/zinc/keymaps/default/readme_jp.md b/keyboards/zinc/keymaps/default/readme_jp.md
index dfedb37c1..8132f5036 100644
--- a/keyboards/zinc/keymaps/default/readme_jp.md
+++ b/keyboards/zinc/keymaps/default/readme_jp.md
@@ -43,6 +43,44 @@
43 `-----------------------------------------' `-----------------------------------------' 43 `-----------------------------------------' `-----------------------------------------'
44``` 44```
45 45
46 ### Lower
47```
48 ,-----------------------------------------. ,-----------------------------------------.
49 | ~ | ! | @ | # | $ | % | | ^ | & | * | ( | ) | |
50 |------+------+------+------+------+------| |------+------+------+------+------+------|
51 | | | | | | | | - | _ | + | { | } | | |
52 |------+------+------+------+------+------| |------+------+------+------+------+------|
53 | | | | | | | | | | | Home | End | |
54 |------+------+------+------+------+------| |------+------+------+------+------+------|
55 | | | | | | | | | | Next | Vol- | Vol+ | Play |
56 `-----------------------------------------' `-----------------------------------------'
57```
58
59### RAISE
60```
61 ,-----------------------------------------. ,-----------------------------------------.
62 | ` | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | Del |
63 |------+------+------+------+------+------| |------+------+------+------+------+------|
64 | | F1 | F2 | F3 | F4 | F5 | | F6 | - | = | [ | ] | \ |
65 |------+------+------+------+------+------| |------+------+------+------+------+------|
66 | | F7 | F8 | F9 | F10 | F11 | | F12 | | | | |
67 |------+------+------+------+------+------| |------+------+------+------+------+------|
68 | | | | | | | | | | Next | Vol- | Vol+ | Play |
69 `-----------------------------------------' `-----------------------------------------'
70```
71
72### Adjust (Lower + Raise)
73```
74 ,-----------------------------------------. ,-----------------------------------------.
75 | | Reset|RGBRST|Aud on|Audoff| | | |Qwerty|Colemk|Dvorak| | Ins |
76 |------+------+------+------+------+------| |------+------+------+------+------+------|
77 | |RGB ON| HUE+ | SAT+ | VAL+ | Mac | | Win | - | = |Print |ScLock|Pause |
78 |------+------+------+------+------+------| |------+------+------+------+------+------|
79 |MODE R|RGBMOD| HUE- | SAT- | VAL- | | | | | | |PageUp| |
80 |------+------+------+------+------+------| |------+------+------+------+------+------|
81 | | | | EISU | EISU | EISU | | KANA | KANA | KANA | Home |PageDn| End |
82 `-----------------------------------------' `-----------------------------------------'
83```
46 84
47## コンパイルの仕方 85## コンパイルの仕方
48 86
@@ -76,7 +114,7 @@ $ make zinc:default:clean
76``` 114```
77# Zinc keyboard 'default' keymap: convenient command line option 115# Zinc keyboard 'default' keymap: convenient command line option
78make ZINC=<options> zinc:defualt 116make ZINC=<options> zinc:defualt
79# option= back | under | na | ios 117# option= back | under | both | cont | na | ios
80# ex. 118# ex.
81# make ZINC=under zinc:defualt 119# make ZINC=under zinc:defualt
82# make ZINC=under,ios zinc:defualt 120# make ZINC=under,ios zinc:defualt
@@ -85,16 +123,16 @@ make ZINC=<options> zinc:defualt
85# make ZINC=back,ios zinc:default 123# make ZINC=back,ios zinc:default
86``` 124```
87 125
88あるいは`qmk_firmware/keyboards/zinc/rev1/keymaps/default/rules.mk` の以下の部分を直接編集して機能を有効化してください。 126あるいは`qmk_firmware/keyboards/zinc/rev1/keymaps/~/rules.mk` の以下の部分を直接編集して機能を有効化してください。
89 127
90``` 128```
91# Zinc keyboard customize 129# Zinc keyboard customize
92LED_BACK_ENABLE = no # LED backlight (Enable SK6812mini backlight) 130LED_BACK_ENABLE = no # LED backlight (Enable SK6812mini backlight)
93LED_UNDERGLOW_ENABLE = no # LED underglow (Enable WS2812 RGB underlight) 131LED_UNDERGLOW_ENABLE = no # LED underglow (Enable WS2812 RGB underlight)
132LED_BOTH_ENABLE = no # LED backlight and underglow
133LED_RGB_CONT = no # LED continuous backlight or/and underglow between left Zinc and right Zinc
94LED_ANIMATIONS = yes # LED animations 134LED_ANIMATIONS = yes # LED animations
95IOS_DEVICE_ENABLE = no # connect to IOS device (iPad,iPhone) 135IOS_DEVICE_ENABLE = no # connect to IOS device (iPad,iPhone)
96
97
98``` 136```
99 137
100## RGB backlight を有効にする 138## RGB backlight を有効にする
@@ -120,4 +158,4 @@ RBG Underglow や RGBバックライトの輝度を抑えて、iPad, iPhone に
120 158
121``` 159```
122IOS_DEVICE_ENABLE = no # connect to IOS device (iPad,iPhone) 160IOS_DEVICE_ENABLE = no # connect to IOS device (iPad,iPhone)
123``` \ No newline at end of file 161```
diff --git a/keyboards/zinc/keymaps/default/rules.mk b/keyboards/zinc/keymaps/default/rules.mk
index c980f7d00..32e0f2161 100644
--- a/keyboards/zinc/keymaps/default/rules.mk
+++ b/keyboards/zinc/keymaps/default/rules.mk
@@ -20,6 +20,9 @@ define ZINC_CUSTOMISE_MSG
20 $(info Zinc customize) 20 $(info Zinc customize)
21 $(info - LED_BACK_ENABLE=$(LED_BACK_ENABLE)) 21 $(info - LED_BACK_ENABLE=$(LED_BACK_ENABLE))
22 $(info - LED_UNDERGLOW_ENABLE=$(LED_UNDERGLOW_ENABLE)) 22 $(info - LED_UNDERGLOW_ENABLE=$(LED_UNDERGLOW_ENABLE))
23 $(info - LED_BOTH_ENABLE=$(LED_BOTH_ENABLE))
24 $(info - LED_RGB_CONT=$(LED_RGB_CONT))
25 $(info - RGB_MATRIX=$(RGB_MATRIX))
23 $(info - LED_ANIMATION=$(LED_ANIMATIONS)) 26 $(info - LED_ANIMATION=$(LED_ANIMATIONS))
24 $(info - IOS_DEVICE_ENABLE=$(IOS_DEVICE_ENABLE)) 27 $(info - IOS_DEVICE_ENABLE=$(IOS_DEVICE_ENABLE))
25endef 28endef
@@ -27,6 +30,10 @@ endef
27# Zinc keyboard customize 30# Zinc keyboard customize
28LED_BACK_ENABLE = no # LED backlight (Enable SK6812mini backlight) 31LED_BACK_ENABLE = no # LED backlight (Enable SK6812mini backlight)
29LED_UNDERGLOW_ENABLE = no # LED underglow (Enable WS2812 RGB underlight) 32LED_UNDERGLOW_ENABLE = no # LED underglow (Enable WS2812 RGB underlight)
33LED_BOTH_ENABLE = no # LED backlight and underglow
34LED_RGB_CONT = no # LED continuous backlight or/and underglow between left Zinc and right Zinc
35RGB_MATRIX = no # RGB LED Matrix
36RGB_MATRIX_SPLIT_RIGHT = no # RGB Matrix for RIGHT Hand
30LED_ANIMATIONS = yes # LED animations 37LED_ANIMATIONS = yes # LED animations
31IOS_DEVICE_ENABLE = no # connect to IOS device (iPad,iPhone) 38IOS_DEVICE_ENABLE = no # connect to IOS device (iPad,iPhone)
32Link_Time_Optimization = no # if firmware size over limit, try this option 39Link_Time_Optimization = no # if firmware size over limit, try this option
@@ -36,7 +43,7 @@ Link_Time_Optimization = no # if firmware size over limit, try this option
36 43
37### Zinc keyboard 'default' keymap: convenient command line option 44### Zinc keyboard 'default' keymap: convenient command line option
38## make ZINC=<options> zinc:defualt 45## make ZINC=<options> zinc:defualt
39## option= back | under | na | ios 46## option= back | under | both | cont | matrix | na | ios
40## ex. 47## ex.
41## make ZINC=under zinc:defualt 48## make ZINC=under zinc:defualt
42## make ZINC=under,ios zinc:defualt 49## make ZINC=under,ios zinc:defualt
@@ -47,9 +54,22 @@ Link_Time_Optimization = no # if firmware size over limit, try this option
47ifneq ($(strip $(ZINC)),) 54ifneq ($(strip $(ZINC)),)
48 ifeq ($(findstring back,$(ZINC)), back) 55 ifeq ($(findstring back,$(ZINC)), back)
49 LED_BACK_ENABLE = yes 56 LED_BACK_ENABLE = yes
50 else ifeq ($(findstring under,$(ZINC)), under) 57 endif
58 ifeq ($(findstring under,$(ZINC)), under)
51 LED_UNDERGLOW_ENABLE = yes 59 LED_UNDERGLOW_ENABLE = yes
52 endif 60 endif
61 ifeq ($(findstring both,$(ZINC)), both)
62 LED_BOTH_ENABLE = yes
63 endif
64 ifeq ($(findstring cont,$(ZINC)), cont)
65 LED_RGB_CONT = yes
66 endif
67 ifeq ($(findstring matrix,$(ZINC)), matrix)
68 RGB_MATRIX = yes
69 endif
70 ifeq ($(findstring right,$(ZINC)), right)
71 RGB_MATRIX_SPLIT_RIGHT = yes
72 endif
53 ifeq ($(findstring na,$(ZINC)), na) 73 ifeq ($(findstring na,$(ZINC)), na)
54 LED_ANIMATIONS = no 74 LED_ANIMATIONS = no
55 endif 75 endif
@@ -62,10 +82,11 @@ endif
62 82
63ifeq ($(strip $(LED_BACK_ENABLE)), yes) 83ifeq ($(strip $(LED_BACK_ENABLE)), yes)
64 RGBLIGHT_ENABLE = yes 84 RGBLIGHT_ENABLE = yes
65 OPT_DEFS += -DRGBLED_BACK
66 ifeq ($(strip $(LED_UNDERGLOW_ENABLE)), yes) 85 ifeq ($(strip $(LED_UNDERGLOW_ENABLE)), yes)
67 $(eval $(call ZINC_CUSTOMISE_MSG)) 86 OPT_DEFS += -DRGBLED_BOTH
68 $(error LED_BACK_ENABLE and LED_UNDERGLOW_ENABLE both 'yes') 87 $(info LED_BOTH_ENABLE option is enabled instead of LED_BACK_ENABLE and LED_UNDERGLOW_ENABLE)
88 else
89 OPT_DEFS += -DRGBLED_BACK
69 endif 90 endif
70else ifeq ($(strip $(LED_UNDERGLOW_ENABLE)), yes) 91else ifeq ($(strip $(LED_UNDERGLOW_ENABLE)), yes)
71 RGBLIGHT_ENABLE = yes 92 RGBLIGHT_ENABLE = yes
@@ -73,18 +94,36 @@ else
73 RGBLIGHT_ENABLE = no 94 RGBLIGHT_ENABLE = no
74endif 95endif
75 96
97ifeq ($(strip $(LED_BOTH_ENABLE)), yes)
98 RGBLIGHT_ENABLE = yes
99 OPT_DEFS += -DRGBLED_BOTH
100endif
101
102ifeq ($(strip $(LED_RGB_CONT)), yes)
103 OPT_DEFS += -DRGBLED_CONT
104endif
105
106ifeq ($(strip $(RGB_MATRIX)), yes)
107 RGBLIGHT_ENABLE = no
108 RGB_MATRIX_ENABLE = WS2812
109endif
110
76ifeq ($(strip $(IOS_DEVICE_ENABLE)), yes) 111ifeq ($(strip $(IOS_DEVICE_ENABLE)), yes)
77 OPT_DEFS += -DIOS_DEVICE_ENABLE 112 OPT_DEFS += -DIOS_DEVICE_ENABLE
78endif 113endif
79 114
80ifeq ($(strip $(LED_ANIMATIONS)), yes) 115ifeq ($(strip $(LED_ANIMATIONS)), yes)
81# OPT_DEFS += -DRGBLIGHT_ANIMATIONS 116# OPT_DEFS += -DRGBLIGHT_ANIMATIONS
82 OPT_DEFS += -DLED_ANIMATIONS 117 OPT_DEFS += -DLED_ANIMATIONS
118
119endif
83 120
121ifeq ($(strip $(RGB_MATRIX_SPLIT_RIGHT)), yes)
122 OPT_DEFS += -DRGB_MATRIX_SPLIT_RIGHT
84endif 123endif
85 124
86ifeq ($(strip $(Link_Time_Optimization)),yes) 125ifeq ($(strip $(Link_Time_Optimization)),yes)
87 EXTRAFLAGS += -flto -DUSE_Link_Time_Optimization 126 EXTRAFLAGS += -flto -DUSE_Link_Time_Optimization
88endif 127endif
89 128
90# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE 129# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
diff --git a/keyboards/zinc/keymaps/ginjake/config.h b/keyboards/zinc/keymaps/ginjake/config.h
index 4dcb0724f..2185dc9eb 100644
--- a/keyboards/zinc/keymaps/ginjake/config.h
+++ b/keyboards/zinc/keymaps/ginjake/config.h
@@ -20,8 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
20*/ 20*/
21 21
22#pragma once 22#pragma once
23// if you need more program area, try uncomment follow line
24#include "serial_config_simpleapi.h"
25 23
26// place overrides here 24// place overrides here
27// Selection of RGBLIGHT MODE to use. 25// Selection of RGBLIGHT MODE to use.
diff --git a/keyboards/zinc/keymaps/ginjake/rules.mk b/keyboards/zinc/keymaps/ginjake/rules.mk
index 2dcefc001..2cb59fe8b 100644
--- a/keyboards/zinc/keymaps/ginjake/rules.mk
+++ b/keyboards/zinc/keymaps/ginjake/rules.mk
@@ -1,12 +1,11 @@
1
2# Build Options 1# Build Options
3# change to "no" to disable the options, or define them in the Makefile in 2# change to "no" to disable the options, or define them in the Makefile in
4# the appropriate keymap folder that will get included automatically 3# the appropriate keymap folder that will get included automatically
5# 4#
6BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000) 5BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration
7MOUSEKEY_ENABLE = no # Mouse keys(+4700) 6MOUSEKEY_ENABLE = no # Mouse keys
8EXTRAKEY_ENABLE = yes # Audio control and System control(+450) 7EXTRAKEY_ENABLE = yes # Audio control and System control
9CONSOLE_ENABLE = no # Console for debug(+400) 8CONSOLE_ENABLE = no # Console for debug
10COMMAND_ENABLE = no # Commands for debug and configuration 9COMMAND_ENABLE = no # Commands for debug and configuration
11NKRO_ENABLE = no # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work 10NKRO_ENABLE = no # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
12BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality 11BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
@@ -21,6 +20,8 @@ define ZINC_CUSTOMISE_MSG
21 $(info Zinc customize) 20 $(info Zinc customize)
22 $(info - LED_BACK_ENABLE=$(LED_BACK_ENABLE)) 21 $(info - LED_BACK_ENABLE=$(LED_BACK_ENABLE))
23 $(info - LED_UNDERGLOW_ENABLE=$(LED_UNDERGLOW_ENABLE)) 22 $(info - LED_UNDERGLOW_ENABLE=$(LED_UNDERGLOW_ENABLE))
23 $(info - LED_BOTH_ENABLE=$(LED_BOTH_ENABLE))
24 $(info - LED_RGB_CONT=$(LED_RGB_CONT))
24 $(info - LED_ANIMATION=$(LED_ANIMATIONS)) 25 $(info - LED_ANIMATION=$(LED_ANIMATIONS))
25 $(info - IOS_DEVICE_ENABLE=$(IOS_DEVICE_ENABLE)) 26 $(info - IOS_DEVICE_ENABLE=$(IOS_DEVICE_ENABLE))
26endef 27endef
@@ -28,6 +29,8 @@ endef
28# Zinc keyboard customize 29# Zinc keyboard customize
29LED_BACK_ENABLE = no # LED backlight (Enable SK6812mini backlight) 30LED_BACK_ENABLE = no # LED backlight (Enable SK6812mini backlight)
30LED_UNDERGLOW_ENABLE = no # LED underglow (Enable WS2812 RGB underlight) 31LED_UNDERGLOW_ENABLE = no # LED underglow (Enable WS2812 RGB underlight)
32LED_BOTH_ENABLE = no # LED backlight and underglow
33LED_RGB_CONT = no # LED continuous backlight or/and underglow between left Zinc and right Zinc
31LED_ANIMATIONS = yes # LED animations 34LED_ANIMATIONS = yes # LED animations
32IOS_DEVICE_ENABLE = no # connect to IOS device (iPad,iPhone) 35IOS_DEVICE_ENABLE = no # connect to IOS device (iPad,iPhone)
33Link_Time_Optimization = no # if firmware size over limit, try this option 36Link_Time_Optimization = no # if firmware size over limit, try this option
@@ -37,7 +40,7 @@ Link_Time_Optimization = no # if firmware size over limit, try this option
37 40
38### Zinc keyboard 'default' keymap: convenient command line option 41### Zinc keyboard 'default' keymap: convenient command line option
39## make ZINC=<options> zinc:defualt 42## make ZINC=<options> zinc:defualt
40## option= back | under | na | ios 43## option= back | under | both | cont | na | ios
41## ex. 44## ex.
42## make ZINC=under zinc:defualt 45## make ZINC=under zinc:defualt
43## make ZINC=under,ios zinc:defualt 46## make ZINC=under,ios zinc:defualt
@@ -48,9 +51,16 @@ Link_Time_Optimization = no # if firmware size over limit, try this option
48ifneq ($(strip $(ZINC)),) 51ifneq ($(strip $(ZINC)),)
49 ifeq ($(findstring back,$(ZINC)), back) 52 ifeq ($(findstring back,$(ZINC)), back)
50 LED_BACK_ENABLE = yes 53 LED_BACK_ENABLE = yes
51 else ifeq ($(findstring under,$(ZINC)), under) 54 endif
55 ifeq ($(findstring under,$(ZINC)), under)
52 LED_UNDERGLOW_ENABLE = yes 56 LED_UNDERGLOW_ENABLE = yes
53 endif 57 endif
58 ifeq ($(findstring both,$(ZINC)), both)
59 LED_BOTH_ENABLE = yes
60 endif
61 ifeq ($(findstring cont,$(ZINC)), cont)
62 LED_RGB_CONT = yes
63 endif
54 ifeq ($(findstring na,$(ZINC)), na) 64 ifeq ($(findstring na,$(ZINC)), na)
55 LED_ANIMATIONS = no 65 LED_ANIMATIONS = no
56 endif 66 endif
@@ -63,10 +73,11 @@ endif
63 73
64ifeq ($(strip $(LED_BACK_ENABLE)), yes) 74ifeq ($(strip $(LED_BACK_ENABLE)), yes)
65 RGBLIGHT_ENABLE = yes 75 RGBLIGHT_ENABLE = yes
66 OPT_DEFS += -DRGBLED_BACK
67 ifeq ($(strip $(LED_UNDERGLOW_ENABLE)), yes) 76 ifeq ($(strip $(LED_UNDERGLOW_ENABLE)), yes)
68 $(eval $(call ZINC_CUSTOMISE_MSG)) 77 OPT_DEFS += -DRGBLED_BOTH
69 $(error LED_BACK_ENABLE and LED_UNDERGLOW_ENABLE both 'yes') 78 $(info LED_BOTH_ENABLE option is enabled instead of LED_BACK_ENABLE and LED_UNDERGLOW_ENABLE)
79 else
80 OPT_DEFS += -DRGBLED_BACK
70 endif 81 endif
71else ifeq ($(strip $(LED_UNDERGLOW_ENABLE)), yes) 82else ifeq ($(strip $(LED_UNDERGLOW_ENABLE)), yes)
72 RGBLIGHT_ENABLE = yes 83 RGBLIGHT_ENABLE = yes
@@ -74,18 +85,27 @@ else
74 RGBLIGHT_ENABLE = no 85 RGBLIGHT_ENABLE = no
75endif 86endif
76 87
88ifeq ($(strip $(LED_BOTH_ENABLE)), yes)
89 RGBLIGHT_ENABLE = yes
90 OPT_DEFS += -DRGBLED_BOTH
91endif
92
93ifeq ($(strip $(LED_RGB_CONT)), yes)
94 OPT_DEFS += -DRGBLED_CONT
95endif
96
77ifeq ($(strip $(IOS_DEVICE_ENABLE)), yes) 97ifeq ($(strip $(IOS_DEVICE_ENABLE)), yes)
78 OPT_DEFS += -DIOS_DEVICE_ENABLE 98 OPT_DEFS += -DIOS_DEVICE_ENABLE
79endif 99endif
80 100
81ifeq ($(strip $(LED_ANIMATIONS)), yes) 101ifeq ($(strip $(LED_ANIMATIONS)), yes)
82# OPT_DEFS += -DRGBLIGHT_ANIMATIONS 102# OPT_DEFS += -DRGBLIGHT_ANIMATIONS
83 OPT_DEFS += -DLED_ANIMATIONS 103 OPT_DEFS += -DLED_ANIMATIONS
84 104
85endif 105endif
86 106
87ifeq ($(strip $(Link_Time_Optimization)),yes) 107ifeq ($(strip $(Link_Time_Optimization)),yes)
88 EXTRAFLAGS += -flto -DUSE_Link_Time_Optimization 108 EXTRAFLAGS += -flto -DUSE_Link_Time_Optimization
89endif 109endif
90 110
91# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE 111# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
diff --git a/keyboards/zinc/keymaps/monks/config.h b/keyboards/zinc/keymaps/monks/config.h
index 4dcb0724f..2185dc9eb 100644
--- a/keyboards/zinc/keymaps/monks/config.h
+++ b/keyboards/zinc/keymaps/monks/config.h
@@ -20,8 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
20*/ 20*/
21 21
22#pragma once 22#pragma once
23// if you need more program area, try uncomment follow line
24#include "serial_config_simpleapi.h"
25 23
26// place overrides here 24// place overrides here
27// Selection of RGBLIGHT MODE to use. 25// Selection of RGBLIGHT MODE to use.
diff --git a/keyboards/zinc/keymaps/monks/keymap.c b/keyboards/zinc/keymaps/monks/keymap.c
index 5fd7c6aa8..a30e8ac5f 100644
--- a/keyboards/zinc/keymaps/monks/keymap.c
+++ b/keyboards/zinc/keymaps/monks/keymap.c
@@ -119,6 +119,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { \
119// define variables for reactive RGB 119// define variables for reactive RGB
120bool TOG_STATUS = false; 120bool TOG_STATUS = false;
121 121
122
122// Setting ADJUST layer RGB back to default 123// Setting ADJUST layer RGB back to default
123void update_tri_layer_RGB(uint8_t layer1, uint8_t layer2, uint8_t layer3) { 124void update_tri_layer_RGB(uint8_t layer1, uint8_t layer2, uint8_t layer3) {
124 if (IS_LAYER_ON(layer1) && IS_LAYER_ON(layer2)) { 125 if (IS_LAYER_ON(layer1) && IS_LAYER_ON(layer2)) {
@@ -163,7 +164,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
163 } 164 }
164 return false; 165 return false;
165 break; 166 break;
166 167
167 case RAISE: 168 case RAISE:
168 if (record->event.pressed) { 169 if (record->event.pressed) {
169 //not sure how to have keyboard check mode and set it to a variable, so my work around 170 //not sure how to have keyboard check mode and set it to a variable, so my work around
diff --git a/keyboards/zinc/keymaps/monks/readme_jp.md b/keyboards/zinc/keymaps/monks/readme_jp.md
index f1495af4c..e518eb769 100644
--- a/keyboards/zinc/keymaps/monks/readme_jp.md
+++ b/keyboards/zinc/keymaps/monks/readme_jp.md
@@ -100,4 +100,4 @@ RBG Underglow や RGBバックライトの輝度を抑えて、iPad, iPhone に
100 100
101``` 101```
102IOS_DEVICE_ENABLE = no # connect to IOS device (iPad,iPhone) 102IOS_DEVICE_ENABLE = no # connect to IOS device (iPad,iPhone)
103``` \ No newline at end of file 103```
diff --git a/keyboards/zinc/keymaps/monks/rules.mk b/keyboards/zinc/keymaps/monks/rules.mk
index eeabc004c..c1b98dead 100644
--- a/keyboards/zinc/keymaps/monks/rules.mk
+++ b/keyboards/zinc/keymaps/monks/rules.mk
@@ -1,12 +1,11 @@
1
2# Build Options 1# Build Options
3# change to "no" to disable the options, or define them in the Makefile in 2# change to "no" to disable the options, or define them in the Makefile in
4# the appropriate keymap folder that will get included automatically 3# the appropriate keymap folder that will get included automatically
5# 4#
6BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000) 5BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration
7MOUSEKEY_ENABLE = no # Mouse keys(+4700) 6MOUSEKEY_ENABLE = no # Mouse keys
8EXTRAKEY_ENABLE = yes # Audio control and System control(+450) 7EXTRAKEY_ENABLE = yes # Audio control and System control
9CONSOLE_ENABLE = no # Console for debug(+400) 8CONSOLE_ENABLE = no # Console for debug
10COMMAND_ENABLE = no # Commands for debug and configuration 9COMMAND_ENABLE = no # Commands for debug and configuration
11NKRO_ENABLE = no # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work 10NKRO_ENABLE = no # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
12BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality 11BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
@@ -21,6 +20,8 @@ define ZINC_CUSTOMISE_MSG
21 $(info Zinc customize) 20 $(info Zinc customize)
22 $(info - LED_BACK_ENABLE=$(LED_BACK_ENABLE)) 21 $(info - LED_BACK_ENABLE=$(LED_BACK_ENABLE))
23 $(info - LED_UNDERGLOW_ENABLE=$(LED_UNDERGLOW_ENABLE)) 22 $(info - LED_UNDERGLOW_ENABLE=$(LED_UNDERGLOW_ENABLE))
23 $(info - LED_BOTH_ENABLE=$(LED_BOTH_ENABLE))
24 $(info - LED_RGB_CONT=$(LED_RGB_CONT))
24 $(info - LED_ANIMATION=$(LED_ANIMATIONS)) 25 $(info - LED_ANIMATION=$(LED_ANIMATIONS))
25 $(info - IOS_DEVICE_ENABLE=$(IOS_DEVICE_ENABLE)) 26 $(info - IOS_DEVICE_ENABLE=$(IOS_DEVICE_ENABLE))
26endef 27endef
@@ -28,6 +29,8 @@ endef
28# Zinc keyboard customize 29# Zinc keyboard customize
29LED_BACK_ENABLE = no # LED backlight (Enable SK6812mini backlight) 30LED_BACK_ENABLE = no # LED backlight (Enable SK6812mini backlight)
30LED_UNDERGLOW_ENABLE = no # LED underglow (Enable WS2812 RGB underlight) 31LED_UNDERGLOW_ENABLE = no # LED underglow (Enable WS2812 RGB underlight)
32LED_BOTH_ENABLE = no # LED backlight and underglow
33LED_RGB_CONT = no # LED continuous backlight or/and underglow between left Zinc and right Zinc
31LED_ANIMATIONS = yes # LED animations 34LED_ANIMATIONS = yes # LED animations
32IOS_DEVICE_ENABLE = no # connect to IOS device (iPad,iPhone) 35IOS_DEVICE_ENABLE = no # connect to IOS device (iPad,iPhone)
33Link_Time_Optimization = no # if firmware size over limit, try this option 36Link_Time_Optimization = no # if firmware size over limit, try this option
@@ -37,7 +40,7 @@ Link_Time_Optimization = no # if firmware size over limit, try this option
37 40
38### Zinc keyboard 'default' keymap: convenient command line option 41### Zinc keyboard 'default' keymap: convenient command line option
39## make ZINC=<options> zinc:defualt 42## make ZINC=<options> zinc:defualt
40## option= back | under | na | ios 43## option= back | under | both | cont | na | ios
41## ex. 44## ex.
42## make ZINC=under zinc:defualt 45## make ZINC=under zinc:defualt
43## make ZINC=under,ios zinc:defualt 46## make ZINC=under,ios zinc:defualt
@@ -48,9 +51,16 @@ Link_Time_Optimization = no # if firmware size over limit, try this option
48ifneq ($(strip $(ZINC)),) 51ifneq ($(strip $(ZINC)),)
49 ifeq ($(findstring back,$(ZINC)), back) 52 ifeq ($(findstring back,$(ZINC)), back)
50 LED_BACK_ENABLE = yes 53 LED_BACK_ENABLE = yes
51 else ifeq ($(findstring under,$(ZINC)), under) 54 endif
55 ifeq ($(findstring under,$(ZINC)), under)
52 LED_UNDERGLOW_ENABLE = yes 56 LED_UNDERGLOW_ENABLE = yes
53 endif 57 endif
58 ifeq ($(findstring both,$(ZINC)), both)
59 LED_BOTH_ENABLE = yes
60 endif
61 ifeq ($(findstring cont,$(ZINC)), cont)
62 LED_RGB_CONT = yes
63 endif
54 ifeq ($(findstring na,$(ZINC)), na) 64 ifeq ($(findstring na,$(ZINC)), na)
55 LED_ANIMATIONS = no 65 LED_ANIMATIONS = no
56 endif 66 endif
@@ -63,10 +73,11 @@ endif
63 73
64ifeq ($(strip $(LED_BACK_ENABLE)), yes) 74ifeq ($(strip $(LED_BACK_ENABLE)), yes)
65 RGBLIGHT_ENABLE = yes 75 RGBLIGHT_ENABLE = yes
66 OPT_DEFS += -DRGBLED_BACK
67 ifeq ($(strip $(LED_UNDERGLOW_ENABLE)), yes) 76 ifeq ($(strip $(LED_UNDERGLOW_ENABLE)), yes)
68 $(eval $(call ZINC_CUSTOMISE_MSG)) 77 OPT_DEFS += -DRGBLED_BOTH
69 $(error LED_BACK_ENABLE and LED_UNDERGLOW_ENABLE both 'yes') 78 $(info LED_BOTH_ENABLE option is enabled instead of LED_BACK_ENABLE and LED_UNDERGLOW_ENABLE)
79 else
80 OPT_DEFS += -DRGBLED_BACK
70 endif 81 endif
71else ifeq ($(strip $(LED_UNDERGLOW_ENABLE)), yes) 82else ifeq ($(strip $(LED_UNDERGLOW_ENABLE)), yes)
72 RGBLIGHT_ENABLE = yes 83 RGBLIGHT_ENABLE = yes
@@ -74,17 +85,27 @@ else
74 RGBLIGHT_ENABLE = no 85 RGBLIGHT_ENABLE = no
75endif 86endif
76 87
88ifeq ($(strip $(LED_BOTH_ENABLE)), yes)
89 RGBLIGHT_ENABLE = yes
90 OPT_DEFS += -DRGBLED_BOTH
91endif
92
93ifeq ($(strip $(LED_RGB_CONT)), yes)
94 OPT_DEFS += -DRGBLED_CONT
95endif
96
77ifeq ($(strip $(IOS_DEVICE_ENABLE)), yes) 97ifeq ($(strip $(IOS_DEVICE_ENABLE)), yes)
78 OPT_DEFS += -DIOS_DEVICE_ENABLE 98 OPT_DEFS += -DIOS_DEVICE_ENABLE
79endif 99endif
80 100
81ifeq ($(strip $(LED_ANIMATIONS)), yes) 101ifeq ($(strip $(LED_ANIMATIONS)), yes)
82# OPT_DEFS += -DRGBLIGHT_ANIMATIONS 102# OPT_DEFS += -DRGBLIGHT_ANIMATIONS
83 OPT_DEFS += -DLED_ANIMATIONS 103 OPT_DEFS += -DLED_ANIMATIONS
104
84endif 105endif
85 106
86ifeq ($(strip $(Link_Time_Optimization)),yes) 107ifeq ($(strip $(Link_Time_Optimization)),yes)
87 EXTRAFLAGS += -flto -DUSE_Link_Time_Optimization 108 EXTRAFLAGS += -flto -DUSE_Link_Time_Optimization
88endif 109endif
89 110
90# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE 111# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
@@ -94,4 +115,3 @@ SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
94# $(info -- RGBLIGHT_ENABLE=$(RGBLIGHT_ENABLE)) 115# $(info -- RGBLIGHT_ENABLE=$(RGBLIGHT_ENABLE))
95# $(info -- OPT_DEFS=$(OPT_DEFS)) 116# $(info -- OPT_DEFS=$(OPT_DEFS))
96# $(info ) 117# $(info )
97
diff --git a/keyboards/zinc/keymaps/toshi0383/config.h b/keyboards/zinc/keymaps/toshi0383/config.h
index 33108a29e..0d53d4424 100644
--- a/keyboards/zinc/keymaps/toshi0383/config.h
+++ b/keyboards/zinc/keymaps/toshi0383/config.h
@@ -21,8 +21,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
21*/ 21*/
22 22
23#pragma once 23#pragma once
24// if you need more program area, try uncomment follow line
25#include "serial_config_simpleapi.h"
26 24
27// place overrides here 25// place overrides here
28// Selection of RGBLIGHT MODE to use. 26// Selection of RGBLIGHT MODE to use.
diff --git a/keyboards/zinc/keymaps/toshi0383/rules.mk b/keyboards/zinc/keymaps/toshi0383/rules.mk
index dca9aa7ff..26ac02f3a 100644
--- a/keyboards/zinc/keymaps/toshi0383/rules.mk
+++ b/keyboards/zinc/keymaps/toshi0383/rules.mk
@@ -1,11 +1,12 @@
1# Build Options 1# Build Options
2# change yes to no to disable 2# change to "no" to disable the options, or define them in the Makefile in
3# the appropriate keymap folder that will get included automatically
3# 4#
4BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration 5BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration
5MOUSEKEY_ENABLE = no # Mouse keys 6MOUSEKEY_ENABLE = no # Mouse keys
6EXTRAKEY_ENABLE = yes # Audio control and System control 7EXTRAKEY_ENABLE = yes # Audio control and System control
7CONSOLE_ENABLE = no # Console for debug 8CONSOLE_ENABLE = no # Console for debug
8COMMAND_ENABLE = no # Commands for debug and configuration 9COMMAND_ENABLE = no # Commands for debug and configuration
9NKRO_ENABLE = no # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work 10NKRO_ENABLE = no # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
10BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality 11BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
11MIDI_ENABLE = no # MIDI controls 12MIDI_ENABLE = no # MIDI controls
@@ -19,6 +20,9 @@ define ZINC_CUSTOMISE_MSG
19 $(info Zinc customize) 20 $(info Zinc customize)
20 $(info - LED_BACK_ENABLE=$(LED_BACK_ENABLE)) 21 $(info - LED_BACK_ENABLE=$(LED_BACK_ENABLE))
21 $(info - LED_UNDERGLOW_ENABLE=$(LED_UNDERGLOW_ENABLE)) 22 $(info - LED_UNDERGLOW_ENABLE=$(LED_UNDERGLOW_ENABLE))
23 $(info - LED_BOTH_ENABLE=$(LED_BOTH_ENABLE))
24 $(info - LED_RGB_CONT=$(LED_RGB_CONT))
25 $(info - RGB_MATRIX=$(RGB_MATRIX))
22 $(info - LED_ANIMATION=$(LED_ANIMATIONS)) 26 $(info - LED_ANIMATION=$(LED_ANIMATIONS))
23 $(info - IOS_DEVICE_ENABLE=$(IOS_DEVICE_ENABLE)) 27 $(info - IOS_DEVICE_ENABLE=$(IOS_DEVICE_ENABLE))
24endef 28endef
@@ -26,6 +30,10 @@ endef
26# Zinc keyboard customize 30# Zinc keyboard customize
27LED_BACK_ENABLE = no # LED backlight (Enable SK6812mini backlight) 31LED_BACK_ENABLE = no # LED backlight (Enable SK6812mini backlight)
28LED_UNDERGLOW_ENABLE = no # LED underglow (Enable WS2812 RGB underlight) 32LED_UNDERGLOW_ENABLE = no # LED underglow (Enable WS2812 RGB underlight)
33LED_BOTH_ENABLE = no # LED backlight and underglow
34LED_RGB_CONT = no # LED continuous backlight or/and underglow between left Zinc and right Zinc
35RGB_MATRIX = no # RGB LED Matrix
36RGB_MATRIX_SPLIT_RIGHT = no # RGB Matrix for RIGHT Hand
29LED_ANIMATIONS = yes # LED animations 37LED_ANIMATIONS = yes # LED animations
30IOS_DEVICE_ENABLE = no # connect to IOS device (iPad,iPhone) 38IOS_DEVICE_ENABLE = no # connect to IOS device (iPad,iPhone)
31Link_Time_Optimization = no # if firmware size over limit, try this option 39Link_Time_Optimization = no # if firmware size over limit, try this option
@@ -35,7 +43,7 @@ Link_Time_Optimization = no # if firmware size over limit, try this option
35 43
36### Zinc keyboard 'default' keymap: convenient command line option 44### Zinc keyboard 'default' keymap: convenient command line option
37## make ZINC=<options> zinc:defualt 45## make ZINC=<options> zinc:defualt
38## option= back | under | na | ios 46## option= back | under | both | cont | matrix | na | ios
39## ex. 47## ex.
40## make ZINC=under zinc:defualt 48## make ZINC=under zinc:defualt
41## make ZINC=under,ios zinc:defualt 49## make ZINC=under,ios zinc:defualt
@@ -46,9 +54,22 @@ Link_Time_Optimization = no # if firmware size over limit, try this option
46ifneq ($(strip $(ZINC)),) 54ifneq ($(strip $(ZINC)),)
47 ifeq ($(findstring back,$(ZINC)), back) 55 ifeq ($(findstring back,$(ZINC)), back)
48 LED_BACK_ENABLE = yes 56 LED_BACK_ENABLE = yes
49 else ifeq ($(findstring under,$(ZINC)), under) 57 endif
58 ifeq ($(findstring under,$(ZINC)), under)
50 LED_UNDERGLOW_ENABLE = yes 59 LED_UNDERGLOW_ENABLE = yes
51 endif 60 endif
61 ifeq ($(findstring both,$(ZINC)), both)
62 LED_BOTH_ENABLE = yes
63 endif
64 ifeq ($(findstring cont,$(ZINC)), cont)
65 LED_RGB_CONT = yes
66 endif
67 ifeq ($(findstring matrix,$(ZINC)), matrix)
68 RGB_MATRIX = yes
69 endif
70 ifeq ($(findstring right,$(ZINC)), right)
71 RGB_MATRIX_SPLIT_RIGHT = yes
72 endif
52 ifeq ($(findstring na,$(ZINC)), na) 73 ifeq ($(findstring na,$(ZINC)), na)
53 LED_ANIMATIONS = no 74 LED_ANIMATIONS = no
54 endif 75 endif
@@ -61,10 +82,11 @@ endif
61 82
62ifeq ($(strip $(LED_BACK_ENABLE)), yes) 83ifeq ($(strip $(LED_BACK_ENABLE)), yes)
63 RGBLIGHT_ENABLE = yes 84 RGBLIGHT_ENABLE = yes
64 OPT_DEFS += -DRGBLED_BACK
65 ifeq ($(strip $(LED_UNDERGLOW_ENABLE)), yes) 85 ifeq ($(strip $(LED_UNDERGLOW_ENABLE)), yes)
66 $(eval $(call ZINC_CUSTOMISE_MSG)) 86 OPT_DEFS += -DRGBLED_BOTH
67 $(error LED_BACK_ENABLE and LED_UNDERGLOW_ENABLE both 'yes') 87 $(info LED_BOTH_ENABLE option is enabled instead of LED_BACK_ENABLE and LED_UNDERGLOW_ENABLE)
88 else
89 OPT_DEFS += -DRGBLED_BACK
68 endif 90 endif
69else ifeq ($(strip $(LED_UNDERGLOW_ENABLE)), yes) 91else ifeq ($(strip $(LED_UNDERGLOW_ENABLE)), yes)
70 RGBLIGHT_ENABLE = yes 92 RGBLIGHT_ENABLE = yes
@@ -72,24 +94,43 @@ else
72 RGBLIGHT_ENABLE = no 94 RGBLIGHT_ENABLE = no
73endif 95endif
74 96
97ifeq ($(strip $(LED_BOTH_ENABLE)), yes)
98 RGBLIGHT_ENABLE = yes
99 OPT_DEFS += -DRGBLED_BOTH
100endif
101
102ifeq ($(strip $(LED_RGB_CONT)), yes)
103 OPT_DEFS += -DRGBLED_CONT
104endif
105
106ifeq ($(strip $(RGB_MATRIX)), yes)
107 RGBLIGHT_ENABLE = no
108 RGB_MATRIX_ENABLE = WS2812
109endif
110
75ifeq ($(strip $(IOS_DEVICE_ENABLE)), yes) 111ifeq ($(strip $(IOS_DEVICE_ENABLE)), yes)
76 OPT_DEFS += -DIOS_DEVICE_ENABLE 112 OPT_DEFS += -DIOS_DEVICE_ENABLE
77endif 113endif
78 114
79ifeq ($(strip $(LED_ANIMATIONS)), yes) 115ifeq ($(strip $(LED_ANIMATIONS)), yes)
80# OPT_DEFS += -DRGBLIGHT_ANIMATIONS 116# OPT_DEFS += -DRGBLIGHT_ANIMATIONS
81 OPT_DEFS += -DLED_ANIMATIONS 117 OPT_DEFS += -DLED_ANIMATIONS
118
119endif
120
121ifeq ($(strip $(RGB_MATRIX_SPLIT_RIGHT)), yes)
122 OPT_DEFS += -DRGB_MATRIX_SPLIT_RIGHT
82endif 123endif
83 124
84ifeq ($(strip $(Link_Time_Optimization)),yes) 125ifeq ($(strip $(Link_Time_Optimization)),yes)
85 EXTRAFLAGS += -flto -DUSE_Link_Time_Optimization 126 EXTRAFLAGS += -flto -DUSE_Link_Time_Optimization
86endif 127endif
87 128
88# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE 129# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
89SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend 130SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
90 131
132
91# Uncomment these for debugging 133# Uncomment these for debugging
92# $(info -- RGBLIGHT_ENABLE=$(RGBLIGHT_ENABLE)) 134# $(info -- RGBLIGHT_ENABLE=$(RGBLIGHT_ENABLE))
93# $(info -- OPT_DEFS=$(OPT_DEFS)) 135# $(info -- OPT_DEFS=$(OPT_DEFS))
94# $(info ) 136# $(info )
95