Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
f1ac92ac63
23 changed files with 80 additions and 355 deletions
|
@ -20,7 +20,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
#include "config_common.h"
|
||||
|
||||
/* key matrix size */
|
||||
#define MATRIX_ROWS 2
|
||||
#define MATRIX_ROWS 1
|
||||
#define MATRIX_COLS 12
|
||||
|
||||
/*
|
||||
|
@ -34,7 +34,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
*
|
||||
*/
|
||||
#define MATRIX_ROW_PINS \
|
||||
{ F5, NO_PIN }
|
||||
{ F5 }
|
||||
#define MATRIX_COL_PINS { B3, B2, B1, D6, D7, B4, B5, B6, C6, C7, F7, F6 }
|
||||
|
||||
/* COL2ROW, ROW2COL */
|
||||
|
@ -194,8 +194,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
|
||||
#define ENCODERS_PAD_A { D0, D2, D5 }
|
||||
#define ENCODERS_PAD_B { D1, D3, D4 }
|
||||
|
||||
#define ENCODERS 3
|
||||
|
||||
#define ENCODERS_CW_KEY { { 0, 1 }, { 2, 1 }, { 4, 1 } }
|
||||
#define ENCODERS_CCW_KEY { { 1, 1 }, { 3, 1 }, { 5, 1 } }
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue