melissa/zsa_qmk_firmware
1
0
Fork 0
mirror of https://github.com/zsa/qmk_firmware.git synced 2026-05-06 09:21:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

chore: merge firmware25 branch

Browse Source
This commit is contained in:
Florian Didron
2025-06-20 11:12:11 +07:00
parent 96c5b8e2d9 82245288b5
commit 74c38ae1c1
5 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
keyboards/zsa/ergodox_ez/ergodox_ez.c
View File

@@ -26,8 +26,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
# include "oryx.h"
#endif // COMMUNITY_MODULE_ORYX_ENABLE
#ifdef COMMUNITY_MODULE_DEFAULTS_ENABLE
# include "defaults.h"
#endif
# include "defaults.h"
#endif // COMMUNITY_MODULE_ORYX_ENABLE
keyboard_config_t keyboard_config;
@@ -283,6 +283,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
}
break;
case RGB_TOG:
case QK_RGB_MATRIX_TOGGLE:
if (record->event.pressed) {
switch (rgb_matrix_get_flags()) {
case LED_FLAG_ALL: {

4
keyboards/zsa/moonlander/moonlander.c
View File

@@ -21,6 +21,9 @@
#ifdef COMMUNITY_MODULE_ORYX_ENABLE
# include "oryx.h"
#endif // COMMUNITY_MODULE_ORYX_ENABLE
#ifdef COMMUNITY_MODULE_DEFAULTS_ENABLE
# include "defaults.h"
#endif // COMMUNITY_MODULE_ORYX_ENABLE
#ifdef COMMUNITY_MODULE_DEFAULTS_ENABLE
# include "defaults.h"
@@ -415,6 +418,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
eeconfig_update_kb(keyboard_config.raw);
}
break;
case RGB_TOG:
case QK_RGB_MATRIX_TOGGLE:
if (record->event.pressed) {
switch (rgb_matrix_get_flags()) {

4
keyboards/zsa/planck_ez/planck_ez.c
View File

@@ -23,9 +23,8 @@
#ifdef COMMUNITY_MODULE_ORYX_ENABLE
# include "oryx.h"
#endif // COMMUNITY_MODULE_ORYX_ENABLE
//
#ifdef COMMUNITY_MODULE_DEFAULTS_ENABLE
# include "defaults.h"
# include "defaults.h"
#endif
keyboard_config_t keyboard_config;
@@ -213,6 +212,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
eeconfig_update_kb(keyboard_config.raw);
}
break;
case RGB_TOG:
case QK_RGB_MATRIX_TOGGLE:
if (record->event.pressed) {
switch (rgb_matrix_get_flags()) {

2
keyboards/zsa/voyager/voyager.c
View File

@@ -7,7 +7,6 @@
#ifdef COMMUNITY_MODULE_ORYX_ENABLE
# include "oryx.h"
#endif // COMMUNITY_MODULE_ORYX_ENABLE
//
#ifdef COMMUNITY_MODULE_DEFAULTS_ENABLE
# include "defaults.h"
#endif
@@ -259,6 +258,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
if (keyboard_config.disable_layer_led) rgb_matrix_set_color_all(0, 0, 0);
}
break;
case RGB_TOG:
case QK_RGB_MATRIX_TOGGLE:
if (record->event.pressed) {
switch (rgb_matrix_get_flags()) {

2
modules/zsa

Submodule modules/zsa updated: 4645104081...e9e7563dec