aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortakashiski <takashiskibb@gmail.com>2019-05-12 15:20:45 +0900
committerDrashna Jaelre <drashna@live.com>2019-05-11 23:20:45 -0700
commit0db65190c2f4f72fd99d676d7e8aed6e0cc834f6 (patch)
tree6da10243faef5d5aabd02d4d6783d13b08c76f2e
parent2b78840ef7e6227949bf6e2f9643449e11df0ac5 (diff)
downloadqmk_firmware-0db65190c2f4f72fd99d676d7e8aed6e0cc834f6.tar.gz
qmk_firmware-0db65190c2f4f72fd99d676d7e8aed6e0cc834f6.zip
[Keyboard] Enable RGBLED_SPLIT on hecomi/alpha (#5836)
* remove not need file * set RGBLIGHT_SPLIT * set RGBLIGHT by layer * exchange LED color on layer * Update keyboards/hecomi/alpha/rules.mk I misunderstand RGBLIGHT_SPLIT Co-Authored-By: Drashna Jaelre <drashna@live.com>
-rw-r--r--keyboards/hecomi/alpha/config.h23
-rw-r--r--keyboards/hecomi/alpha/rules.mk6
-rw-r--r--keyboards/hecomi/config.h246
-rw-r--r--keyboards/hecomi/keymaps/default/keymap.c23
4 files changed, 35 insertions, 263 deletions
diff --git a/keyboards/hecomi/alpha/config.h b/keyboards/hecomi/alpha/config.h
index 40bb8c2f0..8a65f146b 100644
--- a/keyboards/hecomi/alpha/config.h
+++ b/keyboards/hecomi/alpha/config.h
@@ -45,7 +45,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
45#define MATRIX_ROW_PINS { C6,D7,E6,B4,B5 } 45#define MATRIX_ROW_PINS { C6,D7,E6,B4,B5 }
46#define MATRIX_COL_PINS { F4,F5,F6,F7,B1,B3,B2,B6 } 46#define MATRIX_COL_PINS { F4,F5,F6,F7,B1,B3,B2,B6 }
47#define UNUSED_PINS 47#define UNUSED_PINS
48#define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6 48#define SOFT_SERIAL_PIN D1 // or D1, D2, D3, E6
49//#define USE_I2C 49//#define USE_I2C
50 50
51/* COL2ROW, ROW2COL, or CUSTOM_MATRIX */ 51/* COL2ROW, ROW2COL, or CUSTOM_MATRIX */
@@ -62,20 +62,20 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
62 62
63 #define RGB_DI_PIN D4 63 #define RGB_DI_PIN D4
64 #ifdef RGB_DI_PIN 64 #ifdef RGB_DI_PIN
65 #define RGBLED_NUM 8 65 #define RGBLED_NUM 16
66 #define RGBLIGHT_HUE_STEP 8 66 #define RGBLIGHT_HUE_STEP 8
67 #define RGBLIGHT_SAT_STEP 8 67 #define RGBLIGHT_SAT_STEP 8
68 #define RGBLIGHT_VAL_STEP 8 68 #define RGBLIGHT_VAL_STEP 8
69 /*== or choose animations ==*/ 69 /*== or choose animations ==*/
70 #define RGBLIGHT_EFFECT_BREATHING 70// #define RGBLIGHT_EFFECT_BREATHING
71 #define RGBLIGHT_EFFECT_RAINBOW_MOOD 71// #define RGBLIGHT_EFFECT_RAINBOW_MOOD
72 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL 72// #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
73 #define RGBLIGHT_EFFECT_SNAKE 73// #define RGBLIGHT_EFFECT_SNAKE
74 #define RGBLIGHT_EFFECT_KNIGHT 74// #define RGBLIGHT_EFFECT_KNIGHT
75 #define RGBLIGHT_EFFECT_CHRISTMAS 75// #define RGBLIGHT_EFFECT_CHRISTMAS
76 #define RGBLIGHT_EFFECT_STATIC_GRADIENT 76// #define RGBLIGHT_EFFECT_STATIC_GRADIENT
77 #define RGBLIGHT_EFFECT_RGB_TEST 77// #define RGBLIGHT_EFFECT_RGB_TEST
78 #define RGBLIGHT_EFFECT_ALTERNATING 78// #define RGBLIGHT_EFFECT_ALTERNATING
79 #endif 79 #endif
80 80
81/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ 81/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
@@ -244,3 +244,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
244#define MASTER_LEFT 244#define MASTER_LEFT
245#define EEHANDS 245#define EEHANDS
246*/ 246*/
247#define RGBLED_SPLIT {8,8}
diff --git a/keyboards/hecomi/alpha/rules.mk b/keyboards/hecomi/alpha/rules.mk
index ae9192be3..3e726f1d6 100644
--- a/keyboards/hecomi/alpha/rules.mk
+++ b/keyboards/hecomi/alpha/rules.mk
@@ -62,8 +62,8 @@ BOOTLOADER = caterina
62# Build Options 62# Build Options
63# change yes to no to disable 63# change yes to no to disable
64# 64#
65BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000) 65BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000)
66MOUSEKEY_ENABLE = yes # Mouse keys(+4700) 66MOUSEKEY_ENABLE = no # Mouse keys(+4700)
67EXTRAKEY_ENABLE = yes # Audio control and System control(+450) 67EXTRAKEY_ENABLE = yes # Audio control and System control(+450)
68CONSOLE_ENABLE = yes # Console for debug(+400) 68CONSOLE_ENABLE = yes # Console for debug(+400)
69COMMAND_ENABLE = yes # Commands for debug and configuration 69COMMAND_ENABLE = yes # Commands for debug and configuration
@@ -72,7 +72,7 @@ SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
72# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work 72# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
73NKRO_ENABLE = no # USB Nkey Rollover 73NKRO_ENABLE = no # USB Nkey Rollover
74BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality on B7 by default 74BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality on B7 by default
75RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow 75RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
76MIDI_ENABLE = no # MIDI support (+2400 to 4200, depending on config) 76MIDI_ENABLE = no # MIDI support (+2400 to 4200, depending on config)
77UNICODE_ENABLE = no # Unicode 77UNICODE_ENABLE = no # Unicode
78BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID 78BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
diff --git a/keyboards/hecomi/config.h b/keyboards/hecomi/config.h
deleted file mode 100644
index 40bb8c2f0..000000000
--- a/keyboards/hecomi/config.h
+++ /dev/null
@@ -1,246 +0,0 @@
1/*
2Copyright 2018 takashiski
3
4This program is free software: you can redistribute it and/or modify
5it under the terms of the GNU General Public License as published by
6the Free Software Foundation, either version 2 of the License, or
7(at your option) any later version.
8
9This program is distributed in the hope that it will be useful,
10but WITHOUT ANY WARRANTY; without even the implied warranty of
11MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12GNU General Public License for more details.
13
14You should have received a copy of the GNU General Public License
15along with this program. If not, see <http://www.gnu.org/licenses/>.
16*/
17
18#pragma once
19
20#include "config_common.h"
21
22/* USB Device descriptor parameter */
23#define VENDOR_ID 0xFEED
24#define PRODUCT_ID 0x0000
25#define DEVICE_VER 0x0001
26#define MANUFACTURER takashiski
27#define PRODUCT hecomi_alpha
28#define DESCRIPTION asymmetric split keyboard
29
30/* key matrix size */
31//#define MATRIX_ROWS 5
32#define MATRIX_ROWS 10
33#define MATRIX_COLS 8
34
35/*
36 * Keyboard Matrix Assignments
37 *
38 * Change this to how you wired your keyboard
39 * COLS: AVR pins used for columns, left to right
40 * ROWS: AVR pins used for rows, top to bottom
41 * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
42 * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
43 *
44*/
45#define MATRIX_ROW_PINS { C6,D7,E6,B4,B5 }
46#define MATRIX_COL_PINS { F4,F5,F6,F7,B1,B3,B2,B6 }
47#define UNUSED_PINS
48#define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6
49//#define USE_I2C
50
51/* COL2ROW, ROW2COL, or CUSTOM_MATRIX */
52#define DIODE_DIRECTION COL2ROW
53
54/*
55 * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, an3 define SOFT_SERIAL_PIN.
56 */
57//#define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6
58
59// #define BACKLIGHT_PIN B7
60// #define BACKLIGHT_BREATHING
61// #define BACKLIGHT_LEVELS 3
62
63 #define RGB_DI_PIN D4
64 #ifdef RGB_DI_PIN
65 #define RGBLED_NUM 8
66 #define RGBLIGHT_HUE_STEP 8
67 #define RGBLIGHT_SAT_STEP 8
68 #define RGBLIGHT_VAL_STEP 8
69 /*== or choose animations ==*/
70 #define RGBLIGHT_EFFECT_BREATHING
71 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
72 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
73 #define RGBLIGHT_EFFECT_SNAKE
74 #define RGBLIGHT_EFFECT_KNIGHT
75 #define RGBLIGHT_EFFECT_CHRISTMAS
76 #define RGBLIGHT_EFFECT_STATIC_GRADIENT
77 #define RGBLIGHT_EFFECT_RGB_TEST
78 #define RGBLIGHT_EFFECT_ALTERNATING
79 #endif
80
81/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
82#define DEBOUNCING_DELAY 5
83
84/* define if matrix has ghost (lacks anti-ghosting diodes) */
85//#define MATRIX_HAS_GHOST
86
87/* number of backlight levels */
88
89/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
90#define LOCKING_SUPPORT_ENABLE
91/* Locking resynchronize hack */
92#define LOCKING_RESYNC_ENABLE
93
94/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
95 * This is userful for the Windows task manager shortcut (ctrl+shift+esc).
96 */
97// #define GRAVE_ESC_CTRL_OVERRIDE
98
99/*
100 * Force NKRO
101 *
102 * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
103 * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
104 * makefile for this to work.)
105 *
106 * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
107 * until the next keyboard reset.
108 *
109 * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
110 * fully operational during normal computer usage.
111 *
112 * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
113 * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
114 * bootmagic, NKRO mode will always be enabled until it is toggled again during a
115 * power-up.
116 *
117 */
118//#define FORCE_NKRO
119
120/*
121 * Magic Key Options
122 *
123 * Magic keys are hotkey commands that allow control over firmware functions of
124 * the keyboard. They are best used in combination with the HID Listen program,
125 * found here: https://www.pjrc.com/teensy/hid_listen.html
126 *
127 * The options below allow the magic key functionality to be changed. This is
128 * useful if your keyboard/keypad is missing keys and you want magic key support.
129 *
130 */
131
132
133/* control how magic key switches layers */
134//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS true
135//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS true
136//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM false
137
138/* override magic key keymap */
139//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS
140//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS
141//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM
142//#define MAGIC_KEY_HELP1 H
143//#define MAGIC_KEY_HELP2 SLASH
144//#define MAGIC_KEY_DEBUG D
145//#define MAGIC_KEY_DEBUG_MATRIX X
146//#define MAGIC_KEY_DEBUG_KBD K
147//#define MAGIC_KEY_DEBUG_MOUSE M
148//#define MAGIC_KEY_VERSION V
149//#define MAGIC_KEY_STATUS S
150//#define MAGIC_KEY_CONSOLE C
151//#define MAGIC_KEY_LAYER0_ALT1 ESC
152//#define MAGIC_KEY_LAYER0_ALT2 GRAVE
153//#define MAGIC_KEY_LAYER0 0
154//#define MAGIC_KEY_LAYER1 1
155//#define MAGIC_KEY_LAYER2 2
156//#define MAGIC_KEY_LAYER3 3
157//#define MAGIC_KEY_LAYER4 4
158//#define MAGIC_KEY_LAYER5 5
159//#define MAGIC_KEY_LAYER6 6
160//#define MAGIC_KEY_LAYER7 7
161//#define MAGIC_KEY_LAYER8 8
162//#define MAGIC_KEY_LAYER9 9
163//#define MAGIC_KEY_BOOTLOADER PAUSE
164//#define MAGIC_KEY_LOCK CAPS
165//#define MAGIC_KEY_EEPROM E
166//#define MAGIC_KEY_NKRO N
167//#define MAGIC_KEY_SLEEP_LED Z
168
169/*
170 * Feature disable options
171 * These options are also useful to firmware size reduction.
172 */
173
174/* disable debug print */
175//#define NO_DEBUG
176
177/* disable print */
178//#define NO_PRINT
179
180/* disable action features */
181//#define NO_ACTION_LAYER
182//#define NO_ACTION_TAPPING
183//#define NO_ACTION_ONESHOT
184//#define NO_ACTION_MACRO
185//#define NO_ACTION_FUNCTION
186
187/*
188 * MIDI options
189 */
190
191/* Prevent use of disabled MIDI features in the keymap */
192//#define MIDI_ENABLE_STRICT 1
193
194/* enable basic MIDI features:
195 - MIDI notes can be sent when in Music mode is on
196*/
197//#define MIDI_BASIC
198
199/* enable advanced MIDI features:
200 - MIDI notes can be added to the keymap
201 - Octave shift and transpose
202 - Virtual sustain, portamento, and modulation wheel
203 - etc.
204*/
205//#define MIDI_ADVANCED
206
207/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
208//#define MIDI_TONE_KEYCODE_OCTAVES 1
209
210/*
211 * HD44780 LCD Display Configuration
212 */
213/*
214#define LCD_LINES 2 //< number of visible lines of the display
215#define LCD_DISP_LENGTH 16 //< visibles characters per line of the display
216
217#define LCD_IO_MODE 1 //< 0: memory mapped mode, 1: IO port mode
218
219#if LCD_IO_MODE
220#define LCD_PORT PORTB //< port for the LCD lines
221#define LCD_DATA0_PORT LCD_PORT //< port for 4bit data bit 0
222#define LCD_DATA1_PORT LCD_PORT //< port for 4bit data bit 1
223#define LCD_DATA2_PORT LCD_PORT //< port for 4bit data bit 2
224#define LCD_DATA3_PORT LCD_PORT //< port for 4bit data bit 3
225#define LCD_DATA0_PIN 4 //< pin for 4bit data bit 0
226#define LCD_DATA1_PIN 5 //< pin for 4bit data bit 1
227#define LCD_DATA2_PIN 6 //< pin for 4bit data bit 2
228#define LCD_DATA3_PIN 7 //< pin for 4bit data bit 3
229#define LCD_RS_PORT LCD_PORT //< port for RS line
230#define LCD_RS_PIN 3 //< pin for RS line
231#define LCD_RW_PORT LCD_PORT //< port for RW line
232#define LCD_RW_PIN 2 //< pin for RW line
233#define LCD_E_PORT LCD_PORT //< port for Enable line
234#define LCD_E_PIN 1 //< pin for Enable line
235#endif
236*/
237
238/* Bootmagic Lite key configuration */
239// #define BOOTMAGIC_LITE_ROW 0
240// #define BOOTMAGIC_LITE_COLUMN 0
241//
242/*
243#define USE_I2C
244#define MASTER_LEFT
245#define EEHANDS
246*/
diff --git a/keyboards/hecomi/keymaps/default/keymap.c b/keyboards/hecomi/keymaps/default/keymap.c
index 25bddb7df..505966fbe 100644
--- a/keyboards/hecomi/keymaps/default/keymap.c
+++ b/keyboards/hecomi/keymaps/default/keymap.c
@@ -39,15 +39,15 @@ enum layers{
39const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 39const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
40 [DF]=LAYOUT(\ 40 [DF]=LAYOUT(\
41 KC_ESC,KC_1,KC_2,KC_3,KC_4,KC_5,KC_6, KC_7,KC_8,KC_9,KC_0,KC_MINS,KC_EQL,KC_NUHS,KC_GRV,\ 41 KC_ESC,KC_1,KC_2,KC_3,KC_4,KC_5,KC_6, KC_7,KC_8,KC_9,KC_0,KC_MINS,KC_EQL,KC_NUHS,KC_GRV,\
42 KC_TAB ,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_Y, KC_Y,KC_U,KC_I,KC_O,KC_P,KC_LBRC,KC_RBRC,KC_DEL,\ 42 KC_TAB ,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_Y, KC_Y,KC_U,KC_I,KC_O,KC_P,KC_LBRC,KC_RBRC,KC_BSPC,\
43 KC_LCTRL ,KC_A,KC_S,KC_D,KC_F,KC_G, KC_H,KC_J,KC_K,KC_L,KC_SCLN,KC_QUOT,KC_ENT,\ 43 KC_LCTRL ,KC_A,KC_S,KC_D,KC_F,KC_G, KC_H,KC_J,KC_K,KC_L,KC_SCLN,KC_QUOT,KC_ENT,\
44 KC_LSFT ,KC_Z,KC_X,KC_C,KC_V,KC_B, KC_B,KC_N,KC_M,KC_COMM,KC_DOT,KC_SLSH,KC_RSFT,KC_FN,\ 44 KC_LSFT ,KC_Z,KC_X,KC_C,KC_V,KC_B, KC_B,KC_N,KC_M,KC_COMM,KC_DOT,KC_SLSH,KC_RSFT,KC_FN,\
45 KC_LCTRL,KC_LGUI,KC_LALT,KC_MHEN,KC_BSPC,KC_SPC, KC_ENT,KC_ESC,KC_HENK,KC_RALT,KC_RGUI,KC_RCTRL\ 45 KC_LCTRL,KC_LGUI,KC_LALT,KC_MHEN,KC_BSPC,KC_SPC, KC_ENT,KC_ESC,KC_HENK,KC_RALT,KC_RGUI,KC_RCTRL\
46 ), 46 ),
47 [FN]=LAYOUT(\ 47 [FN]=LAYOUT(\
48 KC_ESC,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,KC_DEL,\ 48 KC_ESC,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,KC_DEL,\
49 KC_TAB ,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_Y, KC_Y,KC_U,KC_PSCR,KC_SLCK,KC_PAUSE,KC_UP,KC_RBRC,KC_BSPC,\ 49 KC_TAB ,KC_9,KC_7,KC_5,KC_3,KC_1,KC_Y, KC_Y,KC_U,KC_PSCR,KC_SLCK,KC_PAUSE,KC_UP,KC_RBRC,KC_BSPC,\
50 KC_CAPS ,KC_A,KC_S,KC_D,KC_F,KC_G, KC_SFT(KC_8),KC_SLSH,KC_HOME,KC_PGUP,KC_LEFT,KC_RIGHT,KC_ENT,\ 50 KC_CAPS ,KC_8,KC_6,KC_4,KC_2,KC_0, KC_SFT(KC_8),KC_SLSH,KC_HOME,KC_PGUP,KC_LEFT,KC_RIGHT,KC_ENT,\
51 KC_LSFT ,KC_Z,KC_X,KC_C,KC_V,KC_B, KC_B,KC_SFT(KC_EQL),KC_MINS,KC_END,KC_PGDN,KC_DOWN,KC_RSFT,KC_TRNS,\ 51 KC_LSFT ,KC_Z,KC_X,KC_C,KC_V,KC_B, KC_B,KC_SFT(KC_EQL),KC_MINS,KC_END,KC_PGDN,KC_DOWN,KC_RSFT,KC_TRNS,\
52 KC_LCTRL,KC_LGUI,KC_LALT,KC_MHEN,KC_BSPC,KC_SPC, KC_ENT,KC_ESC,KC_HENK,KC_RALT,KC_RGUI,KC_RCTRL\ 52 KC_LCTRL,KC_LGUI,KC_LALT,KC_MHEN,KC_BSPC,KC_SPC, KC_ENT,KC_ESC,KC_HENK,KC_RALT,KC_RGUI,KC_RCTRL\
53 ), 53 ),
@@ -75,6 +75,23 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
75 return true; 75 return true;
76} 76}
77 77
78uint32_t layer_state_set_user(uint32_t state)
79{
80 uint8_t layer=biton32(state);
81 switch(layer)
82 {
83 case DF:
84 rgblight_sethsv_noeeprom(180,255,255);
85 break;
86 case FN:
87 rgblight_sethsv_noeeprom(0,255,255);
88 break;
89 default:
90 break;
91 }
92 return state;
93}
94
78void matrix_init_user(void) { 95void matrix_init_user(void) {
79 96
80} 97}