diff --git a/qmk_firmware/keyboards/keyball/keyball61/keymaps/oku/config.h b/qmk_firmware/keyboards/keyball/keyball61/keymaps/oku/config.h index e0f2ee43f..420665d40 100644 --- a/qmk_firmware/keyboards/keyball/keyball61/keymaps/oku/config.h +++ b/qmk_firmware/keyboards/keyball/keyball61/keymaps/oku/config.h @@ -43,6 +43,7 @@ along with this program. If not, see . #define NO_ACTION_ONESHOT // #define NO_ACTION_TAPPING #define LAYER_STATE_8BIT +#define SPLIT_LAYER_STATE_ENABLE // #define DRIVER_LED_TOTAL 74 diff --git a/qmk_firmware/keyboards/keyball/keyball61/keymaps/oku/keymap.c b/qmk_firmware/keyboards/keyball/keyball61/keymaps/oku/keymap.c index 30c18ae87..fa198a932 100644 --- a/qmk_firmware/keyboards/keyball/keyball61/keymaps/oku/keymap.c +++ b/qmk_firmware/keyboards/keyball/keyball61/keymaps/oku/keymap.c @@ -40,17 +40,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [2] = LAYOUT_universal( _______ , KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 , KC_F7 , KC_F8 , KC_F9 , KC_F10 , KC_F11 , - _______ , KC_PSLS , KC_7 , KC_8 , KC_9 , KC_PMNS , _______ , _______ , _______ , _______ , _______ , KC_F12 , - _______ , KC_PAST , KC_4 , KC_5 , KC_6 ,KC_PPLS , KC_PGUP , KC_BTN1 , KC_UP , KC_BTN2 , KC_BTN3 , KC_PSCR , - _______ , KC_DOT , KC_1 , KC_2 , KC_3 ,KC_ENT , S(KC_8), S(KC_9) , KC_PGDN , KC_LEFT , KC_DOWN , KC_RGHT , _______ , _______ , + _______ , KC_PSLS , KC_7 , KC_8 , KC_9 , KC_PMNS , _______ , SCRL_DVD , KC_BTN3 , SCRL_DVI , _______ , KC_F12 , + _______ , KC_PAST , KC_4 , KC_5 , KC_6 ,KC_PPLS , KC_UP , KC_BTN1 , SCRL_MO , KC_BTN2 , _______ , KC_PSCR , + _______ , KC_DOT , KC_1 , KC_2 , KC_3 ,KC_ENT , S(KC_8), KC_LEFT , KC_DOWN , KC_RGHT , KC_PGDN , KC_PGUP , _______ , _______ , _______ , _______ , KC_0 , _______ , _______ , _______ , _______ , _______ , KC_ENT , _______ , _______ , _______ , _______ , _______ ), [3] = LAYOUT_universal( - RGB_TOG , AML_TO , AML_I50 , AML_D50 , _______ , _______ , RGB_M_P , RGB_M_B , RGB_M_R , RGB_M_SW , RGB_M_SN , KC_DEL , - RGB_MOD , RGB_HUI , RGB_SAI , RGB_VAI , _______ , _______ , RGB_M_X , RGB_M_G , RGB_M_T , RGB_M_TW , _______ , _______ , + RGB_TOG , AML_TO , AML_I50 , AML_D50 , SSNP_VRT , SSNP_HOR , RGB_M_P , RGB_M_B , RGB_M_R , RGB_M_SW , RGB_M_SN , KC_DEL , + RGB_MOD , RGB_HUI , RGB_SAI , RGB_VAI , _______ , SSNP_FRE , RGB_M_X , RGB_M_G , RGB_M_T , RGB_M_TW , _______ , _______ , RGB_RMOD , RGB_HUD , RGB_SAD , RGB_VAD , _______ , _______ , CPI_D1K , CPI_D100 , CPI_I100 , CPI_I1K , KBC_SAVE , KBC_RST , - _______ , _______ , SCRL_DVD , SCRL_DVI , SCRL_MO , SCRL_TO , EE_CLR , EE_CLR , KC_HOME , KC_PGDN , KC_PGUP , KC_END , _______ , _______ , + _______ , _______ , _______ , _______ , _______ , _______ , EE_CLR , EE_CLR , KC_HOME , KC_PGDN , KC_PGUP , KC_END , _______ , _______ , QK_BOOT , _______ , KC_LEFT , KC_RGHT , KC_DOWN , KC_UP , _______ , KC_LNG2 , KC_DEL , _______ , _______ , _______ , _______ , QK_BOOT ), // Below map is for when keyboard is set to US layout (and out of date) diff --git a/qmk_firmware/keyboards/keyball/lib/keyball/keyball.h b/qmk_firmware/keyboards/keyball/lib/keyball/keyball.h index a01b83248..ba0a00cef 100644 --- a/qmk_firmware/keyboards/keyball/lib/keyball/keyball.h +++ b/qmk_firmware/keyboards/keyball/lib/keyball/keyball.h @@ -51,7 +51,7 @@ along with this program. If not, see . /// Threshold of mouse movement before layer change occurs #ifndef KEYBALL_AUTO_MOUSE_THRESHOLD -# define KEYBALL_AUTO_MOUSE_THRESHOLD 5 +# define KEYBALL_AUTO_MOUSE_THRESHOLD 2 #endif /// Specify SROM ID to be uploaded PMW3360DW (optical sensor). It will be diff --git a/qmk_firmware/keyboards/keyball/lib/oledkit/oledkit.c b/qmk_firmware/keyboards/keyball/lib/oledkit/oledkit.c index 04e67517a..a7e5e633f 100644 --- a/qmk_firmware/keyboards/keyball/lib/oledkit/oledkit.c +++ b/qmk_firmware/keyboards/keyball/lib/oledkit/oledkit.c @@ -15,7 +15,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . */ - + #include "quantum.h" #if defined(OLED_ENABLE) && !defined(OLEDKIT_DISABLE) @@ -23,12 +23,25 @@ along with this program. If not, see . __attribute__((weak)) void oledkit_render_logo_user(void) { // Require `OLED_FONT_H "keyboards/keyball/lib/logofont/logofont.c"` char ch = 0x80; - for (int y = 0; y < 3; y++) { - oled_write_P(PSTR(" "), false); - for (int x = 0; x < 16; x++) { - oled_write_char(ch++, false); - } - oled_advance_page(false); + switch (get_highest_layer(layer_state)) { + case 2: + for (int y = 0; y < 3; y++) { + oled_write_P(PSTR(" "), true); + for (int x = 0; x < 16; x++) { + oled_write_char(ch++, true); + } + oled_advance_page(false); + } + break; + default: + for (int y = 0; y < 3; y++) { + oled_write_P(PSTR(" "), false); + for (int x = 0; x < 16; x++) { + oled_write_char(ch++, false); + } + oled_advance_page(false); + } + break; } }