Skip to content

Commit 2799cd4

Browse files
TraxmaxxTraxmaxx
committed
upgrade deprecated keycodes and point vial to latest qmk merge for testing purposes
1 parent 592f6b6 commit 2799cd4

5 files changed

Lines changed: 20 additions & 17 deletions

File tree

‎.github/workflows/build_binaries.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
uses: qmk/.github/.github/workflows/qmk_userspace_build.yml@main
1212
with:
1313
qmk_repo: vial-kb/vial-qmk
14-
qmk_ref: vial
14+
qmk_ref: merge-2025-12-28
1515
preparation_command: "cp -rf keyboards/* qmk_firmware/keyboards/ && cp -rf modules/drashna/* qmk_firmware/modules/"
1616

1717
publish:

‎keyboards/bastardkb/charybdis/4x6/keymaps/default/keymap.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* This program is distributed in the hope that it will be useful,
1010
* but WITHOUT ANY WARRANTY; without even the implied warranty of
1111
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12-
* GNU General Public License for more details.
12+
* GNU General Public LiRM_NEXTcense for more details.
1313
*
1414
* You should have received a copy of the GNU General Public License
1515
* along with this program. If not, see <http://www.gnu.org/licenses/>.

‎keyboards/bastardkb/charybdis/4x6/keymaps/traxmaxx/keymap.c‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,21 @@ enum charybdis_keymap_layers {
2323
LAYER_POINTER,
2424
};
2525

26-
/** \brief Automatically enable sniping-mode on the pointer layer. */
26+
/** brief Automatically enable sniping-mode on the pointer layer. */
2727
// #define CHARYBDIS_AUTO_SNIPING_ON_LAYER LAYER_POINTER
2828

2929
#define LOWER MO(LAYER_LOWER)
3030
#define RAISE MO(LAYER_RAISE)
3131
#define PT_Z LT(LAYER_POINTER, KC_Z)
3232
#define PT_SLSH LT(LAYER_POINTER, KC_SLSH)
3333

34+
/** Define no-op for pointer keys if building with no trackball */
3435
#ifndef POINTING_DEVICE_ENABLE
3536
# define DRGSCRL KC_NO
3637
# define DPI_MOD KC_NO
38+
# define DPI_RMOD KC_NO
3739
# define S_D_MOD KC_NO
40+
# define S_D_RMOD KC_NO
3841
# define SNIPING KC_NO
3942
#endif // !POINTING_DEVICE_ENABLE
4043

@@ -77,9 +80,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
7780
// ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
7881
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE,
7982
// ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
80-
_______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, KC_NO, KC_VOLU,
83+
_______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, DPI_MOD, KC_VOLU,
8184
// ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
82-
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD,
85+
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, DPI_RMOD, KC_VOLD,
8386
// ╰──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────╯
8487
_______, _______, _______, _______, _______,
8588
_______, _______, _______
@@ -96,8 +99,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
9699
// ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
97100
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
98101
// ╰──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────╯
99-
KC_BTN1, KC_BTN3, KC_BTN2, _______, _______,
100-
XXXXXXX, XXXXXXX, KC_BTN1
102+
MS_BTN1, MS_BTN3, MS_BTN2, _______, _______,
103+
XXXXXXX, XXXXXXX, MS_BTN1
101104
// ╰───────────────────────────╯ ╰──────────────────╯
102105
),
103106
};

‎keyboards/bastardkb/charybdis/4x6/keymaps/via/keymap.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
5959
// ╭──────────────────────────────────────────────────────╮ ╭──────────────────────────────────────────────────────╮
6060
KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_UNDS,
6161
// ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
62-
RGB_MOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LBRC, KC_P7, KC_P8, KC_P9, KC_RBRC, XXXXXXX,
62+
RM_PREV, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LBRC, KC_P7, KC_P8, KC_P9, KC_RBRC, XXXXXXX,
6363
// ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
64-
RGB_TOG, KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, XXXXXXX, KC_PPLS, KC_P4, KC_P5, KC_P6, KC_PMNS, KC_PEQL,
64+
RM_TOGG, KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, XXXXXXX, KC_PPLS, KC_P4, KC_P5, KC_P6, KC_PMNS, KC_PEQL,
6565
// ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
66-
RGB_RMOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PAST, KC_P1, KC_P2, KC_P3, KC_PSLS, KC_PDOT,
66+
RM_NEXT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PAST, KC_P1, KC_P2, KC_P3, KC_PSLS, KC_PDOT,
6767
// ╰──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────╯
6868
XXXXXXX, XXXXXXX, _______, XXXXXXX, _______,
6969
XXXXXXX, XXXXXXX, KC_P0
@@ -95,8 +95,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
9595
// ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
9696
XXXXXXX, _______, DRGSCRL, SNIPING, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, SNIPING, DRGSCRL, _______, XXXXXXX,
9797
// ╰──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────╯
98-
KC_BTN2, KC_BTN1, KC_BTN3, KC_BTN3, KC_BTN1,
99-
XXXXXXX, KC_BTN2, KC_BTN2
98+
MS_BTN2, MS_BTN1, MS_BTN3, MS_BTN3, MS_BTN1,
99+
XXXXXXX, MS_BTN2, MS_BTN2
100100
// ╰───────────────────────────╯ ╰──────────────────╯
101101
),
102102
};

‎keyboards/bastardkb/charybdis/4x6/keymaps/vial/keymap.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
5959
// ╭──────────────────────────────────────────────────────╮ ╭──────────────────────────────────────────────────────╮
6060
KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_UNDS,
6161
// ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
62-
RGB_MOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LBRC, KC_P7, KC_P8, KC_P9, KC_RBRC, XXXXXXX,
62+
RM_PREV, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LBRC, KC_P7, KC_P8, KC_P9, KC_RBRC, XXXXXXX,
6363
// ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
64-
RGB_TOG, KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, XXXXXXX, KC_PPLS, KC_P4, KC_P5, KC_P6, KC_PMNS, KC_PEQL,
64+
RM_TOGG, KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, XXXXXXX, KC_PPLS, KC_P4, KC_P5, KC_P6, KC_PMNS, KC_PEQL,
6565
// ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
66-
RGB_RMOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PAST, KC_P1, KC_P2, KC_P3, KC_PSLS, KC_PDOT,
66+
RM_NEXT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PAST, KC_P1, KC_P2, KC_P3, KC_PSLS, KC_PDOT,
6767
// ╰──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────╯
6868
XXXXXXX, XXXXXXX, _______, XXXXXXX, _______,
6969
XXXXXXX, XXXXXXX, KC_P0
@@ -95,8 +95,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
9595
// ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
9696
XXXXXXX, _______, DRGSCRL, SNIPING, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, SNIPING, DRGSCRL, _______, XXXXXXX,
9797
// ╰──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────╯
98-
KC_BTN2, KC_BTN1, KC_BTN3, KC_BTN3, KC_BTN1,
99-
XXXXXXX, KC_BTN2, KC_BTN2
98+
MS_BTN2, MS_BTN1, MS_BTN3, MS_BTN3, MS_BTN1,
99+
XXXXXXX, MS_BTN2, MS_BTN2
100100
// ╰───────────────────────────╯ ╰──────────────────╯
101101
),
102102
};

0 commit comments

Comments
 (0)