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 | qmk_firmware-d597af9e1e15ed54b3f967c52e39a6cc3b980b68.tar.gz qmk_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/>. | |||
| 30 | #include "util.h" | 30 | #include "util.h" |
| 31 | #include "matrix.h" | 31 | #include "matrix.h" |
| 32 | #include "split_util.h" | 32 | #include "split_util.h" |
| 33 | #include "pro_micro.h" | 33 | #include "quantum.h" |
| 34 | 34 | ||
| 35 | #ifdef USE_MATRIX_I2C | 35 | #ifdef USE_MATRIX_I2C |
| 36 | # include "i2c.h" | 36 | # include "i2c.h" |
| @@ -102,9 +102,10 @@ void matrix_init(void) | |||
| 102 | unselect_rows(); | 102 | unselect_rows(); |
| 103 | init_cols(); | 103 | init_cols(); |
| 104 | 104 | ||
| 105 | TX_RX_LED_INIT; | 105 | setPinOutput(B0); |
| 106 | TXLED0; | 106 | setPinOutput(D5); |
| 107 | RXLED0; | 107 | writePinHigh(D5); |
| 108 | writePinHigh(B0); | ||
| 108 | 109 | ||
| 109 | // initialize matrix state: all keys off | 110 | // initialize matrix state: all keys off |
| 110 | for (uint8_t i=0; i < MATRIX_ROWS; i++) { | 111 | for (uint8_t i=0; i < MATRIX_ROWS; i++) { |
| @@ -189,10 +190,10 @@ int serial_transaction(int master_changed) { | |||
| 189 | int ret=serial_update_buffers(); | 190 | int ret=serial_update_buffers(); |
| 190 | #endif | 191 | #endif |
| 191 | if (ret ) { | 192 | if (ret ) { |
| 192 | if(ret==2) RXLED1; | 193 | if(ret==2) writePinLow(B0); |
| 193 | return 1; | 194 | return 1; |
| 194 | } | 195 | } |
| 195 | RXLED0; | 196 | writePinHigh(B0); |
| 196 | memcpy(&matrix[slaveOffset], | 197 | memcpy(&matrix[slaveOffset], |
| 197 | (void *)serial_slave_buffer, sizeof(serial_slave_buffer)); | 198 | (void *)serial_slave_buffer, sizeof(serial_slave_buffer)); |
| 198 | return 0; | 199 | return 0; |
| @@ -240,7 +241,7 @@ uint8_t matrix_master_scan(void) { | |||
| 240 | if( serial_transaction(mchanged) ) { | 241 | if( serial_transaction(mchanged) ) { |
| 241 | #endif | 242 | #endif |
| 242 | // turn on the indicator led when halves are disconnected | 243 | // turn on the indicator led when halves are disconnected |
| 243 | TXLED1; | 244 | writePinLow(D5); |
| 244 | 245 | ||
| 245 | error_count++; | 246 | error_count++; |
| 246 | 247 | ||
| @@ -253,7 +254,7 @@ uint8_t matrix_master_scan(void) { | |||
| 253 | } | 254 | } |
| 254 | } else { | 255 | } else { |
| 255 | // turn off the indicator led on no error | 256 | // turn off the indicator led on no error |
| 256 | TXLED0; | 257 | writePinHigh(D5); |
| 257 | error_count = 0; | 258 | error_count = 0; |
| 258 | } | 259 | } |
| 259 | matrix_scan_quantum(); | 260 | 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/>. | |||
| 30 | #include "util.h" | 30 | #include "util.h" |
| 31 | #include "matrix.h" | 31 | #include "matrix.h" |
| 32 | #include "split_util.h" | 32 | #include "split_util.h" |
| 33 | #include "pro_micro.h" | 33 | #include "quantum.h" |
| 34 | 34 | ||
| 35 | #ifdef USE_MATRIX_I2C | 35 | #ifdef USE_MATRIX_I2C |
| 36 | # include "i2c.h" | 36 | # include "i2c.h" |
| @@ -102,9 +102,10 @@ void matrix_init(void) | |||
| 102 | unselect_rows(); | 102 | unselect_rows(); |
| 103 | init_cols(); | 103 | init_cols(); |
| 104 | 104 | ||
| 105 | TX_RX_LED_INIT; | 105 | setPinOutput(B0); |
| 106 | TXLED0; | 106 | setPinOutput(D5); |
| 107 | RXLED0; | 107 | writePinHigh(B0); |
| 108 | writePinHigh(D5); | ||
| 108 | 109 | ||
| 109 | // initialize matrix state: all keys off | 110 | // initialize matrix state: all keys off |
| 110 | for (uint8_t i=0; i < MATRIX_ROWS; i++) { | 111 | for (uint8_t i=0; i < MATRIX_ROWS; i++) { |
| @@ -189,10 +190,10 @@ int serial_transaction(int master_changed) { | |||
| 189 | int ret=serial_update_buffers(); | 190 | int ret=serial_update_buffers(); |
| 190 | #endif | 191 | #endif |
| 191 | if (ret ) { | 192 | if (ret ) { |
| 192 | if(ret==2) RXLED1; | 193 | if(ret==2) writePinLow(B0); |
| 193 | return 1; | 194 | return 1; |
| 194 | } | 195 | } |
| 195 | RXLED0; | 196 | writePinHigh(B0); |
| 196 | memcpy(&matrix[slaveOffset], | 197 | memcpy(&matrix[slaveOffset], |
| 197 | (void *)serial_slave_buffer, sizeof(serial_slave_buffer)); | 198 | (void *)serial_slave_buffer, sizeof(serial_slave_buffer)); |
| 198 | return 0; | 199 | return 0; |
| @@ -240,7 +241,7 @@ uint8_t matrix_master_scan(void) { | |||
| 240 | if( serial_transaction(mchanged) ) { | 241 | if( serial_transaction(mchanged) ) { |
| 241 | #endif | 242 | #endif |
| 242 | // turn on the indicator led when halves are disconnected | 243 | // turn on the indicator led when halves are disconnected |
| 243 | TXLED1; | 244 | writePinLow(D5); |
| 244 | 245 | ||
| 245 | error_count++; | 246 | error_count++; |
| 246 | 247 | ||
| @@ -253,7 +254,7 @@ uint8_t matrix_master_scan(void) { | |||
| 253 | } | 254 | } |
| 254 | } else { | 255 | } else { |
| 255 | // turn off the indicator led on no error | 256 | // turn off the indicator led on no error |
| 256 | TXLED0; | 257 | writePinHigh(D5); |
| 257 | error_count = 0; | 258 | error_count = 0; |
| 258 | } | 259 | } |
| 259 | matrix_scan_quantum(); | 260 | matrix_scan_quantum(); |
