darkkirb/qmk_firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

add extern "C" to matrix.cpp

Browse source
This commit is contained in:
Balz Guenat 2017-08-12 18:33:49 +02:00 committed by Jack Humbert
parent 2aa5e44640
commit fa86b10138
1 changed files with 127 additions and 123 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
keyboards/converter/usb_usb/matrix.cpp
View file

@ -83,19 +83,21 @@ KBDReportParser kbd_parser3;
KBDReportParser kbd_parser4; KBDReportParser kbd_parser4;
uint8_t matrix_rows(void) { return MATRIX_ROWS; } extern "C"
uint8_t matrix_cols(void) { return MATRIX_COLS; } {
bool matrix_has_ghost(void) { return false; } uint8_t matrix_rows(void) { return MATRIX_ROWS; }
void matrix_init(void) { uint8_t matrix_cols(void) { return MATRIX_COLS; }
bool matrix_has_ghost(void) { return false; }
void matrix_init(void) {
// USB Host Shield setup // USB Host Shield setup
usb_host.Init(); usb_host.Init();
kbd1.SetReportParser(0, (HIDReportParser*)&kbd_parser1); kbd1.SetReportParser(0, (HIDReportParser*)&kbd_parser1);
kbd2.SetReportParser(0, (HIDReportParser*)&kbd_parser2); kbd2.SetReportParser(0, (HIDReportParser*)&kbd_parser2);
kbd3.SetReportParser(0, (HIDReportParser*)&kbd_parser3); kbd3.SetReportParser(0, (HIDReportParser*)&kbd_parser3);
kbd4.SetReportParser(0, (HIDReportParser*)&kbd_parser4); kbd4.SetReportParser(0, (HIDReportParser*)&kbd_parser4);
} }
static void or_report(report_keyboard_t report) { static void or_report(report_keyboard_t report) {
// integrate reports into keyboard_report // integrate reports into keyboard_report
keyboard_report.mods |= report.mods; keyboard_report.mods |= report.mods;
for (uint8_t i = 0; i < KEYBOARD_REPORT_KEYS; i++) { for (uint8_t i = 0; i < KEYBOARD_REPORT_KEYS; i++) {
@ -108,9 +110,9 @@ static void or_report(report_keyboard_t report) {
} }
} }
} }
} }
uint8_t matrix_scan(void) { uint8_t matrix_scan(void) {
static uint16_t last_time_stamp1 = 0; static uint16_t last_time_stamp1 = 0;
static uint16_t last_time_stamp2 = 0; static uint16_t last_time_stamp2 = 0;
static uint16_t last_time_stamp3 = 0; static uint16_t last_time_stamp3 = 0;
@ -165,13 +167,13 @@ uint8_t matrix_scan(void) {
} }
} }
return 1; return 1;
} }
bool matrix_is_modified(void) { bool matrix_is_modified(void) {
return matrix_is_mod; return matrix_is_mod;
} }
bool matrix_is_on(uint8_t row, uint8_t col) { bool matrix_is_on(uint8_t row, uint8_t col) {
uint8_t code = CODE(row, col); uint8_t code = CODE(row, col);
if (IS_MOD(code)) { if (IS_MOD(code)) {
@ -185,9 +187,9 @@ bool matrix_is_on(uint8_t row, uint8_t col) {
} }
} }
return false; return false;
} }
matrix_row_t matrix_get_row(uint8_t row) { matrix_row_t matrix_get_row(uint8_t row) {
uint16_t row_bits = 0; uint16_t row_bits = 0;
if (IS_MOD(CODE(row, 0)) && keyboard_report.mods) { if (IS_MOD(CODE(row, 0)) && keyboard_report.mods) {
@ -202,9 +204,9 @@ matrix_row_t matrix_get_row(uint8_t row) {
} }
} }
return row_bits; return row_bits;
} }
uint8_t matrix_key_count(void) { uint8_t matrix_key_count(void) {
uint8_t count = 0; uint8_t count = 0;
count += bitpop(keyboard_report.mods); count += bitpop(keyboard_report.mods);
@ -214,21 +216,23 @@ uint8_t matrix_key_count(void) {
} }
} }
return count; return count;
} }
void matrix_print(void) { void matrix_print(void) {
print("\nr/c 0123456789ABCDEF\n"); print("\nr/c 0123456789ABCDEF\n");
for (uint8_t row = 0; row < matrix_rows(); row++) { for (uint8_t row = 0; row < matrix_rows(); row++) {
xprintf("%02d: ", row); xprintf("%02d: ", row);
print_bin_reverse16(matrix_get_row(row)); print_bin_reverse16(matrix_get_row(row));
print("\n"); print("\n");
} }
} }
void led_set(uint8_t usb_led) void led_set(uint8_t usb_led)
{ {
kbd1.SetReport(0, 0, 2, 0, 1, &usb_led); kbd1.SetReport(0, 0, 2, 0, 1, &usb_led);
kbd2.SetReport(0, 0, 2, 0, 1, &usb_led); kbd2.SetReport(0, 0, 2, 0, 1, &usb_led);
kbd3.SetReport(0, 0, 2, 0, 1, &usb_led); kbd3.SetReport(0, 0, 2, 0, 1, &usb_led);
kbd4.SetReport(0, 0, 2, 0, 1, &usb_led); kbd4.SetReport(0, 0, 2, 0, 1, &usb_led);
} }
};