gitbot/qmk_firmware
0
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2024-12-13 05:11:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into xap

Browse Source
This commit is contained in:
QMK Bot 2023-05-08 22:40:08 +00:00
commit ff8c45200a
8 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
keyboards/kapcave/paladin64/config.h Executable file → Normal file
View File

@ -77,18 +77,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
#define RGBLIGHT_EFFECT_SNAKE
#define RGBLIGHT_EFFECT_KNIGHT
#define RGBLIGHT_EFFECT_CHRISTMAS
#define RGBLIGHT_EFFECT_STATIC_GRADIENT
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
#define RGBLED_NUM 14
#define RGBLIGHT_HUE_STEP 10
#define RGBLIGHT_SAT_STEP 17
#define RGBLIGHT_VAL_STEP 12

15
keyboards/kapcave/paladin64/info.json
View File

@ -21,6 +21,21 @@
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"rgblight": {
"led_count": 14,
"animations": {
"alternating": true,
"breathing": true,
"christmas": true,
"knight": true,
"rainbow_mood": true,
"rainbow_swirl": true,
"rgb_test": true,
"snake": true,
"static_gradient": true,
"twinkle": true
}
},
"community_layouts": ["60_ansi"],
"layouts": {
"LAYOUT_all": {

0
keyboards/kapcave/paladin64/keymaps/default/keymap.c Executable file → Normal file
View File

1
keyboards/kapcave/paladin64/keymaps/default/readme.md
View File

@ -1 +0,0 @@
The default keymap for Paladin64

1
keyboards/kapcave/paladin64/keymaps/via/readme.md
View File

@ -1 +0,0 @@
Via layout for the paladin64 pcb

3
keyboards/kapcave/paladin64/keymaps/via/rules.mk
View File

@ -1 +1,2 @@
VIA_ENABLE = yes
VIA_ENABLE = yes
LTO_ENABLE = yes

0
keyboards/kapcave/paladin64/rules.mk Executable file → Normal file
View File

9
keyboards/mxss/rgblight.c
View File

@ -175,18 +175,19 @@ void rgblight_check_config(void) {
}
}
uint32_t eeconfig_read_rgblight(void) {
uint64_t eeconfig_read_rgblight(void) {
#ifdef EEPROM_ENABLE
return eeprom_read_dword(EECONFIG_RGBLIGHT);
return (uint64_t)((eeprom_read_dword(EECONFIG_RGBLIGHT)) | ((uint64_t)eeprom_read_byte(EECONFIG_RGBLIGHT_EXTENDED) << 32));
#else
return 0;
#endif
}
void eeconfig_update_rgblight(uint32_t val) {
void eeconfig_update_rgblight(uint64_t val) {
#ifdef EEPROM_ENABLE
rgblight_check_config();
eeprom_update_dword(EECONFIG_RGBLIGHT, val);
eeprom_update_dword(EECONFIG_RGBLIGHT, val & 0xFFFFFFFF);
eeprom_update_byte(EECONFIG_RGBLIGHT_EXTENDED, (val >> 32) & 0xFF);
#endif
}