Bump peter-evans/create-pull-request from 4 to 5

.envrc

@@ -0,0 +1 @@
+eval "$(lorri direnv)"

.github/workflows/format_push.yml

@@ -47,7 +47,7 @@ jobs:
         git config user.email 'hello@qmk.fm'
 
     - name: Create Pull Request
-      uses: peter-evans/create-pull-request@v4
+      uses: peter-evans/create-pull-request@v5
       if: ${{ github.repository == 'qmk/qmk_firmware'}}
       with:
         token: ${{ secrets.QMK_BOT_TOKEN }}

.github/workflows/regen_push.yml

@@ -34,7 +34,7 @@ jobs:
         git config user.email 'hello@qmk.fm'
 
     - name: Create Pull Request
-      uses: peter-evans/create-pull-request@v4
+      uses: peter-evans/create-pull-request@v5
       if: ${{ github.repository == 'qmk/qmk_firmware'}}
       with:
         token: ${{ secrets.QMK_BOT_TOKEN }}

keyboards/bastardkb/charybdis/3x6/v2/splinky_3/config.h

@@ -24,7 +24,7 @@
     { GP27, GP28, GP21, GP6, GP7, GP8 }
 
 /* Handedness. */
-#define MASTER_RIGHT
+#define MASTER_LEFT
 
 // To use the handedness pin, resistors need to be installed on the adapter PCB.
 // If so, uncomment the following code, and undefine MASTER_RIGHT above.

keyboards/bastardkb/charybdis/4x6/4x6.h

@@ -26,19 +26,19 @@
   k10, k11, k12, k13, k14, k15,     k65, k64, k63, k62, k61, k60, \
   k20, k21, k22, k23, k24, k25,     k75, k74, k73, k72, k71, k70, \
   k30, k31, k32, k33, k34, k35,     k85, k84, k83, k82, k81, k80, \
-                 k43, k44, k41,     k91, k93,                     \
-                      k45, k42,     k95                           \
+                      k93, k91,     k41, k44, k43,                \
+                           k95,     k42, k45                      \
 )                                                                 \
 {                                                                 \
   {   k00,   k01,   k02,   k03,   k04,   k05 },                   \
   {   k10,   k11,   k12,   k13,   k14,   k15 },                   \
   {   k20,   k21,   k22,   k23,   k24,   k25 },                   \
   {   k30,   k31,   k32,   k33,   k34,   k35 },                   \
-  { KC_NO,   k41,   k42,   k43,   k44,   k45 },                   \
+  { KC_NO,   k91, KC_NO,   k93, KC_NO,   k95 },                   \
   {   k50,   k51,   k52,   k53,   k54,   k55 },                   \
   {   k60,   k61,   k62,   k63,   k64,   k65 },                   \
   {   k70,   k71,   k72,   k73,   k74,   k75 },                   \
   {   k80,   k81,   k82,   k83,   k84,   k85 },                   \
-  { KC_NO,   k91, KC_NO,   k93, KC_NO,   k95 },                   \
+  { KC_NO,   k41,   k42,   k43,   k44,   k45 },                   \
 }
 // clang-format on

keyboards/bastardkb/charybdis/4x6/keymaps/wonderbeat/keymap.c

