Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Lotus 58 Glow - Added Auto shift to OLED, corrected OLED orientation #22424

Merged
merged 8 commits into from
Jan 9, 2024
Merged

Lotus 58 Glow - Added Auto shift to OLED, corrected OLED orientation #22424

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7dc11a5
Update keymap
TweetyDaBird Nov 8, 2023
2aef3fb
Update keymap
TweetyDaBird Nov 8, 2023
135c856
Merge branch 'Lotus' of https://github.com/TweetyDaBird/qmk_firmware …
TweetyDaBird Nov 8, 2023
b8b0501
Added make target to bottom folder
TweetyDaBird Nov 9, 2023
44adc3c
Update keyboards/tweetydabird/lotus58/keymaps/default/keymap.c
TweetyDaBird Nov 9, 2023
a8026cc
Reformatted files
TweetyDaBird Nov 9, 2023
a27206e
Merge branch 'Lotus' of https://github.com/TweetyDaBird/qmk_firmware …
TweetyDaBird Nov 9, 2023
281ec3d
Update keymap.c
TweetyDaBird Nov 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions keyboards/tweetydabird/lotus58/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
"bootmagic": true,
"command": false,
"console": false,
"encoder": true,
"extrakey": true,
"mousekey": true,
"nkro": true,
"oled": true,
"encoder": true,
"rgblight": true,
"split": true,
"tri_layer": true
Expand All @@ -33,13 +33,10 @@
"processor": "atmega32u4",
"rgblight": {
"led_count": 70,
"split": true,
"split_count": [35, 35],
"max_brightness": 175,
"sleep": true,
"max_brightness": 175
},
"ws2812": {
"pin": "D3"
"split": true,
"split_count": [35, 35]
},
"split": {
"bootmagic": {
Expand All @@ -65,10 +62,13 @@
},
"url": "https://lectronz.com/stores/tweetys-wild-thinking",
"usb": {
"vid": "0xFEED",
"pid": "0x23B0",
"device_version": "1.2.3",
"force_nkro": true
"force_nkro": true,
"pid": "0x23B0",
"vid": "0xFEED"
},
"ws2812": {
"pin": "D3"
},
"layouts": {
"LAYOUT": {
Expand Down Expand Up @@ -136,4 +136,4 @@
]
}
}
}
}
29 changes: 20 additions & 9 deletions keyboards/tweetydabird/lotus58/keymaps/default/keymap.c
View file
Open in desktop
TweetyDaBird marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT(
KC_ESC, 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_CAPS, 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_RGHT),
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_CAPS, 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_RGHT),
KC_LGUI, TG(2), KC_LALT, LSFT_T(KC_SPC), RSFT_T(KC_ENT), KC_RALT, TG(1), RGUI_T(KC_BSPC)
),

Expand All @@ -28,8 +28,8 @@ LCTL_T(KC_LEFT), KC_Z, KC_X, KC_C, KC_V, KC_B, KC_DOWN, KC
),

[3] = LAYOUT(
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, RGB_MOD, RGB_SAI, RGB_TOG,
QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_RMOD,RGB_SAD, RGB_M_P,
QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, NK_TOGG, AC_TOGG, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, RGB_MOD, RGB_SAI, RGB_TOG,
QK_RBT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_RMOD,RGB_SAD, RGB_M_P,
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_CAPS, XXXXXXX, XXXXXXX, XXXXXXX, RGB_HUI, RGB_VAI, RGB_M_B,
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_HUD, RGB_VAD, RGB_M_R,
_______, _______, _______, _______, _______, _______, _______, _______
Expand All @@ -39,9 +39,9 @@ LCTL_T(KC_LEFT), KC_Z, KC_X, KC_C, KC_V, KC_B, KC_DOWN, KC
#if defined(ENCODER_MAP_ENABLE)
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
[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

Expand Down Expand Up @@ -76,11 +76,22 @@ static void print_status_narrow(void) {
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);
TweetyDaBird marked this conversation as resolved.
Show resolved Hide resolved

#endif


}

bool oled_task_user(void) {
// Render the OLED
print_status_narrow();
return false;
}

#endif
2 changes: 1 addition & 1 deletion keyboards/tweetydabird/lotus58/lotus58.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
1 change: 1 addition & 0 deletions keyboards/tweetydabird/lotus58/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
DEFAULT_FOLDER = tweetydabird/lotus58/promicro