diff options
Diffstat (limited to 'keyboards/converter')
42 files changed, 63 insertions, 455 deletions
diff --git a/keyboards/converter/a1200/a1200.c b/keyboards/converter/a1200/a1200.c deleted file mode 100644 index 5e7e404287..0000000000 --- a/keyboards/converter/a1200/a1200.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2021 8bits4ever - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ -#include "a1200.h" diff --git a/keyboards/converter/a1200/info.json b/keyboards/converter/a1200/info.json index 1b46444ba8..e889432474 100644 --- a/keyboards/converter/a1200/info.json +++ b/keyboards/converter/a1200/info.json @@ -69,7 +69,7 @@ {"label":":", "x":11, "y":3.5}, {"label":"\"", "x":12, "y":3.5}, {"label":"~", "x":13, "y":3.5}, - {"label":"Enter", "x":14, "y":2.5, "w":1, "h":2}, + {"label":"Enter", "x":14, "y":2.5, "h":2}, {"label":"\u2191", "x":16.25, "y":3.5}, {"label":"4", "x":18.5, "y":3.5}, {"label":"5", "x":19.5, "y":3.5}, diff --git a/keyboards/converter/a1200/miss1200/config.h b/keyboards/converter/a1200/miss1200/config.h deleted file mode 100644 index 07e8b9ac93..0000000000 --- a/keyboards/converter/a1200/miss1200/config.h +++ /dev/null @@ -1,40 +0,0 @@ -/* -Copyright 2021 8bits4ever - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#pragma once - - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { F7, F6, F5, F4, F1, F0, B1, B3 } -#define MATRIX_COL_PINS { D0, D1, C7, D6, B7, B6, B5, B4, E6, D7, C6, D4, B2, D5, D3, D2 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/converter/a1200/miss1200/info.json b/keyboards/converter/a1200/miss1200/info.json index 326d73ec83..74d569b8d9 100644 --- a/keyboards/converter/a1200/miss1200/info.json +++ b/keyboards/converter/a1200/miss1200/info.json @@ -6,6 +6,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D0", "D1", "C7", "D6", "B7", "B6", "B5", "B4", "E6", "D7", "C6", "D4", "B2", "D5", "D3", "D2"], + "rows": ["F7", "F6", "F5", "F4", "F1", "F0", "B1", "B3"] + }, + "diode_direction": "ROW2COL", "indicators": { "caps_lock": "B0", "on_state": 0 diff --git a/keyboards/converter/a1200/mistress1200/config.h b/keyboards/converter/a1200/mistress1200/config.h index 6b2204ec43..21ba99e0b7 100644 --- a/keyboards/converter/a1200/mistress1200/config.h +++ b/keyboards/converter/a1200/mistress1200/config.h @@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { F7, F6, F5, F4, F1, F0, B1, B3 } -#define MATRIX_COL_PINS { D0, D1, C7, D6, B7, B6, B5, B4, E6, D7, C6, D4, B2, D5, D3, D2 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL - #define TAPPING_TOGGLE 3 #undef LOCKING_SUPPORT_ENABLE diff --git a/keyboards/converter/a1200/mistress1200/info.json b/keyboards/converter/a1200/mistress1200/info.json index dfbe75c79c..c37bdadd61 100644 --- a/keyboards/converter/a1200/mistress1200/info.json +++ b/keyboards/converter/a1200/mistress1200/info.json @@ -6,6 +6,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D0", "D1", "C7", "D6", "B7", "B6", "B5", "B4", "E6", "D7", "C6", "D4", "B2", "D5", "D3", "D2"], + "rows": ["F7", "F6", "F5", "F4", "F1", "F0", "B1", "B3"] + }, + "diode_direction": "ROW2COL", "indicators": { "caps_lock": "B0", "on_state": 0 diff --git a/keyboards/converter/a1200/teensy2pp/config.h b/keyboards/converter/a1200/teensy2pp/config.h deleted file mode 100644 index c859413d18..0000000000 --- a/keyboards/converter/a1200/teensy2pp/config.h +++ /dev/null @@ -1,40 +0,0 @@ -/* -Copyright 2021 8bits4ever - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#pragma once - - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { F0, F1, F2, F3, F4, F5, F6, F7 } -#define MATRIX_COL_PINS { D2, D3, D4, D5, D6, D7, E0, E1, C0, C1, C2, C3, C4, C5, C6, C7 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/converter/a1200/teensy2pp/info.json b/keyboards/converter/a1200/teensy2pp/info.json index a69aa38278..e4d0c09c0f 100644 --- a/keyboards/converter/a1200/teensy2pp/info.json +++ b/keyboards/converter/a1200/teensy2pp/info.json @@ -6,6 +6,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D2", "D3", "D4", "D5", "D6", "D7", "E0", "E1", "C0", "C1", "C2", "C3", "C4", "C5", "C6", "C7"], + "rows": ["F0", "F1", "F2", "F3", "F4", "F5", "F6", "F7"] + }, + "diode_direction": "ROW2COL", "indicators": { "caps_lock": "B6" }, diff --git a/keyboards/converter/adb_usb/adb_usb.c b/keyboards/converter/adb_usb/adb_usb.c deleted file mode 100644 index 7026d62751..0000000000 --- a/keyboards/converter/adb_usb/adb_usb.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "adb_usb.h" -#include <avr/io.h> -#include "quantum.h" diff --git a/keyboards/converter/hp_46010a/hp_46010a.c b/keyboards/converter/hp_46010a/hp_46010a.c deleted file mode 100644 index 915a220f91..0000000000 --- a/keyboards/converter/hp_46010a/hp_46010a.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "hp_46010a.h" -#include <avr/io.h> -#include "quantum.h"
\ No newline at end of file diff --git a/keyboards/converter/ibm_terminal/ibm_terminal.c b/keyboards/converter/ibm_terminal/ibm_terminal.c deleted file mode 100644 index fd64a21ace..0000000000 --- a/keyboards/converter/ibm_terminal/ibm_terminal.c +++ /dev/null @@ -1 +0,0 @@ -#include "ibm_terminal.h" diff --git a/keyboards/converter/m0110_usb/m0110_usb.c b/keyboards/converter/m0110_usb/m0110_usb.c deleted file mode 100644 index a2f98cced6..0000000000 --- a/keyboards/converter/m0110_usb/m0110_usb.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "m0110_usb.h" -#include <avr/io.h> -#include "quantum.h" diff --git a/keyboards/converter/modelm101/config.h b/keyboards/converter/modelm101/config.h index 00d991fcc8..764fb56f64 100644 --- a/keyboards/converter/modelm101/config.h +++ b/keyboards/converter/modelm101/config.h @@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { F7, F6, F5, F4, F3, F2, F1, F0 } -#define MATRIX_COL_PINS { C7, C6, C5, C4, C3, C2, C1, C0, E1, E0, D7, D6, D5, D4, D3, D2 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL - /* The Model M has no diodes */ #define MATRIX_HAS_GHOST diff --git a/keyboards/converter/modelm101/info.json b/keyboards/converter/modelm101/info.json index 9bffe2e242..a3698672ba 100644 --- a/keyboards/converter/modelm101/info.json +++ b/keyboards/converter/modelm101/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C7", "C6", "C5", "C4", "C3", "C2", "C1", "C0", "E1", "E0", "D7", "D6", "D5", "D4", "D3", "D2"], + "rows": ["F7", "F6", "F5", "F4", "F3", "F2", "F1", "F0"] + }, + "diode_direction": "ROW2COL", "processor": "at90usb1286", "bootloader": "halfkay", "layouts": { diff --git a/keyboards/converter/modelm101_teensy2/config.h b/keyboards/converter/modelm101_teensy2/config.h index 7e0e627bd9..764fb56f64 100644 --- a/keyboards/converter/modelm101_teensy2/config.h +++ b/keyboards/converter/modelm101_teensy2/config.h @@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { D0, D1, D2, D3, C6, C7, D5, D4 } -#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, B6, B5, B4, D7, D6, B0, B1, B2, B3, B7 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL - /* The Model M has no diodes */ #define MATRIX_HAS_GHOST diff --git a/keyboards/converter/modelm101_teensy2/info.json b/keyboards/converter/modelm101_teensy2/info.json index 12ee7274d7..efeb041c3c 100644 --- a/keyboards/converter/modelm101_teensy2/info.json +++ b/keyboards/converter/modelm101_teensy2/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "B6", "B5", "B4", "D7", "D6", "B0", "B1", "B2", "B3", "B7"], + "rows": ["D0", "D1", "D2", "D3", "C6", "C7", "D5", "D4"] + }, + "diode_direction": "ROW2COL", "indicators": { "caps_lock": "E6", "on_state": 0 diff --git a/keyboards/converter/modelm101_teensy2/modelm101_teensy2.c b/keyboards/converter/modelm101_teensy2/modelm101_teensy2.c deleted file mode 100644 index 8283d91eda..0000000000 --- a/keyboards/converter/modelm101_teensy2/modelm101_teensy2.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 iw0rm3r - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ -#include "modelm101_teensy2.h" diff --git a/keyboards/converter/modelm_ssk/config.h b/keyboards/converter/modelm_ssk/config.h index f38e3db3dd..3b6e758833 100644 --- a/keyboards/converter/modelm_ssk/config.h +++ b/keyboards/converter/modelm_ssk/config.h @@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_COL_PINS { C7, C6, C5, C4, C3, C2, C1, C0, E1, E0, D7, D5, D4, D3, D2, D1 } -#define MATRIX_ROW_PINS { F0, F1, F2, F3, F4, F5, F6, F7 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL - /* The Model M does not have NKRO */ #define MATRIX_HAS_GHOST diff --git a/keyboards/converter/modelm_ssk/info.json b/keyboards/converter/modelm_ssk/info.json index 3f947eac2a..d68bb0389f 100644 --- a/keyboards/converter/modelm_ssk/info.json +++ b/keyboards/converter/modelm_ssk/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C7", "C6", "C5", "C4", "C3", "C2", "C1", "C0", "E1", "E0", "D7", "D5", "D4", "D3", "D2", "D1"], + "rows": ["F0", "F1", "F2", "F3", "F4", "F5", "F6", "F7"] + }, + "diode_direction": "ROW2COL", "indicators": { "caps_lock": "B6", "num_lock": "B4", diff --git a/keyboards/converter/modelm_ssk/modelm_ssk.c b/keyboards/converter/modelm_ssk/modelm_ssk.c deleted file mode 100644 index 1b01115e5d..0000000000 --- a/keyboards/converter/modelm_ssk/modelm_ssk.c +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2019 iw0rm3r - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ -#include "modelm_ssk.h" - - - diff --git a/keyboards/converter/numeric_keypad_iie/config.h b/keyboards/converter/numeric_keypad_iie/config.h deleted file mode 100644 index 81671354fd..0000000000 --- a/keyboards/converter/numeric_keypad_iie/config.h +++ /dev/null @@ -1,87 +0,0 @@ -/* -Copyright 2019 Adam Newbold <adam@neatnik.net> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#pragma once - - -/* - -Pin Mappings -============ - -Dsub-15 Connection ------------------- - - Dsub-15 (female) - ,-------------------------. - \ 08 07 06 05 04 03 02 01 / - \ 15 14 13 12 11 10 09 / - `---------------------' - -Header Pins ------------ - _____________________________________ -| | -| 11 10 9 8 7 6 5 4 3 2 1 | -|_____________________________________| - - -Header / Matrix ---------------- - -Pin Name Description --------------------------------------------------------------- -1,2,5,3,4,6 Y0-Y5 Y-direction key-matrix connections -7 NC -9,11,10,8 X4-X7 X-direction key-matrix connections - - -Microcontroller Configuration ------------------------------ - -(Pins are for an Arduino Micro) - -+-----------------------------------+ -| Dsub-15 | Header | Matrix | Micro | -|---------+--------+--------+-------| -| 12 | 11 | X5 | B0 | -| 11 | 10 | X6 | D3 | -| 10 | 9 | X4 | B2 | -| 9 | 8 | X7 | D2 | -| NC | 7 | NC | -- | -| 7 | 6 | Y5 | E6 | -| 6 | 5 | Y2 | D4 | -| 5 | 4 | Y4 | D7 | -| 3 | 3 | Y3 | C6 | -| 2 | 2 | Y1 | D0 | -| 1 | 1 | Y0 | D1 | -+-----------------------------------+ - -Note: Dsub-15 pins 4, 8, 13, 14, and 15 are unused - -Reference ---------- - -https://deskthority.net/wiki/Apple_Numeric_Keypad_IIe -https://geekhack.org/index.php?topic=78048.0 -http://wiki.apple2.org/index.php?title=Pinouts#Apple_.2F.2Fe_Numeric_Keypad_connector - -*/ - -#define MATRIX_ROW_PINS { B0, B2, D2, D3 } -#define MATRIX_COL_PINS { D1, D0, D4, C6, D7, E6 } -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/converter/numeric_keypad_iie/info.json b/keyboards/converter/numeric_keypad_iie/info.json index 41b75f69b9..ae160c7038 100644 --- a/keyboards/converter/numeric_keypad_iie/info.json +++ b/keyboards/converter/numeric_keypad_iie/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D1", "D0", "D4", "C6", "D7", "E6"], + "rows": ["B0", "B2", "D2", "D3"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/converter/numeric_keypad_iie/numeric_keypad_iie.c b/keyboards/converter/numeric_keypad_iie/numeric_keypad_iie.c deleted file mode 100644 index 341af05b31..0000000000 --- a/keyboards/converter/numeric_keypad_iie/numeric_keypad_iie.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 Adam Newbold <adam@neatnik.net> - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ -#include "numeric_keypad_iie.h" diff --git a/keyboards/converter/palm_usb/matrix.c b/keyboards/converter/palm_usb/matrix.c index 4226dfa52c..016b562254 100644 --- a/keyboards/converter/palm_usb/matrix.c +++ b/keyboards/converter/palm_usb/matrix.c @@ -17,7 +17,9 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include QMK_KEYBOARD_H +#include "matrix.h" +#include "debug.h" +#include "wait.h" #include "uart.h" #include "timer.h" @@ -134,14 +136,14 @@ uint8_t rts_reset(void) { if (firstread) { writePinLow(RTS_PIN); } - _delay_ms(10); + wait_ms(10); writePinHigh(RTS_PIN); /* the future is Arm if (!palReadPad(RTS_PIN_IOPRT)) { - _delay_ms(10); + wait_ms(10); palSetPadMode(RTS_PINn_IOPORT, PinDirectionOutput_PUSHPULL); palSetPad(RTS_PORT, RTS_PIN); } @@ -150,13 +152,13 @@ uint8_t rts_reset(void) { palSetPadMode(RTS_PIN_RTS_PORT, PinDirectionOutput_PUSHPULL); palSetPad(RTS_PORT, RTS_PIN); palClearPad(RTS_PORT, RTS_PIN); - _delay_ms(10); + wait_ms(10); palSetPad(RTS_PORT, RTS_PIN); } */ - _delay_ms(5); + wait_ms(5); //print("rts\n"); return 1; } @@ -222,7 +224,7 @@ uint8_t handspring_handshake(void) { uint8_t handspring_reset(void) { writePinLow(VCC_PIN); - _delay_ms(5); + wait_ms(5); writePinHigh(VCC_PIN); if ( handspring_handshake() ) { @@ -257,7 +259,7 @@ void matrix_init(void) last_activity = timer_read(); } else { print("failed handshake"); - _delay_ms(1000); + wait_ms(1000); //BUG /should/ power cycle or toggle RTS & reset, but this usually works. } @@ -271,7 +273,7 @@ void matrix_init(void) last_activity = timer_read(); } else { print("failed handshake"); - _delay_ms(1000); + wait_ms(1000); //BUG /should/ power cycle or toggle RTS & reset, but this usually works. } diff --git a/keyboards/converter/periboard_512/periboard_512.c b/keyboards/converter/periboard_512/periboard_512.c deleted file mode 100644 index 11c65e923a..0000000000 --- a/keyboards/converter/periboard_512/periboard_512.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Sife - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -#include "periboard_512.h" diff --git a/keyboards/converter/siemens_tastatur/config.h b/keyboards/converter/siemens_tastatur/config.h index b21326d298..49725a9592 100644 --- a/keyboards/converter/siemens_tastatur/config.h +++ b/keyboards/converter/siemens_tastatur/config.h @@ -21,11 +21,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define MATRIX_ROWS 5 #define MATRIX_COLS 19 -//This is all fake and not used -#define MATRIX_COL_PINS { B11, B10, B1, B0, A7, A6, A5, A4, A3, A2, A1, A0, C15, C14, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN } -#define MATRIX_ROW_PINS { B3, B4, B5, B6, B7 } -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/converter/siemens_tastatur/siemens_tastatur.c b/keyboards/converter/siemens_tastatur/siemens_tastatur.c deleted file mode 100644 index 21d00c8c30..0000000000 --- a/keyboards/converter/siemens_tastatur/siemens_tastatur.c +++ /dev/null @@ -1,17 +0,0 @@ -/* -Copyright 2019 Yiancar - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ -#include "siemens_tastatur.h" diff --git a/keyboards/converter/sun_usb/command_extra.c b/keyboards/converter/sun_usb/command_extra.c deleted file mode 100644 index b15f9dc9bd..0000000000 --- a/keyboards/converter/sun_usb/command_extra.c +++ /dev/null @@ -1,64 +0,0 @@ -#include QMK_KEYBOARD_H -#include "uart.h" - -bool sun_bell = false; -bool sun_click = false; - - -bool command_extra(uint8_t code) -{ - switch (code) { - case KC_H: - case KC_SLASH: /* ? */ - print("\n\n----- Sun converter Help -----\n"); - print("Home: Toggle Bell\n"); - print("End: Toggle Click\n"); - print("PgUp: LED all On\n"); - print("PgDown: LED all Off\n"); - print("Insert: Layout\n"); - print("Delete: Reset\n"); - return false; - case KC_DEL: - print("Reset\n"); - uart_write(0x01); - break; - case KC_HOME: - sun_bell = !sun_bell; - if (sun_bell) { - print("Bell On\n"); - uart_write(0x02); - } else { - print("Bell Off\n"); - uart_write(0x03); - } - break; - case KC_END: - sun_click = !sun_click; - if (sun_click) { - print("Click On\n"); - uart_write(0x0A); - } else { - print("Click Off\n"); - uart_write(0x0B); - } - break; - case KC_PGUP: - print("LED all on\n"); - uart_write(0x0E); - uart_write(0xFF); - break; - case KC_PGDN: - print("LED all off\n"); - uart_write(0x0E); - uart_write(0x00); - break; - case KC_INSERT: - print("layout\n"); - uart_write(0x0F); - break; - default: - xprintf("Unknown extra command: %02X\n", code); - return false; - } - return true; -} diff --git a/keyboards/converter/sun_usb/led.c b/keyboards/converter/sun_usb/led.c index f8d183fd48..493825bac8 100644 --- a/keyboards/converter/sun_usb/led.c +++ b/keyboards/converter/sun_usb/led.c @@ -15,7 +15,8 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include QMK_KEYBOARD_H +#include "led.h" +#include "print.h" #include "uart.h" void led_set(uint8_t usb_led) diff --git a/keyboards/converter/sun_usb/matrix.c b/keyboards/converter/sun_usb/matrix.c index 9f22eca1eb..bf1d5f807f 100644 --- a/keyboards/converter/sun_usb/matrix.c +++ b/keyboards/converter/sun_usb/matrix.c @@ -15,7 +15,11 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include QMK_KEYBOARD_H +#include "matrix.h" +#include "host.h" +#include "led.h" +#include "debug.h" +#include "wait.h" #include "uart.h" /* @@ -86,9 +90,9 @@ void matrix_init(void) /* print("."); */ /* while (uart_read()); */ /* uart_write(0x01); */ - /* _delay_ms(500); */ + /* wait_ms(500); */ /* if (uart_read() == 0xFF) { */ - /* _delay_ms(500); */ + /* wait_ms(500); */ /* if (uart_read() == 0x04) */ /* break; */ /* } */ @@ -112,7 +116,7 @@ uint8_t matrix_scan(void) switch (code) { case 0xFF: // reset success: FF 04 print("reset: "); - _delay_ms(500); + wait_ms(500); code = uart_read(); xprintf("%02X\n", code); if (code == 0x04) { @@ -122,12 +126,12 @@ uint8_t matrix_scan(void) return 0; case 0xFE: // layout: FE <layout> print("layout: "); - _delay_ms(500); + wait_ms(500); xprintf("%02X\n", uart_read()); return 0; case 0x7E: // reset fail: 7E 01 print("reset fail: "); - _delay_ms(500); + wait_ms(500); xprintf("%02X\n", uart_read()); return 0; case 0x7F: diff --git a/keyboards/converter/usb_usb/ble/ble.c b/keyboards/converter/usb_usb/ble/ble.c deleted file mode 100644 index 387eb8166c..0000000000 --- a/keyboards/converter/usb_usb/ble/ble.c +++ /dev/null @@ -1 +0,0 @@ -#include "ble.h" diff --git a/keyboards/converter/usb_usb/ble/ble.h b/keyboards/converter/usb_usb/ble/ble.h deleted file mode 100644 index 3351176047..0000000000 --- a/keyboards/converter/usb_usb/ble/ble.h +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once - -#include "usb_usb.h" diff --git a/keyboards/converter/usb_usb/hasu/hasu.c b/keyboards/converter/usb_usb/hasu/hasu.c deleted file mode 100644 index 3357735ffd..0000000000 --- a/keyboards/converter/usb_usb/hasu/hasu.c +++ /dev/null @@ -1 +0,0 @@ -#include "hasu.h" diff --git a/keyboards/converter/usb_usb/hasu/hasu.h b/keyboards/converter/usb_usb/hasu/hasu.h deleted file mode 100644 index 3351176047..0000000000 --- a/keyboards/converter/usb_usb/hasu/hasu.h +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once - -#include "usb_usb.h" diff --git a/keyboards/converter/usb_usb/pro_micro/pro_micro.c b/keyboards/converter/usb_usb/pro_micro/pro_micro.c deleted file mode 100644 index f10142f81a..0000000000 --- a/keyboards/converter/usb_usb/pro_micro/pro_micro.c +++ /dev/null @@ -1 +0,0 @@ -#include "pro_micro.h" diff --git a/keyboards/converter/usb_usb/pro_micro/pro_micro.h b/keyboards/converter/usb_usb/pro_micro/pro_micro.h deleted file mode 100644 index 3351176047..0000000000 --- a/keyboards/converter/usb_usb/pro_micro/pro_micro.h +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once - -#include "usb_usb.h" diff --git a/keyboards/converter/usb_usb/usb_usb.c b/keyboards/converter/usb_usb/usb_usb.c deleted file mode 100644 index e8f224ad46..0000000000 --- a/keyboards/converter/usb_usb/usb_usb.c +++ /dev/null @@ -1 +0,0 @@ -#include "usb_usb.h" diff --git a/keyboards/converter/usb_usb/usb_usb.h b/keyboards/converter/usb_usb/usb_usb.h index bcd8b52974..87f70bc07a 100644 --- a/keyboards/converter/usb_usb/usb_usb.h +++ b/keyboards/converter/usb_usb/usb_usb.h @@ -19,14 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "quantum.h" -#if defined(KEYBOARD_converter_usb_usb_ble) -# include "ble.h" -#elif defined(KEYBOARD_converter_usb_usb_hasu) -# include "hasu.h" -#elif defined(KEYBOARD_converter_usb_usb_pro_micro) -# include "pro_micro.h" -#endif - #define XXX KC_NO #define ______ KC_TRNS diff --git a/keyboards/converter/xmk/xmk.c b/keyboards/converter/xmk/xmk.c index a0426e95dc..e0df96fc2d 100644 --- a/keyboards/converter/xmk/xmk.c +++ b/keyboards/converter/xmk/xmk.c @@ -3,7 +3,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later -#include QMK_KEYBOARD_H +#include "quantum.h" #if defined (XMK_DEBUG) void keyboard_post_init_kb(void) { diff --git a/keyboards/converter/xmk/xmk_matrix.c b/keyboards/converter/xmk/xmk_matrix.c index 7327ad5cfe..41eca9fe46 100644 --- a/keyboards/converter/xmk/xmk_matrix.c +++ b/keyboards/converter/xmk/xmk_matrix.c @@ -4,6 +4,8 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "xmk_matrix.h" +#include "matrix.h" +#include "debug.h" bool xmk_changed = false; matrix_row_t xmk_rows[MATRIX_ROWS]; diff --git a/keyboards/converter/xmk/xmk_matrix.h b/keyboards/converter/xmk/xmk_matrix.h index 45514dea04..2a988253f9 100644 --- a/keyboards/converter/xmk/xmk_matrix.h +++ b/keyboards/converter/xmk/xmk_matrix.h @@ -5,6 +5,7 @@ #pragma once -#include QMK_KEYBOARD_H +#include <stdbool.h> +#include <stdint.h> void xmk_matrix_key(bool press, uint8_t key); diff --git a/keyboards/converter/xt_usb/xt_usb.c b/keyboards/converter/xt_usb/xt_usb.c deleted file mode 100644 index 88acee0b0f..0000000000 --- a/keyboards/converter/xt_usb/xt_usb.c +++ /dev/null @@ -1 +0,0 @@ -#include "xt_usb.h" |