From 320822d75b785401809f45007320e6fb6885b3fd Mon Sep 17 00:00:00 2001 From: Wilba Date: Sat, 4 Jan 2020 07:52:00 +1100 Subject: 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 --- keyboards/projectkb/alice/config.h | 26 +++----------------------- keyboards/projectkb/alice/rules.mk | 3 --- 2 files changed, 3 insertions(+), 26 deletions(-) (limited to 'keyboards/projectkb') diff --git a/keyboards/projectkb/alice/config.h b/keyboards/projectkb/alice/config.h index cc0386ae68..4a068a8893 100644 --- a/keyboards/projectkb/alice/config.h +++ b/keyboards/projectkb/alice/config.h @@ -58,29 +58,9 @@ along with this program. If not, see . #define PIN_WS2812 15 #define WS2812_SPI SPID2 - -// EEPROM usage -// TODO: refactor with new user EEPROM code (coming soon) -#define EEPROM_MAGIC 0x451F -#define EEPROM_MAGIC_ADDR 32 -// Bump this every time we change what we store -// This will automatically reset the EEPROM with defaults -// and avoid loading invalid data from the EEPROM -#define EEPROM_VERSION 0x01 -#define EEPROM_VERSION_ADDR 34 - -#define EEPROM_CUSTOM_BACKLIGHT 804 - -#undef EEPROM_MAGIC_ADDR -#define EEPROM_MAGIC_ADDR 34 -#undef EEPROM_VERSION_ADDR -#define EEPROM_VERSION_ADDR 36 -#undef RGB_BACKLIGHT_CONFIG_EEPROM_ADDR -#define RGB_BACKLIGHT_CONFIG_EEPROM_ADDR 37 -#undef DYNAMIC_KEYMAP_EEPROM_ADDR -#define DYNAMIC_KEYMAP_EEPROM_ADDR 68 -#undef DYNAMIC_KEYMAP_MACRO_EEPROM_ADDR -#define DYNAMIC_KEYMAP_MACRO_EEPROM_ADDR 66 +// Backlight config starts after VIA's EEPROM usage, +// dynamic keymaps start after this. +#define VIA_EEPROM_CUSTOM_CONFIG_SIZE 1 /* * Feature disable options diff --git a/keyboards/projectkb/alice/rules.mk b/keyboards/projectkb/alice/rules.mk index 606ffda183..9288783352 100644 --- a/keyboards/projectkb/alice/rules.mk +++ b/keyboards/projectkb/alice/rules.mk @@ -51,7 +51,4 @@ CUSTOM_MATRIX = no # Custom matrix file # BACKLIGHT_ENABLE = yes # This is broken on 072 for some reason RGBLIGHT_ENABLE = yes -# RAW_ENABLE = yes -# DYNAMIC_KEYMAP_ENABLE = yes - DFU_ARGS = -d 0483:df11 -a 0 -s 0x08000000:leave -- cgit v1.2.3