diff options
| author | William Chang <william@factual.com> | 2019-11-20 22:17:07 -0800 |
|---|---|---|
| committer | William Chang <william@factual.com> | 2019-11-20 22:17:07 -0800 |
| commit | e7f4d56592b3975c38af329e77b4efd9108495e8 (patch) | |
| tree | 0a416bccbf70bfdbdb9ffcdb3bf136b47378c014 /keyboards/cannonkeys/instant60 | |
| parent | 71493b2f9bbd5f3d18373c518fa14ccafcbf48fc (diff) | |
| parent | 8416a94ad27b3ff058576f09f35f0704a8b39ff3 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'keyboards/cannonkeys/instant60')
| -rw-r--r-- | keyboards/cannonkeys/instant60/config.h | 14 | ||||
| -rw-r--r-- | keyboards/cannonkeys/instant60/keymaps/default/keymap.c | 1 | ||||
| -rw-r--r-- | keyboards/cannonkeys/instant60/rules.mk | 4 |
3 files changed, 11 insertions, 8 deletions
diff --git a/keyboards/cannonkeys/instant60/config.h b/keyboards/cannonkeys/instant60/config.h index 095384fb9e..9da2043d2f 100644 --- a/keyboards/cannonkeys/instant60/config.h +++ b/keyboards/cannonkeys/instant60/config.h @@ -62,21 +62,21 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. // EEPROM usage // TODO: refactor with new user EEPROM code (coming soon) #define EEPROM_MAGIC 0x451F -#define EEPROM_MAGIC_ADDR 32 +#define EEPROM_MAGIC_ADDR 40 // 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 0x02 -#define EEPROM_VERSION_ADDR 34 +#define EEPROM_VERSION 0x03 +#define EEPROM_VERSION_ADDR 42 #define DYNAMIC_KEYMAP_LAYER_COUNT 4 // Dynamic macro starts after dynamic keymaps (35+(4*5*15*2)) = (35+600) = 635 // start + layer * rows * col * 2 -#define DYNAMIC_KEYMAP_EEPROM_ADDR 35 -#define EEPROM_CUSTOM_BACKLIGHT 636 -#define DYNAMIC_KEYMAP_MACRO_EEPROM_ADDR 637 -#define DYNAMIC_KEYMAP_MACRO_EEPROM_SIZE 200 +#define DYNAMIC_KEYMAP_EEPROM_ADDR 43 +#define EEPROM_CUSTOM_BACKLIGHT 644 +#define DYNAMIC_KEYMAP_MACRO_EEPROM_ADDR 645 +#define DYNAMIC_KEYMAP_MACRO_EEPROM_SIZE 192 #define DYNAMIC_KEYMAP_MACRO_COUNT 16 /* diff --git a/keyboards/cannonkeys/instant60/keymaps/default/keymap.c b/keyboards/cannonkeys/instant60/keymaps/default/keymap.c index 303f307301..f9c7995ae0 100644 --- a/keyboards/cannonkeys/instant60/keymaps/default/keymap.c +++ b/keyboards/cannonkeys/instant60/keymaps/default/keymap.c @@ -16,7 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include QMK_KEYBOARD_H -extern keymap_config_t keymap_config; // Each layer gets a name for readability, which is then used in the keymap matrix below. // The underscores don't mean anything - you can have a layer called STUFF or any other name. diff --git a/keyboards/cannonkeys/instant60/rules.mk b/keyboards/cannonkeys/instant60/rules.mk index 5d4fb1cf72..c0a62e9433 100644 --- a/keyboards/cannonkeys/instant60/rules.mk +++ b/keyboards/cannonkeys/instant60/rules.mk @@ -31,6 +31,10 @@ ARMV = 6 # <tmk_dir>/tmk_core/tool/chibios/ch-bootloader-jump.patch #STM32_BOOTLOADER_ADDRESS = 0x1FFFC800 +# Options to pass to dfu-util when flashing +DFU_ARGS = -d 0483:df11 -a 0 -s 0x08000000:leave +DFU_SUFFIX_ARGS = -p DF11 -v 0483 + # Build Options # comment out to disable the options. # |