aboutsummaryrefslogtreecommitdiff
path: root/tmk_core
diff options
context:
space:
mode:
authorWilba <Jason.S.Williams@gmail.com>2020-01-04 07:52:00 +1100
committerDrashna Jaelre <drashna@live.com>2020-01-03 12:52:00 -0800
commit320822d75b785401809f45007320e6fb6885b3fd (patch)
treec511d49a48b953ac29ffb4a51ac928319eb9fde4 /tmk_core
parentb36259566546eb884cc241bcfadb671051e5e75e (diff)
downloadqmk_firmware-320822d75b785401809f45007320e6fb6885b3fd.tar.gz
qmk_firmware-320822d75b785401809f45007320e6fb6885b3fd.zip
VIA Configurator Refactor (#7268)
* VIA Refactor * Remove old code * review changes * review changes * Fix cannonkeys/satisfaction75/prototype:via build * Add via.h to quantum.h * Move backlight init to after backlight config load * Merge branch 'master' into via_refactor_pr * Update user's rules.mk to new way of enabling VIA * Added id_switch_matrix_state * Review changes
Diffstat (limited to 'tmk_core')
-rw-r--r--tmk_core/common/eeconfig.h2
-rw-r--r--tmk_core/common/keyboard.c6
2 files changed, 8 insertions, 0 deletions
diff --git a/tmk_core/common/eeconfig.h b/tmk_core/common/eeconfig.h
index 308f865e1..6fbe78903 100644
--- a/tmk_core/common/eeconfig.h
+++ b/tmk_core/common/eeconfig.h
@@ -48,6 +48,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
48#define EECONFIG_RGB_MATRIX_SPEED (uint8_t *)32 48#define EECONFIG_RGB_MATRIX_SPEED (uint8_t *)32
49// TODO: Combine these into a single word and single block of EEPROM 49// TODO: Combine these into a single word and single block of EEPROM
50#define EECONFIG_KEYMAP_UPPER_BYTE (uint8_t *)33 50#define EECONFIG_KEYMAP_UPPER_BYTE (uint8_t *)33
51// Size of EEPROM being used, other code can refer to this for available EEPROM
52#define EECONFIG_SIZE 34
51/* debug bit */ 53/* debug bit */
52#define EECONFIG_DEBUG_ENABLE (1 << 0) 54#define EECONFIG_DEBUG_ENABLE (1 << 0)
53#define EECONFIG_DEBUG_MATRIX (1 << 1) 55#define EECONFIG_DEBUG_MATRIX (1 << 1)
diff --git a/tmk_core/common/keyboard.c b/tmk_core/common/keyboard.c
index af2b2fd48..794a9152f 100644
--- a/tmk_core/common/keyboard.c
+++ b/tmk_core/common/keyboard.c
@@ -83,6 +83,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
83#ifdef VELOCIKEY_ENABLE 83#ifdef VELOCIKEY_ENABLE
84# include "velocikey.h" 84# include "velocikey.h"
85#endif 85#endif
86#ifdef VIA_ENABLE
87# include "via.h"
88#endif
86 89
87// Only enable this if console is enabled to print to 90// Only enable this if console is enabled to print to
88#if defined(DEBUG_MATRIX_SCAN_RATE) && defined(CONSOLE_ENABLE) 91#if defined(DEBUG_MATRIX_SCAN_RATE) && defined(CONSOLE_ENABLE)
@@ -217,6 +220,9 @@ __attribute__((weak)) bool is_keyboard_master(void) { return true; }
217void keyboard_init(void) { 220void keyboard_init(void) {
218 timer_init(); 221 timer_init();
219 matrix_init(); 222 matrix_init();
223#ifdef VIA_ENABLE
224 via_init();
225#endif
220#ifdef QWIIC_ENABLE 226#ifdef QWIIC_ENABLE
221 qwiic_init(); 227 qwiic_init();
222#endif 228#endif