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

master
QMK Bot 2020-12-27 17:37:04 +00:00
commit 99d6349978
40 changed files with 40 additions and 61 deletions

View File

@ -66,4 +66,3 @@ include $(TMK_PATH)/rules.mk
$(shell mkdir -p $(BUILD_DIR)/test 2>/dev/null) $(shell mkdir -p $(BUILD_DIR)/test 2>/dev/null)
$(shell mkdir -p $(TEST_OBJ) 2>/dev/null) $(shell mkdir -p $(TEST_OBJ) 2>/dev/null)

View File

@ -50,4 +50,3 @@ This document marks the inaugural Breaking Change merge. A list of changes follo
* `KC_DELT` was a redundant, undocumented alias for `KC_DELETE` * `KC_DELT` was a redundant, undocumented alias for `KC_DELETE`
* It has been removed and all its uses replaced with the more common `KC_DEL` alias * It has been removed and all its uses replaced with the more common `KC_DEL` alias
* Around 90 keymaps (mostly for ErgoDox boards) have been modified as a result * Around 90 keymaps (mostly for ErgoDox boards) have been modified as a result

View File

@ -33,4 +33,3 @@ Soporte para hasta 2 controladores. Cada controlador implementa 2 matrices charl
## IS31FL3733 ## IS31FL3733
Soporte para hasta un solo controlador con espacio para expansión. Cada controlador puede controlar 192 LEDs individuales o 64 LEDs RGB. Para obtener más información sobre cómo configurar el controlador, consulta la página de [Matriz RGB](feature_rgb_matrix.md). Soporte para hasta un solo controlador con espacio para expansión. Cada controlador puede controlar 192 LEDs individuales o 64 LEDs RGB. Para obtener más información sobre cómo configurar el controlador, consulta la página de [Matriz RGB](feature_rgb_matrix.md).

View File

@ -148,4 +148,3 @@ The following old names for existing algorithms will continue to be supported, h
* eager_pk - old name for sym_eager_pk * eager_pk - old name for sym_eager_pk
* sym_pk - old name for sym_defer_pk * sym_pk - old name for sym_defer_pk
* eager_pr - old name for sym_eager_pr * eager_pr - old name for sym_eager_pr

View File

@ -85,4 +85,3 @@ While the tempo defines the absolute speed at which the sequencer goes through t
|`void sequencer_activate_track(uint8_t track);` |Activate the `track` | |`void sequencer_activate_track(uint8_t track);` |Activate the `track` |
|`void sequencer_deactivate_track(uint8_t track);` |Deactivate the `track` | |`void sequencer_deactivate_track(uint8_t track);` |Deactivate the `track` |
|`void sequencer_toggle_single_active_track(uint8_t track);` |Set `track` as the only active track or deactivate all | |`void sequencer_toggle_single_active_track(uint8_t track);` |Set `track` as the only active track or deactivate all |

View File

@ -129,4 +129,3 @@ As defined in `keymap_steno.h`.
|`STN_RES1`||(GeminiPR only)| |`STN_RES1`||(GeminiPR only)|
|`STN_RES2`||(GeminiPR only)| |`STN_RES2`||(GeminiPR only)|
|`STN_PWR`||(GeminiPR only)| |`STN_PWR`||(GeminiPR only)|

View File

@ -47,4 +47,3 @@ This configuration is from usbasploader's Makefile.
# | | +----- LB 2..1 (No memory lock features enabled) # | | +----- LB 2..1 (No memory lock features enabled)
# | +--------- BLB0 2..1 (No restrictions for SPM or LPM accessing the Application section) # | +--------- BLB0 2..1 (No restrictions for SPM or LPM accessing the Application section)
# +--------------- BLB1 2..1 (No restrictions for SPM or LPM accessing the Boot Loader section) # +--------------- BLB1 2..1 (No restrictions for SPM or LPM accessing the Boot Loader section)

View File

@ -43,5 +43,3 @@ endif
* eager_pk - キーごとにデバウンスします。状態が変化すると、応答は即座に行われ、その後そのキーは ```DEBOUNCE``` ミリ秒の間入力されません。 * eager_pk - キーごとにデバウンスします。状態が変化すると、応答は即座に行われ、その後そのキーは ```DEBOUNCE``` ミリ秒の間入力されません。
* sym_g - キーボードごとにデバウンスします。状態が変化すると、グローバルタイマが設定されます。```DEBOUNCE``` ミリ秒の間何も変化がなければ、全ての入力の変更がプッシュされます。 * sym_g - キーボードごとにデバウンスします。状態が変化すると、グローバルタイマが設定されます。```DEBOUNCE``` ミリ秒の間何も変化がなければ、全ての入力の変更がプッシュされます。
* sym_pk - キーごとにデバウンスします。状態が変化すると、キーごとのタイマーが設定されます。```DEBOUNCE``` ミリ秒の間そのキーに変化がなければ、キーの状態の変更がプッシュされます。 * sym_pk - キーごとにデバウンスします。状態が変化すると、キーごとのタイマーが設定されます。```DEBOUNCE``` ミリ秒の間そのキーに変化がなければ、キーの状態の変更がプッシュされます。

View File

@ -171,4 +171,3 @@
* `device` 関連するデバイス * `device` 関連するデバイス
* `func` 登録するコールバック関数 * `func` 登録するコールバック関数

View File

@ -336,4 +336,3 @@ split_penalty_logical_operator=300
# Use the Tab character for indentation. # Use the Tab character for indentation.
use_tabs=False use_tabs=False

View File

@ -14,10 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef TESTS_BASIC_CONFIG_H_ #pragma once
#define TESTS_BASIC_CONFIG_H_
#define MATRIX_ROWS 4 #define MATRIX_ROWS 4
#define MATRIX_COLS 10 #define MATRIX_COLS 10
#endif /* TESTS_BASIC_CONFIG_H_ */

View File

@ -14,8 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef TESTS_TEST_COMMON_TEST_DRIVER_H_ #pragma once
#define TESTS_TEST_COMMON_TEST_DRIVER_H_
#include "gmock/gmock.h" #include "gmock/gmock.h"
#include <stdint.h> #include <stdint.h>
@ -43,6 +42,3 @@ private:
uint8_t m_leds = 0; uint8_t m_leds = 0;
static TestDriver* m_this; static TestDriver* m_this;
}; };
#endif /* TESTS_TEST_COMMON_TEST_DRIVER_H_ */

View File

@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#pragma once #pragma once
#include "gtest/gtest.h" #include "gtest/gtest.h"

View File

@ -496,5 +496,3 @@ xatoi:
ret ret
.endfunc .endfunc
#endif #endif

View File

@ -18,4 +18,3 @@ OPT_DEFS += -DFIXED_NUM_CONFIGURATIONS=1
ifeq ($(strip $(MIDI_ENABLE)), yes) ifeq ($(strip $(MIDI_ENABLE)), yes)
include $(TMK_PATH)/protocol/midi.mk include $(TMK_PATH)/protocol/midi.mk
endif endif