Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
a1c39084a2
@ -15,3 +15,53 @@
|
||||
*/
|
||||
|
||||
#include "endzone34.h"
|
||||
|
||||
oled_rotation_t oled_init_kb(oled_rotation_t rotation) {
|
||||
return OLED_ROTATION_270;
|
||||
}
|
||||
|
||||
//Variable that stores the number of times the key was pressed
|
||||
static uint16_t press_count = 0;
|
||||
|
||||
bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
|
||||
|
||||
// Increment the counter when a key is pressed
|
||||
if (record->event.pressed) {
|
||||
press_count++;
|
||||
}
|
||||
|
||||
return process_record_user(keycode, record);
|
||||
}
|
||||
|
||||
#ifdef OLED_ENABLE
|
||||
bool oled_task_kb(void) {
|
||||
|
||||
if (!oled_task_user()) { return false; }
|
||||
|
||||
static const char PROGMEM my_logo[] = {
|
||||
0x00, 0x00, 0x00, 0xff, 0x01, 0x01, 0x39, 0x29, 0x29, 0x29, 0x29, 0x29, 0xe9, 0x0f, 0x00, 0x00,
|
||||
0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0xf8, 0x08, 0xf8, 0x00, 0x00, 0x00, 0x00,
|
||||
0x80, 0x80, 0x80, 0xbf, 0xa0, 0xa0, 0xa7, 0xa5, 0xa5, 0xa5, 0xa5, 0x25, 0x25, 0x3c, 0x00, 0x1f,
|
||||
0x20, 0x3e, 0x02, 0x3e, 0x20, 0x1f, 0x20, 0x2e, 0x2a, 0x2e, 0x20, 0x1f, 0x00, 0x00, 0x00, 0x00,
|
||||
0x87, 0x44, 0x24, 0x14, 0x0c, 0x00, 0xc0, 0xa0, 0x90, 0x88, 0x87, 0x00, 0xe0, 0x10, 0xd0, 0x50,
|
||||
0xd0, 0x10, 0xe0, 0x10, 0xd0, 0x50, 0xd0, 0x10, 0xe0, 0x10, 0xd0, 0x50, 0x50, 0x10, 0xf0, 0x00,
|
||||
0x07, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x07, 0x00, 0x03, 0x04, 0x05, 0x05,
|
||||
0x05, 0x04, 0x03, 0x04, 0x07, 0x00, 0x07, 0x04, 0x03, 0x04, 0x05, 0x05, 0x05, 0x05, 0x07, 0x00
|
||||
};
|
||||
|
||||
oled_write_raw_P(my_logo, sizeof(my_logo));
|
||||
oled_set_cursor(0, 5);
|
||||
|
||||
oled_write_ln_P(PSTR("Layer"), false);
|
||||
oled_write_ln(get_u8_str(get_highest_layer(layer_state), ' '), false);
|
||||
|
||||
oled_write_ln_P(PSTR(" "), false);
|
||||
oled_write_ln_P(PSTR(" "), false);
|
||||
|
||||
oled_write_ln_P(PSTR("Count"), false);
|
||||
oled_write_ln(get_u16_str(press_count, ' '), false);
|
||||
|
||||
return false;
|
||||
|
||||
}
|
||||
#endif
|
||||
|
@ -41,73 +41,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
RGB_M_K, RGB_M_X, RGB_M_G, RGB_M_T, RGB_M_T, KC_F11, KC_F12, KC_CAPS, KC_NO, KC_NO,
|
||||
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
|
||||
};
|
||||
|
||||
oled_rotation_t oled_init_user(oled_rotation_t rotation) {
|
||||
return OLED_ROTATION_270;
|
||||
}
|
||||
|
||||
//Variable that stores the number of times the key was pressed
|
||||
static uint16_t press_count = 0;
|
||||
|
||||
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
|
||||
|
||||
// Increment the counter when a key is pressed
|
||||
if (record->event.pressed) {
|
||||
press_count++;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
#ifdef OLED_ENABLE
|
||||
|
||||
static void render_logo(void) {
|
||||
|
||||
static const char PROGMEM my_logo[] = {
|
||||
0x00, 0x00, 0x00, 0xff, 0x01, 0x01, 0x39, 0x29, 0x29, 0x29, 0x29, 0x29, 0xe9, 0x0f, 0x00, 0x00,
|
||||
0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0xf8, 0x08, 0xf8, 0x00, 0x00, 0x00, 0x00,
|
||||
0x80, 0x80, 0x80, 0xbf, 0xa0, 0xa0, 0xa7, 0xa5, 0xa5, 0xa5, 0xa5, 0x25, 0x25, 0x3c, 0x00, 0x1f,
|
||||
0x20, 0x3e, 0x02, 0x3e, 0x20, 0x1f, 0x20, 0x2e, 0x2a, 0x2e, 0x20, 0x1f, 0x00, 0x00, 0x00, 0x00,
|
||||
0x87, 0x44, 0x24, 0x14, 0x0c, 0x00, 0xc0, 0xa0, 0x90, 0x88, 0x87, 0x00, 0xe0, 0x10, 0xd0, 0x50,
|
||||
0xd0, 0x10, 0xe0, 0x10, 0xd0, 0x50, 0xd0, 0x10, 0xe0, 0x10, 0xd0, 0x50, 0x50, 0x10, 0xf0, 0x00,
|
||||
0x07, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x07, 0x00, 0x03, 0x04, 0x05, 0x05,
|
||||
0x05, 0x04, 0x03, 0x04, 0x07, 0x00, 0x07, 0x04, 0x03, 0x04, 0x05, 0x05, 0x05, 0x05, 0x07, 0x00
|
||||
};
|
||||
|
||||
oled_write_raw_P(my_logo, sizeof(my_logo));
|
||||
}
|
||||
|
||||
bool oled_task_user(void) {
|
||||
|
||||
render_logo();
|
||||
|
||||
oled_set_cursor(0, 5);
|
||||
|
||||
oled_write_ln_P(PSTR("Layer"), false);
|
||||
uint8_t n = get_highest_layer(layer_state);
|
||||
char layer_str[4];
|
||||
layer_str[3] = '\0';
|
||||
layer_str[2] = '0' + n % 10;
|
||||
layer_str[1] = (n /= 10) % 10 ? '0' + (n) % 10 : (n / 10) % 10 ? '0' : ' ';
|
||||
layer_str[0] = n / 10 ? '0' + n / 10 : ' ';
|
||||
|
||||
oled_write_ln(layer_str, false);
|
||||
|
||||
oled_write_ln_P(PSTR(" "), false);
|
||||
oled_write_ln_P(PSTR(" "), false);
|
||||
|
||||
oled_write_ln_P(PSTR("Count"), false);
|
||||
uint16_t m = press_count;
|
||||
char count_str[6];
|
||||
count_str[5] = '\0';
|
||||
count_str[4] = '0' + m % 10;
|
||||
count_str[3] = (m /= 10) % 10 ? '0' + (m) % 10 : (m / 10) % 10 ? '0' : ' ';
|
||||
count_str[2] = (m /= 10) % 10 ? '0' + (m) % 10 : (m / 10) % 10 ? '0' : ' ';
|
||||
count_str[1] = (m /= 10) % 10 ? '0' + (m) % 10 : (m / 10) % 10 ? '0' : ' ';
|
||||
count_str[0] = m / 10 ? '0' + m / 10 : ' ';
|
||||
|
||||
oled_write_ln(count_str, false);
|
||||
|
||||
return false;
|
||||
}
|
||||
#endif
|
||||
|
@ -65,72 +65,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
|
||||
KC_NO, KC_NO, KC_NO, KC_NO)
|
||||
};
|
||||
|
||||
oled_rotation_t oled_init_user(oled_rotation_t rotation) {
|
||||
return OLED_ROTATION_270;
|
||||
}
|
||||
|
||||
//Variable that stores the number of times the key was pressed
|
||||
static uint16_t press_count = 0;
|
||||
|
||||
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
|
||||
|
||||
// Increment the counter when a key is pressed
|
||||
if (record->event.pressed) {
|
||||
press_count++;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
#ifdef OLED_ENABLE
|
||||
|
||||
static void render_logo(void) {
|
||||
|
||||
static const char PROGMEM my_logo[] = {
|
||||
0x00, 0x00, 0x00, 0xff, 0x01, 0x01, 0x39, 0x29, 0x29, 0x29, 0x29, 0x29, 0xe9, 0x0f, 0x00, 0x00,
|
||||
0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0xf8, 0x08, 0xf8, 0x00, 0x00, 0x00, 0x00,
|
||||
0x80, 0x80, 0x80, 0xbf, 0xa0, 0xa0, 0xa7, 0xa5, 0xa5, 0xa5, 0xa5, 0x25, 0x25, 0x3c, 0x00, 0x1f,
|
||||
0x20, 0x3e, 0x02, 0x3e, 0x20, 0x1f, 0x20, 0x2e, 0x2a, 0x2e, 0x20, 0x1f, 0x00, 0x00, 0x00, 0x00,
|
||||
0x87, 0x44, 0x24, 0x14, 0x0c, 0x00, 0xc0, 0xa0, 0x90, 0x88, 0x87, 0x00, 0xe0, 0x10, 0xd0, 0x50,
|
||||
0xd0, 0x10, 0xe0, 0x10, 0xd0, 0x50, 0xd0, 0x10, 0xe0, 0x10, 0xd0, 0x50, 0x50, 0x10, 0xf0, 0x00,
|
||||
0x07, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x07, 0x00, 0x03, 0x04, 0x05, 0x05,
|
||||
0x05, 0x04, 0x03, 0x04, 0x07, 0x00, 0x07, 0x04, 0x03, 0x04, 0x05, 0x05, 0x05, 0x05, 0x07, 0x00
|
||||
};
|
||||
|
||||
oled_write_raw_P(my_logo, sizeof(my_logo));
|
||||
}
|
||||
|
||||
void oled_task_user(void) {
|
||||
|
||||
render_logo();
|
||||
|
||||
oled_set_cursor(0, 5);
|
||||
|
||||
oled_write_ln_P(PSTR("Layer"), false);
|
||||
uint8_t n = get_highest_layer(layer_state);
|
||||
char layer_str[4];
|
||||
layer_str[3] = '\0';
|
||||
layer_str[2] = '0' + n % 10;
|
||||
layer_str[1] = (n /= 10) % 10 ? '0' + (n) % 10 : (n / 10) % 10 ? '0' : ' ';
|
||||
layer_str[0] = n / 10 ? '0' + n / 10 : ' ';
|
||||
|
||||
oled_write_ln(layer_str, false);
|
||||
|
||||
oled_write_ln_P(PSTR(" "), false);
|
||||
oled_write_ln_P(PSTR(" "), false);
|
||||
|
||||
oled_write_ln_P(PSTR("Count"), false);
|
||||
uint16_t m = press_count;
|
||||
char count_str[6];
|
||||
count_str[5] = '\0';
|
||||
count_str[4] = '0' + m % 10;
|
||||
count_str[3] = (m /= 10) % 10 ? '0' + (m) % 10 : (m / 10) % 10 ? '0' : ' ';
|
||||
count_str[2] = (m /= 10) % 10 ? '0' + (m) % 10 : (m / 10) % 10 ? '0' : ' ';
|
||||
count_str[1] = (m /= 10) % 10 ? '0' + (m) % 10 : (m / 10) % 10 ? '0' : ' ';
|
||||
count_str[0] = m / 10 ? '0' + m / 10 : ' ';
|
||||
|
||||
oled_write_ln(count_str, false);
|
||||
|
||||
}
|
||||
#endif
|
@ -1 +1,2 @@
|
||||
VIA_ENABLE = yes
|
||||
LTO_ENABLE = yes
|
||||
|
Loading…
Reference in New Issue
Block a user