[Keyboard] Increase the way to add oled code for helix/rev3. (#14426)
* move rev3_Xrows/oled_display.c to rev3_Xrows/keymaps/default/oled_display.c * add dummy rev3_Xrows/oled_display.c * Add default minimum oled_task_user() to helix/rev3_Xrows/rev3_Xrows.c * remove unnecessary comment in rev3_Xrows/keymaps/default/oled_display.c * copy rev3_Xrows/keymaps/default/oled_display.c to rev3_Xrows/keymaps/via/oled_display.cmaster
Takeshi ISHII
GitHub
parent
d140e41c93
commit
13b93c212d
|
|
@ -0,0 +1,112 @@
|
||||||
|
/* Copyright 2020 yushakobo
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 2 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* 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 <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include QMK_KEYBOARD_H
|
||||||
|
|
||||||
|
// Defines names for use in layer keycodes and the keymap
|
||||||
|
enum layer_names {
|
||||||
|
_QWERTY = 0,
|
||||||
|
_LOWER,
|
||||||
|
_RAISE,
|
||||||
|
_ADJUST
|
||||||
|
};
|
||||||
|
|
||||||
|
#ifdef OLED_ENABLE
|
||||||
|
|
||||||
|
void render_status(void) {
|
||||||
|
|
||||||
|
// Render to mode icon
|
||||||
|
static const char os_logo[][2][3] PROGMEM ={{{0x95,0x96,0},{0xb5,0xb6,0}},{{0x97,0x98,0},{0xb7,0xb8,0}}};
|
||||||
|
if (is_mac_mode()) {
|
||||||
|
oled_write_P(os_logo[0][0], false);
|
||||||
|
oled_write_P(PSTR("\n"), false);
|
||||||
|
oled_write_P(os_logo[0][1], false);
|
||||||
|
}else{
|
||||||
|
oled_write_P(os_logo[1][0], false);
|
||||||
|
oled_write_P(PSTR("\n"), false);
|
||||||
|
oled_write_P(os_logo[1][1], false);
|
||||||
|
}
|
||||||
|
|
||||||
|
oled_write_P(PSTR(" "), false);
|
||||||
|
|
||||||
|
// Host Keyboard Layer Status
|
||||||
|
oled_write_P(PSTR("Layer: "), false);
|
||||||
|
|
||||||
|
switch (get_highest_layer(layer_state)) {
|
||||||
|
case _QWERTY:
|
||||||
|
oled_write_P(PSTR("Default\n"), false);
|
||||||
|
break;
|
||||||
|
case _RAISE:
|
||||||
|
oled_write_P(PSTR("Raise\n"), false);
|
||||||
|
break;
|
||||||
|
case _LOWER:
|
||||||
|
oled_write_P(PSTR("Lower\n"), false);
|
||||||
|
break;
|
||||||
|
case _ADJUST:
|
||||||
|
oled_write_P(PSTR("Adjust\n"), false);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
// Or use the write_ln shortcut over adding '\n' to the end of your string
|
||||||
|
oled_write_ln_P(PSTR("Undefined"), false);
|
||||||
|
}
|
||||||
|
|
||||||
|
oled_write_P(PSTR("\n"), false);
|
||||||
|
|
||||||
|
// Host Keyboard LED Status
|
||||||
|
led_t led_state = host_keyboard_led_state();
|
||||||
|
oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR(" "), false);
|
||||||
|
oled_write_P(led_state.caps_lock ? PSTR("CAP ") : PSTR(" "), false);
|
||||||
|
oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR(" "), false);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static void render_logo(void) {
|
||||||
|
static const char PROGMEM qmk_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, 0x00
|
||||||
|
};
|
||||||
|
|
||||||
|
oled_write_P(qmk_logo, false);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void render_rgbled_status(bool full) {
|
||||||
|
#ifdef RGBLIGHT_ENABLE
|
||||||
|
char buf[30];
|
||||||
|
if (RGBLIGHT_MODES > 1 && rgblight_is_enabled()) {
|
||||||
|
if (full) {
|
||||||
|
snprintf(buf, sizeof(buf), " LED %2d: %d,%d,%d ",
|
||||||
|
rgblight_get_mode(),
|
||||||
|
rgblight_get_hue()/RGBLIGHT_HUE_STEP,
|
||||||
|
rgblight_get_sat()/RGBLIGHT_SAT_STEP,
|
||||||
|
rgblight_get_val()/RGBLIGHT_VAL_STEP);
|
||||||
|
} else {
|
||||||
|
snprintf(buf, sizeof(buf), "[%2d] ", rgblight_get_mode());
|
||||||
|
}
|
||||||
|
oled_write(buf, false);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
void oled_task_user(void) {
|
||||||
|
if(is_keyboard_master()){
|
||||||
|
render_status();
|
||||||
|
}else{
|
||||||
|
render_logo();
|
||||||
|
render_rgbled_status(true);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
@ -0,0 +1,112 @@
|
||||||
|
/* Copyright 2020 yushakobo
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 2 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* 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 <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include QMK_KEYBOARD_H
|
||||||
|
|
||||||
|
// Defines names for use in layer keycodes and the keymap
|
||||||
|
enum layer_names {
|
||||||
|
_QWERTY = 0,
|
||||||
|
_LOWER,
|
||||||
|
_RAISE,
|
||||||
|
_ADJUST
|
||||||
|
};
|
||||||
|
|
||||||
|
#ifdef OLED_ENABLE
|
||||||
|
|
||||||
|
void render_status(void) {
|
||||||
|
|
||||||
|
// Render to mode icon
|
||||||
|
static const char os_logo[][2][3] PROGMEM ={{{0x95,0x96,0},{0xb5,0xb6,0}},{{0x97,0x98,0},{0xb7,0xb8,0}}};
|
||||||
|
if (is_mac_mode()) {
|
||||||
|
oled_write_P(os_logo[0][0], false);
|
||||||
|
oled_write_P(PSTR("\n"), false);
|
||||||
|
oled_write_P(os_logo[0][1], false);
|
||||||
|
}else{
|
||||||
|
oled_write_P(os_logo[1][0], false);
|
||||||
|
oled_write_P(PSTR("\n"), false);
|
||||||
|
oled_write_P(os_logo[1][1], false);
|
||||||
|
}
|
||||||
|
|
||||||
|
oled_write_P(PSTR(" "), false);
|
||||||
|
|
||||||
|
// Host Keyboard Layer Status
|
||||||
|
oled_write_P(PSTR("Layer: "), false);
|
||||||
|
|
||||||
|
switch (get_highest_layer(layer_state)) {
|
||||||
|
case _QWERTY:
|
||||||
|
oled_write_P(PSTR("Default\n"), false);
|
||||||
|
break;
|
||||||
|
case _RAISE:
|
||||||
|
oled_write_P(PSTR("Raise\n"), false);
|
||||||
|
break;
|
||||||
|
case _LOWER:
|
||||||
|
oled_write_P(PSTR("Lower\n"), false);
|
||||||
|
break;
|
||||||
|
case _ADJUST:
|
||||||
|
oled_write_P(PSTR("Adjust\n"), false);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
// Or use the write_ln shortcut over adding '\n' to the end of your string
|
||||||
|
oled_write_ln_P(PSTR("Undefined"), false);
|
||||||
|
}
|
||||||
|
|
||||||
|
oled_write_P(PSTR("\n"), false);
|
||||||
|
|
||||||
|
// Host Keyboard LED Status
|
||||||
|
led_t led_state = host_keyboard_led_state();
|
||||||
|
oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR(" "), false);
|
||||||
|
oled_write_P(led_state.caps_lock ? PSTR("CAP ") : PSTR(" "), false);
|
||||||
|
oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR(" "), false);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static void render_logo(void) {
|
||||||
|
static const char PROGMEM qmk_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, 0x00
|
||||||
|
};
|
||||||
|
|
||||||
|
oled_write_P(qmk_logo, false);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void render_rgbled_status(bool full) {
|
||||||
|
#ifdef RGBLIGHT_ENABLE
|
||||||
|
char buf[30];
|
||||||
|
if (RGBLIGHT_MODES > 1 && rgblight_is_enabled()) {
|
||||||
|
if (full) {
|
||||||
|
snprintf(buf, sizeof(buf), " LED %2d: %d,%d,%d ",
|
||||||
|
rgblight_get_mode(),
|
||||||
|
rgblight_get_hue()/RGBLIGHT_HUE_STEP,
|
||||||
|
rgblight_get_sat()/RGBLIGHT_SAT_STEP,
|
||||||
|
rgblight_get_val()/RGBLIGHT_VAL_STEP);
|
||||||
|
} else {
|
||||||
|
snprintf(buf, sizeof(buf), "[%2d] ", rgblight_get_mode());
|
||||||
|
}
|
||||||
|
oled_write(buf, false);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
void oled_task_user(void) {
|
||||||
|
if(is_keyboard_master()){
|
||||||
|
render_status();
|
||||||
|
}else{
|
||||||
|
render_logo();
|
||||||
|
render_rgbled_status(true);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
@ -1,123 +1,9 @@
|
||||||
/* Copyright 2020 yushakobo
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 2 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* 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 <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
How to Customize
|
|
||||||
|
|
||||||
$ make helix/rev3_4rows:YOUR_KEYMAP:clean
|
There are several ways to create your own keymap oled code:
|
||||||
$ cp keyboards/helix/rev3_4rows/oled_display.c keyboards/helix/rev3_4rows/keymaps/YOUR_KEYMAP
|
|
||||||
|
|
||||||
$ edit keyboards/helix/rev3_4rows/keymaps/YOUR_KEYMAP/oled_display.c
|
* Add the oled code to your keymaps/<keymap_name>/keymap.c.
|
||||||
$ make helix/rev3_4rows:YOUR_KEYMAP
|
* Create a new file in your keymaps/<keymap_name>/ directory, add the oled code, and add `SRC + = <filename>` to keymaps/<keymap_name>/rules.mk.
|
||||||
$ make helix/rev3_4rows:YOUR_KEYMAP:flash
|
* Copy keymaps/default/oled_display.c to your keymaps/<keymap_name>/ directory and modify it.
|
||||||
*/
|
|
||||||
|
|
||||||
#include QMK_KEYBOARD_H
|
*/
|
||||||
|
|
||||||
// Defines names for use in layer keycodes and the keymap
|
|
||||||
enum layer_names {
|
|
||||||
_QWERTY = 0,
|
|
||||||
_LOWER,
|
|
||||||
_RAISE,
|
|
||||||
_ADJUST
|
|
||||||
};
|
|
||||||
|
|
||||||
#ifdef OLED_ENABLE
|
|
||||||
|
|
||||||
void render_status(void) {
|
|
||||||
|
|
||||||
// Render to mode icon
|
|
||||||
static const char os_logo[][2][3] PROGMEM ={{{0x95,0x96,0},{0xb5,0xb6,0}},{{0x97,0x98,0},{0xb7,0xb8,0}}};
|
|
||||||
if (is_mac_mode()) {
|
|
||||||
oled_write_P(os_logo[0][0], false);
|
|
||||||
oled_write_P(PSTR("\n"), false);
|
|
||||||
oled_write_P(os_logo[0][1], false);
|
|
||||||
}else{
|
|
||||||
oled_write_P(os_logo[1][0], false);
|
|
||||||
oled_write_P(PSTR("\n"), false);
|
|
||||||
oled_write_P(os_logo[1][1], false);
|
|
||||||
}
|
|
||||||
|
|
||||||
oled_write_P(PSTR(" "), false);
|
|
||||||
|
|
||||||
// Host Keyboard Layer Status
|
|
||||||
oled_write_P(PSTR("Layer: "), false);
|
|
||||||
|
|
||||||
switch (get_highest_layer(layer_state)) {
|
|
||||||
case _QWERTY:
|
|
||||||
oled_write_P(PSTR("Default\n"), false);
|
|
||||||
break;
|
|
||||||
case _RAISE:
|
|
||||||
oled_write_P(PSTR("Raise\n"), false);
|
|
||||||
break;
|
|
||||||
case _LOWER:
|
|
||||||
oled_write_P(PSTR("Lower\n"), false);
|
|
||||||
break;
|
|
||||||
case _ADJUST:
|
|
||||||
oled_write_P(PSTR("Adjust\n"), false);
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
// Or use the write_ln shortcut over adding '\n' to the end of your string
|
|
||||||
oled_write_ln_P(PSTR("Undefined"), false);
|
|
||||||
}
|
|
||||||
|
|
||||||
oled_write_P(PSTR("\n"), false);
|
|
||||||
|
|
||||||
// Host Keyboard LED Status
|
|
||||||
led_t led_state = host_keyboard_led_state();
|
|
||||||
oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR(" "), false);
|
|
||||||
oled_write_P(led_state.caps_lock ? PSTR("CAP ") : PSTR(" "), false);
|
|
||||||
oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR(" "), false);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
static void render_logo(void) {
|
|
||||||
static const char PROGMEM qmk_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, 0x00
|
|
||||||
};
|
|
||||||
|
|
||||||
oled_write_P(qmk_logo, false);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void render_rgbled_status(bool full) {
|
|
||||||
#ifdef RGBLIGHT_ENABLE
|
|
||||||
char buf[30];
|
|
||||||
if (RGBLIGHT_MODES > 1 && rgblight_is_enabled()) {
|
|
||||||
if (full) {
|
|
||||||
snprintf(buf, sizeof(buf), " LED %2d: %d,%d,%d ",
|
|
||||||
rgblight_get_mode(),
|
|
||||||
rgblight_get_hue()/RGBLIGHT_HUE_STEP,
|
|
||||||
rgblight_get_sat()/RGBLIGHT_SAT_STEP,
|
|
||||||
rgblight_get_val()/RGBLIGHT_VAL_STEP);
|
|
||||||
} else {
|
|
||||||
snprintf(buf, sizeof(buf), "[%2d] ", rgblight_get_mode());
|
|
||||||
}
|
|
||||||
oled_write(buf, false);
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
void oled_task_user(void) {
|
|
||||||
if(is_keyboard_master()){
|
|
||||||
render_status();
|
|
||||||
}else{
|
|
||||||
render_logo();
|
|
||||||
render_rgbled_status(true);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
|
||||||
|
|
@ -47,3 +47,67 @@ bool dip_switch_update_kb(uint8_t index, bool active) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef OLED_ENABLE
|
||||||
|
static char *sprint_decimal(char *buf, int data) {
|
||||||
|
if (data > 9) {
|
||||||
|
buf = sprint_decimal(buf, data/10);
|
||||||
|
}
|
||||||
|
*buf++ = "0123456789"[data%10];
|
||||||
|
*buf = '\0';
|
||||||
|
return buf;
|
||||||
|
}
|
||||||
|
|
||||||
|
char *sprints(char *buf, char *src) {
|
||||||
|
while (*src) {
|
||||||
|
*buf++ = *src++;
|
||||||
|
}
|
||||||
|
*buf = '\0';
|
||||||
|
return buf;
|
||||||
|
}
|
||||||
|
|
||||||
|
char *sprintd(char *buf, char *leadstr, int data) {
|
||||||
|
buf = sprints(buf, leadstr);
|
||||||
|
buf = sprint_decimal(buf, data);
|
||||||
|
return buf;
|
||||||
|
}
|
||||||
|
|
||||||
|
char *sprint2d(char *buf, char *leadstr, int data) {
|
||||||
|
buf = sprints(buf, leadstr);
|
||||||
|
if (data > 99) {
|
||||||
|
return sprint_decimal(buf, data);
|
||||||
|
}
|
||||||
|
if (data < 10) {
|
||||||
|
*buf++ = ' ';
|
||||||
|
}
|
||||||
|
return sprint_decimal(buf, data);
|
||||||
|
}
|
||||||
|
|
||||||
|
__attribute__((weak))
|
||||||
|
void oled_task_user(void) {
|
||||||
|
static const char PROGMEM helix_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,
|
||||||
|
0x0
|
||||||
|
};
|
||||||
|
static const char os_logo[][2][3] PROGMEM ={{{0x95,0x96,0},{0xb5,0xb6,0}},{{0x97,0x98,0},{0xb7,0xb8,0}}};
|
||||||
|
|
||||||
|
if (is_keyboard_master()) {
|
||||||
|
if (is_mac_mode()) {
|
||||||
|
oled_write_P(os_logo[0][0], false);
|
||||||
|
oled_write_P(PSTR("\n"), false);
|
||||||
|
oled_write_P(os_logo[0][1], false);
|
||||||
|
}else{
|
||||||
|
oled_write_P(os_logo[1][0], false);
|
||||||
|
oled_write_P(PSTR("\n"), false);
|
||||||
|
oled_write_P(os_logo[1][1], false);
|
||||||
|
}
|
||||||
|
char buf[20];
|
||||||
|
sprint2d(buf, " Layer: ", get_highest_layer(layer_state));
|
||||||
|
oled_write(buf, false);
|
||||||
|
} else {
|
||||||
|
oled_write_P(helix_logo, false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,112 @@
|
||||||
|
/* Copyright 2020 yushakobo
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 2 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* 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 <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include QMK_KEYBOARD_H
|
||||||
|
|
||||||
|
// Defines names for use in layer keycodes and the keymap
|
||||||
|
enum layer_names {
|
||||||
|
_QWERTY = 0,
|
||||||
|
_LOWER,
|
||||||
|
_RAISE,
|
||||||
|
_ADJUST
|
||||||
|
};
|
||||||
|
|
||||||
|
#ifdef OLED_ENABLE
|
||||||
|
|
||||||
|
void render_status(void) {
|
||||||
|
|
||||||
|
// Render to mode icon
|
||||||
|
static const char os_logo[][2][3] PROGMEM ={{{0x95,0x96,0},{0xb5,0xb6,0}},{{0x97,0x98,0},{0xb7,0xb8,0}}};
|
||||||
|
if (is_mac_mode()) {
|
||||||
|
oled_write_P(os_logo[0][0], false);
|
||||||
|
oled_write_P(PSTR("\n"), false);
|
||||||
|
oled_write_P(os_logo[0][1], false);
|
||||||
|
}else{
|
||||||
|
oled_write_P(os_logo[1][0], false);
|
||||||
|
oled_write_P(PSTR("\n"), false);
|
||||||
|
oled_write_P(os_logo[1][1], false);
|
||||||
|
}
|
||||||
|
|
||||||
|
oled_write_P(PSTR(" "), false);
|
||||||
|
|
||||||
|
// Host Keyboard Layer Status
|
||||||
|
oled_write_P(PSTR("Layer: "), false);
|
||||||
|
|
||||||
|
switch (get_highest_layer(layer_state)) {
|
||||||
|
case _QWERTY:
|
||||||
|
oled_write_P(PSTR("Default\n"), false);
|
||||||
|
break;
|
||||||
|
case _RAISE:
|
||||||
|
oled_write_P(PSTR("Raise\n"), false);
|
||||||
|
break;
|
||||||
|
case _LOWER:
|
||||||
|
oled_write_P(PSTR("Lower\n"), false);
|
||||||
|
break;
|
||||||
|
case _ADJUST:
|
||||||
|
oled_write_P(PSTR("Adjust\n"), false);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
// Or use the write_ln shortcut over adding '\n' to the end of your string
|
||||||
|
oled_write_ln_P(PSTR("Undefined"), false);
|
||||||
|
}
|
||||||
|
|
||||||
|
oled_write_P(PSTR("\n"), false);
|
||||||
|
|
||||||
|
// Host Keyboard LED Status
|
||||||
|
led_t led_state = host_keyboard_led_state();
|
||||||
|
oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR(" "), false);
|
||||||
|
oled_write_P(led_state.caps_lock ? PSTR("CAP ") : PSTR(" "), false);
|
||||||
|
oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR(" "), false);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static void render_logo(void) {
|
||||||
|
static const char PROGMEM qmk_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, 0x00
|
||||||
|
};
|
||||||
|
|
||||||
|
oled_write_P(qmk_logo, false);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void render_rgbled_status(bool full) {
|
||||||
|
#ifdef RGBLIGHT_ENABLE
|
||||||
|
char buf[30];
|
||||||
|
if (RGBLIGHT_MODES > 1 && rgblight_is_enabled()) {
|
||||||
|
if (full) {
|
||||||
|
snprintf(buf, sizeof(buf), " LED %2d: %d,%d,%d ",
|
||||||
|
rgblight_get_mode(),
|
||||||
|
rgblight_get_hue()/RGBLIGHT_HUE_STEP,
|
||||||
|
rgblight_get_sat()/RGBLIGHT_SAT_STEP,
|
||||||
|
rgblight_get_val()/RGBLIGHT_VAL_STEP);
|
||||||
|
} else {
|
||||||
|
snprintf(buf, sizeof(buf), "[%2d] ", rgblight_get_mode());
|
||||||
|
}
|
||||||
|
oled_write(buf, false);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
void oled_task_user(void) {
|
||||||
|
if(is_keyboard_master()){
|
||||||
|
render_status();
|
||||||
|
}else{
|
||||||
|
render_logo();
|
||||||
|
render_rgbled_status(true);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
@ -0,0 +1,112 @@
|
||||||
|
/* Copyright 2020 yushakobo
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 2 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* 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 <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include QMK_KEYBOARD_H
|
||||||
|
|
||||||
|
// Defines names for use in layer keycodes and the keymap
|
||||||
|
enum layer_names {
|
||||||
|
_QWERTY = 0,
|
||||||
|
_LOWER,
|
||||||
|
_RAISE,
|
||||||
|
_ADJUST
|
||||||
|
};
|
||||||
|
|
||||||
|
#ifdef OLED_ENABLE
|
||||||
|
|
||||||
|
void render_status(void) {
|
||||||
|
|
||||||
|
// Render to mode icon
|
||||||
|
static const char os_logo[][2][3] PROGMEM ={{{0x95,0x96,0},{0xb5,0xb6,0}},{{0x97,0x98,0},{0xb7,0xb8,0}}};
|
||||||
|
if (is_mac_mode()) {
|
||||||
|
oled_write_P(os_logo[0][0], false);
|
||||||
|
oled_write_P(PSTR("\n"), false);
|
||||||
|
oled_write_P(os_logo[0][1], false);
|
||||||
|
}else{
|
||||||
|
oled_write_P(os_logo[1][0], false);
|
||||||
|
oled_write_P(PSTR("\n"), false);
|
||||||
|
oled_write_P(os_logo[1][1], false);
|
||||||
|
}
|
||||||
|
|
||||||
|
oled_write_P(PSTR(" "), false);
|
||||||
|
|
||||||
|
// Host Keyboard Layer Status
|
||||||
|
oled_write_P(PSTR("Layer: "), false);
|
||||||
|
|
||||||
|
switch (get_highest_layer(layer_state)) {
|
||||||
|
case _QWERTY:
|
||||||
|
oled_write_P(PSTR("Default\n"), false);
|
||||||
|
break;
|
||||||
|
case _RAISE:
|
||||||
|
oled_write_P(PSTR("Raise\n"), false);
|
||||||
|
break;
|
||||||
|
case _LOWER:
|
||||||
|
oled_write_P(PSTR("Lower\n"), false);
|
||||||
|
break;
|
||||||
|
case _ADJUST:
|
||||||
|
oled_write_P(PSTR("Adjust\n"), false);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
// Or use the write_ln shortcut over adding '\n' to the end of your string
|
||||||
|
oled_write_ln_P(PSTR("Undefined"), false);
|
||||||
|
}
|
||||||
|
|
||||||
|
oled_write_P(PSTR("\n"), false);
|
||||||
|
|
||||||
|
// Host Keyboard LED Status
|
||||||
|
led_t led_state = host_keyboard_led_state();
|
||||||
|
oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR(" "), false);
|
||||||
|
oled_write_P(led_state.caps_lock ? PSTR("CAP ") : PSTR(" "), false);
|
||||||
|
oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR(" "), false);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static void render_logo(void) {
|
||||||
|
static const char PROGMEM qmk_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, 0x00
|
||||||
|
};
|
||||||
|
|
||||||
|
oled_write_P(qmk_logo, false);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void render_rgbled_status(bool full) {
|
||||||
|
#ifdef RGBLIGHT_ENABLE
|
||||||
|
char buf[30];
|
||||||
|
if (RGBLIGHT_MODES > 1 && rgblight_is_enabled()) {
|
||||||
|
if (full) {
|
||||||
|
snprintf(buf, sizeof(buf), " LED %2d: %d,%d,%d ",
|
||||||
|
rgblight_get_mode(),
|
||||||
|
rgblight_get_hue()/RGBLIGHT_HUE_STEP,
|
||||||
|
rgblight_get_sat()/RGBLIGHT_SAT_STEP,
|
||||||
|
rgblight_get_val()/RGBLIGHT_VAL_STEP);
|
||||||
|
} else {
|
||||||
|
snprintf(buf, sizeof(buf), "[%2d] ", rgblight_get_mode());
|
||||||
|
}
|
||||||
|
oled_write(buf, false);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
void oled_task_user(void) {
|
||||||
|
if(is_keyboard_master()){
|
||||||
|
render_status();
|
||||||
|
}else{
|
||||||
|
render_logo();
|
||||||
|
render_rgbled_status(true);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
@ -1,123 +1,9 @@
|
||||||
/* Copyright 2020 yushakobo
|
/*
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 2 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* 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 <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
/*
|
There are several ways to create your own keymap oled code:
|
||||||
How to Customize
|
|
||||||
|
|
||||||
$ make helix/rev3_5rows:YOUR_KEYMAP:clean
|
* Add the oled code to your keymaps/<keymap_name>/keymap.c.
|
||||||
$ cp keyboards/helix/rev3_5rows/oled_display.c keyboards/helix/rev3_5rows/keymaps/YOUR_KEYMAP
|
* Create a new file in your keymaps/<keymap_name>/ directory, add the oled code, and add `SRC + = <filename>` to keymaps/<keymap_name>/rules.mk.
|
||||||
|
* Copy keymaps/default/oled_display.c to your keymaps/<keymap_name>/ directory and modify it.
|
||||||
|
|
||||||
$ edit keyboards/helix/rev3_5rows/keymaps/YOUR_KEYMAP/oled_display.c
|
*/
|
||||||
$ make helix/rev3_5rows:YOUR_KEYMAP
|
|
||||||
$ make helix/rev3_5rows:YOUR_KEYMAP:flash
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include QMK_KEYBOARD_H
|
|
||||||
|
|
||||||
// Defines names for use in layer keycodes and the keymap
|
|
||||||
enum layer_names {
|
|
||||||
_QWERTY = 0,
|
|
||||||
_LOWER,
|
|
||||||
_RAISE,
|
|
||||||
_ADJUST
|
|
||||||
};
|
|
||||||
|
|
||||||
#ifdef OLED_ENABLE
|
|
||||||
|
|
||||||
void render_status(void) {
|
|
||||||
|
|
||||||
// Render to mode icon
|
|
||||||
static const char os_logo[][2][3] PROGMEM ={{{0x95,0x96,0},{0xb5,0xb6,0}},{{0x97,0x98,0},{0xb7,0xb8,0}}};
|
|
||||||
if (is_mac_mode()) {
|
|
||||||
oled_write_P(os_logo[0][0], false);
|
|
||||||
oled_write_P(PSTR("\n"), false);
|
|
||||||
oled_write_P(os_logo[0][1], false);
|
|
||||||
}else{
|
|
||||||
oled_write_P(os_logo[1][0], false);
|
|
||||||
oled_write_P(PSTR("\n"), false);
|
|
||||||
oled_write_P(os_logo[1][1], false);
|
|
||||||
}
|
|
||||||
|
|
||||||
oled_write_P(PSTR(" "), false);
|
|
||||||
|
|
||||||
// Host Keyboard Layer Status
|
|
||||||
oled_write_P(PSTR("Layer: "), false);
|
|
||||||
|
|
||||||
switch (get_highest_layer(layer_state)) {
|
|
||||||
case _QWERTY:
|
|
||||||
oled_write_P(PSTR("Default\n"), false);
|
|
||||||
break;
|
|
||||||
case _RAISE:
|
|
||||||
oled_write_P(PSTR("Raise\n"), false);
|
|
||||||
break;
|
|
||||||
case _LOWER:
|
|
||||||
oled_write_P(PSTR("Lower\n"), false);
|
|
||||||
break;
|
|
||||||
case _ADJUST:
|
|
||||||
oled_write_P(PSTR("Adjust\n"), false);
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
// Or use the write_ln shortcut over adding '\n' to the end of your string
|
|
||||||
oled_write_ln_P(PSTR("Undefined"), false);
|
|
||||||
}
|
|
||||||
|
|
||||||
oled_write_P(PSTR("\n"), false);
|
|
||||||
|
|
||||||
// Host Keyboard LED Status
|
|
||||||
led_t led_state = host_keyboard_led_state();
|
|
||||||
oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR(" "), false);
|
|
||||||
oled_write_P(led_state.caps_lock ? PSTR("CAP ") : PSTR(" "), false);
|
|
||||||
oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR(" "), false);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
static void render_logo(void) {
|
|
||||||
static const char PROGMEM qmk_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, 0x00
|
|
||||||
};
|
|
||||||
|
|
||||||
oled_write_P(qmk_logo, false);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void render_rgbled_status(bool full) {
|
|
||||||
#ifdef RGBLIGHT_ENABLE
|
|
||||||
char buf[30];
|
|
||||||
if (RGBLIGHT_MODES > 1 && rgblight_is_enabled()) {
|
|
||||||
if (full) {
|
|
||||||
snprintf(buf, sizeof(buf), " LED %2d: %d,%d,%d ",
|
|
||||||
rgblight_get_mode(),
|
|
||||||
rgblight_get_hue()/RGBLIGHT_HUE_STEP,
|
|
||||||
rgblight_get_sat()/RGBLIGHT_SAT_STEP,
|
|
||||||
rgblight_get_val()/RGBLIGHT_VAL_STEP);
|
|
||||||
} else {
|
|
||||||
snprintf(buf, sizeof(buf), "[%2d] ", rgblight_get_mode());
|
|
||||||
}
|
|
||||||
oled_write(buf, false);
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
void oled_task_user(void) {
|
|
||||||
if(is_keyboard_master()){
|
|
||||||
render_status();
|
|
||||||
}else{
|
|
||||||
render_logo();
|
|
||||||
render_rgbled_status(true);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
|
||||||
|
|
@ -47,3 +47,67 @@ bool dip_switch_update_kb(uint8_t index, bool active) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef OLED_ENABLE
|
||||||
|
static char *sprint_decimal(char *buf, int data) {
|
||||||
|
if (data > 9) {
|
||||||
|
buf = sprint_decimal(buf, data/10);
|
||||||
|
}
|
||||||
|
*buf++ = "0123456789"[data%10];
|
||||||
|
*buf = '\0';
|
||||||
|
return buf;
|
||||||
|
}
|
||||||
|
|
||||||
|
char *sprints(char *buf, char *src) {
|
||||||
|
while (*src) {
|
||||||
|
*buf++ = *src++;
|
||||||
|
}
|
||||||
|
*buf = '\0';
|
||||||
|
return buf;
|
||||||
|
}
|
||||||
|
|
||||||
|
char *sprintd(char *buf, char *leadstr, int data) {
|
||||||
|
buf = sprints(buf, leadstr);
|
||||||
|
buf = sprint_decimal(buf, data);
|
||||||
|
return buf;
|
||||||
|
}
|
||||||
|
|
||||||
|
char *sprint2d(char *buf, char *leadstr, int data) {
|
||||||
|
buf = sprints(buf, leadstr);
|
||||||
|
if (data > 99) {
|
||||||
|
return sprint_decimal(buf, data);
|
||||||
|
}
|
||||||
|
if (data < 10) {
|
||||||
|
*buf++ = ' ';
|
||||||
|
}
|
||||||
|
return sprint_decimal(buf, data);
|
||||||
|
}
|
||||||
|
|
||||||
|
__attribute__((weak))
|
||||||
|
void oled_task_user(void) {
|
||||||
|
static const char PROGMEM helix_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,
|
||||||
|
0x0
|
||||||
|
};
|
||||||
|
static const char os_logo[][2][3] PROGMEM ={{{0x95,0x96,0},{0xb5,0xb6,0}},{{0x97,0x98,0},{0xb7,0xb8,0}}};
|
||||||
|
|
||||||
|
if (is_keyboard_master()) {
|
||||||
|
if (is_mac_mode()) {
|
||||||
|
oled_write_P(os_logo[0][0], false);
|
||||||
|
oled_write_P(PSTR("\n"), false);
|
||||||
|
oled_write_P(os_logo[0][1], false);
|
||||||
|
}else{
|
||||||
|
oled_write_P(os_logo[1][0], false);
|
||||||
|
oled_write_P(PSTR("\n"), false);
|
||||||
|
oled_write_P(os_logo[1][1], false);
|
||||||
|
}
|
||||||
|
char buf[20];
|
||||||
|
sprint2d(buf, " Layer: ", get_highest_layer(layer_state));
|
||||||
|
oled_write(buf, false);
|
||||||
|
} else {
|
||||||
|
oled_write_P(helix_logo, false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue