Merge point for 2020 Nov 28 Breaking Change

Split LED_MATRIX_ENABLE into _ENABLE and _DRIVER (#10840 )
Split RGB_MATRIX_ENABLE into _ENABLE and _DRIVER (#10231 )
2020-11-28 06:16:17 -08:00 · 2020-11-28 04:43:31 -08:00 · 2020-11-28 03:23:54 -08:00 · 2020-11-28 22:03:37 +11:00 · 2020-11-28 05:10:43 +00:00 · 2020-11-28 05:04:17 +00:00
29 changed files with 20 additions and 451 deletions
--- a/keyboards/cozykeys/speedo/readme.md
+++ b/keyboards/cozykeys/speedo/readme.md
@@ -8,13 +8,11 @@

 Make example for this keyboard (after setting up your build environment):

-    make cozykeys/speedo/v2:default  # for Speedo v2
-    make cozykeys/speedo/v3:default  # for Speedo v3
+    make speedo:default

 Flashing example for this keyboard:

-    make cozykeys/speedo/v2:default:flash  # for Speedo v2
-    make cozykeys/speedo/v3:default:flash  # for Speedo v3
+    make speedo:default:flash

 See the
 [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and
--- a/keyboards/cozykeys/speedo/speedo.h
+++ b/keyboards/cozykeys/speedo/speedo.h
@@ -17,7 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once

 #ifdef KEYBOARD_cozykeys_speedo_v2
-    #include "v2.h"
+    #include "speedo_v2.h"
 #elif KEYBOARD_cozykeys_speedo_v3
-    #include "v3.h"
+    #include "speedo_v3.h"
 #endif
--- a/keyboards/cozykeys/speedo/v2/speedo_v2.c
+++ b/keyboards/cozykeys/speedo/v2/speedo_v2.c
@@ -14,4 +14,4 @@ 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 "v2.h"
+#include "speedo_v2.h"
--- a/keyboards/cozykeys/speedo/v2/speedo_v2.h
+++ b/keyboards/cozykeys/speedo/v2/speedo_v2.h
--- a/keyboards/cozykeys/speedo/v3/speedo_v3.c
+++ b/keyboards/cozykeys/speedo/v3/speedo_v3.c
@@ -14,4 +14,4 @@ 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 "v3.h"
+#include "speedo_v3.h"
--- a/keyboards/cozykeys/speedo/v3/speedo_v3.h
+++ b/keyboards/cozykeys/speedo/v3/speedo_v3.h
--- a/keyboards/edc40/config.h
+++ b/keyboards/edc40/config.h
@@ -1,50 +0,0 @@
-/* Copyright 2020 OJtheTiny
- *
- * 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
-
-#include "config_common.h"
-
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x4F4A // "OJ"
-#define PRODUCT_ID 0x0002
-#define DEVICE_VER 0x0001
-#define MANUFACTURER OJ
-#define PRODUCT edc40
-
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 12
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
- #define MATRIX_ROW_PINS { D4, D6, D7, F7 }
- #define MATRIX_COL_PINS { B0, B1, B2, B3, D0, D1, D2, D3, D5, B4, B5 }
- #define UNUSED_PINS
-
- #define DIODE_DIRECTION COL2ROW
-
-#define DEBOUNCE 5
-
-#define LOCKING_SUPPORT_ENABLE
-#define LOCKING_RESYNC_ENABLE
-#define RGB_DI_PIN C6
--- a/keyboards/edc40/edc40.c
+++ b/keyboards/edc40/edc40.c
@@ -1,16 +0,0 @@
-/* Copyright 2020 OJtheTiny
- *
- * 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 "edc40.h"
--- a/keyboards/edc40/edc40.h
+++ b/keyboards/edc40/edc40.h
@@ -1,31 +0,0 @@
-/* Copyright 2020 OJtheTiny
- *
- * 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
-
-#include "quantum.h"
-
-#define LAYOUT( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, \
-    K100,  K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, \
-    K200,    K201, K202, K203, K204, K205, K206, K207, K208,    K210, \
-    K300, K301,                      K305,                K308, K310 \
-) \
-{ \
-    {K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011}, \
-    {K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, KC_NO, K110}, \
-    {K200, K201, K202, K203, K204, K205, K206, K207, K208, KC_NO, KC_NO, K210}, \
-    {K300, K301, KC_NO, KC_NO, KC_NO, K305, KC_NO, KC_NO, K308, KC_NO, K310} \
-}
--- a/keyboards/edc40/info.json
+++ b/keyboards/edc40/info.json
@@ -1,54 +0,0 @@
-{
-    "keyboard_name": "edc40",
-    "url": "",
-    "maintainer": "ojthetiny",
-    "width": 12,
-    "height": 4,
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-
-                {"x": 0, "y": 1, "w":1.25},
-                {"x": 1.25, "y": 1},
-                {"x": 2.25, "y": 1},
-                {"x": 3.25, "y": 1},
-                {"x": 4.25, "y": 1},
-                {"x": 5.25, "y": 1},
-                {"x": 6.25, "y": 1},
-                {"x": 7.25, "y": 1},
-                {"x": 8.25, "y": 1},
-                {"x": 9.25, "y": 1},
-                {"x": 10.25, "y": 1, "w":1.75},
-
-                {"x": 0, "y": 2, "w":1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2, "w":2.25},
-
-                {"x": 0, "y": 3, "w":1.25},
-                {"x": 1.25, "y": 3, "w":1.25},
-                {"x": 2.5, "y": 3, "w":7},
-                {"x": 9.5, "y": 3, "w":1.25},
-                {"x": 10.75, "y": 3, "w":1.25}
-            ]
-        }
-    }
-}
--- a/keyboards/edc40/keymaps/default/keymap.c
+++ b/keyboards/edc40/keymaps/default/keymap.c
@@ -1,43 +0,0 @@
-/* Copyright 2020 OJtheTiny
- *
- * 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 layers{
-    L0,
-    L1,
-    L2
-};
-
-const uint16_t PROGMEM keymaps [][MATRIX_ROWS][MATRIX_COLS] = {
-    [L0] = LAYOUT( /* Base Layer */
-      KC_ESC,  KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
-      KC_CAPS,  KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L,    KC_ENT,
-      KC_LSFT,   KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM,    KC_DOT,
-      KC_LCTL,  KC_LGUI,             LT(L1, KC_SPC),              KC_RALT, MO(L2)
-    ),
-    [L1] = LAYOUT( /* Num Layer */
-      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_LEFT, KC_UP, KC_DOWN, KC_RGHT,      KC_BSLS,
-      _______,   _______, _______, KC_PSCR, _______, _______, KC_LBRC, KC_RBRC, KC_MINS,      KC_SLSH,
-      _______, _______,                             _______,                        _______, KC_EQL
-    ),
-    [L2] = LAYOUT( /* F-Keys */
-      _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,      KC_F10,     KC_F11,
-      _______,  KC_MPRV, KC_MPLY, KC_MNXT, _______, _______,  _______, _______, KC_SCLN, KC_QUOT,    KC_ENT,
-      _______,    KC_VOLD,  _______,  KC_VOLU, _______, _______, _______, _______, _______,            _______,
-      _______, _______,                              _______,                           _______, _______
-    )
-};
--- a/keyboards/edc40/keymaps/default/readme.md
+++ b/keyboards/edc40/keymaps/default/readme.md
@@ -1 +0,0 @@
-# default keymap for edc40
--- a/keyboards/edc40/keymaps/oj/keymap.c
+++ b/keyboards/edc40/keymaps/oj/keymap.c
@@ -1,94 +0,0 @@
-/* Copyright 2020 OJtheTiny
- *
- * 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 layers{
-  _QW,
-  _DV,
-  _CM,
-  _L1,
-  _L2,
-  _L3
-};
-enum custom_keycodes {
-    DVORAK = SAFE_RANGE,
-    QWERTY,
-    COLEMAK
-};
-
-
-const uint16_t PROGMEM keymaps [][MATRIX_ROWS][MATRIX_COLS] = {
-    [_QW] = LAYOUT( /* Qwerty */
-      KC_ESC,  KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
-      KC_LCTL,  KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L,    KC_ENT,
-      KC_LSFT,   KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM,    KC_DOT,
-      KC_TAB,  KC_LGUI,                  KC_SPC,              MO(_L1), MO(_L2)
-    ),
-    [_DV] = LAYOUT( /* Dvorak */
-      KC_ESC, KC_SLSH, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_QUOT,
-      KC_LCTL, KC_A,    KC_O,    KC_E,   KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S,
-      KC_LSFT,   KC_Q,    KC_J,   KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z,
-      KC_TAB,  KC_LGUI,                         KC_SPC,                       MO(_L1), MO(_L2)
-    ),
-    [_CM] = LAYOUT( /* Colemak */
-      KC_ESC, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_QUOT,
-      KC_LCTL, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O,
-      KC_LSFT,   KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM,    KC_DOT,
-      KC_TAB, KC_LGUI,                  KC_SPC,              MO(_L1), MO(_L2)
-    ),
-    [_L1] = LAYOUT( /* NUM */
-      KC_GRV, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,  KC_8,    KC_9,    KC_0,    KC_MINUS,
-      _______, _______, _______, _______, _______, KC_LEFT, KC_UP, KC_DOWN, KC_RGHT, KC_SCLN,      KC_BSLS,
-      _______,   _______, _______, KC_PSCR, _______, _______, KC_LBRC, KC_RBRC, KC_MINUS,      KC_EQL,
-      _______, _______,                             _______,                        _______, _______
-    ),
-    [_L2] = LAYOUT( /* F Keys */
-      _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,      KC_F10,     KC_F11,
-      _______,  KC_MPRV, KC_MPLY, KC_MNXT, _______, _______,  _______, _______, UC(0xc3b6), UC(0xc3a4),    KC_ENT,
-      _______,    QWERTY,  DVORAK,  COLEMAK, TG(_L3), _______, _______, _______, _______,            _______,
-      _______, _______,                              _______,                           _______, _______
-    ),
-    [_L3] = LAYOUT( /*Gaming */
-    KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5,    _______, KC_F1, KC_F2, KC_F3, KC_F4, _______,
-    KC_TAB,  KC_Q, KC_W, KC_E, KC_R, _______,  KC_F5, KC_F6, KC_F7, KC_F8,    _______,
-    KC_LCTL,   KC_A, KC_S, KC_D, KC_F, KC_G, _______, _______, _______,       _______,
-    KC_LSFT, KC_B,                    KC_SPC,                      MO(_L2), _______
-    )
-};
-
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-      switch(keycode) {
-        case DVORAK:
-          if (record->event.pressed) {
-            set_single_persistent_default_layer(_DV);
-          }
-          return false;
-        case QWERTY:
-          if (record->event.pressed) {
-            set_single_persistent_default_layer(_QW);
-          }
-          return false;
-        case COLEMAK:
-          if (record->event.pressed) {
-            set_single_persistent_default_layer(_CM);
-          }
-          return false;
-        default:
-          return true;
-      }
-    return true;
-};
--- a/keyboards/edc40/keymaps/oj/readme.md
+++ b/keyboards/edc40/keymaps/oj/readme.md
@@ -1 +0,0 @@
-# Objectively the best keymap for EDC40
--- a/keyboards/edc40/readme.md
+++ b/keyboards/edc40/readme.md
@@ -1,13 +0,0 @@
-# EDC40
-
-An everyday carry 40% keyboard
-
-* Keyboard Maintainer: [OJ](https://github.com/ojthetiny)
-* Hardware Supported: EDC40 PCB
-* Hardware Availabilty: TeslaSkeys
-
-Make example for this keyboard (after setting up your build environment):
-
-    make edc40:default
-
-See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
--- a/keyboards/edc40/rules.mk
+++ b/keyboards/edc40/rules.mk
@@ -1,23 +0,0 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = full     # Virtual DIP switch configuration
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-NKRO_ENABLE = yes           # USB Nkey Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-BLUETOOTH_ENABLE = no       # Enable Bluetooth
-AUDIO_ENABLE = no           # Audio output
-UNICODE_ENABLE = yes
--- a/keyboards/kbdfans/kbd67/rev2/keymaps/via/config.h
+++ b/keyboards/kbdfans/kbd67/rev2/keymaps/via/config.h
@@ -0,0 +1 @@
+#define DYNAMIC_KEYMAP_LAYER_COUNT 2
--- a/keyboards/kbdfans/kbd67/rev2/keymaps/via/keymap.c
+++ b/keyboards/kbdfans/kbd67/rev2/keymaps/via/keymap.c
@@ -1,19 +1,3 @@
-/* Copyright 2020 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://www.gnu.org/licenses/>. 
-  */
-
 #include QMK_KEYBOARD_H

 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
@@ -57,21 +41,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,          _______, _______,
  _______,          _______, _______, _______, _______, _______, _______, _______, KC_END,  KC_PGDN, KC_DOWN, _______, KC_PGUP, _______,
  _______, _______, _______,                            _______,                   _______, _______, _______, KC_HOME, KC_PGDN, KC_END
-),
-
-[2] = LAYOUT_65_ansi(
-  _______, _______,   _______, _______,   _______, _______,   _______, _______,   _______, _______,   _______, _______,  _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
-  _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______,                            _______,                   _______, _______, _______, _______, _______, _______
-), 
-
-[3] = LAYOUT_65_ansi(
-  _______, _______,   _______, _______,   _______, _______,   _______, _______,   _______, _______,   _______, _______,  _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
-  _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______,                            _______,                   _______, _______, _______, _______, _______, _______
-), 
+)
 };
