diff options
author | WarmCat <32871908+WarmCatUK@users.noreply.github.com> | 2018-05-10 16:28:58 +0100 |
---|---|---|
committer | Drashna Jaelre <drashna@live.com> | 2018-05-10 08:28:58 -0700 |
commit | 933842067df08e7d0515049509bdd3fa73b334e1 (patch) | |
tree | 0e777c72e7f357ec45c9f294d80bda3f5915302e /keyboards/jj50/matrix.c | |
parent | c5264d6d89899f19bdeeaf9e2daeb90531617a48 (diff) | |
download | qmk_firmware-933842067df08e7d0515049509bdd3fa73b334e1.tar.gz |
Backlight and RGB now working for JJ50 (#2929)
* Added support for JJ50 from KPRepublic, no rgb or backlight control yet. Added as a layout of ymd96 at the moment (same microprocessor). Basic keymap with three layers to get started.
* Added support for JJ50
* Tidied up jj50 code, backlight and RGB is now working.
* Renaming "KEYMAP" to "LAYOUT" to adhere to the new QMK standards.
Diffstat (limited to 'keyboards/jj50/matrix.c')
-rw-r--r-- | keyboards/jj50/matrix.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/keyboards/jj50/matrix.c b/keyboards/jj50/matrix.c index 8f9c67fe4..95c6057e7 100644 --- a/keyboards/jj50/matrix.c +++ b/keyboards/jj50/matrix.c @@ -1,5 +1,6 @@ /* Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com> +Modified 2018 by Wayne K Jones <github.com/WarmCatUK> 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 @@ -36,17 +37,20 @@ void matrix_init(void) { // all inputs for columns DDRA = 0x00; DDRC &= ~(0x111111<<2); - DDRD &= ~(1<<PIND7); + //----> DDRD &= ~(1<<PIND7); + // Port D not used on this keyboard // all columns are pulled-up PORTA = 0xFF; PORTC |= (0b111111<<2); //PORTD |= (1<<PIND7); + // Port D not used on this keyboard // initialize matrix state: all keys off for (uint8_t row = 0; row < MATRIX_ROWS; row++) { matrix[row] = 0x00; matrix_debouncing[row] = 0x00; } + matrix_init_quantum(); // missing from original port by Luiz } void matrix_set_row_status(uint8_t row) { @@ -72,9 +76,6 @@ uint8_t matrix_scan(void) { ) | ( // cols 8..13, PORTC 7 -> 0 bit_reverse((~PINC) & 0xFF) << 8 - ) | ( - // col 14, PORTD 7 - ((~PIND) & (1 << PIND7)) << 7 ); if (matrix_debouncing[row] != cols) { @@ -92,8 +93,8 @@ uint8_t matrix_scan(void) { } } } - - matrix_scan_user(); + matrix_scan_quantum(); // also missing in original PS2AVRGB implementation + //matrix_scan_user(); return 1; } |