mirror of
https://github.com/qmk/qmk_firmware.git
synced 2024-12-02 16:05:09 +00:00
Merge remote-tracking branch 'origin/develop' into xap
This commit is contained in:
commit
1c0359da58
@ -19,7 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
#include "config_common.h"
|
||||
|
||||
#define SOFT_SERIAL_PIN D3
|
||||
#define SERIAL_USE_MULTI_TRANSACTION
|
||||
#define SELECT_SOFT_SERIAL_SPEED 1
|
||||
|
||||
/* key matrix size */
|
||||
|
@ -18,7 +18,6 @@
|
||||
|
||||
// #define USE_I2C
|
||||
// #define SELECT_SOFT_SERIAL_SPEED 1
|
||||
// #define SERIAL_USE_MULTI_TRANSACTION
|
||||
#define SPLIT_MODS_ENABLE
|
||||
#define EE_HANDS
|
||||
|
||||
|
@ -27,7 +27,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
/* Soft Serial defines */
|
||||
#define SOFT_SERIAL_PIN D2
|
||||
#define SERIAL_USE_MULTI_TRANSACTION
|
||||
|
||||
/* Select hand configuration */
|
||||
#define MASTER_LEFT
|
||||
|
@ -1,5 +1,4 @@
|
||||
#pragma once
|
||||
|
||||
#undef SERIAL_USE_MULTI_TRANSACTION
|
||||
#define SERIAL_SLAVE_BUFFER_LENGTH MATRIX_ROWS/2
|
||||
#define SERIAL_MASTER_BUFFER_LENGTH MATRIX_ROWS/2
|
||||
|
@ -22,7 +22,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
#ifndef SOFT_SERIAL_PIN
|
||||
#define SOFT_SERIAL_PIN D2
|
||||
#define SERIAL_USE_MULTI_TRANSACTION
|
||||
#endif
|
||||
|
||||
#define DIODE_DIRECTION COL2ROW
|
||||
|
@ -29,7 +29,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
#define MATRIX_COL_PINS { F6, F7, B1, B3, B2, B6 }
|
||||
|
||||
#define SOFT_SERIAL_PIN D2
|
||||
#define SERIAL_USE_MULTI_TRANSACTION
|
||||
|
||||
/* define if matrix has ghost */
|
||||
//#define MATRIX_HAS_GHOST
|
||||
|
@ -23,5 +23,4 @@
|
||||
#define TAP_CODE_DELAY 10
|
||||
|
||||
/* communication between sides */
|
||||
#define SERIAL_USE_MULTI_TRANSACTION
|
||||
#define SOFT_SERIAL_PIN D2
|
||||
|
@ -22,5 +22,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
#ifndef SOFT_SERIAL_PIN
|
||||
#define SOFT_SERIAL_PIN D2
|
||||
#define SERIAL_USE_MULTI_TRANSACTION
|
||||
#endif
|
||||
|
Loading…
Reference in New Issue
Block a user