Merge upstream master to 2022 Q4 breaking change

2 files changed, 0 insertions, 271 deletions

diff --git a/keyboards/40percentclub/mf68/keymaps/delivrance/config.h b/keyboards/40percentclub/mf68/keymaps/delivrance/config.h
deleted file mode 100644
index 50c64b4b51..0000000000
--- a/keyboards/40percentclub/mf68/keymaps/delivrance/config.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Dan's Magicforce 68 (MF68) QMK Keyboard
- * Copyright (C) Dan <https://github.com/delivrance>
- *
- * This file is part of Dan's MF68 QMK Keyboard.
- *
- * Dan's MF68 QMK Keyboard 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 3 of the License, or
- * (at your option) any later version.
- *
- * Dan's MF68 QMK Keyboard 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 Dan's MF68 QMK Keyboard.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#undef MANUFACTURER
-#define MANUFACTURER "Dan"
-
-#undef PRODUCT
-#define PRODUCT "Magicforce 68 QMK"
-
-#undef BACKLIGHT_LEVELS
-#define BACKLIGHT_LEVELS 20
-
-// Disable backlight breathing
-#undef BACKLIGHT_BREATHING
-
-// Set USB polling rate to 1000 Hz
-#define USB_POLLING_INTERVAL_MS 1
-
-// Enable NKRO on boot
-#define FORCE_NKRO
-
-// Backlight idle timeout in seconds
-#define BACKLIGHT_IDLE_TIMEOUT 1200
\ No newline at end of file
diff --git a/keyboards/40percentclub/mf68/keymaps/delivrance/keymap.c b/keyboards/40percentclub/mf68/keymaps/delivrance/keymap.c
deleted file mode 100644
index ed98d947e5..0000000000
--- a/keyboards/40percentclub/mf68/keymaps/delivrance/keymap.c
+++ /dev/null
@@ -1,229 +0,0 @@
-/*
- * Dan's Magicforce 68 (MF68) QMK Keyboard
- * Copyright (C) Dan <https://github.com/delivrance>
- *
- * This file is part of Dan's MF68 QMK Keyboard.
- *
- * Dan's MF68 QMK Keyboard 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 3 of the License, or
- * (at your option) any later version.
- *
- * Dan's MF68 QMK Keyboard 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 Dan's MF68 QMK Keyboard.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-#define KC_FN1 MO(_FN)
-#define KC_FN2 LT(_FN, KC_CAPS)
-
-#define KC_BLUP BL_UP    // Backlight increase
-#define KC_BLDN BL_DOWN  // Backlight decrease
-#define KC_BLTOG BL_TOGG // Backlight toggle
-#define KC_REC1 DM_REC1  // Record macro 1
-#define KC_PLY1 DM_PLY1  // Play macro 1
-#define KC_REC2 DM_REC2  // Record macro 2
-#define KC_PLY2 DM_PLY2  // Play macro 1
-#define KC_RSTP DM_RSTP  // Stop macro recording
-
-enum {
-    _QWERTY,
-    _FN
-};
-
-/* ┏━━━━┳━━━━┳━━━━┳━━━━┳━━━━┳━━━━┳━━━━┳━━━━┳━━━━┳━━━━┳━━━━┳━━━━┳━━━━┳━━━━━━━━┓ ┏━━━━┳━━━━┓
-   ┃Esc ┃ 1! ┃ 2@ ┃ 3# ┃ 4$ ┃ 5% ┃ 6^ ┃ 7& ┃ 8* ┃ 9( ┃ 0) ┃ -_ ┃ =+ ┃   ←─   ┃ ┃Ins ┃PgUp┃
-   ┣━━━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━━━━━┫ ┣━━━━╋━━━━┫
-   ┃ Tab  ┃ Q  ┃ W  ┃ E  ┃ R  ┃ T  ┃ Y  ┃ U  ┃ I  ┃ O  ┃ P  ┃ [{ ┃ ]} ┃  \|  ┃ ┃Del ┃PgDn┃
-   ┣━━━━━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━━━━━━┫ ┗━━━━┻━━━━┛
-   ┃  Caps  ┃ A  ┃ S  ┃ D  ┃ F  ┃ G  ┃ H  ┃ J  ┃ K  ┃ L  ┃ ;: ┃ '" ┃  Enter  ┃  Magicforce
-   ┣━━━━━━━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━━━━━━━━━┫ ┏━━━━┓
-   ┃   Shift  ┃ Z  ┃ X  ┃ C  ┃ V  ┃ B  ┃ N  ┃ M  ┃ ,< ┃ .> ┃ /? ┃    Shift   ┃ ┃ ↑  ┃ Dan
-   ┣━━━━━┳━━━━┻┳━━━┻━┳━━┻━━━━┻━━━━┻━━━━┻━━━━┻━━━━┻━━━┳┻━━━━╋━━━━┻┳━━━━━┳━━┳━━┻━╋━━━━╋━━━━┓
-   ┃Ctrl ┃ GUI ┃ Alt ┃             ━━━━━             ┃ Alt ┃ Fn  ┃Ctrl ┃  ┃ ←  ┃ ↓  ┃ →  ┃
-   ┗━━━━━┻━━━━━┻━━━━━┻━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┻━━━━━┻━━━━━┻━━━━━┛  ┗━━━━┻━━━━┻━━━━┛ */
-
-// clang-format off
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[_QWERTY] = LAYOUT_68_ansi( /* Default layer
-   ┏━━━━┳━━━━┳━━━━┳━━━━┳━━━━┳━━━━┳━━━━┳━━━━┳━━━━┳━━━━┳━━━━┳━━━━┳━━━━┳━━━━━━━━┓ ┏━━━━┳━━━━┓ */
-    QK_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_BSPC  ,  KC_INS ,KC_PGUP, /*
-   ┣━━━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━━━━━┫ ┣━━━━╋━━━━┫ */
-     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_DEL ,KC_PGDN, /*
-   ┣━━━━━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━━━━━━┫ ┗━━━━┻━━━━┛ */
-      KC_FN2   , KC_A  , KC_S  , KC_D  , KC_F  , KC_G  , KC_H  , KC_J  , KC_K  , KC_L  ,KC_SCLN,KC_QUOT,  KC_ENTER  ,         /*
-   ┣━━━━━━━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━┳━━┻━━━━━━━━━┫ ┏━━━━┓      */
-       KC_LSFT   , KC_Z  , KC_X  , KC_C  , KC_V  , KC_B  , KC_N  , KC_M  ,KC_COMM,KC_DOT ,KC_SLSH,    KC_RSFT    ,   KC_UP ,  /*
-   ┣━━━━━┳━━━━┻┳━━━┻━┳━━┻━━━━┻━━━━┻━━━━┻━━━━┻━━━━┻━━━┳┻━━━━╋━━━━┻┳━━━━━┳━━┳━━┻━╋━━━━╋━━━━┓ */
-    KC_LCTL ,KC_LGUI ,KC_LALT ,             KC_SPACE             ,KC_RALT , KC_FN1 ,KC_RCTL ,   KC_LEFT,KC_DOWN,KC_RGHT  /*
-   ┗━━━━━┻━━━━━┻━━━━━┻━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┻━━━━━┻━━━━━┻━━━━━┛  ┗━━━━┻━━━━┻━━━━┛ */),
-
-[_FN] = LAYOUT_68_ansi( /* FN & CAPS layer
-   ┏━━━━┳━━━━┳━━━━┳━━━━┳━━━━┳━━━━┳━━━━┳━━━━┳━━━━┳━━━━┳━━━━┳━━━━┳━━━━┳━━━━━━━━┓ ┏━━━━┳━━━━┓ */
-    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_RSTP  ,  KC_PSCR,KC_HOME, /*
-   ┣Esc ┻ 1! ┻ 2@ ┻ 3# ┻ 4$ ┻ 5% ┻ 6^ ┻ 7& ┻ 8* ┻ 9( ┻ 0) ┻ -_ ┻ =+ ┻━┳━ ←─ ━┫ ┣Ins ╋PgUp┫ */
-  _______ ,KC_PLY1,KC_PLY2,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_7  , KC_8  , KC_9  ,KC_BLDN,KC_BLUP,KC_BLTOG ,KC_TRNS  ,KC_END , /*
-   ┣ Tab ━┻ Q ━┻ W ━┻ E ━┻ R ━┻ T ━┻ Y ━┻ U ━┻ I ━┻ O ━┻ P ━┻ [{ ┻ ]} ┻━ \| ━┫ ┗Del ┻PgDn┛ */
-    _______ ,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_4  , KC_5  , KC_6  ,KC_TRNS,   KC_TRNS  ,         /*
-   ┣━ Caps ━┻ A ━┻ S ━┻ D ━┻ F ━┻ G ━┻ H ━┻ J ━┻ K ━┻ L ━┻ ;: ┻ '" ┻━ Enter ━┫ ┏━━━━┓      */
-    _______   ,KC_REC1,KC_REC2,KC_TRNS,KC_TRNS,KC_MSTP,KC_TRNS,KC_MUTE, KC_1  , KC_2  , KC_3  ,KC_TRNS        ,  KC_VOLU,  /*
-   ┣━━ Shift ━┻ Z ━┻ X ━┻ C ━┻ V ━┻ B ━┻ N ━┻ M ━┻ ,< ┻ .> ╋ /? ┻┳━━ Shift ━━┻━╋ ↑ ━╋━━━━┓ */
-  _______,KC_TRNS ,KC_TRNS ,         KC_MPLY              ,  KC_0  ,KC_TRNS ,KC_TRNS ,   KC_MPRV,KC_VOLD,KC_MNXT  /*
-   ┗Ctrl ┻ GUI ┻ Alt ┻━━━━━━━━━━━━ Space ━━━━━━━━━━━━┻ Alt ┻ Fn ━┻Ctrl ┛  ┗ ← ━┻ ↓ ━┻ → ━┛ */)
-};
-// clang-format on
-
-// Initialization code
-// -------------------
-
-void keyboard_post_init_user(void) {
-    backlight_level(2);
-}
-
-// Custom backlight driver
-// -----------------------
-
-// http://jared.geek.nz/2013/feb/linear-led-pwm
-float cie1931(float x) {
-    x *= 100.0 / BACKLIGHT_LEVELS;
-    float y;
-
-    if (x < 8) {
-        y = x / 902.3;
-    } else {
-        y = (x + 16.0) / 116.0;
-        y = y * y * y;
-    }
-
-    return round(y * 255);
-}
-
-void backlight_init_ports(void) {
-    setPinOutput(BACKLIGHT_PIN);
-    writePinLow(BACKLIGHT_PIN);
-
-    TCCR1A = _BV(COM1A1) | _BV(WGM11);
-    TCCR1B = _BV(WGM13) | _BV(WGM12) | _BV(CS10);
-
-    ICR1 = 0xFFU;  // Set PWM levels to 255 (enables high-frequency PWM)
-}
-
-void backlight_set(uint8_t level) {
-    if (level > BACKLIGHT_LEVELS) {
-        level = BACKLIGHT_LEVELS;
-    }
-
-    if (level == 0) {
-        TCCR1A &= ~(_BV(COM1A1));  // Disable PWM
-    } else {
-        TCCR1A |= _BV(COM1A1);  // Enable PWM
-    }
-
-    OCR1A = cie1931(level);
-}
-
-// Custom macro hooks
-// ------------------
-
-// Redefine with lower delay
-void led_blink(void) {
-    backlight_toggle();
-    wait_ms(25);
-    backlight_toggle();
-}
-
-void dynamic_macro_record_start_user(void) {
-    led_blink();
-}
-
-void dynamic_macro_play_user(int8_t direction) {
-    led_blink();
-}
-
-void dynamic_macro_record_key_user(int8_t direction, keyrecord_t *record) {
-    led_blink();
-}
-
-void dynamic_macro_record_end_user(int8_t direction) {
-    led_blink();
-}
-
-// Custom Caps Lock backlight behaviour
-// ------------------------------------
-
-void led_set_user(uint8_t usb_led) {
-    // This exists because I don't like the backlight to turn OFF when the Caps Lock is ON.
-    // That is, this will turn the backlight ON (at half the brightness) when the Caps Lock is ON as well.
-    static bool prev_is_caps_on;
-    bool is_caps_on = IS_LED_ON(usb_led, USB_LED_CAPS_LOCK);
-
-    if (prev_is_caps_on != is_caps_on) {
-        prev_is_caps_on = is_caps_on;
-
-        if (is_caps_on) {
-            backlight_set(BACKLIGHT_LEVELS / 2);
-        } else {
-            if (is_backlight_enabled()) {
-                backlight_set(get_backlight_level());
-            } else {
-                backlight_set(0);
-            }
-        }
-    }
-
-    // Turn on the Pro Micro's on-board LEDs for Caps Lock
-    if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) {
-        // Set to low
-        setPinOutput(B0);
-        writePinLow(B0);
-        setPinOutput(D5);
-        writePinLow(D5);
-    } else {
-        // Set to Hi-Z
-        setPinInput(B0);
-        setPinInput(D5);
-    }
-}
-
-// Backlight idle timeout feature
-// ------------------------------
-
-static uint32_t timer;
-static bool is_idle;
-
-void matrix_scan_user() {
-    // Check the timer only if the keyboard is not idle
-    if (!is_idle) {
-        if (timer_elapsed32(timer) >= (uint32_t) BACKLIGHT_IDLE_TIMEOUT * 1000) {
-            is_idle = true;
-
-            // Both backlight_level and backlight_level_noeeprom modify the global backlight config (not useful)
-            // Instead, use backlight_set in order to restore the current backlight level later on
-            backlight_set(0);
-        }
-    }
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    // Reset timer on each keypress
-    timer = timer_read32();
-
-    // Enable backlight back only when keyboard is idling (which implies the backlight was turned off previously)
-    if (is_idle) {
-        is_idle = false;
-
-        // Set back the original backlight level only if it is actually enabled globally
-        if (is_backlight_enabled()) {
-            // The current backlight level can be obtained with get_backlight_level
-            backlight_set(get_backlight_level());
-        }
-    }
-
-    return true;
-}