Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Keyboard] Update to ZSA Keyboards #15644

Merged
merged 12 commits into from
Dec 29, 2021
Merged

[Keyboard] Update to ZSA Keyboards #15644

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
eadbd7a
[Keyboard] Use DAC Additive driver for ZSA ARM boards
drashna Dec 7, 2021
c14bf2e
fix: layer3 indicator leds (zsa#305)
fdidron Aug 27, 2020
da628f9
fix issues with keyboard sleep (zsa#316)
fdidron Oct 14, 2020
a7ebfa2
Fix/moonlander leds (zsa#318)
fdidron Oct 17, 2020
c85f065
hotfix: fix double mouse report sending on shared EP
drashna Nov 24, 2020
81cec6a
cleanup rules for ergodox
drashna Nov 24, 2020
9755d77
Increase mouse wheel key delay (zsa#333)
fdidron Mar 18, 2021
aa2c4bf
Adds caps lock led status on Moonlander/Ergodox (zsa#332)
fdidron Mar 18, 2021
97a0e00
Fix bug in caps lock light logic for Moonlander (zsa#341)
Xaeroxe Dec 28, 2021
4c31751
Add macro for defining LED layouts on ergodox_ez glow
dmsnell Dec 8, 2021
cdf8784
Additional cleanup
drashna Dec 29, 2021
65d475b
Remove user defines in moonlander config.h
drashna Dec 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix/moonlander leds (zsa#318) 
* Additionall fixes

* fix spelling errors

* Remove bad matrix wake code

Co-authored-by: Drashna Jael're <drashna@live.com>
  • Loading branch information
@fdidron @drashna
fdidron and drashna committed Dec 29, 2021
commit a7ebfa256c4b0a8847658b4218b652bb005c03e9
18 changes: 13 additions & 5 deletions keyboards/moonlander/matrix.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ void matrix_power_up(void) {
// Needed for proper wake/sleep

void matrix_power_up(void) {
mcp23018_init();
bool temp_launching = is_launching;

// outputs
setPinOutput(B10);
Expand All @@ -242,6 +242,8 @@ void matrix_power_up(void) {
setPinOutput(B14);
setPinOutput(B15);

wait_us(30);

// inputs
setPinInputLow(A0);
setPinInputLow(A1);
Expand All @@ -251,10 +253,16 @@ void matrix_power_up(void) {
setPinInputLow(A7);
setPinInputLow(B0);

memset(matrix, 0, MATRIX_ROWS * sizeof(matrix_row_t));
memset(matrix_debouncing, 0, MATRIX_ROWS * sizeof(matrix_row_t));
memset(matrix_debouncing_right, 0, MATRIX_COLS * sizeof(matrix_row_t));

mcp23018_init();
is_launching = temp_launching;
if (!temp_launching) {
ML_LED_1(false);
ML_LED_2(false);
ML_LED_3(false);
ML_LED_4(false);
ML_LED_5(false);
ML_LED_6(false);
}

// initialize matrix state: all keys off
for (uint8_t i=0; i < MATRIX_ROWS; i++) {
Expand Down