Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump up Instant60 custom EEPROM offsets to avoid conflict #6906

Closed
wants to merge 2 commits into from
Closed

Bump up Instant60 custom EEPROM offsets to avoid conflict #6906

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c375c45
Bump EEPROM offsets for Instant60 to fix #6589
bcat Oct 5, 2019
f1c0775
Remove user-specific EEPROM workaround
bcat Oct 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions keyboards/cannonkeys/instant60/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,20 +62,20 @@ 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 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 0x02
#define EEPROM_VERSION_ADDR 34
#define EEPROM_VERSION_ADDR 36


#define DYNAMIC_KEYMAP_LAYER_COUNT 4
// Dynamic macro starts after dynamic keymaps (35+(4*5*15*2)) = (35+600) = 635
#define DYNAMIC_KEYMAP_EEPROM_ADDR 37
// Backlight comes after dynamic keymaps (37+(4*5*15*2)) = (37+600) = 637
// start + layer * rows * col * 2
#define DYNAMIC_KEYMAP_EEPROM_ADDR 35
#define EEPROM_CUSTOM_BACKLIGHT 636
#define DYNAMIC_KEYMAP_MACRO_EEPROM_ADDR 637
#define EEPROM_CUSTOM_BACKLIGHT 637
#define DYNAMIC_KEYMAP_MACRO_EEPROM_ADDR 638
#define DYNAMIC_KEYMAP_MACRO_EEPROM_SIZE 200
#define DYNAMIC_KEYMAP_MACRO_COUNT 16

Expand Down
18 changes: 0 additions & 18 deletions users/bcat/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,21 +46,3 @@
#define MOUSEKEY_WHEEL_MAX_SPEED 3
#define MOUSEKEY_WHEEL_TIME_TO_MAX 150
#endif

#if defined(KEYBOARD_cannonkeys_instant60)
/*
* Work around EEPROM incompatibility with VIA:
* https://github.com/qmk/qmk_firmware/issues/6589#issuecomment-524042457.
*/
#undef EEPROM_MAGIC_ADDR
#undef EEPROM_VERSION_ADDR
#undef DYNAMIC_KEYMAP_EEPROM_ADDR
#undef EEPROM_CUSTOM_BACKLIGHT
#undef DYNAMIC_KEYMAP_MACRO_EEPROM_ADDR

#define EEPROM_MAGIC_ADDR 34
#define EEPROM_VERSION_ADDR 36
#define DYNAMIC_KEYMAP_EEPROM_ADDR 37
#define EEPROM_CUSTOM_BACKLIGHT 637
#define DYNAMIC_KEYMAP_MACRO_EEPROM_ADDR 638
#endif