summaryrefslogtreecommitdiff
path: root/keyboards/converter
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2022-03-10 12:18:47 +0000
committerQMK Bot <hello@qmk.fm>2022-03-10 12:18:47 +0000
commitcf44bde909f8da51fce7a36b345e2c06dd05faf3 (patch)
tree1c49c11c6d971a7c79a34ca695a87fc511baeaf9 /keyboards/converter
parentcb65c7755ead2115296d7a346b907853e306ba10 (diff)
parentbd70f5261cbb7fd4700bf9876da94c9661dadf63 (diff)
downloadqmk_firmware-cf44bde909f8da51fce7a36b345e2c06dd05faf3.tar.gz
qmk_firmware-cf44bde909f8da51fce7a36b345e2c06dd05faf3.zip
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/converter')
-rw-r--r--keyboards/converter/ibm_terminal/matrix.c1
-rw-r--r--keyboards/converter/palm_usb/matrix.c9
-rw-r--r--keyboards/converter/sun_usb/matrix.c9
-rw-r--r--keyboards/converter/usb_usb/custom_matrix.cpp12
4 files changed, 0 insertions, 31 deletions
diff --git a/keyboards/converter/ibm_terminal/matrix.c b/keyboards/converter/ibm_terminal/matrix.c
index caa0a38051..3d6736a0cc 100644
--- a/keyboards/converter/ibm_terminal/matrix.c
+++ b/keyboards/converter/ibm_terminal/matrix.c
@@ -27,7 +27,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define print_matrix_row(row) print_bin_reverse8(matrix_get_row(row))
#define print_matrix_header() print("\nr/c 01234567\n")
-#define matrix_bitpop(i) bitpop(matrix[i])
#define ROW_SHIFTER ((uint8_t)1)
diff --git a/keyboards/converter/palm_usb/matrix.c b/keyboards/converter/palm_usb/matrix.c
index 010fd56c79..28d4b87d83 100644
--- a/keyboards/converter/palm_usb/matrix.c
+++ b/keyboards/converter/palm_usb/matrix.c
@@ -379,12 +379,3 @@ void matrix_print(void)
print("\n");
}
}
-
-uint8_t matrix_key_count(void)
-{
- uint8_t count = 0;
- for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
- count += bitpop(matrix[i]);
- }
- return count;
-}
diff --git a/keyboards/converter/sun_usb/matrix.c b/keyboards/converter/sun_usb/matrix.c
index e28d165d52..35ec391024 100644
--- a/keyboards/converter/sun_usb/matrix.c
+++ b/keyboards/converter/sun_usb/matrix.c
@@ -179,12 +179,3 @@ void matrix_print(void)
print("\n");
}
}
-
-uint8_t matrix_key_count(void)
-{
- uint8_t count = 0;
- for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
- count += bitpop(matrix[i]);
- }
- return count;
-}
diff --git a/keyboards/converter/usb_usb/custom_matrix.cpp b/keyboards/converter/usb_usb/custom_matrix.cpp
index 265fb2c68d..00b5bc5053 100644
--- a/keyboards/converter/usb_usb/custom_matrix.cpp
+++ b/keyboards/converter/usb_usb/custom_matrix.cpp
@@ -225,18 +225,6 @@ extern "C"
return row_bits;
}
- uint8_t matrix_key_count(void) {
- uint8_t count = 0;
-
- count += bitpop(local_keyboard_report.mods);
- for (uint8_t i = 0; i < KEYBOARD_REPORT_KEYS; i++) {
- if (IS_ANY(local_keyboard_report.keys[i])) {
- count++;
- }
- }
- return count;
- }
-
void matrix_print(void) {
print("\nr/c 0123456789ABCDEF\n");
for (uint8_t row = 0; row < matrix_rows(); row++) {