Merge remote-tracking branch 'origin/develop' into xap

This commit is contained in:
QMK Bot 2023-01-30 19:04:14 +00:00
commit 1d1b1e621b
2368 changed files with 11 additions and 2377 deletions

View File

@ -37,12 +37,7 @@ This level contains all of the options for that particular keymap. If you wish t
# The `config.h` File
This is a C header file that is one of the first things included, and will persist over the whole project (if included). Lots of variables can be set here and accessed elsewhere. The `config.h` file shouldn't be including other `config.h` files, or anything besides this:
```c
#include "config_common.h"
```
This is a C header file that is one of the first things included, and will persist over the whole project (if included). Lots of variables can be set here and accessed elsewhere. The `config.h` file shouldn't be including other `config.h` files.
## Hardware Options
* `#define VENDOR_ID 0x1234`
@ -329,7 +324,7 @@ There are a few different ways to set handedness for split keyboards (listed in
* `#define SPLIT_USB_TIMEOUT_POLL 10`
* Poll frequency when detecting master/slave when using `SPLIT_USB_DETECT`
* `#define SPLIT_WATCHDOG_ENABLE`
* Reboot slave if no communication from master within timeout.
* Helps resolve issue where both sides detect as slave using `SPLIT_USB_DETECT`

View File

@ -20,6 +20,7 @@
#pragma once
#include <stdbool.h>
#include <stdint.h>
// CPI values
// clang-format off

View File

@ -16,7 +16,6 @@
#pragma once
#include "config_common.h"
/* key matrix size */
// Rows are doubled-up

View File

@ -16,7 +16,6 @@
#pragma once
#include "config_common.h"
/* underglow */
#define RGB_DI_PIN B6

View File

@ -17,7 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
#include "config_common.h"
/* key matrix size */
#define MATRIX_ROWS 5

View File

@ -16,7 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
#include "config_common.h"
// clang-format off
/* key matrix size */

View File

@ -16,7 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
#include "config_common.h"
// clang-format off
/* key matrix size */

View File

@ -16,7 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
#include "config_common.h"
/* key matrix size */
#define MATRIX_ROWS 2

View File

@ -16,7 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.*/
#pragma once
#include "config_common.h"
/* key matrix size */
#define MATRIX_ROWS 4

View File

@ -15,7 +15,6 @@
*/
#pragma once
#include "config_common.h"
/* matrix size */
#define MATRIX_ROWS 1

View File

@ -17,7 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
#include "config_common.h"
/* key matrix size */
#define MATRIX_ROWS 5

View File

@ -18,7 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
#include "config_common.h"
/* key matrix size */
#define MATRIX_ROWS 5

View File

@ -1,6 +1,5 @@
#pragma once
#include "config_common.h"
/* key matrix size */
#define MATRIX_ROWS 5

View File

@ -3,7 +3,6 @@
#pragma once
#include "config_common.h"
#define DYNAMIC_KEYMAP_LAYER_COUNT 10

View File

@ -3,7 +3,6 @@
#pragma once
#include "config_common.h"
#define DYNAMIC_KEYMAP_LAYER_COUNT 10
#define RGB_DI_PIN GP15

View File

@ -3,7 +3,6 @@
#pragma once
#include "config_common.h"
#define RGB_DI_PIN GP19
#define RGB_MATRIX_LED_COUNT 61

View File

@ -17,7 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
#include "config_common.h"
/* key matrix size */
#define MATRIX_ROWS 4

View File

@ -16,7 +16,6 @@
#pragma once
#include "config_common.h"
/* key matrix size */
#define MATRIX_ROWS 4

View File

@ -1,6 +1,5 @@
#pragma once
#include "config_common.h"
/* key matrix size */
#define MATRIX_ROWS 4

View File

@ -1,6 +1,5 @@
#pragma once
#include "config_common.h"
/* key matrix pins */
#define MATRIX_ROW_PINS { F4, F5, F6, F7 }

View File

@ -16,7 +16,6 @@
#pragma once
#include "config_common.h"
#define DYNAMIC_KEYMAP_LAYER_COUNT 10
#define RGB_DI_PIN GP6

View File

@ -16,7 +16,6 @@
#pragma once
#include "config_common.h"
#define DYNAMIC_KEYMAP_LAYER_COUNT 10

View File

@ -17,7 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
#include "config_common.h"
/* key matrix size */
#define MATRIX_ROWS 4

View File

@ -17,7 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
#include "config_common.h"
/* key matrix size */
#define MATRIX_ROWS 4

View File

@ -17,7 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
#include "config_common.h"
/* key matrix size */
#define MATRIX_ROWS 1

View File

@ -18,4 +18,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
#include "config_common.h"

View File

@ -1,6 +1,5 @@
#pragma once
#include "config_common.h"
/* key matrix size */
#define MATRIX_ROWS 2

View File

@ -1,6 +1,5 @@
#pragma once
#include "config_common.h"
/* key matrix size */
#define MATRIX_ROWS 3

View File

@ -16,7 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
#include "config_common.h"
/* key matrix size */
#define MATRIX_ROWS 1

View File

@ -16,7 +16,6 @@
#pragma once
#include "config_common.h"
/* serial.c configuration for split keyboard */
#define SOFT_SERIAL_PIN D0

View File

@ -17,7 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
#include "config_common.h"
/* key matrix size */
#define MATRIX_ROWS 1

View File

@ -2,7 +2,6 @@
#pragma once
#include "config_common.h"
/* key matrix size */
#define MATRIX_ROWS 4

View File

@ -2,7 +2,6 @@
#pragma once
#include "config_common.h"
/* key matrix size */
#define MATRIX_ROWS 5

View File

@ -16,7 +16,6 @@
#pragma once
#include "config_common.h"
/* serial.c configuration for split keyboard */
#define SOFT_SERIAL_PIN D0

View File

@ -16,7 +16,6 @@
#pragma once
#include "config_common.h"
/* serial.c configuration for split keyboard */
#define SOFT_SERIAL_PIN D0

View File

@ -1,6 +1,5 @@
#pragma once
#include "config_common.h"
/* key matrix size */
#define MATRIX_ROWS 5

View File

@ -17,7 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
#include "config_common.h"
/* key matrix size */
#define MATRIX_ROWS 4*2

View File

@ -16,7 +16,6 @@
#pragma once
#include "config_common.h"
/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
#define DEBOUNCE 5

View File

@ -16,7 +16,6 @@
#pragma once
#include "config_common.h"
/* key matrix size */
#define MATRIX_ROWS 9

View File

@ -16,7 +16,6 @@
#pragma once
#include "config_common.h"
/* key matrix size */
#define MATRIX_ROWS 9

View File

@ -1,6 +1,5 @@
#pragma once
#include "config_common.h"
/* key matrix size */
#define MATRIX_ROWS 8

View File

@ -17,7 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
#include "config_common.h"
/* key matrix size */
#define MATRIX_ROWS 8

View File

@ -17,7 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
#include "config_common.h"
/* Overrides for Feather 32u4 Bluefruit */

View File

@ -17,7 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
#include "config_common.h"
/* key matrix size */
#define MATRIX_ROWS 2

View File

@ -16,7 +16,6 @@
#pragma once
#include "config_common.h"
/* key matrix size */
#define MATRIX_ROWS 3

View File

@ -16,7 +16,6 @@
#pragma once
#include "config_common.h"
/* key matrix size */
#define MATRIX_ROWS 4

View File

@ -16,7 +16,6 @@
#pragma once
#include "config_common.h"
/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
#define DEBOUNCE 5

View File

@ -16,7 +16,6 @@
#pragma once
#include "config_common.h"
/* key matrix size */
#define MATRIX_ROWS 1

View File

@ -16,7 +16,6 @@
#pragma once
#include "config_common.h"
/* key matrix size */
#define MATRIX_ROWS 1

View File

@ -17,7 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
#include "config_common.h"
/* key matrix size */
#define MATRIX_ROWS 2

View File

@ -1,6 +1,5 @@
#pragma once
#include "config_common.h"
/* key matrix size */
#define MATRIX_ROWS 5

View File

@ -17,7 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
#include "config_common.h"
/* key matrix size */
#define MATRIX_ROWS 4

View File

@ -16,7 +16,6 @@
#pragma once
#include "config_common.h"
// place overrides here
#define RGBLIGHT_EFFECT_BREATHING

View File

@ -18,7 +18,6 @@
#pragma once
#include "config_common.h"
/* key matrix size */
#define MATRIX_ROWS 4

View File

@ -1,6 +1,5 @@
#pragma once
#include "config_common.h"
/* key matrix size */
#define MATRIX_ROWS 3

View File

@ -1,6 +1,5 @@
#pragma once
#include "config_common.h"
/* key matrix size */
#define MATRIX_ROWS 5

View File

@ -16,7 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
#include "config_common.h"
/* key matrix size */
#define MATRIX_ROWS 5

View File

@ -16,7 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
#include "config_common.h"
/* key matrix size */
#define MATRIX_ROWS 5

View File

@ -1,6 +1,5 @@
#pragma once
#include "config_common.h"
/* key matrix size */
#define MATRIX_ROWS 5

View File

@ -16,7 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
#include "config_common.h"
/* key matrix size */
#define MATRIX_ROWS 6

View File

@ -16,7 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
#include "config_common.h"
/* key matrix size */
#define MATRIX_ROWS 5

View File

@ -16,7 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
#include "config_common.h"
/* key matrix size */
#define MATRIX_ROWS 5

View File

@ -16,7 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
#include "config_common.h"
/* key matrix size */
#define MATRIX_ROWS 5

View File

@ -16,7 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
#include "config_common.h"
/* key matrix size */
#define MATRIX_ROWS 5

View File

@ -16,7 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
#include "config_common.h"
/* key matrix size */
#define MATRIX_ROWS 5

View File

@ -16,7 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
#include "config_common.h"
/* key matrix size */
#define MATRIX_ROWS 12

View File

@ -16,7 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
#include "config_common.h"
/* key matrix size */
#define MATRIX_ROWS 12

View File

@ -15,7 +15,6 @@
*/
#pragma once
#include "config_common.h"
#define MATRIX_ROWS 10
#define MATRIX_COLS 6

View File

@ -1,6 +1,5 @@
#pragma once
#include "config_common.h"
/* COL2ROW or ROW2COL */
#define DIODE_DIRECTION COL2ROW

View File

@ -17,7 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
#include "config_common.h"
/* key matrix size */
#define MATRIX_ROWS 3

View File

@ -16,7 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
#include "config_common.h"
/* key matrix size */
#define MATRIX_ROWS 8

View File

@ -17,7 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
#include "config_common.h"
/* key matrix size */
#define MATRIX_ROWS 4

View File

@ -17,7 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
#include "config_common.h"
/* RGB Matrix setup */
#define RGB_DI_PIN GP19

View File

@ -17,7 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
#include "config_common.h"
/* key matrix size */
#define MATRIX_ROWS 2

View File

@ -17,7 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
#include "config_common.h"
/* key matrix size */
#define MATRIX_ROWS 5

View File

@ -17,7 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
#include "config_common.h"
#define MATRIX_ROWS 6
#define MATRIX_COLS 17

View File

@ -17,7 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
#include "config_common.h"
#define MATRIX_ROWS 6
#define MATRIX_COLS 17

View File

@ -17,7 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
#include "config_common.h"
/* key matrix size */
#define MATRIX_ROWS 5

View File

@ -17,7 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
#include "config_common.h"
#define MATRIX_ROWS 5
#define MATRIX_COLS 15

View File

@ -17,7 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
#include "config_common.h"
/* key matrix size */
#define MATRIX_ROWS 4

View File

@ -17,7 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
#include "config_common.h"
#define MATRIX_ROWS 4
#define MATRIX_COLS 12

View File

@ -15,7 +15,6 @@ 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
#include "config_common.h"
#define MEDIA_KEY_DELAY 10
#define ALT_TAB_DELAY 1000
@ -187,7 +186,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
uint32_t held_click_timer = 0;
bool is_click_held = false;
bool is_shift_held = false;
bool automatic_hold_cycle = false; // This flag registers if the encoder hold was automatically cycled
bool automatic_hold_cycle = false; // This flag registers if the encoder hold was automatically cycled
// This bool records if LALT is pressed or not. Due to the automatic disabling of the ALT-TAB of the ALTTABS custom keystroke, the automatic disabling can un-register KC_LALT even when the LALT key is phisically pressed. Hence there needs to be two bools: one that keebs track of the ALT-TAB activity and one that keeps track of LALT so that the automatic disabling will not disable LALT if it is phisically pressed.
bool is_lalt_pressed = false;
@ -213,7 +212,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
return true; // Skip all further processing of this key
case KC_LALT: // If this is not defined, if the encoder is activated in the alt-tab mode while the LALT key is pressed, the menu goes away.
if (record->event.pressed) is_lalt_pressed = true;
else is_lalt_pressed = false;
else is_lalt_pressed = false;
return true;
case ENCMUP:
case ENCMDN:
@ -225,7 +224,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
if (!is_alt_tab_active) {
is_alt_tab_active = true;
register_code(KC_LALT);
}
tap_code16(keycode == ALTTABF ? KC_TAB : S(KC_TAB)); // Due to S(KC_TAB), the 16-bit tap_code16 is needed.
alt_tab_timer = timer_read32();
@ -252,7 +251,7 @@ void housekeeping_task_user(void) {
is_alt_tab_active = false;
}
}
/* This piece of the code checks for the encoder push timer. If the encoder push interval was less than encoder_click_delay then it is automatically processed by process_record_user by triggering the current mode's click key. However, if the encoder push is held for more time than the defined delay, then the encoder hold "cycles", that is, gets activated and the timer needs to be reset. This does three things:
/* This piece of the code checks for the encoder push timer. If the encoder push interval was less than encoder_click_delay then it is automatically processed by process_record_user by triggering the current mode's click key. However, if the encoder push is held for more time than the defined delay, then the encoder hold "cycles", that is, gets activated and the timer needs to be reset. This does three things:
- (1) Sets the automatic_hold_cycle flag which prevents process_record_user from triggering the click key when the push is released
- (2) Processes the current mode's hold key in process_record_user
- (3) Resets the click timer

View File

@ -16,7 +16,6 @@
#pragma once
#include "config_common.h"
/* key matrix size */
#define MATRIX_ROWS 5

