diff options
Diffstat (limited to 'keyboards/converter')
54 files changed, 196 insertions, 272 deletions
diff --git a/keyboards/converter/a1200/miss1200/info.json b/keyboards/converter/a1200/miss1200/keyboard.json index 74d569b8d9..1f7bfcda3f 100644 --- a/keyboards/converter/a1200/miss1200/info.json +++ b/keyboards/converter/a1200/miss1200/keyboard.json @@ -6,6 +6,14 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "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"] diff --git a/keyboards/converter/a1200/miss1200/rules.mk b/keyboards/converter/a1200/miss1200/rules.mk deleted file mode 100644 index ac2c4626d9..0000000000 --- a/keyboards/converter/a1200/miss1200/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/converter/a1200/mistress1200/info.json b/keyboards/converter/a1200/mistress1200/keyboard.json index 28de092b3d..c2cf110b2a 100644 --- a/keyboards/converter/a1200/mistress1200/info.json +++ b/keyboards/converter/a1200/mistress1200/keyboard.json @@ -6,6 +6,20 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": false, + "grave_esc": false, + "magic": false, + "mousekey": false, + "nkro": false, + "space_cadet": false + }, "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"] diff --git a/keyboards/converter/a1200/mistress1200/rules.mk b/keyboards/converter/a1200/mistress1200/rules.mk deleted file mode 100644 index 18ddf68b03..0000000000 --- a/keyboards/converter/a1200/mistress1200/rules.mk +++ /dev/null @@ -1,16 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = no # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -LTO_ENABLE = yes -SPACE_CADET_ENABLE = no -GRAVE_ESC_ENABLE = no -MAGIC_ENABLE = no diff --git a/keyboards/converter/a1200/teensy2pp/info.json b/keyboards/converter/a1200/teensy2pp/keyboard.json index e4d0c09c0f..0766123913 100644 --- a/keyboards/converter/a1200/teensy2pp/info.json +++ b/keyboards/converter/a1200/teensy2pp/keyboard.json @@ -6,6 +6,14 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "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"] diff --git a/keyboards/converter/a1200/teensy2pp/rules.mk b/keyboards/converter/a1200/teensy2pp/rules.mk deleted file mode 100644 index b8f2be564d..0000000000 --- a/keyboards/converter/a1200/teensy2pp/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/converter/adb_usb/info.json b/keyboards/converter/adb_usb/info.json index b553dfc10f..47467a97c7 100644 --- a/keyboards/converter/adb_usb/info.json +++ b/keyboards/converter/adb_usb/info.json @@ -8,6 +8,11 @@ "pid": "0x0ADB", "device_version": "1.0.1" }, + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true + }, "layouts": { "LAYOUT_ext_ansi": { "layout": [ diff --git a/keyboards/converter/adb_usb/rev1/info.json b/keyboards/converter/adb_usb/rev1/keyboard.json index 4369a04103..4369a04103 100644 --- a/keyboards/converter/adb_usb/rev1/info.json +++ b/keyboards/converter/adb_usb/rev1/keyboard.json diff --git a/keyboards/converter/adb_usb/rev1/rules.mk b/keyboards/converter/adb_usb/rev1/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/converter/adb_usb/rev1/rules.mk +++ /dev/null diff --git a/keyboards/converter/adb_usb/rev2/info.json b/keyboards/converter/adb_usb/rev2/keyboard.json index dd190d18ee..dd190d18ee 100644 --- a/keyboards/converter/adb_usb/rev2/info.json +++ b/keyboards/converter/adb_usb/rev2/keyboard.json diff --git a/keyboards/converter/adb_usb/rev2/rules.mk b/keyboards/converter/adb_usb/rev2/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/converter/adb_usb/rev2/rules.mk +++ /dev/null diff --git a/keyboards/converter/adb_usb/rules.mk b/keyboards/converter/adb_usb/rules.mk index 4e4d068a70..28df56c337 100644 --- a/keyboards/converter/adb_usb/rules.mk +++ b/keyboards/converter/adb_usb/rules.mk @@ -1,15 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output CUSTOM_MATRIX = yes SRC += matrix.c adb.c led.c diff --git a/keyboards/converter/hp_46010a/info.json b/keyboards/converter/hp_46010a/keyboard.json index da29c72fac..4519306981 100644 --- a/keyboards/converter/hp_46010a/info.json +++ b/keyboards/converter/hp_46010a/keyboard.json @@ -6,10 +6,18 @@ "usb": { "vid": "0xFEED", "pid": "0x6060", - "device_version": "0.0.1" + "device_version": "0.0.1", + "wait_for_enumeration": true }, "processor": "atmega32u4", "bootloader": "halfkay", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "console": true, + "nkro": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/converter/hp_46010a/matrix.c b/keyboards/converter/hp_46010a/matrix.c index 7f4e11ab27..a36e8821a3 100644 --- a/keyboards/converter/hp_46010a/matrix.c +++ b/keyboards/converter/hp_46010a/matrix.c @@ -82,17 +82,17 @@ void matrix_scan_user(void) { // switch, and then into the diode, then into one of the columns into the // matrix. the reset pin can be used to reset the entire counter. -#define RESET _BV(PB0) -#define SCLK _BV(PB1) -#define SDATA _BV(PB3) -#define LED _BV(PD6) +#define HP_46010A_RESET_PIN B0 +#define HP_46010A_SCLK_PIN B1 +#define HP_46010A_SDATA_PIN B3 +#define HP_46010A_LED_PIN D6 inline static void SCLK_increment(void) { - PORTB &= ~SCLK ; + gpio_write_pin_low(HP_46010A_SCLK_PIN); _delay_us( 4 ) ; // make sure the line is stable - PORTB |= SCLK ; + gpio_write_pin_high(HP_46010A_SCLK_PIN); _delay_us( 4 ) ; return ; @@ -101,9 +101,9 @@ void SCLK_increment(void) { inline static void Matrix_Reset(void) { - PORTB |= RESET ; + gpio_write_pin_high(HP_46010A_RESET_PIN); _delay_us( 4 ) ; // make sure the line is stable - PORTB &= ~RESET ; + gpio_write_pin_low(HP_46010A_RESET_PIN); return ; } @@ -116,7 +116,7 @@ uint8_t Matrix_ReceiveByte (void) { for ( uint8_t bit = 0; bit < MATRIX_COLS; ++bit ) { // toggle the clock SCLK_increment(); - temp = (PINB & SDATA) << 4 ; + temp = gpio_read_pin(HP_46010A_SDATA_PIN) << 4 ; received |= temp >> bit ; } @@ -138,18 +138,19 @@ void Matrix_ThrowByte(void) { void matrix_init (void) { // debug_matrix = 1; // PB0 (SS) and PB1 (SCLK) set to outputs - DDRB |= RESET | SCLK ; + gpio_set_pin_output(HP_46010A_RESET_PIN); + gpio_set_pin_output(HP_46010A_SCLK_PIN); // PB2, is unused, and PB3 is our serial input - DDRB &= ~SDATA ; + gpio_set_pin_input(HP_46010A_SDATA_PIN); // SS is reset for this board, and is active High // SCLK is the serial clock and is active High - PORTB &= ~RESET ; - PORTB |= SCLK ; + gpio_write_pin_low(HP_46010A_RESET_PIN); + gpio_write_pin_high(HP_46010A_SCLK_PIN); // led pin - DDRD |= LED ; - PORTD &= ~LED ; + gpio_set_pin_output(HP_46010A_LED_PIN); + gpio_write_pin_low(HP_46010A_LED_PIN); matrix_init_kb(); diff --git a/keyboards/converter/hp_46010a/rules.mk b/keyboards/converter/hp_46010a/rules.mk index 104381f12f..857395fb40 100644 --- a/keyboards/converter/hp_46010a/rules.mk +++ b/keyboards/converter/hp_46010a/rules.mk @@ -1,17 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. -SPLIT_KEYBOARD = no -WAIT_FOR_USB = yes CUSTOM_MATRIX = yes SRC = matrix.c diff --git a/keyboards/converter/ibm_terminal/info.json b/keyboards/converter/ibm_terminal/keyboard.json index 39840eb627..b95ea58d20 100644 --- a/keyboards/converter/ibm_terminal/info.json +++ b/keyboards/converter/ibm_terminal/keyboard.json @@ -10,6 +10,13 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "nkro": true, + "ps2": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/converter/ibm_terminal/rules.mk b/keyboards/converter/ibm_terminal/rules.mk index c04e7e01a4..038d8da5a2 100644 --- a/keyboards/converter/ibm_terminal/rules.mk +++ b/keyboards/converter/ibm_terminal/rules.mk @@ -1,16 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. -PS2_ENABLE = yes PS2_DRIVER = usart CUSTOM_MATRIX = yes diff --git a/keyboards/converter/m0110_usb/info.json b/keyboards/converter/m0110_usb/keyboard.json index 1869d2dacb..522f83caba 100644 --- a/keyboards/converter/m0110_usb/info.json +++ b/keyboards/converter/m0110_usb/keyboard.json @@ -10,6 +10,13 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": false, + "console": true, + "extrakey": true, + "usb_hid": true + }, "layouts": { "LAYOUT_ansi": { "layout": [ diff --git a/keyboards/converter/m0110_usb/rules.mk b/keyboards/converter/m0110_usb/rules.mk index a9dc1a9e49..7021c1052a 100644 --- a/keyboards/converter/m0110_usb/rules.mk +++ b/keyboards/converter/m0110_usb/rules.mk @@ -1,17 +1,6 @@ # Processor frequency F_CPU = 8000000 -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -EXTRAKEY_ENABLE = yes -USB_HID_ENABLE = yes -BACKLIGHT_ENABLE = no CUSTOM_MATRIX = yes SRC = matrix.c m0110.c diff --git a/keyboards/converter/numeric_keypad_iie/info.json b/keyboards/converter/numeric_keypad_iie/keyboard.json index abec316be7..6dcffe7e21 100644 --- a/keyboards/converter/numeric_keypad_iie/info.json +++ b/keyboards/converter/numeric_keypad_iie/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["D1", "D0", "D4", "C6", "D7", "E6"], "rows": ["B0", "B2", "D2", "D3"] diff --git a/keyboards/converter/numeric_keypad_iie/rules.mk b/keyboards/converter/numeric_keypad_iie/rules.mk deleted file mode 100644 index fce764c22d..0000000000 --- a/keyboards/converter/numeric_keypad_iie/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/converter/palm_usb/info.json b/keyboards/converter/palm_usb/info.json index 2fe66720ec..c5b893d757 100644 --- a/keyboards/converter/palm_usb/info.json +++ b/keyboards/converter/palm_usb/info.json @@ -9,5 +9,12 @@ "device_version": "1.0.0" }, "processor": "atmega32u4", - "bootloader": "caterina" + "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": false, + "console": true, + "command": true + } } diff --git a/keyboards/converter/palm_usb/matrix.c b/keyboards/converter/palm_usb/matrix.c index 8ae89deb6a..db3784df19 100644 --- a/keyboards/converter/palm_usb/matrix.c +++ b/keyboards/converter/palm_usb/matrix.c @@ -95,27 +95,27 @@ void pins_init(void) { // set pins for pullups, Rts , power &etc. //print ("pins setup\n"); - setPinOutput(VCC_PIN); - writePinLow(VCC_PIN); + gpio_set_pin_output(VCC_PIN); + gpio_write_pin_low(VCC_PIN); #if ( HANDSPRING == 0) #ifdef CY835 - setPinOutput(GND_PIN); - writePinLow(GND_PIN); + gpio_set_pin_output(GND_PIN); + gpio_write_pin_low(GND_PIN); - setPinOutput(PULLDOWN_PIN); - writePinLow(PULLDOWN_PIN); + gpio_set_pin_output(PULLDOWN_PIN); + gpio_write_pin_low(PULLDOWN_PIN); #endif - setPinInput(DCD_PIN); - setPinInput(RTS_PIN); + gpio_set_pin_input(DCD_PIN); + gpio_set_pin_input(RTS_PIN); #endif /* check that the other side isn't powered up. - test=readPin(DCD_PIN); + test=gpio_read_pin(DCD_PIN); xprintf("b%02X:", test); - test=readPin(RTS_PIN); + test=gpio_read_pin(RTS_PIN); xprintf("%02X\n", test); */ @@ -128,16 +128,16 @@ uint8_t rts_reset(void) { // On boot, we keep rts as input, then switch roles here // on leaving sleep, we toggle the same way - firstread=readPin(RTS_PIN); + firstread=gpio_read_pin(RTS_PIN); // printf("r%02X:", firstread); - setPinOutput(RTS_PIN); + gpio_set_pin_output(RTS_PIN); if (firstread) { - writePinLow(RTS_PIN); + gpio_write_pin_low(RTS_PIN); } wait_ms(10); - writePinHigh(RTS_PIN); + gpio_write_pin_high(RTS_PIN); /* the future is Arm @@ -223,9 +223,9 @@ uint8_t handspring_handshake(void) { } uint8_t handspring_reset(void) { - writePinLow(VCC_PIN); + gpio_write_pin_low(VCC_PIN); wait_ms(5); - writePinHigh(VCC_PIN); + gpio_write_pin_high(VCC_PIN); if ( handspring_handshake() ) { last_activity = timer_read(); @@ -249,7 +249,7 @@ void matrix_init(void) #endif print("power up\n"); - writePinHigh(VCC_PIN); + gpio_write_pin_high(VCC_PIN); // wait for DCD strobe from keyboard - it will do this // up to 3 times, then the board needs the RTS toggled to try again @@ -264,7 +264,7 @@ void matrix_init(void) } #else /// Palm / HP device with DCD - while( !readPin(DCD_PIN) ) {;} + while( !gpio_read_pin(DCD_PIN) ) {;} print("dcd\n"); rts_reset(); // at this point the keyboard should think all is well. diff --git a/keyboards/converter/palm_usb/rules.mk b/keyboards/converter/palm_usb/rules.mk index 72d9daf6d9..bdb3bb0d6b 100644 --- a/keyboards/converter/palm_usb/rules.mk +++ b/keyboards/converter/palm_usb/rules.mk @@ -1,15 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = no # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. #HARDWARE_SERIAL = yes CUSTOM_MATRIX = yes diff --git a/keyboards/converter/palm_usb/stowaway/info.json b/keyboards/converter/palm_usb/stowaway/keyboard.json index 9a263327ad..9a263327ad 100644 --- a/keyboards/converter/palm_usb/stowaway/info.json +++ b/keyboards/converter/palm_usb/stowaway/keyboard.json diff --git a/keyboards/converter/palm_usb/stowaway/rules.mk b/keyboards/converter/palm_usb/stowaway/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/converter/palm_usb/stowaway/rules.mk +++ /dev/null diff --git a/keyboards/converter/periboard_512/info.json b/keyboards/converter/periboard_512/keyboard.json index 08cc8ee9bf..b335931493 100644 --- a/keyboards/converter/periboard_512/info.json +++ b/keyboards/converter/periboard_512/keyboard.json @@ -10,6 +10,11 @@ }, "processor": "at90usb1286", "bootloader": "halfkay", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": false + }, "diode_direction": "ROW2COL", "matrix_pins": { "cols": ["B7", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "E0", "E1", "C0", "C1", "C2", "C3", "C4", "C5", "C6", "C7"], diff --git a/keyboards/converter/periboard_512/rules.mk b/keyboards/converter/periboard_512/rules.mk deleted file mode 100644 index 1eeda920b4..0000000000 --- a/keyboards/converter/periboard_512/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = no # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/converter/siemens_tastatur/info.json b/keyboards/converter/siemens_tastatur/keyboard.json index 8ed2523c26..639859f208 100644 --- a/keyboards/converter/siemens_tastatur/info.json +++ b/keyboards/converter/siemens_tastatur/keyboard.json @@ -8,8 +8,16 @@ "pid": "0x4353", "device_version": "0.0.1" }, - "processor": "STM32F103", - "bootloader": "stm32duino", + "development_board": "bluepill", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true, + "sleep_led": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/converter/siemens_tastatur/matrix.c b/keyboards/converter/siemens_tastatur/matrix.c index ea1aa2287e..447c4641d6 100644 --- a/keyboards/converter/siemens_tastatur/matrix.c +++ b/keyboards/converter/siemens_tastatur/matrix.c @@ -14,10 +14,7 @@ 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 <stdint.h> -#include <stdbool.h> #include <string.h> -#include "quantum.h" #include "timer.h" #include "wait.h" #include "print.h" @@ -82,29 +79,29 @@ static void pal_cb(void* unused) { void matrix_init(void) { //Set I/O as pull-up inputs to read states - setPinInputHigh(A0); - setPinInputHigh(A1); - setPinInputHigh(A2); - setPinInputHigh(A3); - setPinInputHigh(A4); - setPinInputHigh(A5); - setPinInputHigh(A6); - setPinInputHigh(A7); - setPinInputHigh(A8); - setPinInputHigh(A9); - setPinInputHigh(A10); - setPinInputHigh(B3); - setPinInputHigh(B4); - setPinInputHigh(B5); - setPinInputHigh(B6); - setPinInputHigh(B7); - setPinInputHigh(B8); - setPinInputHigh(B9); - setPinInputHigh(B11); - setPinInputHigh(B12); - setPinInputHigh(B13); - setPinInputHigh(B14); - setPinInputHigh(B15); + gpio_set_pin_input_high(A0); + gpio_set_pin_input_high(A1); + gpio_set_pin_input_high(A2); + gpio_set_pin_input_high(A3); + gpio_set_pin_input_high(A4); + gpio_set_pin_input_high(A5); + gpio_set_pin_input_high(A6); + gpio_set_pin_input_high(A7); + gpio_set_pin_input_high(A8); + gpio_set_pin_input_high(A9); + gpio_set_pin_input_high(A10); + gpio_set_pin_input_high(B3); + gpio_set_pin_input_high(B4); + gpio_set_pin_input_high(B5); + gpio_set_pin_input_high(B6); + gpio_set_pin_input_high(B7); + gpio_set_pin_input_high(B8); + gpio_set_pin_input_high(B9); + gpio_set_pin_input_high(B11); + gpio_set_pin_input_high(B12); + gpio_set_pin_input_high(B13); + gpio_set_pin_input_high(B14); + gpio_set_pin_input_high(B15); memset(matrix, 0, MATRIX_ROWS * sizeof(matrix_row_t)); memset(matrix_debouncing, 0, MATRIX_ROWS * sizeof(matrix_row_t)); @@ -210,7 +207,7 @@ uint8_t matrix_scan(void) { matrix[3] = 0x00; } //Special case for Shift - if (readPin(B11) == 0) { matrix[3] |= 0x01; } + if (gpio_read_pin(B11) == 0) { matrix[3] |= 0x01; } porta_buffer = 65535; portb_buffer = 65535; diff --git a/keyboards/converter/siemens_tastatur/rules.mk b/keyboards/converter/siemens_tastatur/rules.mk index 1bc8ee188b..3215e3588a 100644 --- a/keyboards/converter/siemens_tastatur/rules.mk +++ b/keyboards/converter/siemens_tastatur/rules.mk @@ -1,17 +1,2 @@ -SRC = matrix.c - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no -RGBLIGHT_ENABLE = no -SLEEP_LED_ENABLE = yes CUSTOM_MATRIX = yes - - +SRC = matrix.c diff --git a/keyboards/converter/sun_usb/info.json b/keyboards/converter/sun_usb/info.json index a243a64da2..e4031595ad 100644 --- a/keyboards/converter/sun_usb/info.json +++ b/keyboards/converter/sun_usb/info.json @@ -9,5 +9,13 @@ "device_version": "1.0.0" }, "processor": "atmega32u4", - "bootloader": "lufa-dfu" + "bootloader": "lufa-dfu", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true + } } diff --git a/keyboards/converter/sun_usb/matrix.c b/keyboards/converter/sun_usb/matrix.c index 6d52d5cd6c..93354ee114 100644 --- a/keyboards/converter/sun_usb/matrix.c +++ b/keyboards/converter/sun_usb/matrix.c @@ -74,8 +74,8 @@ uint8_t matrix_cols(void) void matrix_init(void) { - /* DDRD |= (1<<6); */ - /* PORTD |= (1<<6); */ + /* gpio_set_pin_output(D6); */ + /* gpio_write_pin_high(D6); */ debug_enable = true; uart_init(1200); @@ -99,7 +99,7 @@ void matrix_init(void) /* } */ /* print(" Done\n"); */ - /* PORTD &= ~(1<<6); */ + /* gpio_write_pin_low(D6) */ matrix_init_kb(); return; diff --git a/keyboards/converter/sun_usb/rules.mk b/keyboards/converter/sun_usb/rules.mk index ae20f51b37..d3ec00c5d5 100644 --- a/keyboards/converter/sun_usb/rules.mk +++ b/keyboards/converter/sun_usb/rules.mk @@ -1,15 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. #HARDWARE_SERIAL = yes CUSTOM_MATRIX = yes diff --git a/keyboards/converter/sun_usb/type3/info.json b/keyboards/converter/sun_usb/type3/keyboard.json index 6e065eaa73..6e065eaa73 100644 --- a/keyboards/converter/sun_usb/type3/info.json +++ b/keyboards/converter/sun_usb/type3/keyboard.json diff --git a/keyboards/converter/sun_usb/type3/rules.mk b/keyboards/converter/sun_usb/type3/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/converter/sun_usb/type3/rules.mk +++ /dev/null diff --git a/keyboards/converter/sun_usb/type5/info.json b/keyboards/converter/sun_usb/type5/keyboard.json index c26e85a65b..c26e85a65b 100644 --- a/keyboards/converter/sun_usb/type5/info.json +++ b/keyboards/converter/sun_usb/type5/keyboard.json diff --git a/keyboards/converter/sun_usb/type5/rules.mk b/keyboards/converter/sun_usb/type5/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/converter/sun_usb/type5/rules.mk +++ /dev/null diff --git a/keyboards/converter/usb_usb/ble/info.json b/keyboards/converter/usb_usb/ble/keyboard.json index 18edf5f577..b92bfe7f3e 100644 --- a/keyboards/converter/usb_usb/ble/info.json +++ b/keyboards/converter/usb_usb/ble/keyboard.json @@ -2,5 +2,11 @@ "bootloader": "caterina", "bluetooth": { "driver": "bluefruit_le" + }, + "build": { + "lto": true + }, + "features":{ + "bluetooth": true } } diff --git a/keyboards/converter/usb_usb/ble/rules.mk b/keyboards/converter/usb_usb/ble/rules.mk index 5b0435372b..3437a35bdf 100644 --- a/keyboards/converter/usb_usb/ble/rules.mk +++ b/keyboards/converter/usb_usb/ble/rules.mk @@ -1,6 +1,2 @@ # Processor frequency F_CPU = 8000000 - -EXTRAKEY_ENABLE = no -BLUETOOTH_ENABLE = yes -LTO_ENABLE = yes diff --git a/keyboards/converter/usb_usb/custom_matrix.cpp b/keyboards/converter/usb_usb/custom_matrix.cpp index f5f751da14..ca0855a82b 100644 --- a/keyboards/converter/usb_usb/custom_matrix.cpp +++ b/keyboards/converter/usb_usb/custom_matrix.cpp @@ -35,10 +35,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "host.h" #include "keyboard.h" -extern "C" { -#include "quantum.h" -} - /* KEY CODE to Matrix * * HID keycode(1 byte): diff --git a/keyboards/converter/usb_usb/hasu/info.json b/keyboards/converter/usb_usb/hasu/keyboard.json index 606784570c..606784570c 100644 --- a/keyboards/converter/usb_usb/hasu/info.json +++ b/keyboards/converter/usb_usb/hasu/keyboard.json diff --git a/keyboards/converter/usb_usb/hasu/rules.mk b/keyboards/converter/usb_usb/hasu/rules.mk deleted file mode 100644 index 6e7633bfe0..0000000000 --- a/keyboards/converter/usb_usb/hasu/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/converter/usb_usb/info.json b/keyboards/converter/usb_usb/info.json index 63c02322a2..747fd49782 100644 --- a/keyboards/converter/usb_usb/info.json +++ b/keyboards/converter/usb_usb/info.json @@ -8,6 +8,13 @@ "pid": "0x005B", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "extrakey": true, + "mousekey": false, + "nkro": false, + "usb_hid": true + }, "processor": "atmega32u4", "community_layouts": ["fullsize_ansi", "fullsize_iso", "fullsize_jis"], "layouts": { diff --git a/keyboards/converter/usb_usb/leonardo/info.json b/keyboards/converter/usb_usb/leonardo/keyboard.json index 56062f7ad3..56062f7ad3 100644 --- a/keyboards/converter/usb_usb/leonardo/info.json +++ b/keyboards/converter/usb_usb/leonardo/keyboard.json diff --git a/keyboards/converter/usb_usb/leonardo/rules.mk b/keyboards/converter/usb_usb/leonardo/rules.mk deleted file mode 100644 index 6e7633bfe0..0000000000 --- a/keyboards/converter/usb_usb/leonardo/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/converter/usb_usb/matrix.c b/keyboards/converter/usb_usb/matrix.c deleted file mode 100644 index b077febd74..0000000000 --- a/keyboards/converter/usb_usb/matrix.c +++ /dev/null @@ -1 +0,0 @@ -// Intentionally left empty. This file must exist for this board to build. diff --git a/keyboards/converter/usb_usb/pro_micro/info.json b/keyboards/converter/usb_usb/pro_micro/keyboard.json index 56062f7ad3..56062f7ad3 100644 --- a/keyboards/converter/usb_usb/pro_micro/info.json +++ b/keyboards/converter/usb_usb/pro_micro/keyboard.json diff --git a/keyboards/converter/usb_usb/rules.mk b/keyboards/converter/usb_usb/rules.mk index 97aebc9349..1e278514f6 100644 --- a/keyboards/converter/usb_usb/rules.mk +++ b/keyboards/converter/usb_usb/rules.mk @@ -1,16 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -USB_HID_ENABLE = yes CUSTOM_MATRIX = yes SRC += custom_matrix.cpp diff --git a/keyboards/converter/xmk/info.json b/keyboards/converter/xmk/keyboard.json index 7e8cd4ec79..7e8cd4ec79 100644 --- a/keyboards/converter/xmk/info.json +++ b/keyboards/converter/xmk/keyboard.json diff --git a/keyboards/converter/xt_usb/config.h b/keyboards/converter/xt_usb/config.h index 7d006b4116..a080698d87 100644 --- a/keyboards/converter/xt_usb/config.h +++ b/keyboards/converter/xt_usb/config.h @@ -34,10 +34,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* hard reset: low pulse for 500ms and after that HiZ for safety */ #define XT_RESET() do { \ - writePinLow(XT_RST_PIN); \ - setPinOutput(XT_RST_PIN); \ + gpio_write_pin_low(XT_RST_PIN); \ + gpio_set_pin_output(XT_RST_PIN); \ wait_ms(500); \ - setPinInput(XT_RST_PIN); \ + gpio_set_pin_input(XT_RST_PIN); \ } while (0) /* INT1 for falling edge of clock line */ diff --git a/keyboards/converter/xt_usb/info.json b/keyboards/converter/xt_usb/keyboard.json index 1c9bcf5e34..649b283329 100644 --- a/keyboards/converter/xt_usb/info.json +++ b/keyboards/converter/xt_usb/keyboard.json @@ -10,6 +10,14 @@ }, "processor": "atmega32u4", "bootloader": "halfkay", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true + }, "layouts": { "LAYOUT_xt": { "layout": [ diff --git a/keyboards/converter/xt_usb/rules.mk b/keyboards/converter/xt_usb/rules.mk index f98bdcc5d3..3fd6b1cfa6 100644 --- a/keyboards/converter/xt_usb/rules.mk +++ b/keyboards/converter/xt_usb/rules.mk @@ -1,15 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output CUSTOM_MATRIX = yes SRC += matrix.c xt_interrupt.c diff --git a/keyboards/converter/xt_usb/xt.h b/keyboards/converter/xt_usb/xt.h index 538ff0e459..09363d75b3 100644 --- a/keyboards/converter/xt_usb/xt.h +++ b/keyboards/converter/xt_usb/xt.h @@ -38,34 +38,35 @@ POSSIBILITY OF SUCH DAMAGE. #pragma once -#include "quantum.h" +#include <stdint.h> +#include "gpio.h" #define XT_DATA_IN() \ do { \ - setPinInput(XT_DATA_PIN); \ - writePinHigh(XT_DATA_PIN); \ + gpio_set_pin_input(XT_DATA_PIN); \ + gpio_write_pin_high(XT_DATA_PIN); \ } while (0) -#define XT_DATA_READ() readPin(XT_DATA_PIN) +#define XT_DATA_READ() gpio_read_pin(XT_DATA_PIN) #define XT_DATA_LO() \ do { \ - writePinLow(XT_DATA_PIN); \ - setPinOutput(XT_DATA_PIN); \ + gpio_write_pin_low(XT_DATA_PIN); \ + gpio_set_pin_output(XT_DATA_PIN); \ } while (0) #define XT_CLOCK_IN() \ do { \ - setPinInput(XT_CLOCK_PIN); \ - writePinHigh(XT_CLOCK_PIN); \ + gpio_set_pin_input(XT_CLOCK_PIN); \ + gpio_write_pin_high(XT_CLOCK_PIN); \ } while (0) -#define XT_CLOCK_READ() readPin(XT_CLOCK_PIN) +#define XT_CLOCK_READ() gpio_read_pin(XT_CLOCK_PIN) #define XT_CLOCK_LO() \ do { \ - writePinLow(XT_CLOCK_PIN); \ - setPinOutput(XT_CLOCK_PIN); \ + gpio_write_pin_low(XT_CLOCK_PIN); \ + gpio_set_pin_output(XT_CLOCK_PIN); \ } while (0) void xt_host_init(void); |