aboutsummaryrefslogtreecommitdiff
path: root/keyboards/helix
diff options
context:
space:
mode:
authorRyo Maeda <epaew@users.noreply.github.com>2021-04-10 09:37:49 +0900
committerGitHub <noreply@github.com>2021-04-09 17:37:49 -0700
commit3dbb7f261dab573a3b55390394444ac3ceb3d257 (patch)
treee1b7e20933766622f974ac40a3d9aaddf239625c /keyboards/helix
parent93e8a401df09df910b2caad7fc5ecb13fe2142ac (diff)
downloadqmk_firmware-3dbb7f261dab573a3b55390394444ac3ceb3d257.tar.gz
qmk_firmware-3dbb7f261dab573a3b55390394444ac3ceb3d257.zip
[Keymap] Remove LAYOUT_kc macros from edvorakjp keymaps (#12217)
Diffstat (limited to 'keyboards/helix')
-rw-r--r--keyboards/helix/rev2/keymaps/edvorakjp/config.h25
-rw-r--r--keyboards/helix/rev2/keymaps/edvorakjp/keymap.c42
-rw-r--r--keyboards/helix/rev2/keymaps/edvorakjp/keymap_4rows.c63
-rw-r--r--keyboards/helix/rev2/keymaps/edvorakjp/keymap_5rows.c75
-rw-r--r--keyboards/helix/rev2/keymaps/edvorakjp/keymap_xrows.h16
-rw-r--r--keyboards/helix/rev2/keymaps/edvorakjp/oled.c112
-rw-r--r--keyboards/helix/rev2/keymaps/edvorakjp/oled.h21
-rw-r--r--keyboards/helix/rev2/keymaps/edvorakjp/rules.mk1
8 files changed, 161 insertions, 194 deletions
diff --git a/keyboards/helix/rev2/keymaps/edvorakjp/config.h b/keyboards/helix/rev2/keymaps/edvorakjp/config.h
index cd0568f61..ca3b73aa2 100644
--- a/keyboards/helix/rev2/keymaps/edvorakjp/config.h
+++ b/keyboards/helix/rev2/keymaps/edvorakjp/config.h
@@ -1,5 +1,4 @@
1#ifndef CONFIG_USER_H 1#pragma once
2#define CONFIG_USER_H
3 2
4#define SWAP_SCLN 3#define SWAP_SCLN
5 4
@@ -12,15 +11,13 @@
12 11
13// Selection of RGBLIGHT MODE to use. 12// Selection of RGBLIGHT MODE to use.
14#if defined(LED_ANIMATIONS) 13#if defined(LED_ANIMATIONS)
15 //#define RGBLIGHT_EFFECT_BREATHING 14//# define RGBLIGHT_EFFECT_BREATHING
16 //#define RGBLIGHT_EFFECT_RAINBOW_MOOD 15//# define RGBLIGHT_EFFECT_RAINBOW_MOOD
17 //#define RGBLIGHT_EFFECT_RAINBOW_SWIRL 16//# define RGBLIGHT_EFFECT_RAINBOW_SWIRL
18 //#define RGBLIGHT_EFFECT_SNAKE 17//# define RGBLIGHT_EFFECT_SNAKE
19 //#define RGBLIGHT_EFFECT_KNIGHT 18//# define RGBLIGHT_EFFECT_KNIGHT
20 //#define RGBLIGHT_EFFECT_CHRISTMAS 19//# define RGBLIGHT_EFFECT_CHRISTMAS
21 #define RGBLIGHT_EFFECT_STATIC_GRADIENT 20# define RGBLIGHT_EFFECT_STATIC_GRADIENT
22 //#define RGBLIGHT_EFFECT_RGB_TEST 21//# define RGBLIGHT_EFFECT_RGB_TEST
23 //#define RGBLIGHT_EFFECT_ALTERNATING 22//# define RGBLIGHT_EFFECT_ALTERNATING
24#endif 23#endif // LED_ANIMATIONS
25
26#endif /* CONFIG_USER_H */
diff --git a/keyboards/helix/rev2/keymaps/edvorakjp/keymap.c b/keyboards/helix/rev2/keymaps/edvorakjp/keymap.c
index 9fba5072c..5de00cb14 100644
--- a/keyboards/helix/rev2/keymaps/edvorakjp/keymap.c
+++ b/keyboards/helix/rev2/keymaps/edvorakjp/keymap.c
@@ -1,38 +1,24 @@
1#include QMK_KEYBOARD_H 1#include QMK_KEYBOARD_H
2#include "split_util.h" 2#include "split_util.h"
3#include "keymap_xrows.h" 3#include "keymap_xrows.h"
4#ifdef SSD1306OLED
5 #include "oled.h"
6#endif
7 4
8// keymaps definitions are moved to keymap_Xrows.c. 5// keymaps definitions are moved to keymap_Xrows.c.
9 6
10#ifdef SSD1306OLED
11void matrix_init_keymap(void) {
12 //SSD1306 OLED init, make sure to add #define SSD1306OLED in config.h
13 iota_gfx_init(!has_usb()); // turns on the display
14}
15
16void matrix_scan_user(void) {
17 iota_gfx_task(); // this is what updates the display continuously
18}
19#endif
20
21#ifdef RGBLIGHT_ENABLE 7#ifdef RGBLIGHT_ENABLE
22uint32_t layer_state_set_keymap(uint32_t state) { 8uint32_t layer_state_set_keymap(uint32_t state) {
23 rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT); 9 rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
24 switch (biton32(state)) { 10 switch (biton32(state)) {
25 case _LOWER: 11 case L_EDVORAKJP_LOWER:
26 rgblight_sethsv_noeeprom_red(); 12 rgblight_sethsv_noeeprom_red();
27 break; 13 break;
28 case _RAISE: 14 case L_EDVORAKJP_RAISE:
29 rgblight_sethsv_noeeprom_blue(); 15 rgblight_sethsv_noeeprom_green();
30 break; 16 break;
31 default: // for any other layers, or the default layer 17 default: // for any other layers, or the default layer
32 rgblight_mode(RGBLIGHT_MODE_STATIC_GRADIENT + 3); 18 rgblight_mode(RGBLIGHT_MODE_STATIC_GRADIENT + 3);
33 rgblight_sethsv_red(); 19 rgblight_sethsv_red();
34 break; 20 break;
35 } 21 }
36 return state; 22 return state;
37} 23}
38#endif 24#endif
diff --git a/keyboards/helix/rev2/keymaps/edvorakjp/keymap_4rows.c b/keyboards/helix/rev2/keymaps/edvorakjp/keymap_4rows.c
index f2befc03b..246c2a9fd 100644
--- a/keyboards/helix/rev2/keymaps/edvorakjp/keymap_4rows.c
+++ b/keyboards/helix/rev2/keymaps/edvorakjp/keymap_4rows.c
@@ -1,41 +1,42 @@
1#include "helix.h" 1#include "helix.h"
2#include "keymap_xrows.h" 2#include "keymap_xrows.h"
3 3
4// clang-format off
4const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 5const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
5 6 [L_EDVORAKJP_BASE] = LAYOUT_wrapper(
6 [_EDVORAK] = LAYOUT_kc( 7 //,-----------------------------------------------------. ,-----------------------------------------------------.
7 //,----+----+-----+-----+-----+----. ,----+-----+-----+-----+----+----. 8 KC_GRV, __EDVORAKJP_BASE_L1__ , __EDVORAKJP_BASE_R1__ , KC_BSLS,
8 GRV ,QUOT,COMM , DOT , Y , Q , F , G , R , W , P ,BSLS, 9 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
9 //|----+----+-----+-----+-----+----| |----+-----+-----+-----+----+----| 10 KC_EQL, __EDVORAKJP_BASE_L2__ , __EDVORAKJP_BASE_R2__ , KC_MINS,
10 EQL , A ,LA(O),LG(E),LC(I), U , D ,RS(T),RG(N),RA(S), M ,MINS, 11 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
11 //|----+----+-----+-----+-----+----| |----+-----+-----+-----+----+----| 12 KC_ESC, __EDVORAKJP_BASE_L3__ , __EDVORAKJP_BASE_R3__ , KC_SLSH,
12 ESC ,SCLN, X , C , V , Z , H , J , K , L , B ,SLSH, 13 //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
13 //|----+----+-----+-----+-----+----+----. ,----+----+-----+-----+-----+----+----| 14 __EDVORAKJP_PAGE__ , LA_TAB, LS_SPC,LOWER_TD, RAISE_TD, RC_BSPC, RG_ENT, __EDVORAKJP_CURSOR__
14 HOME,PGDN,PGUP , END ,TMB1 ,TMB2,TMB3, TMB4,TMB5,TMB6 ,LEFT ,DOWN , UP ,RGHT 15 //`--------------------------------------------------------------' `--------------------------------------------------------------'
15 //`----+----+-----+-----+-----+----+----/ \----+----+-----+-----+-----+----+----'
16 ), 16 ),
17 17
18 [_LOWER] = LAYOUT_kc( 18 [L_EDVORAKJP_LOWER] = LAYOUT_wrapper(
19 //,----+----+------+------+------+----. ,----+------+------+-------+----+----. 19 //,-----------------------------------------------------. ,-----------------------------------------------------.
20 , , LCBR , LBRC , LPRN , , , RPRN , RBRC , RCBR , , , 20 XXXXXXX, XXXXXXX, __EDVORAKJP_BRACKET_L__ , XXXXXXX, XXXXXXX, __EDVORAKJP_BRACKET_R__ , XXXXXXX, XXXXXXX,
21 //|----+----+------+------+------+----| |----+------+------+-------+----+----| 21 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
22 F1 , F2 ,LA(F3),LG(F4),LC(F5), F6 , F7 ,RS(F8),RG(F9),RA(F10),F11 ,F12 , 22 __EDVORAKJP_FUNCTION_L__ , __EDVORAKJP_FUNCTION_R__ ,
23 //|----+----+------+------+------+----| |----+------+------+-------+----+----| 23 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
24 PSCR, , HOME , PGDN , PGUP ,END , LEFT, DOWN , UP , RGHT , , , 24 KC_PSCR, XXXXXXX, __EDVORAKJP_PAGE__ , __EDVORAKJP_CURSOR__ , XXXXXXX, XXXXXXX,
25 //|----+----+------+------+------+----+----. ,----+----+------+------+-------+----+----| 25 //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
26 , , , , , , NO , MAC ,TMB7, , , , , 26 __KC_TRNS_x4__ , KC_TRNS, KC_TRNS, XXXXXXX, KC_MAC, RC_DEL, KC_TRNS, __KC_TRNS_x4__
27 //`----+----+------+------+------+----+----/ \----+----+------+------+-------+----+----' 27 //`--------------------------------------------------------------' `--------------------------------------------------------------'
28 ), 28 ),
29 29
30 [_RAISE] = LAYOUT_kc( 30 [L_EDVORAKJP_RAISE] = LAYOUT_wrapper(
31 //,----+----+-----+-----+-----+----. ,----+-----+-----+-----+----+----. 31 //,-----------------------------------------------------. ,-----------------------------------------------------.
32 , ,EXLM , AT ,HASH ,DLR , PERC,CIRC ,AMPR ,ASTR , , , 32 XXXXXXX, XXXXXXX, __EDVORAKJP_SYMBOL_L__ , __EDVORAKJP_SYMBOL_R__ , XXXXXXX, XXXXXXX,
33 //|----+----+-----+-----+-----+----| |----+-----+-----+-----+----+----| 33 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
34 , 1 ,LA(2),LG(3),LC(4), 5 , 6 ,RS(7),RG(8),RA(9), 0 , , 34 XXXXXXX, __EDVORAKJP_NUMBER_L__ , __EDVORAKJP_NUMBER_R__ , XXXXXXX,
35 //|----+----+-----+-----+-----+----| |----+-----+-----+-----+----+----| 35 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
36 PSCR, ,HOME ,PGDN ,PGUP ,END , LEFT,DOWN , UP ,RGHT , , , 36 KC_PSCR, XXXXXXX, __EDVORAKJP_PAGE__ , __EDVORAKJP_CURSOR__ , XXXXXXX, XXXXXXX,
37 //|----+----+-----+-----+-----+----+----. ,----+----+-----+-----+-----+----+----| 37 //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
38 , , , , , ,WIN , NO , , , , , , 38 __KC_TRNS_x4__ , KC_TRNS, KC_TRNS, KC_WIN, XXXXXXX, KC_TRNS, KC_TRNS, __KC_TRNS_x4__
39 //`----+----+-----+-----+-----+----+----/ \----+----+-----+-----+-----+----+----' 39 //`--------------------------------------------------------------' `--------------------------------------------------------------'
40 ) 40 )
41}; 41};
42// clang-format on
diff --git a/keyboards/helix/rev2/keymaps/edvorakjp/keymap_5rows.c b/keyboards/helix/rev2/keymaps/edvorakjp/keymap_5rows.c
index 642ba8c63..6f2a4d371 100644
--- a/keyboards/helix/rev2/keymaps/edvorakjp/keymap_5rows.c
+++ b/keyboards/helix/rev2/keymaps/edvorakjp/keymap_5rows.c
@@ -1,47 +1,48 @@
1#include "helix.h" 1#include "helix.h"
2#include "keymap_xrows.h" 2#include "keymap_xrows.h"
3 3
4// clang-format off
4const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 5const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
5 6 [L_EDVORAKJP_BASE] = LAYOUT_wrapper(
6 [_EDVORAK] = LAYOUT_kc( 7 //,-----------------------------------------------------. ,-----------------------------------------------------.
7 //,----+----+-----+-----+-----+----. ,----+-----+-----+-----+----+----. 8 KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24,
8 ESC ,EXLM, AT ,HASH , DLR ,PERC, CIRC,AMPR ,ASTR ,LPRN ,RPRN,BSPC, 9 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
9 //|----+----+-----+-----+-----+----| |----+-----+-----+-----+----+----| 10 KC_GRV, __EDVORAKJP_BASE_L1__ , __EDVORAKJP_BASE_R1__ , KC_BSLS,
10 GRV ,QUOT,COMM , DOT , Y , Q , F , G , R , W , P ,BSLS, 11 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
11 //|----+----+-----+-----+-----+----| |----+-----+-----+-----+----+----| 12 KC_EQL, __EDVORAKJP_BASE_L2__ , __EDVORAKJP_BASE_R2__ , KC_MINS,
12 EQL , A ,LA(O),LG(E),LC(I), U , D ,RS(T),RG(N),RA(S), M ,MINS, 13 //|--------+--------+--------+--------+--------+--------+--------. ,--------+--------+--------+--------+--------+--------+--------|
13 //|----+----+-----+-----+-----+----+----. ,----+----+-----+-----+-----+----+----| 14 KC_ESC, __EDVORAKJP_BASE_L3__ , XXXXXXX, XXXXXXX, __EDVORAKJP_BASE_R3__ , KC_SLSH,
14 TAB ,SCLN, X , C , V , Z , NO , NO , H , J , K , L , B ,SLSH, 15 //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
15 //|----+----+-----+-----+-----+----+----| |----+----+-----+-----+-----+----+----| 16 __EDVORAKJP_PAGE__ , LA_TAB, LS_SPC,LOWER_TD, RAISE_TD, RC_BSPC, RG_ENT, __EDVORAKJP_CURSOR__
16 HOME,PGDN,PGUP , END ,TMB1 ,TMB2,TMB3, TMB4,TMB5,TMB6 ,LEFT ,DOWN , UP ,RGHT 17 //`--------------------------------------------------------------' `--------------------------------------------------------------'
17 //`----+----+-----+-----+-----+----+----/ \----+----+-----+-----+-----+----+----'
18 ), 18 ),
19 19
20 [_LOWER] = LAYOUT_kc( 20 [L_EDVORAKJP_LOWER] = LAYOUT_wrapper(
21 //,----+----+------+------+------+----. ,----+------+------+-------+----+----. 21 //,-----------------------------------------------------. ,-----------------------------------------------------.
22 PSCR, , , , , , , , , , , , 22 __KC_TRNS_x6__ , __KC_TRNS_x6__ ,
23 //|----+----+------+------+------+----| |----+------+------+-------+----+----| 23 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
24 , , LCBR , LBRC , LPRN , , , RPRN , RBRC , RCBR , , , 24 XXXXXXX, XXXXXXX, __EDVORAKJP_BRACKET_L__ , XXXXXXX, XXXXXXX, __EDVORAKJP_BRACKET_R__ , XXXXXXX, XXXXXXX,
25 //|----+----+------+------+------+----| |----+------+------+-------+----+----| 25 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
26 F1 , F2 ,LA(F3),LG(F4),LC(F5), F6 , F7 ,RS(F8),RG(F9),RA(F10),F11 ,F12 , 26 __EDVORAKJP_FUNCTION_L__ , __EDVORAKJP_FUNCTION_R__ ,
27 //|----+----+------+------+------+----+----. ,----+----+------+------+-------+----+----| 27 //|--------+--------+--------+--------+--------+--------+--------. ,--------+--------+--------+--------+--------+--------+--------|
28 , , HOME , PGDN , PGUP ,END , , ,LEFT, DOWN , UP , RGHT , , , 28 KC_PSCR, XXXXXXX, __EDVORAKJP_PAGE__ , KC_TRNS, KC_TRNS, __EDVORAKJP_CURSOR__ , XXXXXXX, XXXXXXX,
29 //|----+----+------+------+------+----+----| |----+----+------+------+-------+----+----| 29 //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
30 , , , , , , NO , MAC ,TMB7, , , , , 30 __KC_TRNS_x4__ , KC_TRNS, KC_TRNS, XXXXXXX, KC_MAC, RC_DEL, KC_TRNS, __KC_TRNS_x4__
31 //`----+----+------+------+------+----+----/ \----+----+------+------+-------+----+----' 31 //`--------------------------------------------------------------' `--------------------------------------------------------------'
32 ), 32 ),
33 33
34 [_RAISE] = LAYOUT_kc( 34 [L_EDVORAKJP_RAISE] = LAYOUT_wrapper(
35 //,----+----+-----+-----+-----+----. ,----+-----+-----+-----+----+----. 35 //,-----------------------------------------------------. ,-----------------------------------------------------.
36 PSCR, , , , , , , , , , , , 36 __KC_TRNS_x6__ , __KC_TRNS_x6__ ,
37 //|----+----+-----+-----+-----+----| |----+-----+-----+-----+----+----| 37 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
38 , ,EXLM , AT ,HASH ,DLR , PERC,CIRC ,AMPR ,ASTR , , , 38 XXXXXXX, XXXXXXX, __EDVORAKJP_SYMBOL_L__ , __EDVORAKJP_SYMBOL_R__ , XXXXXXX, XXXXXXX,
39 //|----+----+-----+-----+-----+----| |----+-----+-----+-----+----+----| 39 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
40 , 1 ,LA(2),LG(3),LC(4), 5 , 6 ,RS(7),RG(8),RA(9), 0 , , 40 XXXXXXX, __EDVORAKJP_NUMBER_L__ , __EDVORAKJP_NUMBER_R__ , XXXXXXX,
41 //|----+----+-----+-----+-----+----+----. ,----+----+-----+-----+-----+----+----| 41 //|--------+--------+--------+--------+--------+--------+--------. ,--------+--------+--------+--------+--------+--------+--------|
42 , ,HOME ,PGDN ,PGUP ,END , , ,LEFT,DOWN , UP ,RGHT , , , 42 KC_PSCR, XXXXXXX, __EDVORAKJP_PAGE__ , KC_TRNS, KC_TRNS, __EDVORAKJP_CURSOR__ , XXXXXXX, XXXXXXX,
43 //|----+----+-----+-----+-----+----+----| |----+----+-----+-----+-----+----+----| 43 //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
44 , , , , , ,WIN , NO , , , , , , 44 __KC_TRNS_x4__ , KC_TRNS, KC_TRNS, KC_WIN, XXXXXXX, KC_TRNS, KC_TRNS, __KC_TRNS_x4__
45 //`----+----+-----+-----+-----+----+----/ \----+----+-----+-----+-----+----+----' 45 //`--------------------------------------------------------------' `--------------------------------------------------------------'
46 ) 46 )
47}; 47};
48// clang-format on
diff --git a/keyboards/helix/rev2/keymaps/edvorakjp/keymap_xrows.h b/keyboards/helix/rev2/keymaps/edvorakjp/keymap_xrows.h
index d9561d0b7..aae83fc7a 100644
--- a/keyboards/helix/rev2/keymaps/edvorakjp/keymap_xrows.h
+++ b/keyboards/helix/rev2/keymaps/edvorakjp/keymap_xrows.h
@@ -1,5 +1,4 @@
1#ifndef KEYMAP_XROWS_H 1#pragma once
2#define KEYMAP_XROWS_H
3 2
4#include "edvorakjp.h" 3#include "edvorakjp.h"
5/* 4/*
@@ -8,14 +7,7 @@
8 * }; 7 * };
9 */ 8 */
10 9
11#define KC_ KC_TRNS 10#define LAYOUT_wrapper(...) LAYOUT(__VA_ARGS__)
12 11
13#define KC_TMB1 KC_LA(TAB) 12#define __KC_TRNS_x4__ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
14#define KC_TMB2 KC_LS(SPC) 13#define __KC_TRNS_x6__ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
15#define KC_TMB3 TD(TD_LOWER) // act as LOWER when hold, as KC_LANG2(=English) when tapped
16#define KC_TMB4 TD(TD_RAISE) // act as RAISE when hold, as KC_LANG1(=Japanese) when tapped
17#define KC_TMB5 KC_RC(BSPC)
18#define KC_TMB6 KC_RG(ENT)
19#define KC_TMB7 KC_RC(DEL)
20
21#endif
diff --git a/keyboards/helix/rev2/keymaps/edvorakjp/oled.c b/keyboards/helix/rev2/keymaps/edvorakjp/oled.c
index b931b72b7..4bbab1dc4 100644
--- a/keyboards/helix/rev2/keymaps/edvorakjp/oled.c
+++ b/keyboards/helix/rev2/keymaps/edvorakjp/oled.c
@@ -1,72 +1,68 @@
1#include <stdio.h>
1#include <string.h> 2#include <string.h>
2#include "oled.h" 3#include "oled.h"
3 4
4static void render_logo(struct CharacterMatrix *matrix) { 5#ifdef OLED_DRIVER_ENABLE
6void render_host_led_state(void) {
7 char led_state_str[24];
8 uint8_t leds = host_keyboard_leds();
5 9
6 static char logo[] = { 10 bool is_num_lock_enabled = leds & (1 << USB_LED_NUM_LOCK);
7 0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8a,0x8b,0x8c,0x8d,0x8e,0x8f,0x90,0x91,0x92,0x93,0x94, 11 bool is_caps_lock_enabled = leds & (1 << USB_LED_CAPS_LOCK);
8 0xa0,0xa1,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xab,0xac,0xad,0xae,0xaf,0xb0,0xb1,0xb2,0xb3,0xb4, 12 bool is_scroll_lock_enabled = leds & (1 << USB_LED_SCROLL_LOCK);
9 0xc0,0xc1,0xc2,0xc3,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xcb,0xcc,0xcd,0xce,0xcf,0xd0,0xd1,0xd2,0xd3,0xd4,
10 0};
11 matrix_write(matrix, logo);
12}
13 13
14void matrix_update(struct CharacterMatrix *dest, 14 snprintf(led_state_str, sizeof(led_state_str), "NL:%s CL:%s SL:%s", is_num_lock_enabled ? "on" : "- ", is_caps_lock_enabled ? "on" : "- ", is_scroll_lock_enabled ? "on" : "- ");
15 const struct CharacterMatrix *source) { 15 oled_write(led_state_str, false);
16 if (memcmp(dest->display, source->display, sizeof(dest->display))) {
17 memcpy(dest->display, source->display, sizeof(dest->display));
18 dest->dirty = true;
19 }
20} 16}
21 17
22void render_status(struct CharacterMatrix *matrix) { 18void render_layer_state(void) {
23 19 char layer_name[17];
24 // Render to mode icon 20 oled_write_P(PSTR("Layer: "), false);
25 static char logo[][2][3] = {{{0x95,0x96,0},{0xb5,0xb6,0}},{{0x97,0x98,0},{0xb7,0xb8,0}}};
26 int mode_number = get_enable_kc_lang() ? 0 : 1;
27 matrix_write(matrix, logo[mode_number][0]);
28 matrix_write(matrix, "\n");
29 matrix_write(matrix, logo[mode_number][1]);
30 21
31 // Define layers here, Have not worked out how to have text displayed for each layer. Copy down the number you see and add a case for it below 22 switch (biton32(layer_state)) {
32 char buf[40]; 23 case L_EDVORAKJP_BASE:
33 snprintf(buf,sizeof(buf), "Undef-%ld", layer_state); 24 oled_write_ln_P(PSTR("Default"), false);
34 matrix_write_P(matrix, PSTR("\nLayer: ")); 25 break;
35 switch (biton32(layer_state)) { 26 case L_EDVORAKJP_LOWER:
36 case L_BASE: 27 oled_write_ln_P(PSTR("Lower"), false);
37 matrix_write_P(matrix, PSTR("Default")); 28 break;
38 break; 29 case L_EDVORAKJP_RAISE:
39 case _RAISE: 30 oled_write_ln_P(PSTR("Raise"), false);
40 matrix_write_P(matrix, PSTR("Raise")); 31 break;
41 break; 32 default:
42 case _LOWER: 33 snprintf(layer_name, sizeof(layer_name), "Undef-%ld", layer_state);
43 matrix_write_P(matrix, PSTR("Lower")); 34 oled_write_ln(layer_name, false);
44 break; 35 }
45 default: 36}
46 matrix_write(matrix, buf);
47 }
48 37
49 // Host Keyboard LED Status 38void render_logo(void) {
50 char led[40]; 39 static const char helix_logo[] PROGMEM = {0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94, 0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0};
51 snprintf(led, sizeof(led), "\n%s %s %s", 40 oled_write_P(helix_logo, false);
52 (host_keyboard_leds() & (1<<USB_LED_NUM_LOCK)) ? "NMLK" : " ",
53 (host_keyboard_leds() & (1<<USB_LED_CAPS_LOCK)) ? "CAPS" : " ",
54 (host_keyboard_leds() & (1<<USB_LED_SCROLL_LOCK)) ? "SCLK" : " ");
55 matrix_write(matrix, led);
56} 41}
57 42
58void iota_gfx_task_user(void) { 43void render_mode_icon(bool is_windows) {
59 struct CharacterMatrix matrix; 44 static const char logo[][2][3] = {
45 {{0x95, 0x96, 0}, {0xb5, 0xb6, 0}},
46 {{0x97, 0x98, 0}, {0xb7, 0xb8, 0}},
47 };
48 static char mode_icon[10];
60 49
61#if DEBUG_TO_SCREEN 50 snprintf(mode_icon, sizeof(mode_icon), "%s\n%s ", logo[is_windows][0], logo[is_windows][1]);
62 if (debug_enable) { return; } 51 oled_write(mode_icon, false);
63#endif 52}
53
54oled_rotation_t oled_init_user(oled_rotation_t rotation) {
55 // flips the display 180 degrees if offhand
56 return is_keyboard_left() ? rotation : rotation ^ OLED_ROTATION_180;
57}
64 58
65 matrix_clear(&matrix); 59void oled_task_user(void) {
66 if (is_master) { 60 if (is_keyboard_left()) {
67 render_status(&matrix); 61 render_mode_icon(!get_enable_kc_lang());
68 } else { 62 render_layer_state();
69 render_logo(&matrix); 63 render_host_led_state();
70 } 64 } else {
71 matrix_update(&display, &matrix); 65 render_logo();
66 }
72} 67}
68#endif // OLED_DRIVER_ENABLE
diff --git a/keyboards/helix/rev2/keymaps/edvorakjp/oled.h b/keyboards/helix/rev2/keymaps/edvorakjp/oled.h
index 421de2d81..994dcb5f5 100644
--- a/keyboards/helix/rev2/keymaps/edvorakjp/oled.h
+++ b/keyboards/helix/rev2/keymaps/edvorakjp/oled.h
@@ -1,19 +1,12 @@
1#ifndef OLED_USER_H 1#pragma once
2#define OLED_USER_H
3 2
4//SSD1306 OLED update loop, make sure to add #define SSD1306OLED in config.h
5#include "ssd1306.h"
6#include "edvorakjp.h" 3#include "edvorakjp.h"
7 4
8//assign the right code to your layers for OLED display
9#define L_BASE 0
10
11extern uint8_t is_master;
12extern bool japanese_mode; 5extern bool japanese_mode;
13 6
14void matrix_update(struct CharacterMatrix *dest, 7void render_host_led_state(void);
15 const struct CharacterMatrix *source); 8void render_layer_state(void);
16void render_status(struct CharacterMatrix *matrix); 9void render_logo(void);
17void iota_gfx_task_user(void); 10void render_mode_icon(bool is_windows);
18 11oled_rotation_t oled_init_user(oled_rotation_t rotation);
19#endif // OLED_CONFIG_USER_H 12void oled_task_user(void);
diff --git a/keyboards/helix/rev2/keymaps/edvorakjp/rules.mk b/keyboards/helix/rev2/keymaps/edvorakjp/rules.mk
index 18bef6bf7..59b7acad5 100644
--- a/keyboards/helix/rev2/keymaps/edvorakjp/rules.mk
+++ b/keyboards/helix/rev2/keymaps/edvorakjp/rules.mk
@@ -18,6 +18,7 @@ TAP_DANCE_ENABLE = yes
18# LED_UNDERGLOW_ENABLE = no # LED underglow (Enable WS2812 RGB underlight.) 18# LED_UNDERGLOW_ENABLE = no # LED underglow (Enable WS2812 RGB underlight.)
19# LED_ANIMATIONS = yes # LED animations 19# LED_ANIMATIONS = yes # LED animations
20# IOS_DEVICE_ENABLE = no # connect to IOS device (iPad,iPhone) 20# IOS_DEVICE_ENABLE = no # connect to IOS device (iPad,iPhone)
21OLED_SELECT = core
21 22
22# convert Helix-specific options (that represent combinations of standard options) 23# convert Helix-specific options (that represent combinations of standard options)
23# into QMK standard options. 24# into QMK standard options.
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-15 23:45:16 +0000