summaryrefslogtreecommitdiff
path: root/keyboards/ergoinu
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/ergoinu
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/ergoinu')
-rw-r--r--keyboards/ergoinu/matrix.c39
1 files changed, 17 insertions, 22 deletions
diff --git a/keyboards/ergoinu/matrix.c b/keyboards/ergoinu/matrix.c
index 00914a2575..4a80cf9f24 100644
--- a/keyboards/ergoinu/matrix.c
+++ b/keyboards/ergoinu/matrix.c
@@ -29,24 +29,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "util.h"
#include "matrix.h"
#include "split_util.h"
+#include "quantum.h"
#include "serial.h"
-// from pro_micro.h
-#define TX_RX_LED_INIT DDRD |= (1<<5), DDRB |= (1<<0)
-
-#ifndef DISABLE_PROMICRO_LEDs
- #define TXLED0 PORTD |= (1<<5)
- #define TXLED1 PORTD &= ~(1<<5)
- #define RXLED0 PORTB |= (1<<0)
- #define RXLED1 PORTB &= ~(1<<0)
-#else
- #define TXLED0
- #define TXLED1
- #define RXLED0
- #define RXLED1
-#endif
-
#ifndef DEBOUNCE
# define DEBOUNCE 5
#endif
@@ -108,11 +94,12 @@ void matrix_init(void) {
unselect_rows();
init_cols();
- TX_RX_LED_INIT;
+ setPinOutput(B0);
+ setPinOutput(D5);
#ifdef DISABLE_PROMICRO_LEDs
- PORTD |= (1<<5);
- PORTB |= (1<<0);
+ writePinHigh(B0);
+ writePinHigh(D5);
#endif
// initialize matrix state: all keys off
@@ -158,10 +145,14 @@ int serial_transaction(void) {
int slaveOffset = (isLeftHand) ? (ROWS_PER_HAND) : 0;
int ret=serial_update_buffers();
if (ret ) {
- if(ret==2)RXLED1;
+#ifndef DISABLE_PROMICRO_LEDs
+ if(ret==2) writePinLow(B0);
+#endif
return 1;
}
-RXLED0;
+#ifndef DISABLE_PROMICRO_LEDs
+ writePinHigh(B0);
+#endif
for (int i = 0; i < ROWS_PER_HAND; ++i) {
matrix[slaveOffset+i] = serial_slave_buffer[i];
}
@@ -197,8 +188,10 @@ uint8_t matrix_master_scan(void) {
}
if( serial_transaction() ) {
+#ifndef DISABLE_PROMICRO_LEDs
// turn on the indicator led when halves are disconnected
- TXLED1;
+ writePinLow(D5);
+#endif
error_count++;
@@ -210,8 +203,10 @@ uint8_t matrix_master_scan(void) {
}
}
} else {
+#ifndef DISABLE_PROMICRO_LEDs
// turn off the indicator led on no error
- TXLED0;
+ writePinHigh(D5);
+#endif
error_count = 0;
}
matrix_scan_quantum();