@ -1,25 +1,25 @@ | |||
#ifndef CONFIG_USER_H | |||
#define CONFIG_USER_H | |||
#pragma once | |||
/* Select hand configuration */ | |||
// #define MASTER_LEFT | |||
#define MASTER_RIGHT | |||
#define MASTER_LEFT | |||
// #define MASTER_RIGHT | |||
// #define EE_HANDS | |||
#define SSD1306OLED | |||
#define SWAP_SCLN | |||
// #define TAPPING_FORCE_HOLD | |||
#define TAPPING_TERM 300 | |||
#define IGNORE_MOD_TAP_INTERRUPT | |||
#undef RGBLED_NUM | |||
#define RGBLIGHT_EFFECT_STATIC_GRADIENT | |||
#define RGBLED_NUM 27 | |||
#define RGBLIGHT_LIMIT_VAL 100 | |||
#define RGBLIGHT_HUE_STEP 10 | |||
#define RGBLIGHT_SAT_STEP 17 | |||
#define RGBLIGHT_VAL_STEP 17 | |||
#ifdef RGBLIGHT_ENABLE | |||
# undef RGBLED_NUM | |||
# define RGBLIGHT_EFFECT_STATIC_GRADIENT | |||
# define RGBLED_NUM 27 | |||
# define RGBLIGHT_LIMIT_VAL 100 | |||
# define RGBLIGHT_HUE_STEP 10 | |||
# define RGBLIGHT_SAT_STEP 17 | |||
# define RGBLIGHT_VAL_STEP 17 | |||
#endif // RGBLIGHT_ENABLE | |||
#endif // CONFIG_USER_H | |||
#define OLED_FONT_H "keyboards/crkbd/lib/glcdfont.c" |
@ -1,76 +1,55 @@ | |||
#include <stdio.h> | |||
#include <string.h> | |||
#include "oled.h" | |||
// NOTE: Redefined to avoid to use snprintf(); It makes size of firmware big. | |||
const char *read_mode_icon(bool windows_mode) { | |||
static const char logo[][2][3] = {{{0x95, 0x96, 0}, {0xb5, 0xb6, 0}}, {{0x97, 0x98, 0}, {0xb7, 0xb8, 0}}}; | |||
static char mode_icon[10]; | |||
int mode_number = windows_mode ? 1 : 0; | |||
strcpy(mode_icon, logo[mode_number][0]); | |||
strcat(mode_icon, "\n"); | |||
strcat(mode_icon, logo[mode_number][1]); | |||
return mode_icon; | |||
#ifdef OLED_DRIVER_ENABLE | |||
void render_host_led_state(void) { oled_write(read_host_led_state(), false); } | |||
void render_layer_state(void) { | |||
char layer_name[17]; | |||
oled_write_P(PSTR("Layer: "), false); | |||
switch (biton32(layer_state)) { | |||
case L_EDVORAKJP_BASE: | |||
oled_write_ln_P(PSTR("Default"), false); | |||
break; | |||
case L_EDVORAKJP_LOWER: | |||
oled_write_ln_P(PSTR("Lower"), false); | |||
break; | |||
case L_EDVORAKJP_RAISE: | |||
oled_write_ln_P(PSTR("Raise"), false); | |||
break; | |||
default: | |||
snprintf(layer_name, sizeof(layer_name), "Undef-%ld", layer_state); | |||
oled_write_ln(layer_name, false); | |||
} | |||
} | |||
const char *read_layer_state(void) { | |||
static char layer_state_str[24]; | |||
char layer_name[17]; | |||
switch (biton32(layer_state)) { | |||
case L_BASE: | |||
strcpy(layer_name, "Default"); | |||
break; | |||
case _RAISE: | |||
strcpy(layer_name, "Raise"); | |||
break; | |||
case _LOWER: | |||
strcpy(layer_name, "Lower"); | |||
break; | |||
default: | |||
snprintf(layer_name, sizeof(layer_name), "Undef-%ld", layer_state); | |||
} | |||
void render_logo(void) { oled_write(read_logo(), false); } | |||
strcpy(layer_state_str, "Layer: "); | |||
void render_mode_icon(bool is_windows) { | |||
static const char logo[][2][3] = { | |||
{{0x95, 0x96, 0}, {0xb5, 0xb6, 0}}, | |||
{{0x97, 0x98, 0}, {0xb7, 0xb8, 0}}, | |||
}; | |||
static char mode_icon[10]; | |||
strcat(layer_state_str, layer_name); | |||
strcat(layer_state_str, "\n"); | |||
return layer_state_str; | |||
snprintf(mode_icon, sizeof(mode_icon), "%s\n%s ", logo[is_windows][0], logo[is_windows][1]); | |||
oled_write(mode_icon, false); | |||
} | |||
const char *read_host_led_state(void) { | |||
static char led_str[24]; | |||
strcpy(led_str, (host_keyboard_leds() & (1<<USB_LED_NUM_LOCK)) ? "NMLK" : " "); | |||
strcat(led_str, (host_keyboard_leds() & (1<<USB_LED_CAPS_LOCK)) ? " CAPS" : " "); | |||
strcat(led_str, (host_keyboard_leds() & (1<<USB_LED_SCROLL_LOCK)) ? " SCLK" : " "); | |||
return led_str; | |||
oled_rotation_t oled_init_user(oled_rotation_t rotation) { | |||
// flips the display 180 degrees if offhand | |||
return is_keyboard_left() ? rotation : rotation ^ OLED_ROTATION_180; | |||
} | |||
void matrix_update(struct CharacterMatrix *dest, | |||
const struct CharacterMatrix *source) { | |||
if (memcmp(dest->display, source->display, sizeof(dest->display))) { | |||
memcpy(dest->display, source->display, sizeof(dest->display)); | |||
dest->dirty = true; | |||
} | |||
} | |||
void iota_gfx_task_user(void) { | |||
struct CharacterMatrix matrix; | |||
matrix_clear(&matrix); | |||
#ifdef MASTER_RIGHT | |||
if (!is_master) { | |||
#else | |||
if (is_master) { | |||
#endif // MASTER_RIGHT | |||
matrix_write(&matrix, read_mode_icon(!get_enable_kc_lang())); | |||
matrix_write(&matrix, " "); | |||
matrix_write(&matrix, read_layer_state()); | |||
matrix_write(&matrix, read_host_led_state()); | |||
} else { | |||
matrix_write(&matrix, read_logo()); | |||
} | |||
matrix_update(&display, &matrix); | |||
void oled_task_user(void) { | |||
if (is_keyboard_left()) { | |||
render_mode_icon(!get_enable_kc_lang()); | |||
render_layer_state(); | |||
render_host_led_state(); | |||
} else { | |||
render_logo(); | |||
} | |||
} | |||
#endif // OLED_DRIVER_ENABLE |
@ -1,24 +1,17 @@ | |||
#ifndef OLED_USER_H | |||
#define OLED_USER_H | |||
#pragma once | |||
//SSD1306 OLED update loop, make sure to add #define SSD1306OLED in config.h | |||
#include "ssd1306.h" | |||
#include "edvorakjp.h" | |||
//assign the right code to your layers for OLED display | |||
#define L_BASE 0 | |||
extern uint8_t is_master; | |||
extern bool japanese_mode; | |||
// method prototypes defined in crkbd/lib | |||
extern const char *read_host_led_state(void); | |||
extern const char *read_logo(void); | |||
extern const char *read_mode_icon(bool swap); | |||
const char *read_mode_icon(bool swap); | |||
const char *read_layer_state(void); | |||
const char *read_host_led_state(void); | |||
void matrix_update(struct CharacterMatrix *dest, | |||
const struct CharacterMatrix *source); | |||
void iota_gfx_task_user(void); | |||
#endif // OLED_CONFIG_USER_H | |||
void render_host_led_state(void); | |||
void render_layer_state(void); | |||
void render_logo(void); | |||
void render_mode_icon(bool is_windows); | |||
oled_rotation_t oled_init_user(oled_rotation_t rotation); | |||
void oled_task_user(void); |
@ -1,38 +1,24 @@ | |||
#include QMK_KEYBOARD_H | |||
#include "split_util.h" | |||
#include "keymap_xrows.h" | |||
#ifdef SSD1306OLED | |||
#include "oled.h" | |||
#endif | |||
// keymaps definitions are moved to keymap_Xrows.c. | |||
#ifdef SSD1306OLED | |||
void matrix_init_keymap(void) { | |||
//SSD1306 OLED init, make sure to add #define SSD1306OLED in config.h | |||
iota_gfx_init(!has_usb()); // turns on the display | |||
} | |||
void matrix_scan_user(void) { | |||
iota_gfx_task(); // this is what updates the display continuously | |||
} | |||
#endif | |||
#ifdef RGBLIGHT_ENABLE | |||
uint32_t layer_state_set_keymap(uint32_t state) { | |||
rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT); | |||
switch (biton32(state)) { | |||
case _LOWER: | |||
rgblight_sethsv_noeeprom_red(); | |||
break; | |||
case _RAISE: | |||
rgblight_sethsv_noeeprom_blue(); | |||
break; | |||
default: // for any other layers, or the default layer | |||
rgblight_mode(RGBLIGHT_MODE_STATIC_GRADIENT + 3); | |||
rgblight_sethsv_red(); | |||
break; | |||
} | |||
return state; | |||
rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT); | |||
switch (biton32(state)) { | |||
case L_EDVORAKJP_LOWER: | |||
rgblight_sethsv_noeeprom_red(); | |||
break; | |||
case L_EDVORAKJP_RAISE: | |||
rgblight_sethsv_noeeprom_green(); | |||
break; | |||
default: // for any other layers, or the default layer | |||
rgblight_mode(RGBLIGHT_MODE_STATIC_GRADIENT + 3); | |||
rgblight_sethsv_red(); | |||
break; | |||
} | |||
return state; | |||
} | |||
#endif |
@ -1,41 +1,42 @@ | |||
#include "helix.h" | |||
#include "keymap_xrows.h" | |||
// clang-format off | |||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
[_EDVORAK] = LAYOUT_kc( | |||
//,----+----+-----+-----+-----+----. ,----+-----+-----+-----+----+----. | |||
GRV ,QUOT,COMM , DOT , Y , Q , F , G , R , W , P ,BSLS, | |||
//|----+----+-----+-----+-----+----| |----+-----+-----+-----+----+----| | |||
EQL , A ,LA(O),LG(E),LC(I), U , D ,RS(T),RG(N),RA(S), M ,MINS, | |||
//|----+----+-----+-----+-----+----| |----+-----+-----+-----+----+----| | |||
ESC ,SCLN, X , C , V , Z , H , J , K , L , B ,SLSH, | |||
//|----+----+-----+-----+-----+----+----. ,----+----+-----+-----+-----+----+----| | |||
HOME,PGDN,PGUP , END ,TMB1 ,TMB2,TMB3, TMB4,TMB5,TMB6 ,LEFT ,DOWN , UP ,RGHT | |||
//`----+----+-----+-----+-----+----+----/ \----+----+-----+-----+-----+----+----' | |||
[L_EDVORAKJP_BASE] = LAYOUT_wrapper( | |||
//,-----------------------------------------------------. ,-----------------------------------------------------. | |||
KC_GRV, __EDVORAKJP_BASE_L1__ , __EDVORAKJP_BASE_R1__ , KC_BSLS, | |||
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| | |||
KC_EQL, __EDVORAKJP_BASE_L2__ , __EDVORAKJP_BASE_R2__ , KC_MINS, | |||
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| | |||
KC_ESC, __EDVORAKJP_BASE_L3__ , __EDVORAKJP_BASE_R3__ , KC_SLSH, | |||
//|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| | |||
__EDVORAKJP_PAGE__ , LA_TAB, LS_SPC,LOWER_TD, RAISE_TD, RC_BSPC, RG_ENT, __EDVORAKJP_CURSOR__ | |||
//`--------------------------------------------------------------' `--------------------------------------------------------------' | |||
), | |||
[_LOWER] = LAYOUT_kc( | |||
//,----+----+------+------+------+----. ,----+------+------+-------+----+----. | |||
, , LCBR , LBRC , LPRN , , , RPRN , RBRC , RCBR , , , | |||
//|----+----+------+------+------+----| |----+------+------+-------+----+----| | |||
F1 , F2 ,LA(F3),LG(F4),LC(F5), F6 , F7 ,RS(F8),RG(F9),RA(F10),F11 ,F12 , | |||
//|----+----+------+------+------+----| |----+------+------+-------+----+----| | |||
PSCR, , HOME , PGDN , PGUP ,END , LEFT, DOWN , UP , RGHT , , , | |||
//|----+----+------+------+------+----+----. ,----+----+------+------+-------+----+----| | |||
, , , , , , NO , MAC ,TMB7, , , , , | |||
//`----+----+------+------+------+----+----/ \----+----+------+------+-------+----+----' | |||
[L_EDVORAKJP_LOWER] = LAYOUT_wrapper( | |||
//,-----------------------------------------------------. ,-----------------------------------------------------. | |||
XXXXXXX, XXXXXXX, __EDVORAKJP_BRACKET_L__ , XXXXXXX, XXXXXXX, __EDVORAKJP_BRACKET_R__ , XXXXXXX, XXXXXXX, | |||
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| | |||
__EDVORAKJP_FUNCTION_L__ , __EDVORAKJP_FUNCTION_R__ , | |||
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| | |||
KC_PSCR, XXXXXXX, __EDVORAKJP_PAGE__ , __EDVORAKJP_CURSOR__ , XXXXXXX, XXXXXXX, | |||
//|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| | |||
__KC_TRNS_x4__ , KC_TRNS, KC_TRNS, XXXXXXX, KC_MAC, RC_DEL, KC_TRNS, __KC_TRNS_x4__ | |||
//`--------------------------------------------------------------' `--------------------------------------------------------------' | |||
), | |||
[_RAISE] = LAYOUT_kc( | |||
//,----+----+-----+-----+-----+----. ,----+-----+-----+-----+----+----. | |||
, ,EXLM , AT ,HASH ,DLR , PERC,CIRC ,AMPR ,ASTR , , , | |||
//|----+----+-----+-----+-----+----| |----+-----+-----+-----+----+----| | |||
, 1 ,LA(2),LG(3),LC(4), 5 , 6 ,RS(7),RG(8),RA(9), 0 , , | |||
//|----+----+-----+-----+-----+----| |----+-----+-----+-----+----+----| | |||
PSCR, ,HOME ,PGDN ,PGUP ,END , LEFT,DOWN , UP ,RGHT , , , | |||
//|----+----+-----+-----+-----+----+----. ,----+----+-----+-----+-----+----+----| | |||
, , , , , ,WIN , NO , , , , , , | |||
//`----+----+-----+-----+-----+----+----/ \----+----+-----+-----+-----+----+----' | |||
[L_EDVORAKJP_RAISE] = LAYOUT_wrapper( | |||
//,-----------------------------------------------------. ,-----------------------------------------------------. | |||
XXXXXXX, XXXXXXX, __EDVORAKJP_SYMBOL_L__ , __EDVORAKJP_SYMBOL_R__ , XXXXXXX, XXXXXXX, | |||
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| | |||
XXXXXXX, __EDVORAKJP_NUMBER_L__ , __EDVORAKJP_NUMBER_R__ , XXXXXXX, | |||
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| | |||
KC_PSCR, XXXXXXX, __EDVORAKJP_PAGE__ , __EDVORAKJP_CURSOR__ , XXXXXXX, XXXXXXX, | |||
//|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| | |||
__KC_TRNS_x4__ , KC_TRNS, KC_TRNS, KC_WIN, XXXXXXX, KC_TRNS, KC_TRNS, __KC_TRNS_x4__ | |||
//`--------------------------------------------------------------' `--------------------------------------------------------------' | |||
) | |||
}; | |||
// clang-format on |
@ -1,47 +1,48 @@ | |||
#include "helix.h" | |||
#include "keymap_xrows.h" | |||
// clang-format off | |||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
[_EDVORAK] = LAYOUT_kc( | |||
//,----+----+-----+-----+-----+----. ,----+-----+-----+-----+----+----. | |||
ESC ,EXLM, AT ,HASH , DLR ,PERC, CIRC,AMPR ,ASTR ,LPRN ,RPRN,BSPC, | |||
//|----+----+-----+-----+-----+----| |----+-----+-----+-----+----+----| | |||
GRV ,QUOT,COMM , DOT , Y , Q , F , G , R , W , P ,BSLS, | |||
//|----+----+-----+-----+-----+----| |----+-----+-----+-----+----+----| | |||
EQL , A ,LA(O),LG(E),LC(I), U , D ,RS(T),RG(N),RA(S), M ,MINS, | |||
//|----+----+-----+-----+-----+----+----. ,----+----+-----+-----+-----+----+----| | |||
TAB ,SCLN, X , C , V , Z , NO , NO , H , J , K , L , B ,SLSH, | |||
//|----+----+-----+-----+-----+----+----| |----+----+-----+-----+-----+----+----| | |||
HOME,PGDN,PGUP , END ,TMB1 ,TMB2,TMB3, TMB4,TMB5,TMB6 ,LEFT ,DOWN , UP ,RGHT | |||
//`----+----+-----+-----+-----+----+----/ \----+----+-----+-----+-----+----+----' | |||
[L_EDVORAKJP_BASE] = LAYOUT_wrapper( | |||
//,-----------------------------------------------------. ,-----------------------------------------------------. | |||
KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, | |||
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| | |||
KC_GRV, __EDVORAKJP_BASE_L1__ , __EDVORAKJP_BASE_R1__ , KC_BSLS, | |||
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| | |||
KC_EQL, __EDVORAKJP_BASE_L2__ , __EDVORAKJP_BASE_R2__ , KC_MINS, | |||
//|--------+--------+--------+--------+--------+--------+--------. ,--------+--------+--------+--------+--------+--------+--------| | |||
KC_ESC, __EDVORAKJP_BASE_L3__ , XXXXXXX, XXXXXXX, __EDVORAKJP_BASE_R3__ , KC_SLSH, | |||
//|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| | |||
__EDVORAKJP_PAGE__ , LA_TAB, LS_SPC,LOWER_TD, RAISE_TD, RC_BSPC, RG_ENT, __EDVORAKJP_CURSOR__ | |||
//`--------------------------------------------------------------' `--------------------------------------------------------------' | |||
), | |||
[_LOWER] = LAYOUT_kc( | |||
//,----+----+------+------+------+----. ,----+------+------+-------+----+----. | |||
PSCR, , , , , , , , , , , , | |||
//|----+----+------+------+------+----| |----+------+------+-------+----+----| | |||
, , LCBR , LBRC , LPRN , , , RPRN , RBRC , RCBR , , , | |||
//|----+----+------+------+------+----| |----+------+------+-------+----+----| | |||
F1 , F2 ,LA(F3),LG(F4),LC(F5), F6 , F7 ,RS(F8),RG(F9),RA(F10),F11 ,F12 , | |||
//|----+----+------+------+------+----+----. ,----+----+------+------+-------+----+----| | |||
, , HOME , PGDN , PGUP ,END , , ,LEFT, DOWN , UP , RGHT , , , | |||
//|----+----+------+------+------+----+----| |----+----+------+------+-------+----+----| | |||
, , , , , , NO , MAC ,TMB7, , , , , | |||
//`----+----+------+------+------+----+----/ \----+----+------+------+-------+----+----' | |||
[L_EDVORAKJP_LOWER] = LAYOUT_wrapper( | |||
//,-----------------------------------------------------. ,-----------------------------------------------------. | |||
__KC_TRNS_x6__ , __KC_TRNS_x6__ , | |||
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| | |||
XXXXXXX, XXXXXXX, __EDVORAKJP_BRACKET_L__ , XXXXXXX, XXXXXXX, __EDVORAKJP_BRACKET_R__ , XXXXXXX, XXXXXXX, | |||
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| | |||
__EDVORAKJP_FUNCTION_L__ , __EDVORAKJP_FUNCTION_R__ , | |||
//|--------+--------+--------+--------+--------+--------+--------. ,--------+--------+--------+--------+--------+--------+--------| | |||
KC_PSCR, XXXXXXX, __EDVORAKJP_PAGE__ , KC_TRNS, KC_TRNS, __EDVORAKJP_CURSOR__ , XXXXXXX, XXXXXXX, | |||
//|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| | |||
__KC_TRNS_x4__ , KC_TRNS, KC_TRNS, XXXXXXX, KC_MAC, RC_DEL, KC_TRNS, __KC_TRNS_x4__ | |||
//`--------------------------------------------------------------' `--------------------------------------------------------------' | |||
), | |||
[_RAISE] = LAYOUT_kc( | |||
//,----+----+-----+-----+-----+----. ,----+-----+-----+-----+----+----. | |||
PSCR, , , , , , , , , , , , | |||
//|----+----+-----+-----+-----+----| |----+-----+-----+-----+----+----| | |||
, ,EXLM , AT ,HASH ,DLR , PERC,CIRC ,AMPR ,ASTR , , , | |||
//|----+----+-----+-----+-----+----| |----+-----+-----+-----+----+----| | |||
, 1 ,LA(2),LG(3),LC(4), 5 , 6 ,RS(7),RG(8),RA(9), 0 , , | |||
//|----+----+-----+-----+-----+----+----. ,----+----+-----+-----+-----+----+----| | |||
, ,HOME ,PGDN ,PGUP ,END , , ,LEFT,DOWN , UP ,RGHT , , , | |||
//|----+----+-----+-----+-----+----+----| |----+----+-----+-----+-----+----+----| | |||
, , , , , ,WIN , NO , , , , , , | |||
//`----+----+-----+-----+-----+----+----/ \----+----+-----+-----+-----+----+----' | |||
[L_EDVORAKJP_RAISE] = LAYOUT_wrapper( | |||
//,-----------------------------------------------------. ,-----------------------------------------------------. | |||
__KC_TRNS_x6__ , __KC_TRNS_x6__ , | |||
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| | |||
XXXXXXX, XXXXXXX, __EDVORAKJP_SYMBOL_L__ , __EDVORAKJP_SYMBOL_R__ , XXXXXXX, XXXXXXX, | |||
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| | |||
XXXXXXX, __EDVORAKJP_NUMBER_L__ , __EDVORAKJP_NUMBER_R__ , XXXXXXX, | |||
//|--------+--------+--------+--------+--------+--------+--------. ,--------+--------+--------+--------+--------+--------+--------| | |||
KC_PSCR, XXXXXXX, __EDVORAKJP_PAGE__ , KC_TRNS, KC_TRNS, __EDVORAKJP_CURSOR__ , XXXXXXX, XXXXXXX, | |||
//|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| | |||
__KC_TRNS_x4__ , KC_TRNS, KC_TRNS, KC_WIN, XXXXXXX, KC_TRNS, KC_TRNS, __KC_TRNS_x4__ | |||
//`--------------------------------------------------------------' `--------------------------------------------------------------' | |||
) | |||
}; | |||
// clang-format on |
@ -1,72 +1,68 @@ | |||
#include <stdio.h> | |||
#include <string.h> | |||
#include "oled.h" | |||
static void render_logo(struct CharacterMatrix *matrix) { | |||
#ifdef OLED_DRIVER_ENABLE | |||
void render_host_led_state(void) { | |||
char led_state_str[24]; | |||
uint8_t leds = host_keyboard_leds(); | |||
static char logo[] = { | |||
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}; | |||
matrix_write(matrix, logo); | |||
} | |||
bool is_num_lock_enabled = leds & (1 << USB_LED_NUM_LOCK); | |||
bool is_caps_lock_enabled = leds & (1 << USB_LED_CAPS_LOCK); | |||
bool is_scroll_lock_enabled = leds & (1 << USB_LED_SCROLL_LOCK); | |||
void matrix_update(struct CharacterMatrix *dest, | |||
const struct CharacterMatrix *source) { | |||
if (memcmp(dest->display, source->display, sizeof(dest->display))) { | |||
memcpy(dest->display, source->display, sizeof(dest->display)); | |||
dest->dirty = true; | |||
} | |||
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" : "- "); | |||
oled_write(led_state_str, false); | |||
} | |||
void render_status(struct CharacterMatrix *matrix) { | |||
// Render to mode icon | |||
static char logo[][2][3] = {{{0x95,0x96,0},{0xb5,0xb6,0}},{{0x97,0x98,0},{0xb7,0xb8,0}}}; | |||
int mode_number = get_enable_kc_lang() ? 0 : 1; | |||
matrix_write(matrix, logo[mode_number][0]); | |||
matrix_write(matrix, "\n"); | |||
matrix_write(matrix, logo[mode_number][1]); | |||
void render_layer_state(void) { | |||
char layer_name[17]; | |||
oled_write_P(PSTR("Layer: "), false); | |||
// 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 | |||
char buf[40]; | |||
snprintf(buf,sizeof(buf), "Undef-%ld", layer_state); | |||
matrix_write_P(matrix, PSTR("\nLayer: ")); | |||
switch (biton32(layer_state)) { | |||
case L_BASE: | |||
matrix_write_P(matrix, PSTR("Default")); | |||
break; | |||
case _RAISE: | |||
matrix_write_P(matrix, PSTR("Raise")); | |||
break; | |||
case _LOWER: | |||
matrix_write_P(matrix, PSTR("Lower")); | |||
break; | |||
default: | |||
matrix_write(matrix, buf); | |||
} | |||
switch (biton32(layer_state)) { | |||
case L_EDVORAKJP_BASE: | |||
oled_write_ln_P(PSTR("Default"), false); | |||
break; | |||
case L_EDVORAKJP_LOWER: | |||
oled_write_ln_P(PSTR("Lower"), false); | |||
break; | |||
case L_EDVORAKJP_RAISE: | |||
oled_write_ln_P(PSTR("Raise"), false); | |||
break; | |||
default: | |||
snprintf(layer_name, sizeof(layer_name), "Undef-%ld", layer_state); | |||
oled_write_ln(layer_name, false); | |||
} | |||
} | |||
// Host Keyboard LED Status | |||
char led[40]; | |||
snprintf(led, sizeof(led), "\n%s %s %s", | |||
(host_keyboard_leds() & (1<<USB_LED_NUM_LOCK)) ? "NMLK" : " ", | |||
(host_keyboard_leds() & (1<<USB_LED_CAPS_LOCK)) ? "CAPS" : " ", | |||
(host_keyboard_leds() & (1<<USB_LED_SCROLL_LOCK)) ? "SCLK" : " "); | |||
matrix_write(matrix, led); | |||
void render_logo(void) { | |||
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}; | |||
oled_write_P(helix_logo, false); | |||
} | |||
void iota_gfx_task_user(void) { | |||
struct CharacterMatrix matrix; | |||
void render_mode_icon(bool is_windows) { | |||
static const char logo[][2][3] = { | |||
{{0x95, 0x96, 0}, {0xb5, 0xb6, 0}}, | |||
{{0x97, 0x98, 0}, {0xb7, 0xb8, 0}}, | |||
}; | |||
static char mode_icon[10]; | |||
#if DEBUG_TO_SCREEN | |||
if (debug_enable) { return; } | |||
#endif | |||
snprintf(mode_icon, sizeof(mode_icon), "%s\n%s ", logo[is_windows][0], logo[is_windows][1]); | |||
oled_write(mode_icon, false); | |||
} | |||
oled_rotation_t oled_init_user(oled_rotation_t rotation) { | |||
// flips the display 180 degrees if offhand | |||
return is_keyboard_left() ? rotation : rotation ^ OLED_ROTATION_180; | |||
} | |||
matrix_clear(&matrix); | |||
if (is_master) { | |||
render_status(&matrix); | |||
} else { | |||
render_logo(&matrix); | |||
} | |||
matrix_update(&display, &matrix); | |||
void oled_task_user(void) { | |||
if (is_keyboard_left()) { | |||
render_mode_icon(!get_enable_kc_lang()); | |||
render_layer_state(); | |||
render_host_led_state(); | |||
} else { | |||
render_logo(); | |||
} | |||
} | |||
#endif // OLED_DRIVER_ENABLE |
@ -1,19 +1,12 @@ | |||
#ifndef OLED_USER_H | |||
#define OLED_USER_H | |||
#pragma once | |||
//SSD1306 OLED update loop, make sure to add #define SSD1306OLED in config.h | |||
#include "ssd1306.h" | |||
#include "edvorakjp.h" | |||
//assign the right code to your layers for OLED display | |||
#define L_BASE 0 | |||
extern uint8_t is_master; | |||
extern bool japanese_mode; | |||
void matrix_update(struct CharacterMatrix *dest, | |||
const struct CharacterMatrix *source); | |||
void render_status(struct CharacterMatrix *matrix); | |||
void iota_gfx_task_user(void); | |||
#endif // OLED_CONFIG_USER_H | |||
void render_host_led_state(void); | |||
void render_layer_state(void); | |||
void render_logo(void); | |||
void render_mode_icon(bool is_windows); | |||
oled_rotation_t oled_init_user(oled_rotation_t rotation); | |||
void oled_task_user(void); |
@ -1,32 +1,22 @@ | |||
#include "edvorakjp.h" | |||
void matrix_init_user(void) { | |||
edvorakjp_status_init(); | |||
matrix_init_keymap(); | |||
edvorakjp_status_init(); | |||
matrix_init_keymap(); | |||
} | |||
__attribute__ ((weak)) | |||
void matrix_init_keymap() {} | |||
__attribute__((weak)) void matrix_init_keymap() {} | |||
uint32_t layer_state_set_user(uint32_t state) { | |||
state = update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); | |||
return layer_state_set_keymap(state); | |||
state = update_tri_layer_state(state, L_EDVORAKJP_LOWER, L_EDVORAKJP_RAISE, L_EDVORAKJP_ADJUST); | |||
return layer_state_set_keymap(state); | |||
} | |||
__attribute__ ((weak)) | |||
uint32_t layer_state_set_keymap(uint32_t state) { | |||
return state; | |||
} | |||
__attribute__((weak)) uint32_t layer_state_set_keymap(uint32_t state) { return state; } | |||
bool process_record_user(uint16_t keycode, keyrecord_t *record) { | |||
return process_record_keymap(keycode, record) &&\ | |||
process_record_edvorakjp_swap_scln(keycode, record) &&\ | |||
process_record_edvorakjp_config(keycode, record) &&\ | |||
process_record_layer(keycode, record) &&\ | |||
process_record_ime(keycode, record); | |||
bool process_record_user_result = process_record_keymap(keycode, record) && process_record_edvorakjp_swap_scln(keycode, record) && process_record_edvorakjp_config(keycode, record) && process_record_layer(keycode, record) && process_record_ime(keycode, record); | |||
return process_record_user_result; | |||
} | |||
__attribute__ ((weak)) | |||
bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { | |||
return true; | |||
} | |||
__attribute__((weak)) bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { return true; } |