Merge remote-tracking branch 'upstream/master'

* upstream/master: (80 commits) Ignore VIA(L) json files (qmk#16845) Fix external flash on AVR (qmk#16851) [Keyboard] Fix kay65 - Missing keycode (qmk#16849) [Keyboard] Fix waffling80 - Missing comma (qmk#16848) [Keyboard] The inaugural commit for Leeloo's firmware. (qmk#16599) [Keymap] bépo layout on Lily58L (qmk#16243) [Keyboard] Add RM_Numpad (qmk#15983) [Keymap] Add thattolleyguy keymaps (qmk#15351) [Keyboard] Add Frooastboard Walnut (69% Keyboard) (qmk#16743) [Keyboard] add tiger80 keyboard (qmk#16742) [Keyboard] annepro2: match default keymap to stock keycaps (qmk#16724) [Keyboard] Add banime40 keyboard (qmk#16694) [Keyboard] correct matrix for Kay65 (qmk#16751) [Keymap] Fix snowe keymap after updates to QMK (qmk#16777) [Keyboard] KBD67 rev1 Caps Lock LED Fix (qmk#16790) [Keyboard] Ported ErgoDox to VIA (qmk#16804) [Keyboard] Waffling60 - minor tweak, improve default behavior of caps lock indicator. (qmk#16836) [Keymap] sinc/lickel: Use backlight keys in Fn Row (qmk#16789) [Keyboard] Add Eros by PJB (qmk#16756) [Keymap] fixed oled turn-off issue for crkbd:gotham (qmk#16748) ...
nesth · Apr 14, 2022 · 3daaa39 · 3daaa39
2 parents 3dd7e90 + a4a67d5
commit 3daaa39
Show file tree

Hide file tree

Showing 415 changed files with 17,388 additions and 1,199 deletions.
diff --git a/.github/workflows/auto_approve.yml b/.github/workflows/auto_approve.yml
@@ -0,0 +1,18 @@
+name: Automatic Approve
+
+on:
+ schedule:
+ - cron: "*/5 * * * *"
+
+jobs:
+ automatic_approve:
+ runs-on: ubuntu-latest
+
+ if: github.repository == 'qmk/qmk_firmware'
+
+ steps:
+ - uses: mheap/automatic-approve-action@v1
+ with:
+ token: ${{ secrets.QMK_BOT_TOKEN }}
+ workflows: "format.yml,lint.yml,unit_test.yml"
+ dangerous_files: "lib/python/,Makefile,paths.mk,builddefs/"
diff --git a/.github/workflows/auto_tag.yaml → .github/workflows/auto_tag.yml b/.github/workflows/auto_tag.yaml → .github/workflows/auto_tag.yml
diff --git a/.github/workflows/format.yaml → .github/workflows/format.yml b/.github/workflows/format.yaml → .github/workflows/format.yml
diff --git a/.github/workflows/format_push.yaml → .github/workflows/format_push.yml b/.github/workflows/format_push.yaml → .github/workflows/format_push.yml
diff --git a/.gitignore b/.gitignore
@@ -91,3 +91,6 @@ user_song_list.h
 compile_commands.json
 .clangd/
 .cache/
+
+# VIA(L) json files that don't belong in QMK repo
+via*.json
diff --git a/data/schemas/definitions.jsonschema b/data/schemas/definitions.jsonschema
@@ -71,6 +71,22 @@
  "type": "number",
  "min": 0.25
  },
