diff options
| author | Wilba <Jason.S.Williams@gmail.com> | 2020-01-04 07:52:00 +1100 |
|---|---|---|
| committer | Drashna Jaelre <drashna@live.com> | 2020-01-03 12:52:00 -0800 |
| commit | 320822d75b785401809f45007320e6fb6885b3fd (patch) | |
| tree | c511d49a48b953ac29ffb4a51ac928319eb9fde4 /keyboards/dp60 | |
| parent | b36259566546eb884cc241bcfadb671051e5e75e (diff) | |
| download | qmk_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/dp60')
| -rw-r--r-- | keyboards/dp60/config.h | 22 | ||||
| -rw-r--r-- | keyboards/dp60/keymaps/via/rules.mk | 40 |
2 files changed, 3 insertions, 59 deletions
diff --git a/keyboards/dp60/config.h b/keyboards/dp60/config.h index 87eebbe197..29d5e3c2a4 100644 --- a/keyboards/dp60/config.h +++ b/keyboards/dp60/config.h @@ -50,24 +50,6 @@ #define DRIVER_2_LED_TOTAL 36 #define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL) -#if defined(RAW_ENABLE) -//VIA -#define DYNAMIC_KEYMAP_LAYER_COUNT 2 -// EEPROM usage - -// TODO: refactor with new user EEPROM code (coming soon) -#define EEPROM_MAGIC 0x451F -#define EEPROM_MAGIC_ADDR 34 -// 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 0x08 -#define EEPROM_VERSION_ADDR 36 - -// Dynamic keymap starts after EEPROM version -#define DYNAMIC_KEYMAP_EEPROM_ADDR 37 -// Dynamic macro starts after dynamic keymaps (35+(4*10*6*2)) = (35+480) -#define DYNAMIC_KEYMAP_MACRO_EEPROM_ADDR 637 -#define DYNAMIC_KEYMAP_MACRO_EEPROM_SIZE 391 // 1024-DYNAMIC_KEYMAP_MACRO_EEPROM_ADDR -#define DYNAMIC_KEYMAP_MACRO_COUNT 16 +#if defined(VIA_ENABLE) +# define DYNAMIC_KEYMAP_LAYER_COUNT 2 #endif diff --git a/keyboards/dp60/keymaps/via/rules.mk b/keyboards/dp60/keymaps/via/rules.mk index 6d2a738643..036bd6d1c3 100644 --- a/keyboards/dp60/keymaps/via/rules.mk +++ b/keyboards/dp60/keymaps/via/rules.mk @@ -1,39 +1 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -# Teensy halfkay -# Pro Micro caterina -# Atmel DFU atmel-dfu -# LUFA DFU lufa-dfu -# QMK DFU qmk-dfu -# ATmega32A bootloadHID -# ATmega328P USBasp -BOOTLOADER = atmel-dfu - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE -SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend -# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -NKRO_ENABLE = no # USB Nkey Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality on B7 by default -MIDI_ENABLE = no # MIDI support -UNICODE_ENABLE = no # Unicode -BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID -AUDIO_ENABLE = no # Audio output on port C6 -FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches -RGBLIGHT_ENABLE = yes # Use RGB bottom light -RGB_MATRIX_ENABLE = yes # Use RGB matrix - -RAW_ENABLE = yes -DYNAMIC_KEYMAP_ENABLE = yes - -CUSTOM_MATRIX = yes -SRC += matrix.c keyboards/wilba_tech/wt_main.c +VIA_ENABLE = yes
\ No newline at end of file |