From d6c3202f156b5ca0f3a668445a588a08b8f7a9b9 Mon Sep 17 00:00:00 2001
From: jack <0x6A73@pm.me>
Date: Mon, 8 May 2023 16:38:51 -0600
Subject: [PATCH 1/2] Fixup paladin64 (#20805)
---
keyboards/kapcave/paladin64/config.h | 15 ---------------
keyboards/kapcave/paladin64/info.json | 15 +++++++++++++++
.../kapcave/paladin64/keymaps/default/keymap.c | 0
.../kapcave/paladin64/keymaps/default/readme.md | 1 -
keyboards/kapcave/paladin64/keymaps/via/readme.md | 1 -
keyboards/kapcave/paladin64/keymaps/via/rules.mk | 3 ++-
keyboards/kapcave/paladin64/rules.mk | 0
7 files changed, 17 insertions(+), 18 deletions(-)
mode change 100755 => 100644 keyboards/kapcave/paladin64/config.h
mode change 100755 => 100644 keyboards/kapcave/paladin64/keymaps/default/keymap.c
delete mode 100644 keyboards/kapcave/paladin64/keymaps/default/readme.md
delete mode 100644 keyboards/kapcave/paladin64/keymaps/via/readme.md
mode change 100755 => 100644 keyboards/kapcave/paladin64/rules.mk
diff --git a/keyboards/kapcave/paladin64/config.h b/keyboards/kapcave/paladin64/config.h
old mode 100755
new mode 100644
index 93d67ee100f..9d449cb0167
--- a/keyboards/kapcave/paladin64/config.h
+++ b/keyboards/kapcave/paladin64/config.h
@@ -77,18 +77,3 @@ along with this program. If not, see .
/* 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
diff --git a/keyboards/kapcave/paladin64/info.json b/keyboards/kapcave/paladin64/info.json
index e0255bb7dad..d32be70b60f 100644
--- a/keyboards/kapcave/paladin64/info.json
+++ b/keyboards/kapcave/paladin64/info.json
@@ -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": {
diff --git a/keyboards/kapcave/paladin64/keymaps/default/keymap.c b/keyboards/kapcave/paladin64/keymaps/default/keymap.c
old mode 100755
new mode 100644
diff --git a/keyboards/kapcave/paladin64/keymaps/default/readme.md b/keyboards/kapcave/paladin64/keymaps/default/readme.md
deleted file mode 100644
index 11248150d90..00000000000
--- a/keyboards/kapcave/paladin64/keymaps/default/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-The default keymap for Paladin64
\ No newline at end of file
diff --git a/keyboards/kapcave/paladin64/keymaps/via/readme.md b/keyboards/kapcave/paladin64/keymaps/via/readme.md
deleted file mode 100644
index 2cf66cd4cb0..00000000000
--- a/keyboards/kapcave/paladin64/keymaps/via/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-Via layout for the paladin64 pcb
\ No newline at end of file
diff --git a/keyboards/kapcave/paladin64/keymaps/via/rules.mk b/keyboards/kapcave/paladin64/keymaps/via/rules.mk
index 036bd6d1c3e..36b7ba9cbc9 100644
--- a/keyboards/kapcave/paladin64/keymaps/via/rules.mk
+++ b/keyboards/kapcave/paladin64/keymaps/via/rules.mk
@@ -1 +1,2 @@
-VIA_ENABLE = yes
\ No newline at end of file
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/keyboards/kapcave/paladin64/rules.mk b/keyboards/kapcave/paladin64/rules.mk
old mode 100755
new mode 100644
From 54d172830cf9f526b0d5ddce963c470d70e8fb86 Mon Sep 17 00:00:00 2001
From: Drashna Jaelre
Date: Mon, 8 May 2023 15:39:49 -0700
Subject: [PATCH 2/2] [Keyboard] Fix mxss rgblight.c compilation issues
(#20804)
---
keyboards/mxss/rgblight.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/keyboards/mxss/rgblight.c b/keyboards/mxss/rgblight.c
index b2df351c55c..94f6b1dfe85 100644
--- a/keyboards/mxss/rgblight.c
+++ b/keyboards/mxss/rgblight.c
@@ -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
}