+ "keyboard": {
+ "oneOf": [
+ {
+ "type": "string",
+ "enum": [
+ "converter/numeric_keypad_IIe",
+ "emptystring/NQG",
+ "maple_computing/christmas_tree/V2017"
+ ]
+ },
+ {
+ "type": "string",
+ "pattern": "^[0-9a-z][0-9a-z_/]*$"
+ }
+ ]
+ },
  "mcu_pin_array": {
  "type": "array",
  "items": {"$ref": "#/mcu_pin"}

diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema
@@ -5,6 +5,7 @@
  "type": "object",
  "properties": {
  "keyboard_name": {"$ref": "qmk.definitions.v1#/text_identifier"},
+ "keyboard_folder": {"$ref": "qmk.definitions.v1#/keyboard"},
  "maintainer": {"$ref": "qmk.definitions.v1#/text_identifier"},
  "manufacturer": {"$ref": "qmk.definitions.v1#/text_identifier"},
  "url": {

diff --git a/docs/cli_commands.md b/docs/cli_commands.md
@@ -335,6 +335,23 @@ This command cleans up the `.build` folder. If `--all` is passed, any .hex or .b
 qmk clean [-a]
 ```
 
+## `qmk via2json`
+
+This command an generate a keymap.json from a VIA keymap backup. Both the layers and the macros are converted, enabling users to easily move away from a VIA-enabled firmware without writing any code or reimplementing their keymaps in QMK Configurator.
+
+**Usage**:
+
+```
+qmk via2json -kb KEYBOARD [-l LAYOUT] [-km KEYMAP] [-o OUTPUT] filename
+```
+
+**Example:**
+
+```
+$ qmk via2json -kb ai03/polaris -o polaris_keymap.json polaris_via_backup.json
+Ψ Wrote keymap to /home/you/qmk_firmware/polaris_keymap.json
+```
+
 ---
 
 # Developer Commands

diff --git a/drivers/flash/flash_spi.c b/drivers/flash/flash_spi.c
@@ -57,7 +57,7 @@ along with this program. If not, see <http:https://www.gnu.org/licenses/>.
 
 /* Mode setting comands */
 #define FLASH_CMD_DP 0xB9 /* DP (Deep Power Down) */
-#define FLASH_CMD_RDP 0xAB /* RDP (Release form Deep Power Down) */
+#define FLASH_CMD_RDP 0xAB /* RDP (Release from Deep Power Down) */
 
 /* Status register */
 #define FLASH_FLAG_WIP 0x01 /* Write in progress bit */

diff --git a/drivers/flash/flash_spi.h b/drivers/flash/flash_spi.h
@@ -74,21 +74,21 @@ along with this program. If not, see <http:https://www.gnu.org/licenses/>.
  The sector size of the FLASH in bytes, as specified in the datasheet.
 */
 #ifndef EXTERNAL_FLASH_SECTOR_SIZE
-# define EXTERNAL_FLASH_SECTOR_SIZE (4 * 1024)
+# define EXTERNAL_FLASH_SECTOR_SIZE (4 * 1024L)
 #endif
 
 /*
  The block size of the FLASH in bytes, as specified in the datasheet.
 */
 #ifndef EXTERNAL_FLASH_BLOCK_SIZE
-# define EXTERNAL_FLASH_BLOCK_SIZE (64 * 1024)
+# define EXTERNAL_FLASH_BLOCK_SIZE (64 * 1024L)
 #endif
 
 /*
  The total size of the FLASH in bytes, as specified in the datasheet.
 */
 #ifndef EXTERNAL_FLASH_SIZE
-# define EXTERNAL_FLASH_SIZE (512 * 1024)
+# define EXTERNAL_FLASH_SIZE (512 * 1024L)
 #endif
 
 /*

diff --git a/drivers/ps2/ps2_mouse.h b/drivers/ps2/ps2_mouse.h
@@ -120,7 +120,7 @@ __attribute__((unused)) static enum ps2_mouse_mode_e {
 enum ps2_mouse_command_e {
  PS2_MOUSE_RESET = 0xFF,
  PS2_MOUSE_RESEND = 0xFE,
- PS2_MOSUE_SET_DEFAULTS = 0xF6,
+ PS2_MOUSE_SET_DEFAULTS = 0xF6,
  PS2_MOUSE_DISABLE_DATA_REPORTING = 0xF5,
  PS2_MOUSE_ENABLE_DATA_REPORTING = 0xF4,
  PS2_MOUSE_SET_SAMPLE_RATE = 0xF3,

diff --git a/keyboards/1upkeyboards/super16v2/config.h b/keyboards/1upkeyboards/super16v2/config.h
@@ -22,6 +22,8 @@
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 4
 
+#define MOUSEKEY_MOVE_DELTA 25
+
 /*
  * Keyboard Matrix Assignments
  *
@@ -37,6 +39,9 @@
 #define MATRIX_ROW_PINS { D1, D2, D3, D4 }
 #define MATRIX_COL_PINS { D5, D6, C2, D0 }
 
+#define ENCODERS_PAD_A { B1, B3 }
+#define ENCODERS_PAD_B { B2, B4 }
+
 #define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
@@ -58,28 +63,62 @@
 //#define BACKLIGHT_BREATHING
 
 #define RGB_DI_PIN B5
+#define DRIVER_LED_TOTAL 20
 #ifdef RGB_DI_PIN
-# define RGBLED_NUM 20
-# define RGBLIGHT_HUE_STEP 8
-# define RGBLIGHT_SAT_STEP 8
-# define RGBLIGHT_VAL_STEP 8
-# define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
-# define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-# define RGBLIGHT_EFFECT_BREATHING
-# define RGBLIGHT_EFFECT_RAINBOW_MOOD
-# define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-# define RGBLIGHT_EFFECT_SNAKE
-# define RGBLIGHT_EFFECT_KNIGHT
-# define RGBLIGHT_EFFECT_CHRISTMAS
-# define RGBLIGHT_EFFECT_STATIC_GRADIENT
-# define RGBLIGHT_EFFECT_RGB_TEST
-# define RGBLIGHT_EFFECT_ALTERNATING
-/*== customize breathing effect ==*/
-/*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
-//# define RGBLIGHT_BREATHE_TABLE_SIZE 256 // 256(default) or 128 or 64
-/*==== use exp() and sin() ====*/
-//# define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85 // 1 to 2.7
-//# define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255
+# define RGB_MATRIX_KEYPRESSES // reacts to keypresses
+# define RGBLIGHT_LIMIT_VAL 255
+#endif
+#ifdef RGB_MATRIX_ENABLE
+# define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
+# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255
+// RGB Matrix Animation modes. Explicitly enabled
+// For full list of effects, see:
+// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
+# define ENABLE_RGB_MATRIX_ALPHAS_MODS
+# define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+# define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+# define ENABLE_RGB_MATRIX_BREATHING
+# define ENABLE_RGB_MATRIX_BAND_SAT
+# define ENABLE_RGB_MATRIX_BAND_VAL
+# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+# define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+# define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+# define ENABLE_RGB_MATRIX_CYCLE_ALL
+# define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+# define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+# define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+# define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+# define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+# define ENABLE_RGB_MATRIX_DUAL_BEACON
+# define ENABLE_RGB_MATRIX_RAINBOW_BEACON
+# define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+# define ENABLE_RGB_MATRIX_RAINDROPS
+# define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+# define ENABLE_RGB_MATRIX_HUE_BREATHING
+# define ENABLE_RGB_MATRIX_HUE_PENDULUM
+# define ENABLE_RGB_MATRIX_HUE_WAVE
+# define ENABLE_RGB_MATRIX_PIXEL_RAIN
+# define ENABLE_RGB_MATRIX_PIXEL_FLOW
+# define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
+//# define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+//# define ENABLE_RGB_MATRIX_DIGITAL_RAIN
+// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
+# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+# define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+//# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+//# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+//# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+//# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+//# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+//# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+# define ENABLE_RGB_MATRIX_SPLASH
+//# define ENABLE_RGB_MATRIX_MULTISPLASH
+//# define ENABLE_RGB_MATRIX_SOLID_SPLASH
+//# define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 #endif
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */

diff --git a/keyboards/1upkeyboards/super16v2/keymaps/default/keymap.c b/keyboards/1upkeyboards/super16v2/keymaps/default/keymap.c
@@ -27,8 +27,24 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  [1] = LAYOUT_ortho_4x4( /* Fn Layer */
  RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI,
  RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ RGB_SPD, RGB_SPI, KC_TRNS, KC_TRNS,
  KC_TRNS, KC_TRNS, KC_TRNS, RESET
  ),
 };
 
+bool encoder_update_user(uint8_t index, bool clockwise) {
+ if (index == 0) { /* First encoder */
+ if (clockwise) {
+ tap_code_delay(KC_VOLU, 10);
+ } else {
+ tap_code_delay(KC_VOLD, 10);
+ }
+ } else if (index == 1) { /* Second encoder */
+ if (clockwise) {
+ rgb_matrix_increase_hue();
+ } else {
+ rgb_matrix_decrease_hue();
+ }
+ }
+ return false;
+}
diff --git a/keyboards/1upkeyboards/super16v2/keymaps/mouse/keymap.c b/keyboards/1upkeyboards/super16v2/keymaps/mouse/keymap.c
@@ -0,0 +1,50 @@
+/* Copyright 2022 MechMerlin
+ *
+ * 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:https://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT_ortho_4x4( /* Base */
+ KC_TRNS, KC_DELETE, KC_BACKSPACE, KC_MUTE,
+ KC_P4, KC_P5, KC_P6, KC_PPLS,
+ KC_P1, KC_P2, KC_P3, KC_PSLS,
+ MO(1), KC_P0, KC_PDOT, KC_BTN3
+ ),
+
+ [1] = LAYOUT_ortho_4x4( /* Fn Layer */
+ RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI,
+ RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD,
+ RGB_SPD, RGB_SPI, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, RESET
+ ),
+};
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+ if (index == 0) { /* First encoder */
+ if (clockwise) {
+ tap_code_delay(KC_MS_RIGHT, 10);
+ } else {
+ tap_code_delay(KC_MS_LEFT, 10);
+ }
+ } else if (index == 1) { /* Second encoder */
+ if (clockwise) {
+ tap_code_delay(KC_AUDIO_VOL_UP, 10);
+ } else {
+ tap_code_delay(KC_AUDIO_VOL_DOWN, 10);
+ }
+ }
+ return false;
+}
diff --git a/keyboards/1upkeyboards/super16v2/keymaps/mouse/readme.md b/keyboards/1upkeyboards/super16v2/keymaps/mouse/readme.md
@@ -0,0 +1 @@
+# The default keymap for Super 16 V2
diff --git a/keyboards/1upkeyboards/super16v2/rules.mk b/keyboards/1upkeyboards/super16v2/rules.mk
@@ -14,5 +14,8 @@ 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 = yes # Enable keyboard RGB underglow
+RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
 AUDIO_ENABLE = no # Audio output
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = WS2812
+ENCODER_ENABLE = yes
diff --git a/keyboards/1upkeyboards/super16v2/super16v2.c b/keyboards/1upkeyboards/super16v2/super16v2.c
@@ -15,3 +15,27 @@
  */
 
 #include "super16v2.h"
+
+#ifdef RGB_MATRIX_ENABLE
+led_config_t g_led_config = { {
+ // Key Matrix to LED Index
+ { 3, 2, 1, 0 },
+ { 7, 6, 5, 4 },
+ { 11, 10, 9, 8 },
+ { 15, 14, 13, 12 }
+}, {
+ // LED Index to Physical Position
+ { 28, 12 }, { 84, 12 }, { 140, 12 }, { 196, 12 },
+ { 28, 28 }, { 84, 28 }, { 140, 28 }, { 196, 28 },
+ { 28, 44 }, { 84, 44 }, { 140, 44 }, { 196, 44 },
+ { 28, 60 }, { 84, 60 }, { 140, 60 }, { 196, 60 },
+ { 168, 48 }, { 168, 16 }, { 58, 16 }, { 56, 48 }
+}, {
+ // LED Index to Flag
+ 4, 4, 4, 4,
+ 4, 4, 4, 4,
+ 4, 4, 4, 4,
+ 4, 4, 4, 4,
+ 2, 2, 2, 2,
+} };
+#endif
diff --git a/keyboards/4pplet/waffling60/keymaps/default/keymap.c b/keyboards/4pplet/waffling60/keymaps/default/keymap.c
@@ -20,9 +20,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // main layer
 [0] = LAYOUT_all(
  KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_NO, KC_BSPC,
- KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, 
- KC_LCTRL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, 
- KC_LSFT, KC_NO,  KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_NO,
+ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
+ KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
+ KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1),
  KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_APP, MO(1)),
 // basic function layer
 [1] = LAYOUT_all(