diff options
| -rw-r--r-- | keyboards/helix/rev2/keymaps/five_rows_jis/keymap.c | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/keyboards/helix/rev2/keymaps/five_rows_jis/keymap.c b/keyboards/helix/rev2/keymaps/five_rows_jis/keymap.c index 141b22275..df00366e3 100644 --- a/keyboards/helix/rev2/keymaps/five_rows_jis/keymap.c +++ b/keyboards/helix/rev2/keymaps/five_rows_jis/keymap.c | |||
| @@ -214,7 +214,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 214 | #endif | 214 | #endif |
| 215 | 215 | ||
| 216 | #ifdef SSD1306OLED | 216 | #ifdef SSD1306OLED |
| 217 | char keylog[20] = {}; | 217 | char keylog[24] = {}; |
| 218 | const char code_to_name[60] = { | 218 | const char code_to_name[60] = { |
| 219 | ' ', ' ', ' ', ' ', 'a', 'b', 'c', 'd', 'e', 'f', | 219 | ' ', ' ', ' ', ' ', 'a', 'b', 'c', 'd', 'e', 'f', |
| 220 | 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', | 220 | 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', |
| @@ -223,7 +223,7 @@ const char code_to_name[60] = { | |||
| 223 | 'R', 'E', 'B', 'T', ' ', '-', ' ', '@', ' ', ' ', | 223 | 'R', 'E', 'B', 'T', ' ', '-', ' ', '@', ' ', ' ', |
| 224 | ' ', ';', ':', ' ', ',', '.', '/', ' ', ' ', ' '}; | 224 | ' ', ';', ':', ' ', ',', '.', '/', ' ', ' ', ' '}; |
| 225 | 225 | ||
| 226 | inline void set_keylog(uint16_t keycode, keyrecord_t *record) | 226 | static inline void set_keylog(uint16_t keycode, keyrecord_t *record) |
| 227 | { | 227 | { |
| 228 | char name = ' '; | 228 | char name = ' '; |
| 229 | uint8_t leds = host_keyboard_leds(); | 229 | uint8_t leds = host_keyboard_leds(); |
| @@ -246,6 +246,12 @@ inline void set_keylog(uint16_t keycode, keyrecord_t *record) | |||
| 246 | } | 246 | } |
| 247 | #endif | 247 | #endif |
| 248 | 248 | ||
| 249 | #ifdef RGBLIGHT_ENABLE | ||
| 250 | #define RGBLIGHT(mode) rgblight_mode(mode) | ||
| 251 | #else | ||
| 252 | #define RGBLIGHT(mode) | ||
| 253 | #endif | ||
| 254 | |||
| 249 | // define variables for reactive RGB | 255 | // define variables for reactive RGB |
| 250 | int RGB_current_mode; | 256 | int RGB_current_mode; |
| 251 | #ifdef ADJUST_MACRO_ENABLE | 257 | #ifdef ADJUST_MACRO_ENABLE |
| @@ -263,12 +269,6 @@ void update_tri_layer_RGB(uint8_t layer1, uint8_t layer2, uint8_t layer3) { | |||
| 263 | #define ADJUST_MACRO(layer1, layer2, layer3) | 269 | #define ADJUST_MACRO(layer1, layer2, layer3) |
| 264 | #endif | 270 | #endif |
| 265 | 271 | ||
| 266 | #ifdef RGBLIGHT_ENABLE | ||
| 267 | #define RGBLIGHT(mode) rgblight_mode(mode) | ||
| 268 | #else | ||
| 269 | #define RGBLIGHT(mode) | ||
| 270 | #endif | ||
| 271 | |||
| 272 | bool process_record_user(uint16_t keycode, keyrecord_t *record) { | 272 | bool process_record_user(uint16_t keycode, keyrecord_t *record) { |
| 273 | #ifdef SSD1306OLED | 273 | #ifdef SSD1306OLED |
| 274 | if (record->event.pressed) { | 274 | if (record->event.pressed) { |
| @@ -344,7 +344,7 @@ void matrix_scan_user(void) { | |||
| 344 | iota_gfx_task(); // this is what updates the display continuously | 344 | iota_gfx_task(); // this is what updates the display continuously |
| 345 | } | 345 | } |
| 346 | 346 | ||
| 347 | inline void matrix_update(struct CharacterMatrix *dest, | 347 | static inline void matrix_update(struct CharacterMatrix *dest, |
| 348 | const struct CharacterMatrix *source) { | 348 | const struct CharacterMatrix *source) { |
| 349 | if (memcmp(dest->display, source->display, sizeof(dest->display))) { | 349 | if (memcmp(dest->display, source->display, sizeof(dest->display))) { |
| 350 | memcpy(dest->display, source->display, sizeof(dest->display)); | 350 | memcpy(dest->display, source->display, sizeof(dest->display)); |
| @@ -367,13 +367,15 @@ const char helix_logo[]={ | |||
| 367 | 0xa0,0xa1,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xab,0xac,0xad,0xae,0xaf,0xb0,0xb1,0xb2,0xb3,0xb4, | 367 | 0xa0,0xa1,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xab,0xac,0xad,0xae,0xaf,0xb0,0xb1,0xb2,0xb3,0xb4, |
| 368 | 0xc0,0xc1,0xc2,0xc3,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xcb,0xcc,0xcd,0xce,0xcf,0xd0,0xd1,0xd2,0xd3,0xd4, | 368 | 0xc0,0xc1,0xc2,0xc3,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xcb,0xcc,0xcd,0xce,0xcf,0xd0,0xd1,0xd2,0xd3,0xd4, |
| 369 | 0}; | 369 | 0}; |
| 370 | inline void render_logo(struct CharacterMatrix *matrix) { | 370 | |
| 371 | static inline void render_logo(struct CharacterMatrix *matrix) { | ||
| 371 | 372 | ||
| 372 | matrix_write(matrix, helix_logo); | 373 | matrix_write(matrix, helix_logo); |
| 373 | } | 374 | } |
| 374 | 375 | ||
| 375 | const char mac_win_logo[][2][3]={{{0x95,0x96,0},{0xb5,0xb6,0}},{{0x97,0x98,0},{0xb7,0xb8,0}}}; | 376 | const char mac_win_logo[][2][3]={{{0x95,0x96,0},{0xb5,0xb6,0}},{{0x97,0x98,0},{0xb7,0xb8,0}}}; |
| 376 | inline void render_status(struct CharacterMatrix *matrix) { | 377 | |
| 378 | static inline void render_status(struct CharacterMatrix *matrix) { | ||
| 377 | 379 | ||
| 378 | char buf[20]; | 380 | char buf[20]; |
| 379 | // Render to mode icon | 381 | // Render to mode icon |
