From 6cb4ebbf95ec566e9a80abe5ed9aedb76db54c8a Mon Sep 17 00:00:00 2001 From: Drashna Jaelre Date: Mon, 12 May 2025 20:58:02 -0700 Subject: [PATCH] Fix errors (#407) * Make sure that unit tests run on all release versions * [ErgoDox EZ] Fix complication issues due to updates * [ErgoDox EZ] Fix compilication errors and warnings We want all green! * Fix weird merge conflicts --- .github/workflows/unit_test.yml | 3 +-- data/mappings/keyboard_aliases.hjson | 9 +++++++++ keyboards/zsa/ergodox_ez/config.h | 11 +++-------- keyboards/zsa/ergodox_ez/ergodox_ez.c | 2 +- .../m32u4/base/{info.json => keyboard.json} | 0 keyboards/zsa/ergodox_ez/m32u4/base/rules.mk | 0 .../m32u4/glow/{info.json => keyboard.json} | 3 +++ keyboards/zsa/ergodox_ez/m32u4/glow/rules.mk | 1 - keyboards/zsa/ergodox_ez/m32u4/m32u4.c | 3 ++- keyboards/zsa/ergodox_ez/m32u4/rules.mk | 1 - .../m32u4/shine/{info.json => keyboard.json} | 3 +++ keyboards/zsa/ergodox_ez/m32u4/shine/rules.mk | 1 - keyboards/zsa/ergodox_ez/m32u4/shine/shine.h | 0 keyboards/zsa/ergodox_ez/rules.mk | 1 - keyboards/zsa/ergodox_ez/stm32/rules.mk | 1 - .../chordal_hold/default/config.h | 10 ---------- .../chordal_hold/hold_on_other_key_press/config.h | 11 ----------- .../chordal_hold/retro_shift_permissive_hold/config.h | 4 ---- 18 files changed, 22 insertions(+), 42 deletions(-) rename keyboards/zsa/ergodox_ez/m32u4/base/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/zsa/ergodox_ez/m32u4/base/rules.mk rename keyboards/zsa/ergodox_ez/m32u4/glow/{info.json => keyboard.json} (62%) delete mode 100644 keyboards/zsa/ergodox_ez/m32u4/glow/rules.mk delete mode 100644 keyboards/zsa/ergodox_ez/m32u4/rules.mk rename keyboards/zsa/ergodox_ez/m32u4/shine/{info.json => keyboard.json} (63%) delete mode 100644 keyboards/zsa/ergodox_ez/m32u4/shine/rules.mk delete mode 100644 keyboards/zsa/ergodox_ez/m32u4/shine/shine.h delete mode 100644 keyboards/zsa/ergodox_ez/stm32/rules.mk diff --git a/.github/workflows/unit_test.yml b/.github/workflows/unit_test.yml index a834053a76..8d0a1f7706 100644 --- a/.github/workflows/unit_test.yml +++ b/.github/workflows/unit_test.yml @@ -6,8 +6,7 @@ permissions: on: push: branches: - - master - - develop + - firmware[0-9]+ pull_request: paths: - 'builddefs/**' diff --git a/data/mappings/keyboard_aliases.hjson b/data/mappings/keyboard_aliases.hjson index d1b0436d00..2c5736872e 100644 --- a/data/mappings/keyboard_aliases.hjson +++ b/data/mappings/keyboard_aliases.hjson @@ -37,5 +37,14 @@ }, "voyager": { "target": "zsa/voyager" + }, + "zsa/ergodox_ez": { + "target": "zsa/ergodox_ez/m32u4/base" + }, + "zsa/ergodox_ez/m32u4": { + "target": "zsa/ergodox_ez/m32u4/base" + }, + "zsa/ergodox_ez/stm32": { + "target": "zsa/ergodox_ez/stm32/base" } } diff --git a/keyboards/zsa/ergodox_ez/config.h b/keyboards/zsa/ergodox_ez/config.h index cc1a5bc48d..fc2c9a7c7d 100644 --- a/keyboards/zsa/ergodox_ez/config.h +++ b/keyboards/zsa/ergodox_ez/config.h @@ -42,8 +42,6 @@ along with this program. If not, see . #define MOUSEKEY_WHEEL_MAX_SPEED MOUSEKEY_MAX_SPEED #define MOUSEKEY_WHEEL_TIME_TO_MAX MOUSEKEY_TIME_TO_MAX -#define TAPPING_TOGGLE 1 - #define BOOTMAGIC_LITE_ROW_RIGHT 13 #define BOOTMAGIC_LITE_COLUMN_RIGHT 0 @@ -83,12 +81,9 @@ along with this program. If not, see . */ // RGB backlight -#define DRIVER_ADDR_1 0b1110100 -#define DRIVER_ADDR_2 0b1110111 -#define DRIVER_COUNT 2 -#define DRIVER_1_LED_TOTAL 24 -#define DRIVER_2_LED_TOTAL 24 -#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL) +#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND +#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_VCC +#define IS31FL3731_I2C_TIMEOUT 5 #define RGB_MATRIX_LED_PROCESS_LIMIT 5 #define RGB_MATRIX_LED_FLUSH_LIMIT 26 diff --git a/keyboards/zsa/ergodox_ez/ergodox_ez.c b/keyboards/zsa/ergodox_ez/ergodox_ez.c index 75eba2d440..9e0aedc28a 100644 --- a/keyboards/zsa/ergodox_ez/ergodox_ez.c +++ b/keyboards/zsa/ergodox_ez/ergodox_ez.c @@ -196,7 +196,7 @@ const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = { #ifdef RGB_MATRIX_ENABLE // clang-format off -__attribute__((weak)) const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = { +__attribute__((weak)) const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = { /* driver * | R location * | | G location diff --git a/keyboards/zsa/ergodox_ez/m32u4/base/info.json b/keyboards/zsa/ergodox_ez/m32u4/base/keyboard.json similarity index 100% rename from keyboards/zsa/ergodox_ez/m32u4/base/info.json rename to keyboards/zsa/ergodox_ez/m32u4/base/keyboard.json diff --git a/keyboards/zsa/ergodox_ez/m32u4/base/rules.mk b/keyboards/zsa/ergodox_ez/m32u4/base/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/keyboards/zsa/ergodox_ez/m32u4/glow/info.json b/keyboards/zsa/ergodox_ez/m32u4/glow/keyboard.json similarity index 62% rename from keyboards/zsa/ergodox_ez/m32u4/glow/info.json rename to keyboards/zsa/ergodox_ez/m32u4/glow/keyboard.json index dcbb1999ca..da57313673 100644 --- a/keyboards/zsa/ergodox_ez/m32u4/glow/info.json +++ b/keyboards/zsa/ergodox_ez/m32u4/glow/keyboard.json @@ -2,5 +2,8 @@ "keyboard_name": "ErgoDox EZ Glow", "usb": { "pid": "0x4976" + }, + "features": { + "rgb_matrix": true } } diff --git a/keyboards/zsa/ergodox_ez/m32u4/glow/rules.mk b/keyboards/zsa/ergodox_ez/m32u4/glow/rules.mk deleted file mode 100644 index aad92997d0..0000000000 --- a/keyboards/zsa/ergodox_ez/m32u4/glow/rules.mk +++ /dev/null @@ -1 +0,0 @@ -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/zsa/ergodox_ez/m32u4/m32u4.c b/keyboards/zsa/ergodox_ez/m32u4/m32u4.c index 7f19250b42..bb8943fd77 100644 --- a/keyboards/zsa/ergodox_ez/m32u4/m32u4.c +++ b/keyboards/zsa/ergodox_ez/m32u4/m32u4.c @@ -53,7 +53,8 @@ void keyboard_post_init_sub(void) { } #ifdef RGB_MATRIX_ENABLE -const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = { +const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = { + /* driver * | R location * | | G location diff --git a/keyboards/zsa/ergodox_ez/m32u4/rules.mk b/keyboards/zsa/ergodox_ez/m32u4/rules.mk deleted file mode 100644 index 1df1d14461..0000000000 --- a/keyboards/zsa/ergodox_ez/m32u4/rules.mk +++ /dev/null @@ -1 +0,0 @@ -DEFAULT_FOLDER = zsa/ergodox_ez/m32u4/base diff --git a/keyboards/zsa/ergodox_ez/m32u4/shine/info.json b/keyboards/zsa/ergodox_ez/m32u4/shine/keyboard.json similarity index 63% rename from keyboards/zsa/ergodox_ez/m32u4/shine/info.json rename to keyboards/zsa/ergodox_ez/m32u4/shine/keyboard.json index 11c3a8b209..a454a4e739 100644 --- a/keyboards/zsa/ergodox_ez/m32u4/shine/info.json +++ b/keyboards/zsa/ergodox_ez/m32u4/shine/keyboard.json @@ -2,5 +2,8 @@ "keyboard_name": "ErgoDox EZ Shine", "usb": { "pid": "0x4975" + }, + "features": { + "rgblight": true } } diff --git a/keyboards/zsa/ergodox_ez/m32u4/shine/rules.mk b/keyboards/zsa/ergodox_ez/m32u4/shine/rules.mk deleted file mode 100644 index 1e3cebb145..0000000000 --- a/keyboards/zsa/ergodox_ez/m32u4/shine/rules.mk +++ /dev/null @@ -1 +0,0 @@ -RGBLIGHT_ENABLE = yes diff --git a/keyboards/zsa/ergodox_ez/m32u4/shine/shine.h b/keyboards/zsa/ergodox_ez/m32u4/shine/shine.h deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/keyboards/zsa/ergodox_ez/rules.mk b/keyboards/zsa/ergodox_ez/rules.mk index 363c32e629..6e46d842d3 100644 --- a/keyboards/zsa/ergodox_ez/rules.mk +++ b/keyboards/zsa/ergodox_ez/rules.mk @@ -7,4 +7,3 @@ I2C_DRIVER_REQUIRED = yes MOUSE_SHARED_EP = no -DEFAULT_FOLDER = zsa/ergodox_ez/m32u4/base diff --git a/keyboards/zsa/ergodox_ez/stm32/rules.mk b/keyboards/zsa/ergodox_ez/stm32/rules.mk deleted file mode 100644 index fb7f8a18cf..0000000000 --- a/keyboards/zsa/ergodox_ez/stm32/rules.mk +++ /dev/null @@ -1 +0,0 @@ -DEFAULT_FOLDER = zsa/ergodox_ez/stm32/base diff --git a/tests/tap_hold_configurations/chordal_hold/default/config.h b/tests/tap_hold_configurations/chordal_hold/default/config.h index 6ee76b9922..2ba155df73 100644 --- a/tests/tap_hold_configurations/chordal_hold/default/config.h +++ b/tests/tap_hold_configurations/chordal_hold/default/config.h @@ -1,9 +1,5 @@ -<<<<<<<< HEAD:tests/tap_hold_configurations/chordal_hold/default/config.h /* Copyright 2022 Vladislav Kucheriavykh * Copyright 2024 Google LLC -======== -/* Copyright 2024 ThanhSon.Mech ->>>>>>>> origin/master:keyboards/trnthsn/e8ghty/halconf.h * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,11 +17,5 @@ #pragma once -<<<<<<<< HEAD:tests/tap_hold_configurations/chordal_hold/default/config.h #include "test_common.h" #define CHORDAL_HOLD -======== -#define HAL_USE_SPI TRUE - -#include_next ->>>>>>>> origin/master:keyboards/trnthsn/e8ghty/halconf.h diff --git a/tests/tap_hold_configurations/chordal_hold/hold_on_other_key_press/config.h b/tests/tap_hold_configurations/chordal_hold/hold_on_other_key_press/config.h index 5361770fa9..87094b2fac 100644 --- a/tests/tap_hold_configurations/chordal_hold/hold_on_other_key_press/config.h +++ b/tests/tap_hold_configurations/chordal_hold/hold_on_other_key_press/config.h @@ -1,9 +1,5 @@ -<<<<<<<< HEAD:tests/tap_hold_configurations/chordal_hold/hold_on_other_key_press/config.h /* Copyright 2022 Vladislav Kucheriavykh * Copyright 2024 Google LLC -======== -/* Copyright 2022 QMK ->>>>>>>> origin/master:keyboards/deemen17/de80/halconf.h * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,13 +17,6 @@ #pragma once -<<<<<<<< HEAD:tests/tap_hold_configurations/chordal_hold/hold_on_other_key_press/config.h #include "test_common.h" #define CHORDAL_HOLD #define HOLD_ON_OTHER_KEY_PRESS -======== -#define HAL_USE_SPI TRUE - -#include_next - ->>>>>>>> origin/master:keyboards/deemen17/de80/halconf.h diff --git a/tests/tap_hold_configurations/chordal_hold/retro_shift_permissive_hold/config.h b/tests/tap_hold_configurations/chordal_hold/retro_shift_permissive_hold/config.h index 8b86147628..4d704c5978 100644 --- a/tests/tap_hold_configurations/chordal_hold/retro_shift_permissive_hold/config.h +++ b/tests/tap_hold_configurations/chordal_hold/retro_shift_permissive_hold/config.h @@ -19,11 +19,7 @@ #include "test_common.h" -<<<<<<<< HEAD:tests/tap_hold_configurations/chordal_hold/retro_shift_permissive_hold/config.h #define CHORDAL_HOLD -======== -// place overrides here ->>>>>>>> origin/master:keyboards/unikeyboard/diverge3/keymaps/iso_uk/config.h #define PERMISSIVE_HOLD #define RETRO_SHIFT 2 * TAPPING_TERM