From 474c0bc8a2886077fa8dbdb4a8a7a57f4e1291d1 Mon Sep 17 00:00:00 2001
From: jack <0x6A73@pm.me>
Date: Thu, 13 Oct 2022 11:26:42 -0600
Subject: Fixup dumbpad/v3x (#18692)
---
keyboards/dumbpad/v3x/config.h | 6 +-----
keyboards/dumbpad/v3x/keymaps/default/keymap.c | 4 ++--
keyboards/dumbpad/v3x/keymaps/deveth0/keymap.c | 4 ++--
keyboards/dumbpad/v3x/keymaps/via/keymap.c | 4 ++--
4 files changed, 7 insertions(+), 11 deletions(-)
(limited to 'keyboards/dumbpad')
diff --git a/keyboards/dumbpad/v3x/config.h b/keyboards/dumbpad/v3x/config.h
index c64409c967..d689863cf7 100644
--- a/keyboards/dumbpad/v3x/config.h
+++ b/keyboards/dumbpad/v3x/config.h
@@ -16,15 +16,11 @@ along with this program. If not, see .
*/
#pragma once
-#include "config_common.h"
-
-
/* Column/Row IO definitions */
#define MATRIX_ROWS 4
#define MATRIX_COLS 5
#define MATRIX_ROW_PINS { F4, F5, F6, F7 }
#define MATRIX_COL_PINS { C6, D7, E6, B4, B5 }
-#define UNUSED_PINS
/* Single rotary encoder */
#define ENCODERS_PAD_A { B2 }
@@ -40,7 +36,7 @@ along with this program. If not, see .
#define BOOTMAGIC_LITE_COLUMN 0
#define RGB_DI_PIN D1
-#define DRIVER_LED_TOTAL 16
+#define RGB_MATRIX_LED_COUNT 16
// Cleanup RGB
#ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/dumbpad/v3x/keymaps/default/keymap.c b/keyboards/dumbpad/v3x/keymaps/default/keymap.c
index b96e0e71ce..0c65fac187 100644
--- a/keyboards/dumbpad/v3x/keymaps/default/keymap.c
+++ b/keyboards/dumbpad/v3x/keymaps/default/keymap.c
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
\-----------------------------------------------------'
*/
[1] = LAYOUT(
- RGB_TOG, RGB_VAD, RGB_VAI, RESET,
+ RGB_TOG, RGB_VAD, RGB_VAI, QK_BOOT,
KC_NO, RGB_HUD, RGB_HUI, KC_NO,
KC_NO, RGB_SAD, RGB_SAI, KC_NO,
KC_NO, _______, RGB_SPD, RGB_SPI, KC_NO
@@ -77,5 +77,5 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
}
break;
}
- return true;
+ return false;
}
diff --git a/keyboards/dumbpad/v3x/keymaps/deveth0/keymap.c b/keyboards/dumbpad/v3x/keymaps/deveth0/keymap.c
index b95e6270e8..3d0fd20ecf 100644
--- a/keyboards/dumbpad/v3x/keymaps/deveth0/keymap.c
+++ b/keyboards/dumbpad/v3x/keymaps/deveth0/keymap.c
@@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
\-----------------------------------------------------'
*/
[1] = LAYOUT(
- RGB_TOG, RGB_VAD, RGB_VAI, RESET,
+ RGB_TOG, RGB_VAD, RGB_VAI, QK_BOOT,
KC_NO, RGB_HUD, RGB_HUI, KC_NO,
KC_NO, RGB_SAD, RGB_SAI, KC_NO,
KC_NO, _______, RGB_SPD, RGB_SPI, KC_NO
@@ -100,5 +100,5 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
}
break;
}
- return true;
+ return false;
}
diff --git a/keyboards/dumbpad/v3x/keymaps/via/keymap.c b/keyboards/dumbpad/v3x/keymaps/via/keymap.c
index b96e0e71ce..0c65fac187 100644
--- a/keyboards/dumbpad/v3x/keymaps/via/keymap.c
+++ b/keyboards/dumbpad/v3x/keymaps/via/keymap.c
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
\-----------------------------------------------------'
*/
[1] = LAYOUT(
- RGB_TOG, RGB_VAD, RGB_VAI, RESET,
+ RGB_TOG, RGB_VAD, RGB_VAI, QK_BOOT,
KC_NO, RGB_HUD, RGB_HUI, KC_NO,
KC_NO, RGB_SAD, RGB_SAI, KC_NO,
KC_NO, _______, RGB_SPD, RGB_SPI, KC_NO
@@ -77,5 +77,5 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
}
break;
}
- return true;
+ return false;
}
--
cgit v1.2.3
From 5e4b076af3c99d36632d6b92f3ddd046f38a01af Mon Sep 17 00:00:00 2001
From: Ryan
Date: Sun, 16 Oct 2022 08:29:43 +1100
Subject: Remove legacy keycodes, part 5 (#18710)
* `KC_SLCK` -> `KC_SCRL`
* `KC_NLCK` -> `KC_NUM`
---
keyboards/dumbpad/v1x/keymaps/numpad_media/keymap.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'keyboards/dumbpad')
diff --git a/keyboards/dumbpad/v1x/keymaps/numpad_media/keymap.c b/keyboards/dumbpad/v1x/keymaps/numpad_media/keymap.c
index 2806a31740..334c72596a 100644
--- a/keyboards/dumbpad/v1x/keymaps/numpad_media/keymap.c
+++ b/keyboards/dumbpad/v1x/keymaps/numpad_media/keymap.c
@@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
\-----------------------------------------------------'
*/
[1] = LAYOUT(
- _______, _______, _______, KC_NLCK,
+ _______, _______, _______, KC_NUM,
_______, _______, _______, KC_KP_MINUS,
_______, _______, _______, KC_KP_SLASH,
KC_MUTE, _______, _______, _______, KC_KP_EQUAL
--
cgit v1.2.3
From 7cbff9d921879ef3c54837cb2ffc455e019f45b4 Mon Sep 17 00:00:00 2001
From: Ryan
Date: Sat, 22 Oct 2022 01:46:10 +1100
Subject: Deprecate `KC_LOCK` for `QK_LOCK` (#18796)
---
keyboards/dumbpad/v0x/keymaps/default/keymap.c | 2 +-
keyboards/dumbpad/v0x_right/keymaps/default/keymap.c | 2 +-
keyboards/dumbpad/v1x/keymaps/default/keymap.c | 2 +-
keyboards/dumbpad/v1x_dualencoder/keymaps/default/keymap.c | 2 +-
keyboards/dumbpad/v1x_oled/keymaps/default/keymap.c | 2 +-
keyboards/dumbpad/v1x_oled/keymaps/via/keymap.c | 2 +-
keyboards/dumbpad/v1x_right/keymaps/default/keymap.c | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
(limited to 'keyboards/dumbpad')
diff --git a/keyboards/dumbpad/v0x/keymaps/default/keymap.c b/keyboards/dumbpad/v0x/keymaps/default/keymap.c
index c0627e7490..9787c24f0f 100644
--- a/keyboards/dumbpad/v0x/keymaps/default/keymap.c
+++ b/keyboards/dumbpad/v0x/keymaps/default/keymap.c
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, _______, _______, QK_BOOT,
_______, _______, _______, KC_KP_PLUS,
_______, _______, _______, KC_KP_MINUS,
- KC_LOCK, _______, _______, _______, KC_EQL
+ QK_LOCK, _______, _______, _______, KC_EQL
),
};
diff --git a/keyboards/dumbpad/v0x_right/keymaps/default/keymap.c b/keyboards/dumbpad/v0x_right/keymaps/default/keymap.c
index bc762bc0f2..a0f4e3a669 100644
--- a/keyboards/dumbpad/v0x_right/keymaps/default/keymap.c
+++ b/keyboards/dumbpad/v0x_right/keymaps/default/keymap.c
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, _______, _______, QK_BOOT,
_______, _______, _______, KC_KP_PLUS,
_______, _______, _______, KC_KP_MINUS,
- _______, _______, _______, KC_EQL, KC_LOCK
+ _______, _______, _______, KC_EQL, QK_LOCK
),
};
diff --git a/keyboards/dumbpad/v1x/keymaps/default/keymap.c b/keyboards/dumbpad/v1x/keymaps/default/keymap.c
index c0627e7490..9787c24f0f 100644
--- a/keyboards/dumbpad/v1x/keymaps/default/keymap.c
+++ b/keyboards/dumbpad/v1x/keymaps/default/keymap.c
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, _______, _______, QK_BOOT,
_______, _______, _______, KC_KP_PLUS,
_______, _______, _______, KC_KP_MINUS,
- KC_LOCK, _______, _______, _______, KC_EQL
+ QK_LOCK, _______, _______, _______, KC_EQL
),
};
diff --git a/keyboards/dumbpad/v1x_dualencoder/keymaps/default/keymap.c b/keyboards/dumbpad/v1x_dualencoder/keymaps/default/keymap.c
index b21ac95849..805815253a 100644
--- a/keyboards/dumbpad/v1x_dualencoder/keymaps/default/keymap.c
+++ b/keyboards/dumbpad/v1x_dualencoder/keymaps/default/keymap.c
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, _______, _______, QK_BOOT,
_______, _______, _______, KC_KP_PLUS,
_______, _______, _______, KC_KP_MINUS,
- KC_LOCK, _______, _______, _______, KC_EQL
+ QK_LOCK, _______, _______, _______, KC_EQL
),
};
diff --git a/keyboards/dumbpad/v1x_oled/keymaps/default/keymap.c b/keyboards/dumbpad/v1x_oled/keymaps/default/keymap.c
index 84d23f665a..94f5b55b8d 100644
--- a/keyboards/dumbpad/v1x_oled/keymaps/default/keymap.c
+++ b/keyboards/dumbpad/v1x_oled/keymaps/default/keymap.c
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, _______, _______, QK_BOOT,
_______, _______, _______, KC_KP_PLUS,
_______, _______, _______, KC_KP_MINUS,
- KC_LOCK, _______, _______, _______, KC_EQL
+ QK_LOCK, _______, _______, _______, KC_EQL
),
[2] = LAYOUT(
diff --git a/keyboards/dumbpad/v1x_oled/keymaps/via/keymap.c b/keyboards/dumbpad/v1x_oled/keymaps/via/keymap.c
index 00f4500469..a1db187d2b 100644
--- a/keyboards/dumbpad/v1x_oled/keymaps/via/keymap.c
+++ b/keyboards/dumbpad/v1x_oled/keymaps/via/keymap.c
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, _______, _______, QK_BOOT,
_______, _______, _______, KC_KP_PLUS,
_______, _______, _______, KC_KP_MINUS,
- KC_LOCK, _______, _______, _______, KC_EQL
+ QK_LOCK, _______, _______, _______, KC_EQL
),
[2] = LAYOUT(
diff --git a/keyboards/dumbpad/v1x_right/keymaps/default/keymap.c b/keyboards/dumbpad/v1x_right/keymaps/default/keymap.c
index bc762bc0f2..a0f4e3a669 100644
--- a/keyboards/dumbpad/v1x_right/keymaps/default/keymap.c
+++ b/keyboards/dumbpad/v1x_right/keymaps/default/keymap.c
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, _______, _______, QK_BOOT,
_______, _______, _______, KC_KP_PLUS,
_______, _______, _______, KC_KP_MINUS,
- _______, _______, _______, KC_EQL, KC_LOCK
+ _______, _______, _______, KC_EQL, QK_LOCK
),
};
--
cgit v1.2.3
From db2aa039f197f958fbf0e95c0d7256a5a41c7163 Mon Sep 17 00:00:00 2001
From: Ryan
Date: Fri, 4 Nov 2022 04:42:19 +1100
Subject: Remove more `UNUSED_PINS` defines (#18940)
---
keyboards/dumbpad/v1x_oled/config.h | 1 -
1 file changed, 1 deletion(-)
(limited to 'keyboards/dumbpad')
diff --git a/keyboards/dumbpad/v1x_oled/config.h b/keyboards/dumbpad/v1x_oled/config.h
index 2dba0c3b14..4b3695096e 100644
--- a/keyboards/dumbpad/v1x_oled/config.h
+++ b/keyboards/dumbpad/v1x_oled/config.h
@@ -21,7 +21,6 @@ along with this program. If not, see .
#define MATRIX_ROW_PINS { F4, F5, F6, F7 }
#define MATRIX_COL_PINS { C6, B1, B3, B2, B6 }
-#define UNUSED_PINS
/* Dual rotary encoders */
#define ENCODERS_PAD_A { B4, E6 }
--
cgit v1.2.3