diff options
| author | QMK Bot <hello@qmk.fm> | 2021-03-02 14:33:32 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2021-03-02 14:33:32 +0000 |
| commit | 967d7c47dc90c2cc087fb68acb328cc6e3fca76a (patch) | |
| tree | dea58777c7061bab5874b6542113df2706ce87a6 | |
| parent | 4c04c848b550b5327d1e1ef61a597f12047b35c4 (diff) | |
| parent | c5b0b6ff3258f82fdaad137dea179157e8dea3e3 (diff) | |
| download | qmk_firmware-967d7c47dc90c2cc087fb68acb328cc6e3fca76a.tar.gz qmk_firmware-967d7c47dc90c2cc087fb68acb328cc6e3fca76a.zip | |
Merge remote-tracking branch 'origin/master' into develop
| -rw-r--r-- | keyboards/lily58/keymaps/default/config.h | 6 | ||||
| -rw-r--r-- | keyboards/lily58/keymaps/default/keymap.c | 8 |
2 files changed, 0 insertions, 14 deletions
diff --git a/keyboards/lily58/keymaps/default/config.h b/keyboards/lily58/keymaps/default/config.h index 4f155d3af8..d843f5b1c4 100644 --- a/keyboards/lily58/keymaps/default/config.h +++ b/keyboards/lily58/keymaps/default/config.h @@ -20,18 +20,12 @@ 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 diff --git a/keyboards/lily58/keymaps/default/keymap.c b/keyboards/lily58/keymaps/default/keymap.c index 2b34bf3e15..74a1895dd6 100644 --- a/keyboards/lily58/keymaps/default/keymap.c +++ b/keyboards/lily58/keymaps/default/keymap.c @@ -1,13 +1,5 @@ #include QMK_KEYBOARD_H -#ifdef PROTOCOL_LUFA - #include "lufa.h" - #include "split_util.h" -#endif -#ifdef SSD1306OLED - #include "ssd1306.h" -#endif - enum layer_number { _QWERTY = 0, _LOWER, |