mirror of
https://github.com/openstenoproject/qmk
synced 2024-11-10 02:30:07 +00:00
having trouble with conflicts
This commit is contained in:
parent
45b7718fb1
commit
0f71c81df8
3 changed files with 0 additions and 20 deletions
|
@ -32,20 +32,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
#define MATRIX_ROWS 5
|
||||
#define MATRIX_COLS 6
|
||||
|
||||
<<<<<<< HEAD
|
||||
// Planck PCB default pin-out
|
||||
// Change this to how you wired your keyboard
|
||||
// COLS: Left to right, ROWS: Top to bottom
|
||||
#ifdef USE_PRO_MICRO
|
||||
#define MATRIX_ROW_PINS { B6, B2, B3, B1, F7 }
|
||||
#define MATRIX_COL_PINS { F4, C6, D7, F5, B4, B5 }
|
||||
#define UNUSED_PINS
|
||||
#else
|
||||
#define MATRIX_ROW_PINS { B6, F7, B2, B3, B1 }
|
||||
#define MATRIX_COL_PINS { F6, C6, D7, F5, B4, B5 }
|
||||
#define UNUSED_PINS
|
||||
#endif
|
||||
=======
|
||||
/*
|
||||
* Keyboard Matrix Assignments
|
||||
*
|
||||
|
@ -65,7 +51,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
//#define MATRIX_COL_PINS { F6, C6, D7, F5, B4, B5 }
|
||||
//#define UNUSED_PINS
|
||||
|
||||
>>>>>>> 102a830bbdb302eb0951ec7910ab7c9feae272d1
|
||||
|
||||
/* COL2ROW or ROW2COL */
|
||||
#define DIODE_DIRECTION COL2ROW
|
||||
|
|
|
@ -1,6 +1,4 @@
|
|||
<<<<<<< HEAD
|
||||
Maxipad keyboard firmware
|
||||
======================
|
||||
|
||||
## Quantum MK Firmware
|
||||
|
||||
|
|
|
@ -59,7 +59,6 @@ EXTRAKEY_ENABLE ?= yes # Audio control and System control(+450)
|
|||
CONSOLE_ENABLE ?= yes # Console for debug(+400)
|
||||
COMMAND_ENABLE ?= yes # Commands for debug and configuration
|
||||
# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
|
||||
<<<<<<< HEAD
|
||||
# SLEEP_LED_ENABLE ?= yes # Breathing sleep LED during USB suspend
|
||||
# NKRO_ENABLE ?= yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
|
||||
# BACKLIGHT_ENABLE ?= yes # Enable keyboard backlight functionality
|
||||
|
@ -67,7 +66,6 @@ COMMAND_ENABLE ?= yes # Commands for debug and configuration
|
|||
# UNICODE_ENABLE ?= YES # Unicode
|
||||
# BLUETOOTH_ENABLE ?= yes # Enable Bluetooth with the Adafruit EZ-Key HID
|
||||
USE_PRO_MICRO ?= yes
|
||||
=======
|
||||
SLEEP_LED_ENABLE ?= no # Breathing sleep LED during USB suspend
|
||||
# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
|
||||
NKRO_ENABLE ?= no # USB Nkey Rollover
|
||||
|
@ -76,4 +74,3 @@ MIDI_ENABLE ?= no # MIDI controls
|
|||
UNICODE_ENABLE ?= no # Unicode
|
||||
BLUETOOTH_ENABLE ?= no # Enable Bluetooth with the Adafruit EZ-Key HID
|
||||
AUDIO_ENABLE ?= no # Audio output on port C6
|
||||
>>>>>>> 102a830bbdb302eb0951ec7910ab7c9feae272d1
|
||||
|
|
Loading…
Reference in a new issue