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

This commit is contained in:
QMK Bot
2021-01-05 00:37:55 +00:00
8 changed files with 19 additions and 16 deletions

View File

@@ -17,3 +17,4 @@
#pragma once
// place overrides here
#define TAPPING_TOGGLE 2

View File

@@ -15,9 +15,6 @@
*/
#include QMK_KEYBOARD_H
#define TAPPING_TOGGLE 2
// Layer names
#define base 0
#define shrek 1

View File

@@ -99,7 +99,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
)
};
uint16_t get_tapping_term(uint16_t keycode) {
uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
switch (keycode) {
case KC_SPRA:
return TAPPING_LAYER_TERM;