aboutsummaryrefslogtreecommitdiff
path: root/keyboards/projectkb
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 /keyboards/projectkb
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 'keyboards/projectkb')
-rw-r--r--keyboards/projectkb/alice/config.h26
-rw-r--r--keyboards/projectkb/alice/rules.mk3
2 files changed, 3 insertions, 26 deletions
diff --git a/keyboards/projectkb/alice/config.h b/keyboards/projectkb/alice/config.h
index cc0386ae6..4a068a889 100644
--- a/keyboards/projectkb/alice/config.h
+++ b/keyboards/projectkb/alice/config.h
@@ -58,29 +58,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
58#define PIN_WS2812 15 58#define PIN_WS2812 15
59#define WS2812_SPI SPID2 59#define WS2812_SPI SPID2
60 60
61 61// Backlight config starts after VIA's EEPROM usage,
62// EEPROM usage 62// dynamic keymaps start after this.
63// TODO: refactor with new user EEPROM code (coming soon) 63#define VIA_EEPROM_CUSTOM_CONFIG_SIZE 1
64#define EEPROM_MAGIC 0x451F
65#define EEPROM_MAGIC_ADDR 32
66// Bump this every time we change what we store
67// This will automatically reset the EEPROM with defaults
68// and avoid loading invalid data from the EEPROM
69#define EEPROM_VERSION 0x01
70#define EEPROM_VERSION_ADDR 34
71
72#define EEPROM_CUSTOM_BACKLIGHT 804
73
74#undef EEPROM_MAGIC_ADDR
75#define EEPROM_MAGIC_ADDR 34
76#undef EEPROM_VERSION_ADDR
77#define EEPROM_VERSION_ADDR 36
78#undef RGB_BACKLIGHT_CONFIG_EEPROM_ADDR
79#define RGB_BACKLIGHT_CONFIG_EEPROM_ADDR 37
80#undef DYNAMIC_KEYMAP_EEPROM_ADDR
81#define DYNAMIC_KEYMAP_EEPROM_ADDR 68
82#undef DYNAMIC_KEYMAP_MACRO_EEPROM_ADDR
83#define DYNAMIC_KEYMAP_MACRO_EEPROM_ADDR 66
84 64
85/* 65/*
86 * Feature disable options 66 * Feature disable options
diff --git a/keyboards/projectkb/alice/rules.mk b/keyboards/projectkb/alice/rules.mk
index 606ffda18..928878335 100644
--- a/keyboards/projectkb/alice/rules.mk
+++ b/keyboards/projectkb/alice/rules.mk
@@ -51,7 +51,4 @@ CUSTOM_MATRIX = no # Custom matrix file
51# BACKLIGHT_ENABLE = yes # This is broken on 072 for some reason 51# BACKLIGHT_ENABLE = yes # This is broken on 072 for some reason
52RGBLIGHT_ENABLE = yes 52RGBLIGHT_ENABLE = yes
53 53
54# RAW_ENABLE = yes
55# DYNAMIC_KEYMAP_ENABLE = yes
56
57DFU_ARGS = -d 0483:df11 -a 0 -s 0x08000000:leave 54DFU_ARGS = -d 0483:df11 -a 0 -s 0x08000000:leave