mirror of
				https://github.com/mfulz/qmk_firmware.git
				synced 2025-11-04 07:12:33 +01:00 
			
		
		
		
	Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		
						commit
						c43f48f6a9
					
				@ -20,6 +20,7 @@
 | 
			
		||||
#include <stdbool.h>
 | 
			
		||||
#include "matrix.h"
 | 
			
		||||
#include "eeconfig.h"
 | 
			
		||||
#include "util.h"
 | 
			
		||||
 | 
			
		||||
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
 | 
			
		||||
 | 
			
		||||
@ -60,7 +60,7 @@
 | 
			
		||||
 | 
			
		||||
// #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 */
 | 
			
		||||
#define LOCKING_SUPPORT_ENABLE
 | 
			
		||||
 | 
			
		||||
@ -63,7 +63,7 @@
 | 
			
		||||
 | 
			
		||||
// #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 */
 | 
			
		||||
#define LOCKING_SUPPORT_ENABLE
 | 
			
		||||
 | 
			
		||||
@ -62,7 +62,7 @@
 | 
			
		||||
 | 
			
		||||
// #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 */
 | 
			
		||||
#define LOCKING_SUPPORT_ENABLE
 | 
			
		||||
 | 
			
		||||
@ -62,7 +62,7 @@
 | 
			
		||||
 | 
			
		||||
// #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 */
 | 
			
		||||
#define LOCKING_SUPPORT_ENABLE
 | 
			
		||||
 | 
			
		||||
@ -63,7 +63,7 @@
 | 
			
		||||
 | 
			
		||||
// #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 */
 | 
			
		||||
#define LOCKING_SUPPORT_ENABLE
 | 
			
		||||
 | 
			
		||||
@ -63,7 +63,7 @@
 | 
			
		||||
 | 
			
		||||
// #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 */
 | 
			
		||||
#define LOCKING_SUPPORT_ENABLE
 | 
			
		||||
 | 
			
		||||
@ -63,7 +63,7 @@
 | 
			
		||||
 | 
			
		||||
// #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 */
 | 
			
		||||
#define LOCKING_SUPPORT_ENABLE
 | 
			
		||||
 | 
			
		||||
@ -62,7 +62,7 @@
 | 
			
		||||
 | 
			
		||||
// #define DEBUG_MATRIX_SCAN_RATE
 | 
			
		||||
#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 */
 | 
			
		||||
#define LOCKING_SUPPORT_ENABLE
 | 
			
		||||
 | 
			
		||||
@ -62,7 +62,7 @@
 | 
			
		||||
 | 
			
		||||
// #define DEBUG_MATRIX_SCAN_RATE
 | 
			
		||||
#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 */
 | 
			
		||||
#define LOCKING_SUPPORT_ENABLE
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user