Remove unnecessary definition of encoder count

the value is calculated by QMK
jpskenn · Nov 3, 2023 · a41653a · a41653a
1 parent 23b82ce
commit a41653a
Show file tree

Hide file tree

Showing 9 changed files with 6 additions and 15 deletions.
diff --git a/keyboards/sandy/dn0020/config.h b/keyboards/sandy/dn0020/config.h
@@ -21,9 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // when turn knob clockwise or counterclockwise.
 // This is handy to assign key codes by VIA.
 
-// Number of encoder
-#define ENCODERS 2
-
 /* RGB LED */
     #define RGBLIGHT_DEFAULT_VAL 80
     /*== Lighting Layers ==*/

diff --git a/keyboards/sandy/dn0020/keymaps/jpskenn/keymap.c b/keyboards/sandy/dn0020/keymaps/jpskenn/keymap.c
@@ -286,7 +286,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // Rotary Encoder with VIA
 //------------------------------------------------------------------------------
 #ifdef ENCODER_MAP_ENABLE
-const uint16_t PROGMEM encoder_map[][ENCODERS][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
     [_BASE1] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD), ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
     [_BASE2] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______) },
     [_BASE3] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______) },

diff --git a/keyboards/sandy/dn0020/keymaps/via/keymap.c b/keyboards/sandy/dn0020/keymaps/via/keymap.c
@@ -220,7 +220,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // Rotary Encoder with VIA
 //------------------------------------------------------------------------------
 #ifdef ENCODER_MAP_ENABLE
-const uint16_t PROGMEM encoder_map[][ENCODERS][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
     [_BASE1] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD), ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
     [_BASE2] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______) },
     [_BASE3] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______) },

diff --git a/keyboards/sandy/dn0030/config.h b/keyboards/sandy/dn0030/config.h
@@ -21,9 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // when turn knob clockwise or counterclockwise.
 // This is handy to assign key codes by VIA.
 
-// Number of encoder
-#define ENCODERS 2
-
 /* RGB LED */
     #define RGBLIGHT_DEFAULT_VAL 80
     /*== Lighting Effects ==*/

diff --git a/keyboards/sandy/dn0030/keymaps/jpskenn/keymap.c b/keyboards/sandy/dn0030/keymaps/jpskenn/keymap.c
@@ -288,7 +288,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // Rotary Encoder with VIA
 //------------------------------------------------------------------------------
 #ifdef ENCODER_MAP_ENABLE
-const uint16_t PROGMEM encoder_map[][ENCODERS][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
     [_BASE1] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD), ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
     [_BASE2] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______) },
     [_BASE3] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______) },

diff --git a/keyboards/sandy/dn0030/keymaps/via/keymap.c b/keyboards/sandy/dn0030/keymaps/via/keymap.c
@@ -222,7 +222,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // Rotary Encoder with VIA
 //------------------------------------------------------------------------------
 #ifdef ENCODER_MAP_ENABLE
-const uint16_t PROGMEM encoder_map[][ENCODERS][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
     [_BASE1] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD), ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
     [_BASE2] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______) },
     [_BASE3] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______) },

diff --git a/keyboards/sandy/v01/config.h b/keyboards/sandy/v01/config.h
@@ -21,9 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // when turn knob clockwise or counterclockwise.
 // This is handy to assign key codes by VIA.
 
-// Number of encoder
-#define ENCODERS 2
-
 /* RGB LED */
     #define RGBLIGHT_DEFAULT_VAL 80
     /*== Lighting Layers ==*/

diff --git a/keyboards/sandy/v01/keymaps/jpskenn/keymap.c b/keyboards/sandy/v01/keymaps/jpskenn/keymap.c
@@ -282,7 +282,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // Rotary Encoder with VIA
 //------------------------------------------------------------------------------
 #ifdef ENCODER_MAP_ENABLE
-const uint16_t PROGMEM encoder_map[][ENCODERS][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
     [_BASE1] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD), ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
     [_BASE2] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______) },
     [_BASE3] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______) },

diff --git a/keyboards/sandy/v01/keymaps/via/keymap.c b/keyboards/sandy/v01/keymaps/via/keymap.c
@@ -220,7 +220,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // Rotary Encoder with VIA
 //------------------------------------------------------------------------------
 #ifdef ENCODER_MAP_ENABLE
-const uint16_t PROGMEM encoder_map[][ENCODERS][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
     [_BASE1] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD), ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
     [_BASE2] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______) },
     [_BASE3] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______) },