mirror of
https://github.com/qmk/qmk_firmware.git
synced 2024-12-14 05:40:47 +00:00
Merge remote-tracking branch 'origin/develop' into xap
This commit is contained in:
commit
2fa752201b
@ -20,6 +20,7 @@
|
|||||||
#include <stdbool.h>
|
#include <stdbool.h>
|
||||||
#include "matrix.h"
|
#include "matrix.h"
|
||||||
#include "eeconfig.h"
|
#include "eeconfig.h"
|
||||||
|
#include "util.h"
|
||||||
|
|
||||||
typedef struct PACKED {
|
typedef struct PACKED {
|
||||||
uint8_t actuation_mode; // 0: normal board-wide APC, 1: Rapid trigger from specific board-wide actuation point, 2: Rapid trigger from resting point
|
uint8_t actuation_mode; // 0: normal board-wide APC, 1: Rapid trigger from specific board-wide actuation point, 2: Rapid trigger from resting point
|
||||||
|
@ -60,7 +60,7 @@
|
|||||||
|
|
||||||
// #define DEBUG_MATRIX_SCAN_RATE
|
// #define DEBUG_MATRIX_SCAN_RATE
|
||||||
|
|
||||||
#define EECONFIG_KB_DATA_SIZE 58
|
#define EECONFIG_KB_DATA_SIZE 57
|
||||||
|
|
||||||
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
|
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
|
||||||
#define LOCKING_SUPPORT_ENABLE
|
#define LOCKING_SUPPORT_ENABLE
|
||||||
|
@ -63,7 +63,7 @@
|
|||||||
|
|
||||||
// #define DEBUG_MATRIX_SCAN_RATE
|
// #define DEBUG_MATRIX_SCAN_RATE
|
||||||
|
|
||||||
#define EECONFIG_KB_DATA_SIZE 160
|
#define EECONFIG_KB_DATA_SIZE 159
|
||||||
|
|
||||||
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
|
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
|
||||||
#define LOCKING_SUPPORT_ENABLE
|
#define LOCKING_SUPPORT_ENABLE
|
||||||
|
@ -62,7 +62,7 @@
|
|||||||
|
|
||||||
// #define DEBUG_MATRIX_SCAN_RATE
|
// #define DEBUG_MATRIX_SCAN_RATE
|
||||||
|
|
||||||
#define EECONFIG_KB_DATA_SIZE 170
|
#define EECONFIG_KB_DATA_SIZE 169
|
||||||
|
|
||||||
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
|
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
|
||||||
#define LOCKING_SUPPORT_ENABLE
|
#define LOCKING_SUPPORT_ENABLE
|
||||||
|
@ -62,7 +62,7 @@
|
|||||||
|
|
||||||
// #define DEBUG_MATRIX_SCAN_RATE
|
// #define DEBUG_MATRIX_SCAN_RATE
|
||||||
|
|
||||||
#define EECONFIG_KB_DATA_SIZE 170
|
#define EECONFIG_KB_DATA_SIZE 169
|
||||||
|
|
||||||
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
|
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
|
||||||
#define LOCKING_SUPPORT_ENABLE
|
#define LOCKING_SUPPORT_ENABLE
|
||||||
|
@ -63,7 +63,7 @@
|
|||||||
|
|
||||||
// #define DEBUG_MATRIX_SCAN_RATE
|
// #define DEBUG_MATRIX_SCAN_RATE
|
||||||
|
|
||||||
#define EECONFIG_KB_DATA_SIZE 160
|
#define EECONFIG_KB_DATA_SIZE 159
|
||||||
|
|
||||||
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
|
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
|
||||||
#define LOCKING_SUPPORT_ENABLE
|
#define LOCKING_SUPPORT_ENABLE
|
||||||
|
@ -63,7 +63,7 @@
|
|||||||
|
|
||||||
// #define DEBUG_MATRIX_SCAN_RATE
|
// #define DEBUG_MATRIX_SCAN_RATE
|
||||||
|
|
||||||
#define EECONFIG_KB_DATA_SIZE 160
|
#define EECONFIG_KB_DATA_SIZE 159
|
||||||
|
|
||||||
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
|
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
|
||||||
#define LOCKING_SUPPORT_ENABLE
|
#define LOCKING_SUPPORT_ENABLE
|
||||||
|
@ -63,7 +63,7 @@
|
|||||||
|
|
||||||
// #define DEBUG_MATRIX_SCAN_RATE
|
// #define DEBUG_MATRIX_SCAN_RATE
|
||||||
|
|
||||||
#define EECONFIG_KB_DATA_SIZE 150
|
#define EECONFIG_KB_DATA_SIZE 149
|
||||||
|
|
||||||
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
|
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
|
||||||
#define LOCKING_SUPPORT_ENABLE
|
#define LOCKING_SUPPORT_ENABLE
|
||||||
|
@ -62,7 +62,7 @@
|
|||||||
|
|
||||||
// #define DEBUG_MATRIX_SCAN_RATE
|
// #define DEBUG_MATRIX_SCAN_RATE
|
||||||
#define DYNAMIC_KEYMAP_LAYER_COUNT 3
|
#define DYNAMIC_KEYMAP_LAYER_COUNT 3
|
||||||
#define EECONFIG_KB_DATA_SIZE 202
|
#define EECONFIG_KB_DATA_SIZE 201
|
||||||
|
|
||||||
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
|
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
|
||||||
#define LOCKING_SUPPORT_ENABLE
|
#define LOCKING_SUPPORT_ENABLE
|
||||||
|
@ -62,7 +62,7 @@
|
|||||||
|
|
||||||
// #define DEBUG_MATRIX_SCAN_RATE
|
// #define DEBUG_MATRIX_SCAN_RATE
|
||||||
#define DYNAMIC_KEYMAP_LAYER_COUNT 3
|
#define DYNAMIC_KEYMAP_LAYER_COUNT 3
|
||||||
#define EECONFIG_KB_DATA_SIZE 202
|
#define EECONFIG_KB_DATA_SIZE 201
|
||||||
|
|
||||||
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
|
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
|
||||||
#define LOCKING_SUPPORT_ENABLE
|
#define LOCKING_SUPPORT_ENABLE
|
||||||
|
Loading…
Reference in New Issue
Block a user