aboutsummaryrefslogtreecommitdiff
path: root/keyboards/helix/rev2/matrix.c
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2020-03-15 02:31:15 +1100
committerGitHub <noreply@github.com>2020-03-14 15:31:15 +0000
commitd597af9e1e15ed54b3f967c52e39a6cc3b980b68 (patch)
tree0271c0c4f4993ba28b1ad6354ff438ee22bca078 /keyboards/helix/rev2/matrix.c
parent03ed8197175ffe046de050b3c2fd7b70f641cc60 (diff)
downloadqmk_firmware-d597af9e1e15ed54b3f967c52e39a6cc3b980b68.tar.gz
qmk_firmware-d597af9e1e15ed54b3f967c52e39a6cc3b980b68.zip
Remove pro_micro.h (#8374)
* Remove pro_micro.h * Include quantum.h
Diffstat (limited to 'keyboards/helix/rev2/matrix.c')
-rw-r--r--keyboards/helix/rev2/matrix.c17
1 files changed, 9 insertions, 8 deletions
diff --git a/keyboards/helix/rev2/matrix.c b/keyboards/helix/rev2/matrix.c
index 050dcac2d..8ea070aa3 100644
--- a/keyboards/helix/rev2/matrix.c
+++ b/keyboards/helix/rev2/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"
@@ -100,9 +100,10 @@ void matrix_init(void)
100 unselect_rows(); 100 unselect_rows();
101 init_cols(); 101 init_cols();
102 102
103 TX_RX_LED_INIT; 103 setPinOutput(B0);
104 TXLED0; 104 setPinOutput(D5);
105 RXLED0; 105 writePinHigh(B0);
106 writePinHigh(D5);
106 107
107 // initialize matrix state: all keys off 108 // initialize matrix state: all keys off
108 for (uint8_t i=0; i < MATRIX_ROWS; i++) { 109 for (uint8_t i=0; i < MATRIX_ROWS; i++) {
@@ -185,10 +186,10 @@ int serial_transaction(int master_changed) {
185 int ret=serial_update_buffers(); 186 int ret=serial_update_buffers();
186#endif 187#endif
187 if (ret ) { 188 if (ret ) {
188 if(ret==2) RXLED1; 189 if(ret==2) writePinLow(B0);
189 return 1; 190 return 1;
190 } 191 }
191 RXLED0; 192 writePinHigh(B0);
192 memcpy(&matrix[slaveOffset], 193 memcpy(&matrix[slaveOffset],
193 (void *)serial_slave_buffer, sizeof(serial_slave_buffer)); 194 (void *)serial_slave_buffer, sizeof(serial_slave_buffer));
194 return 0; 195 return 0;
@@ -239,7 +240,7 @@ uint8_t matrix_master_scan(void) {
239 if( serial_transaction(mchanged) ) { 240 if( serial_transaction(mchanged) ) {
240#endif 241#endif
241 // turn on the indicator led when halves are disconnected 242 // turn on the indicator led when halves are disconnected
242 TXLED1; 243 writePinLow(D5);
243 244
244 error_count++; 245 error_count++;
245 246
@@ -252,7 +253,7 @@ uint8_t matrix_master_scan(void) {
252 } 253 }
253 } else { 254 } else {
254 // turn off the indicator led on no error 255 // turn off the indicator led on no error
255 TXLED0; 256 writePinHigh(D5);
256 error_count = 0; 257 error_count = 0;
257 } 258 }
258 matrix_scan_quantum(); 259 matrix_scan_quantum();