Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
QMK Bot 2021-03-02 14:33:32 +00:00
commit 967d7c47dc
2 changed files with 0 additions and 14 deletions

View File

@ -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

View File

@ -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,