mirror of
https://github.com/qmk/qmk_firmware.git
synced 2024-12-13 21:30:47 +00:00
Merge remote-tracking branch 'origin/develop' into xap
This commit is contained in:
commit
7be0e718e9
@ -47,5 +47,3 @@
|
|||||||
//#define NO_ACTION_LAYER
|
//#define NO_ACTION_LAYER
|
||||||
//#define NO_ACTION_TAPPING
|
//#define NO_ACTION_TAPPING
|
||||||
//#define NO_ACTION_ONESHOT
|
//#define NO_ACTION_ONESHOT
|
||||||
|
|
||||||
#define VIA_HAS_BROKEN_KEYCODES
|
|
||||||
|
@ -26,6 +26,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.*/
|
|||||||
#define RGBLIGHT_EFFECT_RGB_TEST
|
#define RGBLIGHT_EFFECT_RGB_TEST
|
||||||
#define RGBLIGHT_EFFECT_ALTERNATING
|
#define RGBLIGHT_EFFECT_ALTERNATING
|
||||||
#define RGBLIGHT_EFFECT_TWINKLE
|
#define RGBLIGHT_EFFECT_TWINKLE
|
||||||
|
|
||||||
|
|
||||||
#define VIA_HAS_BROKEN_KEYCODES
|
|
||||||
|
@ -19,8 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
//#define SERIAL_USE_MULTI_TRANSACTION
|
|
||||||
|
|
||||||
|
|
||||||
#ifdef RGB_MATRIX_ENABLE
|
#ifdef RGB_MATRIX_ENABLE
|
||||||
# define RGB_MATRIX_LED_COUNT 74
|
# define RGB_MATRIX_LED_COUNT 74
|
||||||
|
@ -1,18 +0,0 @@
|
|||||||
/* Copyright 2019 Spaceman
|
|
||||||
*
|
|
||||||
* 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
|
|
||||||
|
|
||||||
#define VIA_HAS_BROKEN_KEYCODES
|
|
@ -33,5 +33,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||||||
|
|
||||||
/* Bluetooth */
|
/* Bluetooth */
|
||||||
#define BATTERY_LEVEL_PIN B6
|
#define BATTERY_LEVEL_PIN B6
|
||||||
|
|
||||||
#define VIA_HAS_BROKEN_KEYCODES
|
|
||||||
|
@ -15,9 +15,6 @@
|
|||||||
*/
|
*/
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
/* Fix VIA RGB_light */
|
|
||||||
#define VIA_HAS_BROKEN_KEYCODES
|
|
||||||
|
|
||||||
/* RGB Matrix */
|
/* RGB Matrix */
|
||||||
#ifdef RGB_MATRIX_ENABLE
|
#ifdef RGB_MATRIX_ENABLE
|
||||||
# define RGB_MATRIX_LED_COUNT 82
|
# define RGB_MATRIX_LED_COUNT 82
|
||||||
|
Loading…
Reference in New Issue
Block a user