From e7d7f129ffb56610133817a30ca980bf619e35b1 Mon Sep 17 00:00:00 2001 From: TweetyDaBird Date: Wed, 27 Sep 2023 14:01:41 +0200 Subject: [PATCH 01/11] adding vial id --- .../lotus58/keymaps/vial/config.h | 33 ++ .../lotus58/keymaps/vial/keymap.c | 124 ++++++ .../lotus58/keymaps/vial/rules.mk | 13 + .../lotus58/keymaps/vial/vial.json | 420 ++++++++++++++++++ 4 files changed, 590 insertions(+) create mode 100644 keyboards/tweetydabird/lotus58/keymaps/vial/config.h create mode 100644 keyboards/tweetydabird/lotus58/keymaps/vial/keymap.c create mode 100644 keyboards/tweetydabird/lotus58/keymaps/vial/rules.mk create mode 100644 keyboards/tweetydabird/lotus58/keymaps/vial/vial.json diff --git a/keyboards/tweetydabird/lotus58/keymaps/vial/config.h b/keyboards/tweetydabird/lotus58/keymaps/vial/config.h new file mode 100644 index 00000000000..146a388399d --- /dev/null +++ b/keyboards/tweetydabird/lotus58/keymaps/vial/config.h @@ -0,0 +1,33 @@ +// Copyright 2022 Markus Knutsson (@TweetyDaBird) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#define VIAL_KEYBOARD_UID {0x5F, 0xEC, 0xD8, 0x46, 0x91, 0x40, 0x1B, 0x09} + +#define VIAL_UNLOCK_COMBO_ROWS {0, 0} +#define VIAL_UNLOCK_COMBO_COLS {0, 5} + +// Split options not yet fully implemented in VIAL info.json +#define SPLIT_HAND_PIN B5 +#define SPLIT_LAYER_STATE_ENABLE +#define SPLIT_LED_STATE_ENABLE +#define SPLIT_OLED_ENABLE + +// RGB options not yet fully implemented in VIAL info.json +#define RGBLIGHT_LIMIT_VAL 175 +#define RGBLIGHT_DEFAULT_VAL ( RGBLIGHT_LIMIT_VAL / 2 ) +#define RGBLIGHT_SLEEP + +// Static glow is ALWAYS on with RGBLIGHT +#define RGBLIGHT_EFFECT_BREATHING +#define RGBLIGHT_EFFECT_RAINBOW_MOOD + +#undef LOCKING_SUPPORT_ENABLE +#undef LOCKING_RESYNC_ENABLE +#define LAYER_STATE_8BIT + +// VIAL specific reduce memory +#define VIAL_COMBO_ENTRIES 4 +#define VIAL_TAP_DANCE_ENTRIES 4 +#define VIAL_KEY_OVERRIDE_ENTRIES 4 diff --git a/keyboards/tweetydabird/lotus58/keymaps/vial/keymap.c b/keyboards/tweetydabird/lotus58/keymaps/vial/keymap.c new file mode 100644 index 00000000000..6fb6408fe43 --- /dev/null +++ b/keyboards/tweetydabird/lotus58/keymaps/vial/keymap.c @@ -0,0 +1,124 @@ +// Copyright 2022 Markus Knutsson (@TweetyDaBird) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H +#define ____ KC_TRNS + +#ifdef AUTO_SHIFT_ENABLE + +void keyboard_post_init_user(void) { + autoshift_disable(); +} +#endif + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT( + KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_MPLY, KC_MPLY, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, + KC_NUHS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, + LCTL_T(KC_LEFT), KC_Z, KC_X, KC_C, KC_V, KC_B, KC_DOWN, KC_UP, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, RCTL_T(KC_RIGHT), + KC_DEL, TG(1), LALT_T(KC_LGUI), LSFT_T(KC_SPACE), RSFT_T(KC_ENTER), RALT_T(KC_APP), TG(2), KC_BSPC + ), + + [1] = LAYOUT( + ____, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, ____, ____, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, + ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, + ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, + ____, ____, ____, ____, ____, ____, KC_PGDN, KC_PGUP, ____, ____, ____, ____, ____, ____, + ____, ____, ____, ____, ____, ____, ____, ____ + ), + + [2] = LAYOUT( + ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, + ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, + ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, + ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, + ____, ____, ____, ____, ____, ____, ____, ____ + ), + + [3] = LAYOUT( + RESET, ____, ____, ____, NK_TOGG, KC_ASTG, ____, ____, ____, ____, ____, RGB_VAI, RGB_VAD, RGB_TOG, + ____, ____, ____, ____, ____, ____, ____, ____, ____, RGB_HUI, RGB_HUD, RGB_M_P, + ____, ____, ____, ____, ____, ____, ____, ____, ____, RGB_SAI, RGB_SAD, RGB_M_B, + ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, RGB_SPI, RGB_SPD, RGB_M_R, + ____, ____, ____, ____, ____, ____, ____, ____ + ), +}; + +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [1] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [2] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [3] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) } +}; +#endif + +#ifdef OLED_ENABLE + +static void print_status_narrow(void) { + // Create OLED content + oled_write_P(PSTR("\n"), false); + oled_write_P(PSTR(""), false); + oled_write_P(PSTR("Lotus -58-"), false); + oled_write_P(PSTR("\n"), false); + + // Print current layer + oled_write_P(PSTR("Layer"), false); + switch (get_highest_layer(layer_state)) { + case 0: + oled_write_P(PSTR("-Base\n"), false); + break; + case 1: + oled_write_P(PSTR("-Func\n"), false); + break; + case 2: + oled_write_P(PSTR("-Num \n"), false); + break; + case 3: + oled_write_P(PSTR("-Sys \n"), false); + break; + default: + oled_write_P(PSTR("Undef"), false); + } + + // Display capslock + oled_write_P(PSTR("\n"), false); + led_t led_usb_state = host_keyboard_led_state(); + oled_write_ln_P(PSTR("Caps- lock"), led_usb_state.caps_lock); + +#ifdef AUTO_SHIFT_ENABLE + + bool autoshift = get_autoshift_state(); + oled_write_P(PSTR("\n"), false); + oled_write_P(PSTR("Auto-Shift"), autoshift); + oled_write_P(PSTR("\n"), false); + +#endif + +} + +oled_rotation_t oled_init_user(oled_rotation_t rotation) { + if (is_keyboard_left()) { + return OLED_ROTATION_270; + } else { + return OLED_ROTATION_270; + } + return rotation; +} + +bool oled_task_user(void) { + if (is_keyboard_master()) { + print_status_narrow(); + } else { + print_status_narrow(); + } + return false; +} + +#endif + +layer_state_t layer_state_set_user(layer_state_t state) { + return update_tri_layer_state(state, 1, 2, 3); +} \ No newline at end of file diff --git a/keyboards/tweetydabird/lotus58/keymaps/vial/rules.mk b/keyboards/tweetydabird/lotus58/keymaps/vial/rules.mk new file mode 100644 index 00000000000..0c247d954c0 --- /dev/null +++ b/keyboards/tweetydabird/lotus58/keymaps/vial/rules.mk @@ -0,0 +1,13 @@ +# Copyright 2022 Markus Knutsson (@TweetyDaBird) +# SPDX-License-Identifier: GPL-2.0-or-later + +# Needed for VIAL compatability (all are needed) +VIA_ENABLE = yes +VIAL_ENABLE = yes +ENCODER_MAP_ENABLE = yes + +# Reduce size by disabling +TAP_DANCE_ENABLE = no +QMK_SETTINGS = no +KEY_OVERRIDE_ENABLE = no +COMBO_ENABLE = no diff --git a/keyboards/tweetydabird/lotus58/keymaps/vial/vial.json b/keyboards/tweetydabird/lotus58/keymaps/vial/vial.json new file mode 100644 index 00000000000..fdb331bdbfa --- /dev/null +++ b/keyboards/tweetydabird/lotus58/keymaps/vial/vial.json @@ -0,0 +1,420 @@ +{ + "name": "Lotus 58 Glow VIAL", + "author": "Markus Knutsson", + + "lighting": "qmk_rgblight", + + "matrix": { + "rows": 10, + "cols": 6 + }, + + "layouts": { + "labels": + [ + + [ + "Left Encoder", + "Top Placement", + "Bottom Placement", + "No Encoder" + ], + [ + "Right Encoder", + "Top Placement", + "Bottom Placement", + "No Encoder" + ] + ], + + "keymap": + [ + [ + { + "y": 0.25, + "x": 3 + }, + "0,3", + { + "x": 9.25 + }, + "5,3" + ], + [ + { + "y": -0.87, + "x": 2 + }, + "0,2", + { + "x": 1 + }, + "0,4", + { + "x": 7.25 + }, + "5,4", + { + "x": 1 + }, + "5,2" + ], + [ + { + "y": -0.88, + "x": 5 + }, + "0,5" + ], + [ + { + "y": -1, + "x": 11.25 + }, + "5,5" + ], + [ + { + "y": -0.87, + "x": 1 + }, + "0,1", + { + "x": 13.25 + }, + "5,1" + ], + [ + { + "y": -0.7499999999999999 + }, + "0,0", + { + "x": 15.25 + }, + "5,0" + ], + [ + { + "y": -0.8799999999999999, + "x": 6 + }, + "4,0\n\n\n0,0", + { + "x": -1, + "d": true + }, + "4,0\n\n\n0,1", + { + "x": 0.25 + }, + "0,1\n\n\n0,0\n\n\n\n\n\ne", + { + "x": -1, + "d": true + }, + "0,1\n\n\n0,2\n\n\n\n\n\ne", + { + "x": 0.75 + }, + "1,1\n\n\n1,0\n\n\n\n\n\ne", + { + "x": -1, + "d": true + }, + "1,1\n\n\n1,0\n\n\n\n\n\ne", + { + "x": 0.25, + "d": true + }, + "9,0\n\n\n1,1", + { + "x": -1 + }, + "9,0\n\n\n1,0" + ], + [ + { + "y": -0.75, + "x": 3 + }, + "1,3", + { + "x": 9.25 + }, + "6,3" + ], + [ + { + "y": -0.8700000000000001, + "x": 2 + }, + "1,2", + { + "x": 1 + }, + "1,4", + { + "x": 7.25 + }, + "6,4", + { + "x": 1 + }, + "6,2" + ], + [ + { + "y": -0.8799999999999999, + "x": 5 + }, + "1,5", + { + "x": 5.25 + }, + "6,5" + ], + [ + { + "y": -0.8700000000000001, + "x": 1 + }, + "1,1", + { + "x": 13.25 + }, + "6,1" + ], + [ + { + "y": -0.75 + }, + "1,0", + { + "x": 15.25 + }, + "6,0" + ], + [ + { + "y": -0.8799999999999999, + "x": 7.25 + }, + "0,1\n\n\n0,1\n\n\n\n\n\ne", + { + "x": -1 + }, + "0,0\n\n\n0,0\n\n\n\n\n\ne", + { + "x": -1, + "d": true + }, + "0,1\n\n\n0,2\n\n\n\n\n\ne", + { + "x": 0.75 + }, + "1,0\n\n\n1,0\n\n\n\n\n\ne", + { + "x": -1 + }, + "1,1\n\n\n1,1\n\n\n\n\n\ne", + { + "x": -1, + "d": true + }, + "1,0\n\n\n1,2\n\n\n\n\n\ne" + ], + [ + { + "y": -0.75, + "x": 3 + }, + "2,3", + { + "x": 9.25 + }, + "7,3" + ], + [ + { + "y": -0.8700000000000001, + "x": 2 + }, + "2,2", + { + "x": 1, + "n": true + }, + "2,4", + { + "x": 7.25, + "n": true + }, + "7,4", + { + "x": 1 + }, + "7,2" + ], + [ + { + "y": -0.8799999999999999, + "x": 5 + }, + "2,5", + { + "x": 5.25 + }, + "7,5" + ], + [ + { + "y": -0.8700000000000001, + "x": 1 + }, + "2,1", + { + "x": 13.25 + }, + "7,1" + ], + [ + { + "y": -0.8799999999999999, + "x": 6 + }, + "4,5", + { + "x": 3.25 + }, + "9,5" + ], + [ + { + "y": -0.8700000000000001 + }, + "2,0", + { + "x": 15.25 + }, + "7,0" + ], + [ + { + "y": -0.8799999999999999, + "x": 7.25 + }, + "0,0\n\n\n0,1\n\n\n\n\n\ne", + { + "x": 0.75 + }, + "1,0\n\n\n1,1\n\n\n\n\n\ne" + ], + [ + { + "y": -0.75, + "x": 3 + }, + "3,3", + { + "x": 9.25 + }, + "8,3" + ], + [ + { + "y": -0.8700000000000001, + "x": 2 + }, + "3,2", + { + "x": 1 + }, + "3,4", + { + "x": 7.25 + }, + "8,4", + { + "x": 1 + }, + "8,2" + ], + [ + { + "y": -0.8799999999999999, + "x": 5 + }, + "3,5", + { + "x": 5.25 + }, + "8,5" + ], + [ + { + "y": -0.8700000000000001, + "x": 1 + }, + "3,1", + { + "x": 13.25 + }, + "8,1" + ], + [ + { + "y": -0.75 + }, + "3,0", + { + "x": 15.25 + }, + "8,0" + ], + [ + { + "y": -0.5, + "x": 2.75 + }, + "4,1", + "4,2", + { + "x": 7.75 + }, + "9,2", + "9,1" + ], + [ + { + "y": -0.8799999999999999, + "x": 4.75 + }, + "4,3", + { + "x": 5.75 + }, + "9,3" + ], + [ + { + "r": 30, + "y": -5.5, + "x": 7.5, + "h": 1.5 + }, + "4,4" + ], + [ + { + "r": -30, + "y": 7.630000000000001, + "x": 6.44, + "h": 1.5 + }, + "9,4" + ] + +] + } +} \ No newline at end of file From 4839d674bc6b9cce74f872f017686001f9fb1912 Mon Sep 17 00:00:00 2001 From: TweetyDaBird Date: Tue, 7 Nov 2023 10:12:29 +0100 Subject: [PATCH 02/11] Update Vial keymap Replacing key-codes to match latest QMK iteration, some options are moved to .JSON --- keyboards/tweetydabird/lotus58/keymaps/vial/config.h | 11 ----------- keyboards/tweetydabird/lotus58/keymaps/vial/keymap.c | 6 +++--- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/keyboards/tweetydabird/lotus58/keymaps/vial/config.h b/keyboards/tweetydabird/lotus58/keymaps/vial/config.h index 146a388399d..d8df14f5a63 100644 --- a/keyboards/tweetydabird/lotus58/keymaps/vial/config.h +++ b/keyboards/tweetydabird/lotus58/keymaps/vial/config.h @@ -8,17 +8,6 @@ #define VIAL_UNLOCK_COMBO_ROWS {0, 0} #define VIAL_UNLOCK_COMBO_COLS {0, 5} -// Split options not yet fully implemented in VIAL info.json -#define SPLIT_HAND_PIN B5 -#define SPLIT_LAYER_STATE_ENABLE -#define SPLIT_LED_STATE_ENABLE -#define SPLIT_OLED_ENABLE - -// RGB options not yet fully implemented in VIAL info.json -#define RGBLIGHT_LIMIT_VAL 175 -#define RGBLIGHT_DEFAULT_VAL ( RGBLIGHT_LIMIT_VAL / 2 ) -#define RGBLIGHT_SLEEP - // Static glow is ALWAYS on with RGBLIGHT #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/tweetydabird/lotus58/keymaps/vial/keymap.c b/keyboards/tweetydabird/lotus58/keymaps/vial/keymap.c index 6fb6408fe43..0d4b76e905f 100644 --- a/keyboards/tweetydabird/lotus58/keymaps/vial/keymap.c +++ b/keyboards/tweetydabird/lotus58/keymaps/vial/keymap.c @@ -14,7 +14,7 @@ void keyboard_post_init_user(void) { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT( - KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_MPLY, KC_MPLY, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, + QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_MPLY, KC_MPLY, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_NUHS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, LCTL_T(KC_LEFT), KC_Z, KC_X, KC_C, KC_V, KC_B, KC_DOWN, KC_UP, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, RCTL_T(KC_RIGHT), @@ -38,8 +38,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [3] = LAYOUT( - RESET, ____, ____, ____, NK_TOGG, KC_ASTG, ____, ____, ____, ____, ____, RGB_VAI, RGB_VAD, RGB_TOG, - ____, ____, ____, ____, ____, ____, ____, ____, ____, RGB_HUI, RGB_HUD, RGB_M_P, + QK_BOOT, ____, ____, ____, NK_TOGG, AC_TOGG, ____, ____, ____, ____, ____, RGB_VAI, RGB_VAD, RGB_TOG, + QK_RBT, ____, ____, ____, ____, ____, ____, ____, ____, RGB_HUI, RGB_HUD, RGB_M_P, ____, ____, ____, ____, ____, ____, ____, ____, ____, RGB_SAI, RGB_SAD, RGB_M_B, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, RGB_SPI, RGB_SPD, RGB_M_R, ____, ____, ____, ____, ____, ____, ____, ____ From 726fe49c519ec4d10ad36600aca25d448c53c654 Mon Sep 17 00:00:00 2001 From: Markus Knutsson Date: Wed, 8 Nov 2023 07:53:48 +0100 Subject: [PATCH 03/11] Update keyboards/tweetydabird/lotus58/keymaps/vial/keymap.c Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> --- keyboards/tweetydabird/lotus58/keymaps/vial/keymap.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/keyboards/tweetydabird/lotus58/keymaps/vial/keymap.c b/keyboards/tweetydabird/lotus58/keymaps/vial/keymap.c index 0d4b76e905f..583075c25f2 100644 --- a/keyboards/tweetydabird/lotus58/keymaps/vial/keymap.c +++ b/keyboards/tweetydabird/lotus58/keymaps/vial/keymap.c @@ -49,9 +49,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { #if defined(ENCODER_MAP_ENABLE) const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, - [1] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, - [2] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, - [3] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) } + [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) } }; #endif From a2f9e418ad64881b1c3816956203e1e03f0935f8 Mon Sep 17 00:00:00 2001 From: Markus Knutsson Date: Wed, 8 Nov 2023 07:54:29 +0100 Subject: [PATCH 04/11] Update keyboards/tweetydabird/lotus58/keymaps/vial/keymap.c Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> --- keyboards/tweetydabird/lotus58/keymaps/vial/keymap.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/keyboards/tweetydabird/lotus58/keymaps/vial/keymap.c b/keyboards/tweetydabird/lotus58/keymaps/vial/keymap.c index 583075c25f2..b58a426589a 100644 --- a/keyboards/tweetydabird/lotus58/keymaps/vial/keymap.c +++ b/keyboards/tweetydabird/lotus58/keymaps/vial/keymap.c @@ -100,12 +100,7 @@ static void print_status_narrow(void) { } oled_rotation_t oled_init_user(oled_rotation_t rotation) { - if (is_keyboard_left()) { - return OLED_ROTATION_270; - } else { - return OLED_ROTATION_270; - } - return rotation; + return OLED_ROTATION_270; } bool oled_task_user(void) { From f04cd1918b4633f3d34fbf6d0aa2c8c54bbdabff Mon Sep 17 00:00:00 2001 From: Markus Knutsson Date: Wed, 8 Nov 2023 07:55:36 +0100 Subject: [PATCH 05/11] Update keyboards/tweetydabird/lotus58/keymaps/vial/keymap.c Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> --- keyboards/tweetydabird/lotus58/keymaps/vial/keymap.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/keyboards/tweetydabird/lotus58/keymaps/vial/keymap.c b/keyboards/tweetydabird/lotus58/keymaps/vial/keymap.c index b58a426589a..d4e3fec124a 100644 --- a/keyboards/tweetydabird/lotus58/keymaps/vial/keymap.c +++ b/keyboards/tweetydabird/lotus58/keymaps/vial/keymap.c @@ -112,8 +112,4 @@ bool oled_task_user(void) { return false; } -#endif - -layer_state_t layer_state_set_user(layer_state_t state) { - return update_tri_layer_state(state, 1, 2, 3); -} \ No newline at end of file +#endif \ No newline at end of file From bc9e839a1047ffd4ca9ef2045725c136c7be9757 Mon Sep 17 00:00:00 2001 From: Markus Knutsson Date: Wed, 8 Nov 2023 07:57:02 +0100 Subject: [PATCH 06/11] Update keyboards/tweetydabird/lotus58/keymaps/vial/keymap.c Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> --- keyboards/tweetydabird/lotus58/keymaps/vial/keymap.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/keyboards/tweetydabird/lotus58/keymaps/vial/keymap.c b/keyboards/tweetydabird/lotus58/keymaps/vial/keymap.c index d4e3fec124a..02f607c2f5f 100644 --- a/keyboards/tweetydabird/lotus58/keymaps/vial/keymap.c +++ b/keyboards/tweetydabird/lotus58/keymaps/vial/keymap.c @@ -106,8 +106,6 @@ oled_rotation_t oled_init_user(oled_rotation_t rotation) { bool oled_task_user(void) { if (is_keyboard_master()) { print_status_narrow(); - } else { - print_status_narrow(); } return false; } From 71edaab1a3a33c19e2466f674b7b658cc759ddfe Mon Sep 17 00:00:00 2001 From: TweetyDaBird Date: Wed, 8 Nov 2023 11:58:21 +0100 Subject: [PATCH 07/11] Simplified OLED, cleaned up keymap Simplified OLED, cleaned up keymap --- .../lotus58/keymaps/vial/keymap.c | 60 +++++++++---------- keyboards/tweetydabird/lotus58/lotus58.c | 2 +- 2 files changed, 28 insertions(+), 34 deletions(-) diff --git a/keyboards/tweetydabird/lotus58/keymaps/vial/keymap.c b/keyboards/tweetydabird/lotus58/keymaps/vial/keymap.c index 02f607c2f5f..4845bbdbd3e 100644 --- a/keyboards/tweetydabird/lotus58/keymaps/vial/keymap.c +++ b/keyboards/tweetydabird/lotus58/keymaps/vial/keymap.c @@ -14,35 +14,35 @@ void keyboard_post_init_user(void) { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT( - QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_MPLY, KC_MPLY, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, - KC_NUHS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, - LCTL_T(KC_LEFT), KC_Z, KC_X, KC_C, KC_V, KC_B, KC_DOWN, KC_UP, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, RCTL_T(KC_RIGHT), - KC_DEL, TG(1), LALT_T(KC_LGUI), LSFT_T(KC_SPACE), RSFT_T(KC_ENTER), RALT_T(KC_APP), TG(2), KC_BSPC + QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_MPLY, KC_MPLY, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, + KC_NUHS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, + LCTL_T(KC_LEFT), KC_Z, KC_X, KC_C, KC_V, KC_B, KC_DOWN, KC_UP, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, RCTL_T(KC_RIGHT), + KC_DEL, TG(1), LALT_T(KC_LGUI), LSFT_T(KC_SPACE), RSFT_T(KC_ENTER), RALT_T(KC_APP), TG(2), KC_BSPC ), - - [1] = LAYOUT( - ____, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, ____, ____, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, - ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, - ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, - ____, ____, ____, ____, ____, ____, KC_PGDN, KC_PGUP, ____, ____, ____, ____, ____, ____, - ____, ____, ____, ____, ____, ____, ____, ____ - ), - [2] = LAYOUT( - ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, - ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, - ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, - ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, - ____, ____, ____, ____, ____, ____, ____, ____ - ), + [1] = LAYOUT( + ____, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, ____, ____, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, + ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, + ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, + ____, ____, ____, ____, ____, ____, KC_PGDN, KC_PGUP, ____, ____, ____, ____, ____, ____, + ____, ____, ____, ____, ____, ____, ____, ____ + ), + + [2] = LAYOUT( + ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, + ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, + ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, + ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, + ____, ____, ____, ____, ____, ____, ____, ____ + ), - [3] = LAYOUT( - QK_BOOT, ____, ____, ____, NK_TOGG, AC_TOGG, ____, ____, ____, ____, ____, RGB_VAI, RGB_VAD, RGB_TOG, - QK_RBT, ____, ____, ____, ____, ____, ____, ____, ____, RGB_HUI, RGB_HUD, RGB_M_P, - ____, ____, ____, ____, ____, ____, ____, ____, ____, RGB_SAI, RGB_SAD, RGB_M_B, - ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, RGB_SPI, RGB_SPD, RGB_M_R, - ____, ____, ____, ____, ____, ____, ____, ____ + [3] = LAYOUT( + QK_BOOT, ____, ____, ____, NK_TOGG, AC_TOGG, ____, ____, ____, ____, ____, RGB_VAI, RGB_VAD, RGB_TOG, + QK_RBT, ____, ____, ____, ____, ____, ____, ____, ____, RGB_HUI, RGB_HUD, RGB_M_P, + ____, ____, ____, ____, ____, ____, ____, ____, ____, RGB_SAI, RGB_SAD, RGB_M_B, + ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, RGB_SPI, RGB_SPD, RGB_M_R, + ____, ____, ____, ____, ____, ____, ____, ____ ), }; @@ -99,14 +99,8 @@ static void print_status_narrow(void) { } -oled_rotation_t oled_init_user(oled_rotation_t rotation) { - return OLED_ROTATION_270; -} - bool oled_task_user(void) { - if (is_keyboard_master()) { - print_status_narrow(); - } + print_status_narrow(); return false; } diff --git a/keyboards/tweetydabird/lotus58/lotus58.c b/keyboards/tweetydabird/lotus58/lotus58.c index a06c88111cc..f1e433a4265 100644 --- a/keyboards/tweetydabird/lotus58/lotus58.c +++ b/keyboards/tweetydabird/lotus58/lotus58.c @@ -6,7 +6,7 @@ #ifdef OLED_ENABLE oled_rotation_t oled_init_kb(oled_rotation_t rotation) { - return OLED_ROTATION_90; + return OLED_ROTATION_270; } void render_logo(void) { From ac8a3c1e039eca095c0c8528a1ad638d45588494 Mon Sep 17 00:00:00 2001 From: Markus Knutsson Date: Sat, 11 Nov 2023 11:20:58 +0100 Subject: [PATCH 08/11] Update keyboards/tweetydabird/lotus58/keymaps/vial/keymap.c Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> --- keyboards/tweetydabird/lotus58/keymaps/vial/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/tweetydabird/lotus58/keymaps/vial/keymap.c b/keyboards/tweetydabird/lotus58/keymaps/vial/keymap.c index 02f607c2f5f..73df5f4fa5a 100644 --- a/keyboards/tweetydabird/lotus58/keymaps/vial/keymap.c +++ b/keyboards/tweetydabird/lotus58/keymaps/vial/keymap.c @@ -84,7 +84,7 @@ static void print_status_narrow(void) { } // Display capslock - oled_write_P(PSTR("\n"), false); + oled_advance_page(true); led_t led_usb_state = host_keyboard_led_state(); oled_write_ln_P(PSTR("Caps- lock"), led_usb_state.caps_lock); From 3b77fcea780391459b16b9ef630ee536abc3ab06 Mon Sep 17 00:00:00 2001 From: Markus Knutsson Date: Sat, 11 Nov 2023 11:21:04 +0100 Subject: [PATCH 09/11] Update keyboards/tweetydabird/lotus58/keymaps/vial/keymap.c Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> --- keyboards/tweetydabird/lotus58/keymaps/vial/keymap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/tweetydabird/lotus58/keymaps/vial/keymap.c b/keyboards/tweetydabird/lotus58/keymaps/vial/keymap.c index 73df5f4fa5a..2f9a8df3e10 100644 --- a/keyboards/tweetydabird/lotus58/keymaps/vial/keymap.c +++ b/keyboards/tweetydabird/lotus58/keymaps/vial/keymap.c @@ -91,9 +91,9 @@ static void print_status_narrow(void) { #ifdef AUTO_SHIFT_ENABLE bool autoshift = get_autoshift_state(); - oled_write_P(PSTR("\n"), false); + oled_advance_page(true); oled_write_P(PSTR("Auto-Shift"), autoshift); - oled_write_P(PSTR("\n"), false); + oled_advance_page(true); #endif From a67f009d64a664fefd39b66677fe47cd0617a985 Mon Sep 17 00:00:00 2001 From: Markus Knutsson Date: Sat, 11 Nov 2023 11:21:15 +0100 Subject: [PATCH 10/11] Update keyboards/tweetydabird/lotus58/keymaps/vial/keymap.c Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> --- keyboards/tweetydabird/lotus58/keymaps/vial/keymap.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/keyboards/tweetydabird/lotus58/keymaps/vial/keymap.c b/keyboards/tweetydabird/lotus58/keymaps/vial/keymap.c index 2f9a8df3e10..1bc9df2f84a 100644 --- a/keyboards/tweetydabird/lotus58/keymaps/vial/keymap.c +++ b/keyboards/tweetydabird/lotus58/keymaps/vial/keymap.c @@ -59,10 +59,9 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { static void print_status_narrow(void) { // Create OLED content - oled_write_P(PSTR("\n"), false); - oled_write_P(PSTR(""), false); + oled_advance_page(true); oled_write_P(PSTR("Lotus -58-"), false); - oled_write_P(PSTR("\n"), false); + oled_advance_page(true); // Print current layer oled_write_P(PSTR("Layer"), false); From d3db4ab5a2d75a60d9871296d5588c1349cb3ce0 Mon Sep 17 00:00:00 2001 From: TweetyDaBird Date: Sat, 11 Nov 2023 11:24:03 +0100 Subject: [PATCH 11/11] conditional --- .../tweetydabird/lotus58/keymaps/vial/rules.mk | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/keyboards/tweetydabird/lotus58/keymaps/vial/rules.mk b/keyboards/tweetydabird/lotus58/keymaps/vial/rules.mk index 0c247d954c0..044dc609d69 100644 --- a/keyboards/tweetydabird/lotus58/keymaps/vial/rules.mk +++ b/keyboards/tweetydabird/lotus58/keymaps/vial/rules.mk @@ -6,8 +6,16 @@ VIA_ENABLE = yes VIAL_ENABLE = yes ENCODER_MAP_ENABLE = yes -# Reduce size by disabling -TAP_DANCE_ENABLE = no -QMK_SETTINGS = no -KEY_OVERRIDE_ENABLE = no -COMBO_ENABLE = no +# Reduce size on atmega32u4 +ifeq ($(strip $(MCU)), atmega32u4) + TAP_DANCE_ENABLE = no + QMK_SETTINGS = no + KEY_OVERRIDE_ENABLE = no + COMBO_ENABLE = no + + # Reduce size even more for non-nanoboot bootloaders + ifneq ($(strip $(BOOTLOADER_SIZE)), 512) + MAGIC_ENABLE = no + MOUSEKEY_ENABLE = no + endif +endif \ No newline at end of file