|
@@ -15,14 +15,7 @@
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
*/
|
|
|
|
|
|
-#include <stdint.h>
|
|
|
|
-#include <stdbool.h>
|
|
|
|
-#include <string.h>
|
|
|
|
-#include "hal.h"
|
|
|
|
-#include "timer.h"
|
|
|
|
-#include "wait.h"
|
|
|
|
-#include "debug.h"
|
|
|
|
-#include "matrix.h"
|
|
|
|
|
|
+#include "quantum.h"
|
|
|
|
|
|
/*
|
|
/*
|
|
* col: { B11, B10, B2, B1, A7, B0 }
|
|
* col: { B11, B10, B2, B1, A7, B0 }
|
|
@@ -38,9 +31,13 @@ __attribute__((weak)) void matrix_init_user(void) {}
|
|
|
|
|
|
__attribute__((weak)) void matrix_scan_user(void) {}
|
|
__attribute__((weak)) void matrix_scan_user(void) {}
|
|
|
|
|
|
-__attribute__((weak)) void matrix_init_kb(void) { matrix_init_user(); }
|
|
|
|
|
|
+__attribute__((weak)) void matrix_init_kb(void) {
|
|
|
|
+ matrix_init_user();
|
|
|
|
+}
|
|
|
|
|
|
-__attribute__((weak)) void matrix_scan_kb(void) { matrix_scan_user(); }
|
|
|
|
|
|
+__attribute__((weak)) void matrix_scan_kb(void) {
|
|
|
|
+ matrix_scan_user();
|
|
|
|
+}
|
|
|
|
|
|
void matrix_init(void) {
|
|
void matrix_init(void) {
|
|
dprintf("matrix init\n");
|
|
dprintf("matrix init\n");
|
|
@@ -146,9 +143,13 @@ uint8_t matrix_scan(void) {
|
|
return 1;
|
|
return 1;
|
|
}
|
|
}
|
|
|
|
|
|
-bool matrix_is_on(uint8_t row, uint8_t col) { return (matrix[row] & (1 << col)); }
|
|
|
|
|
|
+bool matrix_is_on(uint8_t row, uint8_t col) {
|
|
|
|
+ return (matrix[row] & (1 << col));
|
|
|
|
+}
|
|
|
|
|
|
-matrix_row_t matrix_get_row(uint8_t row) { return matrix[row]; }
|
|
|
|
|
|
+matrix_row_t matrix_get_row(uint8_t row) {
|
|
|
|
+ return matrix[row];
|
|
|
|
+}
|
|
|
|
|
|
void matrix_print(void) {
|
|
void matrix_print(void) {
|
|
dprintf("\nr/c 01234567\n");
|
|
dprintf("\nr/c 01234567\n");
|