summaryrefslogtreecommitdiff
path: root/keyboards/rgbkb/sol
diff options
context:
space:
mode:
authorXScorpion2 <rcalt2vt@gmail.com>2019-06-01 16:39:31 -0500
committerDrashna Jaelre <drashna@live.com>2019-06-01 14:39:31 -0700
commit4f788c2ae90583f64e0cec6545a3da75a5aff0f8 (patch)
treefa7f8583fca9839d2c5f3f8b6c5822569c649929 /keyboards/rgbkb/sol
parent02b3fadbac6c68940e1bf141397d5d7cb87a6928 (diff)
[Keymap] Xulkal user changes (#6044)
* Xulkal user changes Xulkal user changes * Reduce code duplication * Massive user code refactor
Diffstat (limited to 'keyboards/rgbkb/sol')
-rw-r--r--keyboards/rgbkb/sol/keymaps/xulkal/keymap.c93
1 files changed, 1 insertions, 92 deletions
diff --git a/keyboards/rgbkb/sol/keymaps/xulkal/keymap.c b/keyboards/rgbkb/sol/keymaps/xulkal/keymap.c
index 5c560abad8..09c27428ec 100644
--- a/keyboards/rgbkb/sol/keymaps/xulkal/keymap.c
+++ b/keyboards/rgbkb/sol/keymaps/xulkal/keymap.c
@@ -6,10 +6,6 @@
#include "split_util.h"
#endif
-#ifdef OLED_DRIVER_ENABLE
- #include "oled_driver.h"
-#endif
-
#define EXPAND_LAYOUT(...) LAYOUT(__VA_ARGS__)
// Define your non-alpha grouping in this define's LAYOUT, and all your BASE_LAYERS will share the same mod/macro columns
@@ -36,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_________________QWERTY_L3_________________, KC_GRV, KC_QUOT, _________________QWERTY_R3_________________, \
_________________QWERTY_L4_________________, RGB_TOG, RGBRST, _________________QWERTY_R4_________________, \
_________________QWERTY_L5_________________, RGB_RMOD, RGB_MOD, _________________QWERTY_R5_________________, \
- KC_SPC, KC_DEL, KC_ENT, KC_SPC \
+ KC_SPC, TD_DEL, KC_ENT, KC_SPC \
),
#ifndef GAMELAYER_DISABLE
@@ -79,90 +75,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
#endif
};
-
-//SSD1306 OLED update loop, make sure to add #define SSD1306OLED in config.h
-#ifdef OLED_DRIVER_ENABLE
-
-static void render_logo(void) {
- static const char PROGMEM sol_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};
-
- oled_write_P(sol_logo, false);
-}
-
-
-static void render_status(void) {
- // Render to mode icon
- static const char PROGMEM mode_logo[2][3] = {
- {0x97,0x98,0},
- {0xb7,0xb8,0} };
-
- oled_write_P(mode_logo[0], false);
-
-#if defined(RGB_MATRIX_ENABLE)
- static char buffer[20] = {0};
- snprintf(buffer, sizeof(buffer), " h%3d s%3d v%3d\n", rgb_matrix_config.hue, rgb_matrix_config.sat, rgb_matrix_config.val);
- oled_write(buffer, false);
-#endif
-
- oled_write_P(mode_logo[1], false);
-
-#if defined(RGB_MATRIX_ENABLE)
- snprintf(buffer, sizeof(buffer), " s%3d m%3d\n", rgb_matrix_config.speed, rgb_matrix_config.mode);
- oled_write(buffer, false);
-#endif
-
- // 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
- oled_write_P(PSTR("Layer: "), false);
- switch (biton32(layer_state)) {
- case _QWERTY:
-#ifndef GAMELAYER_DISABLE
- switch (biton32(default_layer_state)) {
- case _QWERTY:
- oled_write_P(PSTR("Default\n"), false);
- break;
- case _GAME:
- oled_write_P(PSTR("Game\n"), false);
- break;
- default:
- oled_write_P(PSTR("Undefined\n"), false);
- break;
- }
-#else
- oled_write_P(PSTR("Default\n"), false);
-#endif
- break;
- case _LOWER:
- oled_write_P(PSTR("Lower\n"), false);
- break;
- case _RAISE:
- oled_write_P(PSTR("Raise\n"), false);
- break;
-#ifdef TRILAYER_ENABLED
- case _ADJUST:
- oled_write_P(PSTR("Adjust\n"), false);
- break;
-#endif
- default:
- oled_write_P(PSTR("Undefined\n"), false);
- }
-
- // Host Keyboard LED Status
- uint8_t led_usb_state = host_keyboard_leds();
- oled_write_P(led_usb_state & (1<<USB_LED_NUM_LOCK) ? PSTR("NUMLCK ") : PSTR(" "), false);
- oled_write_P(led_usb_state & (1<<USB_LED_CAPS_LOCK) ? PSTR("CAPLCK ") : PSTR(" "), false);
- oled_write_P(led_usb_state & (1<<USB_LED_SCROLL_LOCK) ? PSTR("SCRLCK ") : PSTR(" "), false);
-}
-
-void oled_task_user(void) {
- if (is_keyboard_master()) {
- render_status();
- } else {
- render_logo();
- oled_scroll_left();
- }
-}
-
-#endif