melissa/zsa_qmk_firmware
1
0
Fork 0
mirror of https://github.com/zsa/qmk_firmware.git synced 2026-01-10 07:33:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix issues with Ergodox EZ Shine LEDs (#400)

Browse Source 
* Fix issues with Ergodox EZ Shine LEDs

* Get RGB Light working with newer driver model
This commit is contained in:
Drashna Jaelre
2024-08-19 03:14:18 -07:00
committed by GitHub
parent e9fa160faf
commit 0be58d4b06
5 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
keyboards/zsa/ergodox_ez/info.json
View File

@@ -80,6 +80,9 @@
"saturation_steps": 255, "saturation_steps": 255,
"sleep": true "sleep": true
}, },
"ws2812": {
"rgbw": true
},
"tapping": { "tapping": {
"toggle": 1 "toggle": 1
}, },

3
keyboards/zsa/ergodox_ez/m32u4/m32u4.c
View File

@@ -21,12 +21,11 @@ void keyboard_post_init_sub(void) {
// (tied to Vcc for hardware convenience) // (tied to Vcc for hardware convenience)
setPinInput(B4); setPinInput(B4);
// unused pins - C7, D4, D5, D7, E6 // unused pins - C7, D4, D5, E6
// set as input with internal pull-up enabled // set as input with internal pull-up enabled
setPinInputHigh(C7); setPinInputHigh(C7);
setPinInputHigh(D4); setPinInputHigh(D4);
setPinInputHigh(D5); setPinInputHigh(D5);
setPinInputHigh(D7);
setPinInputHigh(E6); setPinInputHigh(E6);
setPinOutput(ERGODOX_LED_1_PIN); setPinOutput(ERGODOX_LED_1_PIN);

1
keyboards/zsa/ergodox_ez/post_config.h
View File

@@ -38,6 +38,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// If not, then only define 15 // If not, then only define 15
# define RGBLIGHT_LED_COUNT 15 // Number of LEDs # define RGBLIGHT_LED_COUNT 15 // Number of LEDs
#endif #endif
#define WS2812_LED_COUNT RGBLIGHT_LED_COUNT
#ifndef ISSI_TIMEOUT #ifndef ISSI_TIMEOUT
# define ISSI_TIMEOUT 3 # define ISSI_TIMEOUT 3

5
keyboards/zsa/ergodox_ez/post_rules.mk
View File

@@ -1 +1,6 @@
include keyboards/zsa/common/features.mk include keyboards/zsa/common/features.mk
ifeq ($(RGBLIGHT_ENABLE),yes)
RGBLIGHT_DRIVER = custom
WS2812_DRIVER_REQUIRED = yes
SRC += rgblight_custom.c
endif

24
keyboards/zsa/ergodox_ez/led_i2c.c → keyboards/zsa/ergodox_ez/rgblight_custom.c
View File

@@ -18,24 +18,23 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifdef RGBLIGHT_ENABLE
# include "ergodox_ez.h" # include "ergodox_ez.h"
# include "ws2812.h"
void rgblight_call_driver(LED_TYPE *led, uint8_t led_num) { void setleds_custom(rgb_led_t *led, uint16_t led_num) {
uint16_t length = 0; uint16_t length = 0;
uint8_t i = 0; int i = 0;
uint8_t j = 0; int j = 0;
# ifdef RGBW # ifdef WS2812_RGBW
const uint8_t bytes_per_led = 4; int bytes_per_led = 4;
# else # else
const uint8_t bytes_per_led = 3; int bytes_per_led = 3;
# endif # endif
# if defined(ERGODOX_LED_30) # if defined(ERGODOX_LED_30)
// prevent right-half code from trying to bitbang all 30 // prevent right-half code from trying to bitbang all 30
// so with 30 LEDs, we count from 29 to 15 here, and the // so with 30 LEDs, we count from 29 to 15 here, and the
// other half does 0 to 14. // other half does 0 to 14.
uint8_t half_led_num = RGBLED_NUM / 2; uint8_t half_led_num = WS2812_LED_COUNT / 2;
length = half_led_num * bytes_per_led; length = half_led_num * bytes_per_led;
uint8_t data[length]; uint8_t data[length];
for (i = half_led_num + half_led_num - 1; i >= half_led_num; --i) for (i = half_led_num + half_led_num - 1; i >= half_led_num; --i)
@@ -53,7 +52,7 @@ void rgblight_call_driver(LED_TYPE *led, uint8_t led_num) {
data[j++] = data_byte[0]; data[j++] = data_byte[0];
data[j++] = data_byte[1]; data[j++] = data_byte[1];
data[j++] = data_byte[2]; data[j++] = data_byte[2];
# ifdef RGBW # ifdef WS2812_RGBW
data[j++] = data_byte[3]; data[j++] = data_byte[3];
# endif # endif
} }
@@ -62,4 +61,7 @@ void rgblight_call_driver(LED_TYPE *led, uint8_t led_num) {
ws2812_setleds(led, led_num); ws2812_setleds(led, led_num);
} }
#endif // RGBLIGHT_ENABLE const rgblight_driver_t rgblight_driver = {
.init = ws2812_init,
.setleds = setleds_custom,
};