diff options
author | yiancar <yiangosyiangou@cytanet.com.cy> | 2019-01-07 01:22:19 +0000 |
---|---|---|
committer | MechMerlin <30334081+mechmerlin@users.noreply.github.com> | 2019-01-06 17:22:19 -0800 |
commit | 2bfac351edebc6e141d3291448512b0e228e5c47 (patch) | |
tree | dd8f9ed31f1a3ddabe59f26a9fdfb85b1570d0ae /tmk_core/common/eeconfig.h | |
parent | 2c0bc5ed6be737e98377fa2299102f6737bbea72 (diff) | |
download | qmk_firmware-2bfac351edebc6e141d3291448512b0e228e5c47.tar.gz qmk_firmware-2bfac351edebc6e141d3291448512b0e228e5c47.zip |
Final HS60v2 changes. (#4790)
* initial commit, this now mostly works
- RGB controls work
- Dynamic keymap still broken due to eeprom
- Via works
* STM32 eeprom update
- Update EEPROM emulation library to handle 8bit data like AVR.
- This library also allows for multiple page pairs resulting in greater EEPROM size flexibility
* hs60 changes
* HS60 hhkb added
* Update keyboards/hs60/v2/config.h
Co-Authored-By: yiancar <yiangosyiangou@cytanet.com.cy>
Diffstat (limited to 'tmk_core/common/eeconfig.h')
-rw-r--r-- | tmk_core/common/eeconfig.h | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/tmk_core/common/eeconfig.h b/tmk_core/common/eeconfig.h index 8d4e1d4d0..eedd67602 100644 --- a/tmk_core/common/eeconfig.h +++ b/tmk_core/common/eeconfig.h | |||
@@ -25,8 +25,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
25 | #define EECONFIG_MAGIC_NUMBER (uint16_t)0xFEED | 25 | #define EECONFIG_MAGIC_NUMBER (uint16_t)0xFEED |
26 | #define EECONFIG_MAGIC_NUMBER_OFF (uint16_t)0xFFFF | 26 | #define EECONFIG_MAGIC_NUMBER_OFF (uint16_t)0xFFFF |
27 | 27 | ||
28 | /* eeprom parameteter address */ | 28 | /* EEPROM parameter address */ |
29 | #if !defined(STM32_EEPROM_ENABLE) | ||
30 | #define EECONFIG_MAGIC (uint16_t *)0 | 29 | #define EECONFIG_MAGIC (uint16_t *)0 |
31 | #define EECONFIG_DEBUG (uint8_t *)2 | 30 | #define EECONFIG_DEBUG (uint8_t *)2 |
32 | #define EECONFIG_DEFAULT_LAYER (uint8_t *)3 | 31 | #define EECONFIG_DEFAULT_LAYER (uint8_t *)3 |
@@ -42,24 +41,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
42 | #define EECONFIG_KEYBOARD (uint32_t *)15 | 41 | #define EECONFIG_KEYBOARD (uint32_t *)15 |
43 | #define EECONFIG_USER (uint32_t *)19 | 42 | #define EECONFIG_USER (uint32_t *)19 |
44 | 43 | ||
45 | #else | ||
46 | /* STM32F3 uses 16byte block. Reconfigure memory map */ | ||
47 | #define EECONFIG_MAGIC (uint16_t *)0 | ||
48 | #define EECONFIG_DEBUG (uint8_t *)1 | ||
49 | #define EECONFIG_DEFAULT_LAYER (uint8_t *)2 | ||
50 | #define EECONFIG_KEYMAP (uint8_t *)3 | ||
51 | #define EECONFIG_MOUSEKEY_ACCEL (uint8_t *)4 | ||
52 | #define EECONFIG_BACKLIGHT (uint8_t *)5 | ||
53 | #define EECONFIG_AUDIO (uint8_t *)6 | ||
54 | #define EECONFIG_RGBLIGHT (uint32_t *)7 | ||
55 | #define EECONFIG_UNICODEMODE (uint8_t *)9 | ||
56 | #define EECONFIG_STENOMODE (uint8_t *)10 | ||
57 | // EEHANDS for two handed boards | ||
58 | #define EECONFIG_HANDEDNESS (uint8_t *)11 | ||
59 | #define EECONFIG_KEYBOARD (uint32_t *)12 | ||
60 | #define EECONFIG_USER (uint32_t *)14 | ||
61 | #endif | ||
62 | |||
63 | /* debug bit */ | 44 | /* debug bit */ |
64 | #define EECONFIG_DEBUG_ENABLE (1<<0) | 45 | #define EECONFIG_DEBUG_ENABLE (1<<0) |
65 | #define EECONFIG_DEBUG_MATRIX (1<<1) | 46 | #define EECONFIG_DEBUG_MATRIX (1<<1) |