@@ -0,0 +1,85 @@
+/**
+ * Copyright 2021 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+enum charybdis_keymap_layers {
+    LAYER_BASE = 0,
+    LAYER_LOWER,
+    LAYER_RAISE,
+};
+
+#define LOWER MO(LAYER_LOWER)
+#define RAISE MO(LAYER_RAISE)
+
+// Tap Dance Declarations
+enum { TD_UNDS_PIPE = 0, TD_LCBR_LBRC, TD_RCBR_RBRC, TD_NEXT_PLAY, SLSH_BSLS };
+
+// Home mod row (kinda)
+// Home mod row (kinda)
+tap_dance_action_t tap_dance_actions[] = {[TD_UNDS_PIPE] = ACTION_TAP_DANCE_DOUBLE(KC_UNDS, KC_PIPE), [TD_LCBR_LBRC] = ACTION_TAP_DANCE_DOUBLE(KC_LCBR, KC_LBRC), [TD_RCBR_RBRC] = ACTION_TAP_DANCE_DOUBLE(KC_RCBR, KC_RBRC), [TD_NEXT_PLAY] = ACTION_TAP_DANCE_DOUBLE(KC_MNXT, KC_MPLY), [SLSH_BSLS] = ACTION_TAP_DANCE_DOUBLE(KC_SLSH, KC_BSLS)};
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [LAYER_BASE] = LAYOUT_charybdis_4x6(
+  // ╭──────────────────────────────────────────────────────╮ ╭──────────────────────────────────────────────────────╮
+        KC_GRV,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,       KC_6,    KC_7,    KC_8,    KC_9,    KC_0, KC_MINS,
+  // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
+        KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,       KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_BSLS,
+  // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
+      KC_ESC,LSFT_T(KC_A),LCTL_T(KC_S),LALT_T(KC_D),KC_F,KC_G,     KC_H,KC_J,LALT_T(KC_K), LCTL_T(KC_L), LSFT_T(KC_SCLN), KC_BSPC,
+  // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
+       TD(SLSH_BSLS), KC_Z,  KC_X,    KC_C,    KC_V,    KC_B,       KC_N,    KC_M, KC_COMM, KC_DOT, KC_SLSH, TD(TD_UNDS_PIPE),
+  // ╰──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────╯
+                                            KC_RGUI, LOWER,       RAISE,  KC_RGUI,  TD(TD_NEXT_PLAY),
+                                                    KC_ENT,       KC_SPC,    KC_RALT
+//                            ╰───────────────────────────╯ ╰──────────────────╯
+  /*                                  KC_LGUI, KC_SPC,   LOWER,      RAISE,  KC_ENT, */
+  /*                                          KC_LALT, KC_BSPC,    KC_DEL */
+  /* //                            ╰───────────────────────────╯ ╰──────────────────╯ */
+  ),
+
+  [LAYER_LOWER] = LAYOUT_charybdis_4x6(
+  // ╭──────────────────────────────────────────────────────╮ ╭──────────────────────────────────────────────────────╮
+       KC_TILD, KC_EXLM,   KC_AT, KC_HASH,  KC_DLR, KC_PERC,    KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_UNDS,
+  // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
+       RGB_MOD, KC_EXLM,   KC_AT, KC_HASH,  KC_DLR, KC_PERC,    KC_LBRC,   KC_P7,   KC_P8,   KC_P9, KC_RBRC, XXXXXXX,
+  // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
+       RGB_TOG, KC_EQL,  KC_MINS, KC_PLUS, KC_LCBR, KC_RCBR,    KC_PPLS,   KC_P4,   KC_P5,   KC_P6, KC_PMNS, KC_DEL,
+  // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
+      RGB_RMOD, XXXXXXX, XXXXXXX, XXXXXXX, EE_CLR,  QK_BOOT,    KC_LBRC, KC_RBRC, KC_SCLN, KC_COLN, KC_BSLS, KC_PDOT,
+  // ╰──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────╯
+                                           _______, XXXXXXX,    _______,    _______, _______,
+                                                    _______,    _______,    KC_P0
+  //                            ╰───────────────────────────╯ ╰──────────────────╯
+  ),
+
+  [LAYER_RAISE] = LAYOUT_charybdis_4x6(
+  // ╭──────────────────────────────────────────────────────╮ ╭──────────────────────────────────────────────────────╮
+        KC_F12,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,      KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,
+  // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
+       KC_MNXT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    KC_PGUP, XXXXXXX, KC_UP, XXXXXXX, XXXXXXX, KC_VOLU,
+  // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
+       KC_MPLY, KC_LEFT,   KC_UP, KC_DOWN, KC_RGHT, XXXXXXX,    KC_PGDN, KC_LEFT, KC_DOWN, KC_RIGHT, KC_RGUI, KC_MUTE,
+  // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
+       KC_MPRV, KC_HOME, KC_PGUP, KC_PGDN,  KC_END, XXXXXXX,    QK_BOOT, EE_CLR,  XXXXXXX, XXXXXXX, XXXXXXX, KC_VOLD,
+  // ╰──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────╯
+                                  _______, _______,            KC_BTN3,    _______, _______,
+                                           _______,            KC_BTN1,    KC_BTN2
+  //                            ╰───────────────────────────╯ ╰──────────────────╯
+  ),
+};
+// clang-format on

keyboards/bastardkb/charybdis/4x6/keymaps/wonderbeat/readme.md

@@ -0,0 +1,7 @@
+# Charybdis (4x6) default keymap
+
+> :bulb: Have a look at the [`via` keymap](../via) for a more feature-rich layout.
+
+The Charydbis (4x6) default keymap is inspired from the original [Dactyl Manuform](../../../../../handwired/dactyl_manuform) default keymap.
+
+This layout supports RGB matrix. However, due to space constraints on the MCU, only a limited number of effect can be enabled at once. Look at the `config.h` file and enable your favorite effect.

keyboards/bastardkb/charybdis/4x6/keymaps/wonderbeat/rules.mk

@@ -0,0 +1,29 @@
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
+AUDIO_SUPPORTED = no        # Audio is not supported
+RGB_MATRIX_SUPPORTED = no  # RGB matrix is supported and enabled by default
+RGBLIGHT_SUPPORTED = no    # RGB underglow is supported, but not enabled by default
+RGB_MATRIX_ENABLE = no     # Enable keyboard RGB matrix functionality
+RGB_MATRIX_DRIVER = WS2812
+
+SPLIT_KEYBOARD = yes
+
+POINTING_DEVICE_ENABLE = yes # Enable trackball
+POINTING_DEVICE_DRIVER = pmw3360
+
+SERIAL_DRIVER = vendor
+WS2812_DRIVER = vendor
+
+TAP_DANCE_ENABLE = yes
+CHARYBDIS_MINIMUM_DEFAULT_DPI = 800