View File

@ -3,7 +3,6 @@
#pragma once
#include "config_common.h"
/* key matrix size */
#define MATRIX_ROWS 6

View File

@ -16,7 +16,6 @@
#pragma once
#include "config_common.h"
/* key matrix size */
#define MATRIX_ROWS 5

View File

@ -17,7 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
#include "config_common.h"
/* key matrix size */
#define MATRIX_ROWS 7

View File

@ -18,5 +18,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
#include "config_common.h"

View File

@ -16,7 +16,6 @@
#pragma once
#include "config_common.h"
#define MATRIX_ROWS 4
#define MATRIX_COLS 12

View File

@ -3,7 +3,6 @@
#pragma once
#include "config_common.h"
/* Key matrix size */
#define MATRIX_ROWS 6

View File

@ -17,7 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
#include "config_common.h"
/* key matrix size */
#define MATRIX_ROWS 10

View File

@ -3,7 +3,6 @@
#pragma once
#include "config_common.h"
/* key matrix size */
#define MATRIX_ROWS 4

View File

@ -3,7 +3,6 @@
#pragma once
#include "config_common.h"
/* key matrix size */
#define MATRIX_ROWS 8

View File

@ -16,7 +16,6 @@
#pragma once
#include "config_common.h"
/* key matrix size */
#define MATRIX_ROWS 12

View File

@ -17,7 +17,6 @@
#pragma once
#include "config_common.h"
/* key matrix size */
#define MATRIX_ROWS 5

View File

@ -16,7 +16,6 @@
#pragma once
#include "config_common.h"
/* key matrix size */
#define MATRIX_ROWS 5

View File

@ -17,7 +17,6 @@
#pragma once
#include "config_common.h"
/* key matrix size */
#define MATRIX_ROWS 5

View File

@ -16,4 +16,3 @@
#pragma once
#include "config_common.h"

View File

@ -16,4 +16,3 @@
#pragma once
#include "config_common.h"

View File

@ -16,4 +16,3 @@
#pragma once
#include "config_common.h"

View File

@ -16,4 +16,3 @@
#pragma once
#include "config_common.h"

Some files were not shown because too many files have changed in this diff Show More