From a6f5047a883c4d67d8d04110de27777c95f69d73 Mon Sep 17 00:00:00 2001 From: Mikko Ahlroth Date: Thu, 13 Jul 2023 14:44:23 +0300 Subject: [PATCH] Update with latest tests --- keyboards/fujitsu/fmr60kb111/info.json | 6 +++--- .../fujitsu/fmr60kb111/keymaps/default/keymap.c | 16 ++++++++-------- keyboards/fujitsu/fmr60kb111/matrix.c | 12 ++++++++++-- keyboards/fujitsu/fmr60kb111/rules.mk | 2 -- 4 files changed, 21 insertions(+), 15 deletions(-) diff --git a/keyboards/fujitsu/fmr60kb111/info.json b/keyboards/fujitsu/fmr60kb111/info.json index 0e9127a0e3..ca0aeec123 100644 --- a/keyboards/fujitsu/fmr60kb111/info.json +++ b/keyboards/fujitsu/fmr60kb111/info.json @@ -7,7 +7,7 @@ "features": { "bootmagic": true, "command": false, - "console": false, + "console": true, "extrakey": true, "mousekey": true, "nkro": true @@ -20,8 +20,8 @@ "url": "", "usb": { "device_version": "1.0.0", - "pid": "0x0000", - "vid": "0xFEED" + "pid": "0xFAFE", + "vid": "0xFEFA" }, "layouts": { "LAYOUT_fullsize_jis": { diff --git a/keyboards/fujitsu/fmr60kb111/keymaps/default/keymap.c b/keyboards/fujitsu/fmr60kb111/keymaps/default/keymap.c index 2ab567c29b..e315195c3e 100644 --- a/keyboards/fujitsu/fmr60kb111/keymaps/default/keymap.c +++ b/keyboards/fujitsu/fmr60kb111/keymaps/default/keymap.c @@ -21,14 +21,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * └────┴────┴────┴────┴────────────┴────┴────┴───┴───┴───┴────┘ └───┴───┴───┘ └───────┴───┴───┘ */ [0] = { - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {} + {KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A}, + {KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A}, + {KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A}, + {KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A}, + {KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A}, + {KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A}, + {KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A}, + {KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A, KC_A} } }; diff --git a/keyboards/fujitsu/fmr60kb111/matrix.c b/keyboards/fujitsu/fmr60kb111/matrix.c index 0ee3a781fb..1995acd9b7 100644 --- a/keyboards/fujitsu/fmr60kb111/matrix.c +++ b/keyboards/fujitsu/fmr60kb111/matrix.c @@ -244,18 +244,26 @@ void matrix_init_custom(void) { writePinLow(COL_E); wait_us(20); - dprintf("Init finished"); + print("Init finished\n"); } bool matrix_scan_custom(matrix_row_t current_matrix[]) { + static uint16_t counter = 0; bool matrix_has_changed = false; enum Demux active_demux = D139; + ++counter; + do { select_demux(active_demux); matrix_has_changed = scan_demux(current_matrix, active_demux) || matrix_has_changed; - dprintf("Checking demux %d, %i", active_demux, matrix_has_changed); + + if (counter % 1000 == 0) { + printf("Checking demux %d, %i\n", active_demux, matrix_has_changed); + counter = 0; + } + active_demux = next_demux(active_demux); } while (active_demux != END); diff --git a/keyboards/fujitsu/fmr60kb111/rules.mk b/keyboards/fujitsu/fmr60kb111/rules.mk index a759c293a2..30ce5d293b 100644 --- a/keyboards/fujitsu/fmr60kb111/rules.mk +++ b/keyboards/fujitsu/fmr60kb111/rules.mk @@ -1,4 +1,2 @@ CUSTOM_MATRIX = lite SRC += matrix.c - -CONSOLE_ENABLE = yes