diff options
| author | Wilba <Jason.S.Williams@gmail.com> | 2018-12-01 03:43:34 +1100 |
|---|---|---|
| committer | Drashna Jaelre <drashna@live.com> | 2018-11-30 08:43:34 -0800 |
| commit | d7f1e072a859d7fcbaccd675b4bad7d02d214e52 (patch) | |
| tree | fb24714b6f37ef58f265802897a5225abf171753 /keyboards/rama/m6_b | |
| parent | b10aad45b60326c7e9f2d1fc67e45bd201341552 (diff) | |
| download | firmware-d7f1e072a859d7fcbaccd675b4bad7d02d214e52.tar.gz firmware-d7f1e072a859d7fcbaccd675b4bad7d02d214e52.tar.bz2 firmware-d7f1e072a859d7fcbaccd675b4bad7d02d214e52.zip | |
Added macros to Dynamic Keymaps, Zeal60 RGB backlight improvements (#4520)
* Refactored M6-B to use Zeal60 RGB backlight code
* Fixed M6-B LED co-ordinates
* Minor changes to RGB config for Zeal65
* Added dynamic keymaps to WT80-A, WT60-A, WT-80A, U80-A
* Macro implementation
* Implemented macros, API protocol version 8, RGB backlight fixes
* Improved radial effects for M6-B
* Fixed undefined references when building an RGB keyboard after M6-A
Diffstat (limited to 'keyboards/rama/m6_b')
| -rw-r--r-- | keyboards/rama/m6_b/config.h | 11 | ||||
| -rw-r--r-- | keyboards/rama/m6_b/rules.mk | 4 |
2 files changed, 9 insertions, 6 deletions
diff --git a/keyboards/rama/m6_b/config.h b/keyboards/rama/m6_b/config.h index c016703e0..67034ef8c 100644 --- a/keyboards/rama/m6_b/config.h +++ b/keyboards/rama/m6_b/config.h @@ -150,11 +150,14 @@ // 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 0x07 +#define EEPROM_VERSION 0x08 #define EEPROM_VERSION_ADDR 34 // Backlight config starts after EEPROM version #define RGB_BACKLIGHT_CONFIG_EEPROM_ADDR 35 -// Dynamic keymap starts after backlight config (35+37) -#define DYNAMIC_KEYMAP_EEPROM_ADDR 72 - +// Dynamic keymap starts after backlight config (35+43) +#define DYNAMIC_KEYMAP_EEPROM_ADDR 78 +// Dynamic macro starts after dynamic keymaps (78+(4*6*2)) = (78+48) +#define DYNAMIC_KEYMAP_MACRO_EEPROM_ADDR 126 +#define DYNAMIC_KEYMAP_MACRO_EEPROM_SIZE 898 +#define DYNAMIC_KEYMAP_MACRO_COUNT 16 diff --git a/keyboards/rama/m6_b/rules.mk b/keyboards/rama/m6_b/rules.mk index 1a7466af3..b7a76b8dd 100644 --- a/keyboards/rama/m6_b/rules.mk +++ b/keyboards/rama/m6_b/rules.mk @@ -1,6 +1,6 @@ # project specific files -SRC = ../zeal60/zeal60.c \ - ../zeal60/rgb_backlight.c \ +SRC = keyboards/zeal60/zeal60.c \ + keyboards/zeal60/rgb_backlight.c \ quantum/color.c \ drivers/issi/is31fl3218.c \ drivers/avr/i2c_master.c |