[keyboard] tominabox1/le_chiffre refactor pt 1 (#21567)

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
This commit is contained in:
Less/Rikki 2023-07-25 02:29:07 -04:00 committed by GitHub
parent e4e47525b3
commit b6a2df6646
2 changed files with 32 additions and 49 deletions

View file

@ -15,41 +15,24 @@
*/ */
#include QMK_KEYBOARD_H #include QMK_KEYBOARD_H
// clang-format off
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT( [0] = LAYOUT(
KC_Q, KC_W, KC_E, KC_R, KC_T, KC_MPLY, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_MPLY, KC_Y, KC_U, KC_I, KC_O, KC_P,
KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN,
KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,
KC_LCTL, KC_ENT, KC_SPC, KC_RALT KC_LCTL, KC_ENT, KC_SPC, KC_RALT
), )
[1] = LAYOUT(
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
),
[2] = LAYOUT(
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
),
}; };
// clang-format on
bool encoder_update_user(uint8_t index, bool clockwise) { #if defined(ENCODER_MAP_ENABLE)
if (index == 0) { const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
if (clockwise) { [0] = { ENCODER_CCW_CW(KC_MNXT, KC_MPRV) }
tap_code(KC_MNXT); };
} else { #endif
tap_code(KC_MPRV);
}
}
return true;
}
#ifdef OLED_ENABLE //Special thanks to Sickbabies for this great OLED widget! #ifdef OLED_ENABLE // Special thanks to Sickbabies for this great OLED widget!
oled_rotation_t oled_init_user(oled_rotation_t rotation) { oled_rotation_t oled_init_user(oled_rotation_t rotation) {
return OLED_ROTATION_90; // rotates for proper orientation return OLED_ROTATION_90; // rotates for proper orientation
} }
@ -58,12 +41,11 @@ void render_lechiffre_logo(void) {
static const char PROGMEM lechiffre_logo[] = { static const char PROGMEM lechiffre_logo[] = {
// 'lechiffre_logo', 32x20px // 'lechiffre_logo', 32x20px
0x00, 0x3e, 0x20, 0x20, 0x00, 0x18, 0x2c, 0xa8, 0x80, 0x00, 0x1c, 0x22, 0x22, 0x00, 0x3e, 0x08, 0x00, 0x3e, 0x20, 0x20, 0x00, 0x18, 0x2c, 0xa8, 0x80, 0x00, 0x1c, 0x22, 0x22, 0x00, 0x3e, 0x08,
0x30, 0x00, 0x34, 0x00, 0x3c, 0x0a, 0x00, 0xbc, 0x8a, 0x00, 0x38, 0x08, 0x00, 0x18, 0x2c, 0x28, 0x30, 0x00, 0x34, 0x00, 0x3c, 0x0a, 0x00, 0xbc, 0x8a, 0x00, 0x38, 0x08, 0x00, 0x18, 0x2c, 0x28,
0x00, 0xb6, 0xb6, 0x00, 0xdb, 0xdb, 0x00, 0x6d, 0x6d, 0x00, 0xdb, 0xdb, 0x00, 0xdb, 0xdb, 0x00, 0x00, 0xb6, 0xb6, 0x00, 0xdb, 0xdb, 0x00, 0x6d, 0x6d, 0x00, 0xdb, 0xdb, 0x00, 0xdb, 0xdb, 0x00,
0x00, 0xdb, 0xdb, 0x00, 0xdb, 0xdb, 0x00, 0x6d, 0x6d, 0x00, 0xdb, 0xdb, 0x00, 0xb6, 0xb6, 0x00, 0x00, 0xdb, 0xdb, 0x00, 0xdb, 0xdb, 0x00, 0x6d, 0x6d, 0x00, 0xdb, 0xdb, 0x00, 0xb6, 0xb6, 0x00,
0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x06, 0x06, 0x06, 0x00, 0x06, 0x06, 0x06, 0x06, 0x06, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x06, 0x06, 0x06, 0x00, 0x06, 0x06, 0x06, 0x06, 0x06, 0x00,
0x00, 0x06, 0x06, 0x06, 0x06, 0x06, 0x00, 0x06, 0x06, 0x06, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00 0x00, 0x06, 0x06, 0x06, 0x06, 0x06, 0x00, 0x06, 0x06, 0x06, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00};
};
oled_write_raw_P(lechiffre_logo, sizeof(lechiffre_logo)); oled_write_raw_P(lechiffre_logo, sizeof(lechiffre_logo));
} }
@ -120,7 +102,7 @@ void update_log(void) {
} }
} }
//Text only renders // Text only renders
void render_keylogger_status(void) { void render_keylogger_status(void) {
oled_write_P(PSTR("-----"), false); oled_write_P(PSTR("-----"), false);
oled_write(keylog_str, false); oled_write(keylog_str, false);
@ -133,7 +115,7 @@ void render_keylock_status(led_t led_state) {
oled_write_P(PSTR("N"), led_state.num_lock); oled_write_P(PSTR("N"), led_state.num_lock);
oled_write_P(PSTR(" "), false); oled_write_P(PSTR(" "), false);
oled_write_P(PSTR("S"), led_state.scroll_lock); oled_write_P(PSTR("S"), led_state.scroll_lock);
//oled_write_ln_P(PSTR(" "), false); // oled_write_ln_P(PSTR(" "), false);
} }
void render_mod_status(uint8_t modifiers) { void render_mod_status(uint8_t modifiers) {
@ -144,11 +126,11 @@ void render_mod_status(uint8_t modifiers) {
oled_write_ln_P(PSTR("GUI"), (modifiers & MOD_MASK_GUI)); oled_write_ln_P(PSTR("GUI"), (modifiers & MOD_MASK_GUI));
} }
void oled_task_keymap(void) { bool oled_task_user(void) {
render_lechiffre_logo(); render_lechiffre_logo();
oled_set_cursor(0,3); oled_set_cursor(0, 3);
// render_layer_status(); // Renders the current keyboard state (layer, lock, caps, scroll, etc) // render_layer_status(); // Renders the current keyboard state (layer, lock, caps, scroll, etc)
render_mod_status(get_mods()|get_oneshot_mods()); render_mod_status(get_mods() | get_oneshot_mods());
render_keylock_status(host_keyboard_led_state()); render_keylock_status(host_keyboard_led_state());
render_keylogger_status(); render_keylogger_status();
@ -160,5 +142,5 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
add_keylog(keycode); add_keylog(keycode);
} }
return true; return true;
} }
#endif #endif

View file

@ -1 +1,2 @@
VIA_ENABLE = yes VIA_ENABLE = yes
ENCODER_MAP_ENABLE = yes