From 075495a7923418d7105f748de29b8279c5051dd9 Mon Sep 17 00:00:00 2001 From: Jonathan Rascher Date: Fri, 30 Aug 2019 19:44:28 -0500 Subject: [Keyboard] Support flashing Instant60 from command line (#6625) --- keyboards/cannonkeys/instant60/rules.mk | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'keyboards/cannonkeys/instant60') 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_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. # -- cgit v1.2.3 From 455a0c597854b417c4dc02a462433043bddfa830 Mon Sep 17 00:00:00 2001 From: Andrew Kannan Date: Wed, 30 Oct 2019 02:45:58 -0400 Subject: [Keyboard] New CannonKeys boards and EEPROM fixes (#6968) * Add Iron165 * CannonKeys new boards and cleanup * Tmo50 info json * Update readme for TMOv2 * update via keymap tmo * info json again * Apply suggestions from code review Co-Authored-By: Drashna Jaelre * Address PR comments * More changes for rules files cleanup * info.json fixed? * Fix Savage65 matrix * Apply suggestions from code review Thanks noroadsleft for the improvements! Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com> * Bump eeprom version * Apply suggestions from code review Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com> --- keyboards/cannonkeys/instant60/config.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'keyboards/cannonkeys/instant60') 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 . // 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 /* -- cgit v1.2.3 From e6b9980bd45c186f7360df68c24b6e05a80c10dc Mon Sep 17 00:00:00 2001 From: Drashna Jaelre Date: Wed, 20 Nov 2019 14:31:36 -0800 Subject: Remove keymap_config extern from default keymaps (#7399) * Remove keymap_config extern from default keymaps * Revert unicode Apparently VSCode does not like unicode, I didn't actually edit these lines, so it must have been automatic... :( Co-Authored-By: fauxpark --- keyboards/cannonkeys/instant60/keymaps/default/keymap.c | 1 - 1 file changed, 1 deletion(-) (limited to 'keyboards/cannonkeys/instant60') 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 . */ #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. -- cgit v1.2.3