keyboards/bastardkb/charybdis/config.h

@@ -18,20 +18,21 @@
 
 #pragma once
 
-
 /* Pointing device configuration. */
 
 // Enable use of pointing device on slave split.
 #define SPLIT_POINTING_ENABLE
 
-// Pointing device is on the right split.
-#define POINTING_DEVICE_RIGHT
+// Pointing device is on the left split.
+#define POINTING_DEVICE_LEFT
 
 // Limits the frequency that the sensor is polled for motion.
 #define POINTING_DEVICE_TASK_THROTTLE_MS 1
 
 // Invert X axis on mouse reports.
-#define POINTING_DEVICE_INVERT_X
+//#define POINTING_DEVICE_INVERT_X
+
+#define POINTING_DEVICE_INVERT_Y
 
 /* RGB matrix support. */
 #ifdef RGB_MATRIX_ENABLE

keyboards/sofle/keymaps/wonderbeat/config.h

@@ -0,0 +1,61 @@
+ /* Copyright 2020 Josef Adamcik
+  * Modification for VIA support and RGB underglow by Jens Bonk-Wiltfang
+  *
+  * This program is free software: you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published by
+  * the Free Software Foundation, either version 2 of the License, or
+  * (at your option) any later version.
+  *
+  * This program is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  * GNU General Public License for more details.
+  *
+  * You should have received a copy of the GNU General Public License
+  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  */
+
+ #pragma once
+
+ /* The way how "handedness" is decided (which half is which),
+ see https://docs.qmk.fm/#/feature_split_keyboard?id=setting-handedness
+ for more options.
+ */
+
+ /* #define EE_HANDS */
+
+ #define MASTER_LEFT
+
+ #ifdef RGBLIGHT_ENABLE
+ #    define RGBLIGHT_ANIMATIONS
+ #    define RGBLIGHT_DEFAULT_SPD 12
+ #endif
+
+ #define TAPPING_TERM 200
+ #define IGNORE_MOD_TAP_INTERRUPT
+ #define PERMISSIVE_HOLD
+
+ #ifdef RGB_MATRIX_ENABLE
+ #    define RGB_DI_PIN D3
+ #    define DRIVER_LED_TOTAL 74
+ #    define RGB_DISABLE_WHEN_USB_SUSPENDED   // turn off effects when suspended
+ #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 70 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
+ #    define RGB_MATRIX_KEYPRESSES
+ #    define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+ #    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+ #    define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+ /* #    define ENABLE_RGB_MATRIX_MULTISPLASH */
+ /* #define RGB_MATRIX_STARTUP_MODE       RGB_MATRIX_RAINDROPS */
+ #    define RGB_MATRIX_SPLIT \
+         { 37, 37 }
+ #    define RGB_MATRIX_LED_COUNT DRIVER_LED_TOTAL
+
+ #endif
+
+ #define LUNA
+
+ #if defined(OLED_FONT_H)
+ #    undef OLED_FONT_H
+ #endif
+
+ #define OLED_FONT_H "keyboards/sofle/keymaps/wonderbeat/glcdfont.c"

keyboards/sofle/keymaps/wonderbeat/encoder.c

@@ -0,0 +1,55 @@
+ /* Copyright 2020 Josef Adamcik
+  * Modification for VIA support and RGB underglow by Jens Bonk-Wiltfang
+  * 
+  * This program is free software: you can redistribute it and/or modify 
+  * it under the terms of the GNU General Public License as published by 
+  * the Free Software Foundation, either version 2 of the License, or 
+  * (at your option) any later version. 
+  * 
+  * This program is distributed in the hope that it will be useful, 
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+  * GNU General Public License for more details. 
+  * 
+  * You should have received a copy of the GNU General Public License 
+  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+  */
+
+//Setting up what encoder rotation does. If your encoder can be pressed as a button, that function can be set in Via.
+
+#ifdef ENCODER_ENABLE
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    uint8_t temp_mod = get_mods();
+    uint8_t temp_osm = get_oneshot_mods();
+    bool    is_shift = (temp_mod | temp_osm) & MOD_MASK_SHIFT;
+    bool    is_gui = (temp_mod | temp_osm) & MOD_MASK_GUI;
+    if (index == 0) {
+        if (clockwise) {
+            tap_code(KC_VOLU);
+        } else {
+            tap_code(KC_VOLD);
+        }
+    }  else if(index == 1 && is_shift) {
+        if (clockwise) {
+            rgb_matrix_increase_speed();
+        } else {
+            rgb_matrix_decrease_speed();
+        }
+    } else if(index == 1 && is_gui)  {
+        if (clockwise) {
+            rgblight_increase_val();
+        } else {
+            rgblight_decrease_val();
+        }
+    } else if(index == 1) {
+        if (clockwise) {
+            tap_code(KC_BRMD);
+        } else {
+            tap_code(KC_BRK);
+        }
+    }
+    return true;
+}
+
+#endif