diff options
| author | Ryan <fauxpark@gmail.com> | 2020-03-15 02:31:15 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-14 15:31:15 +0000 |
| commit | d597af9e1e15ed54b3f967c52e39a6cc3b980b68 (patch) | |
| tree | 0271c0c4f4993ba28b1ad6354ff438ee22bca078 /keyboards/zinc | |
| parent | 03ed8197175ffe046de050b3c2fd7b70f641cc60 (diff) | |
| download | firmware-d597af9e1e15ed54b3f967c52e39a6cc3b980b68.tar.gz firmware-d597af9e1e15ed54b3f967c52e39a6cc3b980b68.tar.bz2 firmware-d597af9e1e15ed54b3f967c52e39a6cc3b980b68.zip | |
Remove pro_micro.h (#8374)
* Remove pro_micro.h
* Include quantum.h
Diffstat (limited to 'keyboards/zinc')
| -rw-r--r-- | keyboards/zinc/rev1/matrix.c | 17 | ||||
| -rw-r--r-- | keyboards/zinc/reva/matrix.c | 17 |
2 files changed, 18 insertions, 16 deletions
diff --git a/keyboards/zinc/rev1/matrix.c b/keyboards/zinc/rev1/matrix.c index 220954f05..df674ce14 100644 --- a/keyboards/zinc/rev1/matrix.c +++ b/keyboards/zinc/rev1/matrix.c @@ -30,7 +30,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "util.h" #include "matrix.h" #include "split_util.h" -#include "pro_micro.h" +#include "quantum.h" #ifdef USE_MATRIX_I2C # include "i2c.h" @@ -102,9 +102,10 @@ void matrix_init(void) unselect_rows(); init_cols(); - TX_RX_LED_INIT; - TXLED0; - RXLED0; + setPinOutput(B0); + setPinOutput(D5); + writePinHigh(D5); + writePinHigh(B0); // initialize matrix state: all keys off for (uint8_t i=0; i < MATRIX_ROWS; i++) { @@ -189,10 +190,10 @@ int serial_transaction(int master_changed) { int ret=serial_update_buffers(); #endif if (ret ) { - if(ret==2) RXLED1; + if(ret==2) writePinLow(B0); return 1; } - RXLED0; + writePinHigh(B0); memcpy(&matrix[slaveOffset], (void *)serial_slave_buffer, sizeof(serial_slave_buffer)); return 0; @@ -240,7 +241,7 @@ uint8_t matrix_master_scan(void) { if( serial_transaction(mchanged) ) { #endif // turn on the indicator led when halves are disconnected - TXLED1; + writePinLow(D5); error_count++; @@ -253,7 +254,7 @@ uint8_t matrix_master_scan(void) { } } else { // turn off the indicator led on no error - TXLED0; + writePinHigh(D5); error_count = 0; } matrix_scan_quantum(); diff --git a/keyboards/zinc/reva/matrix.c b/keyboards/zinc/reva/matrix.c index 220954f05..5b58500db 100644 --- a/keyboards/zinc/reva/matrix.c +++ b/keyboards/zinc/reva/matrix.c @@ -30,7 +30,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "util.h" #include "matrix.h" #include "split_util.h" -#include "pro_micro.h" +#include "quantum.h" #ifdef USE_MATRIX_I2C # include "i2c.h" @@ -102,9 +102,10 @@ void matrix_init(void) unselect_rows(); init_cols(); - TX_RX_LED_INIT; - TXLED0; - RXLED0; + setPinOutput(B0); + setPinOutput(D5); + writePinHigh(B0); + writePinHigh(D5); // initialize matrix state: all keys off for (uint8_t i=0; i < MATRIX_ROWS; i++) { @@ -189,10 +190,10 @@ int serial_transaction(int master_changed) { int ret=serial_update_buffers(); #endif if (ret ) { - if(ret==2) RXLED1; + if(ret==2) writePinLow(B0); return 1; } - RXLED0; + writePinHigh(B0); memcpy(&matrix[slaveOffset], (void *)serial_slave_buffer, sizeof(serial_slave_buffer)); return 0; @@ -240,7 +241,7 @@ uint8_t matrix_master_scan(void) { if( serial_transaction(mchanged) ) { #endif // turn on the indicator led when halves are disconnected - TXLED1; + writePinLow(D5); error_count++; @@ -253,7 +254,7 @@ uint8_t matrix_master_scan(void) { } } else { // turn off the indicator led on no error - TXLED0; + writePinHigh(D5); error_count = 0; } matrix_scan_quantum(); |