Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
3a98bd75c8
|
@ -17,6 +17,7 @@ SERIAL_PATH := $(QUANTUM_PATH)/serial_link
|
||||||
|
|
||||||
QUANTUM_SRC += \
|
QUANTUM_SRC += \
|
||||||
$(QUANTUM_DIR)/quantum.c \
|
$(QUANTUM_DIR)/quantum.c \
|
||||||
|
$(QUANTUM_DIR)/bitwise.c \
|
||||||
$(QUANTUM_DIR)/led.c \
|
$(QUANTUM_DIR)/led.c \
|
||||||
$(QUANTUM_DIR)/keymap_common.c \
|
$(QUANTUM_DIR)/keymap_common.c \
|
||||||
$(QUANTUM_DIR)/keycode_config.c
|
$(QUANTUM_DIR)/keycode_config.c
|
||||||
|
@ -36,6 +37,11 @@ ifeq ($(strip $(API_SYSEX_ENABLE)), yes)
|
||||||
SRC += $(QUANTUM_DIR)/api.c
|
SRC += $(QUANTUM_DIR)/api.c
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifeq ($(strip $(COMMAND_ENABLE)), yes)
|
||||||
|
SRC += $(QUANTUM_DIR)/command.c
|
||||||
|
OPT_DEFS += -DCOMMAND_ENABLE
|
||||||
|
endif
|
||||||
|
|
||||||
ifeq ($(strip $(AUDIO_ENABLE)), yes)
|
ifeq ($(strip $(AUDIO_ENABLE)), yes)
|
||||||
OPT_DEFS += -DAUDIO_ENABLE
|
OPT_DEFS += -DAUDIO_ENABLE
|
||||||
MUSIC_ENABLE = yes
|
MUSIC_ENABLE = yes
|
||||||
|
|
|
@ -1,3 +0,0 @@
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include "common/matrix.h"
|
|
|
@ -1,6 +1,6 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "common/matrix.h"
|
#include "matrix.h"
|
||||||
|
|
||||||
#define ROWS_PER_HAND (MATRIX_ROWS/2)
|
#define ROWS_PER_HAND (MATRIX_ROWS/2)
|
||||||
|
|
||||||
|
|
|
@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
|
|
||||||
// convert to L string
|
|
||||||
#define LSTR(s) XLSTR(s)
|
|
||||||
#define XLSTR(s) L## #s
|
|
||||||
// convert to string
|
|
||||||
#define STR(s) XSTR(s)
|
|
||||||
#define XSTR(s) #s
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
extern "C" {
|
extern "C" {
|
||||||
#endif
|
#endif
|
|
@ -1,14 +1,13 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
/*--------------------------------------------------------------------
|
|
||||||
* Ring buffer to store scan codes from keyboard
|
|
||||||
*------------------------------------------------------------------*/
|
|
||||||
#ifndef RBUF_SIZE
|
|
||||||
# define RBUF_SIZE 32
|
|
||||||
#endif
|
|
||||||
#include <util/atomic.h>
|
#include <util/atomic.h>
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#include <stdbool.h>
|
#include <stdbool.h>
|
||||||
|
|
||||||
|
#ifndef RBUF_SIZE
|
||||||
|
# define RBUF_SIZE 32
|
||||||
|
#endif
|
||||||
|
|
||||||
static uint8_t rbuf[RBUF_SIZE];
|
static uint8_t rbuf[RBUF_SIZE];
|
||||||
static uint8_t rbuf_head = 0;
|
static uint8_t rbuf_head = 0;
|
||||||
static uint8_t rbuf_tail = 0;
|
static uint8_t rbuf_tail = 0;
|
|
@ -1,6 +1,6 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "common/matrix.h"
|
#include "matrix.h"
|
||||||
|
|
||||||
void transport_master_init(void);
|
void transport_master_init(void);
|
||||||
void transport_slave_init(void);
|
void transport_slave_init(void);
|
||||||
|
|
|
@ -13,31 +13,14 @@ GNU General Public License for more details.
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License
|
You should have received a copy of the GNU General Public License
|
||||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
Ported to QMK by Peter Roe <pete@13bit.me>
|
|
||||||
*/
|
*/
|
||||||
|
#pragma once
|
||||||
|
|
||||||
#ifndef LED_H
|
#include "bitwise.h"
|
||||||
#define LED_H
|
|
||||||
#include <stdint.h>
|
|
||||||
|
|
||||||
|
// convert to L string
|
||||||
/* keyboard LEDs */
|
#define LSTR(s) XLSTR(s)
|
||||||
#define USB_LED_NUM_LOCK 0
|
#define XLSTR(s) L## #s
|
||||||
#define USB_LED_CAPS_LOCK 1
|
// convert to string
|
||||||
#define USB_LED_SCROLL_LOCK 2
|
#define STR(s) XSTR(s)
|
||||||
#define USB_LED_COMPOSE 3
|
#define XSTR(s) #s
|
||||||
#define USB_LED_KANA 4
|
|
||||||
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C" {
|
|
||||||
#endif
|
|
||||||
|
|
||||||
void led_set(uint8_t usb_led);
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif
|
|
|
@ -13,7 +13,6 @@ TMK_COMMON_SRC += $(COMMON_DIR)/host.c \
|
||||||
$(COMMON_DIR)/print.c \
|
$(COMMON_DIR)/print.c \
|
||||||
$(COMMON_DIR)/debug.c \
|
$(COMMON_DIR)/debug.c \
|
||||||
$(COMMON_DIR)/sendchar_null.c \
|
$(COMMON_DIR)/sendchar_null.c \
|
||||||
$(COMMON_DIR)/util.c \
|
|
||||||
$(COMMON_DIR)/eeconfig.c \
|
$(COMMON_DIR)/eeconfig.c \
|
||||||
$(COMMON_DIR)/report.c \
|
$(COMMON_DIR)/report.c \
|
||||||
$(PLATFORM_COMMON_DIR)/suspend.c \
|
$(PLATFORM_COMMON_DIR)/suspend.c \
|
||||||
|
@ -90,11 +89,6 @@ else
|
||||||
TMK_COMMON_DEFS += -DNO_DEBUG
|
TMK_COMMON_DEFS += -DNO_DEBUG
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(strip $(COMMAND_ENABLE)), yes)
|
|
||||||
TMK_COMMON_SRC += $(COMMON_DIR)/command.c
|
|
||||||
TMK_COMMON_DEFS += -DCOMMAND_ENABLE
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifeq ($(strip $(NKRO_ENABLE)), yes)
|
ifeq ($(strip $(NKRO_ENABLE)), yes)
|
||||||
ifeq ($(PROTOCOL), VUSB)
|
ifeq ($(PROTOCOL), VUSB)
|
||||||
$(info NKRO is not currently supported on V-USB, and has been disabled.)
|
$(info NKRO is not currently supported on V-USB, and has been disabled.)
|
||||||
|
|
|
@ -16,7 +16,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "arm_atsam_protocol.h"
|
#include "arm_atsam_protocol.h"
|
||||||
#include "tmk_core/common/led.h"
|
#include "led.h"
|
||||||
#include "rgb_matrix.h"
|
#include "rgb_matrix.h"
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
|
|
Loading…
Reference in New Issue