tudattr
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

master
QMK Bot 2021-07-21 18:30:35 +00:00
parent 201b4dc7ab b564ba13ee
commit 874a3df950
4 changed files with 7 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
keyboards/peranekofactory/tone/rev1/config.h
View File

@ -28,7 +28,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* key matrix size */ /* key matrix size */
#define MATRIX_ROWS 1 #define MATRIX_ROWS 1
#define MATRIX_COLS 10 #define MATRIX_COLS 8
/* /*
* Keyboard Matrix Assignments * Keyboard Matrix Assignments
@ -42,19 +42,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#define DIRECT_PINS { \ #define DIRECT_PINS { \
{ D4, C6, D7, E6, F6, F7, B1, B3 } \ { D4, C6, D7, E6, F6, F7, B1, B3 } \
} }
#define UNUSED_PINS #define UNUSED_PINS
/*
#define MATRIX_ROW_PINS { NO_PIN }
#define MATRIX_COL_PINS { F6,F7,B1,B3,D4,C6,D7,E6 }
#define UNUSED_PINS
*/
/* COL2ROW, ROW2COL */ /* COL2ROW, ROW2COL */
#define DIODE_DIRECTION COL2ROW #define DIODE_DIRECTION COL2ROW
/* Rotary encoder define*/ /* Rotary encoder define*/
#define ENCODERS_PAD_A { B5 } #define ENCODERS_PAD_A { B5 }
#define ENCODERS_PAD_B { B4 } #define ENCODERS_PAD_B { B4 }

9
keyboards/peranekofactory/tone/rev2/config.h
View File

@ -28,7 +28,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* key matrix size */ /* key matrix size */
#define MATRIX_ROWS 1 #define MATRIX_ROWS 1
#define MATRIX_COLS 10 #define MATRIX_COLS 8
/* /*
* Keyboard Matrix Assignments * Keyboard Matrix Assignments
@ -42,13 +42,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#define DIRECT_PINS { \ #define DIRECT_PINS { \
{ D4,C6,D7,E6,F6,F7,B1,B3 } \ { D4, C6, D7, E6, F6, F7, B1, B3 } \
} }
/*
#define MATRIX_ROW_PINS { NO_PIN }
#define MATRIX_COL_PINS { D4,C6,D7,E6,F6,F7,B1,B3 }
*/
#define UNUSED_PINS #define UNUSED_PINS
/* COL2ROW, ROW2COL */ /* COL2ROW, ROW2COL */

2
keyboards/sekigon/grs_70ec/config.h
View File

@ -45,7 +45,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
* *
*/ */
#define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 } #define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 }
#define MATRIX_COL_PINS { S2, S1, S0, S3, S5, S7, S6, S4 } #define MATRIX_COL_CHANNELS { 2, 1, 0, 3, 5, 7, 6, 4 }
#define UNUSED_PINS #define UNUSED_PINS
#define DISCHARGE_PIN B1 #define DISCHARGE_PIN B1
#define ANALOG_PORT F6 #define ANALOG_PORT F6

12
keyboards/sekigon/grs_70ec/ec_switch_matrix.c
View File

@ -20,19 +20,9 @@
#include "analog.h" #include "analog.h"
#include "print.h" #include "print.h"
// sensing channel definitions
#define S0 0
#define S1 1
#define S2 2
#define S3 3
#define S4 4
#define S5 5
#define S6 6
#define S7 7
// pin connections // pin connections
const uint8_t row_pins[] = MATRIX_ROW_PINS; const uint8_t row_pins[] = MATRIX_ROW_PINS;
const uint8_t col_channels[] = MATRIX_COL_PINS; const uint8_t col_channels[] = MATRIX_COL_CHANNELS;
const uint8_t mux_sel_pins[] = MUX_SEL_PINS; const uint8_t mux_sel_pins[] = MUX_SEL_PINS;
_Static_assert(sizeof(mux_sel_pins) == 3, "invalid MUX_SEL_PINS"); _Static_assert(sizeof(mux_sel_pins) == 3, "invalid MUX_SEL_PINS");