aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryiancar <yiangosyiangou@cytanet.com.cy>2019-01-07 01:22:19 +0000
committerMechMerlin <30334081+mechmerlin@users.noreply.github.com>2019-01-06 17:22:19 -0800
commit2bfac351edebc6e141d3291448512b0e228e5c47 (patch)
treedd8f9ed31f1a3ddabe59f26a9fdfb85b1570d0ae
parent2c0bc5ed6be737e98377fa2299102f6737bbea72 (diff)
downloadqmk_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
-rw-r--r--drivers/issi/is31fl3733.c2
-rw-r--r--keyboards/hs60/v2/config.h89
-rw-r--r--keyboards/hs60/v2/keymaps/ansi/config.h2
-rw-r--r--keyboards/hs60/v2/keymaps/ansi/keymap.c22
-rw-r--r--keyboards/hs60/v2/keymaps/ansi/readme.md6
-rw-r--r--keyboards/hs60/v2/keymaps/default/keymap.c20
-rw-r--r--keyboards/hs60/v2/keymaps/default/readme.md6
-rw-r--r--keyboards/hs60/v2/keymaps/hhkb/config.h13
-rw-r--r--keyboards/hs60/v2/keymaps/hhkb/keymap.c34
-rw-r--r--keyboards/hs60/v2/keymaps/hhkb/readme.md6
-rw-r--r--keyboards/hs60/v2/mcuconf.h2
-rw-r--r--keyboards/hs60/v2/rules.mk18
-rw-r--r--keyboards/hs60/v2/v2.c621
-rw-r--r--keyboards/hs60/v2/v2.h7
-rw-r--r--keyboards/zeal60/rgb_backlight.c285
-rwxr-xr-xtmk_core/common/chibios/eeprom_stm32.c710
-rwxr-xr-xtmk_core/common/chibios/eeprom_stm32.h68
-rwxr-xr-xtmk_core/common/chibios/flash_stm32.c15
-rwxr-xr-xtmk_core/common/chibios/flash_stm32.h1
-rw-r--r--tmk_core/common/eeconfig.c4
-rw-r--r--tmk_core/common/eeconfig.h21
-rw-r--r--tmk_core/common/eeprom.h1
-rw-r--r--tmk_core/protocol/chibios/main.c2
23 files changed, 611 insertions, 1344 deletions
diff --git a/drivers/issi/is31fl3733.c b/drivers/issi/is31fl3733.c
index c198ec517..c18ed7ca3 100644
--- a/drivers/issi/is31fl3733.c
+++ b/drivers/issi/is31fl3733.c
@@ -24,10 +24,10 @@
24#include "wait.h" 24#include "wait.h"
25#endif 25#endif
26 26
27#include "is31fl3733.h"
27#include <string.h> 28#include <string.h>
28#include "i2c_master.h" 29#include "i2c_master.h"
29#include "progmem.h" 30#include "progmem.h"
30#include "rgb_matrix.h"
31 31
32// This is a 7-bit address, that gets left-shifted and bit 0 32// This is a 7-bit address, that gets left-shifted and bit 0
33// set to 0 for write, 1 for read (as per I2C protocol) 33// set to 0 for write, 1 for read (as per I2C protocol)
diff --git a/keyboards/hs60/v2/config.h b/keyboards/hs60/v2/config.h
index 192f7d6f2..bc1681ffd 100644
--- a/keyboards/hs60/v2/config.h
+++ b/keyboards/hs60/v2/config.h
@@ -20,9 +20,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
20#include "config_common.h" 20#include "config_common.h"
21 21
22/* USB Device descriptor parameter */ 22/* USB Device descriptor parameter */
23#define VENDOR_ID 0xFEED 23#define VENDOR_ID 0x8968
24#define PRODUCT_ID 0x0258 24#define PRODUCT_ID 0x4853
25#define DEVICE_VER 0x0001 25#define DEVICE_VER 0x0002
26#define MANUFACTURER Yiancar-Designs 26#define MANUFACTURER Yiancar-Designs
27#define PRODUCT HS60 V2 27#define PRODUCT HS60 V2
28#define DESCRIPTION GH60 compatible, tool free RGB keyboard 28#define DESCRIPTION GH60 compatible, tool free RGB keyboard
@@ -39,7 +39,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
39#define DIODE_DIRECTION COL2ROW 39#define DIODE_DIRECTION COL2ROW
40 40
41/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ 41/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
42#define DEBOUNCE 0 42#define DEBOUNCING_DELAY 5
43 43
44/* define if matrix has ghost (lacks anti-ghosting diodes) */ 44/* define if matrix has ghost (lacks anti-ghosting diodes) */
45//#define MATRIX_HAS_GHOST 45//#define MATRIX_HAS_GHOST
@@ -70,48 +70,63 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
70 */ 70 */
71//#define FORCE_NKRO 71//#define FORCE_NKRO
72 72
73/*
74 * Magic Key Options
75 *
76 * Magic keys are hotkey commands that allow control over firmware functions of
77 * the keyboard. They are best used in combination with the HID Listen program,
78 * found here: https://www.pjrc.com/teensy/hid_listen.html
79 *
80 * The options below allow the magic key functionality to be changed. This is
81 * useful if your keyboard/keypad is missing keys and you want magic key support.
82 *
83 */
84
85/* key combination for magic key command */ 73/* key combination for magic key command */
86#define IS_COMMAND() ( \ 74#define IS_COMMAND() ( \
87 keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \ 75 keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \
88) 76)
89 77
90/* 78/* Backlight options */
91 * Feature disable options
92 * These options are also useful to firmware size reduction.
93 */
94 79
95/* disable debug print */ 80#define RGB_BACKLIGHT_ENABLED 1
96//#define NO_DEBUG
97 81
98/* disable print */ 82#define RGB_BACKLIGHT_HS60
99//#define NO_PRINT
100 83
101/* Backlight options */ 84// they aren't really used if RGB_BACKLIGHT_HS60 defined
85#define RGB_BACKLIGHT_USE_SPLIT_BACKSPACE 0
86#define RGB_BACKLIGHT_USE_SPLIT_LEFT_SHIFT 0
87#define RGB_BACKLIGHT_USE_SPLIT_RIGHT_SHIFT 0
88#define RGB_BACKLIGHT_USE_7U_SPACEBAR 0
89#define RGB_BACKLIGHT_USE_ISO_ENTER 0
90#define RGB_BACKLIGHT_DISABLE_HHKB_BLOCKER_LEDS 0
102 91
103#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects 92// disable backlight when USB suspended (PC sleep/hibernate/shutdown)
104#define RGB_DISABLE_WHEN_USB_SUSPENDED false // turn off effects when suspended 93#define RGB_BACKLIGHT_DISABLE_WHEN_USB_SUSPENDED 0
105#define RGB_MATRIX_SKIP_FRAMES 3
106 94
107#define DRIVER_ADDR_1 0b1010000 95// disable backlight after timeout in minutes, 0 = no timeout
108#define DRIVER_ADDR_2 0b1010000 // this is here for compliancy reasons. 96#define RGB_BACKLIGHT_DISABLE_AFTER_TIMEOUT 0
109 97
110#define DRIVER_COUNT 2 98// the default effect (RGB test)
111#ifdef HS60_ANSI 99#define RGB_BACKLIGHT_EFFECT 255
112#define DRIVER_1_LED_TOTAL 61
113#else
114#define DRIVER_1_LED_TOTAL 62
115#endif
116 100
117#define DRIVER_LED_TOTAL DRIVER_1_LED_TOTAL 101#define DRIVER_COUNT 2
102#define DRIVER_LED_TOTAL 64
103
104// These define which keys in the matrix are alphas/mods
105// Used for backlight effects so colors are different for
106// alphas vs. mods
107// Each value is for a row, bit 0 is column 0
108// Alpha=0 Mod=1
109#define RGB_BACKLIGHT_ALPHAS_MODS_ROW_0 0b0010000000000001
110#define RGB_BACKLIGHT_ALPHAS_MODS_ROW_1 0b0000000000000001
111#define RGB_BACKLIGHT_ALPHAS_MODS_ROW_2 0b0010000000000001
112#define RGB_BACKLIGHT_ALPHAS_MODS_ROW_3 0b0010000000000001
113#define RGB_BACKLIGHT_ALPHAS_MODS_ROW_4 0b0011110000000111
114
115// TODO: refactor with new user EEPROM code (coming soon)
116#define EEPROM_MAGIC 0x451F
117#define EEPROM_MAGIC_ADDR 32
118// Bump this every time we change what we store
119// This will automatically reset the EEPROM with defaults
120// and avoid loading invalid data from the EEPROM
121#define EEPROM_VERSION 0x08
122#define EEPROM_VERSION_ADDR 34
123
124// Backlight config starts after EEPROM version
125#define RGB_BACKLIGHT_CONFIG_EEPROM_ADDR 35
126// Dynamic keymap starts after backlight config (35+31)
127#define DYNAMIC_KEYMAP_EEPROM_ADDR 66
128#define DYNAMIC_KEYMAP_LAYER_COUNT 4
129// Dynamic macro starts after dynamic keymaps (66+(4*5*14*2)) = (66+560)
130#define DYNAMIC_KEYMAP_MACRO_EEPROM_ADDR 626
131#define DYNAMIC_KEYMAP_MACRO_EEPROM_SIZE 398
132#define DYNAMIC_KEYMAP_MACRO_COUNT 16
diff --git a/keyboards/hs60/v2/keymaps/ansi/config.h b/keyboards/hs60/v2/keymaps/ansi/config.h
index f51cc16d8..96adaf568 100644
--- a/keyboards/hs60/v2/keymaps/ansi/config.h
+++ b/keyboards/hs60/v2/keymaps/ansi/config.h
@@ -19,3 +19,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
19/* Include overwrites for specific keymap */ 19/* Include overwrites for specific keymap */
20 20
21#define HS60_ANSI 21#define HS60_ANSI
22#undef PRODUCT_ID
23#define PRODUCT_ID 0x4854
diff --git a/keyboards/hs60/v2/keymaps/ansi/keymap.c b/keyboards/hs60/v2/keymaps/ansi/keymap.c
index 923af9e2c..ba649470b 100644
--- a/keyboards/hs60/v2/keymaps/ansi/keymap.c
+++ b/keyboards/hs60/v2/keymaps/ansi/keymap.c
@@ -26,11 +26,25 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
26 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1) , KC_APP, KC_RCTL), 26 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1) , KC_APP, KC_RCTL),
27 27
28[1] = LAYOUT_60_ansi( /* FN */ 28[1] = LAYOUT_60_ansi( /* FN */
29 KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL ,\ 29 KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL ,\
30 KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET , KC_TRNS,\ 30 KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS,\
31 KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,\ 31 KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, S1_DEC, S1_INC, S2_DEC, S2_INC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,\
32 KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD, KC_TRNS,\ 32 KC_TRNS, EF_DEC, EF_INC, H1_DEC, H1_INC, H2_DEC, H2_INC, BR_DEC, BR_INC, ES_DEC, ES_INC, KC_TRNS,\
33 KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), 33 KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
34
35[2] = LAYOUT_60_ansi( /* Empty for dynamic keymaps */
36 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,\
37 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,\
38 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,\
39 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,\
40 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
41
42[3] = LAYOUT_60_ansi( /* Empty for dynamic keymaps */
43 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,\
44 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,\
45 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,\
46 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,\
47 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
34}; 48};
35 49
36void matrix_init_user(void) { 50void matrix_init_user(void) {
diff --git a/keyboards/hs60/v2/keymaps/ansi/readme.md b/keyboards/hs60/v2/keymaps/ansi/readme.md
index fa811319d..650871a5e 100644
--- a/keyboards/hs60/v2/keymaps/ansi/readme.md
+++ b/keyboards/hs60/v2/keymaps/ansi/readme.md
@@ -1,6 +1,6 @@
1The default keymap for ANSI HS60 1The default keymap for ANSI HS60 V2
2================================ 2===================================
3 3
4![Layout image](https://imgur.com/CSyPw0J.png) 4![Layout image](https://i.imgur.com/m8t5CfE.png)
5 5
6Default layer is normal ANSI and Fn layer is used for RGB functions, Volume control and arrow cluster \ No newline at end of file 6Default layer is normal ANSI and Fn layer is used for RGB functions, Volume control and arrow cluster \ No newline at end of file
diff --git a/keyboards/hs60/v2/keymaps/default/keymap.c b/keyboards/hs60/v2/keymaps/default/keymap.c
index 2a5e82361..c1e575769 100644
--- a/keyboards/hs60/v2/keymaps/default/keymap.c
+++ b/keyboards/hs60/v2/keymaps/default/keymap.c
@@ -26,11 +26,25 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
26 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1) , KC_APP, KC_RCTL), 26 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1) , KC_APP, KC_RCTL),
27 27
28[1] = LAYOUT_60_iso( /* FN */ 28[1] = LAYOUT_60_iso( /* FN */
29 KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL ,\ 29 KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL ,\
30 KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET , \ 30 KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET , \
31 KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,\ 31 KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, S1_DEC, S1_INC, S2_DEC, S2_INC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,\
32 KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD, KC_TRNS, KC_TRNS,\ 32 KC_TRNS, KC_TRNS, EF_DEC, EF_INC, H1_DEC, H1_INC, H2_DEC, H2_INC, BR_DEC, BR_INC, ES_DEC, ES_INC, KC_TRNS,\
33 KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), 33 KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
34
35[2] = LAYOUT_60_iso( /* Empty for dynamic keymaps */
36 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,\
37 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \
38 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,\
39 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,\
40 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
41
42[3] = LAYOUT_60_iso( /* Empty for dynamic keymaps */
43 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,\
44 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \
45 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,\
46 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,\
47 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
34}; 48};
35 49
36void matrix_init_user(void) { 50void matrix_init_user(void) {
diff --git a/keyboards/hs60/v2/keymaps/default/readme.md b/keyboards/hs60/v2/keymaps/default/readme.md
index 9125cb349..f0b29900e 100644
--- a/keyboards/hs60/v2/keymaps/default/readme.md
+++ b/keyboards/hs60/v2/keymaps/default/readme.md
@@ -1,6 +1,6 @@
1The default keymap for ISO HS60 1The default keymap for ISO HS60 V2
2=============================== 2==================================
3 3
4![Layout image](https://imgur.com/HXj4tYL.png) 4![Layout image](https://imgur.com/6go4vQV.png)
5 5
6Default layer is normal ISO and Fn layer is used for RGB functions, Volume control and arrow cluster \ No newline at end of file 6Default layer is normal ISO and Fn layer is used for RGB functions, Volume control and arrow cluster \ No newline at end of file
diff --git a/keyboards/hs60/v2/keymaps/hhkb/config.h b/keyboards/hs60/v2/keymaps/hhkb/config.h
index 3db403ecc..fc1b6d8f4 100644
--- a/keyboards/hs60/v2/keymaps/hhkb/config.h
+++ b/keyboards/hs60/v2/keymaps/hhkb/config.h
@@ -19,3 +19,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
19/* Include overwrites for specific keymap */ 19/* Include overwrites for specific keymap */
20 20
21#define HS60_HHKB 21#define HS60_HHKB
22#undef PRODUCT_ID
23#define PRODUCT_ID 0x4855
24
25#undef RGB_BACKLIGHT_ALPHAS_MODS_ROW_0
26#undef RGB_BACKLIGHT_ALPHAS_MODS_ROW_1
27#undef RGB_BACKLIGHT_ALPHAS_MODS_ROW_2
28#undef RGB_BACKLIGHT_ALPHAS_MODS_ROW_3
29#undef RGB_BACKLIGHT_ALPHAS_MODS_ROW_4
30#define RGB_BACKLIGHT_ALPHAS_MODS_ROW_0 0b0000000000000001
31#define RGB_BACKLIGHT_ALPHAS_MODS_ROW_1 0b0000000000000001
32#define RGB_BACKLIGHT_ALPHAS_MODS_ROW_2 0b0011000000000001
33#define RGB_BACKLIGHT_ALPHAS_MODS_ROW_3 0b0011000000000001
34#define RGB_BACKLIGHT_ALPHAS_MODS_ROW_4 0b0011100000000111
diff --git a/keyboards/hs60/v2/keymaps/hhkb/keymap.c b/keyboards/hs60/v2/keymaps/hhkb/keymap.c
index d52fc4bac..9641eedb4 100644
--- a/keyboards/hs60/v2/keymaps/hhkb/keymap.c
+++ b/keyboards/hs60/v2/keymaps/hhkb/keymap.c
@@ -19,18 +19,32 @@
19 19
20const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 20const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
21[0] = LAYOUT_60_hhkb( /* Base */ 21[0] = LAYOUT_60_hhkb( /* Base */
22 KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_GRV, KC_BSLS, \ 22 KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_GRV, KC_BSLS,\
23 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, \ 23 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC,\
24 KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, \ 24 KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, \
25 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), \ 25 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1),\
26 KC_LCTL, KC_LGUI,KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL ), 26 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL ),
27 27
28[1] = LAYOUT_60_hhkb( /* FN */ 28[1] = LAYOUT_60_hhkb( /* FN */
29 RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS,\ 29 RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS,\
30 KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD, KC_UP, KC_TRNS, KC_DEL, \ 30 KC_TRNS, EF_DEC, EF_INC, H1_DEC, H1_INC, H2_DEC, H2_INC, BR_DEC, BR_INC, ES_DEC, ES_INC, KC_UP, KC_TRNS, KC_DEL, \
31 KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_TRNS, \ 31 KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_TRNS, \
32 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END, KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS, \ 32 KC_TRNS, KC_TRNS, S1_DEC, S1_INC, S2_DEC, S2_INC, KC_TRNS, KC_TRNS, KC_END, KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS,\
33 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ) 33 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ),
34
35[2] = LAYOUT_60_hhkb( /* Empty for dynamic keymaps */
36 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,\
37 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,\
38 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \
39 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,\
40 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ),
41
42[3] = LAYOUT_60_hhkb( /* Empty for dynamic keymaps */
43 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,\
44 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,\
45 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \
46 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,\
47 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ),
34}; 48};
35 49
36void matrix_init_user(void) { 50void matrix_init_user(void) {
diff --git a/keyboards/hs60/v2/keymaps/hhkb/readme.md b/keyboards/hs60/v2/keymaps/hhkb/readme.md
new file mode 100644
index 000000000..69b812c60
--- /dev/null
+++ b/keyboards/hs60/v2/keymaps/hhkb/readme.md
@@ -0,0 +1,6 @@
1The default keymap for HHKB HS60 V2
2===================================
3
4![Layout image](https://imgur.com/usbrQWL.png)
5
6Default layer is normal HHKB with 7U space. Fn layer is used for RGB functions, Volume control and arrow cluster \ No newline at end of file
diff --git a/keyboards/hs60/v2/mcuconf.h b/keyboards/hs60/v2/mcuconf.h
index 226da48d5..ce608f904 100644
--- a/keyboards/hs60/v2/mcuconf.h
+++ b/keyboards/hs60/v2/mcuconf.h
@@ -139,7 +139,7 @@
139#define STM32_GPT_USE_TIM1 FALSE 139#define STM32_GPT_USE_TIM1 FALSE
140#define STM32_GPT_USE_TIM2 FALSE 140#define STM32_GPT_USE_TIM2 FALSE
141#define STM32_GPT_USE_TIM3 FALSE 141#define STM32_GPT_USE_TIM3 FALSE
142#define STM32_GPT_USE_TIM4 FALSE 142#define STM32_GPT_USE_TIM4 TRUE
143#define STM32_GPT_USE_TIM6 TRUE 143#define STM32_GPT_USE_TIM6 TRUE
144#define STM32_GPT_USE_TIM7 TRUE 144#define STM32_GPT_USE_TIM7 TRUE
145#define STM32_GPT_USE_TIM8 TRUE 145#define STM32_GPT_USE_TIM8 TRUE
diff --git a/keyboards/hs60/v2/rules.mk b/keyboards/hs60/v2/rules.mk
index 51e3cf0a3..a2850a830 100644
--- a/keyboards/hs60/v2/rules.mk
+++ b/keyboards/hs60/v2/rules.mk
@@ -1,4 +1,9 @@
1# project specific files 1# project specific files
2SRC = keyboards/zeal60/zeal60.c \
3 keyboards/zeal60/rgb_backlight.c \
4 drivers/issi/is31fl3733.c \
5 quantum/color.c \
6 drivers/arm/i2c_master.c
2 7
3## chip/board settings 8## chip/board settings
4# the next two should match the directories in 9# the next two should match the directories in
@@ -44,15 +49,18 @@ DFU_ARGS = -d 0483:df11 -a 0 -s 0x08000000:leave
44# Build Options 49# Build Options
45# comment out to disable the options. 50# comment out to disable the options.
46# 51#
47BACKLIGHT_ENABLE = no 52BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
48BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration 53BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration
49MOUSEKEY_ENABLE = yes # Mouse keys 54MOUSEKEY_ENABLE = yes # Mouse keys
50EXTRAKEY_ENABLE = yes # Audio control and System control 55EXTRAKEY_ENABLE = yes # Audio control and System control
51CONSOLE_ENABLE = no # Console for debug 56CONSOLE_ENABLE = no # Console for debug
52COMMAND_ENABLE = no # Commands for debug and configuration 57COMMAND_ENABLE = no # Commands for debug and configuration
53#SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend 58SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
54NKRO_ENABLE = yes # USB Nkey Rollover 59NKRO_ENABLE = yes # USB Nkey Rollover
55AUDIO_ENABLE = no 60AUDIO_ENABLE = no # Audio output on port C6
56RGB_MATRIX_ENABLE = IS31FL3733 # Use RGB matrix
57NO_USB_STARTUP_CHECK = no # Disable initialization only when usb is plugged in 61NO_USB_STARTUP_CHECK = no # Disable initialization only when usb is plugged in
58#SERIAL_LINK_ENABLE = yes 62#SERIAL_LINK_ENABLE = yes
63
64RAW_ENABLE = yes
65DYNAMIC_KEYMAP_ENABLE = yes
66CIE1931_CURVE = yes
diff --git a/keyboards/hs60/v2/v2.c b/keyboards/hs60/v2/v2.c
index 4289c1fed..2e12538e9 100644
--- a/keyboards/hs60/v2/v2.c
+++ b/keyboards/hs60/v2/v2.c
@@ -13,623 +13,6 @@
13 * You should have received a copy of the GNU General Public License 13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>. 14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */ 15 */
16#include "v2.h" 16#ifndef RGB_BACKLIGHT_HS60
17 17#error RGB_BACKLIGHT_M60_A not defined, recheck config.h
18//#include "is31fl3733.h"
19
20// Please ignore this is for upcoming features
21/*#ifdef RAW_ENABLE
22
23void raw_hid_receive( uint8_t *data, uint8_t length )
24{
25 uint8_t command = data[0];
26 switch ( command )
27 {
28 case id_protocol_version:
29 {
30 msg_protocol_version *msg = (msg_protocol_version*)&data[1];
31 msg->version = PROTOCOL_VERSION;
32 break;
33 }
34#if USE_KEYMAPS_IN_EEPROM
35 case id_keymap_keycode_load:
36 {
37 msg_keymap_keycode_load *msg = (msg_keymap_keycode_load*)&data[1];
38 msg->keycode = keymap_keycode_load( msg->layer, msg->row, msg->column );
39 break;
40 }
41 case id_keymap_keycode_save:
42 {
43 msg_keymap_keycode_save *msg = (msg_keymap_keycode_save*)&data[1];
44 keymap_keycode_save( msg->layer, msg->row, msg->column, msg->keycode);
45 break;
46 }
47 case id_keymap_default_save:
48 {
49 keymap_default_save();
50 break;
51 }
52#endif // USE_KEYMAPS_IN_EEPROM
53 case id_backlight_config_set_values:
54 {
55 msg_backlight_config_set_values *msg = (msg_backlight_config_set_values*)&data[1];
56 backlight_config_set_values(msg);
57 backlight_config_save();
58 break;
59 }
60 case id_backlight_config_set_alphas_mods:
61 {
62 msg_backlight_config_set_alphas_mods *msg = (msg_backlight_config_set_alphas_mods*)&data[1];
63 backlight_config_set_alphas_mods( msg->alphas_mods );
64 backlight_config_save();
65 break;
66 }
67 case id_backlight_set_key_color:
68 {
69 msg_backlight_set_key_color *msg = (msg_backlight_set_key_color*)&data[1];
70 backlight_set_key_color(msg->row, msg->column, msg->hsv);
71 break;
72 }
73 case id_system_get_state:
74 {
75 msg_system_state *msg = (msg_system_state*)&data[1];
76 msg->value = backlight_get_tick();
77 break;
78 }
79 default:
80 {
81 // Unhandled message.
82 data[0] = id_unhandled;
83 break;
84 }
85 }
86
87 // Return same buffer with values changed
88 raw_hid_send( data, length );
89
90}
91
92#endif*/
93
94#ifdef HS60_ANSI
95
96const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
97/* Refer to IS31 manual for these locations
98 * driver
99 * | R location
100 * | | G location
101 * | | | B location
102 * | | | | */
103 {0, B_1, A_1, C_1}, //MX1
104 {0, E_1, D_1, F_1}, //MX2
105 {0, H_1, G_1, I_1}, //MX3
106 {0, K_1, J_1, L_1}, //MX4
107 {0, B_2, A_2, C_2}, //MX6
108 {0, E_2, D_2, F_2}, //MX7
109 {0, H_2, G_2, I_2}, //MX8
110 {0, K_2, J_2, L_2}, //MX14
111 {0, B_3, A_3, C_3}, //MX11
112 {0, E_3, D_3, F_3}, //MX12
113 {0, H_3, G_3, I_3}, //MX13
114 {0, K_3, J_3, L_3}, //MX19
115 {0, B_4, A_4, C_4}, //MX16
116 {0, E_4, D_4, F_4}, //MX17
117 {0, H_4, G_4, I_4}, //MX18
118 {0, K_4, J_4, L_4}, //MX23
119 {0, B_5, A_5, C_5}, //MX20
120 {0, E_5, D_5, F_5}, //MX21
121 {0, H_5, G_5, I_5}, //MX22
122 {0, K_5, J_5, L_5}, //MX27
123 {0, B_6, A_6, C_6}, //MX24
124 {0, E_6, D_6, F_6}, //MX25
125 {0, H_6, G_6, I_6}, //MX26
126 {0, K_6, J_6, L_6}, //MX31
127 {0, B_7, A_7, C_7}, //MX28
128 {0, E_7, D_7, F_7}, //MX29
129 {0, H_7, G_7, I_7}, //MX30
130 {0, K_7, J_7, L_7}, //MX36
131 {0, B_8, A_8, C_8}, //MX33
132 {0, E_8, D_8, F_8}, //MX34
133 {0, H_8, G_8, I_8}, //MX35
134 {0, K_8, J_8, L_8}, //MX40
135 {0, B_9, A_9, C_9}, //MX37
136 {0, E_9, D_9, F_9}, //MX38
137 {0, H_9, G_9, I_9}, //MX39
138 {0, K_9, J_9, L_9}, //MX44
139 {0, B_10, A_10, C_10}, //MX41
140 {0, E_10, D_10, F_10}, //MX42
141 {0, H_10, G_10, I_10}, //MX43
142 {0, K_10, J_10, L_10}, //MX48
143 {0, B_11, A_11, C_11}, //MX45
144 {0, E_11, D_11, F_11}, //MX46
145 {0, H_11, G_11, I_11}, //MX47
146 {0, K_11, J_11, L_11}, //MX53
147 {0, B_12, A_12, C_12}, //MX50
148 {0, E_12, D_12, F_12}, //MX51
149 {0, H_12, G_12, I_12}, //MX52
150
151 {0, B_13, A_13, C_13}, //MX55
152 {0, E_13, D_13, F_13}, //MX56
153
154 {0, K_13, J_13, L_13}, //MX61
155 {0, B_14, A_14, C_14}, //MX59
156 {0, E_14, D_14, F_14}, //MX57
157 {0, H_14, G_14, I_14}, //MX60
158 {0, K_14, J_14, L_14}, //MX62
159 {0, B_15, A_15, C_15}, //MX5
160 {0, E_15, D_15, F_15}, //MX10
161 {0, H_15, G_15, I_15}, //MX15
162 {0, K_15, J_15, L_15}, //MX32
163
164 {0, E_16, D_16, F_16}, //MX49
165 {0, H_16, G_16, I_16}, //MX54
166 {0, K_16, J_16, L_16}, //MX58
167};
168
169const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
170//
171// MX1, MX6, MX11, MX16, MX20, MX24, MX28, MX33, MX37, MX41, MX45, MX50, MX55, MX59,
172// MX2, MX7, MX12, MX17, MX21, MX25, MX29, MX34, MX38, MX42, MX46, MX51, MX56, ---,
173// MX3, MX8, MX13, MX18, MX22, MX26, MX30, MX35, MX39, MX43, MX47, MX52, MX57, MX60,
174// MX4, ---, MX14, MX19, MX23, MX27, MX31, MX36, MX40, MX44, MX48, MX53, ---, MX61,
175// MX5, MX10, MX15, ---, ---, ---, MX32, ---, ---, ---, MX49, MX54, MX58, MX62
176/* {row | col << 4}
177 * | {x=0..224, y=0..64}
178 * | | modifier
179 * | | | */
180 {{0|(0<<4)}, { 0, 0}, 1}, //MX1
181 {{1|(0<<4)}, { 0, 16}, 1}, //MX2
182 {{2|(0<<4)}, { 0, 32}, 1}, //MX3
183 {{3|(0<<4)}, { 0, 48}, 1}, //MX4
184 {{0|(1<<4)}, { 17, 0}, 0}, //MX6
185 {{1|(1<<4)}, { 17, 16}, 0}, //MX7
186 {{2|(1<<4)}, { 17, 32}, 0}, //MX8
187 {{3|(2<<4)}, { 34, 48}, 0}, //MX14
188 {{0|(2<<4)}, { 34, 0}, 0}, //MX11
189 {{1|(2<<4)}, { 34, 16}, 0}, //MX12
190 {{2|(2<<4)}, { 34, 32}, 0}, //MX13
191 {{3|(3<<4)}, { 51, 48}, 0}, //MX19
192 {{0|(3<<4)}, { 51, 0}, 0}, //MX16
193 {{1|(3<<4)}, { 51, 16}, 0}, //MX17
194 {{2|(3<<4)}, { 51, 32}, 0}, //MX18
195 {{3|(4<<4)}, { 68, 48}, 0}, //MX23
196 {{0|(4<<4)}, { 68, 0}, 0}, //MX20
197 {{1|(4<<4)}, { 68, 16}, 0}, //MX21
198 {{2|(4<<4)}, { 68, 32}, 0}, //MX22
199 {{3|(5<<4)}, { 85, 48}, 0}, //MX27
200 {{0|(5<<4)}, { 85, 0}, 0}, //MX24
201 {{1|(5<<4)}, { 85, 16}, 0}, //MX25
202 {{2|(5<<4)}, { 85, 32}, 0}, //MX26
203 {{3|(6<<4)}, {102, 48}, 0}, //MX31
204 {{0|(6<<4)}, {102, 0}, 0}, //MX28
205 {{1|(6<<4)}, {102, 16}, 0}, //MX29
206 {{2|(6<<4)}, {102, 32}, 0}, //MX30
207 {{3|(7<<4)}, {119, 48}, 0}, //MX36
208 {{0|(7<<4)}, {119, 0}, 0}, //MX33
209 {{1|(7<<4)}, {119, 16}, 0}, //MX34
210 {{2|(7<<4)}, {119, 32}, 0}, //MX35
211 {{3|(8<<4)}, {136, 48}, 0}, //MX40
212 {{0|(8<<4)}, {136, 0}, 0}, //MX37
213 {{1|(8<<4)}, {136, 16}, 0}, //MX38
214 {{2|(8<<4)}, {136, 32}, 0}, //MX39
215 {{3|(9<<4)}, {153, 48}, 0}, //MX44
216 {{0|(9<<4)}, {153, 0}, 0}, //MX41
217 {{1|(9<<4)}, {153, 16}, 0}, //MX42
218 {{2|(9<<4)}, {153, 32}, 0}, //MX43
219 {{3|(10<<4)}, {170, 48}, 0}, //MX48
220 {{0|(10<<4)}, {170, 0}, 0}, //MX45
221 {{1|(10<<4)}, {170, 16}, 0}, //MX46
222 {{2|(10<<4)}, {170, 32}, 0}, //MX47
223 {{3|(11<<4)}, {187, 48}, 0}, //MX53
224 {{0|(11<<4)}, {187, 0}, 0}, //MX50
225 {{1|(11<<4)}, {187, 16}, 0}, //MX51
226 {{2|(11<<4)}, {187, 32}, 0}, //MX52
227
228 {{0|(12<<4)}, {204, 0}, 0}, //MX55
229 {{1|(12<<4)}, {204, 16}, 0}, //MX56
230
231 {{3|(13<<4)}, {221, 48}, 1}, //MX61
232 {{0|(13<<4)}, {221, 0}, 1}, //MX59
233 {{2|(12<<4)}, {221, 16}, 0}, //MX57
234 {{2|(13<<4)}, {221, 32}, 1}, //MX60
235 {{4|(13<<4)}, {221, 64}, 1}, //MX62
236 {{4|(0<<4)}, { 0, 64}, 1}, //MX5
237 {{4|(1<<4)}, { 17, 64}, 1}, //MX10
238 {{4|(2<<4)}, { 34, 64}, 1}, //MX15
239 {{4|(5<<4)}, {102, 64}, 0}, //MX32
240
241 {{4|(10<<4)}, {170, 64}, 1}, //MX49
242 {{4|(11<<4)}, {187, 64}, 1}, //MX54
243 {{4|(12<<4)}, {204, 64}, 1} //MX58
244};
245
246#elif defined(HS60_HHKB)
247
248const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
249/* Refer to IS31 manual for these locations
250 * driver
251 * | R location
252 * | | G location
253 * | | | B location
254 * | | | | */
255 {0, B_1, A_1, C_1}, //MX1
256 {0, E_1, D_1, F_1}, //MX2
257 {0, H_1, G_1, I_1}, //MX3
258 {0, K_1, J_1, L_1}, //MX4
259 {0, B_2, A_2, C_2}, //MX6
260 {0, E_2, D_2, F_2}, //MX7
261 {0, H_2, G_2, I_2}, //MX8
262 {0, K_2, J_2, L_2}, //MX14
263 {0, B_3, A_3, C_3}, //MX11
264 {0, E_3, D_3, F_3}, //MX12
265 {0, H_3, G_3, I_3}, //MX13
266 {0, K_3, J_3, L_3}, //MX19
267 {0, B_4, A_4, C_4}, //MX16
268 {0, E_4, D_4, F_4}, //MX17
269 {0, H_4, G_4, I_4}, //MX18
270 {0, K_4, J_4, L_4}, //MX23
271 {0, B_5, A_5, C_5}, //MX20
272 {0, E_5, D_5, F_5}, //MX21
273 {0, H_5, G_5, I_5}, //MX22
274 {0, K_5, J_5, L_5}, //MX27
275 {0, B_6, A_6, C_6}, //MX24
276 {0, E_6, D_6, F_6}, //MX25
277 {0, H_6, G_6, I_6}, //MX26
278 {0, K_6, J_6, L_6}, //MX31
279 {0, B_7, A_7, C_7}, //MX28
280 {0, E_7, D_7, F_7}, //MX29
281 {0, H_7, G_7, I_7}, //MX30
282 {0, K_7, J_7, L_7}, //MX36
283 {0, B_8, A_8, C_8}, //MX33
284 {0, E_8, D_8, F_8}, //MX34
285 {0, H_8, G_8, I_8}, //MX35
286 {0, K_8, J_8, L_8}, //MX40
287 {0, B_9, A_9, C_9}, //MX37
288 {0, E_9, D_9, F_9}, //MX38
289 {0, H_9, G_9, I_9}, //MX39
290 {0, K_9, J_9, L_9}, //MX44
291 {0, B_10, A_10, C_10}, //MX41
292 {0, E_10, D_10, F_10}, //MX42
293 {0, H_10, G_10, I_10}, //MX43
294 {0, K_10, J_10, L_10}, //MX48
295 {0, B_11, A_11, C_11}, //MX45
296 {0, E_11, D_11, F_11}, //MX46
297 {0, H_11, G_11, I_11}, //MX47
298 {0, K_11, J_11, L_11}, //MX53
299 {0, B_12, A_12, C_12}, //MX50
300 {0, E_12, D_12, F_12}, //MX51
301 {0, H_12, G_12, I_12}, //MX52
302 {0, K_12, J_12, L_12}, //MX64
303 {0, B_13, A_13, C_13}, //MX55
304 {0, E_13, D_13, F_13}, //MX56
305 {0, H_13, G_13, I_13}, //MX63
306 {0, K_13, J_13, L_13}, //MX61
307 {0, B_14, A_14, C_14}, //MX59
308 {0, E_14, D_14, F_14}, //MX57
309 {0, H_14, G_14, I_14}, //MX60
310 {0, K_14, J_14, L_14}, //MX62
311 {0, B_15, A_15, C_15}, //MX5
312 {0, E_15, D_15, F_15}, //MX10
313 {0, H_15, G_15, I_15}, //MX15
314 {0, K_15, J_15, L_15}, //MX32
315
316
317 {0, H_16, G_16, I_16}, //MX54
318 {0, K_16, J_16, L_16}, //MX58
319};
320
321const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
322//
323// MX1, MX6, MX11, MX16, MX20, MX24, MX28, MX33, MX37, MX41, MX45, MX50, MX55, MX59,
324// MX2, MX7, MX12, MX17, MX21, MX25, MX29, MX34, MX38, MX42, MX46, MX51, MX56, MX64,
325// MX3, MX8, MX13, MX18, MX22, MX26, MX30, MX35, MX39, MX43, MX47, MX52, MX57, MX60,
326// MX4, ----, MX14, MX19, MX23, MX27, MX31, MX36, MX40, MX44, MX48, MX53, MX63, MX61,
327// MX5, MX10, MX15, ----, ----, ----, MX32, ----, ---, ----, ----, MX54, MX58, MX62
328/* {row | col << 4}
329 * | {x=0..224, y=0..64}
330 * | | modifier
331 * | | | */
332 {{0|(0<<4)}, { 0, 0}, 1}, //MX1
333 {{1|(0<<4)}, { 0, 16}, 1}, //MX2
334 {{2|(0<<4)}, { 0, 32}, 1}, //MX3
335 {{3|(0<<4)}, { 0, 48}, 1}, //MX4
336 {{0|(1<<4)}, { 17, 0}, 0}, //MX6
337 {{1|(1<<4)}, { 17, 16}, 0}, //MX7
338 {{2|(1<<4)}, { 17, 32}, 0}, //MX8
339 {{3|(2<<4)}, { 34, 48}, 0}, //MX14
340 {{0|(2<<4)}, { 34, 0}, 0}, //MX11
341 {{1|(2<<4)}, { 34, 16}, 0}, //MX12
342 {{2|(2<<4)}, { 34, 32}, 0}, //MX13
343 {{3|(3<<4)}, { 51, 48}, 0}, //MX19
344 {{0|(3<<4)}, { 51, 0}, 0}, //MX16
345 {{1|(3<<4)}, { 51, 16}, 0}, //MX17
346 {{2|(3<<4)}, { 51, 32}, 0}, //MX18
347 {{3|(4<<4)}, { 68, 48}, 0}, //MX23
348 {{0|(4<<4)}, { 68, 0}, 0}, //MX20
349 {{1|(4<<4)}, { 68, 16}, 0}, //MX21
350 {{2|(4<<4)}, { 68, 32}, 0}, //MX22
351 {{3|(5<<4)}, { 85, 48}, 0}, //MX27
352 {{0|(5<<4)}, { 85, 0}, 0}, //MX24
353 {{1|(5<<4)}, { 85, 16}, 0}, //MX25
354 {{2|(5<<4)}, { 85, 32}, 0}, //MX26
355 {{3|(6<<4)}, {102, 48}, 0}, //MX31
356 {{0|(6<<4)}, {102, 0}, 0}, //MX28
357 {{1|(6<<4)}, {102, 16}, 0}, //MX29
358 {{2|(6<<4)}, {102, 32}, 0}, //MX30
359 {{3|(7<<4)}, {119, 48}, 0}, //MX36
360 {{0|(7<<4)}, {119, 0}, 0}, //MX33
361 {{1|(7<<4)}, {119, 16}, 0}, //MX34
362 {{2|(7<<4)}, {119, 32}, 0}, //MX35
363 {{3|(8<<4)}, {136, 48}, 0}, //MX40
364 {{0|(8<<4)}, {136, 0}, 0}, //MX37
365 {{1|(8<<4)}, {136, 16}, 0}, //MX38
366 {{2|(8<<4)}, {136, 32}, 0}, //MX39
367 {{3|(9<<4)}, {153, 48}, 0}, //MX44
368 {{0|(9<<4)}, {153, 0}, 0}, //MX41
369 {{1|(9<<4)}, {153, 16}, 0}, //MX42
370 {{2|(9<<4)}, {153, 32}, 0}, //MX43
371 {{3|(10<<4)}, {170, 48}, 0}, //MX48
372 {{0|(10<<4)}, {170, 0}, 0}, //MX45
373 {{1|(10<<4)}, {170, 16}, 0}, //MX46
374 {{2|(10<<4)}, {170, 32}, 0}, //MX47
375 {{3|(11<<4)}, {187, 48}, 0}, //MX53
376 {{0|(11<<4)}, {187, 0}, 0}, //MX50
377 {{1|(11<<4)}, {187, 16}, 0}, //MX51
378 {{2|(11<<4)}, {187, 32}, 0}, //MX52
379 {{1|(13<<4)}, {221, 0}, 1}, //MX64
380 {{0|(12<<4)}, {204, 0}, 0}, //MX55
381 {{1|(12<<4)}, {204, 16}, 0}, //MX56
382 {{3|(12<<4)}, {204, 48}, 0}, //MX63
383 {{3|(13<<4)}, {212, 48}, 1}, //MX61
384 {{0|(13<<4)}, {221, 0}, 0}, //MX59
385 {{2|(12<<4)}, {221, 16}, 0}, //MX57
386 {{2|(13<<4)}, {221, 32}, 1}, //MX60
387 {{4|(13<<4)}, {221, 64}, 1}, //MX62
388 {{4|(0<<4)}, { 0, 64}, 1}, //MX5
389 {{4|(1<<4)}, { 17, 64}, 1}, //MX10
390 {{4|(2<<4)}, { 34, 64}, 1}, //MX15
391 {{4|(5<<4)}, {102, 64}, 0}, //MX32
392
393
394 {{4|(11<<4)}, {187, 64}, 1}, //MX54
395 {{4|(12<<4)}, {204, 64}, 1} //MX58
396};
397
398#else //ISO layout
399
400const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
401/* Refer to IS31 manual for these locations
402 * driver
403 * | R location
404 * | | G location
405 * | | | B location
406 * | | | | */
407 {0, B_1, A_1, C_1}, //MX1
408 {0, E_1, D_1, F_1}, //MX2
409 {0, H_1, G_1, I_1}, //MX3
410 {0, K_1, J_1, L_1}, //MX4
411 {0, B_2, A_2, C_2}, //MX6
412 {0, E_2, D_2, F_2}, //MX7
413 {0, H_2, G_2, I_2}, //MX8
414 {0, K_2, J_2, L_2}, //MX14
415 {0, B_3, A_3, C_3}, //MX11
416 {0, E_3, D_3, F_3}, //MX12
417 {0, H_3, G_3, I_3}, //MX13
418 {0, K_3, J_3, L_3}, //MX19
419 {0, B_4, A_4, C_4}, //MX16
420 {0, E_4, D_4, F_4}, //MX17
421 {0, H_4, G_4, I_4}, //MX18
422 {0, K_4, J_4, L_4}, //MX23
423 {0, B_5, A_5, C_5}, //MX20
424 {0, E_5, D_5, F_5}, //MX21
425 {0, H_5, G_5, I_5}, //MX22
426 {0, K_5, J_5, L_5}, //MX27
427 {0, B_6, A_6, C_6}, //MX24
428 {0, E_6, D_6, F_6}, //MX25
429 {0, H_6, G_6, I_6}, //MX26
430 {0, K_6, J_6, L_6}, //MX31
431 {0, B_7, A_7, C_7}, //MX28
432 {0, E_7, D_7, F_7}, //MX29
433 {0, H_7, G_7, I_7}, //MX30
434 {0, K_7, J_7, L_7}, //MX36
435 {0, B_8, A_8, C_8}, //MX33
436 {0, E_8, D_8, F_8}, //MX34
437 {0, H_8, G_8, I_8}, //MX35
438 {0, K_8, J_8, L_8}, //MX40
439 {0, B_9, A_9, C_9}, //MX37
440 {0, E_9, D_9, F_9}, //MX38
441 {0, H_9, G_9, I_9}, //MX39
442 {0, K_9, J_9, L_9}, //MX44
443 {0, B_10, A_10, C_10}, //MX41
444 {0, E_10, D_10, F_10}, //MX42
445 {0, H_10, G_10, I_10}, //MX43
446 {0, K_10, J_10, L_10}, //MX48
447 {0, B_11, A_11, C_11}, //MX45
448 {0, E_11, D_11, F_11}, //MX46
449 {0, H_11, G_11, I_11}, //MX47
450 {0, K_11, J_11, L_11}, //MX53
451 {0, B_12, A_12, C_12}, //MX50
452 {0, E_12, D_12, F_12}, //MX51
453 {0, H_12, G_12, I_12}, //MX52
454 {0, K_12, J_12, L_12}, //MX9
455 {0, B_13, A_13, C_13}, //MX55
456 {0, E_13, D_13, F_13}, //MX56
457
458 {0, K_13, J_13, L_13}, //MX61
459 {0, B_14, A_14, C_14}, //MX59
460 {0, E_14, D_14, F_14}, //MX57
461 {0, H_14, G_14, I_14}, //MX60
462 {0, K_14, J_14, L_14}, //MX62
463 {0, B_15, A_15, C_15}, //MX5
464 {0, E_15, D_15, F_15}, //MX10
465 {0, H_15, G_15, I_15}, //MX15
466 {0, K_15, J_15, L_15}, //MX32
467
468 {0, E_16, D_16, F_16}, //MX49
469 {0, H_16, G_16, I_16}, //MX54
470 {0, K_16, J_16, L_16}, //MX58
471};
472
473const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
474//
475// MX1, MX6, MX11, MX16, MX20, MX24, MX28, MX33, MX37, MX41, MX45, MX50, MX55, MX59,
476// MX2, MX7, MX12, MX17, MX21, MX25, MX29, MX34, MX38, MX42, MX46, MX51, MX56, ---,
477// MX3, MX8, MX13, MX18, MX22, MX26, MX30, MX35, MX39, MX43, MX47, MX52, MX57, MX60,
478// MX4, ---, MX14, MX19, MX23, MX27, MX31, MX36, MX40, MX44, MX48, MX53, ---, MX61,
479// MX5, MX10, MX15, ---, ---, ---, MX32, ---, ---, ---, MX49, MX54, MX58, MX62
480/* {row | col << 4}
481 * | {x=0..224, y=0..64}
482 * | | modifier
483 * | | | */
484 {{0|(0<<4)}, { 0, 0}, 1}, //MX1
485 {{1|(0<<4)}, { 0, 16}, 1}, //MX2
486 {{2|(0<<4)}, { 0, 32}, 1}, //MX3
487 {{3|(0<<4)}, { 0, 48}, 1}, //MX4
488 {{0|(1<<4)}, { 17, 0}, 0}, //MX6
489 {{1|(1<<4)}, { 17, 16}, 0}, //MX7
490 {{2|(1<<4)}, { 17, 32}, 0}, //MX8
491 {{3|(2<<4)}, { 34, 48}, 0}, //MX14
492 {{0|(2<<4)}, { 34, 0}, 0}, //MX11
493 {{1|(2<<4)}, { 34, 16}, 0}, //MX12
494 {{2|(2<<4)}, { 34, 32}, 0}, //MX13
495 {{3|(3<<4)}, { 51, 48}, 0}, //MX19
496 {{0|(3<<4)}, { 51, 0}, 0}, //MX16
497 {{1|(3<<4)}, { 51, 16}, 0}, //MX17
498 {{2|(3<<4)}, { 51, 32}, 0}, //MX18
499 {{3|(4<<4)}, { 68, 48}, 0}, //MX23
500 {{0|(4<<4)}, { 68, 0}, 0}, //MX20
501 {{1|(4<<4)}, { 68, 16}, 0}, //MX21
502 {{2|(4<<4)}, { 68, 32}, 0}, //MX22
503 {{3|(5<<4)}, { 85, 48}, 0}, //MX27
504 {{0|(5<<4)}, { 85, 0}, 0}, //MX24
505 {{1|(5<<4)}, { 85, 16}, 0}, //MX25
506 {{2|(5<<4)}, { 85, 32}, 0}, //MX26
507 {{3|(6<<4)}, {102, 48}, 0}, //MX31
508 {{0|(6<<4)}, {102, 0}, 0}, //MX28
509 {{1|(6<<4)}, {102, 16}, 0}, //MX29
510 {{2|(6<<4)}, {102, 32}, 0}, //MX30
511 {{3|(7<<4)}, {119, 48}, 0}, //MX36
512 {{0|(7<<4)}, {119, 0}, 0}, //MX33
513 {{1|(7<<4)}, {119, 16}, 0}, //MX34
514 {{2|(7<<4)}, {119, 32}, 0}, //MX35
515 {{3|(8<<4)}, {136, 48}, 0}, //MX40
516 {{0|(8<<4)}, {136, 0}, 0}, //MX37
517 {{1|(8<<4)}, {136, 16}, 0}, //MX38
518 {{2|(8<<4)}, {136, 32}, 0}, //MX39
519 {{3|(9<<4)}, {153, 48}, 0}, //MX44
520 {{0|(9<<4)}, {153, 0}, 0}, //MX41
521 {{1|(9<<4)}, {153, 16}, 0}, //MX42
522 {{2|(9<<4)}, {153, 32}, 0}, //MX43
523 {{3|(10<<4)}, {170, 48}, 0}, //MX48
524 {{0|(10<<4)}, {170, 0}, 0}, //MX45
525 {{1|(10<<4)}, {170, 16}, 0}, //MX46
526 {{2|(10<<4)}, {170, 32}, 0}, //MX47
527 {{3|(11<<4)}, {187, 48}, 0}, //MX53
528 {{0|(11<<4)}, {187, 0}, 0}, //MX50
529 {{1|(11<<4)}, {187, 16}, 0}, //MX51
530 {{2|(11<<4)}, {187, 32}, 0}, //MX52
531 {{3|(2<<4)}, { 17, 32}, 1}, //MX9
532 {{0|(12<<4)}, {204, 0}, 0}, //MX55
533 {{1|(12<<4)}, {204, 16}, 0}, //MX56
534
535 {{3|(13<<4)}, {221, 48}, 1}, //MX61
536 {{0|(13<<4)}, {221, 0}, 1}, //MX59
537 {{2|(12<<4)}, {204, 32}, 0}, //MX57
538 {{2|(13<<4)}, {221, 24}, 1}, //MX60
539 {{4|(13<<4)}, {221, 64}, 1}, //MX62
540 {{4|(0<<4)}, { 0, 64}, 1}, //MX5
541 {{4|(1<<4)}, { 17, 64}, 1}, //MX10
542 {{4|(2<<4)}, { 34, 64}, 1}, //MX15
543 {{4|(5<<4)}, {102, 64}, 0}, //MX32
544
545 {{4|(10<<4)}, {170, 64}, 1}, //MX49
546 {{4|(11<<4)}, {187, 64}, 1}, //MX54
547 {{4|(12<<4)}, {204, 64}, 1} //MX58
548};
549
550#endif 18#endif
551
552void bootmagic_lite(void)
553{
554 // The lite version of TMK's bootmagic made by Wilba.
555 // 100% less potential for accidentally making the
556 // keyboard do stupid things.
557
558 // We need multiple scans because debouncing can't be turned off.
559 matrix_scan();
560 wait_ms(10);
561 matrix_scan();
562
563 // If the Esc and space bar are held down on power up,
564 // reset the EEPROM valid state and jump to bootloader.
565 // Assumes Esc is at [0,0] and spacebar is at [4,6].
566 // This isn't very generalized, but we need something that doesn't
567 // rely on user's keymaps in firmware or EEPROM.
568 if ( ( matrix_get_row(0) & (1<<0) ) &&
569 ( matrix_get_row(4) & (1<<6) ) )
570 {
571 // Set the TMK/QMK EEPROM state as invalid.
572 eeconfig_disable();
573 //eeprom_set_valid(false);
574 // Jump to bootloader.
575 bootloader_jump();
576 }
577}
578
579void matrix_init_kb(void) {
580 // put your keyboard start-up code here
581 // runs once when the firmware starts up
582
583 bootmagic_lite();
584
585 // Please ignore this is for upcoming features
586 // If the EEPROM has the magic, the data is good.
587 // OK to load from EEPROM.
588 /*if (eeprom_is_valid())
589 {
590 backlight_config_load();
591
592 // TODO: do something to "turn on" keymaps in EEPROM?
593 }
594 else
595 {
596 // If the EEPROM has not been saved before, or is out of date,
597 // save the default values to the EEPROM. Default values
598 // come from construction of the zeal_backlight_config instance.
599 backlight_config_save();
600
601 // Clear the LED colors stored in EEPROM
602 for ( int row=0; row < MATRIX_ROWS; row++ )
603 {
604 HSV hsv;
605 for ( int column=0; column < MATRIX_COLS; column++ )
606 {
607 hsv.h = rand() & 0xFF;
608 hsv.s = rand() & 0x7F;
609 hsv.v = 255;
610 backlight_set_key_color( row, column, hsv );
611 }
612 }
613 #ifdef USE_KEYMAPS_IN_EEPROM
614 keymap_default_save();
615 #endif
616 // Save the magic number last, in case saving was interrupted
617 eeprom_set_valid(true);
618 }*/
619
620 matrix_init_user();
621}
622
623void matrix_scan_kb(void) {
624
625 matrix_scan_user();
626}
627
628bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
629
630 return process_record_user(keycode, record);
631}
632
633void led_set_kb(uint8_t usb_led) {
634 //backlight_set_indicator_state(usb_led);
635} \ No newline at end of file
diff --git a/keyboards/hs60/v2/v2.h b/keyboards/hs60/v2/v2.h
index 86aeb68a7..0a35acdea 100644
--- a/keyboards/hs60/v2/v2.h
+++ b/keyboards/hs60/v2/v2.h
@@ -13,12 +13,13 @@
13 * You should have received a copy of the GNU General Public License 13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>. 14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */ 15 */
16#ifndef HS60_H 16#pragma once
17#define HS60_H
18 17
19#define XXX KC_NO 18#define XXX KC_NO
20 19
21#include "quantum.h" 20#include "quantum.h"
21#include "../../zeal60/rgb_backlight_keycodes.h"
22#include "../../zeal60/zeal60_keycodes.h"
22 23
23// This a shortcut to help you visually see your layout. 24// This a shortcut to help you visually see your layout.
24 25
@@ -63,5 +64,3 @@
63 { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \ 64 { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \
64 { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, XXX, XXX, K4B, K4C, K4D } \ 65 { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, XXX, XXX, K4B, K4C, K4D } \
65} 66}
66
67#endif \ No newline at end of file
diff --git a/keyboards/zeal60/rgb_backlight.c b/keyboards/zeal60/rgb_backlight.c
index 64b95059e..a965a13bb 100644
--- a/keyboards/zeal60/rgb_backlight.c
+++ b/keyboards/zeal60/rgb_backlight.c
@@ -15,27 +15,44 @@
15 */ 15 */
16#if RGB_BACKLIGHT_ENABLED 16#if RGB_BACKLIGHT_ENABLED
17 17
18#if defined (RGB_BACKLIGHT_ZEAL60) || defined (RGB_BACKLIGHT_ZEAL65) || defined (RGB_BACKLIGHT_M60_A) || defined(RGB_BACKLIGHT_M6_B) || defined(RGB_BACKLIGHT_KOYU) 18#if defined (RGB_BACKLIGHT_ZEAL60) || defined (RGB_BACKLIGHT_ZEAL65) || defined (RGB_BACKLIGHT_M60_A) || defined(RGB_BACKLIGHT_M6_B) || defined(RGB_BACKLIGHT_KOYU) || defined(RGB_BACKLIGHT_HS60)
19#else 19#else
20#error None of the following was defined: RGB_BACKLIGHT_ZEAL60, RGB_BACKLIGHT_ZEAL65, RGB_BACKLIGHT_M60_A, RGB_BACKLIGHT_M6_B, RGB_BACKLIGHT_KOYU 20#error None of the following was defined: RGB_BACKLIGHT_ZEAL60, RGB_BACKLIGHT_ZEAL65, RGB_BACKLIGHT_M60_A, RGB_BACKLIGHT_M6_B, RGB_BACKLIGHT_KOYU
21#endif 21#endif
22 22
23#ifndef MAX
24 #define MAX(X, Y) ((X) > (Y) ? (X) : (Y))
25#endif
26
27#ifndef MIN
28 #define MIN(a,b) ((a) < (b)? (a): (b))
29#endif
30
23#include "quantum.h" 31#include "quantum.h"
24#include "rgb_backlight.h" 32#include "rgb_backlight.h"
25#include "rgb_backlight_api.h" 33#include "rgb_backlight_api.h"
26#include "rgb_backlight_keycodes.h" 34#include "rgb_backlight_keycodes.h"
27 35
36#if !defined(RGB_BACKLIGHT_HS60)
28#include <avr/io.h> 37#include <avr/io.h>
29#include <util/delay.h> 38#include <util/delay.h>
30#include <avr/interrupt.h> 39#include <avr/interrupt.h>
40#include "drivers/avr/i2c_master.h"
41#else
42#include "ch.h"
43#include "hal.h"
44#include "drivers/arm/i2c_master.h"
45#include "tmk_core/common/eeprom.h"
46#endif
31#include "progmem.h" 47#include "progmem.h"
32
33#include "quantum/color.h" 48#include "quantum/color.h"
34#include "drivers/avr/i2c_master.h"
35 49
36#if defined (RGB_BACKLIGHT_M6_B) 50#if defined (RGB_BACKLIGHT_M6_B)
37#include "drivers/issi/is31fl3218.h" 51#include "drivers/issi/is31fl3218.h"
38#define BACKLIGHT_LED_COUNT 6 52#define BACKLIGHT_LED_COUNT 6
53#elif defined (RGB_BACKLIGHT_HS60)
54#include "drivers/issi/is31fl3733.h"
55#define BACKLIGHT_LED_COUNT 64
39#else 56#else
40#include "drivers/issi/is31fl3731.h" 57#include "drivers/issi/is31fl3731.h"
41#define BACKLIGHT_LED_COUNT 72 58#define BACKLIGHT_LED_COUNT 72
@@ -84,7 +101,88 @@ uint8_t g_key_hit[BACKLIGHT_LED_COUNT];
84// Ticks since any key was last hit. 101// Ticks since any key was last hit.
85uint32_t g_any_key_hit = 0; 102uint32_t g_any_key_hit = 0;
86 103
87#if !defined(RGB_BACKLIGHT_M6_B) 104#if defined(RGB_BACKLIGHT_HS60)
105
106// This is a 7-bit address, that gets left-shifted and bit 0
107// set to 0 for write, 1 for read (as per I2C protocol)
108// ADDR_2 is not needed. it is here as a dummy
109#define ISSI_ADDR_1 0x50
110#define ISSI_ADDR_2 0x50
111
112const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
113/* Refer to IS31 manual for these locations
114 * driver
115 * | R location
116 * | | G location
117 * | | | B location
118 * | | | | */
119 {0, B_1, A_1, C_1}, //LA1
120 {0, E_1, D_1, F_1}, //LA2
121 {0, H_1, G_1, I_1}, //LA3
122 {0, K_1, J_1, L_1}, //LA4
123 {0, B_2, A_2, C_2}, //LA5
124 {0, E_2, D_2, F_2}, //LA6
125 {0, H_2, G_2, I_2}, //LA7
126 {0, K_2, J_2, L_2}, //LA8
127 {0, B_3, A_3, C_3}, //LA9
128 {0, E_3, D_3, F_3}, //LA10
129 {0, H_3, G_3, I_3}, //LA11
130 {0, K_3, J_3, L_3}, //LA12
131 {0, B_4, A_4, C_4}, //LA13
132 {0, E_4, D_4, F_4}, //LA14
133 {0, H_4, G_4, I_4}, //LA15
134 {0, K_4, J_4, L_4}, //LA16
135 {0, B_5, A_5, C_5}, //LA17
136 {0, E_5, D_5, F_5}, //LA18
137 {0, H_5, G_5, I_5}, //LA19
138 {0, K_5, J_5, L_5}, //LA20
139 {0, B_6, A_6, C_6}, //LA21
140 {0, E_6, D_6, F_6}, //LA22
141 {0, H_6, G_6, I_6}, //LA23
142 {0, K_6, J_6, L_6}, //LA24
143 {0, B_7, A_7, C_7}, //LA25
144 {0, E_7, D_7, F_7}, //LA26
145 {0, H_7, G_7, I_7}, //LA27
146 {0, K_7, J_7, L_7}, //LA28
147 {0, B_8, A_8, C_8}, //LA29
148 {0, E_8, D_8, F_8}, //LA30
149 {0, H_8, G_8, I_8}, //LA31
150 {0, K_8, J_8, L_8}, //LA32
151 {0, B_9, A_9, C_9}, //LA33
152 {0, E_9, D_9, F_9}, //LA34
153 {0, H_9, G_9, I_9}, //LA35
154 {0, K_9, J_9, L_9}, //LA36
155 {0, B_10, A_10, C_10}, //LA37
156 {0, E_10, D_10, F_10}, //LA38
157 {0, H_10, G_10, I_10}, //LA39
158 {0, K_10, J_10, L_10}, //LA40
159 {0, B_11, A_11, C_11}, //LA41
160 {0, E_11, D_11, F_11}, //LA42
161 {0, H_11, G_11, I_11}, //LA43
162 {0, K_11, J_11, L_11}, //LA44
163 {0, B_12, A_12, C_12}, //LA45
164 {0, E_12, D_12, F_12}, //LA46
165 {0, H_12, G_12, I_12}, //LA47
166 {0, K_12, J_12, L_12}, //LA48
167 {0, B_13, A_13, C_13}, //LA49
168 {0, E_13, D_13, F_13}, //LA50
169 {0, H_13, G_13, I_13}, //LA51
170 {0, K_13, J_13, L_13}, //LA52
171 {0, B_14, A_14, C_14}, //LA53
172 {0, E_14, D_14, F_14}, //LA54
173 {0, H_14, G_14, I_14}, //LA55
174 {0, K_14, J_14, L_14}, //LA56
175 {0, B_15, A_15, C_15}, //LA57
176 {0, E_15, D_15, F_15}, //LA58
177 {0, H_15, G_15, I_15}, //LA59
178 {0, K_15, J_15, L_15}, //LA60
179 {0, B_16, A_16, C_16}, //LA61
180 {0, E_16, D_16, F_16}, //LA62
181 {0, H_16, G_16, I_16}, //LA63
182 {0, K_16, J_16, L_16}, //LA64
183};
184
185#elif !defined(RGB_BACKLIGHT_M6_B)
88// This is a 7-bit address, that gets left-shifted and bit 0 186// This is a 7-bit address, that gets left-shifted and bit 0
89// set to 0 for write, 1 for read (as per I2C protocol) 187// set to 0 for write, 1 for read (as per I2C protocol)
90#define ISSI_ADDR_1 0x74 188#define ISSI_ADDR_1 0x74
@@ -272,6 +370,85 @@ const Point g_map_led_to_point_polar[BACKLIGHT_LED_COUNT] PROGMEM = {
272 {0,27}, {0,64}, {0,101}, {0,137}, {0,174}, {255,233}, {228,201}, {235,255}, {237,255}, 370 {0,27}, {0,64}, {0,101}, {0,137}, {0,174}, {255,233}, {228,201}, {235,255}, {237,255},
273 {195,128}, {206,136}, {215,152}, {222,175}, {205,234}, {209,255}, {214,255}, {219,255}, {223,255} 371 {195,128}, {206,136}, {215,152}, {222,175}, {205,234}, {209,255}, {214,255}, {219,255}, {223,255}
274}; 372};
373#elif defined (RGB_BACKLIGHT_HS60) && defined (HS60_ANSI)
374const Point g_map_led_to_point[BACKLIGHT_LED_COUNT] PROGMEM = {
375 // LA1..LA47
376 {0,0}, {4,16}, {6,32}, {10,48}, {16,0}, {24,16}, {28,32}, {36,48}, {32,0}, {40,16}, {44,32}, {52,48},
377 {48,0}, {56,16}, {60,32}, {68,48}, {64,0}, {72,16}, {76,32}, {84,48}, {80,0}, {88,16}, {92,32}, {100,48},
378 {96,0}, {104,16}, {108,32}, {116,48}, {112,0}, {120,16}, {124,32}, {132,48}, {128,0}, {136,16}, {140,32},
379 {148,48}, {144,0}, {152,16}, {156,32}, {164,48}, {160,0}, {168,16}, {172,32}, {180,48}, {176,0}, {184, 16}, {188,32},
380 {255,255},// LA48 does not exist, dummy
381 // LA49..LA50
382 {192,0}, {200,16},
383 {255,255},// LA51 does not exit, dummy
384 // LA52..LA60
385 {210,48}, {216,0}, {220,16}, {214,32}, {222,64}, {2,64}, {22,64}, {42,64}, {102,64},
386 {255,255},// LA61 does not exit, dummy
387 {162,64}, {182,64}, {202,64}
388};
389const Point g_map_led_to_point_polar[BACKLIGHT_LED_COUNT] PROGMEM = {
390 // LA1..LA47
391 {96,255}, {109,255}, {128,242}, {148,255}, {93,255}, {105,238}, {128,192}, {154,216}, {89,255}, {101,208}, {128,155}, {159,188},
392 {85,255}, {96,181}, {128,119}, {165,163}, {81,255}, {89,157}, {128,82}, {173,143}, {75,255}, {81,139}, {128,46}, {183,131},
393 {70,255}, {70,129}, {129,9}, {195,128}, {64,255}, {58,129}, {255,27}, {206,136}, {58,255}, {47,139}, {255,64}, {215,152},
394 {53,255}, {39,157}, {255,101}, {222,175}, {47,255}, {32,181}, {255,137}, {228,201}, {43,255}, {27,208}, {255, 174},
395 {255,255},// LA48 does not exist, dummy
396 // LA49..LA50
397 {39,255}, {23,238},
398 {255,255},// LA51 does not exit, dummy
399 // LA52..LA60
400 {235,255}, {33,255}, {19,255}, {255,233}, {224,255}, {160,255}, {164,255}, {169,255}, {188,255},
401 {255,255},// LA61 does not exit, dummy
402 {209,255}, {215,255}, {220,255}
403};
404#elif defined (RGB_BACKLIGHT_HS60) && defined (HS60_HHKB)
405const Point g_map_led_to_point[BACKLIGHT_LED_COUNT] PROGMEM = {
406 // LA1..LA60
407 {0,0}, {4,16}, {6,32}, {10,48}, {16,0}, {24,16}, {28,32}, {36,48}, {32,0}, {40,16}, {44,32}, {52,48},
408 {48,0}, {56,16}, {60,32}, {68,48}, {64,0}, {72,16}, {76,32}, {84,48}, {80,0}, {88,16}, {92,32}, {100,48},
409 {96,0}, {104,16}, {108,32}, {116,48}, {112,0}, {120,16}, {124,32}, {132,48}, {128,0}, {136,16}, {140,32},
410 {148,48}, {144,0}, {152,16}, {156,32}, {164,48}, {160,0}, {168,16}, {172,32}, {180,48}, {176,0}, {184, 16}, {188,32},
411 {224,0}, {192,0}, {200,16}, {202,48}, {224,48}, {208,0}, {220,16}, {214,32}, {220,64}, {4,64}, {24,64}, {44,64}, {112,64},
412 {255,255}, {255,255}, // LA61..LA62 does not exit, dummy
413 // LA63..LA64
414 {180,64}, {200,64}
415};
416const Point g_map_led_to_point_polar[BACKLIGHT_LED_COUNT] PROGMEM = {
417 // LA1..LA60
418 {96,255}, {109,255}, {128,242}, {148,255}, {93,255}, {105,238}, {128,192}, {154,216}, {89,255}, {101,208}, {128,155}, {159,188},
419 {85,255}, {96,181}, {128,119}, {165,163}, {81,255}, {89,157}, {128,82}, {173,143}, {75,255}, {81,139}, {128,46}, {183,131},
420 {70,255}, {70,129}, {129,9}, {195,128}, {64,255}, {58,129}, {255,27}, {206,136}, {58,255}, {47,139}, {255,64}, {215,152},
421 {53,255}, {39,157}, {255,101}, {222,175}, {47,255}, {32,181}, {255,137}, {228,201}, {43,255}, {27,208}, {255, 174}, {32,255},
422 {39,255}, {23,238}, {233,242}, {237,255}, {35,255}, {19,255}, {255,233}, {223,255}, {161,255}, {165,255}, {170,255}, {192,255},
423 {255,255}, {255,255}, // LA61..LA62 does not exit, dummy
424 // LA63..LA64
425 {214,255}, {219,255}
426};
427#elif defined (RGB_BACKLIGHT_HS60) //HS60_ISO
428const Point g_map_led_to_point[BACKLIGHT_LED_COUNT] PROGMEM = {
429 // LA1..LA50
430 {0,0}, {4,16}, {6,32}, {2,48}, {16,0}, {24,16}, {28,32}, {36,48}, {32,0}, {40,16}, {44,32}, {52,48}, {48,0},
431 {56,16}, {60,32}, {68,48}, {64,0}, {72,16}, {76,32}, {84,48}, {80,0}, {88,16}, {92,32}, {100,48}, {96,0}, {104,16},
432 {108,32}, {116,48}, {112,0}, {120,16}, {124,32}, {132,48}, {128,0}, {136,16}, {140,32}, {148,48}, {144,0}, {152,16},
433 {156,32}, {164,48}, {160,0}, {168,16}, {172,32}, {180,48}, {176,0}, {184, 16}, {188,32}, {20,48}, {192,0}, {200,16},
434 {255,255},// LA51 does not exit, dummy
435 // LA52..LA60
436 {210,48}, {216,0}, {220,16}, {222,24}, {222,64}, {2,64}, {22,64}, {42,64}, {102,64},
437 {255,255},// LA61 does not exit, dummy
438 {162,64}, {182,64}, {202,64}
439};
440const Point g_map_led_to_point_polar[BACKLIGHT_LED_COUNT] PROGMEM = {
441 // LA1..LA50
442 {96,255}, {109,255}, {128,242}, {147,255}, {93,255}, {105,238}, {128,192}, {154,216}, {89,255}, {101,208}, {128,155}, {159,188}, {85,255},
443 {96,181}, {128,119}, {165,163}, {81,255}, {89,157}, {128,82}, {173,143}, {75,255}, {81,139}, {128,46}, {183,131}, {70,255}, {70,129},
444 {129,9}, {195,128}, {64,255}, {58,129}, {255,27}, {206,136}, {58,255}, {47,139}, {255,64}, {215,152}, {53,255}, {39,157}, {255,101},
445 {222,175}, {47,255}, {32,181}, {255,137}, {228,201}, {43,255}, {27,208}, {255, 174}, {150,246}, {39,255}, {23,238},
446 {255,255},// LA51 does not exit, dummy
447 // LA52..LA60
448 {235,255}, {33,255}, {19,255}, {10,255}, {224,255}, {160,255}, {164,255}, {169,255}, {188,255},
449 {255,255},// LA61 does not exit, dummy
450 {209,255}, {215,255}, {220,255}
451};
275#elif defined (RGB_BACKLIGHT_M6_B) 452#elif defined (RGB_BACKLIGHT_M6_B)
276// M6-B is really simple: 453// M6-B is really simple:
277// 0 3 5 454// 0 3 5
@@ -397,6 +574,48 @@ const uint8_t g_map_row_column_to_led[MATRIX_ROWS][MATRIX_COLS] PROGMEM = {
397 { 36+16, 36+15, 36+5, 36+4, 36+3, 36+2, 36+1, 54+9, 54+10, 54+11, 54+12, 54+6, 54+7, 54+8 }, 574 { 36+16, 36+15, 36+5, 36+4, 36+3, 36+2, 36+1, 54+9, 54+10, 54+11, 54+12, 54+6, 54+7, 54+8 },
398 { 36+17, 36+8, 36+7, 36+6, 255, 255, 255, 36+0, 255, 54+13, 54+14, 54+15, 54+16, 54+17 } 575 { 36+17, 36+8, 36+7, 36+6, 255, 255, 255, 36+0, 255, 54+13, 54+14, 54+15, 54+16, 54+17 }
399}; 576};
577#elif defined (RGB_BACKLIGHT_HS60) && defined (HS60_ANSI)
578//
579// LA1, LA5, LA9, LA13, LA17, LA21, LA25, LA29, LA33, LA37, LA41, LA45, LA49, LA53,
580// LA2, LA6, LA10, LA14, LA18, LA22, LA26, LA30, LA34, LA38, LA42, LA46, LA50, ---,
581// LA3, LA7, LA11, LA15, LA19, LA23, LA27, LA31, LA35, LA39, LA43, LA47, LA54, LA55,
582// LA4, ---, LA8, LA12, LA16, LA20, LA24, LA28, LA32, LA36, LA40, LA44, ---, LA52,
583// LA57, LA58, LA59, ---, ---, ---, LA60, ---, ---, ---, LA62, LA63, LA64, LA56
584const uint8_t g_map_row_column_to_led[MATRIX_ROWS][MATRIX_COLS] PROGMEM = {
585 { 1-1, 5-1, 9-1, 13-1, 17-1, 21-1, 25-1, 29-1, 33-1, 37-1, 41-1, 45-1, 49-1, 53-1 },
586 { 2-1, 6-1, 10-1, 14-1, 18-1, 22-1, 26-1, 30-1, 34-1, 38-1, 42-1, 46-1, 50-1, 255 },
587 { 3-1, 7-1, 11-1, 15-1, 19-1, 23-1, 27-1, 31-1, 35-1, 39-1, 43-1, 47-1, 54-1, 55-1 },
588 { 4-1, 255, 8-1, 12-1, 16-1, 20-1, 24-1, 28-1, 32-1, 36-1, 40-1, 44-1, 255, 52-1 },
589 { 57-1, 58-1, 59-1, 255, 255, 255, 60-1, 255, 255, 255, 62-1, 63-1, 64-1, 56-1 }
590};
591#elif defined (RGB_BACKLIGHT_HS60) && defined (HS60_HHKB)
592//
593// LA1, LA5, LA9, LA13, LA17, LA21, LA25, LA29, LA33, LA37, LA41, LA45, LA49, LA53,
594// LA2, LA6, LA10, LA14, LA18, LA22, LA26, LA30, LA34, LA38, LA42, LA46, LA50, LA48,
595// LA3, LA7, LA11, LA15, LA19, LA23, LA27, LA31, LA35, LA39, LA43, LA47, LA54, LA55,
596// LA4, ---, LA8, LA12, LA16, LA20, LA24, LA28, LA32, LA36, LA40, LA44, LA51, LA52,
597// LA57, LA58, LA59, ---, ---, ---, LA60, ---, ---, ---, ---, LA63, LA64, LA56
598const uint8_t g_map_row_column_to_led[MATRIX_ROWS][MATRIX_COLS] PROGMEM = {
599 { 1-1, 5-1, 9-1, 13-1, 17-1, 21-1, 25-1, 29-1, 33-1, 37-1, 41-1, 45-1, 49-1, 53-1 },
600 { 2-1, 6-1, 10-1, 14-1, 18-1, 22-1, 26-1, 30-1, 34-1, 38-1, 42-1, 46-1, 50-1, 48-1 },
601 { 3-1, 7-1, 11-1, 15-1, 19-1, 23-1, 27-1, 31-1, 35-1, 39-1, 43-1, 47-1, 54-1, 55-1 },
602 { 4-1, 255, 8-1, 12-1, 16-1, 20-1, 24-1, 28-1, 32-1, 36-1, 40-1, 44-1, 51-1, 52-1 },
603 { 57-1, 58-1, 59-1, 255, 255, 255, 60-1, 255, 255, 255, 255, 63-1, 64-1, 56-1 }
604};
605#elif defined (RGB_BACKLIGHT_HS60) //HS60_ISO
606//
607// LA1, LA5, LA9, LA13, LA17, LA21, LA25, LA29, LA33, LA37, LA41, LA45, LA49, LA53,
608// LA2, LA6, LA10, LA14, LA18, LA22, LA26, LA30, LA34, LA38, LA42, LA46, LA50, ---,
609// LA3, LA7, LA11, LA15, LA19, LA23, LA27, LA31, LA35, LA39, LA43, LA47, LA54, LA55,
610// LA4, LA48, LA8, LA12, LA16, LA20, LA24, LA28, LA32, LA36, LA40, LA44, ---, LA52,
611// LA57, LA58, LA59, ---, ---, ---, LA60, ---, ---, ---, LA62, LA63, LA64, LA56
612const uint8_t g_map_row_column_to_led[MATRIX_ROWS][MATRIX_COLS] PROGMEM = {
613 { 1-1, 5-1, 9-1, 13-1, 17-1, 21-1, 25-1, 29-1, 33-1, 37-1, 41-1, 45-1, 49-1, 53-1 },
614 { 2-1, 6-1, 10-1, 14-1, 18-1, 22-1, 26-1, 30-1, 34-1, 38-1, 42-1, 46-1, 50-1, 255 },
615 { 3-1, 7-1, 11-1, 15-1, 19-1, 23-1, 27-1, 31-1, 35-1, 39-1, 43-1, 47-1, 54-1, 55-1 },
616 { 4-1, 48-1, 8-1, 12-1, 16-1, 20-1, 24-1, 28-1, 32-1, 36-1, 40-1, 44-1, 255, 52-1 },
617 { 57-1, 58-1, 59-1, 255, 255, 255, 60-1, 255, 255, 255, 62-1, 63-1, 64-1, 56-1 }
618};
400#elif defined (RGB_BACKLIGHT_M6_B) 619#elif defined (RGB_BACKLIGHT_M6_B)
401// M6-B is really simple: 620// M6-B is really simple:
402// 0 3 5 621// 0 3 5
@@ -419,6 +638,9 @@ void backlight_update_pwm_buffers(void)
419{ 638{
420#if defined (RGB_BACKLIGHT_M6_B) 639#if defined (RGB_BACKLIGHT_M6_B)
421 IS31FL3218_update_pwm_buffers(); 640 IS31FL3218_update_pwm_buffers();
641#elif defined (RGB_BACKLIGHT_HS60)
642 IS31FL3733_update_pwm_buffers( ISSI_ADDR_1, ISSI_ADDR_2 );
643 IS31FL3733_update_led_control_registers( ISSI_ADDR_1, ISSI_ADDR_2 );
422#else 644#else
423 IS31FL3731_update_pwm_buffers( ISSI_ADDR_1, ISSI_ADDR_2 ); 645 IS31FL3731_update_pwm_buffers( ISSI_ADDR_1, ISSI_ADDR_2 );
424 IS31FL3731_update_led_control_registers( ISSI_ADDR_1, ISSI_ADDR_2 ); 646 IS31FL3731_update_led_control_registers( ISSI_ADDR_1, ISSI_ADDR_2 );
@@ -429,6 +651,8 @@ void backlight_set_color( int index, uint8_t red, uint8_t green, uint8_t blue )
429{ 651{
430#if defined (RGB_BACKLIGHT_M6_B) 652#if defined (RGB_BACKLIGHT_M6_B)
431 IS31FL3218_set_color( index, red, green, blue ); 653 IS31FL3218_set_color( index, red, green, blue );
654#elif defined (RGB_BACKLIGHT_HS60)
655 IS31FL3733_set_color( index, red, green, blue );
432#else 656#else
433 IS31FL3731_set_color( index, red, green, blue ); 657 IS31FL3731_set_color( index, red, green, blue );
434#endif 658#endif
@@ -438,6 +662,8 @@ void backlight_set_color_all( uint8_t red, uint8_t green, uint8_t blue )
438{ 662{
439#if defined (RGB_BACKLIGHT_M6_B) 663#if defined (RGB_BACKLIGHT_M6_B)
440 IS31FL3218_set_color_all( red, green, blue ); 664 IS31FL3218_set_color_all( red, green, blue );
665#elif defined (RGB_BACKLIGHT_HS60)
666 IS31FL3733_set_color_all( red, green, blue );
441#else 667#else
442 IS31FL3731_set_color_all( red, green, blue ); 668 IS31FL3731_set_color_all( red, green, blue );
443#endif 669#endif
@@ -452,6 +678,7 @@ void backlight_set_key_hit(uint8_t row, uint8_t column)
452 g_any_key_hit = 0; 678 g_any_key_hit = 0;
453} 679}
454 680
681#if !defined(RGB_BACKLIGHT_HS60)
455// This is (F_CPU/1024) / 20 Hz 682// This is (F_CPU/1024) / 20 Hz
456// = 15625 Hz / 20 Hz 683// = 15625 Hz / 20 Hz
457// = 781 684// = 781
@@ -487,6 +714,29 @@ void backlight_timer_disable(void)
487{ 714{
488 TIMSK3 &= ~_BV(OCIE3A); 715 TIMSK3 &= ~_BV(OCIE3A);
489} 716}
717#else //STM32, use GPT with TIM4. Enable in halconf.h
718static void gpt_backlight_timer_task(GPTDriver *gptp);
719// Timer setup at 200Khz, callback at 10k ticks = 20Hz
720static GPTConfig gpt4cfg1 = {
721 .frequency = 200000U,
722 .callback = gpt_backlight_timer_task
723};
724
725void backlight_timer_init(void)
726{
727 gptStart(&GPTD4, &gpt4cfg1);
728}
729
730void backlight_timer_enable(void)
731{
732 gptStartContinuous(&GPTD4, 10000);
733}
734
735void backlight_timer_disable(void)
736{
737 gptStopTimer(&GPTD4);
738}
739#endif //!defined(RGB_BACKLIGHT_HS60)
490 740
491void backlight_set_suspend_state(bool state) 741void backlight_set_suspend_state(bool state)
492{ 742{
@@ -921,7 +1171,11 @@ void backlight_effect_indicators(void)
921 } 1171 }
922} 1172}
923 1173
1174#if !defined(RGB_BACKLIGHT_HS60)
924ISR(TIMER3_COMPA_vect) 1175ISR(TIMER3_COMPA_vect)
1176#else //STM32 interrupt
1177static void gpt_backlight_timer_task(GPTDriver *gptp)
1178#endif
925{ 1179{
926 // delay 1 second before driving LEDs or doing anything else 1180 // delay 1 second before driving LEDs or doing anything else
927 static uint8_t startup_tick = 0; 1181 static uint8_t startup_tick = 0;
@@ -1378,6 +1632,27 @@ void backlight_init_drivers(void)
1378 1632
1379#if defined(RGB_BACKLIGHT_M6_B) 1633#if defined(RGB_BACKLIGHT_M6_B)
1380 IS31FL3218_init(); 1634 IS31FL3218_init();
1635#elif defined(RGB_BACKLIGHT_HS60)
1636 IS31FL3733_init( ISSI_ADDR_1 );
1637
1638 for ( int index = 0; index < BACKLIGHT_LED_COUNT; index++ )
1639 {
1640#if defined (HS60_ANSI)
1641 bool enabled = !( ( index == 48-1 ) || //LA48
1642 ( index == 51-1 ) || //LA51
1643 ( index == 61-1 ) ); //LA61
1644#elif defined (HS60_HHKB)
1645 bool enabled = !( ( index == 61-1 ) || //LA61
1646 ( index == 62-1 ) ); //LA62
1647#else //HS60_ISO
1648 bool enabled = !( ( index == 51-1 ) || //LA51
1649 ( index == 61-1 ) ); //LA61
1650#endif
1651 // This only caches it for later
1652 IS31FL3733_set_led_control_register( index, enabled, enabled, enabled );
1653 }
1654 // This actually updates the LED drivers
1655 IS31FL3733_update_led_control_registers( ISSI_ADDR_1, ISSI_ADDR_2 );
1381#else 1656#else
1382 IS31FL3731_init( ISSI_ADDR_1 ); 1657 IS31FL3731_init( ISSI_ADDR_1 );
1383 IS31FL3731_init( ISSI_ADDR_2 ); 1658 IS31FL3731_init( ISSI_ADDR_2 );
@@ -1668,7 +1943,6 @@ void backlight_test_led( uint8_t index, bool red, bool green, bool blue )
1668 } 1943 }
1669 } 1944 }
1670} 1945}
1671#endif // defined(RGB_DEBUGGING_ONLY)
1672 1946
1673void backlight_debug_led( bool state ) 1947void backlight_debug_led( bool state )
1674{ 1948{
@@ -1685,5 +1959,6 @@ void backlight_debug_led( bool state )
1685 PORTE &= ~(1<<6); 1959 PORTE &= ~(1<<6);
1686 } 1960 }
1687} 1961}
1962#endif // defined(RGB_DEBUGGING_ONLY)
1688 1963
1689#endif // BACKLIGHT_ENABLED 1964#endif // BACKLIGHT_ENABLED
diff --git a/tmk_core/common/chibios/eeprom_stm32.c b/tmk_core/common/chibios/eeprom_stm32.c
index a86998550..a15430d67 100755
--- a/tmk_core/common/chibios/eeprom_stm32.c
+++ b/tmk_core/common/chibios/eeprom_stm32.c
@@ -10,664 +10,206 @@
10 * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 10 * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
11 * DEALINGS IN THE SOFTWARE. 11 * DEALINGS IN THE SOFTWARE.
12 * 12 *
13 * This files are free to use from https://github.com/rogerclarkmelbourne/Arduino_STM32 and 13 * This files are free to use from http://engsta.com/stm32-flash-memory-eeprom-emulator/ by
14 * https://github.com/leaflabs/libmaple 14 * Artur F.
15 * 15 *
16 * Modifications for QMK and STM32F303 by Yiancar 16 * Modifications for QMK and STM32F303 by Yiancar
17 */ 17 */
18 18
19#include <stdio.h>
20#include <string.h>
19#include "eeprom_stm32.h" 21#include "eeprom_stm32.h"
22/*****************************************************************************
23 * Allows to use the internal flash to store non volatile data. To initialize
24 * the functionality use the EEPROM_Init() function. Be sure that by reprogramming
25 * of the controller just affected pages will be deleted. In other case the non
26 * volatile data will be lost.
27******************************************************************************/
28
29/* Private macro -------------------------------------------------------------*/
30/* Private variables ---------------------------------------------------------*/
31/* Functions -----------------------------------------------------------------*/
32
33uint8_t DataBuf[FEE_PAGE_SIZE];
34/*****************************************************************************
35* Delete Flash Space used for user Data, deletes the whole space between
36* RW_PAGE_BASE_ADDRESS and the last uC Flash Page
37******************************************************************************/
38uint16_t EEPROM_Init(void) {
39 // unlock flash
40 FLASH_Unlock();
20 41
21 FLASH_Status EE_ErasePage(uint32_t); 42 // Clear Flags
22 43 //FLASH_ClearFlag(FLASH_SR_EOP|FLASH_SR_PGERR|FLASH_SR_WRPERR);
23 uint16_t EE_CheckPage(uint32_t, uint16_t);
24 uint16_t EE_CheckErasePage(uint32_t, uint16_t);
25 uint16_t EE_Format(void);
26 uint32_t EE_FindValidPage(void);
27 uint16_t EE_GetVariablesCount(uint32_t, uint16_t);
28 uint16_t EE_PageTransfer(uint32_t, uint32_t, uint16_t);
29 uint16_t EE_VerifyPageFullWriteVariable(uint16_t, uint16_t);
30
31 uint32_t PageBase0 = EEPROM_PAGE0_BASE;
32 uint32_t PageBase1 = EEPROM_PAGE1_BASE;
33 uint32_t PageSize = EEPROM_PAGE_SIZE;
34 uint16_t Status = EEPROM_NOT_INIT;
35
36// See http://www.st.com/web/en/resource/technical/document/application_note/CD00165693.pdf
37
38/**
39 * @brief Check page for blank
40 * @param page base address
41 * @retval Success or error
42 * EEPROM_BAD_FLASH: page not empty after erase
43 * EEPROM_OK: page blank
44 */
45uint16_t EE_CheckPage(uint32_t pageBase, uint16_t status)
46{
47 uint32_t pageEnd = pageBase + (uint32_t)PageSize;
48
49 // Page Status not EEPROM_ERASED and not a "state"
50 if ((*(__IO uint16_t*)pageBase) != EEPROM_ERASED && (*(__IO uint16_t*)pageBase) != status)
51 return EEPROM_BAD_FLASH;
52 for(pageBase += 4; pageBase < pageEnd; pageBase += 4)
53 if ((*(__IO uint32_t*)pageBase) != 0xFFFFFFFF) // Verify if slot is empty
54 return EEPROM_BAD_FLASH;
55 return EEPROM_OK;
56}
57
58/**
59 * @brief Erase page with increment erase counter (page + 2)
60 * @param page base address
61 * @retval Success or error
62 * FLASH_COMPLETE: success erase
63 * - Flash error code: on write Flash error
64 */
65FLASH_Status EE_ErasePage(uint32_t pageBase)
66{
67 FLASH_Status FlashStatus;
68 uint16_t data = (*(__IO uint16_t*)(pageBase));
69 if ((data == EEPROM_ERASED) || (data == EEPROM_VALID_PAGE) || (data == EEPROM_RECEIVE_DATA))
70 data = (*(__IO uint16_t*)(pageBase + 2)) + 1;
71 else
72 data = 0;
73
74 FlashStatus = FLASH_ErasePage(pageBase);
75 if (FlashStatus == FLASH_COMPLETE)
76 FlashStatus = FLASH_ProgramHalfWord(pageBase + 2, data);
77
78 return FlashStatus;
79}
80 44
81/** 45 return FEE_DENSITY_BYTES;
82 * @brief Check page for blank and erase it
83 * @param page base address
84 * @retval Success or error
85 * - Flash error code: on write Flash error
86 * - EEPROM_BAD_FLASH: page not empty after erase
87 * - EEPROM_OK: page blank
88 */
89uint16_t EE_CheckErasePage(uint32_t pageBase, uint16_t status)
90{
91 uint16_t FlashStatus;
92 if (EE_CheckPage(pageBase, status) != EEPROM_OK)
93 {
94 FlashStatus = EE_ErasePage(pageBase);
95 if (FlashStatus != FLASH_COMPLETE)
96 return FlashStatus;
97 return EE_CheckPage(pageBase, status);
98 }
99 return EEPROM_OK;
100} 46}
47/*****************************************************************************
48* Erase the whole reserved Flash Space used for user Data
49******************************************************************************/
50void EEPROM_Erase (void) {
101 51
102/** 52 int page_num = 0;
103 * @brief Find valid Page for write or read operation
104 * @param Page0: Page0 base address
105 * Page1: Page1 base address
106 * @retval Valid page address (PAGE0 or PAGE1) or NULL in case of no valid page was found
107 */
108uint32_t EE_FindValidPage(void)
109{
110 uint16_t status0 = (*(__IO uint16_t*)PageBase0); // Get Page0 actual status
111 uint16_t status1 = (*(__IO uint16_t*)PageBase1); // Get Page1 actual status
112
113 if (status0 == EEPROM_VALID_PAGE && status1 == EEPROM_ERASED)
114 return PageBase0;
115 if (status1 == EEPROM_VALID_PAGE && status0 == EEPROM_ERASED)
116 return PageBase1;
117
118 return 0;
119}
120 53
121/** 54 // delete all pages from specified start page to the last page
122 * @brief Calculate unique variables in EEPROM 55 do {
123 * @param start: address of first slot to check (page + 4) 56 FLASH_ErasePage(FEE_PAGE_BASE_ADDRESS + (page_num * FEE_PAGE_SIZE));
124 * @param end: page end address 57 page_num++;
125 * @param address: 16 bit virtual address of the variable to excluse (or 0XFFFF) 58 } while (page_num < FEE_DENSITY_PAGES);
126 * @retval count of variables
127 */
128uint16_t EE_GetVariablesCount(uint32_t pageBase, uint16_t skipAddress)
129{
130 uint16_t varAddress, nextAddress;
131 uint32_t idx;
132 uint32_t pageEnd = pageBase + (uint32_t)PageSize;
133 uint16_t count = 0;
134
135 for (pageBase += 6; pageBase < pageEnd; pageBase += 4)
136 {
137 varAddress = (*(__IO uint16_t*)pageBase);
138 if (varAddress == 0xFFFF || varAddress == skipAddress)
139 continue;
140
141 count++;
142 for(idx = pageBase + 4; idx < pageEnd; idx += 4)
143 {
144 nextAddress = (*(__IO uint16_t*)idx);
145 if (nextAddress == varAddress)
146 {
147 count--;
148 break;
149 }
150 }
151 }
152 return count;
153} 59}
60/*****************************************************************************
61* Writes once data byte to flash on specified address. If a byte is already
62* written, the whole page must be copied to a buffer, the byte changed and
63* the manipulated buffer written after PageErase.
64*******************************************************************************/
65uint16_t EEPROM_WriteDataByte (uint16_t Address, uint8_t DataByte) {
154 66
155/** 67 FLASH_Status FlashStatus = FLASH_COMPLETE;
156 * @brief Transfers last updated variables data from the full Page to an empty one.
157 * @param newPage: new page base address
158 * @param oldPage: old page base address
159 * @param SkipAddress: 16 bit virtual address of the variable (or 0xFFFF)
160 * @retval Success or error status:
161 * - FLASH_COMPLETE: on success
162 * - EEPROM_OUT_SIZE: if valid new page is full
163 * - Flash error code: on write Flash error
164 */
165uint16_t EE_PageTransfer(uint32_t newPage, uint32_t oldPage, uint16_t SkipAddress)
166{
167 uint32_t oldEnd, newEnd;
168 uint32_t oldIdx, newIdx, idx;
169 uint16_t address, data, found;
170 FLASH_Status FlashStatus;
171
172 // Transfer process: transfer variables from old to the new active page
173 newEnd = newPage + ((uint32_t)PageSize);
174
175 // Find first free element in new page
176 for (newIdx = newPage + 4; newIdx < newEnd; newIdx += 4)
177 if ((*(__IO uint32_t*)newIdx) == 0xFFFFFFFF) // Verify if element
178 break; // contents are 0xFFFFFFFF
179 if (newIdx >= newEnd)
180 return EEPROM_OUT_SIZE;
181
182 oldEnd = oldPage + 4;
183 oldIdx = oldPage + (uint32_t)(PageSize - 2);
184
185 for (; oldIdx > oldEnd; oldIdx -= 4)
186 {
187 address = *(__IO uint16_t*)oldIdx;
188 if (address == 0xFFFF || address == SkipAddress)
189 continue; // it's means that power off after write data
190
191 found = 0;
192 for (idx = newPage + 6; idx < newIdx; idx += 4)
193 if ((*(__IO uint16_t*)(idx)) == address)
194 {
195 found = 1;
196 break;
197 }
198
199 if (found)
200 continue;
201
202 if (newIdx < newEnd)
203 {
204 data = (*(__IO uint16_t*)(oldIdx - 2));
205
206 FlashStatus = FLASH_ProgramHalfWord(newIdx, data);
207 if (FlashStatus != FLASH_COMPLETE)
208 return FlashStatus;
209 68
210 FlashStatus = FLASH_ProgramHalfWord(newIdx + 2, address); 69 uint32_t page;
211 if (FlashStatus != FLASH_COMPLETE) 70 int i;
212 return FlashStatus;
213 71
214 newIdx += 4; 72 // exit if desired address is above the limit (e.G. under 2048 Bytes for 4 pages)
215 } 73 if (Address > FEE_DENSITY_BYTES) {
216 else 74 return 0;
217 return EEPROM_OUT_SIZE;
218 } 75 }
219 76
220 // Erase the old Page: Set old Page status to EEPROM_EEPROM_ERASED status 77 // calculate which page is affected (Pagenum1/Pagenum2...PagenumN)
221 data = EE_CheckErasePage(oldPage, EEPROM_ERASED); 78 page = (FEE_PAGE_BASE_ADDRESS + FEE_ADDR_OFFSET(Address)) & 0x00000FFF;
222 if (data != EEPROM_OK)
223 return data;
224 79
225 // Set new Page status 80 if (page % FEE_PAGE_SIZE) page = page + FEE_PAGE_SIZE;
226 FlashStatus = FLASH_ProgramHalfWord(newPage, EEPROM_VALID_PAGE); 81 page = (page / FEE_PAGE_SIZE) - 1;
227 if (FlashStatus != FLASH_COMPLETE)
228 return FlashStatus;
229 82
230 return EEPROM_OK; 83 // if current data is 0xFF, the byte is empty, just overwrite with the new one
231} 84 if ((*(__IO uint16_t*)(FEE_PAGE_BASE_ADDRESS + FEE_ADDR_OFFSET(Address))) == FEE_EMPTY_WORD) {
232 85
233/** 86 FlashStatus = FLASH_ProgramHalfWord(FEE_PAGE_BASE_ADDRESS + FEE_ADDR_OFFSET(Address), (uint16_t)(0x00FF & DataByte));
234 * @brief Verify if active page is full and Writes variable in EEPROM.
235 * @param Address: 16 bit virtual address of the variable
236 * @param Data: 16 bit data to be written as variable value
237 * @retval Success or error status:
238 * - FLASH_COMPLETE: on success
239 * - EEPROM_PAGE_FULL: if valid page is full (need page transfer)
240 * - EEPROM_NO_VALID_PAGE: if no valid page was found
241 * - EEPROM_OUT_SIZE: if EEPROM size exceeded
242 * - Flash error code: on write Flash error
243 */
244uint16_t EE_VerifyPageFullWriteVariable(uint16_t Address, uint16_t Data)
245{
246 FLASH_Status FlashStatus;
247 uint32_t idx, pageBase, pageEnd, newPage;
248 uint16_t count;
249
250 // Get valid Page for write operation
251 pageBase = EE_FindValidPage();
252 if (pageBase == 0)
253 return EEPROM_NO_VALID_PAGE;
254
255 // Get the valid Page end Address
256 pageEnd = pageBase + PageSize; // Set end of page
257
258 for (idx = pageEnd - 2; idx > pageBase; idx -= 4)
259 {
260 if ((*(__IO uint16_t*)idx) == Address) // Find last value for address
261 {
262 count = (*(__IO uint16_t*)(idx - 2)); // Read last data
263 if (count == Data)
264 return EEPROM_OK;
265 if (count == 0xFFFF)
266 {
267 FlashStatus = FLASH_ProgramHalfWord(idx - 2, Data); // Set variable data
268 if (FlashStatus == FLASH_COMPLETE)
269 return EEPROM_OK;
270 }
271 break;
272 }
273 } 87 }
88 else {
274 89
275 // Check each active page address starting from begining 90 // Copy Page to a buffer
276 for (idx = pageBase + 4; idx < pageEnd; idx += 4) 91 memcpy(DataBuf, (uint8_t*)FEE_PAGE_BASE_ADDRESS + (page * FEE_PAGE_SIZE), FEE_PAGE_SIZE); // !!! Calculate base address for the desired page
277 if ((*(__IO uint32_t*)idx) == 0xFFFFFFFF) // Verify if element
278 { // contents are 0xFFFFFFFF
279 FlashStatus = FLASH_ProgramHalfWord(idx, Data); // Set variable data
280 if (FlashStatus != FLASH_COMPLETE)
281 return FlashStatus;
282 FlashStatus = FLASH_ProgramHalfWord(idx + 2, Address); // Set variable virtual address
283 if (FlashStatus != FLASH_COMPLETE)
284 return FlashStatus;
285 return EEPROM_OK;
286 }
287
288 // Empty slot not found, need page transfer
289 // Calculate unique variables in page
290 count = EE_GetVariablesCount(pageBase, Address) + 1;
291 if (count >= (PageSize / 4 - 1))
292 return EEPROM_OUT_SIZE;
293
294 if (pageBase == PageBase1)
295 newPage = PageBase0; // New page address where variable will be moved to
296 else
297 newPage = PageBase1;
298
299 // Set the new Page status to RECEIVE_DATA status
300 FlashStatus = FLASH_ProgramHalfWord(newPage, EEPROM_RECEIVE_DATA);
301 if (FlashStatus != FLASH_COMPLETE)
302 return FlashStatus;
303
304 // Write the variable passed as parameter in the new active page
305 FlashStatus = FLASH_ProgramHalfWord(newPage + 4, Data);
306 if (FlashStatus != FLASH_COMPLETE)
307 return FlashStatus;
308
309 FlashStatus = FLASH_ProgramHalfWord(newPage + 6, Address);
310 if (FlashStatus != FLASH_COMPLETE)
311 return FlashStatus;
312
313 return EE_PageTransfer(newPage, pageBase, Address);
314}
315
316/*EEPROMClass::EEPROMClass(void)
317{
318 PageBase0 = EEPROM_PAGE0_BASE;
319 PageBase1 = EEPROM_PAGE1_BASE;
320 PageSize = EEPROM_PAGE_SIZE;
321 Status = EEPROM_NOT_INIT;
322}*/
323/*
324uint16_t EEPROM_init(uint32_t pageBase0, uint32_t pageBase1, uint32_t pageSize)
325{
326 PageBase0 = pageBase0;
327 PageBase1 = pageBase1;
328 PageSize = pageSize;
329 return EEPROM_init();
330}*/
331 92
332uint16_t EEPROM_init(void) 93 // check if new data is differ to current data, return if not, proceed if yes
333{ 94 if (DataByte == *(__IO uint8_t*)(FEE_PAGE_BASE_ADDRESS + FEE_ADDR_OFFSET(Address))) {
334 uint16_t status0 = 6, status1 = 6; 95 return 0;
335 FLASH_Status FlashStatus; 96 }
336 97
337 FLASH_Unlock(); 98 // manipulate desired data byte in temp data array if new byte is differ to the current
338 Status = EEPROM_NO_VALID_PAGE; 99 DataBuf[FEE_ADDR_OFFSET(Address)] = DataByte;
339 100
340 status0 = (*(__IO uint16_t *)PageBase0); 101 //Erase Page
341 status1 = (*(__IO uint16_t *)PageBase1); 102 FlashStatus = FLASH_ErasePage(FEE_PAGE_BASE_ADDRESS + page);
342 103
343 switch (status0) 104 // Write new data (whole page) to flash if data has beed changed
344 { 105 for(i = 0; i < (FEE_PAGE_SIZE / 2); i++) {
345/* 106 if ((__IO uint16_t)(0xFF00 | DataBuf[FEE_ADDR_OFFSET(i)]) != 0xFFFF) {
346 Page0 Page1 107 FlashStatus = FLASH_ProgramHalfWord((FEE_PAGE_BASE_ADDRESS + (page * FEE_PAGE_SIZE)) + (i * 2), (uint16_t)(0xFF00 | DataBuf[FEE_ADDR_OFFSET(i)]));
347 ----- -----
348 EEPROM_ERASED EEPROM_VALID_PAGE Page1 valid, Page0 erased
349 EEPROM_RECEIVE_DATA Page1 need set to valid, Page0 erased
350 EEPROM_ERASED make EE_Format
351 any Error: EEPROM_NO_VALID_PAGE
352*/
353 case EEPROM_ERASED:
354 if (status1 == EEPROM_VALID_PAGE) // Page0 erased, Page1 valid
355 Status = EE_CheckErasePage(PageBase0, EEPROM_ERASED);
356 else if (status1 == EEPROM_RECEIVE_DATA) // Page0 erased, Page1 receive
357 {
358 FlashStatus = FLASH_ProgramHalfWord(PageBase1, EEPROM_VALID_PAGE);
359 if (FlashStatus != FLASH_COMPLETE)
360 Status = FlashStatus;
361 else
362 Status = EE_CheckErasePage(PageBase0, EEPROM_ERASED);
363 }
364 else if (status1 == EEPROM_ERASED) // Both in erased state so format EEPROM
365 Status = EEPROM_format();
366 break;
367/*
368 Page0 Page1
369 ----- -----
370 EEPROM_RECEIVE_DATA EEPROM_VALID_PAGE Transfer Page1 to Page0
371 EEPROM_ERASED Page0 need set to valid, Page1 erased
372 any EEPROM_NO_VALID_PAGE
373*/
374 case EEPROM_RECEIVE_DATA:
375 if (status1 == EEPROM_VALID_PAGE) // Page0 receive, Page1 valid
376 Status = EE_PageTransfer(PageBase0, PageBase1, 0xFFFF);
377 else if (status1 == EEPROM_ERASED) // Page0 receive, Page1 erased
378 {
379 Status = EE_CheckErasePage(PageBase1, EEPROM_ERASED);
380 if (Status == EEPROM_OK)
381 {
382 FlashStatus = FLASH_ProgramHalfWord(PageBase0, EEPROM_VALID_PAGE);
383 if (FlashStatus != FLASH_COMPLETE)
384 Status = FlashStatus;
385 else
386 Status = EEPROM_OK;
387 } 108 }
388 } 109 }
389 break;
390/*
391 Page0 Page1
392 ----- -----
393 EEPROM_VALID_PAGE EEPROM_VALID_PAGE Error: EEPROM_NO_VALID_PAGE
394 EEPROM_RECEIVE_DATA Transfer Page0 to Page1
395 any Page0 valid, Page1 erased
396*/
397 case EEPROM_VALID_PAGE:
398 if (status1 == EEPROM_VALID_PAGE) // Both pages valid
399 Status = EEPROM_NO_VALID_PAGE;
400 else if (status1 == EEPROM_RECEIVE_DATA)
401 Status = EE_PageTransfer(PageBase1, PageBase0, 0xFFFF);
402 else
403 Status = EE_CheckErasePage(PageBase1, EEPROM_ERASED);
404 break;
405/*
406 Page0 Page1
407 ----- -----
408 any EEPROM_VALID_PAGE Page1 valid, Page0 erased
409 EEPROM_RECEIVE_DATA Page1 valid, Page0 erased
410 any EEPROM_NO_VALID_PAGE
411*/
412 default:
413 if (status1 == EEPROM_VALID_PAGE)
414 Status = EE_CheckErasePage(PageBase0, EEPROM_ERASED); // Check/Erase Page0
415 else if (status1 == EEPROM_RECEIVE_DATA)
416 {
417 FlashStatus = FLASH_ProgramHalfWord(PageBase1, EEPROM_VALID_PAGE);
418 if (FlashStatus != FLASH_COMPLETE)
419 Status = FlashStatus;
420 else
421 Status = EE_CheckErasePage(PageBase0, EEPROM_ERASED);
422 }
423 break;
424 }
425 return Status;
426}
427
428/**
429 * @brief Erases PAGE0 and PAGE1 and writes EEPROM_VALID_PAGE / 0 header to PAGE0
430 * @param PAGE0 and PAGE1 base addresses
431 * @retval Status of the last operation (Flash write or erase) done during EEPROM formating
432 */
433uint16_t EEPROM_format(void)
434{
435 uint16_t status;
436 FLASH_Status FlashStatus;
437 110
438 FLASH_Unlock();
439
440 // Erase Page0
441 status = EE_CheckErasePage(PageBase0, EEPROM_VALID_PAGE);
442 if (status != EEPROM_OK)
443 return status;
444 if ((*(__IO uint16_t*)PageBase0) == EEPROM_ERASED)
445 {
446 // Set Page0 as valid page: Write VALID_PAGE at Page0 base address
447 FlashStatus = FLASH_ProgramHalfWord(PageBase0, EEPROM_VALID_PAGE);
448 if (FlashStatus != FLASH_COMPLETE)
449 return FlashStatus;
450 } 111 }
451 // Erase Page1 112 return FlashStatus;
452 return EE_CheckErasePage(PageBase1, EEPROM_ERASED);
453}
454
455/**
456 * @brief Returns the erase counter for current page
457 * @param Data: Global variable contains the read variable value
458 * @retval Success or error status:
459 * - EEPROM_OK: if erases counter return.
460 * - EEPROM_NO_VALID_PAGE: if no valid page was found.
461 */
462uint16_t EEPROM_erases(uint16_t *Erases)
463{
464 uint32_t pageBase;
465 if (Status != EEPROM_OK)
466 if (EEPROM_init() != EEPROM_OK)
467 return Status;
468
469 // Get active Page for read operation
470 pageBase = EE_FindValidPage();
471 if (pageBase == 0)
472 return EEPROM_NO_VALID_PAGE;
473
474 *Erases = (*(__IO uint16_t*)pageBase+2);
475 return EEPROM_OK;
476}
477
478/**
479 * @brief Returns the last stored variable data, if found,
480 * which correspond to the passed virtual address
481 * @param Address: Variable virtual address
482 * @retval Data for variable or EEPROM_DEFAULT_DATA, if any errors
483 */
484/*
485uint16_t EEPROM_read (uint16_t Address)
486{
487 uint16_t data;
488 EEPROM_read(Address, &data);
489 return data;
490}*/
491
492/**
493 * @brief Returns the last stored variable data, if found,
494 * which correspond to the passed virtual address
495 * @param Address: Variable virtual address
496 * @param Data: Pointer to data variable
497 * @retval Success or error status:
498 * - EEPROM_OK: if variable was found
499 * - EEPROM_BAD_ADDRESS: if the variable was not found
500 * - EEPROM_NO_VALID_PAGE: if no valid page was found.
501 */
502uint16_t EEPROM_read(uint16_t Address, uint16_t *Data)
503{
504 uint32_t pageBase, pageEnd;
505
506 // Set default data (empty EEPROM)
507 *Data = EEPROM_DEFAULT_DATA;
508
509 if (Status == EEPROM_NOT_INIT)
510 if (EEPROM_init() != EEPROM_OK)
511 return Status;
512
513 // Get active Page for read operation
514 pageBase = EE_FindValidPage();
515 if (pageBase == 0)
516 return EEPROM_NO_VALID_PAGE;
517
518 // Get the valid Page end Address
519 pageEnd = pageBase + ((uint32_t)(PageSize - 2));
520
521 // Check each active page address starting from end
522 for (pageBase += 6; pageEnd >= pageBase; pageEnd -= 4)
523 if ((*(__IO uint16_t*)pageEnd) == Address) // Compare the read address with the virtual address
524 {
525 *Data = (*(__IO uint16_t*)(pageEnd - 2)); // Get content of Address-2 which is variable value
526 return EEPROM_OK;
527 }
528
529 // Return ReadStatus value: (0: variable exist, 1: variable doesn't exist)
530 return EEPROM_BAD_ADDRESS;
531}
532
533/**
534 * @brief Writes/upadtes variable data in EEPROM.
535 * @param VirtAddress: Variable virtual address
536 * @param Data: 16 bit data to be written
537 * @retval Success or error status:
538 * - FLASH_COMPLETE: on success
539 * - EEPROM_BAD_ADDRESS: if address = 0xFFFF
540 * - EEPROM_PAGE_FULL: if valid page is full
541 * - EEPROM_NO_VALID_PAGE: if no valid page was found
542 * - EEPROM_OUT_SIZE: if no empty EEPROM variables
543 * - Flash error code: on write Flash error
544 */
545uint16_t EEPROM_write(uint16_t Address, uint16_t Data)
546{
547 if (Status == EEPROM_NOT_INIT)
548 if (EEPROM_init() != EEPROM_OK)
549 return Status;
550
551 if (Address == 0xFFFF)
552 return EEPROM_BAD_ADDRESS;
553
554 // Write the variable virtual address and value in the EEPROM
555 uint16_t status = EE_VerifyPageFullWriteVariable(Address, Data);
556 return status;
557}
558
559/**
560 * @brief Writes/upadtes variable data in EEPROM.
561 The value is written only if differs from the one already saved at the same address.
562 * @param VirtAddress: Variable virtual address
563 * @param Data: 16 bit data to be written
564 * @retval Success or error status:
565 * - EEPROM_SAME_VALUE: If new Data matches existing EEPROM Data
566 * - FLASH_COMPLETE: on success
567 * - EEPROM_BAD_ADDRESS: if address = 0xFFFF
568 * - EEPROM_PAGE_FULL: if valid page is full
569 * - EEPROM_NO_VALID_PAGE: if no valid page was found
570 * - EEPROM_OUT_SIZE: if no empty EEPROM variables
571 * - Flash error code: on write Flash error
572 */
573uint16_t EEPROM_update(uint16_t Address, uint16_t Data)
574{
575 uint16_t temp;
576 EEPROM_read(Address, &temp);
577 if (temp == Data)
578 return EEPROM_SAME_VALUE;
579 else
580 return EEPROM_write(Address, Data);
581} 113}
114/*****************************************************************************
115* Read once data byte from a specified address.
116*******************************************************************************/
117uint8_t EEPROM_ReadDataByte (uint16_t Address) {
582 118
583/** 119 uint8_t DataByte = 0xFF;
584 * @brief Return number of variable
585 * @retval Number of variables
586 */
587uint16_t EEPROM_count(uint16_t *Count)
588{
589 if (Status == EEPROM_NOT_INIT)
590 if (EEPROM_init() != EEPROM_OK)
591 return Status;
592
593 // Get valid Page for write operation
594 uint32_t pageBase = EE_FindValidPage();
595 if (pageBase == 0)
596 return EEPROM_NO_VALID_PAGE; // No valid page, return max. numbers
597 120
598 *Count = EE_GetVariablesCount(pageBase, 0xFFFF); 121 // Get Byte from specified address
599 return EEPROM_OK; 122 DataByte = (*(__IO uint8_t*)(FEE_PAGE_BASE_ADDRESS + FEE_ADDR_OFFSET(Address)));
600}
601 123
602uint16_t EEPROM_maxcount(void) 124 return DataByte;
603{
604 return ((PageSize / 4)-1);
605} 125}
606 126
607 127/*****************************************************************************
128* Wrap library in AVR style functions.
129*******************************************************************************/
608uint8_t eeprom_read_byte (const uint8_t *Address) 130uint8_t eeprom_read_byte (const uint8_t *Address)
609{ 131{
610 const uint16_t p = (const uint32_t) Address; 132 const uint16_t p = (const uint32_t) Address;
611 uint16_t temp; 133 return EEPROM_ReadDataByte(p);
612 EEPROM_read(p, &temp);
613 return (uint8_t) temp;
614} 134}
615 135
616void eeprom_write_byte (uint8_t *Address, uint8_t Value) 136void eeprom_write_byte (uint8_t *Address, uint8_t Value)
617{ 137{
618 uint16_t p = (uint32_t) Address; 138 uint16_t p = (uint32_t) Address;
619 EEPROM_write(p, (uint16_t) Value); 139 EEPROM_WriteDataByte(p, Value);
620} 140}
621 141
622void eeprom_update_byte (uint8_t *Address, uint8_t Value) 142void eeprom_update_byte (uint8_t *Address, uint8_t Value)
623{ 143{
624 uint16_t p = (uint32_t) Address; 144 uint16_t p = (uint32_t) Address;
625 EEPROM_update(p, (uint16_t) Value); 145 EEPROM_WriteDataByte(p, Value);
626} 146}
627 147
628uint16_t eeprom_read_word (const uint16_t *Address) 148uint16_t eeprom_read_word (const uint16_t *Address)
629{ 149{
630 const uint16_t p = (const uint32_t) Address; 150 const uint16_t p = (const uint32_t) Address;
631 uint16_t temp; 151 return EEPROM_ReadDataByte(p) | (EEPROM_ReadDataByte(p+1) << 8);
632 EEPROM_read(p, &temp);
633 return temp;
634} 152}
635 153
636void eeprom_write_word (uint16_t *Address, uint16_t Value) 154void eeprom_write_word (uint16_t *Address, uint16_t Value)
637{ 155{
638 uint16_t p = (uint32_t) Address; 156 uint16_t p = (uint32_t) Address;
639 EEPROM_write(p, Value); 157 EEPROM_WriteDataByte(p, (uint8_t) Value);
158 EEPROM_WriteDataByte(p + 1, (uint8_t) (Value >> 8));
640} 159}
641 160
642void eeprom_update_word (uint16_t *Address, uint16_t Value) 161void eeprom_update_word (uint16_t *Address, uint16_t Value)
643{ 162{
644 uint16_t p = (uint32_t) Address; 163 uint16_t p = (uint32_t) Address;
645 EEPROM_update(p, Value); 164 EEPROM_WriteDataByte(p, (uint8_t) Value);
165 EEPROM_WriteDataByte(p + 1, (uint8_t) (Value >> 8));
646} 166}
647 167
648uint32_t eeprom_read_dword (const uint32_t *Address) 168uint32_t eeprom_read_dword (const uint32_t *Address)
649{ 169{
650 const uint16_t p = (const uint32_t) Address; 170 const uint16_t p = (const uint32_t) Address;
651 uint16_t temp1, temp2; 171 return EEPROM_ReadDataByte(p) | (EEPROM_ReadDataByte(p+1) << 8)
652 EEPROM_read(p, &temp1); 172 | (EEPROM_ReadDataByte(p+2) << 16) | (EEPROM_ReadDataByte(p+3) << 24);
653 EEPROM_read(p + 1, &temp2);
654 return temp1 | (temp2 << 16);
655} 173}
656 174
657void eeprom_write_dword (uint32_t *Address, uint32_t Value) 175void eeprom_write_dword (uint32_t *Address, uint32_t Value)
658{ 176{
659 uint16_t temp = (uint16_t) Value; 177 uint16_t p = (const uint32_t) Address;
660 uint16_t p = (uint32_t) Address; 178 EEPROM_WriteDataByte(p, (uint8_t) Value);
661 EEPROM_write(p, temp); 179 EEPROM_WriteDataByte(p+1, (uint8_t) (Value >> 8));
662 temp = (uint16_t) (Value >> 16); 180 EEPROM_WriteDataByte(p+2, (uint8_t) (Value >> 16));
663 EEPROM_write(p + 1, temp); 181 EEPROM_WriteDataByte(p+3, (uint8_t) (Value >> 24));
664} 182}
665 183
666void eeprom_update_dword (uint32_t *Address, uint32_t Value) 184void eeprom_update_dword (uint32_t *Address, uint32_t Value)
667{ 185{
668 uint16_t temp = (uint16_t) Value; 186 uint16_t p = (const uint32_t) Address;
669 uint16_t p = (uint32_t) Address; 187 EEPROM_WriteDataByte(p, (uint8_t) Value);
670 EEPROM_update(p, temp); 188 EEPROM_WriteDataByte(p+1, (uint8_t) (Value >> 8));
671 temp = (uint16_t) (Value >> 16); 189 EEPROM_WriteDataByte(p+2, (uint8_t) (Value >> 16));
672 EEPROM_update(p + 1, temp); 190 EEPROM_WriteDataByte(p+3, (uint8_t) (Value >> 24));
191}
192
193void eeprom_read_block(void *buf, const void *addr, uint32_t len) {
194 const uint8_t *p = (const uint8_t *)addr;
195 uint8_t *dest = (uint8_t *)buf;
196 while (len--) {
197 *dest++ = eeprom_read_byte(p++);
198 }
199}
200
201void eeprom_write_block(const void *buf, void *addr, uint32_t len) {
202 uint8_t *p = (uint8_t *)addr;
203 const uint8_t *src = (const uint8_t *)buf;
204 while (len--) {
205 eeprom_write_byte(p++, *src++);
206 }
207}
208
209void eeprom_update_block(const void *buf, void *addr, uint32_t len) {
210 uint8_t *p = (uint8_t *)addr;
211 const uint8_t *src = (const uint8_t *)buf;
212 while (len--) {
213 eeprom_write_byte(p++, *src++);
214 }
673} 215}
diff --git a/tmk_core/common/chibios/eeprom_stm32.h b/tmk_core/common/chibios/eeprom_stm32.h
index 09229530c..892e417b7 100755
--- a/tmk_core/common/chibios/eeprom_stm32.h
+++ b/tmk_core/common/chibios/eeprom_stm32.h
@@ -10,15 +10,17 @@
10 * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 10 * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
11 * DEALINGS IN THE SOFTWARE. 11 * DEALINGS IN THE SOFTWARE.
12 * 12 *
13 * This files are free to use from https://github.com/rogerclarkmelbourne/Arduino_STM32 and 13 * This files are free to use from http://engsta.com/stm32-flash-memory-eeprom-emulator/ by
14 * https://github.com/leaflabs/libmaple 14 * Artur F.
15 * 15 *
16 * Modifications for QMK and STM32F303 by Yiancar 16 * Modifications for QMK and STM32F303 by Yiancar
17 *
18 * This library assumes 8-bit data locations. To add a new MCU, please provide the flash
19 * page size and the total flash size in Kb. The number of available pages must be a multiple
20 * of 2. Only half of the pages account for the total EEPROM size.
21 * This library also assumes that the pages are not used by the firmware.
17 */ 22 */
18 23
19// This file must be modified if the MCU is not defined below.
20// This library also assumes that the pages are not used by the firmware.
21
22#ifndef __EEPROM_H 24#ifndef __EEPROM_H
23#define __EEPROM_H 25#define __EEPROM_H
24 26
@@ -38,9 +40,11 @@
38 40
39#ifndef EEPROM_PAGE_SIZE 41#ifndef EEPROM_PAGE_SIZE
40 #if defined (MCU_STM32F103RB) 42 #if defined (MCU_STM32F103RB)
41 #define EEPROM_PAGE_SIZE (uint16_t)0x400 /* Page size = 1KByte */ 43 #define FEE_PAGE_SIZE (uint16_t)0x400 // Page size = 1KByte
44 #define FEE_DENSITY_PAGES 2 // How many pages are used
42 #elif defined (MCU_STM32F103ZE) || defined (MCU_STM32F103RE) || defined (MCU_STM32F103RD) || defined (MCU_STM32F303CC) 45 #elif defined (MCU_STM32F103ZE) || defined (MCU_STM32F103RE) || defined (MCU_STM32F103RD) || defined (MCU_STM32F303CC)
43 #define EEPROM_PAGE_SIZE (uint16_t)0x800 /* Page size = 2KByte */ 46 #define FEE_PAGE_SIZE (uint16_t)0x800 // Page size = 2KByte
47 #define FEE_DENSITY_PAGES 4 // How many pages are used
44 #else 48 #else
45 #error "No MCU type specified. Add something like -DMCU_STM32F103RB to your compiler arguments (probably in a Makefile)." 49 #error "No MCU type specified. Add something like -DMCU_STM32F103RB to your compiler arguments (probably in a Makefile)."
46 #endif 50 #endif
@@ -48,48 +52,30 @@
48 52
49#ifndef EEPROM_START_ADDRESS 53#ifndef EEPROM_START_ADDRESS
50 #if defined (MCU_STM32F103RB) 54 #if defined (MCU_STM32F103RB)
51 #define EEPROM_START_ADDRESS ((uint32_t)(0x8000000 + 128 * 1024 - 2 * EEPROM_PAGE_SIZE)) 55 #define FEE_MCU_FLASH_SIZE 128 // Size in Kb
52 #elif defined (MCU_STM32F103ZE) || defined (MCU_STM32F103RE) 56 #elif defined (MCU_STM32F103ZE) || defined (MCU_STM32F103RE)
53 #define EEPROM_START_ADDRESS ((uint32_t)(0x8000000 + 512 * 1024 - 2 * EEPROM_PAGE_SIZE)) 57 #define FEE_MCU_FLASH_SIZE 512 // Size in Kb
54 #elif defined (MCU_STM32F103RD) 58 #elif defined (MCU_STM32F103RD)
55 #define EEPROM_START_ADDRESS ((uint32_t)(0x8000000 + 384 * 1024 - 2 * EEPROM_PAGE_SIZE)) 59 #define FEE_MCU_FLASH_SIZE 384 // Size in Kb
56 #elif defined (MCU_STM32F303CC) 60 #elif defined (MCU_STM32F303CC)
57 #define EEPROM_START_ADDRESS ((uint32_t)(0x8000000 + 256 * 1024 - 2 * EEPROM_PAGE_SIZE)) 61 #define FEE_MCU_FLASH_SIZE 256 // Size in Kb
58 #else 62 #else
59 #error "No MCU type specified. Add something like -DMCU_STM32F103RB to your compiler arguments (probably in a Makefile)." 63 #error "No MCU type specified. Add something like -DMCU_STM32F103RB to your compiler arguments (probably in a Makefile)."
60 #endif 64 #endif
61#endif 65#endif
62 66
63/* Pages 0 and 1 base and end addresses */ 67// DONT CHANGE
64#define EEPROM_PAGE0_BASE ((uint32_t)(EEPROM_START_ADDRESS + 0x000)) 68// Choose location for the first EEPROM Page address on the top of flash
65#define EEPROM_PAGE1_BASE ((uint32_t)(EEPROM_START_ADDRESS + EEPROM_PAGE_SIZE)) 69#define FEE_PAGE_BASE_ADDRESS ((uint32_t)(0x8000000 + FEE_MCU_FLASH_SIZE * 1024 - FEE_DENSITY_PAGES * FEE_PAGE_SIZE))
66 70#define FEE_DENSITY_BYTES ((FEE_PAGE_SIZE / 2) * FEE_DENSITY_PAGES - 1)
67/* Page status definitions */ 71#define FEE_LAST_PAGE_ADDRESS (FEE_PAGE_BASE_ADDRESS + (FEE_PAGE_SIZE * FEE_DENSITY_PAGES))
68#define EEPROM_ERASED ((uint16_t)0xFFFF) /* PAGE is empty */ 72#define FEE_EMPTY_WORD ((uint16_t)0xFFFF)
69#define EEPROM_RECEIVE_DATA ((uint16_t)0xEEEE) /* PAGE is marked to receive data */ 73#define FEE_ADDR_OFFSET(Address)(Address * 2) // 1Byte per Word will be saved to preserve Flash
70#define EEPROM_VALID_PAGE ((uint16_t)0x0000) /* PAGE containing valid data */
71
72/* Page full define */
73enum uint16_t
74 {
75 EEPROM_OK = ((uint16_t)0x0000),
76 EEPROM_OUT_SIZE = ((uint16_t)0x0081),
77 EEPROM_BAD_ADDRESS = ((uint16_t)0x0082),
78 EEPROM_BAD_FLASH = ((uint16_t)0x0083),
79 EEPROM_NOT_INIT = ((uint16_t)0x0084),
80 EEPROM_SAME_VALUE = ((uint16_t)0x0085),
81 EEPROM_NO_VALID_PAGE = ((uint16_t)0x00AB)
82 };
83
84#define EEPROM_DEFAULT_DATA 0xFFFF
85 74
86 uint16_t EEPROM_init(void); 75// Use this function to initialize the functionality
87 uint16_t EEPROM_format(void); 76uint16_t EEPROM_Init(void);
88 uint16_t EEPROM_erases(uint16_t *); 77void EEPROM_Erase (void);
89 uint16_t EEPROM_read (uint16_t address, uint16_t *data); 78uint16_t EEPROM_WriteDataByte (uint16_t Address, uint8_t DataByte);
90 uint16_t EEPROM_write(uint16_t address, uint16_t data); 79uint8_t EEPROM_ReadDataByte (uint16_t Address);
91 uint16_t EEPROM_update(uint16_t address, uint16_t data);
92 uint16_t EEPROM_count(uint16_t *);
93 uint16_t EEPROM_maxcount(void);
94 80
95#endif /* __EEPROM_H */ 81#endif /* __EEPROM_H */
diff --git a/tmk_core/common/chibios/flash_stm32.c b/tmk_core/common/chibios/flash_stm32.c
index 273593484..164654a15 100755
--- a/tmk_core/common/chibios/flash_stm32.c
+++ b/tmk_core/common/chibios/flash_stm32.c
@@ -186,3 +186,18 @@ void FLASH_Lock(void)
186 /* Set the Lock Bit to lock the FPEC and the FCR */ 186 /* Set the Lock Bit to lock the FPEC and the FCR */
187 FLASH->CR |= FLASH_CR_LOCK; 187 FLASH->CR |= FLASH_CR_LOCK;
188} 188}
189
190/**
191 * @brief Clears the FLASH's pending flags.
192 * @param FLASH_FLAG: specifies the FLASH flags to clear.
193 * This parameter can be any combination of the following values:
194 * @arg FLASH_FLAG_PGERR: FLASH Programming error flag flag
195 * @arg FLASH_FLAG_WRPERR: FLASH Write protected error flag
196 * @arg FLASH_FLAG_EOP: FLASH End of Programming flag
197 * @retval None
198 */
199void FLASH_ClearFlag(uint32_t FLASH_FLAG)
200{
201 /* Clear the flags */
202 FLASH->SR = FLASH_FLAG;
203}
diff --git a/tmk_core/common/chibios/flash_stm32.h b/tmk_core/common/chibios/flash_stm32.h
index cc065cbca..3c99cc566 100755
--- a/tmk_core/common/chibios/flash_stm32.h
+++ b/tmk_core/common/chibios/flash_stm32.h
@@ -45,6 +45,7 @@ FLASH_Status FLASH_ProgramHalfWord(uint32_t Address, uint16_t Data);
45 45
46void FLASH_Unlock(void); 46void FLASH_Unlock(void);
47void FLASH_Lock(void); 47void FLASH_Lock(void);
48void FLASH_ClearFlag(uint32_t FLASH_FLAG);
48 49
49#ifdef __cplusplus 50#ifdef __cplusplus
50} 51}
diff --git a/tmk_core/common/eeconfig.c b/tmk_core/common/eeconfig.c
index d8bab7d2e..59b2bffbc 100644
--- a/tmk_core/common/eeconfig.c
+++ b/tmk_core/common/eeconfig.c
@@ -33,7 +33,7 @@ void eeconfig_init_kb(void) {
33 */ 33 */
34void eeconfig_init_quantum(void) { 34void eeconfig_init_quantum(void) {
35#ifdef STM32_EEPROM_ENABLE 35#ifdef STM32_EEPROM_ENABLE
36 EEPROM_format(); 36 EEPROM_Erase();
37#endif 37#endif
38 eeprom_update_word(EECONFIG_MAGIC, EECONFIG_MAGIC_NUMBER); 38 eeprom_update_word(EECONFIG_MAGIC, EECONFIG_MAGIC_NUMBER);
39 eeprom_update_byte(EECONFIG_DEBUG, 0); 39 eeprom_update_byte(EECONFIG_DEBUG, 0);
@@ -74,7 +74,7 @@ void eeconfig_enable(void)
74void eeconfig_disable(void) 74void eeconfig_disable(void)
75{ 75{
76#ifdef STM32_EEPROM_ENABLE 76#ifdef STM32_EEPROM_ENABLE
77 EEPROM_format(); 77 EEPROM_Erase();
78#endif 78#endif
79 eeprom_update_word(EECONFIG_MAGIC, EECONFIG_MAGIC_NUMBER_OFF); 79 eeprom_update_word(EECONFIG_MAGIC, EECONFIG_MAGIC_NUMBER_OFF);
80} 80}
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)
diff --git a/tmk_core/common/eeprom.h b/tmk_core/common/eeprom.h
index 3696d0df3..5ae0f6eeb 100644
--- a/tmk_core/common/eeprom.h
+++ b/tmk_core/common/eeprom.h
@@ -20,5 +20,4 @@ void eeprom_update_dword (uint32_t *__p, uint32_t __value);
20void eeprom_update_block (const void *__src, void *__dst, uint32_t __n); 20void eeprom_update_block (const void *__src, void *__dst, uint32_t __n);
21#endif 21#endif
22 22
23
24#endif /* TMK_CORE_COMMON_EEPROM_H_ */ 23#endif /* TMK_CORE_COMMON_EEPROM_H_ */
diff --git a/tmk_core/protocol/chibios/main.c b/tmk_core/protocol/chibios/main.c
index ee9571c95..5436d4909 100644
--- a/tmk_core/protocol/chibios/main.c
+++ b/tmk_core/protocol/chibios/main.c
@@ -113,7 +113,7 @@ int main(void) {
113 chSysInit(); 113 chSysInit();
114 114
115#ifdef STM32_EEPROM_ENABLE 115#ifdef STM32_EEPROM_ENABLE
116 EEPROM_init(); 116 EEPROM_Init();
117#endif 117#endif
118 118
119 // TESTING 119 // TESTING
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-22 04:54:39 +0000