--- a/keyboards/lucid/phantom_hs/readme.md
+++ b/keyboards/lucid/phantom_hs/readme.md
@@ -1,4 +1,4 @@
-# Phantom Hotswap PCB by Lucid
+# bolsa65

 The following is the QMK Firmware for the Phantom Hotswap PCB for [LucidKB](http://www.lucidkb.cm).
 ---
--- a/keyboards/ymdk/bface/config.h
+++ b/keyboards/ymdk/bface/config.h
@@ -17,8 +17,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 #pragma once

-#define VENDOR_ID       0x594D // "YM"
-#define PRODUCT_ID      0x4266 // "Bf"
+#define VENDOR_ID       0x20A0
+#define PRODUCT_ID      0x422D
 #define DEVICE_VER      0x0200
 #define MANUFACTURER    YMDK
 #define PRODUCT         B.face
--- a/keyboards/ymdk/bface/keymaps/via/keymap.c
+++ b/keyboards/ymdk/bface/keymaps/via/keymap.c
@@ -1,53 +0,0 @@
-/*
-Copyright 2019 Ethan Durrant (emdarcher)
-
-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 
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    //Base Layer
-    [0] = LAYOUT_all(
-        KC_GESC,   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_CAPS,     KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,KC_SCLN,KC_QUOT, KC_NO, 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_NO,        KC_RSFT, KC_NO,
-        KC_LCTL,   KC_LGUI,KC_LALT, KC_NO,                KC_SPC,                  KC_NO,    KC_RALT,MO(1),KC_NO,KC_MENU,KC_RCTL
-    ),
-    //Layer 1
-    [1] = LAYOUT_all(
-        KC_GRV,   KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9, KC_F10, KC_F11, KC_F12,KC_NO,RESET,
-        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_NO,KC_TRNS,
-        KC_TRNS,KC_NO,KC_TRNS,KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_NO,        KC_TRNS, KC_NO,
-        KC_TRNS,KC_TRNS,KC_TRNS, KC_NO,               KC_TRNS,               KC_NO,         KC_TRNS,KC_TRNS,KC_NO,KC_TRNS,KC_TRNS
-    ),
-    //Layer 2
-    [2] = LAYOUT_all(
-        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_NO,KC_TRNS,
-        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_NO,KC_TRNS,
-        KC_TRNS,KC_NO,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_NO,       KC_TRNS, KC_NO,
-        KC_TRNS,KC_TRNS,KC_TRNS, KC_NO,               KC_TRNS,                 KC_NO,       KC_TRNS,KC_TRNS,KC_NO,KC_TRNS,KC_TRNS
-    ), 
-    //Layer 3
-    [3] = LAYOUT_all(
-        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_NO,KC_TRNS,
-        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_NO,KC_TRNS,
-        KC_TRNS,KC_NO,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_NO,       KC_TRNS, KC_NO,
-        KC_TRNS,KC_TRNS,KC_TRNS, KC_NO,               KC_TRNS,                 KC_NO,       KC_TRNS,KC_TRNS,KC_NO,KC_TRNS,KC_TRNS
-    ), 
-};
--- a/keyboards/ymdk/bface/keymaps/via/rules.mk
+++ b/keyboards/ymdk/bface/keymaps/via/rules.mk
@@ -1,2 +0,0 @@
-VIA_ENABLE = yes
-LTO_ENABLE = yes
--- a/layouts/community/ergodox/ab/keymap.c
+++ b/layouts/community/ergodox/ab/keymap.c
@@ -89,10 +89,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS,
 	KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,
 	KC_TRNS, KC_TRNS, KC_BTN1, KC_BTN3, KC_BTN2, KC_TRNS, KC_TRNS,
-	RESET, KC_TRNS, ZM_NRM,  ZM_OUT,  ZM_IN,
+	KC_TRNS, KC_TRNS, ZM_NRM,  ZM_OUT,  ZM_IN,
 	KC_TRNS, KC_TRNS,
 	KC_TRNS,
-	KC_TRNS, KC_TRNS, KC_TRNS,
+	RESET,   KC_TRNS, KC_TRNS,
 	// Right hand
 	KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_BSPC,
 	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
--- a/lib/python/qmk/tests/test_cli_commands.py
+++ b/lib/python/qmk/tests/test_cli_commands.py
@@ -34,7 +34,7 @@ def test_compile():


 def test_compile_json():
-    result = check_subcommand('compile', '-kb', 'handwired/onekey/pytest', '-km', 'default_json', '-n')
+    result = check_subcommand('compile', '-kb', 'handwired/onekey/pytest', '-km', 'default_json')
    check_returncode(result)


--- a/shell.nix
+++ b/shell.nix
@@ -16,25 +16,6 @@ let
      inherit pname version;
      sha256 = "1yaimcgz8w0ps1wk28wk9g9zdidp79d14xqqj9rjkvxalvx2f5qx";
    };
-
-    doCheck = false;
-  };
-
-  milc = with pkgs.python3Packages; buildPythonPackage rec {
-    pname = "milc";
-    version = "1.0.10";
-
-    src = fetchPypi {
-      inherit pname version;
-      sha256 = "1q1p7qrqk78mw67nhv04zgxaq8himmdxmy2vp4fmi7chwgcbpi32";
-    };
-
-    propagatedBuildInputs = [
-      appdirs
-      argcomplete
-      colorama
-    ];
-
    doCheck = false;
  };

@@ -44,7 +25,6 @@ let
    argcomplete
    colorama
    hjson
-    milc
    pygments
    # requirements-dev.txt
    nose2
--- a/tmk_core/common/timer.h
+++ b/tmk_core/common/timer.h
@@ -45,8 +45,8 @@ uint16_t timer_elapsed(uint16_t last);
 uint32_t timer_elapsed32(uint32_t last);

 // Utility functions to check if a future time has expired & autmatically handle time wrapping if checked / reset frequently (half of max value)
-#define timer_expired(current, future) ((uint16_t)(current - future) < UINT16_MAX / 2)
-#define timer_expired32(current, future) ((uint32_t)(current - future) < UINT32_MAX / 2)
+#define timer_expired(current, future) (((uint16_t)current - (uint16_t)future) < 0x8000)
+#define timer_expired32(current, future) (((uint32_t)current - (uint32_t)future) < 0x80000000)

 #ifdef __cplusplus
 }
--- a/util/travis_build.sh
+++ b/util/travis_build.sh
@@ -2,6 +2,8 @@

 source util/travis_utils.sh

+NUM_CORE_CHANGES=$(echo "$QMK_CHANGES" | grep -Ecv -e '^(docs/)' -e '^(keyboards/)' -e '^(layouts/)' -e '^(util/)' -e '^(lib/python/)' -e '^(bin/qmk)' -e '^(requirements.txt)' -e '(.travis.yml)')
+
 if [[ "$TRAVIS_COMMIT_MESSAGE" == *"[skip build]"* ]]; then
    echo "Skipping due to commit message"
    exit 0
--- a/util/travis_test.sh
+++ b/util/travis_test.sh
@@ -2,6 +2,8 @@

 source util/travis_utils.sh

+NUM_CORE_CHANGES=$(echo "$QMK_CHANGES" | grep -Ecv -e '^(docs/)' -e '^(keyboards/)' -e '^(layouts/)' -e '^(util/)' -e '^(lib/python/)' -e '^(bin/qmk)' -e '^(requirements.txt)' -e '(.travis.yml)')
+
 if [[ "$TRAVIS_COMMIT_MESSAGE" == *"[skip test]"* ]]; then
    echo "Skipping due to commit message"
    exit 0
--- a/util/travis_utils.sh
+++ b/util/travis_utils.sh
@@ -12,7 +12,6 @@ TRAVIS_COMMIT_RANGE="${TRAVIS_COMMIT_RANGE:-HEAD~1..HEAD}"
 # Extra variables
 LOCAL_BRANCH=$(git rev-parse --abbrev-ref HEAD)
 QMK_CHANGES=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE})
-NUM_CORE_CHANGES=$(echo "$QMK_CHANGES" | grep -Ec -e '^Makefile' -e '^[^/]*.mk' -e '^drivers/' -e '^lib/atsam' -e '^lib/lib8tion/' -e '^platforms' -e '^quantum' -e '^tests' -e '^tmk_core')

 # if docker is installed - patch calls to within the qmk docker image
 if command -v docker >/dev/null; then
Author	SHA1	Message	Date
James Young	9b851ea9c2	Merge point for 2020 Nov 28 Breaking Change	2020-11-28 06:16:17 -08:00
Ryan	7baa37c3df	Split LED_MATRIX_ENABLE into _ENABLE and _DRIVER (#10840 )	2020-11-28 04:43:31 -08:00
Ryan	2e642699f7	Split RGB_MATRIX_ENABLE into _ENABLE and _DRIVER (#10231 )	2020-11-28 03:23:54 -08:00
Ryan	6b3e56b889	Rename ledmatrix.h to match .c file (#7949 )	2020-11-28 22:03:37 +11:00
QMK Bot	8fc8a940b9	Merge remote-tracking branch 'origin/master' into develop	2020-11-28 05:10:43 +00:00
QMK Bot	29e814ea2c	Merge remote-tracking branch 'origin/master' into develop	2020-11-28 05:04:17 +00:00
QMK Bot	c9e2690702	Merge remote-tracking branch 'origin/master' into develop	2020-11-27 18:05:44 +00:00
Dean Scarff	fd8f65959e	Auto shift: support repeats and early registration (#9826 ) Fixes #7048. Co-authored-by: IsaacElenbaas <isaacelenbaas@gmail.com>	2020-11-27 08:35:22 -08:00
QMK Bot	63a06fe220	Merge remote-tracking branch 'origin/master' into develop	2020-11-26 14:38:31 +00:00
QMK Bot	1528359a7d	Merge remote-tracking branch 'origin/master' into develop	2020-11-26 12:44:48 +00:00
QMK Bot	3a3571ca1e	Merge remote-tracking branch 'origin/master' into develop	2020-11-26 12:17:10 +00:00
QMK Bot	9e9b979c6c	Merge remote-tracking branch 'origin/master' into develop	2020-11-26 12:16:24 +00:00
QMK Bot	2076d1cab6	Merge remote-tracking branch 'origin/master' into develop	2020-11-25 22:09:09 +00:00
QMK Bot	675caef987	Merge remote-tracking branch 'origin/master' into develop	2020-11-25 21:27:44 +00:00
QMK Bot	4b4fe1b4b9	Merge remote-tracking branch 'origin/master' into develop	2020-11-25 19:05:29 +00:00
QMK Bot	b14e131ba7	Merge remote-tracking branch 'origin/master' into develop	2020-11-25 18:56:33 +00:00
QMK Bot	2d1a29b7d3	Merge remote-tracking branch 'origin/master' into develop	2020-11-25 18:48:50 +00:00
QMK Bot	d2f965b837	Merge remote-tracking branch 'origin/master' into develop	2020-11-25 18:37:26 +00:00
QMK Bot	1180213509	Merge remote-tracking branch 'origin/master' into develop	2020-11-25 18:27:53 +00:00
QMK Bot	37a2387aad	Merge remote-tracking branch 'origin/master' into develop	2020-11-25 18:25:30 +00:00
QMK Bot	537291adde	Merge remote-tracking branch 'origin/master' into develop	2020-11-25 18:09:50 +00:00
QMK Bot	71a49dfccb	Merge remote-tracking branch 'origin/master' into develop	2020-11-25 18:05:36 +00:00
QMK Bot	b839674d83	Merge remote-tracking branch 'origin/master' into develop	2020-11-25 17:14:32 +00:00
QMK Bot	a69d684ce9	Merge remote-tracking branch 'origin/master' into develop	2020-11-25 17:00:41 +00:00
QMK Bot	cc63130756	Merge remote-tracking branch 'origin/master' into develop	2020-11-25 16:58:44 +00:00
QMK Bot	745e6874b3	Merge remote-tracking branch 'origin/master' into develop	2020-11-25 16:53:43 +00:00
QMK Bot	f250c01bba	Merge remote-tracking branch 'origin/master' into develop	2020-11-24 20:12:06 +00:00
QMK Bot	49b3aafdaf	Merge remote-tracking branch 'origin/master' into develop	2020-11-24 13:46:54 +00:00
QMK Bot	2b97c20837	Merge remote-tracking branch 'origin/master' into develop	2020-11-24 09:59:58 +00:00
QMK Bot	50b45128db	Merge remote-tracking branch 'origin/master' into develop	2020-11-23 19:47:41 +00:00
QMK Bot	b6bb2b86c7	Merge remote-tracking branch 'origin/master' into develop	2020-11-23 07:58:06 +00:00
QMK Bot	ddf1adea5e	Merge remote-tracking branch 'origin/master' into develop	2020-11-22 21:25:45 +00:00
QMK Bot	7d0c713432	Merge remote-tracking branch 'origin/master' into develop	2020-11-22 21:22:26 +00:00
QMK Bot	866f853bff	Merge remote-tracking branch 'origin/master' into develop	2020-11-22 21:13:12 +00:00
Zach White	ac3b7d79e0	Merge remote-tracking branch 'origin/master' into develop Resolved Conflicts: keyboards/kc60/rules.mk keyboards/xd96/rules.mk lib/python/qmk/cli/__init__.py	2020-11-22 08:28:53 -08:00
Drashna Jaelre	9e32e9be46	Add AT90USB support for serial.c (#10706 ) * Expand list of supported controllers for serial.c * Fix pin defines based on mtei's feedback * Fix EICRx checks in soft_serial_target_init * Fix copy-paste typo * Add defines for EICRx	2020-11-18 16:49:44 -08:00
Nick Brassel	f63e3e12b9	Allow for certain code in the codebase assuming length of string. (#10974 )	2020-11-19 05:54:01 +11:00
Nick Brassel	4ef4965b02	Fixup version.h writing when using SKIP_VERSION=yes (#10972 )	2020-11-19 05:34:22 +11:00
Dave Allie	f7ae095473	Fix cursor position bug in oled_write_raw functions (#10800 ) The documentation for these APIs say that they write to the buffer from the current current position, but they would always write from the start of the buffer irrespective of the current cursor.	2020-11-15 11:46:57 -08:00
Xelus22	0bfec7bf6f	[Keyboard] Add Valor FRL TKL (+refactor) (#10512 ) * frl tkl * refator * removebootloaderfile * zvecr recommended changes * fix default keymap * Update keyboards/xelus/valor/frl_tkl/keymaps/default/config.h Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/xelus/valor/frl_tkl/keymaps/via/config.h Co-authored-by: Joel Challis <git@zvecr.com> * remove accidental * move frl tkl to its own keyboard * fixup readme Co-authored-by: Joel Challis <git@zvecr.com>	2020-11-15 10:51:07 -08:00
James Young	e3a2407b17	Remove HD44780 References, Part 4 (#10735 ) * remove HD44780_ENABLE rules: I-M * remove HD44780_ENABLE config: I-M * remove HD44780_ENABLE rules: N-S * remove HD44780_ENABLE config: N-S * remove HD44780_ENABLE rules: T-Z * remove HD44780_ENABLE config: T-Z	2020-11-15 08:35:14 -08:00
yulei	55e2a42047	update chibios os usb for the otg driver (#8893 ) * add support for otg * update endpoint numbering for stm32f4 * removed testing file * add DEBUG_MATRIX_SCAN_RATE_ENABLE to common_features.mk (#10824) Add a Make variable to easily enable DEBUG_MATRIX_SCAN_RATE on the command line. eg. ``` make DEBUG_MATRIX_SCAN_RATE_ENABLE=yes KEYBOARD:KEYMAP ``` * [Core] Added `add_oneshot_mods` & `del_oneshot_mods` (#10549) * Added `add_oneshot_mods` & `del_oneshot_mods` Deleted undefined and unused prototypes: - void oneshot_enable(void) - void oneshot_disable(void) - void oneshot_toggle(void) Reordered the oneshot functions to follow the same order as other mod functions, that is to say : get, add, del, set, clear * Stricter conditions on add_oneshot_mods & del_oneshot_mods Prevent extending the one shot timer if the called add_oneshot_mods or del_oneshot_mods do not change anything to the current one shot mod state. Co-authored-by: David Kosorin <david@kosorin.net> Co-authored-by: David Kosorin <david@kosorin.net> * add support for otg * update endpoint numbering for stm32f4 * removed testing file * added missing #endif Co-authored-by: Takeshi ISHII <2170248+mtei@users.noreply.github.com> Co-authored-by: precondition <57645186+precondition@users.noreply.github.com> Co-authored-by: David Kosorin <david@kosorin.net>	2020-11-11 03:17:42 +11:00
precondition	3dcb0463ad	[Core] Added `add_oneshot_mods` & `del_oneshot_mods` (#10549 ) * Added `add_oneshot_mods` & `del_oneshot_mods` Deleted undefined and unused prototypes: - void oneshot_enable(void) - void oneshot_disable(void) - void oneshot_toggle(void) Reordered the oneshot functions to follow the same order as other mod functions, that is to say : get, add, del, set, clear * Stricter conditions on add_oneshot_mods & del_oneshot_mods Prevent extending the one shot timer if the called add_oneshot_mods or del_oneshot_mods do not change anything to the current one shot mod state. Co-authored-by: David Kosorin <david@kosorin.net> Co-authored-by: David Kosorin <david@kosorin.net>	2020-11-10 20:27:35 +11:00
Takeshi ISHII	28d6b9d7be	add DEBUG_MATRIX_SCAN_RATE_ENABLE to common_features.mk (#10824 ) Add a Make variable to easily enable DEBUG_MATRIX_SCAN_RATE on the command line. eg. ``` make DEBUG_MATRIX_SCAN_RATE_ENABLE=yes KEYBOARD:KEYMAP ```	2020-11-10 19:03:15 +11:00
Xelus22	2098d98e57	Refactor xelus/dawn60 for Rev2 later (#10584 ) * refactor for rev2 incoming * fix cr * Update keyboards/xelus/dawn60/rev1/config.h * Update keyboards/xelus/dawn60/dawn60.h * Update keyboards/xelus/dawn60/config.h * Update keyboards/xelus/dawn60/dawn60.h * fix tabs * small update	2020-11-09 15:05:49 -08:00
Xelus22	7d836cba12	aeboards/ext65 refactor (#10820 ) * ext65 refactor * Update rev2.c * update keymap * Update keyboards/aeboards/ext65/readme.md * update with suggestions	2020-11-09 12:57:44 -08:00
Rodolphe Belouin	38527f9a3b	Add step sequencer feature (#9703 ) * sequencer: create togglable feature * sequencer: add support for steps * sequencer: add support for tempo and resolutions * sequencer: schedule a message print at the right frequency * sequencer: send a hardcoded note * sequencer: add support for 8 tracks * sequencer: play several notes simultaneously * sequencer: only play the active tracks for a given step * sequencer: change the default behavior of the track toggler * sequencer: make number of tracks and track notes customizable * sequencer: move the keycodes down Not adding them at the end of the list apparently risks breaking compatibility with VIA. Source: https://github.com/qmk/qmk_firmware/pull/9703#discussion_r459202733 * sequencer: add unit tests * sequencer: add unit test for matrix_scan_sequencer * sequencer: expose internal state for better unit-testability * sequencer: add unit tests for matrix_scan_sequencer	2020-11-07 19:35:14 -08:00
Leo Deng	4cdd3005d6	[quantum] combine repeated lines of code (#10837 )	2020-11-02 20:32:00 +00:00
Evy Dekkers	b968a53c7e	Maartenwut/Maarten namechange to evyd13/Evy (#10274 )	2020-11-01 09:40:51 -08:00
Paul Ewing	c3221d4e71	[Keyboard] Update the Speedo firmware for v3.0 (#10657 ) * Update the Speedo firmware for v3.0 * Cleanup recommendations from the PR checklist * Address PR feedback * Update build instructions in readme * Restructure folders and restore v2 firmware * Clean up layouts in info.json * Remove unnecessary files * Address more PR feedback	2020-10-30 13:23:08 -07:00
Nick Brassel	991c75081c	qmk cformat (#10767 )	2020-10-30 13:23:07 -07:00
Takeshi ISHII	75a18e69f9	Some GPIO manipulations in matrix.c change to atomic. (#10491 ) * Changed the processing of select_xxx()/unselect_xxx() in quantum/matrix.c to be atomic. * Changed the processing of select_xxx()/unselect_xxx() in quantum/split_common/matrix.c to be atomic. * update matrix.c * add ATOMIC_BLOCK_FORCEON macro to quantum/quantum_atomic_extend.h * quantum_atomic_extend.h's contents move into quantum.h * update ATOMIC_BLOCK_xxx for unknown platform * ATOMIC_BLOCK macro support PROTOCOL_ARM_ATSAM * Add Atomic Operation section in docs/internals_gpio_control.md	2020-10-30 13:23:06 -07:00
XScorpion2	69d8bbf1f4	Minor change to behavior allowing display updates to continue between task ticks (#10750 )	2020-10-30 13:23:05 -07:00
MakotoKurauchi	3ede17e729	Reduce Helix keyboard build variation (#8669 ) * modify helix config. 'helix/rev2' always OLED on * reduce helix build variation pattern * helix/rev2/keymaps/xulkal/rules.mk: Explicitly disable helix standard post-processing Compilation result does not change * helix readmes update * add temporary test script * test end. -- Revert "add temporary test script" This reverts commit 6229ed41f2ff8bac52015150837eaa51d9815e13. * rename rev2/split_common/rules.mk -> rev2/sc/rules.mk * rename pico/split_common/rules.mk -> pico/sc/rules.mk * update keymaps/default/reademe.md * add 'helix/pico/qmk_conf' and 'helix/rev2/qmk_conf' target * add ChangeLog for Helix: PR 8669 * fix helix/pico/qmk_conf compile error Co-authored-by: mtei <2170248+mtei@users.noreply.github.com>	2020-10-30 13:23:04 -07:00
Nick Brassel	f22a61e7e9	Rescale both ChibiOS and AVR backlighting.	2020-10-30 13:23:04 -07:00
Nick Brassel	c4ecae1d77	Add housekeeping task callbacks so that keyboards/keymaps are capable of executing code for each main loop iteration. (#10530 )	2020-10-30 13:23:03 -07:00
Nick Brassel	de4cbe34ff	Allow for modification of output RGB values when using rgblight/rgb_matrix. (#10638 )	2020-10-30 13:23:02 -07:00
ridingqwerty	daea43debf	New feature: Retro Tapping per key (#10622 )	2020-10-30 13:23:01 -07:00
Nick Brassel	c1295a3557	Add definition based on currently-selected serial driver. (#10716 ) * Add definition based on currently-selected serial driver. * Apply suggestions from code review Suggestions from zvecr. Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Joel Challis <git@zvecr.com>	2020-10-30 13:23:00 -07:00
Takeshi ISHII	12be012e3d	OLED display update interval support (#10388 ) * add OLED_UPDATE_INTERVAL_MS support * update docs/feature_oled_driver.md * Update docs/feature_oled_driver.md Co-authored-by: Joel Challis <git@zvecr.com> * Update drivers/oled/oled_driver.c * Update drivers/oled/oled_driver.c Co-authored-by: Joel Challis <git@zvecr.com>	2020-10-30 13:20:54 -07:00
Ryan	94fea35e18	XD75 cleanup (#10524 ) * XD75 cleanup * LAYOUT-ify keymaps	2020-10-30 13:15:51 -07:00
Purdea Andrei	c904520f72	Haptic and solenoid cleanup (#9700 ) * solenoid: remove two functions that do nothing. These functions modify the argument, and so they do nothing. Note: versions of these functions exist in mtdjr's user folder, however to core solenoid support and mtdjr user-specific solenoid support are exclusive (only one can be used at a time). So removing these confusing functions does no harm. * solenoid: bugfix: don't allow dwell time to go 1ms below minimum time. The previous code allowed dwell time to go 1ms below the configured minimum. This change corrects it. * solenoid: bugfix: when incrementing above maximum dwell time, jump back to minimum, not to 1 The previous code used to jump back to 1, which might be way under the configured minimum setting. * solenoid: bugfix: on startup actually use the eeprom-stored dwell-time This is because the dwell time is stored in two variables. * solenoid: bugfix: on haptic_reset, actually use the newly set default dwell time. This is needed because dwell time is configured in two variables. * solenoid: on HPT_RST set buzz to a default value * solenoid: buzz: reworked to make more configurable. Previous behaviour maintained. * solenoid: documentation: clarify meaning of dwell time * solenoid: add feature SOLENOID_DWELL_STEP_SIZE * solenoid: documentation: added note about the precision of the solenoid time settings * haptic: Correctly call haptic_reset when eeprom is corrupt. * haptic: improve what happens if haptic is enabled without erasing eeprom * haptic: improve what happens if solenoid is enabled without erasing eeprom * drivers/haptic: fix compilation issue, when haptic is enabled, but solenoid isn't	2020-10-30 13:15:50 -07:00
Nick Brassel	2e1232c6bd	ChibiOS upgrade: configuration file migrator (#9952 ) * Initial commit for ChibiOS conf migration. * Modify paths, normalise chconf.h and halconf.h to be common. * Allow deletion of non-overridden files.	2020-10-30 13:15:49 -07:00
Nick Brassel	46d7b25e4d	ChibiOS upgrade: early init conversions (#10214 ) * Migrate at_at/660m to use new ChibiOS early initialisation code, use generic F072 board. * Migrate cannonkeys/satisfaction75 to use new ChibiOS early initialisation code, use generic F072 board. * Migrate nebula12 to use new ChibiOS early initialisation code, use generic F072 board. * Defer GENERIC_STM32_F072XB board files to ChibiOS. * Create generic mcuconf.h file for GENERIC_STM32_F072XB. * Create generic mcuconf.h file for STM32_F103_STM32DUINO. * Create generic mcuconf.h file for GENERIC_STM32_F042X6. * Allow boards to override EARLY_INIT_PERFORM_BOOTLOADER_JUMP.	2020-10-30 13:15:48 -07:00
Zach White	fa6bd5cbe5	Add milc as a dependency and remove the installed milc (#10563 ) * Add milc as a dependency and remove the installed milc * update doctor.py too * pyformat * remove rather than shim questions	2020-10-30 13:15:47 -07:00
Nick Brassel	53f2b5b944	Support for STM32 GPIOF,G,H,I,J,K (#10206 ) * Add GPIOF/GPIOH. * Also add GPIOI,GPIOJ,GPIOK, to match ChibiOS 20.x. * Make GPIOK opt-in, describe what a keyboard designer needs to do in order to gain access.	2020-10-30 13:15:46 -07:00
Nick Brassel	46869ddc7e	Naming change.	2020-10-30 13:15:45 -07:00
Drashna Jaelre	08caa7afd6	Add advanced/efficient RGB Matrix Indicators (#8564 ) * Add Advanced RGB Matrix effects Add a new option, so that we can better handle custom indicators * Switch to led min/max instead of params Because params has already been incremented and is wrong now * Add indicator color function for use with advanced indicator functions * Add docs and helper macros * Add comment for explanations * Fix macro variables * Fix typo * Run clang-format on rgb_matrix.h	2020-10-30 13:15:44 -07:00
LSChyi	b1a6b161f3	Add hotfix for chibios keyboards not wake (#10088 )	2020-10-30 13:15:43 -07:00
Manna Harbour	eecedf0db5	Share button state from mousekey to pointing_device (#10179 ) * Branch point for 2020 November 28 Breaking Change Update readme.md * Share button state from mousekey to pointing_device Co-authored-by: Nick Brassel <nick@tzarc.org> Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> Co-authored-by: Nick Brassel <nick@tzarc.org>	2020-10-30 13:15:42 -07:00
Ryan	310662fce9	Per-encoder resolutions (#10259 ) * Per-encoder resolutions * Resolutions for right hand	2020-10-30 13:15:41 -07:00
seb-pau	f728c249ce	Joystick 16-bit support (#10439 ) * Joystick 16-bit support * Add variable joystick axes resolution * Moved #define statements to .h files * Moved definitions to quantum/joystick.h Removed duplicate definitions from usb_descriptor.h and process_joysick.h Adjust process_joystick.c and usb_descriptor.c to use the pre-computed "JOYSTICK_RESOLUTION" value which contains the logical maximum value of a joystick axis * Cleaning up unnecessary code * Update docs/feature_joystick.md Co-authored-by: Ryan <fauxpark@gmail.com> * Workaround to joystick.h not being included to report.h * Removed unnecessary newlines, updated report.h Changed JOYSTICK_AXES_RESOLUTION conditional in report.h Co-authored-by: Ryan <fauxpark@gmail.com>	2020-10-30 13:15:41 -07:00
Nick Brassel	9664723595	Make bootloader_jump weak for ChibiOS. (#10417 )	2020-10-30 13:15:40 -07:00
Nick Brassel	2f2432f0e5	Actually use eeprom_driver_init().	2020-10-30 13:15:39 -07:00
Nick Brassel	b1b7696347	Add ability to build a subset of all keyboards based on platform.	2020-10-30 13:15:38 -07:00
jakobkg	bf84d35117	Change MIDI velocity implementation to allow direct control of velocity value (#9940 ) * Initial changes to expose "real" MIDI velocity * Change MI_VELU and MI_VELD to fit new logic * Apply cleanups from fauxpark's review my bad on the errant whitespace and else {} placements * Slight changes to MI_VELD to match values when velocity is falling to when it is rising * Add keycode MI_VEL_0 * Update compute_velocity() to handle MI_VEL_0 * Store velocity as 7 bits to hard cap value at 127	2020-10-30 13:15:37 -07:00
Naoto Takai	73d20754bb	Add support for soft serial to ATmega32U2 (#10204 ) * Add support for soft serial to ATmega32U2 * Update drivers/avr/serial.c * Update drivers/avr/serial.c * Update drivers/avr/serial.c * Fix comment * Update drivers/avr/serial.c	2020-10-30 13:15:36 -07:00
Sergey Vlasov	53ad78b4b6	Remove matrix_col_t to allow MATRIX_ROWS > 32 (#10183 ) The matrix_col_t type was added in commit `0284431ad9` (part of #3449), but then the code which used that type was removed in #6140, and no other users were added since that time. The presence of that type, however, limits MATRIX_ROWS to 32, which probably does not matter for a real keyboard, but prevents doing things like making a firmware to test all existing pins on a board like Teensy++ 2.0 (which has 46 GPIOs).	2020-10-30 13:15:35 -07:00
James Young	47fff7484e	Branch point for 2020 November 28 Breaking Change Update readme.md	2020-10-30 13:15:26 -07:00