diff options
| -rw-r--r-- | keyboards/peranekofactory/tone/rev1/config.h | 12 | ||||
| -rw-r--r-- | keyboards/peranekofactory/tone/rev2/config.h | 9 | ||||
| -rw-r--r-- | keyboards/sekigon/grs_70ec/config.h | 2 | ||||
| -rw-r--r-- | keyboards/sekigon/grs_70ec/ec_switch_matrix.c | 12 | 
4 files changed, 7 insertions, 28 deletions
| diff --git a/keyboards/peranekofactory/tone/rev1/config.h b/keyboards/peranekofactory/tone/rev1/config.h index 22658c9c78..54a59ed551 100644 --- a/keyboards/peranekofactory/tone/rev1/config.h +++ b/keyboards/peranekofactory/tone/rev1/config.h @@ -28,7 +28,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  /* key matrix size */  #define MATRIX_ROWS 1 -#define MATRIX_COLS 10 +#define MATRIX_COLS 8  /*   * Keyboard Matrix Assignments @@ -42,19 +42,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.   */  #define DIRECT_PINS { \ -	{ D4, C6, D7, E6, F6, F7, B1, B3 } \ +    { D4, C6, D7, E6, F6, F7, B1, B3 } \  }  #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 */  #define DIODE_DIRECTION COL2ROW -     +  /* Rotary encoder define*/  #define ENCODERS_PAD_A { B5 }  #define ENCODERS_PAD_B { B4 } diff --git a/keyboards/peranekofactory/tone/rev2/config.h b/keyboards/peranekofactory/tone/rev2/config.h index f49c38e4b8..54a59ed551 100644 --- a/keyboards/peranekofactory/tone/rev2/config.h +++ b/keyboards/peranekofactory/tone/rev2/config.h @@ -28,7 +28,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  /* key matrix size */  #define MATRIX_ROWS 1 -#define MATRIX_COLS 10 +#define MATRIX_COLS 8  /*   * Keyboard Matrix Assignments @@ -42,13 +42,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.   */  #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  /* COL2ROW, ROW2COL */ diff --git a/keyboards/sekigon/grs_70ec/config.h b/keyboards/sekigon/grs_70ec/config.h index aa740e7775..b1559fcc2f 100644 --- a/keyboards/sekigon/grs_70ec/config.h +++ b/keyboards/sekigon/grs_70ec/config.h @@ -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_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 DISCHARGE_PIN B1  #define ANALOG_PORT F6 diff --git a/keyboards/sekigon/grs_70ec/ec_switch_matrix.c b/keyboards/sekigon/grs_70ec/ec_switch_matrix.c index 88e9bdabdb..d1c2d85ac8 100644 --- a/keyboards/sekigon/grs_70ec/ec_switch_matrix.c +++ b/keyboards/sekigon/grs_70ec/ec_switch_matrix.c @@ -20,19 +20,9 @@  #include "analog.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  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;  _Static_assert(sizeof(mux_sel_pins) == 3, "invalid MUX_SEL_PINS"); | 
