Added OLED 128x32 support and Lily58 keymap
This commit is contained in:
parent
7d47d69f6a
commit
34a9e79cae
38
keyboards/lily58/config.h
Normal file
38
keyboards/lily58/config.h
Normal file
@ -0,0 +1,38 @@
|
|||||||
|
/*
|
||||||
|
Copyright 2012 Jun Wako <wakojun@gmail.com>
|
||||||
|
Copyright 2015 Jack Humbert
|
||||||
|
|
||||||
|
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/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "config_common.h"
|
||||||
|
|
||||||
|
#ifndef SOFT_SERIAL_PIN
|
||||||
|
#define SOFT_SERIAL_PIN D2
|
||||||
|
#define SERIAL_USE_MULTI_TRANSACTION
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if !defined(NO_ACTION_MACRO)
|
||||||
|
#define NO_ACTION_MACRO
|
||||||
|
#endif
|
||||||
|
#if !defined(NO_ACTION_FUNCTION)
|
||||||
|
#define NO_ACTION_FUNCTION
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#define DIODE_DIRECTION COL2ROW
|
||||||
|
|
||||||
|
// Use the lily version to get the Lily58 logo instead of the qmk logo
|
||||||
|
#define OLED_FONT_H "lib/glcdfont_lily.c"
|
||||||
52
keyboards/lily58/keymaps/default/config.h
Normal file
52
keyboards/lily58/keymaps/default/config.h
Normal file
@ -0,0 +1,52 @@
|
|||||||
|
/*
|
||||||
|
This is the c configuration file for the keymap
|
||||||
|
|
||||||
|
Copyright 2012 Jun Wako <wakojun@gmail.com>
|
||||||
|
Copyright 2015 Jack Humbert
|
||||||
|
|
||||||
|
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/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
//#define USE_MATRIX_I2C
|
||||||
|
|
||||||
|
/* Select hand configuration */
|
||||||
|
|
||||||
|
#define MASTER_LEFT
|
||||||
|
// #define MASTER_RIGHT
|
||||||
|
// #define EE_HANDS
|
||||||
|
|
||||||
|
// #define SSD1306OLED
|
||||||
|
|
||||||
|
#define USE_SERIAL_PD2
|
||||||
|
|
||||||
|
#define TAPPING_FORCE_HOLD
|
||||||
|
#define TAPPING_TERM 100
|
||||||
|
|
||||||
|
#undef RGBLED_NUM
|
||||||
|
#define RGBLIGHT_ANIMATIONS
|
||||||
|
#define RGBLED_NUM 27
|
||||||
|
#define RGBLIGHT_LIMIT_VAL 120
|
||||||
|
#define RGBLIGHT_HUE_STEP 10
|
||||||
|
#define RGBLIGHT_SAT_STEP 17
|
||||||
|
#define RGBLIGHT_VAL_STEP 17
|
||||||
|
|
||||||
|
// Underglow
|
||||||
|
/*
|
||||||
|
#undef RGBLED_NUM
|
||||||
|
#define RGBLED_NUM 14 // Number of LEDs
|
||||||
|
#define RGBLIGHT_ANIMATIONS
|
||||||
|
#define RGBLIGHT_SLEEP
|
||||||
|
*/
|
||||||
163
keyboards/lily58/keymaps/default/keymap.c
Normal file
163
keyboards/lily58/keymaps/default/keymap.c
Normal file
@ -0,0 +1,163 @@
|
|||||||
|
#include QMK_KEYBOARD_H
|
||||||
|
|
||||||
|
#ifdef PROTOCOL_LUFA
|
||||||
|
#include "lufa.h"
|
||||||
|
#include "split_util.h"
|
||||||
|
#endif
|
||||||
|
#ifdef SSD1306OLED
|
||||||
|
#include "ssd1306.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
extern uint8_t is_master;
|
||||||
|
|
||||||
|
enum layer_number {
|
||||||
|
_QWERTY = 0,
|
||||||
|
_LOWER,
|
||||||
|
_RAISE,
|
||||||
|
_ADJUST,
|
||||||
|
};
|
||||||
|
|
||||||
|
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||||
|
|
||||||
|
/* QWERTY
|
||||||
|
* ,-----------------------------------------. ,-----------------------------------------.
|
||||||
|
* | ESC | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | ` |
|
||||||
|
* |------+------+------+------+------+------| |------+------+------+------+------+------|
|
||||||
|
* | Tab | Q | W | E | R | T | | Y | U | I | O | P | - |
|
||||||
|
* |------+------+------+------+------+------| |------+------+------+------+------+------|
|
||||||
|
* |LCTRL | A | S | D | F | G |-------. ,-------| H | J | K | L | ; | ' |
|
||||||
|
* |------+------+------+------+------+------| [ | | ] |------+------+------+------+------+------|
|
||||||
|
* |LShift| Z | X | C | V | B |-------| |-------| N | M | , | . | / |RShift|
|
||||||
|
* `-----------------------------------------/ / \ \-----------------------------------------'
|
||||||
|
* | LAlt | LGUI |LOWER | /Space / \Enter \ |RAISE |BackSP| RGUI |
|
||||||
|
* | | | |/ / \ \ | | | |
|
||||||
|
* `----------------------------' '------''--------------------'
|
||||||
|
*/
|
||||||
|
|
||||||
|
[_QWERTY] = LAYOUT( \
|
||||||
|
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_GRV, \
|
||||||
|
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_MINS, \
|
||||||
|
KC_LCTRL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \
|
||||||
|
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_LBRC, KC_RBRC, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, \
|
||||||
|
KC_LALT, KC_LGUI, MO(_LOWER), KC_SPC, KC_ENT, MO(_RAISE), KC_BSPC, KC_RGUI \
|
||||||
|
),
|
||||||
|
/* LOWER
|
||||||
|
* ,-----------------------------------------. ,-----------------------------------------.
|
||||||
|
* | | | | | | | | | | | | | |
|
||||||
|
* |------+------+------+------+------+------| |------+------+------+------+------+------|
|
||||||
|
* | F1 | F2 | F3 | F4 | F5 | F6 | | F7 | F8 | F9 | F10 | F11 | F12 |
|
||||||
|
* |------+------+------+------+------+------| |------+------+------+------+------+------|
|
||||||
|
* | ` | ! | @ | # | $ | % |-------. ,-------| ^ | & | * | ( | ) | - |
|
||||||
|
* |------+------+------+------+------+------| [ | | ] |------+------+------+------+------+------|
|
||||||
|
* | | | | | | |-------| |-------| | _ | + | { | } | | |
|
||||||
|
* `-----------------------------------------/ / \ \-----------------------------------------'
|
||||||
|
* | LAlt | LGUI |LOWER | /Space / \Enter \ |RAISE |BackSP| RGUI |
|
||||||
|
* | | | |/ / \ \ | | | |
|
||||||
|
* `----------------------------' '------''--------------------'
|
||||||
|
*/
|
||||||
|
[_LOWER] = LAYOUT( \
|
||||||
|
_______, _______, _______, _______, _______, _______, _______, _______, _______,_______, _______, _______,\
|
||||||
|
KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, \
|
||||||
|
KC_GRV, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_TILD, \
|
||||||
|
_______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, \
|
||||||
|
_______, _______, _______, _______, _______, _______, _______, _______\
|
||||||
|
),
|
||||||
|
/* RAISE
|
||||||
|
* ,-----------------------------------------. ,-----------------------------------------.
|
||||||
|
* | | | | | | | | | | | | | |
|
||||||
|
* |------+------+------+------+------+------| |------+------+------+------+------+------|
|
||||||
|
* | ` | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | |
|
||||||
|
* |------+------+------+------+------+------| |------+------+------+------+------+------|
|
||||||
|
* | F1 | F2 | F3 | F4 | F5 | F6 |-------. ,-------| | Left | Down | Up |Right | |
|
||||||
|
* |------+------+------+------+------+------| [ | | ] |------+------+------+------+------+------|
|
||||||
|
* | F7 | F8 | F9 | F10 | F11 | F12 |-------| |-------| + | - | = | [ | ] | \ |
|
||||||
|
* `-----------------------------------------/ / \ \-----------------------------------------'
|
||||||
|
* | LAlt | LGUI |LOWER | /Space / \Enter \ |RAISE |BackSP| RGUI |
|
||||||
|
* | | | |/ / \ \ | | | |
|
||||||
|
* `----------------------------' '------''--------------------'
|
||||||
|
*/
|
||||||
|
|
||||||
|
[_RAISE] = LAYOUT( \
|
||||||
|
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
|
||||||
|
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, \
|
||||||
|
KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, XXXXXXX, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, XXXXXXX, \
|
||||||
|
KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, KC_PLUS, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, \
|
||||||
|
_______, _______, _______, _______, _______, _______, _______, _______ \
|
||||||
|
),
|
||||||
|
/* ADJUST
|
||||||
|
* ,-----------------------------------------. ,-----------------------------------------.
|
||||||
|
* | | | | | | | | | | | | | |
|
||||||
|
* |------+------+------+------+------+------| |------+------+------+------+------+------|
|
||||||
|
* | | | | | | | | | | | | | |
|
||||||
|
* |------+------+------+------+------+------| |------+------+------+------+------+------|
|
||||||
|
* | | | | | | |-------. ,-------| | |RGB ON| HUE+ | SAT+ | VAL+ |
|
||||||
|
* |------+------+------+------+------+------| | | |------+------+------+------+------+------|
|
||||||
|
* | | | | | | |-------| |-------| | | MODE | HUE- | SAT- | VAL- |
|
||||||
|
* `-----------------------------------------/ / \ \-----------------------------------------'
|
||||||
|
* | LAlt | LGUI |LOWER | /Space / \Enter \ |RAISE |BackSP| RGUI |
|
||||||
|
* | | | |/ / \ \ | | | |
|
||||||
|
* `----------------------------' '------''--------------------'
|
||||||
|
*/
|
||||||
|
[_ADJUST] = LAYOUT( \
|
||||||
|
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
|
||||||
|
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
|
||||||
|
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
|
||||||
|
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,\
|
||||||
|
_______, _______, _______, _______, _______, _______, _______, _______ \
|
||||||
|
)
|
||||||
|
};
|
||||||
|
|
||||||
|
// Setting ADJUST layer RGB back to default
|
||||||
|
void update_tri_layer_RGB(uint8_t layer1, uint8_t layer2, uint8_t layer3) {
|
||||||
|
if (IS_LAYER_ON(layer1) && IS_LAYER_ON(layer2)) {
|
||||||
|
layer_on(layer3);
|
||||||
|
} else {
|
||||||
|
layer_off(layer3);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
//SSD1306 OLED update loop, make sure to enable OLED_DRIVER_ENABLE=yes in rules.mk
|
||||||
|
#ifdef OLED_DRIVER_ENABLE
|
||||||
|
|
||||||
|
oled_rotation_t oled_init_user(oled_rotation_t rotation) {
|
||||||
|
if (!is_keyboard_master())
|
||||||
|
return OLED_ROTATION_180; // flips the display 180 degrees if offhand
|
||||||
|
return rotation;
|
||||||
|
}
|
||||||
|
|
||||||
|
// When you add source files to SRC in rules.mk, you can use functions.
|
||||||
|
const char *read_layer_state(void);
|
||||||
|
const char *read_logo(void);
|
||||||
|
void set_keylog(uint16_t keycode, keyrecord_t *record);
|
||||||
|
const char *read_keylog(void);
|
||||||
|
const char *read_keylogs(void);
|
||||||
|
|
||||||
|
// const char *read_mode_icon(bool swap);
|
||||||
|
// const char *read_host_led_state(void);
|
||||||
|
// void set_timelog(void);
|
||||||
|
// const char *read_timelog(void);
|
||||||
|
|
||||||
|
void oled_task_user(void) {
|
||||||
|
if (is_keyboard_master()) {
|
||||||
|
// If you want to change the display of OLED, you need to change here
|
||||||
|
oled_write_ln(read_layer_state(), false);
|
||||||
|
oled_write_ln(read_keylog(), false);
|
||||||
|
oled_write_ln(read_keylogs(), false);
|
||||||
|
//oled_write_ln(read_mode_icon(keymap_config.swap_lalt_lgui), false);
|
||||||
|
//oled_write_ln(read_host_led_state(), false);
|
||||||
|
//oled_write_ln(read_timelog(), false);
|
||||||
|
} else {
|
||||||
|
oled_write(read_logo(), false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif // OLED_DRIVER_ENABLE
|
||||||
|
|
||||||
|
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
|
||||||
|
if (record->event.pressed) {
|
||||||
|
#ifdef OLED_DRIVER_ENABLE
|
||||||
|
set_keylog(keycode, record);
|
||||||
|
#endif
|
||||||
|
// set_timelog();
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
30
keyboards/lily58/keymaps/default/rules.mk
Normal file
30
keyboards/lily58/keymaps/default/rules.mk
Normal file
@ -0,0 +1,30 @@
|
|||||||
|
# Build Options
|
||||||
|
# change to "no" to disable the options, or define them in the Makefile in
|
||||||
|
# the appropriate keymap folder that will get included automatically
|
||||||
|
#
|
||||||
|
BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration
|
||||||
|
MOUSEKEY_ENABLE = no # Mouse keys
|
||||||
|
EXTRAKEY_ENABLE = no # Audio control and System control
|
||||||
|
CONSOLE_ENABLE = no # Console for debug
|
||||||
|
COMMAND_ENABLE = no # Commands for debug and configuration
|
||||||
|
NKRO_ENABLE = no # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
|
||||||
|
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
|
||||||
|
MIDI_ENABLE = no # MIDI controls
|
||||||
|
AUDIO_ENABLE = no # Audio output on port C6
|
||||||
|
UNICODE_ENABLE = no # Unicode
|
||||||
|
BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
|
||||||
|
RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
|
||||||
|
SWAP_HANDS_ENABLE = no # Enable one-hand typing
|
||||||
|
OLED_DRIVER_ENABLE= yes # OLED display
|
||||||
|
|
||||||
|
# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
|
||||||
|
SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
|
||||||
|
|
||||||
|
# If you want to change the display of OLED, you need to change here
|
||||||
|
SRC += ./lib/rgb_state_reader.c \
|
||||||
|
./lib/layer_state_reader.c \
|
||||||
|
./lib/logo_reader.c \
|
||||||
|
./lib/keylogger.c \
|
||||||
|
# ./lib/mode_icon_reader.c \
|
||||||
|
# ./lib/host_led_state_reader.c \
|
||||||
|
# ./lib/timelogger.c \
|
||||||
57
keyboards/lily58/keymaps/drashna/config.h
Normal file
57
keyboards/lily58/keymaps/drashna/config.h
Normal file
@ -0,0 +1,57 @@
|
|||||||
|
/*
|
||||||
|
This is the c configuration file for the keymap
|
||||||
|
|
||||||
|
Copyright 2012 Jun Wako <wakojun@gmail.com>
|
||||||
|
Copyright 2015 Jack Humbert
|
||||||
|
|
||||||
|
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/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#define EE_HANDS
|
||||||
|
#define MASTER_LEFT
|
||||||
|
|
||||||
|
//#define USE_SERIAL_PD2
|
||||||
|
|
||||||
|
#ifdef OLED_DRIVER_ENABLE
|
||||||
|
# define OLED_DISPLAY_128X32
|
||||||
|
# define OLED_FONT_H "lib/glcdfont_lily.c"
|
||||||
|
# define OLED_DISABLE_TIMEOUT
|
||||||
|
# define OLED_SCROLL_TIMEOUT_RIGHT 60000
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef RGBLIGHT_ENABLE
|
||||||
|
# define RGBLIGHT_SLEEP
|
||||||
|
# define RGBLIGHT_LIMIT_VAL 200
|
||||||
|
# define RGBLIGHT_HUE_STEP 8
|
||||||
|
# define RGBLIGHT_SAT_STEP 8
|
||||||
|
# define RGBLIGHT_VAL_STEP 8
|
||||||
|
# define RGBLIGHT_SPLIT
|
||||||
|
#endif
|
||||||
|
|
||||||
|
//#define SSD1306OLED
|
||||||
|
|
||||||
|
// If you are using an Elite C rev3 on the slave side, uncomment the lines below:
|
||||||
|
#define SPLIT_USB_DETECT
|
||||||
|
#define SPLIT_USB_TIMEOUT 1000
|
||||||
|
|
||||||
|
#define KEYLOGGER_LENGTH 10
|
||||||
|
|
||||||
|
#define LEADER_PER_KEY_TIMING
|
||||||
|
#define LEADER_TIMEOUT 350
|
||||||
|
|
||||||
|
#define TAPPING_FORCE_HOLD
|
||||||
|
|
||||||
|
|
||||||
114
keyboards/lily58/keymaps/drashna/keymap.c
Normal file
114
keyboards/lily58/keymaps/drashna/keymap.c
Normal file
@ -0,0 +1,114 @@
|
|||||||
|
// #include QMK_KEYBOARD_H
|
||||||
|
#include "drashna.h"
|
||||||
|
|
||||||
|
uint8_t is_master;
|
||||||
|
|
||||||
|
// #ifdef PROTOCOL_LUFA
|
||||||
|
// #include "lufa.h"
|
||||||
|
// #include "split_util.h"
|
||||||
|
// #endif
|
||||||
|
// #ifdef SSD1306OLED
|
||||||
|
// #include "ssd1306.h"
|
||||||
|
// #endif
|
||||||
|
|
||||||
|
// clang-format off
|
||||||
|
#define LAYOUT_lily58_base( \
|
||||||
|
K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, \
|
||||||
|
K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, \
|
||||||
|
K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A \
|
||||||
|
) \
|
||||||
|
LAYOUT_wrapper( \
|
||||||
|
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, /*----*/ KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, \
|
||||||
|
KC_TAB, K01, K02, K03, K04, K05, /*----*/ K06, K07, K08, K09, K0A, KC_GRV, \
|
||||||
|
KC_LSFT, K11, K12, K13, K14, K15, /*----*/ K16, K17, K18, K19, K1A, KC_QUOT, \
|
||||||
|
KC_LCTRL, K21, K22, K23, K24, K25, KC_CCCV, /*----*/ KC_LEAD, K26, K27, K28, K29, K2A, KC_MINS, \
|
||||||
|
KC_LALT, MO(_LOWER), LT(_NAV, KC_SPC), KC_ENT, /*----*/ KC_DEL, LT(_NAV, KC_SPC), MO(_RAISE), KC_TAB \
|
||||||
|
)
|
||||||
|
|
||||||
|
/* Re-pass though to allow templates to be used */
|
||||||
|
#define LAYOUT_lily58_base_wrapper(...) LAYOUT_lily58_base(__VA_ARGS__)
|
||||||
|
|
||||||
|
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||||
|
|
||||||
|
[_QWERTY] = LAYOUT_lily58_base_wrapper(
|
||||||
|
_________________QWERTY_L1_________________, _________________QWERTY_R1_________________,
|
||||||
|
_________________QWERTY_L2_________________, _________________QWERTY_R2_________________,
|
||||||
|
_________________QWERTY_L3_________________, _________________QWERTY_R3_________________
|
||||||
|
),
|
||||||
|
|
||||||
|
[_WORKMAN] = LAYOUT_lily58_base_wrapper(
|
||||||
|
_________________WORKMAN_L1________________, _________________WORKMAN_R1________________,
|
||||||
|
_________________WORKMAN_L2________________, _________________WORKMAN_R2________________,
|
||||||
|
_________________WORKMAN_L3________________, _________________WORKMAN_R3________________
|
||||||
|
),
|
||||||
|
|
||||||
|
[_LOWER] = LAYOUT_lily58_base_wrapper(
|
||||||
|
_________________LOWER_L1__________________, _________________LOWER_R1__________________,
|
||||||
|
_________________LOWER_L2__________________, _________________LOWER_R2__________________,
|
||||||
|
_________________LOWER_L3__________________, _________________LOWER_R3__________________
|
||||||
|
),
|
||||||
|
[_RAISE] = LAYOUT_lily58_base_wrapper(
|
||||||
|
_________________RAISE_L1__________________, _________________RAISE_R1__________________,
|
||||||
|
_________________RAISE_L2__________________, _________________RAISE_R2__________________,
|
||||||
|
_________________RAISE_L3__________________, _________________RAISE_R3__________________
|
||||||
|
),
|
||||||
|
[_ADJUST] = LAYOUT_lily58_base_wrapper(
|
||||||
|
_________________ADJUST_L1_________________, _________________ADJUST_R1_________________,
|
||||||
|
_________________ADJUST_L2_________________, _________________ADJUST_R2_________________,
|
||||||
|
_________________ADJUST_L3_________________, _________________ADJUST_R3_________________
|
||||||
|
),
|
||||||
|
[_NAV] = LAYOUT_lily58_base_wrapper(
|
||||||
|
___________________NAV_L1__________________, ___________________NAV_R1__________________,
|
||||||
|
___________________NAV_L2__________________, ___________________NAV_R2__________________,
|
||||||
|
___________________NAV_L3__________________, ___________________NAV_R3__________________
|
||||||
|
),
|
||||||
|
// [_LAYERINDEX] = LAYOUT_wrapper(
|
||||||
|
// _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||||
|
// _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||||
|
// _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||||
|
// _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
|
||||||
|
// ),
|
||||||
|
};
|
||||||
|
// clang-format on
|
||||||
|
|
||||||
|
// // Setting ADJUST layer RGB back to default
|
||||||
|
// void update_tri_layer_RGB(uint8_t layer1, uint8_t layer2, uint8_t layer3) {
|
||||||
|
// if (IS_LAYER_ON(layer1) && IS_LAYER_ON(layer2)) {
|
||||||
|
// layer_on(layer3);
|
||||||
|
// } else {
|
||||||
|
// layer_off(layer3);
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
|
||||||
|
|
||||||
|
bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
|
||||||
|
if (record->event.pressed) {
|
||||||
|
#ifndef SPLIT_KEYBOARD
|
||||||
|
if (keycode == RESET && !is_master) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
void matrix_init_keymap(void) { is_master = (uint8_t)is_keyboard_master(); }
|
||||||
|
|
||||||
|
#ifdef OLED_DRIVER_ENABLE
|
||||||
|
oled_rotation_t oled_init_user(oled_rotation_t rotation) { return OLED_ROTATION_180; }
|
||||||
|
|
||||||
|
// clang-format off
|
||||||
|
|
||||||
|
# ifndef SPLIT_TRANSPORT_MIRROR
|
||||||
|
void oled_driver_render_logo(void) {
|
||||||
|
static const char PROGMEM lily58_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(lily58_logo, false);
|
||||||
|
}
|
||||||
|
# endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
39
keyboards/lily58/keymaps/drashna/rules.mk
Normal file
39
keyboards/lily58/keymaps/drashna/rules.mk
Normal file
@ -0,0 +1,39 @@
|
|||||||
|
DROP_ALT = no
|
||||||
|
ENCODER_ENABLE = no # ENables the use of one or more encoders
|
||||||
|
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
|
||||||
|
RGBLIGHT_STARTUP_ANIMATION = no
|
||||||
|
LEADER_ENABLE = yes
|
||||||
|
|
||||||
|
SPLIT_TRANSPORT = mirror
|
||||||
|
SPLIT_KEYBOARD = yes
|
||||||
|
|
||||||
|
# Build Options
|
||||||
|
# change to "no" to disable the options, or define them in the Makefile in
|
||||||
|
# the appropriate keymap folder that will get included automatically
|
||||||
|
#
|
||||||
|
BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration
|
||||||
|
MOUSEKEY_ENABLE = no # Mouse keys
|
||||||
|
EXTRAKEY_ENABLE = no # Audio control and System control
|
||||||
|
CONSOLE_ENABLE = no # Console for debug
|
||||||
|
COMMAND_ENABLE = no # Commands for debug and configuration
|
||||||
|
NKRO_ENABLE = no # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
|
||||||
|
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
|
||||||
|
MIDI_ENABLE = no # MIDI controls
|
||||||
|
AUDIO_ENABLE = no # Audio output on port C6
|
||||||
|
UNICODE_ENABLE = no # Unicode
|
||||||
|
BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
|
||||||
|
RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
|
||||||
|
SWAP_HANDS_ENABLE = no # Enable one-hand typing
|
||||||
|
OLED_DRIVER_ENABLE= yes # OLED display
|
||||||
|
|
||||||
|
# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
|
||||||
|
SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
|
||||||
|
|
||||||
|
# # If you want to change the display of OLED, you need to change here
|
||||||
|
# SRC += ./lib/rgb_state_reader.c \
|
||||||
|
# ./lib/layer_state_reader.c \
|
||||||
|
# ./lib/logo_reader.c \
|
||||||
|
# ./lib/keylogger.c \
|
||||||
|
# # ./lib/mode_icon_reader.c \
|
||||||
|
# # ./lib/host_led_state_reader.c \
|
||||||
|
# # ./lib/timelogger.c \
|
||||||
233
keyboards/lily58/lib/glcdfont_lily.c
Normal file
233
keyboards/lily58/lib/glcdfont_lily.c
Normal file
@ -0,0 +1,233 @@
|
|||||||
|
// This is the 'classic' fixed-space bitmap font for Adafruit_GFX since 1.0.
|
||||||
|
// See gfxfont.h for newer custom bitmap font info.
|
||||||
|
|
||||||
|
// Modified to show the Lily58 logo instead of the qmk logo
|
||||||
|
#include "progmem.h"
|
||||||
|
|
||||||
|
// Standard ASCII 5x7 font
|
||||||
|
const unsigned char font[] PROGMEM = {
|
||||||
|
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||||
|
0x3E, 0x5B, 0x4F, 0x5B, 0x3E, 0x00,
|
||||||
|
0x3E, 0x6B, 0x4F, 0x6B, 0x3E, 0x00,
|
||||||
|
0x1C, 0x3E, 0x7C, 0x3E, 0x1C, 0x00,
|
||||||
|
0x18, 0x3C, 0x7E, 0x3C, 0x18, 0x00,
|
||||||
|
0x1C, 0x57, 0x7D, 0x57, 0x1C, 0x00,
|
||||||
|
0x1C, 0x5E, 0x7F, 0x5E, 0x1C, 0x00,
|
||||||
|
0x00, 0x18, 0x3C, 0x18, 0x00, 0x00,
|
||||||
|
0xFF, 0xE7, 0xC3, 0xE7, 0xFF, 0x00,
|
||||||
|
0x00, 0x18, 0x24, 0x18, 0x00, 0x00,
|
||||||
|
0xFF, 0xE7, 0xDB, 0xE7, 0xFF, 0x00,
|
||||||
|
0x30, 0x48, 0x3A, 0x06, 0x0E, 0x00,
|
||||||
|
0x26, 0x29, 0x79, 0x29, 0x26, 0x00,
|
||||||
|
0x40, 0x7F, 0x05, 0x05, 0x07, 0x00,
|
||||||
|
0x40, 0x7F, 0x05, 0x25, 0x3F, 0x00,
|
||||||
|
0x5A, 0x3C, 0xE7, 0x3C, 0x5A, 0x00,
|
||||||
|
0x7F, 0x3E, 0x1C, 0x1C, 0x08, 0x00,
|
||||||
|
0x08, 0x1C, 0x1C, 0x3E, 0x7F, 0x00,
|
||||||
|
0x14, 0x22, 0x7F, 0x22, 0x14, 0x00,
|
||||||
|
0x5F, 0x5F, 0x00, 0x5F, 0x5F, 0x00,
|
||||||
|
0x06, 0x09, 0x7F, 0x01, 0x7F, 0x00,
|
||||||
|
0x00, 0x66, 0x89, 0x95, 0x6A, 0x00,
|
||||||
|
0x60, 0x60, 0x60, 0x60, 0x60, 0x00,
|
||||||
|
0x94, 0xA2, 0xFF, 0xA2, 0x94, 0x00,
|
||||||
|
0x08, 0x04, 0x7E, 0x04, 0x08, 0x00,
|
||||||
|
0x10, 0x20, 0x7E, 0x20, 0x10, 0x00,
|
||||||
|
0x08, 0x08, 0x2A, 0x1C, 0x08, 0x00,
|
||||||
|
0x08, 0x1C, 0x2A, 0x08, 0x08, 0x00,
|
||||||
|
0x1E, 0x10, 0x10, 0x10, 0x10, 0x00,
|
||||||
|
0x0C, 0x1E, 0x0C, 0x1E, 0x0C, 0x00,
|
||||||
|
0x30, 0x38, 0x3E, 0x38, 0x30, 0x00,
|
||||||
|
0x06, 0x0E, 0x3E, 0x0E, 0x06, 0x00,
|
||||||
|
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||||
|
0x00, 0x00, 0x5F, 0x00, 0x00, 0x00,
|
||||||
|
0x00, 0x07, 0x00, 0x07, 0x00, 0x00,
|
||||||
|
0x14, 0x7F, 0x14, 0x7F, 0x14, 0x00,
|
||||||
|
0x24, 0x2A, 0x7F, 0x2A, 0x12, 0x00,
|
||||||
|
0x23, 0x13, 0x08, 0x64, 0x62, 0x00,
|
||||||
|
0x36, 0x49, 0x56, 0x20, 0x50, 0x00,
|
||||||
|
0x00, 0x08, 0x07, 0x03, 0x00, 0x00,
|
||||||
|
0x00, 0x1C, 0x22, 0x41, 0x00, 0x00,
|
||||||
|
0x00, 0x41, 0x22, 0x1C, 0x00, 0x00,
|
||||||
|
0x2A, 0x1C, 0x7F, 0x1C, 0x2A, 0x00,
|
||||||
|
0x08, 0x08, 0x3E, 0x08, 0x08, 0x00,
|
||||||
|
0x00, 0x80, 0x70, 0x30, 0x00, 0x00,
|
||||||
|
0x08, 0x08, 0x08, 0x08, 0x08, 0x00,
|
||||||
|
0x00, 0x00, 0x60, 0x60, 0x00, 0x00,
|
||||||
|
0x20, 0x10, 0x08, 0x04, 0x02, 0x00,
|
||||||
|
0x3E, 0x51, 0x49, 0x45, 0x3E, 0x00,
|
||||||
|
0x00, 0x42, 0x7F, 0x40, 0x00, 0x00,
|
||||||
|
0x72, 0x49, 0x49, 0x49, 0x46, 0x00,
|
||||||
|
0x21, 0x41, 0x49, 0x4D, 0x33, 0x00,
|
||||||
|
0x18, 0x14, 0x12, 0x7F, 0x10, 0x00,
|
||||||
|
0x27, 0x45, 0x45, 0x45, 0x39, 0x00,
|
||||||
|
0x3C, 0x4A, 0x49, 0x49, 0x31, 0x00,
|
||||||
|
0x41, 0x21, 0x11, 0x09, 0x07, 0x00,
|
||||||
|
0x36, 0x49, 0x49, 0x49, 0x36, 0x00,
|
||||||
|
0x46, 0x49, 0x49, 0x29, 0x1E, 0x00,
|
||||||
|
0x00, 0x00, 0x14, 0x00, 0x00, 0x00,
|
||||||
|
0x00, 0x40, 0x34, 0x00, 0x00, 0x00,
|
||||||
|
0x00, 0x08, 0x14, 0x22, 0x41, 0x00,
|
||||||
|
0x14, 0x14, 0x14, 0x14, 0x14, 0x00,
|
||||||
|
0x00, 0x41, 0x22, 0x14, 0x08, 0x00,
|
||||||
|
0x02, 0x01, 0x59, 0x09, 0x06, 0x00,
|
||||||
|
0x3E, 0x41, 0x5D, 0x59, 0x4E, 0x00,
|
||||||
|
0x7C, 0x12, 0x11, 0x12, 0x7C, 0x00,
|
||||||
|
0x7F, 0x49, 0x49, 0x49, 0x36, 0x00,
|
||||||
|
0x3E, 0x41, 0x41, 0x41, 0x22, 0x00,
|
||||||
|
0x7F, 0x41, 0x41, 0x41, 0x3E, 0x00,
|
||||||
|
0x7F, 0x49, 0x49, 0x49, 0x41, 0x00,
|
||||||
|
0x7F, 0x09, 0x09, 0x09, 0x01, 0x00,
|
||||||
|
0x3E, 0x41, 0x41, 0x51, 0x73, 0x00,
|
||||||
|
0x7F, 0x08, 0x08, 0x08, 0x7F, 0x00,
|
||||||
|
0x00, 0x41, 0x7F, 0x41, 0x00, 0x00,
|
||||||
|
0x20, 0x40, 0x41, 0x3F, 0x01, 0x00,
|
||||||
|
0x7F, 0x08, 0x14, 0x22, 0x41, 0x00,
|
||||||
|
0x7F, 0x40, 0x40, 0x40, 0x40, 0x00,
|
||||||
|
0x7F, 0x02, 0x1C, 0x02, 0x7F, 0x00,
|
||||||
|
0x7F, 0x04, 0x08, 0x10, 0x7F, 0x00,
|
||||||
|
0x3E, 0x41, 0x41, 0x41, 0x3E, 0x00,
|
||||||
|
0x7F, 0x09, 0x09, 0x09, 0x06, 0x00,
|
||||||
|
0x3E, 0x41, 0x51, 0x21, 0x5E, 0x00,
|
||||||
|
0x7F, 0x09, 0x19, 0x29, 0x46, 0x00,
|
||||||
|
0x26, 0x49, 0x49, 0x49, 0x32, 0x00,
|
||||||
|
0x03, 0x01, 0x7F, 0x01, 0x03, 0x00,
|
||||||
|
0x3F, 0x40, 0x40, 0x40, 0x3F, 0x00,
|
||||||
|
0x1F, 0x20, 0x40, 0x20, 0x1F, 0x00,
|
||||||
|
0x3F, 0x40, 0x38, 0x40, 0x3F, 0x00,
|
||||||
|
0x63, 0x14, 0x08, 0x14, 0x63, 0x00,
|
||||||
|
0x03, 0x04, 0x78, 0x04, 0x03, 0x00,
|
||||||
|
0x61, 0x59, 0x49, 0x4D, 0x43, 0x00,
|
||||||
|
0x00, 0x7F, 0x41, 0x41, 0x41, 0x00,
|
||||||
|
0x02, 0x04, 0x08, 0x10, 0x20, 0x00,
|
||||||
|
0x00, 0x41, 0x41, 0x41, 0x7F, 0x00,
|
||||||
|
0x04, 0x02, 0x01, 0x02, 0x04, 0x00,
|
||||||
|
0x40, 0x40, 0x40, 0x40, 0x40, 0x00,
|
||||||
|
0x00, 0x03, 0x07, 0x08, 0x00, 0x00,
|
||||||
|
0x20, 0x54, 0x54, 0x78, 0x40, 0x00,
|
||||||
|
0x7F, 0x28, 0x44, 0x44, 0x38, 0x00,
|
||||||
|
0x38, 0x44, 0x44, 0x44, 0x28, 0x00,
|
||||||
|
0x38, 0x44, 0x44, 0x28, 0x7F, 0x00,
|
||||||
|
0x38, 0x54, 0x54, 0x54, 0x18, 0x00,
|
||||||
|
0x00, 0x08, 0x7E, 0x09, 0x02, 0x00,
|
||||||
|
0x18, 0x24, 0x24, 0x1C, 0x78, 0x00,
|
||||||
|
0x7F, 0x08, 0x04, 0x04, 0x78, 0x00,
|
||||||
|
0x00, 0x44, 0x7D, 0x40, 0x00, 0x00,
|
||||||
|
0x20, 0x40, 0x40, 0x3D, 0x00, 0x00,
|
||||||
|
0x7F, 0x10, 0x28, 0x44, 0x00, 0x00,
|
||||||
|
0x00, 0x41, 0x7F, 0x40, 0x00, 0x00,
|
||||||
|
0x7C, 0x04, 0x78, 0x04, 0x78, 0x00,
|
||||||
|
0x7C, 0x08, 0x04, 0x04, 0x78, 0x00,
|
||||||
|
0x38, 0x44, 0x44, 0x44, 0x38, 0x00,
|
||||||
|
0x7C, 0x18, 0x24, 0x24, 0x18, 0x00,
|
||||||
|
0x18, 0x24, 0x24, 0x18, 0x7C, 0x00,
|
||||||
|
0x7C, 0x08, 0x04, 0x04, 0x08, 0x00,
|
||||||
|
0x48, 0x54, 0x54, 0x54, 0x24, 0x00,
|
||||||
|
0x04, 0x04, 0x3F, 0x44, 0x24, 0x00,
|
||||||
|
0x3C, 0x40, 0x40, 0x20, 0x7C, 0x00,
|
||||||
|
0x1C, 0x20, 0x40, 0x20, 0x1C, 0x00,
|
||||||
|
0x3C, 0x40, 0x30, 0x40, 0x3C, 0x00,
|
||||||
|
0x44, 0x28, 0x10, 0x28, 0x44, 0x00,
|
||||||
|
0x4C, 0x90, 0x90, 0x90, 0x7C, 0x00,
|
||||||
|
0x44, 0x64, 0x54, 0x4C, 0x44, 0x00,
|
||||||
|
0x00, 0x08, 0x36, 0x41, 0x00, 0x00,
|
||||||
|
0x00, 0x00, 0x77, 0x00, 0x00, 0x00,
|
||||||
|
0x00, 0x41, 0x36, 0x08, 0x00, 0x00,
|
||||||
|
0x02, 0x01, 0x02, 0x04, 0x02, 0x00,
|
||||||
|
0x3C, 0x26, 0x23, 0x26, 0x3C, 0x00,
|
||||||
|
0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
|
||||||
|
0x80, 0x80, 0x80, 0x00, 0x00, 0x00,
|
||||||
|
0x00, 0x00, 0x80, 0xE0, 0x70, 0x18,
|
||||||
|
0x0C, 0x18, 0x30, 0xE0, 0x80, 0x00,
|
||||||
|
0x00, 0x10, 0xF8, 0x90, 0x10, 0x30,
|
||||||
|
0x78, 0x30, 0x10, 0xB8, 0xFC, 0x38,
|
||||||
|
0x10, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||||
|
0x00, 0xF8, 0xFC, 0xF8, 0x00, 0x00,
|
||||||
|
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||||
|
0x00, 0x00, 0x00, 0x00, 0x00, 0x1C,
|
||||||
|
0x9C, 0x1C, 0x00, 0x00, 0x00, 0x00,
|
||||||
|
0xF8, 0xFC, 0xF8, 0x00, 0x00, 0x00,
|
||||||
|
0x00, 0x00, 0x00, 0x1C, 0xFC, 0xF8,
|
||||||
|
0xC0, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||||
|
0x00, 0x80, 0xE0, 0xF8, 0x7C, 0x1C,
|
||||||
|
0x00, 0x00, 0x00, 0xF0, 0xFC, 0xFC,
|
||||||
|
0xFC, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C,
|
||||||
|
0x1C, 0x1C, 0x1C, 0x00, 0x00, 0x00,
|
||||||
|
0x00, 0x00, 0x00, 0xC0, 0xF0, 0xF8,
|
||||||
|
0x38, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C,
|
||||||
|
0x1C, 0x3C, 0xF8, 0xF0, 0xE0, 0x00,
|
||||||
|
0xE0, 0xF0, 0xF0, 0xF0, 0xE0, 0xEC,
|
||||||
|
0xEE, 0xF7, 0xF3, 0x70, 0x20, 0x00,
|
||||||
|
0x7C, 0x7C, 0x7C, 0x7E, 0x00, 0x7E,
|
||||||
|
0x7E, 0x7E, 0x7F, 0x7F, 0x7F, 0x00,
|
||||||
|
0x00, 0x80, 0xC0, 0xE0, 0x7E, 0x5B,
|
||||||
|
0x4F, 0x5B, 0xFE, 0xC0, 0x00, 0x00,
|
||||||
|
0xC0, 0x00, 0xDC, 0xD7, 0xDE, 0xDE,
|
||||||
|
0xDE, 0xD7, 0xDC, 0x00, 0xC0, 0x00,
|
||||||
|
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||||
|
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||||
|
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||||
|
0x00, 0x00, 0x00, 0x00, 0x00, 0x0F,
|
||||||
|
0xBC, 0xE0, 0x81, 0x81, 0x81, 0x83,
|
||||||
|
0x83, 0x82, 0x87, 0x0C, 0x18, 0x30,
|
||||||
|
0x60, 0xC0, 0x00, 0x00, 0x1F, 0xFE,
|
||||||
|
0x90, 0xB9, 0xFF, 0xBB, 0x91, 0x98,
|
||||||
|
0x3C, 0x18, 0x11, 0x13, 0x3F, 0x11,
|
||||||
|
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||||
|
0x00, 0xFF, 0xFF, 0xFF, 0x00, 0x00,
|
||||||
|
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||||
|
0x00, 0x00, 0x00, 0x00, 0x00, 0xFF,
|
||||||
|
0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00,
|
||||||
|
0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00,
|
||||||
|
0x00, 0x00, 0x00, 0x00, 0x00, 0x03,
|
||||||
|
0x0F, 0x7F, 0xF8, 0xE0, 0x80, 0xF0,
|
||||||
|
0xFC, 0x3F, 0x0F, 0x01, 0x00, 0x00,
|
||||||
|
0x00, 0x00, 0x00, 0x3F, 0x3F, 0x3F,
|
||||||
|
0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x3C,
|
||||||
|
0x78, 0xF8, 0xF0, 0xE0, 0x80, 0x00,
|
||||||
|
0x00, 0x00, 0x00, 0xC3, 0xE7, 0xFF,
|
||||||
|
0x7E, 0x3C, 0x38, 0x78, 0x78, 0x70,
|
||||||
|
0x70, 0xF8, 0xFF, 0xDF, 0x87, 0x00,
|
||||||
|
0x0F, 0x1F, 0x3F, 0x7F, 0x7F, 0x7F,
|
||||||
|
0x7F, 0x7F, 0x3F, 0x1E, 0x0C, 0x00,
|
||||||
|
0x1F, 0x1F, 0x1F, 0x3F, 0x00, 0x3F,
|
||||||
|
0x3F, 0x3F, 0x7F, 0x7F, 0x7F, 0x00,
|
||||||
|
0x30, 0x7B, 0x7F, 0x78, 0x30, 0x20,
|
||||||
|
0x20, 0x30, 0x78, 0x7F, 0x3B, 0x00,
|
||||||
|
0x03, 0x00, 0x0F, 0x7F, 0x0F, 0x0F,
|
||||||
|
0x0F, 0x7F, 0x0F, 0x00, 0x03, 0x00,
|
||||||
|
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||||
|
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||||
|
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||||
|
0x18, 0x3C, 0x24, 0x66, 0x63, 0x41,
|
||||||
|
0xC1, 0x81, 0x80, 0x80, 0x80, 0x80,
|
||||||
|
0x80, 0x80, 0x81, 0xC1, 0x41, 0x62,
|
||||||
|
0x38, 0x6C, 0x4C, 0xC6, 0x81, 0x81,
|
||||||
|
0x80, 0x80, 0x80, 0x80, 0x80, 0x81,
|
||||||
|
0xC1, 0x43, 0x62, 0x36, 0x1C, 0x18,
|
||||||
|
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||||
|
0x00, 0xFF, 0xFF, 0xFF, 0xC0, 0xC0,
|
||||||
|
0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0,
|
||||||
|
0xC0, 0x80, 0x00, 0x00, 0x00, 0x7F,
|
||||||
|
0xFF, 0x7F, 0x00, 0x00, 0x00, 0x00,
|
||||||
|
0x7F, 0xFF, 0xFF, 0xC0, 0x80, 0x00,
|
||||||
|
0x00, 0x00, 0xE0, 0xE0, 0xC0, 0xC0,
|
||||||
|
0xC0, 0xE0, 0xF9, 0x7F, 0x1F, 0x07,
|
||||||
|
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||||
|
0x00, 0x00, 0x00, 0x70, 0xF0, 0xE0,
|
||||||
|
0xE0, 0xC0, 0xC0, 0xC0, 0xC0, 0xE0,
|
||||||
|
0xF0, 0xF8, 0x7F, 0x3F, 0x0F, 0x00,
|
||||||
|
0x00, 0x00, 0x0F, 0x3F, 0x7F, 0xF9,
|
||||||
|
0xE0, 0xE0, 0xC0, 0xC0, 0xC0, 0xC0,
|
||||||
|
0xC0, 0xE0, 0xF9, 0x7F, 0x3F, 0x1F,
|
||||||
|
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||||
|
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||||
|
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||||
|
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||||
|
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||||
|
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||||
|
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||||
|
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||||
|
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||||
|
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||||
|
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||||
|
};
|
||||||
16
keyboards/lily58/lib/host_led_state_reader.c
Normal file
16
keyboards/lily58/lib/host_led_state_reader.c
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
#include <stdio.h>
|
||||||
|
#include "led.h"
|
||||||
|
#include "host.h"
|
||||||
|
#include "lily58.h"
|
||||||
|
|
||||||
|
char host_led_state_str[24];
|
||||||
|
|
||||||
|
const char *read_host_led_state(void)
|
||||||
|
{
|
||||||
|
snprintf(host_led_state_str, sizeof(host_led_state_str), "NL:%s CL:%s SL:%s",
|
||||||
|
(IS_HOST_LED_ON(USB_LED_NUM_LOCK)) ? "on" : "- ",
|
||||||
|
(IS_HOST_LED_ON(USB_LED_CAPS_LOCK)) ? "on" : "- ",
|
||||||
|
(IS_HOST_LED_ON(USB_LED_SCROLL_LOCK)) ? "on" : "- ");
|
||||||
|
|
||||||
|
return host_led_state_str;
|
||||||
|
}
|
||||||
46
keyboards/lily58/lib/keylogger.c
Normal file
46
keyboards/lily58/lib/keylogger.c
Normal file
@ -0,0 +1,46 @@
|
|||||||
|
#include <stdio.h>
|
||||||
|
#include "action.h"
|
||||||
|
#include "lily58.h"
|
||||||
|
|
||||||
|
char keylog_str[24] = {};
|
||||||
|
char keylogs_str[21] = {};
|
||||||
|
int keylogs_str_idx = 0;
|
||||||
|
|
||||||
|
const char code_to_name[60] = {
|
||||||
|
' ', ' ', ' ', ' ', 'a', 'b', 'c', 'd', 'e', 'f',
|
||||||
|
'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p',
|
||||||
|
'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
|
||||||
|
'1', '2', '3', '4', '5', '6', '7', '8', '9', '0',
|
||||||
|
'R', 'E', 'B', 'T', ' ', ' ', ' ', ' ', ' ', ' ',
|
||||||
|
' ', ';', '\'', ' ', ',', '.', '/', ' ', ' ', ' '};
|
||||||
|
|
||||||
|
void set_keylog(uint16_t keycode, keyrecord_t *record) {
|
||||||
|
char name = ' ';
|
||||||
|
if (keycode < 60) {
|
||||||
|
name = code_to_name[keycode];
|
||||||
|
}
|
||||||
|
|
||||||
|
// update keylog
|
||||||
|
snprintf(keylog_str, sizeof(keylog_str), "%dx%d, k%2d : %c",
|
||||||
|
record->event.key.row, record->event.key.col,
|
||||||
|
keycode, name);
|
||||||
|
|
||||||
|
// update keylogs
|
||||||
|
if (keylogs_str_idx == sizeof(keylogs_str) - 1) {
|
||||||
|
keylogs_str_idx = 0;
|
||||||
|
for (int i = 0; i < sizeof(keylogs_str) - 1; i++) {
|
||||||
|
keylogs_str[i] = ' ';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
keylogs_str[keylogs_str_idx] = name;
|
||||||
|
keylogs_str_idx++;
|
||||||
|
}
|
||||||
|
|
||||||
|
const char *read_keylog(void) {
|
||||||
|
return keylog_str;
|
||||||
|
}
|
||||||
|
|
||||||
|
const char *read_keylogs(void) {
|
||||||
|
return keylogs_str;
|
||||||
|
}
|
||||||
35
keyboards/lily58/lib/layer_state_reader.c
Normal file
35
keyboards/lily58/lib/layer_state_reader.c
Normal file
@ -0,0 +1,35 @@
|
|||||||
|
|
||||||
|
#include QMK_KEYBOARD_H
|
||||||
|
#include <stdio.h>
|
||||||
|
#include "lily58.h"
|
||||||
|
|
||||||
|
#define L_BASE 0
|
||||||
|
#define L_LOWER (1 << 1)
|
||||||
|
#define L_RAISE (1 << 2)
|
||||||
|
#define L_ADJUST (1 << 3)
|
||||||
|
#define L_ADJUST_TRI (L_ADJUST | L_RAISE | L_LOWER)
|
||||||
|
|
||||||
|
char layer_state_str[24];
|
||||||
|
|
||||||
|
const char *read_layer_state(void) {
|
||||||
|
switch (layer_state)
|
||||||
|
{
|
||||||
|
case L_BASE:
|
||||||
|
snprintf(layer_state_str, sizeof(layer_state_str), "Layer: Default");
|
||||||
|
break;
|
||||||
|
case L_RAISE:
|
||||||
|
snprintf(layer_state_str, sizeof(layer_state_str), "Layer: Raise");
|
||||||
|
break;
|
||||||
|
case L_LOWER:
|
||||||
|
snprintf(layer_state_str, sizeof(layer_state_str), "Layer: Lower");
|
||||||
|
break;
|
||||||
|
case L_ADJUST:
|
||||||
|
case L_ADJUST_TRI:
|
||||||
|
snprintf(layer_state_str, sizeof(layer_state_str), "Layer: Adjust");
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
snprintf(layer_state_str, sizeof(layer_state_str), "Layer: Undef-%ld", layer_state);
|
||||||
|
}
|
||||||
|
|
||||||
|
return layer_state_str;
|
||||||
|
}
|
||||||
11
keyboards/lily58/lib/logo_reader.c
Normal file
11
keyboards/lily58/lib/logo_reader.c
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
#include "lily58.h"
|
||||||
|
|
||||||
|
const char *read_logo(void) {
|
||||||
|
static char 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};
|
||||||
|
|
||||||
|
return logo;
|
||||||
|
}
|
||||||
16
keyboards/lily58/lib/mode_icon_reader.c
Normal file
16
keyboards/lily58/lib/mode_icon_reader.c
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
#include <stdio.h>
|
||||||
|
#include <stdbool.h>
|
||||||
|
#include "lily58.h"
|
||||||
|
|
||||||
|
char mode_icon[24];
|
||||||
|
|
||||||
|
const char *read_mode_icon(bool swap) {
|
||||||
|
static char logo[][2][3] = {{{0x95, 0x96, 0}, {0xb5, 0xb6, 0}}, {{0x97, 0x98, 0}, {0xb7, 0xb8, 0}}};
|
||||||
|
if (swap == false) {
|
||||||
|
snprintf(mode_icon, sizeof(mode_icon), "%s\n%s", logo[0][0], logo[0][1]);
|
||||||
|
} else {
|
||||||
|
snprintf(mode_icon, sizeof(mode_icon), "%s\n%s", logo[1][0], logo[1][1]);
|
||||||
|
}
|
||||||
|
|
||||||
|
return mode_icon;
|
||||||
|
}
|
||||||
15
keyboards/lily58/lib/rgb_state_reader.c
Normal file
15
keyboards/lily58/lib/rgb_state_reader.c
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
#ifdef RGBLIGHT_ENABLE
|
||||||
|
|
||||||
|
#include QMK_KEYBOARD_H
|
||||||
|
#include <stdio.h>
|
||||||
|
|
||||||
|
extern rgblight_config_t rgblight_config;
|
||||||
|
char rbf_info_str[24];
|
||||||
|
const char *read_rgb_info(void) {
|
||||||
|
|
||||||
|
snprintf(rbf_info_str, sizeof(rbf_info_str), "%s %2d h%3d s%3d v%3d",
|
||||||
|
rgblight_config.enable ? "on" : "- ", rgblight_config.mode,
|
||||||
|
rgblight_config.hue, rgblight_config.sat, rgblight_config.val);
|
||||||
|
return rbf_info_str;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
17
keyboards/lily58/lib/timelogger.c
Normal file
17
keyboards/lily58/lib/timelogger.c
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
#include <stdio.h>
|
||||||
|
#include "timer.h"
|
||||||
|
#include "lily58.h"
|
||||||
|
|
||||||
|
char timelog_str[24] = {};
|
||||||
|
int last_time = 0;
|
||||||
|
int elapsed_time = 0;
|
||||||
|
|
||||||
|
void set_timelog(void) {
|
||||||
|
elapsed_time = timer_elapsed(last_time);
|
||||||
|
last_time = timer_read();
|
||||||
|
snprintf(timelog_str, sizeof(timelog_str), "lt:%5d, et:%5d", last_time, elapsed_time);
|
||||||
|
}
|
||||||
|
|
||||||
|
const char *read_timelog(void) {
|
||||||
|
return timelog_str;
|
||||||
|
}
|
||||||
5
keyboards/lily58/lily58.c
Normal file
5
keyboards/lily58/lily58.c
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
#include "lily58.h"
|
||||||
|
|
||||||
|
bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
|
||||||
|
return process_record_user(keycode, record);
|
||||||
|
}
|
||||||
5
keyboards/lily58/lily58.h
Normal file
5
keyboards/lily58/lily58.h
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
#pragma once
|
||||||
|
|
||||||
|
#ifdef KEYBOARD_lily58_rev1
|
||||||
|
#include "rev1.h"
|
||||||
|
#endif
|
||||||
15
keyboards/lily58/readme.md
Normal file
15
keyboards/lily58/readme.md
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
# Lily58
|
||||||
|
|
||||||
|
Lily58 is 6×4+5keys column-staggered split keyboard.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
Keyboard Maintainer: [Naoki Katahira](https://github.com/kata0510/) [Twitter:@F_YUUCHI](https://twitter.com/F_YUUCHI)
|
||||||
|
Hardware Supported: Lily58 PCB, ProMicro
|
||||||
|
Hardware Availability: [PCB & Case Data](https://github.com/kata0510/Lily58)
|
||||||
|
|
||||||
|
Make example for this keyboard (after setting up your build environment):
|
||||||
|
|
||||||
|
make lily58:default
|
||||||
|
|
||||||
|
See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
|
||||||
71
keyboards/lily58/rev1/config.h
Normal file
71
keyboards/lily58/rev1/config.h
Normal file
@ -0,0 +1,71 @@
|
|||||||
|
/*
|
||||||
|
Copyright 2012 Jun Wako <wakojun@gmail.com>
|
||||||
|
Copyright 2015 Jack Humbert
|
||||||
|
Copyright 2017 F_YUUCHI
|
||||||
|
|
||||||
|
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/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
/* USB Device descriptor parameter */
|
||||||
|
#define VENDOR_ID 0x04D8
|
||||||
|
#define PRODUCT_ID 0xEB2D
|
||||||
|
#define DEVICE_VER 0x0100
|
||||||
|
#define MANUFACTURER liliums
|
||||||
|
#define PRODUCT Lily58
|
||||||
|
#define DESCRIPTION Lily58 is 6×4+5keys column-staggered split keyboard.
|
||||||
|
|
||||||
|
/* key matrix size */
|
||||||
|
// Rows are doubled-up
|
||||||
|
#define MATRIX_ROWS 10
|
||||||
|
#define MATRIX_COLS 6
|
||||||
|
|
||||||
|
// wiring of each half
|
||||||
|
#define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 }
|
||||||
|
#define MATRIX_COL_PINS { F6, F7, B1, B3, B2, B6 }
|
||||||
|
|
||||||
|
|
||||||
|
/* define if matrix has ghost */
|
||||||
|
//#define MATRIX_HAS_GHOST
|
||||||
|
|
||||||
|
/* Set 0 if debouncing isn't needed */
|
||||||
|
#define DEBOUNCE 5
|
||||||
|
|
||||||
|
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
|
||||||
|
//#define LOCKING_SUPPORT_ENABLE
|
||||||
|
/* Locking resynchronize hack */
|
||||||
|
//#define LOCKING_RESYNC_ENABLE
|
||||||
|
|
||||||
|
/* ws2812 RGB LED */
|
||||||
|
#define RGB_DI_PIN D3
|
||||||
|
#define RGBLED_NUM 12 // Number of LEDs
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Feature disable options
|
||||||
|
* These options are also useful to firmware size reduction.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/* disable debug print */
|
||||||
|
// #define NO_DEBUG
|
||||||
|
|
||||||
|
/* disable print */
|
||||||
|
// #define NO_PRINT
|
||||||
|
|
||||||
|
/* disable action features */
|
||||||
|
//#define NO_ACTION_LAYER
|
||||||
|
//#define NO_ACTION_TAPPING
|
||||||
|
//#define NO_ACTION_ONESHOT
|
||||||
|
//#define NO_ACTION_MACRO
|
||||||
|
//#define NO_ACTION_FUNCTION
|
||||||
18
keyboards/lily58/rev1/info.json
Normal file
18
keyboards/lily58/rev1/info.json
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
{
|
||||||
|
"keyboard_name": "Lily58",
|
||||||
|
"url": "",
|
||||||
|
"maintainer": "liliums",
|
||||||
|
"width": 16.5,
|
||||||
|
"height": 5.25,
|
||||||
|
"layouts": {
|
||||||
|
"LAYOUT": {
|
||||||
|
"layout": [
|
||||||
|
{"x":0, "y":0.5}, {"x":1, "y":0.375}, {"x":2, "y":0.125}, {"x":3, "y":0}, {"x":4, "y":0.125}, {"x":5, "y":0.25}, {"x":10.5, "y":0.25}, {"x":11.5, "y":0.125}, {"x":12.5, "y":0}, {"x":13.5, "y":0.125}, {"x":14.5, "y":0.375}, {"x":15.5, "y":0.5},
|
||||||
|
{"x":0, "y":1.5}, {"x":1, "y":1.375}, {"x":2, "y":1.125}, {"x":3, "y":1}, {"x":4, "y":1.125}, {"x":5, "y":1.25}, {"x":10.5, "y":1.25}, {"x":11.5, "y":1.125}, {"x":12.5, "y":1}, {"x":13.5, "y":1.125}, {"x":14.5, "y":1.375}, {"x":15.5, "y":1.5},
|
||||||
|
{"x":0, "y":2.5}, {"x":1, "y":2.375}, {"x":2, "y":2.125}, {"x":3, "y":2}, {"x":4, "y":2.125}, {"x":5, "y":2.25}, {"x":10.5, "y":2.25}, {"x":11.5, "y":2.125}, {"x":12.5, "y":2}, {"x":13.5, "y":2.125}, {"x":14.5, "y":2.375}, {"x":15.5, "y":2.5},
|
||||||
|
{"x":0, "y":3.5}, {"x":1, "y":3.375}, {"x":2, "y":3.125}, {"x":3, "y":3}, {"x":4, "y":3.125}, {"x":5, "y":3.25}, {"x":6, "y":2.75}, {"x":9.5, "y":2.75}, {"x":10.5, "y":3.25}, {"x":11.5, "y":3.125}, {"x":12.5, "y":3}, {"x":13.5, "y":3.125}, {"x":14.5, "y":3.375}, {"x":15.5, "y":3.5},
|
||||||
|
{"x":2.5, "y":4.125}, {"x":3.5, "y":4.15}, {"x":4.5, "y":4.25}, {"x":6, "y":4.25, "h":1.5}, {"x":9.5, "y":4.25, "h":1.5}, {"x":11, "y":4.25}, {"x":12, "y":4.15}, {"x":13, "y":4.15}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
357
keyboards/lily58/rev1/matrix.c
Normal file
357
keyboards/lily58/rev1/matrix.c
Normal file
@ -0,0 +1,357 @@
|
|||||||
|
/*
|
||||||
|
Copyright 2012 Jun Wako <wakojun@gmail.com>
|
||||||
|
|
||||||
|
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/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/*
|
||||||
|
* scan matrix
|
||||||
|
*/
|
||||||
|
#include <stdint.h>
|
||||||
|
#include <stdbool.h>
|
||||||
|
#include <string.h>
|
||||||
|
#include <avr/io.h>
|
||||||
|
#include <avr/wdt.h>
|
||||||
|
#include <avr/interrupt.h>
|
||||||
|
#include <util/delay.h>
|
||||||
|
#include "print.h"
|
||||||
|
#include "debug.h"
|
||||||
|
#include "util.h"
|
||||||
|
#include "matrix.h"
|
||||||
|
#include "split_util.h"
|
||||||
|
#include "quantum.h"
|
||||||
|
|
||||||
|
#ifdef USE_MATRIX_I2C
|
||||||
|
# include "i2c.h"
|
||||||
|
#else // USE_SERIAL
|
||||||
|
# include "split_scomm.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef DEBOUNCE
|
||||||
|
# define DEBOUNCE 5
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#define ERROR_DISCONNECT_COUNT 5
|
||||||
|
|
||||||
|
static uint8_t debouncing = DEBOUNCE;
|
||||||
|
static const int ROWS_PER_HAND = MATRIX_ROWS/2;
|
||||||
|
static uint8_t error_count = 0;
|
||||||
|
uint8_t is_master = 0 ;
|
||||||
|
|
||||||
|
static const uint8_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
|
||||||
|
static const uint8_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
|
||||||
|
|
||||||
|
/* matrix state(1:on, 0:off) */
|
||||||
|
static matrix_row_t matrix[MATRIX_ROWS];
|
||||||
|
static matrix_row_t matrix_debouncing[MATRIX_ROWS];
|
||||||
|
|
||||||
|
static matrix_row_t read_cols(void);
|
||||||
|
static void init_cols(void);
|
||||||
|
static void unselect_rows(void);
|
||||||
|
static void select_row(uint8_t row);
|
||||||
|
static uint8_t matrix_master_scan(void);
|
||||||
|
|
||||||
|
|
||||||
|
__attribute__ ((weak))
|
||||||
|
void matrix_init_kb(void) {
|
||||||
|
matrix_init_user();
|
||||||
|
}
|
||||||
|
|
||||||
|
__attribute__ ((weak))
|
||||||
|
void matrix_scan_kb(void) {
|
||||||
|
matrix_scan_user();
|
||||||
|
}
|
||||||
|
|
||||||
|
__attribute__ ((weak))
|
||||||
|
void matrix_init_user(void) {
|
||||||
|
}
|
||||||
|
|
||||||
|
__attribute__ ((weak))
|
||||||
|
void matrix_scan_user(void) {
|
||||||
|
}
|
||||||
|
|
||||||
|
inline
|
||||||
|
uint8_t matrix_rows(void)
|
||||||
|
{
|
||||||
|
return MATRIX_ROWS;
|
||||||
|
}
|
||||||
|
|
||||||
|
inline
|
||||||
|
uint8_t matrix_cols(void)
|
||||||
|
{
|
||||||
|
return MATRIX_COLS;
|
||||||
|
}
|
||||||
|
|
||||||
|
void matrix_init(void)
|
||||||
|
{
|
||||||
|
split_keyboard_setup();
|
||||||
|
|
||||||
|
// initialize row and col
|
||||||
|
unselect_rows();
|
||||||
|
init_cols();
|
||||||
|
|
||||||
|
setPinOutput(B0);
|
||||||
|
setPinOutput(D5);
|
||||||
|
writePinHigh(B0);
|
||||||
|
writePinHigh(D5);
|
||||||
|
|
||||||
|
// initialize matrix state: all keys off
|
||||||
|
for (uint8_t i=0; i < MATRIX_ROWS; i++) {
|
||||||
|
matrix[i] = 0;
|
||||||
|
matrix_debouncing[i] = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
is_master = has_usb();
|
||||||
|
|
||||||
|
matrix_init_quantum();
|
||||||
|
}
|
||||||
|
|
||||||
|
uint8_t _matrix_scan(void)
|
||||||
|
{
|
||||||
|
// Right hand is stored after the left in the matirx so, we need to offset it
|
||||||
|
int offset = isLeftHand ? 0 : (ROWS_PER_HAND);
|
||||||
|
|
||||||
|
for (uint8_t i = 0; i < ROWS_PER_HAND; i++) {
|
||||||
|
select_row(i);
|
||||||
|
_delay_us(30); // without this wait read unstable value.
|
||||||
|
matrix_row_t cols = read_cols();
|
||||||
|
if (matrix_debouncing[i+offset] != cols) {
|
||||||
|
matrix_debouncing[i+offset] = cols;
|
||||||
|
debouncing = DEBOUNCE;
|
||||||
|
}
|
||||||
|
unselect_rows();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (debouncing) {
|
||||||
|
if (--debouncing) {
|
||||||
|
_delay_ms(1);
|
||||||
|
} else {
|
||||||
|
for (uint8_t i = 0; i < ROWS_PER_HAND; i++) {
|
||||||
|
matrix[i+offset] = matrix_debouncing[i+offset];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
#ifdef USE_MATRIX_I2C
|
||||||
|
|
||||||
|
// Get rows from other half over i2c
|
||||||
|
int i2c_transaction(void) {
|
||||||
|
int slaveOffset = (isLeftHand) ? (ROWS_PER_HAND) : 0;
|
||||||
|
|
||||||
|
int err = i2c_master_start(SLAVE_I2C_ADDRESS + I2C_WRITE);
|
||||||
|
if (err) goto i2c_error;
|
||||||
|
|
||||||
|
// start of matrix stored at 0x00
|
||||||
|
err = i2c_master_write(0x00);
|
||||||
|
if (err) goto i2c_error;
|
||||||
|
|
||||||
|
// Start read
|
||||||
|
err = i2c_master_start(SLAVE_I2C_ADDRESS + I2C_READ);
|
||||||
|
if (err) goto i2c_error;
|
||||||
|
|
||||||
|
if (!err) {
|
||||||
|
int i;
|
||||||
|
for (i = 0; i < ROWS_PER_HAND-1; ++i) {
|
||||||
|
matrix[slaveOffset+i] = i2c_master_read(I2C_ACK);
|
||||||
|
}
|
||||||
|
matrix[slaveOffset+i] = i2c_master_read(I2C_NACK);
|
||||||
|
i2c_master_stop();
|
||||||
|
} else {
|
||||||
|
i2c_error: // the cable is disconnceted, or something else went wrong
|
||||||
|
i2c_reset_state();
|
||||||
|
return err;
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
#else // USE_SERIAL
|
||||||
|
|
||||||
|
int serial_transaction(int master_changed) {
|
||||||
|
int slaveOffset = (isLeftHand) ? (ROWS_PER_HAND) : 0;
|
||||||
|
#ifdef SERIAL_USE_MULTI_TRANSACTION
|
||||||
|
int ret=serial_update_buffers(master_changed);
|
||||||
|
#else
|
||||||
|
int ret=serial_update_buffers();
|
||||||
|
#endif
|
||||||
|
if (ret ) {
|
||||||
|
if(ret==2) writePinLow(B0);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
writePinHigh(B0);
|
||||||
|
memcpy(&matrix[slaveOffset],
|
||||||
|
(void *)serial_slave_buffer, SERIAL_SLAVE_BUFFER_LENGTH);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
uint8_t matrix_scan(void)
|
||||||
|
{
|
||||||
|
if (is_master) {
|
||||||
|
matrix_master_scan();
|
||||||
|
}else{
|
||||||
|
matrix_slave_scan();
|
||||||
|
int offset = (isLeftHand) ? ROWS_PER_HAND : 0;
|
||||||
|
memcpy(&matrix[offset],
|
||||||
|
(void *)serial_master_buffer, SERIAL_MASTER_BUFFER_LENGTH);
|
||||||
|
matrix_scan_quantum();
|
||||||
|
}
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
uint8_t matrix_master_scan(void) {
|
||||||
|
|
||||||
|
int ret = _matrix_scan();
|
||||||
|
int mchanged = 1;
|
||||||
|
|
||||||
|
int offset = (isLeftHand) ? 0 : ROWS_PER_HAND;
|
||||||
|
|
||||||
|
#ifdef USE_MATRIX_I2C
|
||||||
|
// for (int i = 0; i < ROWS_PER_HAND; ++i) {
|
||||||
|
/* i2c_slave_buffer[i] = matrix[offset+i]; */
|
||||||
|
// i2c_slave_buffer[i] = matrix[offset+i];
|
||||||
|
// }
|
||||||
|
#else // USE_SERIAL
|
||||||
|
#ifdef SERIAL_USE_MULTI_TRANSACTION
|
||||||
|
mchanged = memcmp((void *)serial_master_buffer,
|
||||||
|
&matrix[offset], SERIAL_MASTER_BUFFER_LENGTH);
|
||||||
|
#endif
|
||||||
|
memcpy((void *)serial_master_buffer,
|
||||||
|
&matrix[offset], SERIAL_MASTER_BUFFER_LENGTH);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef USE_MATRIX_I2C
|
||||||
|
if( i2c_transaction() ) {
|
||||||
|
#else // USE_SERIAL
|
||||||
|
if( serial_transaction(mchanged) ) {
|
||||||
|
#endif
|
||||||
|
// turn on the indicator led when halves are disconnected
|
||||||
|
writePinLow(D5);
|
||||||
|
|
||||||
|
error_count++;
|
||||||
|
|
||||||
|
if (error_count > ERROR_DISCONNECT_COUNT) {
|
||||||
|
// reset other half if disconnected
|
||||||
|
int slaveOffset = (isLeftHand) ? (ROWS_PER_HAND) : 0;
|
||||||
|
for (int i = 0; i < ROWS_PER_HAND; ++i) {
|
||||||
|
matrix[slaveOffset+i] = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// turn off the indicator led on no error
|
||||||
|
writePinHigh(D5);
|
||||||
|
error_count = 0;
|
||||||
|
}
|
||||||
|
matrix_scan_quantum();
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
void matrix_slave_scan(void) {
|
||||||
|
_matrix_scan();
|
||||||
|
|
||||||
|
int offset = (isLeftHand) ? 0 : ROWS_PER_HAND;
|
||||||
|
|
||||||
|
#ifdef USE_MATRIX_I2C
|
||||||
|
for (int i = 0; i < ROWS_PER_HAND; ++i) {
|
||||||
|
/* i2c_slave_buffer[i] = matrix[offset+i]; */
|
||||||
|
i2c_slave_buffer[i] = matrix[offset+i];
|
||||||
|
}
|
||||||
|
#else // USE_SERIAL
|
||||||
|
#ifdef SERIAL_USE_MULTI_TRANSACTION
|
||||||
|
int change = 0;
|
||||||
|
#endif
|
||||||
|
for (int i = 0; i < ROWS_PER_HAND; ++i) {
|
||||||
|
#ifdef SERIAL_USE_MULTI_TRANSACTION
|
||||||
|
if( serial_slave_buffer[i] != matrix[offset+i] )
|
||||||
|
change = 1;
|
||||||
|
#endif
|
||||||
|
serial_slave_buffer[i] = matrix[offset+i];
|
||||||
|
}
|
||||||
|
#ifdef SERIAL_USE_MULTI_TRANSACTION
|
||||||
|
slave_buffer_change_count += change;
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
bool matrix_is_modified(void)
|
||||||
|
{
|
||||||
|
if (debouncing) return false;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
inline
|
||||||
|
bool matrix_is_on(uint8_t row, uint8_t col)
|
||||||
|
{
|
||||||
|
return (matrix[row] & ((matrix_row_t)1<<col));
|
||||||
|
}
|
||||||
|
|
||||||
|
inline
|
||||||
|
matrix_row_t matrix_get_row(uint8_t row)
|
||||||
|
{
|
||||||
|
return matrix[row];
|
||||||
|
}
|
||||||
|
|
||||||
|
void matrix_print(void)
|
||||||
|
{
|
||||||
|
print("\nr/c 0123456789ABCDEF\n");
|
||||||
|
for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
|
||||||
|
phex(row); print(": ");
|
||||||
|
pbin_reverse16(matrix_get_row(row));
|
||||||
|
print("\n");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
uint8_t matrix_key_count(void)
|
||||||
|
{
|
||||||
|
uint8_t count = 0;
|
||||||
|
for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
|
||||||
|
count += bitpop16(matrix[i]);
|
||||||
|
}
|
||||||
|
return count;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void init_cols(void)
|
||||||
|
{
|
||||||
|
for(int x = 0; x < MATRIX_COLS; x++) {
|
||||||
|
_SFR_IO8((col_pins[x] >> 4) + 1) &= ~_BV(col_pins[x] & 0xF);
|
||||||
|
_SFR_IO8((col_pins[x] >> 4) + 2) |= _BV(col_pins[x] & 0xF);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static matrix_row_t read_cols(void)
|
||||||
|
{
|
||||||
|
matrix_row_t result = 0;
|
||||||
|
for(int x = 0; x < MATRIX_COLS; x++) {
|
||||||
|
result |= (_SFR_IO8(col_pins[x] >> 4) & _BV(col_pins[x] & 0xF)) ? 0 : (1 << x);
|
||||||
|
}
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void unselect_rows(void)
|
||||||
|
{
|
||||||
|
for(int x = 0; x < ROWS_PER_HAND; x++) {
|
||||||
|
_SFR_IO8((row_pins[x] >> 4) + 1) &= ~_BV(row_pins[x] & 0xF);
|
||||||
|
_SFR_IO8((row_pins[x] >> 4) + 2) |= _BV(row_pins[x] & 0xF);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void select_row(uint8_t row)
|
||||||
|
{
|
||||||
|
_SFR_IO8((row_pins[row] >> 4) + 1) |= _BV(row_pins[row] & 0xF);
|
||||||
|
_SFR_IO8((row_pins[row] >> 4) + 2) &= ~_BV(row_pins[row] & 0xF);
|
||||||
|
}
|
||||||
8
keyboards/lily58/rev1/rev1.c
Normal file
8
keyboards/lily58/rev1/rev1.c
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
#include "lily58.h"
|
||||||
|
|
||||||
|
#ifdef SSD1306OLED
|
||||||
|
void led_set_kb(uint8_t usb_led) {
|
||||||
|
// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
|
||||||
|
//led_set_user(usb_led);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
62
keyboards/lily58/rev1/rev1.h
Normal file
62
keyboards/lily58/rev1/rev1.h
Normal file
@ -0,0 +1,62 @@
|
|||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "lily58.h"
|
||||||
|
|
||||||
|
#include "quantum.h"
|
||||||
|
|
||||||
|
#ifdef RGBLIGHT_ENABLE
|
||||||
|
//rgb led driver
|
||||||
|
#include "ws2812.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef USE_I2C
|
||||||
|
#include <stddef.h>
|
||||||
|
#ifdef __AVR__
|
||||||
|
#include <avr/io.h>
|
||||||
|
#include <avr/interrupt.h>
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef FLIP_HALF
|
||||||
|
#define LAYOUT( \
|
||||||
|
L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
|
||||||
|
L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
|
||||||
|
L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
|
||||||
|
L30, L31, L32, L33, L34, L35, L45, R40, R30, R31, R32, R33, R34, R35, \
|
||||||
|
L41, L42, L43, L44, R41, R42, R43, R44 \
|
||||||
|
) \
|
||||||
|
{ \
|
||||||
|
{ L00, L01, L02, L03, L04, L05 }, \
|
||||||
|
{ L10, L11, L12, L13, L14, L15 }, \
|
||||||
|
{ L20, L21, L22, L23, L24, L25 }, \
|
||||||
|
{ L30, L31, L32, L33, L34, L35 }, \
|
||||||
|
{ KC_NO, L41, L42, L43, L44, L45 }, \
|
||||||
|
{ R05, R04, R03, R02, R01, R00 }, \
|
||||||
|
{ R15, R14, R13, R12, R11, R10 }, \
|
||||||
|
{ R25, R24, R23, R22, R21, R20 }, \
|
||||||
|
{ R35, R34, R33, R32, R31, R30 }, \
|
||||||
|
{ KC_NO, R44, R43, R42, R41, R40 } \
|
||||||
|
}
|
||||||
|
#else
|
||||||
|
// Keymap with right side flipped
|
||||||
|
// (TRRS jack on both halves are to the right)
|
||||||
|
#define LAYOUT( \
|
||||||
|
L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
|
||||||
|
L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
|
||||||
|
L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
|
||||||
|
L30, L31, L32, L33, L34, L35, L45, R30, R31, R32, R33, R34, R35, R45, \
|
||||||
|
L41, L42, L43, L44, R41, R42, R43, R44 \
|
||||||
|
) \
|
||||||
|
{ \
|
||||||
|
{ L00, L01, L02, L03, L04, L05 }, \
|
||||||
|
{ L10, L11, L12, L13, L14, L15 }, \
|
||||||
|
{ L20, L21, L22, L23, L24, L25 }, \
|
||||||
|
{ L30, L31, L32, L33, L34, L35 }, \
|
||||||
|
{ KC_NO, L41, L42, L43, L44, L45 }, \
|
||||||
|
{ R00, R01, R02, R03, R04, R05 }, \
|
||||||
|
{ R10, R11, R12, R13, R14, R15 }, \
|
||||||
|
{ R20, R21, R22, R23, R24, R25 }, \
|
||||||
|
{ R30, R31, R32, R33, R34, R35 }, \
|
||||||
|
{ KC_NO, R41, R42, R43, R44, R45 } \
|
||||||
|
}
|
||||||
|
#endif
|
||||||
0
keyboards/lily58/rev1/rules.mk
Normal file
0
keyboards/lily58/rev1/rules.mk
Normal file
4
keyboards/lily58/rev1/serial_config.h
Normal file
4
keyboards/lily58/rev1/serial_config.h
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
#ifndef SOFT_SERIAL_PIN
|
||||||
|
#define SOFT_SERIAL_PIN D2
|
||||||
|
#define SERIAL_USE_MULTI_TRANSACTION
|
||||||
|
#endif
|
||||||
100
keyboards/lily58/rev1/split_util.c
Normal file
100
keyboards/lily58/rev1/split_util.c
Normal file
@ -0,0 +1,100 @@
|
|||||||
|
#include <avr/io.h>
|
||||||
|
#include <avr/wdt.h>
|
||||||
|
#include <avr/power.h>
|
||||||
|
#include <avr/interrupt.h>
|
||||||
|
#include <util/delay.h>
|
||||||
|
#include <avr/eeprom.h>
|
||||||
|
#include "split_util.h"
|
||||||
|
#include "matrix.h"
|
||||||
|
#include "keyboard.h"
|
||||||
|
#include "wait.h"
|
||||||
|
|
||||||
|
#ifdef USE_MATRIX_I2C
|
||||||
|
# include "i2c.h"
|
||||||
|
#else
|
||||||
|
# include "split_scomm.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef SPLIT_USB_TIMEOUT
|
||||||
|
# define SPLIT_USB_TIMEOUT 2500
|
||||||
|
#endif
|
||||||
|
|
||||||
|
volatile bool isLeftHand = true;
|
||||||
|
|
||||||
|
bool waitForUsb(void) {
|
||||||
|
for (uint8_t i = 0; i < (SPLIT_USB_TIMEOUT / 100); i++) {
|
||||||
|
// This will return true of a USB connection has been established
|
||||||
|
if (UDADDR & _BV(ADDEN)) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
wait_ms(100);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Avoid NO_USB_STARTUP_CHECK - Disable USB as the previous checks seem to enable it somehow
|
||||||
|
(USBCON &= ~(_BV(USBE) | _BV(OTGPADE)));
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
__attribute__((weak)) bool is_keyboard_left(void) {
|
||||||
|
#if defined(SPLIT_HAND_PIN)
|
||||||
|
// Test pin SPLIT_HAND_PIN for High/Low, if low it's right hand
|
||||||
|
setPinInput(SPLIT_HAND_PIN);
|
||||||
|
return readPin(SPLIT_HAND_PIN);
|
||||||
|
#elif defined(EE_HANDS)
|
||||||
|
return eeconfig_read_handedness();
|
||||||
|
#elif defined(MASTER_RIGHT)
|
||||||
|
return !has_usb();
|
||||||
|
#endif
|
||||||
|
|
||||||
|
return has_usb();
|
||||||
|
}
|
||||||
|
|
||||||
|
__attribute__((weak)) bool has_usb(void) {
|
||||||
|
static enum { UNKNOWN, MASTER, SLAVE } usbstate = UNKNOWN;
|
||||||
|
|
||||||
|
// only check once, as this is called often
|
||||||
|
if (usbstate == UNKNOWN) {
|
||||||
|
#if defined(SPLIT_USB_DETECT)
|
||||||
|
usbstate = waitForUsb() ? MASTER : SLAVE;
|
||||||
|
#elif defined(__AVR__)
|
||||||
|
USBCON |= (1 << OTGPADE); // enables VBUS pad
|
||||||
|
wait_us(5);
|
||||||
|
|
||||||
|
usbstate = (USBSTA & (1 << VBUS)) ? MASTER : SLAVE; // checks state of VBUS
|
||||||
|
#else
|
||||||
|
usbstate = MASTER;
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
return (usbstate == MASTER);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void keyboard_master_setup(void) {
|
||||||
|
|
||||||
|
#ifdef USE_MATRIX_I2C
|
||||||
|
i2c_master_init();
|
||||||
|
#else
|
||||||
|
serial_master_init();
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
static void keyboard_slave_setup(void) {
|
||||||
|
|
||||||
|
#ifdef USE_MATRIX_I2C
|
||||||
|
i2c_slave_init(SLAVE_I2C_ADDRESS);
|
||||||
|
#else
|
||||||
|
serial_slave_init();
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
void split_keyboard_setup(void) {
|
||||||
|
isLeftHand = is_keyboard_left();
|
||||||
|
|
||||||
|
if (has_usb()) {
|
||||||
|
keyboard_master_setup();
|
||||||
|
} else {
|
||||||
|
keyboard_slave_setup();
|
||||||
|
}
|
||||||
|
sei();
|
||||||
|
}
|
||||||
35
keyboards/lily58/rules.mk
Normal file
35
keyboards/lily58/rules.mk
Normal file
@ -0,0 +1,35 @@
|
|||||||
|
# MCU name
|
||||||
|
MCU = atmega32u4
|
||||||
|
|
||||||
|
# Bootloader selection
|
||||||
|
# Teensy halfkay
|
||||||
|
# Pro Micro caterina
|
||||||
|
# Atmel DFU atmel-dfu
|
||||||
|
# LUFA DFU lufa-dfu
|
||||||
|
# QMK DFU qmk-dfu
|
||||||
|
# ATmega32A bootloadHID
|
||||||
|
# ATmega328P USBasp
|
||||||
|
BOOTLOADER = caterina
|
||||||
|
|
||||||
|
# Build Options
|
||||||
|
# change to "no" to disable the options, or define them in the Makefile in
|
||||||
|
# the appropriate keymap folder that will get included automatically
|
||||||
|
#
|
||||||
|
BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration
|
||||||
|
MOUSEKEY_ENABLE = no # Mouse keys
|
||||||
|
EXTRAKEY_ENABLE = no # Audio control and System control
|
||||||
|
CONSOLE_ENABLE = no # Console for debug
|
||||||
|
COMMAND_ENABLE = no # Commands for debug and configuration
|
||||||
|
NKRO_ENABLE = no # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
|
||||||
|
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
|
||||||
|
MIDI_ENABLE = no # MIDI controls
|
||||||
|
AUDIO_ENABLE = no # Audio output on port C6
|
||||||
|
UNICODE_ENABLE = no # Unicode
|
||||||
|
BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
|
||||||
|
RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
|
||||||
|
# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
|
||||||
|
SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
|
||||||
|
OLED_DRIVER_ENABLE = yes # OLED display
|
||||||
|
SPLIT_KEYBOARD = yes
|
||||||
|
|
||||||
|
DEFAULT_FOLDER = lily58/rev1
|
||||||
589
keyboards/lily58/serial.c
Normal file
589
keyboards/lily58/serial.c
Normal file
@ -0,0 +1,589 @@
|
|||||||
|
/*
|
||||||
|
* WARNING: be careful changing this code, it is very timing dependent
|
||||||
|
*
|
||||||
|
* 2018-10-28 checked
|
||||||
|
* avr-gcc 4.9.2
|
||||||
|
* avr-gcc 5.4.0
|
||||||
|
* avr-gcc 7.3.0
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef F_CPU
|
||||||
|
#define F_CPU 16000000
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#include <avr/io.h>
|
||||||
|
#include <avr/interrupt.h>
|
||||||
|
#include <util/delay.h>
|
||||||
|
#include <stddef.h>
|
||||||
|
#include <stdbool.h>
|
||||||
|
#include "serial.h"
|
||||||
|
|
||||||
|
#ifdef SOFT_SERIAL_PIN
|
||||||
|
|
||||||
|
#ifdef __AVR_ATmega32U4__
|
||||||
|
// if using ATmega32U4 I2C, can not use PD0 and PD1 in soft serial.
|
||||||
|
#ifdef USE_I2C
|
||||||
|
#if SOFT_SERIAL_PIN == D0 || SOFT_SERIAL_PIN == D1
|
||||||
|
#error Using ATmega32U4 I2C, so can not use PD0, PD1
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if SOFT_SERIAL_PIN >= D0 && SOFT_SERIAL_PIN <= D3
|
||||||
|
#define SERIAL_PIN_DDR DDRD
|
||||||
|
#define SERIAL_PIN_PORT PORTD
|
||||||
|
#define SERIAL_PIN_INPUT PIND
|
||||||
|
#if SOFT_SERIAL_PIN == D0
|
||||||
|
#define SERIAL_PIN_MASK _BV(PD0)
|
||||||
|
#define EIMSK_BIT _BV(INT0)
|
||||||
|
#define EICRx_BIT (~(_BV(ISC00) | _BV(ISC01)))
|
||||||
|
#define SERIAL_PIN_INTERRUPT INT0_vect
|
||||||
|
#elif SOFT_SERIAL_PIN == D1
|
||||||
|
#define SERIAL_PIN_MASK _BV(PD1)
|
||||||
|
#define EIMSK_BIT _BV(INT1)
|
||||||
|
#define EICRx_BIT (~(_BV(ISC10) | _BV(ISC11)))
|
||||||
|
#define SERIAL_PIN_INTERRUPT INT1_vect
|
||||||
|
#elif SOFT_SERIAL_PIN == D2
|
||||||
|
#define SERIAL_PIN_MASK _BV(PD2)
|
||||||
|
#define EIMSK_BIT _BV(INT2)
|
||||||
|
#define EICRx_BIT (~(_BV(ISC20) | _BV(ISC21)))
|
||||||
|
#define SERIAL_PIN_INTERRUPT INT2_vect
|
||||||
|
#elif SOFT_SERIAL_PIN == D3
|
||||||
|
#define SERIAL_PIN_MASK _BV(PD3)
|
||||||
|
#define EIMSK_BIT _BV(INT3)
|
||||||
|
#define EICRx_BIT (~(_BV(ISC30) | _BV(ISC31)))
|
||||||
|
#define SERIAL_PIN_INTERRUPT INT3_vect
|
||||||
|
#endif
|
||||||
|
#elif SOFT_SERIAL_PIN == E6
|
||||||
|
#define SERIAL_PIN_DDR DDRE
|
||||||
|
#define SERIAL_PIN_PORT PORTE
|
||||||
|
#define SERIAL_PIN_INPUT PINE
|
||||||
|
#define SERIAL_PIN_MASK _BV(PE6)
|
||||||
|
#define EIMSK_BIT _BV(INT6)
|
||||||
|
#define EICRx_BIT (~(_BV(ISC60) | _BV(ISC61)))
|
||||||
|
#define SERIAL_PIN_INTERRUPT INT6_vect
|
||||||
|
#else
|
||||||
|
#error invalid SOFT_SERIAL_PIN value
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#else
|
||||||
|
#error serial.c now support ATmega32U4 only
|
||||||
|
#endif
|
||||||
|
|
||||||
|
//////////////// for backward compatibility ////////////////////////////////
|
||||||
|
#ifndef SERIAL_USE_MULTI_TRANSACTION
|
||||||
|
/* --- USE Simple API (OLD API, compatible with let's split serial.c) */
|
||||||
|
#if SERIAL_SLAVE_BUFFER_LENGTH > 0
|
||||||
|
uint8_t volatile serial_slave_buffer[SERIAL_SLAVE_BUFFER_LENGTH] = {0};
|
||||||
|
#endif
|
||||||
|
#if SERIAL_MASTER_BUFFER_LENGTH > 0
|
||||||
|
uint8_t volatile serial_master_buffer[SERIAL_MASTER_BUFFER_LENGTH] = {0};
|
||||||
|
#endif
|
||||||
|
uint8_t volatile status0 = 0;
|
||||||
|
|
||||||
|
SSTD_t transactions[] = {
|
||||||
|
{ (uint8_t *)&status0,
|
||||||
|
#if SERIAL_MASTER_BUFFER_LENGTH > 0
|
||||||
|
sizeof(serial_master_buffer), (uint8_t *)serial_master_buffer,
|
||||||
|
#else
|
||||||
|
0, (uint8_t *)NULL,
|
||||||
|
#endif
|
||||||
|
#if SERIAL_SLAVE_BUFFER_LENGTH > 0
|
||||||
|
sizeof(serial_slave_buffer), (uint8_t *)serial_slave_buffer
|
||||||
|
#else
|
||||||
|
0, (uint8_t *)NULL,
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
void serial_master_init(void)
|
||||||
|
{ soft_serial_initiator_init(transactions, TID_LIMIT(transactions)); }
|
||||||
|
|
||||||
|
void serial_slave_init(void)
|
||||||
|
{ soft_serial_target_init(transactions, TID_LIMIT(transactions)); }
|
||||||
|
|
||||||
|
// 0 => no error
|
||||||
|
// 1 => slave did not respond
|
||||||
|
// 2 => checksum error
|
||||||
|
int serial_update_buffers()
|
||||||
|
{
|
||||||
|
int result;
|
||||||
|
result = soft_serial_transaction();
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif // end of Simple API (OLD API, compatible with let's split serial.c)
|
||||||
|
////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
|
#define ALWAYS_INLINE __attribute__((always_inline))
|
||||||
|
#define NO_INLINE __attribute__((noinline))
|
||||||
|
#define _delay_sub_us(x) __builtin_avr_delay_cycles(x)
|
||||||
|
|
||||||
|
// parity check
|
||||||
|
#define ODD_PARITY 1
|
||||||
|
#define EVEN_PARITY 0
|
||||||
|
#define PARITY EVEN_PARITY
|
||||||
|
|
||||||
|
#ifdef SERIAL_DELAY
|
||||||
|
// custom setup in config.h
|
||||||
|
// #define TID_SEND_ADJUST 2
|
||||||
|
// #define SERIAL_DELAY 6 // micro sec
|
||||||
|
// #define READ_WRITE_START_ADJUST 30 // cycles
|
||||||
|
// #define READ_WRITE_WIDTH_ADJUST 8 // cycles
|
||||||
|
#else
|
||||||
|
// ============ Standard setups ============
|
||||||
|
|
||||||
|
#ifndef SELECT_SOFT_SERIAL_SPEED
|
||||||
|
#define SELECT_SOFT_SERIAL_SPEED 1
|
||||||
|
// 0: about 189kbps
|
||||||
|
// 1: about 137kbps (default)
|
||||||
|
// 2: about 75kbps
|
||||||
|
// 3: about 39kbps
|
||||||
|
// 4: about 26kbps
|
||||||
|
// 5: about 20kbps
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if __GNUC__ < 6
|
||||||
|
#define TID_SEND_ADJUST 14
|
||||||
|
#else
|
||||||
|
#define TID_SEND_ADJUST 2
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if SELECT_SOFT_SERIAL_SPEED == 0
|
||||||
|
// Very High speed
|
||||||
|
#define SERIAL_DELAY 4 // micro sec
|
||||||
|
#if __GNUC__ < 6
|
||||||
|
#define READ_WRITE_START_ADJUST 33 // cycles
|
||||||
|
#define READ_WRITE_WIDTH_ADJUST 3 // cycles
|
||||||
|
#else
|
||||||
|
#define READ_WRITE_START_ADJUST 34 // cycles
|
||||||
|
#define READ_WRITE_WIDTH_ADJUST 7 // cycles
|
||||||
|
#endif
|
||||||
|
#elif SELECT_SOFT_SERIAL_SPEED == 1
|
||||||
|
// High speed
|
||||||
|
#define SERIAL_DELAY 6 // micro sec
|
||||||
|
#if __GNUC__ < 6
|
||||||
|
#define READ_WRITE_START_ADJUST 30 // cycles
|
||||||
|
#define READ_WRITE_WIDTH_ADJUST 3 // cycles
|
||||||
|
#else
|
||||||
|
#define READ_WRITE_START_ADJUST 33 // cycles
|
||||||
|
#define READ_WRITE_WIDTH_ADJUST 7 // cycles
|
||||||
|
#endif
|
||||||
|
#elif SELECT_SOFT_SERIAL_SPEED == 2
|
||||||
|
// Middle speed
|
||||||
|
#define SERIAL_DELAY 12 // micro sec
|
||||||
|
#define READ_WRITE_START_ADJUST 30 // cycles
|
||||||
|
#if __GNUC__ < 6
|
||||||
|
#define READ_WRITE_WIDTH_ADJUST 3 // cycles
|
||||||
|
#else
|
||||||
|
#define READ_WRITE_WIDTH_ADJUST 7 // cycles
|
||||||
|
#endif
|
||||||
|
#elif SELECT_SOFT_SERIAL_SPEED == 3
|
||||||
|
// Low speed
|
||||||
|
#define SERIAL_DELAY 24 // micro sec
|
||||||
|
#define READ_WRITE_START_ADJUST 30 // cycles
|
||||||
|
#if __GNUC__ < 6
|
||||||
|
#define READ_WRITE_WIDTH_ADJUST 3 // cycles
|
||||||
|
#else
|
||||||
|
#define READ_WRITE_WIDTH_ADJUST 7 // cycles
|
||||||
|
#endif
|
||||||
|
#elif SELECT_SOFT_SERIAL_SPEED == 4
|
||||||
|
// Very Low speed
|
||||||
|
#define SERIAL_DELAY 36 // micro sec
|
||||||
|
#define READ_WRITE_START_ADJUST 30 // cycles
|
||||||
|
#if __GNUC__ < 6
|
||||||
|
#define READ_WRITE_WIDTH_ADJUST 3 // cycles
|
||||||
|
#else
|
||||||
|
#define READ_WRITE_WIDTH_ADJUST 7 // cycles
|
||||||
|
#endif
|
||||||
|
#elif SELECT_SOFT_SERIAL_SPEED == 5
|
||||||
|
// Ultra Low speed
|
||||||
|
#define SERIAL_DELAY 48 // micro sec
|
||||||
|
#define READ_WRITE_START_ADJUST 30 // cycles
|
||||||
|
#if __GNUC__ < 6
|
||||||
|
#define READ_WRITE_WIDTH_ADJUST 3 // cycles
|
||||||
|
#else
|
||||||
|
#define READ_WRITE_WIDTH_ADJUST 7 // cycles
|
||||||
|
#endif
|
||||||
|
#else
|
||||||
|
#error invalid SELECT_SOFT_SERIAL_SPEED value
|
||||||
|
#endif /* SELECT_SOFT_SERIAL_SPEED */
|
||||||
|
#endif /* SERIAL_DELAY */
|
||||||
|
|
||||||
|
#define SERIAL_DELAY_HALF1 (SERIAL_DELAY/2)
|
||||||
|
#define SERIAL_DELAY_HALF2 (SERIAL_DELAY - SERIAL_DELAY/2)
|
||||||
|
|
||||||
|
#define SLAVE_INT_WIDTH_US 1
|
||||||
|
#ifndef SERIAL_USE_MULTI_TRANSACTION
|
||||||
|
#define SLAVE_INT_RESPONSE_TIME SERIAL_DELAY
|
||||||
|
#else
|
||||||
|
#define SLAVE_INT_ACK_WIDTH_UNIT 2
|
||||||
|
#define SLAVE_INT_ACK_WIDTH 4
|
||||||
|
#endif
|
||||||
|
|
||||||
|
static SSTD_t *Transaction_table = NULL;
|
||||||
|
static uint8_t Transaction_table_size = 0;
|
||||||
|
|
||||||
|
inline static void serial_delay(void) ALWAYS_INLINE;
|
||||||
|
inline static
|
||||||
|
void serial_delay(void) {
|
||||||
|
_delay_us(SERIAL_DELAY);
|
||||||
|
}
|
||||||
|
|
||||||
|
inline static void serial_delay_half1(void) ALWAYS_INLINE;
|
||||||
|
inline static
|
||||||
|
void serial_delay_half1(void) {
|
||||||
|
_delay_us(SERIAL_DELAY_HALF1);
|
||||||
|
}
|
||||||
|
|
||||||
|
inline static void serial_delay_half2(void) ALWAYS_INLINE;
|
||||||
|
inline static
|
||||||
|
void serial_delay_half2(void) {
|
||||||
|
_delay_us(SERIAL_DELAY_HALF2);
|
||||||
|
}
|
||||||
|
|
||||||
|
inline static void serial_output(void) ALWAYS_INLINE;
|
||||||
|
inline static
|
||||||
|
void serial_output(void) {
|
||||||
|
SERIAL_PIN_DDR |= SERIAL_PIN_MASK;
|
||||||
|
}
|
||||||
|
|
||||||
|
// make the serial pin an input with pull-up resistor
|
||||||
|
inline static void serial_input_with_pullup(void) ALWAYS_INLINE;
|
||||||
|
inline static
|
||||||
|
void serial_input_with_pullup(void) {
|
||||||
|
SERIAL_PIN_DDR &= ~SERIAL_PIN_MASK;
|
||||||
|
SERIAL_PIN_PORT |= SERIAL_PIN_MASK;
|
||||||
|
}
|
||||||
|
|
||||||
|
inline static uint8_t serial_read_pin(void) ALWAYS_INLINE;
|
||||||
|
inline static
|
||||||
|
uint8_t serial_read_pin(void) {
|
||||||
|
return !!(SERIAL_PIN_INPUT & SERIAL_PIN_MASK);
|
||||||
|
}
|
||||||
|
|
||||||
|
inline static void serial_low(void) ALWAYS_INLINE;
|
||||||
|
inline static
|
||||||
|
void serial_low(void) {
|
||||||
|
SERIAL_PIN_PORT &= ~SERIAL_PIN_MASK;
|
||||||
|
}
|
||||||
|
|
||||||
|
inline static void serial_high(void) ALWAYS_INLINE;
|
||||||
|
inline static
|
||||||
|
void serial_high(void) {
|
||||||
|
SERIAL_PIN_PORT |= SERIAL_PIN_MASK;
|
||||||
|
}
|
||||||
|
|
||||||
|
void soft_serial_initiator_init(SSTD_t *sstd_table, int sstd_table_size)
|
||||||
|
{
|
||||||
|
Transaction_table = sstd_table;
|
||||||
|
Transaction_table_size = (uint8_t)sstd_table_size;
|
||||||
|
serial_output();
|
||||||
|
serial_high();
|
||||||
|
}
|
||||||
|
|
||||||
|
void soft_serial_target_init(SSTD_t *sstd_table, int sstd_table_size)
|
||||||
|
{
|
||||||
|
Transaction_table = sstd_table;
|
||||||
|
Transaction_table_size = (uint8_t)sstd_table_size;
|
||||||
|
serial_input_with_pullup();
|
||||||
|
|
||||||
|
// Enable INT0-INT3,INT6
|
||||||
|
EIMSK |= EIMSK_BIT;
|
||||||
|
#if SERIAL_PIN_MASK == _BV(PE6)
|
||||||
|
// Trigger on falling edge of INT6
|
||||||
|
EICRB &= EICRx_BIT;
|
||||||
|
#else
|
||||||
|
// Trigger on falling edge of INT0-INT3
|
||||||
|
EICRA &= EICRx_BIT;
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
// Used by the sender to synchronize timing with the reciver.
|
||||||
|
static void sync_recv(void) NO_INLINE;
|
||||||
|
static
|
||||||
|
void sync_recv(void) {
|
||||||
|
for (uint8_t i = 0; i < SERIAL_DELAY*5 && serial_read_pin(); i++ ) {
|
||||||
|
}
|
||||||
|
// This shouldn't hang if the target disconnects because the
|
||||||
|
// serial line will float to high if the target does disconnect.
|
||||||
|
while (!serial_read_pin());
|
||||||
|
}
|
||||||
|
|
||||||
|
// Used by the reciver to send a synchronization signal to the sender.
|
||||||
|
static void sync_send(void) NO_INLINE;
|
||||||
|
static
|
||||||
|
void sync_send(void) {
|
||||||
|
serial_low();
|
||||||
|
serial_delay();
|
||||||
|
serial_high();
|
||||||
|
}
|
||||||
|
|
||||||
|
// Reads a byte from the serial line
|
||||||
|
static uint8_t serial_read_chunk(uint8_t *pterrcount, uint8_t bit) NO_INLINE;
|
||||||
|
static uint8_t serial_read_chunk(uint8_t *pterrcount, uint8_t bit) {
|
||||||
|
uint8_t byte, i, p, pb;
|
||||||
|
|
||||||
|
_delay_sub_us(READ_WRITE_START_ADJUST);
|
||||||
|
for( i = 0, byte = 0, p = PARITY; i < bit; i++ ) {
|
||||||
|
serial_delay_half1(); // read the middle of pulses
|
||||||
|
if( serial_read_pin() ) {
|
||||||
|
byte = (byte << 1) | 1; p ^= 1;
|
||||||
|
} else {
|
||||||
|
byte = (byte << 1) | 0; p ^= 0;
|
||||||
|
}
|
||||||
|
_delay_sub_us(READ_WRITE_WIDTH_ADJUST);
|
||||||
|
serial_delay_half2();
|
||||||
|
}
|
||||||
|
/* recive parity bit */
|
||||||
|
serial_delay_half1(); // read the middle of pulses
|
||||||
|
pb = serial_read_pin();
|
||||||
|
_delay_sub_us(READ_WRITE_WIDTH_ADJUST);
|
||||||
|
serial_delay_half2();
|
||||||
|
|
||||||
|
*pterrcount += (p != pb)? 1 : 0;
|
||||||
|
|
||||||
|
return byte;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Sends a byte with MSB ordering
|
||||||
|
void serial_write_chunk(uint8_t data, uint8_t bit) NO_INLINE;
|
||||||
|
void serial_write_chunk(uint8_t data, uint8_t bit) {
|
||||||
|
uint8_t b, p;
|
||||||
|
for( p = PARITY, b = 1<<(bit-1); b ; b >>= 1) {
|
||||||
|
if(data & b) {
|
||||||
|
serial_high(); p ^= 1;
|
||||||
|
} else {
|
||||||
|
serial_low(); p ^= 0;
|
||||||
|
}
|
||||||
|
serial_delay();
|
||||||
|
}
|
||||||
|
/* send parity bit */
|
||||||
|
if(p & 1) { serial_high(); }
|
||||||
|
else { serial_low(); }
|
||||||
|
serial_delay();
|
||||||
|
|
||||||
|
serial_low(); // sync_send() / senc_recv() need raise edge
|
||||||
|
}
|
||||||
|
|
||||||
|
static void serial_send_packet(uint8_t *buffer, uint8_t size) NO_INLINE;
|
||||||
|
static
|
||||||
|
void serial_send_packet(uint8_t *buffer, uint8_t size) {
|
||||||
|
for (uint8_t i = 0; i < size; ++i) {
|
||||||
|
uint8_t data;
|
||||||
|
data = buffer[i];
|
||||||
|
sync_send();
|
||||||
|
serial_write_chunk(data,8);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static uint8_t serial_recive_packet(uint8_t *buffer, uint8_t size) NO_INLINE;
|
||||||
|
static
|
||||||
|
uint8_t serial_recive_packet(uint8_t *buffer, uint8_t size) {
|
||||||
|
uint8_t pecount = 0;
|
||||||
|
for (uint8_t i = 0; i < size; ++i) {
|
||||||
|
uint8_t data;
|
||||||
|
sync_recv();
|
||||||
|
data = serial_read_chunk(&pecount, 8);
|
||||||
|
buffer[i] = data;
|
||||||
|
}
|
||||||
|
return pecount == 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
inline static
|
||||||
|
void change_sender2reciver(void) {
|
||||||
|
sync_send(); //0
|
||||||
|
serial_delay_half1(); //1
|
||||||
|
serial_low(); //2
|
||||||
|
serial_input_with_pullup(); //2
|
||||||
|
serial_delay_half1(); //3
|
||||||
|
}
|
||||||
|
|
||||||
|
inline static
|
||||||
|
void change_reciver2sender(void) {
|
||||||
|
sync_recv(); //0
|
||||||
|
serial_delay(); //1
|
||||||
|
serial_low(); //3
|
||||||
|
serial_output(); //3
|
||||||
|
serial_delay_half1(); //4
|
||||||
|
}
|
||||||
|
|
||||||
|
static inline uint8_t nibble_bits_count(uint8_t bits)
|
||||||
|
{
|
||||||
|
bits = (bits & 0x5) + (bits >> 1 & 0x5);
|
||||||
|
bits = (bits & 0x3) + (bits >> 2 & 0x3);
|
||||||
|
return bits;
|
||||||
|
}
|
||||||
|
|
||||||
|
// interrupt handle to be used by the target device
|
||||||
|
ISR(SERIAL_PIN_INTERRUPT) {
|
||||||
|
|
||||||
|
#ifndef SERIAL_USE_MULTI_TRANSACTION
|
||||||
|
serial_low();
|
||||||
|
serial_output();
|
||||||
|
SSTD_t *trans = Transaction_table;
|
||||||
|
#else
|
||||||
|
// recive transaction table index
|
||||||
|
uint8_t tid, bits;
|
||||||
|
uint8_t pecount = 0;
|
||||||
|
sync_recv();
|
||||||
|
bits = serial_read_chunk(&pecount,7);
|
||||||
|
tid = bits>>3;
|
||||||
|
bits = (bits&7) != nibble_bits_count(tid);
|
||||||
|
if( bits || pecount> 0 || tid > Transaction_table_size ) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
serial_delay_half1();
|
||||||
|
|
||||||
|
serial_high(); // response step1 low->high
|
||||||
|
serial_output();
|
||||||
|
_delay_sub_us(SLAVE_INT_ACK_WIDTH_UNIT*SLAVE_INT_ACK_WIDTH);
|
||||||
|
SSTD_t *trans = &Transaction_table[tid];
|
||||||
|
serial_low(); // response step2 ack high->low
|
||||||
|
#endif
|
||||||
|
|
||||||
|
// target send phase
|
||||||
|
if( trans->target2initiator_buffer_size > 0 )
|
||||||
|
serial_send_packet((uint8_t *)trans->target2initiator_buffer,
|
||||||
|
trans->target2initiator_buffer_size);
|
||||||
|
// target switch to input
|
||||||
|
change_sender2reciver();
|
||||||
|
|
||||||
|
// target recive phase
|
||||||
|
if( trans->initiator2target_buffer_size > 0 ) {
|
||||||
|
if (serial_recive_packet((uint8_t *)trans->initiator2target_buffer,
|
||||||
|
trans->initiator2target_buffer_size) ) {
|
||||||
|
*trans->status = TRANSACTION_ACCEPTED;
|
||||||
|
} else {
|
||||||
|
*trans->status = TRANSACTION_DATA_ERROR;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
*trans->status = TRANSACTION_ACCEPTED;
|
||||||
|
}
|
||||||
|
|
||||||
|
sync_recv(); //weit initiator output to high
|
||||||
|
}
|
||||||
|
|
||||||
|
/////////
|
||||||
|
// start transaction by initiator
|
||||||
|
//
|
||||||
|
// int soft_serial_transaction(int sstd_index)
|
||||||
|
//
|
||||||
|
// Returns:
|
||||||
|
// TRANSACTION_END
|
||||||
|
// TRANSACTION_NO_RESPONSE
|
||||||
|
// TRANSACTION_DATA_ERROR
|
||||||
|
// this code is very time dependent, so we need to disable interrupts
|
||||||
|
#ifndef SERIAL_USE_MULTI_TRANSACTION
|
||||||
|
int soft_serial_transaction(void) {
|
||||||
|
SSTD_t *trans = Transaction_table;
|
||||||
|
#else
|
||||||
|
int soft_serial_transaction(int sstd_index) {
|
||||||
|
if( sstd_index > Transaction_table_size )
|
||||||
|
return TRANSACTION_TYPE_ERROR;
|
||||||
|
SSTD_t *trans = &Transaction_table[sstd_index];
|
||||||
|
#endif
|
||||||
|
cli();
|
||||||
|
|
||||||
|
// signal to the target that we want to start a transaction
|
||||||
|
serial_output();
|
||||||
|
serial_low();
|
||||||
|
_delay_us(SLAVE_INT_WIDTH_US);
|
||||||
|
|
||||||
|
#ifndef SERIAL_USE_MULTI_TRANSACTION
|
||||||
|
// wait for the target response
|
||||||
|
serial_input_with_pullup();
|
||||||
|
_delay_us(SLAVE_INT_RESPONSE_TIME);
|
||||||
|
|
||||||
|
// check if the target is present
|
||||||
|
if (serial_read_pin()) {
|
||||||
|
// target failed to pull the line low, assume not present
|
||||||
|
serial_output();
|
||||||
|
serial_high();
|
||||||
|
*trans->status = TRANSACTION_NO_RESPONSE;
|
||||||
|
sei();
|
||||||
|
return TRANSACTION_NO_RESPONSE;
|
||||||
|
}
|
||||||
|
|
||||||
|
#else
|
||||||
|
// send transaction table index
|
||||||
|
int tid = (sstd_index<<3) | (7 & nibble_bits_count(sstd_index));
|
||||||
|
sync_send();
|
||||||
|
_delay_sub_us(TID_SEND_ADJUST);
|
||||||
|
serial_write_chunk(tid, 7);
|
||||||
|
serial_delay_half1();
|
||||||
|
|
||||||
|
// wait for the target response (step1 low->high)
|
||||||
|
serial_input_with_pullup();
|
||||||
|
while( !serial_read_pin() ) {
|
||||||
|
_delay_sub_us(2);
|
||||||
|
}
|
||||||
|
|
||||||
|
// check if the target is present (step2 high->low)
|
||||||
|
for( int i = 0; serial_read_pin(); i++ ) {
|
||||||
|
if (i > SLAVE_INT_ACK_WIDTH + 1) {
|
||||||
|
// slave failed to pull the line low, assume not present
|
||||||
|
serial_output();
|
||||||
|
serial_high();
|
||||||
|
*trans->status = TRANSACTION_NO_RESPONSE;
|
||||||
|
sei();
|
||||||
|
return TRANSACTION_NO_RESPONSE;
|
||||||
|
}
|
||||||
|
_delay_sub_us(SLAVE_INT_ACK_WIDTH_UNIT);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
// initiator recive phase
|
||||||
|
// if the target is present syncronize with it
|
||||||
|
if( trans->target2initiator_buffer_size > 0 ) {
|
||||||
|
if (!serial_recive_packet((uint8_t *)trans->target2initiator_buffer,
|
||||||
|
trans->target2initiator_buffer_size) ) {
|
||||||
|
serial_output();
|
||||||
|
serial_high();
|
||||||
|
*trans->status = TRANSACTION_DATA_ERROR;
|
||||||
|
sei();
|
||||||
|
return TRANSACTION_DATA_ERROR;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// initiator switch to output
|
||||||
|
change_reciver2sender();
|
||||||
|
|
||||||
|
// initiator send phase
|
||||||
|
if( trans->initiator2target_buffer_size > 0 ) {
|
||||||
|
serial_send_packet((uint8_t *)trans->initiator2target_buffer,
|
||||||
|
trans->initiator2target_buffer_size);
|
||||||
|
}
|
||||||
|
|
||||||
|
// always, release the line when not in use
|
||||||
|
sync_send();
|
||||||
|
|
||||||
|
*trans->status = TRANSACTION_END;
|
||||||
|
sei();
|
||||||
|
return TRANSACTION_END;
|
||||||
|
}
|
||||||
|
|
||||||
|
#ifdef SERIAL_USE_MULTI_TRANSACTION
|
||||||
|
int soft_serial_get_and_clean_status(int sstd_index) {
|
||||||
|
SSTD_t *trans = &Transaction_table[sstd_index];
|
||||||
|
cli();
|
||||||
|
int retval = *trans->status;
|
||||||
|
*trans->status = 0;;
|
||||||
|
sei();
|
||||||
|
return retval;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
|
// Helix serial.c history
|
||||||
|
// 2018-1-29 fork from let's split and add PD2, modify sync_recv() (#2308, bceffdefc)
|
||||||
|
// 2018-6-28 bug fix master to slave comm and speed up (#3255, 1038bbef4)
|
||||||
|
// (adjusted with avr-gcc 4.9.2)
|
||||||
|
// 2018-7-13 remove USE_SERIAL_PD2 macro (#3374, f30d6dd78)
|
||||||
|
// (adjusted with avr-gcc 4.9.2)
|
||||||
|
// 2018-8-11 add support multi-type transaction (#3608, feb5e4aae)
|
||||||
|
// (adjusted with avr-gcc 4.9.2)
|
||||||
|
// 2018-10-21 fix serial and RGB animation conflict (#4191, 4665e4fff)
|
||||||
|
// (adjusted with avr-gcc 7.3.0)
|
||||||
|
// 2018-10-28 re-adjust compiler depend value of delay (#4269, 8517f8a66)
|
||||||
|
// (adjusted with avr-gcc 5.4.0, 7.3.0)
|
||||||
@ -30,6 +30,7 @@ enum userspace_layers {
|
|||||||
_MODS, /* layer 8 */
|
_MODS, /* layer 8 */
|
||||||
_GAMEPAD,
|
_GAMEPAD,
|
||||||
_DIABLO,
|
_DIABLO,
|
||||||
|
_HEROES,
|
||||||
_WARCRAFT,
|
_WARCRAFT,
|
||||||
_MACROS,
|
_MACROS,
|
||||||
_MEDIA,
|
_MEDIA,
|
||||||
|
|||||||
233
users/drashna/font_lily.c
Normal file
233
users/drashna/font_lily.c
Normal file
@ -0,0 +1,233 @@
|
|||||||
|
// This is the 'classic' fixed-space bitmap font for Adafruit_GFX since 1.0.
|
||||||
|
// See gfxfont.h for newer custom bitmap font info.
|
||||||
|
|
||||||
|
// Modified to show the Lily58 logo instead of the qmk logo
|
||||||
|
#include "progmem.h"
|
||||||
|
|
||||||
|
// Standard ASCII 5x7 font
|
||||||
|
const unsigned char font[] PROGMEM = {
|
||||||
|
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||||
|
0x3E, 0x5B, 0x4F, 0x5B, 0x3E, 0x00,
|
||||||
|
0x3E, 0x6B, 0x4F, 0x6B, 0x3E, 0x00,
|
||||||
|
0x1C, 0x3E, 0x7C, 0x3E, 0x1C, 0x00,
|
||||||
|
0x18, 0x3C, 0x7E, 0x3C, 0x18, 0x00,
|
||||||
|
0x1C, 0x57, 0x7D, 0x57, 0x1C, 0x00,
|
||||||
|
0x1C, 0x5E, 0x7F, 0x5E, 0x1C, 0x00,
|
||||||
|
0x00, 0x18, 0x3C, 0x18, 0x00, 0x00,
|
||||||
|
0xFF, 0xE7, 0xC3, 0xE7, 0xFF, 0x00,
|
||||||
|
0x00, 0x18, 0x24, 0x18, 0x00, 0x00,
|
||||||
|
0xFF, 0xE7, 0xDB, 0xE7, 0xFF, 0x00,
|
||||||
|
0x30, 0x48, 0x3A, 0x06, 0x0E, 0x00,
|
||||||
|
0x26, 0x29, 0x79, 0x29, 0x26, 0x00,
|
||||||
|
0x40, 0x7F, 0x05, 0x05, 0x07, 0x00,
|
||||||
|
0x40, 0x7F, 0x05, 0x25, 0x3F, 0x00,
|
||||||
|
0x5A, 0x3C, 0xE7, 0x3C, 0x5A, 0x00,
|
||||||
|
0x7F, 0x3E, 0x1C, 0x1C, 0x08, 0x00,
|
||||||
|
0x08, 0x1C, 0x1C, 0x3E, 0x7F, 0x00,
|
||||||
|
0x14, 0x22, 0x7F, 0x22, 0x14, 0x00,
|
||||||
|
0x5F, 0x5F, 0x00, 0x5F, 0x5F, 0x00,
|
||||||
|
0x06, 0x09, 0x7F, 0x01, 0x7F, 0x00,
|
||||||
|
0x00, 0x66, 0x89, 0x95, 0x6A, 0x00,
|
||||||
|
0x60, 0x60, 0x60, 0x60, 0x60, 0x00,
|
||||||
|
0x94, 0xA2, 0xFF, 0xA2, 0x94, 0x00,
|
||||||
|
0x08, 0x04, 0x7E, 0x04, 0x08, 0x00,
|
||||||
|
0x10, 0x20, 0x7E, 0x20, 0x10, 0x00,
|
||||||
|
0x08, 0x08, 0x2A, 0x1C, 0x08, 0x00,
|
||||||
|
0x08, 0x1C, 0x2A, 0x08, 0x08, 0x00,
|
||||||
|
0x1E, 0x10, 0x10, 0x10, 0x10, 0x00,
|
||||||
|
0x0C, 0x1E, 0x0C, 0x1E, 0x0C, 0x00,
|
||||||
|
0x30, 0x38, 0x3E, 0x38, 0x30, 0x00,
|
||||||
|
0x06, 0x0E, 0x3E, 0x0E, 0x06, 0x00,
|
||||||
|
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||||
|
0x00, 0x00, 0x5F, 0x00, 0x00, 0x00,
|
||||||
|
0x00, 0x07, 0x00, 0x07, 0x00, 0x00,
|
||||||
|
0x14, 0x7F, 0x14, 0x7F, 0x14, 0x00,
|
||||||
|
0x24, 0x2A, 0x7F, 0x2A, 0x12, 0x00,
|
||||||
|
0x23, 0x13, 0x08, 0x64, 0x62, 0x00,
|
||||||
|
0x36, 0x49, 0x56, 0x20, 0x50, 0x00,
|
||||||
|
0x00, 0x08, 0x07, 0x03, 0x00, 0x00,
|
||||||
|
0x00, 0x1C, 0x22, 0x41, 0x00, 0x00,
|
||||||
|
0x00, 0x41, 0x22, 0x1C, 0x00, 0x00,
|
||||||
|
0x2A, 0x1C, 0x7F, 0x1C, 0x2A, 0x00,
|
||||||
|
0x08, 0x08, 0x3E, 0x08, 0x08, 0x00,
|
||||||
|
0x00, 0x80, 0x70, 0x30, 0x00, 0x00,
|
||||||
|
0x08, 0x08, 0x08, 0x08, 0x08, 0x00,
|
||||||
|
0x00, 0x00, 0x60, 0x60, 0x00, 0x00,
|
||||||
|
0x20, 0x10, 0x08, 0x04, 0x02, 0x00,
|
||||||
|
0x3E, 0x51, 0x49, 0x45, 0x3E, 0x00,
|
||||||
|
0x00, 0x42, 0x7F, 0x40, 0x00, 0x00,
|
||||||
|
0x72, 0x49, 0x49, 0x49, 0x46, 0x00,
|
||||||
|
0x21, 0x41, 0x49, 0x4D, 0x33, 0x00,
|
||||||
|
0x18, 0x14, 0x12, 0x7F, 0x10, 0x00,
|
||||||
|
0x27, 0x45, 0x45, 0x45, 0x39, 0x00,
|
||||||
|
0x3C, 0x4A, 0x49, 0x49, 0x31, 0x00,
|
||||||
|
0x41, 0x21, 0x11, 0x09, 0x07, 0x00,
|
||||||
|
0x36, 0x49, 0x49, 0x49, 0x36, 0x00,
|
||||||
|
0x46, 0x49, 0x49, 0x29, 0x1E, 0x00,
|
||||||
|
0x00, 0x00, 0x14, 0x00, 0x00, 0x00,
|
||||||
|
0x00, 0x40, 0x34, 0x00, 0x00, 0x00,
|
||||||
|
0x00, 0x08, 0x14, 0x22, 0x41, 0x00,
|
||||||
|
0x14, 0x14, 0x14, 0x14, 0x14, 0x00,
|
||||||
|
0x00, 0x41, 0x22, 0x14, 0x08, 0x00,
|
||||||
|
0x02, 0x01, 0x59, 0x09, 0x06, 0x00,
|
||||||
|
0x3E, 0x41, 0x5D, 0x59, 0x4E, 0x00,
|
||||||
|
0x7C, 0x12, 0x11, 0x12, 0x7C, 0x00,
|
||||||
|
0x7F, 0x49, 0x49, 0x49, 0x36, 0x00,
|
||||||
|
0x3E, 0x41, 0x41, 0x41, 0x22, 0x00,
|
||||||
|
0x7F, 0x41, 0x41, 0x41, 0x3E, 0x00,
|
||||||
|
0x7F, 0x49, 0x49, 0x49, 0x41, 0x00,
|
||||||
|
0x7F, 0x09, 0x09, 0x09, 0x01, 0x00,
|
||||||
|
0x3E, 0x41, 0x41, 0x51, 0x73, 0x00,
|
||||||
|
0x7F, 0x08, 0x08, 0x08, 0x7F, 0x00,
|
||||||
|
0x00, 0x41, 0x7F, 0x41, 0x00, 0x00,
|
||||||
|
0x20, 0x40, 0x41, 0x3F, 0x01, 0x00,
|
||||||
|
0x7F, 0x08, 0x14, 0x22, 0x41, 0x00,
|
||||||
|
0x7F, 0x40, 0x40, 0x40, 0x40, 0x00,
|
||||||
|
0x7F, 0x02, 0x1C, 0x02, 0x7F, 0x00,
|
||||||
|
0x7F, 0x04, 0x08, 0x10, 0x7F, 0x00,
|
||||||
|
0x3E, 0x41, 0x41, 0x41, 0x3E, 0x00,
|
||||||
|
0x7F, 0x09, 0x09, 0x09, 0x06, 0x00,
|
||||||
|
0x3E, 0x41, 0x51, 0x21, 0x5E, 0x00,
|
||||||
|
0x7F, 0x09, 0x19, 0x29, 0x46, 0x00,
|
||||||
|
0x26, 0x49, 0x49, 0x49, 0x32, 0x00,
|
||||||
|
0x03, 0x01, 0x7F, 0x01, 0x03, 0x00,
|
||||||
|
0x3F, 0x40, 0x40, 0x40, 0x3F, 0x00,
|
||||||
|
0x1F, 0x20, 0x40, 0x20, 0x1F, 0x00,
|
||||||
|
0x3F, 0x40, 0x38, 0x40, 0x3F, 0x00,
|
||||||
|
0x63, 0x14, 0x08, 0x14, 0x63, 0x00,
|
||||||
|
0x03, 0x04, 0x78, 0x04, 0x03, 0x00,
|
||||||
|
0x61, 0x59, 0x49, 0x4D, 0x43, 0x00,
|
||||||
|
0x00, 0x7F, 0x41, 0x41, 0x41, 0x00,
|
||||||
|
0x02, 0x04, 0x08, 0x10, 0x20, 0x00,
|
||||||
|
0x00, 0x41, 0x41, 0x41, 0x7F, 0x00,
|
||||||
|
0x04, 0x02, 0x01, 0x02, 0x04, 0x00,
|
||||||
|
0x40, 0x40, 0x40, 0x40, 0x40, 0x00,
|
||||||
|
0x00, 0x03, 0x07, 0x08, 0x00, 0x00,
|
||||||
|
0x20, 0x54, 0x54, 0x78, 0x40, 0x00,
|
||||||
|
0x7F, 0x28, 0x44, 0x44, 0x38, 0x00,
|
||||||
|
0x38, 0x44, 0x44, 0x44, 0x28, 0x00,
|
||||||
|
0x38, 0x44, 0x44, 0x28, 0x7F, 0x00,
|
||||||
|
0x38, 0x54, 0x54, 0x54, 0x18, 0x00,
|
||||||
|
0x00, 0x08, 0x7E, 0x09, 0x02, 0x00,
|
||||||
|
0x18, 0x24, 0x24, 0x1C, 0x78, 0x00,
|
||||||
|
0x7F, 0x08, 0x04, 0x04, 0x78, 0x00,
|
||||||
|
0x00, 0x44, 0x7D, 0x40, 0x00, 0x00,
|
||||||
|
0x20, 0x40, 0x40, 0x3D, 0x00, 0x00,
|
||||||
|
0x7F, 0x10, 0x28, 0x44, 0x00, 0x00,
|
||||||
|
0x00, 0x41, 0x7F, 0x40, 0x00, 0x00,
|
||||||
|
0x7C, 0x04, 0x78, 0x04, 0x78, 0x00,
|
||||||
|
0x7C, 0x08, 0x04, 0x04, 0x78, 0x00,
|
||||||
|
0x38, 0x44, 0x44, 0x44, 0x38, 0x00,
|
||||||
|
0x7C, 0x18, 0x24, 0x24, 0x18, 0x00,
|
||||||
|
0x18, 0x24, 0x24, 0x18, 0x7C, 0x00,
|
||||||
|
0x7C, 0x08, 0x04, 0x04, 0x08, 0x00,
|
||||||
|
0x48, 0x54, 0x54, 0x54, 0x24, 0x00,
|
||||||
|
0x04, 0x04, 0x3F, 0x44, 0x24, 0x00,
|
||||||
|
0x3C, 0x40, 0x40, 0x20, 0x7C, 0x00,
|
||||||
|
0x1C, 0x20, 0x40, 0x20, 0x1C, 0x00,
|
||||||
|
0x3C, 0x40, 0x30, 0x40, 0x3C, 0x00,
|
||||||
|
0x44, 0x28, 0x10, 0x28, 0x44, 0x00,
|
||||||
|
0x4C, 0x90, 0x90, 0x90, 0x7C, 0x00,
|
||||||
|
0x44, 0x64, 0x54, 0x4C, 0x44, 0x00,
|
||||||
|
0x00, 0x08, 0x36, 0x41, 0x00, 0x00,
|
||||||
|
0x00, 0x00, 0x77, 0x00, 0x00, 0x00,
|
||||||
|
0x00, 0x41, 0x36, 0x08, 0x00, 0x00,
|
||||||
|
0x02, 0x01, 0x02, 0x04, 0x02, 0x00,
|
||||||
|
0x3C, 0x26, 0x23, 0x26, 0x3C, 0x00,
|
||||||
|
0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
|
||||||
|
0x80, 0x80, 0x80, 0x00, 0x00, 0x00,
|
||||||
|
0x00, 0x00, 0x80, 0xE0, 0x70, 0x18,
|
||||||
|
0x0C, 0x18, 0x30, 0xE0, 0x80, 0x00,
|
||||||
|
0x00, 0x10, 0xF8, 0x90, 0x10, 0x30,
|
||||||
|
0x78, 0x30, 0x10, 0xB8, 0xFC, 0x38,
|
||||||
|
0x10, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||||
|
0x00, 0xF8, 0xFC, 0xF8, 0x00, 0x00,
|
||||||
|
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||||
|
0x00, 0x00, 0x00, 0x00, 0x00, 0x1C,
|
||||||
|
0x9C, 0x1C, 0x00, 0x00, 0x00, 0x00,
|
||||||
|
0xF8, 0xFC, 0xF8, 0x00, 0x00, 0x00,
|
||||||
|
0x00, 0x00, 0x00, 0x1C, 0xFC, 0xF8,
|
||||||
|
0xC0, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||||
|
0x00, 0x80, 0xE0, 0xF8, 0x7C, 0x1C,
|
||||||
|
0x00, 0x00, 0x00, 0xF0, 0xFC, 0xFC,
|
||||||
|
0xFC, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C,
|
||||||
|
0x1C, 0x1C, 0x1C, 0x00, 0x00, 0x00,
|
||||||
|
0x00, 0x00, 0x00, 0xC0, 0xF0, 0xF8,
|
||||||
|
0x38, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C,
|
||||||
|
0x1C, 0x3C, 0xF8, 0xF0, 0xE0, 0x00,
|
||||||
|
0xE0, 0xF0, 0xF0, 0xF0, 0xE0, 0xEC,
|
||||||
|
0xEE, 0xF7, 0xF3, 0x70, 0x20, 0x00,
|
||||||
|
0x7C, 0x7C, 0x7C, 0x7E, 0x00, 0x7E,
|
||||||
|
0x7E, 0x7E, 0x7F, 0x7F, 0x7F, 0x00,
|
||||||
|
0x00, 0x80, 0xC0, 0xE0, 0x7E, 0x5B,
|
||||||
|
0x4F, 0x5B, 0xFE, 0xC0, 0x00, 0x00,
|
||||||
|
0xC0, 0x00, 0xDC, 0xD7, 0xDE, 0xDE,
|
||||||
|
0xDE, 0xD7, 0xDC, 0x00, 0xC0, 0x00,
|
||||||
|
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||||
|
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||||
|
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||||
|
0x00, 0x00, 0x00, 0x00, 0x00, 0x0F,
|
||||||
|
0xBC, 0xE0, 0x81, 0x81, 0x81, 0x83,
|
||||||
|
0x83, 0x82, 0x87, 0x0C, 0x18, 0x30,
|
||||||
|
0x60, 0xC0, 0x00, 0x00, 0x1F, 0xFE,
|
||||||
|
0x90, 0xB9, 0xFF, 0xBB, 0x91, 0x98,
|
||||||
|
0x3C, 0x18, 0x11, 0x13, 0x3F, 0x11,
|
||||||
|
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||||
|
0x00, 0xFF, 0xFF, 0xFF, 0x00, 0x00,
|
||||||
|
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||||
|
0x00, 0x00, 0x00, 0x00, 0x00, 0xFF,
|
||||||
|
0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00,
|
||||||
|
0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00,
|
||||||
|
0x00, 0x00, 0x00, 0x00, 0x00, 0x03,
|
||||||
|
0x0F, 0x7F, 0xF8, 0xE0, 0x80, 0xF0,
|
||||||
|
0xFC, 0x3F, 0x0F, 0x01, 0x00, 0x00,
|
||||||
|
0x00, 0x00, 0x00, 0x3F, 0x3F, 0x3F,
|
||||||
|
0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x3C,
|
||||||
|
0x78, 0xF8, 0xF0, 0xE0, 0x80, 0x00,
|
||||||
|
0x00, 0x00, 0x00, 0xC3, 0xE7, 0xFF,
|
||||||
|
0x7E, 0x3C, 0x38, 0x78, 0x78, 0x70,
|
||||||
|
0x70, 0xF8, 0xFF, 0xDF, 0x87, 0x00,
|
||||||
|
0x0F, 0x1F, 0x3F, 0x7F, 0x7F, 0x7F,
|
||||||
|
0x7F, 0x7F, 0x3F, 0x1E, 0x0C, 0x00,
|
||||||
|
0x1F, 0x1F, 0x1F, 0x3F, 0x00, 0x3F,
|
||||||
|
0x3F, 0x3F, 0x7F, 0x7F, 0x7F, 0x00,
|
||||||
|
0x30, 0x7B, 0x7F, 0x78, 0x30, 0x20,
|
||||||
|
0x20, 0x30, 0x78, 0x7F, 0x3B, 0x00,
|
||||||
|
0x03, 0x00, 0x0F, 0x7F, 0x0F, 0x0F,
|
||||||
|
0x0F, 0x7F, 0x0F, 0x00, 0x03, 0x00,
|
||||||
|
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||||
|
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||||
|
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||||
|
0x18, 0x3C, 0x24, 0x66, 0x63, 0x41,
|
||||||
|
0xC1, 0x81, 0x80, 0x80, 0x80, 0x80,
|
||||||
|
0x80, 0x80, 0x81, 0xC1, 0x41, 0x62,
|
||||||
|
0x38, 0x6C, 0x4C, 0xC6, 0x81, 0x81,
|
||||||
|
0x80, 0x80, 0x80, 0x80, 0x80, 0x81,
|
||||||
|
0xC1, 0x43, 0x62, 0x36, 0x1C, 0x18,
|
||||||
|
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||||
|
0x00, 0xFF, 0xFF, 0xFF, 0xC0, 0xC0,
|
||||||
|
0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0,
|
||||||
|
0xC0, 0x80, 0x00, 0x00, 0x00, 0x7F,
|
||||||
|
0xFF, 0x7F, 0x00, 0x00, 0x00, 0x00,
|
||||||
|
0x7F, 0xFF, 0xFF, 0xC0, 0x80, 0x00,
|
||||||
|
0x00, 0x00, 0xE0, 0xE0, 0xC0, 0xC0,
|
||||||
|
0xC0, 0xE0, 0xF9, 0x7F, 0x1F, 0x07,
|
||||||
|
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||||
|
0x00, 0x00, 0x00, 0x70, 0xF0, 0xE0,
|
||||||
|
0xE0, 0xC0, 0xC0, 0xC0, 0xC0, 0xE0,
|
||||||
|
0xF0, 0xF8, 0x7F, 0x3F, 0x0F, 0x00,
|
||||||
|
0x00, 0x00, 0x0F, 0x3F, 0x7F, 0xF9,
|
||||||
|
0xE0, 0xE0, 0xC0, 0xC0, 0xC0, 0xC0,
|
||||||
|
0xC0, 0xE0, 0xF9, 0x7F, 0x3F, 0x1F,
|
||||||
|
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||||
|
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||||
|
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||||
|
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||||
|
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||||
|
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||||
|
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||||
|
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||||
|
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||||
|
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||||
|
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||||
|
};
|
||||||
@ -1,22 +1,23 @@
|
|||||||
#include "drashna.h"
|
#include "drashna.h"
|
||||||
|
|
||||||
extern uint8_t is_master;
|
extern uint8_t is_master;
|
||||||
|
#if defined(OLED_DISPLAY_128X64) || defined(OLED_DISPLAY_128X32)
|
||||||
|
|
||||||
#ifndef KEYLOGGER_LENGTH
|
#ifndef KEYLOGGER_LENGTH
|
||||||
// # ifdef OLED_DISPLAY_128X64
|
// # ifdef OLED_DISPLAY_128X64
|
||||||
# define KEYLOGGER_LENGTH ((int)(OLED_DISPLAY_HEIGHT / OLED_FONT_WIDTH))
|
# define KEYLOGGER_LENGTH ((int)(OLED_DISPLAY_HEIGHT / OLED_FONT_WIDTH))
|
||||||
// # else
|
// # else
|
||||||
// # define KEYLOGGER_LENGTH (uint8_t *(OLED_DISPLAY_WIDTH / OLED_FONT_HEIGHT))
|
// # define KEYLOGGER_LENGTH (uint8_t *(OLED_DISPLAY_WIDTH / OLED_FONT_HEIGHT))
|
||||||
// # endif
|
// # endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static uint32_t oled_timer = 0;
|
static uint32_t oled_timer = 0;
|
||||||
static char keylog_str[KEYLOGGER_LENGTH + 1] = {"\n"};
|
static char keylog_str[KEYLOGGER_LENGTH + 1] = {"\n"};
|
||||||
static uint16_t log_timer = 0;
|
static uint16_t log_timer = 0;
|
||||||
|
|
||||||
// clang-format off
|
// clang-format off
|
||||||
static const char PROGMEM code_to_name[0xFF] = {
|
static const char PROGMEM code_to_name[0xFF] = {
|
||||||
// 0 1 2 3 4 5 6 7 8 9 A B c D E F
|
// 0 1 2 3 4 5 6 7 8 9 A B c D E F
|
||||||
' ', ' ', ' ', ' ', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', // 0x
|
' ', ' ', ' ', ' ', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', // 0x
|
||||||
'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '1', '2', // 1x
|
'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '1', '2', // 1x
|
||||||
'3', '4', '5', '6', '7', '8', '9', '0', 20, 19, 27, 26, 22, '-', '=', '[', // 2x
|
'3', '4', '5', '6', '7', '8', '9', '0', 20, 19, 27, 26, 22, '-', '=', '[', // 2x
|
||||||
@ -33,10 +34,10 @@ static const char PROGMEM code_to_name[0xFF] = {
|
|||||||
' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', // Dx
|
' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', // Dx
|
||||||
'C', 'S', 'A', 'C', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', // Ex
|
'C', 'S', 'A', 'C', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', // Ex
|
||||||
' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ' // Fx
|
' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ' // Fx
|
||||||
};
|
};
|
||||||
// clang-format on
|
// clang-format on
|
||||||
|
|
||||||
void add_keylog(uint16_t keycode) {
|
void add_keylog(uint16_t keycode) {
|
||||||
if ((keycode >= QK_MOD_TAP && keycode <= QK_MOD_TAP_MAX) || (keycode >= QK_LAYER_TAP && keycode <= QK_LAYER_TAP_MAX) || (keycode >= QK_MODS && keycode <= QK_MODS_MAX)) {
|
if ((keycode >= QK_MOD_TAP && keycode <= QK_MOD_TAP_MAX) || (keycode >= QK_LAYER_TAP && keycode <= QK_LAYER_TAP_MAX) || (keycode >= QK_MODS && keycode <= QK_MODS_MAX)) {
|
||||||
keycode = keycode & 0xFF;
|
keycode = keycode & 0xFF;
|
||||||
} else if (keycode > 0xFF) {
|
} else if (keycode > 0xFF) {
|
||||||
@ -52,30 +53,30 @@ void add_keylog(uint16_t keycode) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
log_timer = timer_read();
|
log_timer = timer_read();
|
||||||
}
|
}
|
||||||
|
|
||||||
bool process_record_user_oled(uint16_t keycode, keyrecord_t *record) {
|
bool process_record_user_oled(uint16_t keycode, keyrecord_t *record) {
|
||||||
if (record->event.pressed) {
|
if (record->event.pressed) {
|
||||||
#ifdef OLED_DRIVER_ENABLE
|
#ifdef OLED_DRIVER_ENABLE
|
||||||
oled_timer = timer_read32();
|
oled_timer = timer_read32();
|
||||||
add_keylog(keycode);
|
add_keylog(keycode);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
void update_log(void) {
|
void update_log(void) {
|
||||||
if (timer_elapsed(log_timer) > 750) {
|
if (timer_elapsed(log_timer) > 750) {
|
||||||
// add_keylog(0);
|
// add_keylog(0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void render_keylogger_status(void) {
|
void render_keylogger_status(void) {
|
||||||
oled_write_P(PSTR(OLED_RENDER_KEYLOGGER), false);
|
oled_write_P(PSTR(OLED_RENDER_KEYLOGGER), false);
|
||||||
oled_write(keylog_str, false);
|
oled_write(keylog_str, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
void render_default_layer_state(void) {
|
void render_default_layer_state(void) {
|
||||||
oled_write_P(PSTR(OLED_RENDER_LAYOUT_NAME), false);
|
oled_write_P(PSTR(OLED_RENDER_LAYOUT_NAME), false);
|
||||||
switch (get_highest_layer(layer_state)) {
|
switch (get_highest_layer(layer_state)) {
|
||||||
case _DIABLO:
|
case _DIABLO:
|
||||||
@ -84,6 +85,10 @@ void render_default_layer_state(void) {
|
|||||||
case _WARCRAFT:
|
case _WARCRAFT:
|
||||||
oled_write_P(PSTR(OLED_RENDER_LAYOUT_WARCRAFT), false);
|
oled_write_P(PSTR(OLED_RENDER_LAYOUT_WARCRAFT), false);
|
||||||
break;
|
break;
|
||||||
|
case _HEROES:
|
||||||
|
oled_write_P(PSTR(OLED_RENDER_LAYOUT_HEROES), false);
|
||||||
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
switch (get_highest_layer(default_layer_state)) {
|
switch (get_highest_layer(default_layer_state)) {
|
||||||
case _WORKMAN:
|
case _WORKMAN:
|
||||||
@ -95,17 +100,18 @@ void render_default_layer_state(void) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
oled_advance_page(true);
|
oled_advance_page(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
// void render_default_layer_state(void) {
|
// void render_default_layer_state(void) {
|
||||||
// oled_write_P(PSTR(OLED_RENDER_LAYOUT_NAME), false);
|
// oled_write_P(PSTR(OLED_RENDER_LAYOUT_NAME), false);
|
||||||
// oled_write_P(PSTR(OLED_RENDER_LAYOUT_QWERTY), layer_state_is(_QWERTY));
|
// oled_write_P(PSTR(OLED_RENDER_LAYOUT_QWERTY), layer_state_is(_QWERTY));
|
||||||
// oled_write_P(PSTR(OLED_RENDER_LAYOUT_DIABLO), layer_state_is(_WARCRAFT));
|
// oled_write_P(PSTR(OLED_RENDER_LAYOUT_DIABLO), layer_state_is(_WARCRAFT));
|
||||||
// oled_write_P(PSTR(OLED_RENDER_LAYOUT_WARCRAFT), layer_state_is(_DIABLO));
|
// oled_write_P(PSTR(OLED_RENDER_LAYOUT_WARCRAFT), layer_state_is(_DIABLO));
|
||||||
// oled_advance_page(true);
|
// oled_advance_page(true);
|
||||||
// }
|
// }
|
||||||
|
|
||||||
void render_layer_state(void) {
|
void render_layer_state(void) {
|
||||||
|
#ifdef OLED_DISPLAY_128X64
|
||||||
oled_write_P(PSTR(OLED_RENDER_LAYER_NAME), false);
|
oled_write_P(PSTR(OLED_RENDER_LAYER_NAME), false);
|
||||||
oled_write_P(PSTR(" "), false);
|
oled_write_P(PSTR(" "), false);
|
||||||
oled_write_P(PSTR(OLED_RENDER_LAYER_LOWER), layer_state_is(_LOWER));
|
oled_write_P(PSTR(OLED_RENDER_LAYER_LOWER), layer_state_is(_LOWER));
|
||||||
@ -116,9 +122,22 @@ void render_layer_state(void) {
|
|||||||
oled_write_P(PSTR(" "), false);
|
oled_write_P(PSTR(" "), false);
|
||||||
oled_write_P(PSTR(OLED_RENDER_LAYER_NAV), layer_state_is(_NAV));
|
oled_write_P(PSTR(OLED_RENDER_LAYER_NAV), layer_state_is(_NAV));
|
||||||
oled_advance_page(true);
|
oled_advance_page(true);
|
||||||
}
|
#endif
|
||||||
|
#ifdef OLED_DISPLAY_128X32
|
||||||
|
oled_write_P(PSTR(OLED_RENDER_LAYER_NAME), false);
|
||||||
|
oled_write_P(PSTR(" "), false);
|
||||||
|
oled_write_P(PSTR(OLED_RENDER_LAYER_LOWER), layer_state_is(_LOWER));
|
||||||
|
oled_write_P(PSTR(" "), false);
|
||||||
|
oled_write_P(PSTR(OLED_RENDER_LAYER_RAISE), layer_state_is(_RAISE));
|
||||||
|
oled_write_P(PSTR(" "), false);
|
||||||
|
oled_write_P(PSTR(OLED_RENDER_LAYER_MODS), layer_state_is(_MODS));
|
||||||
|
oled_write_P(PSTR(" "), false);
|
||||||
|
oled_write_P(PSTR(OLED_RENDER_LAYER_NAV), layer_state_is(_NAV));
|
||||||
|
//oled_advance_page(true);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
void render_keylock_status(uint8_t led_usb_state) {
|
void render_keylock_status(uint8_t led_usb_state) {
|
||||||
oled_write_P(PSTR(OLED_RENDER_LOCK_NAME), false);
|
oled_write_P(PSTR(OLED_RENDER_LOCK_NAME), false);
|
||||||
oled_write_P(PSTR(" "), false);
|
oled_write_P(PSTR(" "), false);
|
||||||
oled_write_P(PSTR(OLED_RENDER_LOCK_NUML), led_usb_state & (1 << USB_LED_NUM_LOCK));
|
oled_write_P(PSTR(OLED_RENDER_LOCK_NUML), led_usb_state & (1 << USB_LED_NUM_LOCK));
|
||||||
@ -127,9 +146,9 @@ void render_keylock_status(uint8_t led_usb_state) {
|
|||||||
oled_write_P(PSTR(" "), false);
|
oled_write_P(PSTR(" "), false);
|
||||||
oled_write_P(PSTR(OLED_RENDER_LOCK_SCLK), led_usb_state & (1 << USB_LED_SCROLL_LOCK));
|
oled_write_P(PSTR(OLED_RENDER_LOCK_SCLK), led_usb_state & (1 << USB_LED_SCROLL_LOCK));
|
||||||
oled_advance_page(true);
|
oled_advance_page(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
void render_mod_status(uint8_t modifiers) {
|
void render_mod_status(uint8_t modifiers) {
|
||||||
oled_write_P(PSTR(OLED_RENDER_MODS_NAME), false);
|
oled_write_P(PSTR(OLED_RENDER_MODS_NAME), false);
|
||||||
oled_write_P(PSTR(OLED_RENDER_MODS_SFT), (modifiers & MOD_MASK_SHIFT));
|
oled_write_P(PSTR(OLED_RENDER_MODS_SFT), (modifiers & MOD_MASK_SHIFT));
|
||||||
oled_write_P(PSTR(" "), false);
|
oled_write_P(PSTR(" "), false);
|
||||||
@ -138,9 +157,9 @@ void render_mod_status(uint8_t modifiers) {
|
|||||||
oled_write_P(PSTR(OLED_RENDER_MODS_ALT), (modifiers & MOD_MASK_ALT));
|
oled_write_P(PSTR(OLED_RENDER_MODS_ALT), (modifiers & MOD_MASK_ALT));
|
||||||
oled_write_P(PSTR(" "), false);
|
oled_write_P(PSTR(" "), false);
|
||||||
oled_write_P(PSTR(OLED_RENDER_MODS_GUI), (modifiers & MOD_MASK_GUI));
|
oled_write_P(PSTR(OLED_RENDER_MODS_GUI), (modifiers & MOD_MASK_GUI));
|
||||||
}
|
}
|
||||||
|
|
||||||
__attribute__((weak)) void oled_driver_render_logo(void) {
|
__attribute__((weak)) void oled_driver_render_logo(void) {
|
||||||
// clang-format off
|
// clang-format off
|
||||||
static const char PROGMEM qmk_logo[] = {
|
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,
|
0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8a,0x8b,0x8c,0x8d,0x8e,0x8f,0x90,0x91,0x92,0x93,0x94,
|
||||||
@ -148,39 +167,42 @@ __attribute__((weak)) void oled_driver_render_logo(void) {
|
|||||||
0xc0,0xc1,0xc2,0xc3,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xcb,0xcc,0xcd,0xce,0xcf,0xd0,0xd1,0xd2,0xd3,0xd4,0};
|
0xc0,0xc1,0xc2,0xc3,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xcb,0xcc,0xcd,0xce,0xcf,0xd0,0xd1,0xd2,0xd3,0xd4,0};
|
||||||
// clang-format on
|
// clang-format on
|
||||||
oled_write_P(qmk_logo, false);
|
oled_write_P(qmk_logo, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
void render_status_secondary(void) {
|
void render_status_secondary(void) {
|
||||||
#if !defined(SPLIT_TRANSPORT_MIRROR) || defined(OLED_DRIVER_128x64)
|
#if !defined(SPLIT_TRANSPORT_MIRROR) || defined(OLED_DRIVER_128x64) || defined(OLED_DRIVER_128x32)
|
||||||
oled_driver_render_logo();
|
oled_driver_render_logo();
|
||||||
#endif
|
#endif
|
||||||
#ifdef SPLIT_TRANSPORT_MIRROR
|
#ifdef SPLIT_TRANSPORT_MIRROR
|
||||||
/* Show Keyboard Layout */
|
/* Show Keyboard Layout */
|
||||||
render_default_layer_state();
|
render_default_layer_state();
|
||||||
render_layer_state();
|
render_layer_state();
|
||||||
render_mod_status(get_mods() | get_oneshot_mods());
|
render_mod_status(get_mods() | get_oneshot_mods());
|
||||||
render_keylogger_status();
|
render_keylogger_status();
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
// clang-format on
|
// clang-format on
|
||||||
|
|
||||||
void render_status_main(void) {
|
void render_status_main(void) {
|
||||||
/* Show Keyboard Layout */
|
/* Show Keyboard Layout */
|
||||||
render_default_layer_state();
|
render_default_layer_state();
|
||||||
render_layer_state();
|
render_layer_state();
|
||||||
|
#ifdef RGBLIGHT_ENABLE
|
||||||
render_keylock_status(host_keyboard_leds());
|
render_keylock_status(host_keyboard_leds());
|
||||||
|
#else
|
||||||
|
//render_keylock_status(host_keyboard_leds());
|
||||||
|
#endif
|
||||||
|
|
||||||
render_mod_status(get_mods() | get_oneshot_mods());
|
//render_mod_status(get_mods() | get_oneshot_mods());
|
||||||
|
|
||||||
//render_bootmagic_status();
|
//render_bootmagic_status();
|
||||||
//render_user_status();
|
//render_user_status();
|
||||||
|
|
||||||
render_keylogger_status();
|
render_keylogger_status();
|
||||||
}
|
}
|
||||||
|
|
||||||
void oled_task_user(void) {
|
void oled_task_user(void) {
|
||||||
update_log();
|
update_log();
|
||||||
|
|
||||||
if (is_master) {
|
if (is_master) {
|
||||||
@ -188,4 +210,5 @@ void oled_task_user(void) {
|
|||||||
} else {
|
} else {
|
||||||
render_status_secondary();
|
render_status_secondary();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
@ -6,7 +6,7 @@
|
|||||||
void oled_driver_render_logo(void);
|
void oled_driver_render_logo(void);
|
||||||
bool process_record_user_oled(uint16_t keycode, keyrecord_t *record);
|
bool process_record_user_oled(uint16_t keycode, keyrecord_t *record);
|
||||||
|
|
||||||
#ifdef OLED_DISPLAY_128X64
|
#if defined(OLED_DISPLAY_128X64) || defined(OLED_DISPLAY_128X32)
|
||||||
# define OLED_RENDER_KEYLOGGER "Keylogger: "
|
# define OLED_RENDER_KEYLOGGER "Keylogger: "
|
||||||
|
|
||||||
# define OLED_RENDER_LAYOUT_NAME "Layout: "
|
# define OLED_RENDER_LAYOUT_NAME "Layout: "
|
||||||
@ -14,6 +14,7 @@ bool process_record_user_oled(uint16_t keycode, keyrecord_t *record);
|
|||||||
# define OLED_RENDER_LAYOUT_WARCRAFT "Warcraft"
|
# define OLED_RENDER_LAYOUT_WARCRAFT "Warcraft"
|
||||||
# define OLED_RENDER_LAYOUT_DIABLO "Diablo"
|
# define OLED_RENDER_LAYOUT_DIABLO "Diablo"
|
||||||
# define OLED_RENDER_LAYOUT_WORKMAN "Workman"
|
# define OLED_RENDER_LAYOUT_WORKMAN "Workman"
|
||||||
|
# define OLED_RENDER_LAYOUT_HEROES "Heroes"
|
||||||
|
|
||||||
# define OLED_RENDER_LAYER_NAME "Layer:\n"
|
# define OLED_RENDER_LAYER_NAME "Layer:\n"
|
||||||
# define OLED_RENDER_LAYER_LOWER "Lower"
|
# define OLED_RENDER_LAYER_LOWER "Lower"
|
||||||
|
|||||||
@ -285,6 +285,9 @@ layer_state_t layer_state_set_rgb_light(layer_state_t state) {
|
|||||||
case _DIABLO:
|
case _DIABLO:
|
||||||
rgblight_set_hsv_and_mode(HSV_RED, RGBLIGHT_MODE_BREATHING + 3);
|
rgblight_set_hsv_and_mode(HSV_RED, RGBLIGHT_MODE_BREATHING + 3);
|
||||||
break;
|
break;
|
||||||
|
case _HEROES:
|
||||||
|
rgblight_set_hsv_and_mode(HSV_CYAN, RGBLIGHT_MODE_BREATHING + 3);
|
||||||
|
break;
|
||||||
case _RAISE:
|
case _RAISE:
|
||||||
rgblight_set_hsv_and_mode(HSV_YELLOW, RGBLIGHT_MODE_BREATHING + 3);
|
rgblight_set_hsv_and_mode(HSV_YELLOW, RGBLIGHT_MODE_BREATHING + 3);
|
||||||
break;
|
break;
|
||||||
|
|||||||
@ -19,6 +19,7 @@ expanded before being used as arguments to the LAYOUT_xxx macro.
|
|||||||
#define LAYOUT_gergo_wrapper(...) LAYOUT_gergo(__VA_ARGS__)
|
#define LAYOUT_gergo_wrapper(...) LAYOUT_gergo(__VA_ARGS__)
|
||||||
#define LAYOUT_ut472_wrapper(...) LAYOUT_ut472(__VA_ARGS__)
|
#define LAYOUT_ut472_wrapper(...) LAYOUT_ut472(__VA_ARGS__)
|
||||||
#define LAYOUT_dropALT_wrapper(...) LAYOUT_dropALT(__VA_ARGS__)
|
#define LAYOUT_dropALT_wrapper(...) LAYOUT_dropALT(__VA_ARGS__)
|
||||||
|
#define LAYOUT_lily58_base_wrapper(...) LAYOUT_lily58_base(__VA_ARGS__)
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Blocks for each of the four major keyboard layouts
|
Blocks for each of the four major keyboard layouts
|
||||||
@ -83,7 +84,7 @@ NOTE: These are all the same length. If you do a search/replace
|
|||||||
#define _________________ADJUST_R2_________________ _______, KC_F4, KC_F5, KC_F6, KC_F11
|
#define _________________ADJUST_R2_________________ _______, KC_F4, KC_F5, KC_F6, KC_F11
|
||||||
#define _________________ADJUST_R3_________________ _______, KC_F1, KC_F2, KC_F3, KC_F12
|
#define _________________ADJUST_R3_________________ _______, KC_F1, KC_F2, KC_F3, KC_F12
|
||||||
|
|
||||||
#define ___________________NAV_L1__________________ DF(_QWERTY), DF(_WORKMAN), TG(_WARCRAFT), TG(_DIABLO), _______
|
#define ___________________NAV_L1__________________ DF(_QWERTY), DF(_WORKMAN), TG(_WARCRAFT), TG(_DIABLO), TG(_HEROES)
|
||||||
#define ___________________NAV_L2__________________ _______, _______, KC_UP , _______, _______
|
#define ___________________NAV_L2__________________ _______, _______, KC_UP , _______, _______
|
||||||
#define ___________________NAV_L3__________________ _______, KC_LEFT, KC_DOWN, KC_RGHT, _______
|
#define ___________________NAV_L3__________________ _______, KC_LEFT, KC_DOWN, KC_RGHT, _______
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user