diff options
Diffstat (limited to 'keyboards/kinesis')
18 files changed, 39 insertions, 62 deletions
diff --git a/keyboards/kinesis/alvicstep/info.json b/keyboards/kinesis/alvicstep/keyboard.json index 293b0168a4..951f01203c 100644 --- a/keyboards/kinesis/alvicstep/info.json +++ b/keyboards/kinesis/alvicstep/keyboard.json @@ -12,9 +12,7 @@ "command": false, "mousekey": true, "extrakey": true, - "nkro": true, - "audio": false, - "backlight": false + "nkro": true }, "processor": "at90usb1286", "bootloader": "halfkay", diff --git a/keyboards/kinesis/kint2pp/info.json b/keyboards/kinesis/kint2pp/keyboard.json index ecf86658a8..48d77942db 100644 --- a/keyboards/kinesis/kint2pp/info.json +++ b/keyboards/kinesis/kint2pp/keyboard.json @@ -13,9 +13,7 @@ "command": false, "mousekey": true, "extrakey": true, - "nkro": true, - "audio": false, - "backlight": false + "nkro": true }, "build": { "debounce_type": "sym_eager_pk" diff --git a/keyboards/kinesis/kint2pp/rules.mk b/keyboards/kinesis/kint2pp/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/kinesis/kint2pp/rules.mk +++ /dev/null diff --git a/keyboards/kinesis/kint36/info.json b/keyboards/kinesis/kint36/keyboard.json index 969f819f80..592fade4cb 100644 --- a/keyboards/kinesis/kint36/info.json +++ b/keyboards/kinesis/kint36/keyboard.json @@ -13,9 +13,7 @@ "command": false, "mousekey": true, "extrakey": true, - "nkro": true, - "audio": false, - "backlight": false + "nkro": true }, "build": { "debounce_type": "sym_eager_pk" diff --git a/keyboards/kinesis/kint36/kint36.c b/keyboards/kinesis/kint36/kint36.c index b3ae9b570c..c6f399d6dc 100644 --- a/keyboards/kinesis/kint36/kint36.c +++ b/keyboards/kinesis/kint36/kint36.c @@ -22,6 +22,6 @@ void matrix_init_kb(void) { matrix_init_user(); // Turn on the Teensy 3.6 Power LED: - setPinOutput(LED_POWER); - writePinHigh(LED_POWER); + gpio_set_pin_output(LED_POWER); + gpio_write_pin_high(LED_POWER); } diff --git a/keyboards/kinesis/kint36/rules.mk b/keyboards/kinesis/kint36/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/kinesis/kint36/rules.mk +++ /dev/null diff --git a/keyboards/kinesis/kint41/info.json b/keyboards/kinesis/kint41/keyboard.json index eec726cf51..c1eb7b8465 100644 --- a/keyboards/kinesis/kint41/info.json +++ b/keyboards/kinesis/kint41/keyboard.json @@ -13,9 +13,7 @@ "command": false, "mousekey": true, "extrakey": true, - "nkro": true, - "audio": false, - "backlight": false + "nkro": true }, "build": { "debounce_type": "sym_eager_pk" diff --git a/keyboards/kinesis/kint41/kint41.c b/keyboards/kinesis/kint41/kint41.c index 6d339497ee..8f8f7dfc59 100644 --- a/keyboards/kinesis/kint41/kint41.c +++ b/keyboards/kinesis/kint41/kint41.c @@ -22,8 +22,8 @@ void matrix_init_kb(void) { matrix_init_user(); // Turn on the Teensy 4.x Power LED: - setPinOutput(LED_POWER); - writePinHigh(LED_POWER); + gpio_set_pin_output(LED_POWER); + gpio_write_pin_high(LED_POWER); } // delay_inline sleeps for |cycles| (e.g. sleeping for F_CPU will sleep 1s). diff --git a/keyboards/kinesis/kintlc/info.json b/keyboards/kinesis/kintlc/keyboard.json index 13c2f9a55c..07c81e1c89 100644 --- a/keyboards/kinesis/kintlc/info.json +++ b/keyboards/kinesis/kintlc/keyboard.json @@ -13,9 +13,7 @@ "command": false, "mousekey": true, "extrakey": true, - "nkro": true, - "audio": false, - "backlight": false + "nkro": true }, "build": { "debounce_type": "sym_eager_pk" diff --git a/keyboards/kinesis/kintlc/kintlc.c b/keyboards/kinesis/kintlc/kintlc.c index 9623d04fe0..6904adc6ad 100644 --- a/keyboards/kinesis/kintlc/kintlc.c +++ b/keyboards/kinesis/kintlc/kintlc.c @@ -22,6 +22,6 @@ void matrix_init_kb(void) { matrix_init_user(); // Turn on the Teensy LC Power LED: - setPinOutput(LED_POWER); - writePinHigh(LED_POWER); + gpio_set_pin_output(LED_POWER); + gpio_write_pin_high(LED_POWER); } diff --git a/keyboards/kinesis/kintwin/info.json b/keyboards/kinesis/kintwin/keyboard.json index ed67c36af3..92727e9ecb 100644 --- a/keyboards/kinesis/kintwin/info.json +++ b/keyboards/kinesis/kintwin/keyboard.json @@ -18,9 +18,7 @@ "command": false, "mousekey": true, "extrakey": true, - "nkro": true, - "audio": false, - "backlight": false + "nkro": true }, "matrix_pins": { "rows": ["A0", "A1", "A2", "A3", "A4", "A5", "A6"], diff --git a/keyboards/kinesis/kintwin/kintwin.c b/keyboards/kinesis/kintwin/kintwin.c index 0e2e7a5792..e0c3ab4880 100644 --- a/keyboards/kinesis/kintwin/kintwin.c +++ b/keyboards/kinesis/kintwin/kintwin.c @@ -8,22 +8,22 @@ void matrix_init_kb(void) { uint8_t led_delay_ms = 80; /* LED pins setup */ - setPinOutput(LED_CAPS_LOCK_PIN); - writePinLow(LED_CAPS_LOCK_PIN); + gpio_set_pin_output(LED_CAPS_LOCK_PIN); + gpio_write_pin_low(LED_CAPS_LOCK_PIN); wait_ms(led_delay_ms); - setPinOutput(LED_NUM_LOCK_PIN); - writePinLow(LED_NUM_LOCK_PIN); + gpio_set_pin_output(LED_NUM_LOCK_PIN); + gpio_write_pin_low(LED_NUM_LOCK_PIN); wait_ms(led_delay_ms); - setPinOutput(LED_SCROLL_LOCK_PIN); - writePinLow(LED_SCROLL_LOCK_PIN); + gpio_set_pin_output(LED_SCROLL_LOCK_PIN); + gpio_write_pin_low(LED_SCROLL_LOCK_PIN); wait_ms(led_delay_ms); - setPinOutput(LED_COMPOSE_PIN); - writePinLow(LED_COMPOSE_PIN); + gpio_set_pin_output(LED_COMPOSE_PIN); + gpio_write_pin_low(LED_COMPOSE_PIN); wait_ms(led_delay_ms); - writePinHigh(LED_COMPOSE_PIN); + gpio_write_pin_high(LED_COMPOSE_PIN); matrix_init_user(); }
\ No newline at end of file diff --git a/keyboards/kinesis/kintwin/rules.mk b/keyboards/kinesis/kintwin/rules.mk deleted file mode 100644 index 3922c569c4..0000000000 --- a/keyboards/kinesis/kintwin/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# File intentionally blank
\ No newline at end of file diff --git a/keyboards/kinesis/nguyenvietyen/info.json b/keyboards/kinesis/nguyenvietyen/keyboard.json index 123b42e9bf..68bdd0f767 100644 --- a/keyboards/kinesis/nguyenvietyen/info.json +++ b/keyboards/kinesis/nguyenvietyen/keyboard.json @@ -13,8 +13,7 @@ "mousekey": true, "extrakey": true, "nkro": true, - "audio": false, - "backlight": false + "sleep_led": true }, "indicators": { "caps_lock": "E6", diff --git a/keyboards/kinesis/nguyenvietyen/matrix.c b/keyboards/kinesis/nguyenvietyen/matrix.c index d6ea67da68..06b57c7c0b 100644 --- a/keyboards/kinesis/nguyenvietyen/matrix.c +++ b/keyboards/kinesis/nguyenvietyen/matrix.c @@ -3,17 +3,15 @@ #include "matrix.h" -#include "quantum.h" - static matrix_row_t read_row(uint8_t row) { matrix_io_delay(); // without this wait read unstable value. // keypad and program buttons if (row == 12) { - return ~(readPin(B4) | (readPin(B5) << 1) | 0b11111100); + return ~(gpio_read_pin(B4) | (gpio_read_pin(B5) << 1) | 0b11111100); } - return ~(readPin(B6) | readPin(B2) << 1 | readPin(B3) << 2 | readPin(B1) << 3 | readPin(F7) << 4 | readPin(F6) << 5 | readPin(F5) << 6 | readPin(F4) << 7); + return ~(gpio_read_pin(B6) | gpio_read_pin(B2) << 1 | gpio_read_pin(B3) << 2 | gpio_read_pin(B1) << 3 | gpio_read_pin(F7) << 4 | gpio_read_pin(F6) << 5 | gpio_read_pin(F5) << 6 | gpio_read_pin(F4) << 7); } static void unselect_rows(void) { @@ -28,24 +26,24 @@ static void select_rows(uint8_t row) { void matrix_init_custom(void) { // output low (multiplexers) - setPinOutput(D0); - setPinOutput(D1); - setPinOutput(D2); - setPinOutput(D3); + gpio_set_pin_output(D0); + gpio_set_pin_output(D1); + gpio_set_pin_output(D2); + gpio_set_pin_output(D3); // input with pullup (matrix) - setPinInputHigh(B6); - setPinInputHigh(B2); - setPinInputHigh(B3); - setPinInputHigh(B1); - setPinInputHigh(F7); - setPinInputHigh(F6); - setPinInputHigh(F5); - setPinInputHigh(F4); + gpio_set_pin_input_high(B6); + gpio_set_pin_input_high(B2); + gpio_set_pin_input_high(B3); + gpio_set_pin_input_high(B1); + gpio_set_pin_input_high(F7); + gpio_set_pin_input_high(F6); + gpio_set_pin_input_high(F5); + gpio_set_pin_input_high(F4); // input with pullup (program and keypad buttons) - setPinInputHigh(B4); - setPinInputHigh(B5); + gpio_set_pin_input_high(B4); + gpio_set_pin_input_high(B5); // initialize row and col unselect_rows(); diff --git a/keyboards/kinesis/nguyenvietyen/rules.mk b/keyboards/kinesis/nguyenvietyen/rules.mk index 59129f4320..30ce5d293b 100644 --- a/keyboards/kinesis/nguyenvietyen/rules.mk +++ b/keyboards/kinesis/nguyenvietyen/rules.mk @@ -1,7 +1,2 @@ -# Build Options -# change yes to no to disable -# - -SLEEP_LED_ENABLE = yes CUSTOM_MATRIX = lite SRC += matrix.c diff --git a/keyboards/kinesis/stapelberg/info.json b/keyboards/kinesis/stapelberg/keyboard.json index 44e2a33157..6ad972d247 100644 --- a/keyboards/kinesis/stapelberg/info.json +++ b/keyboards/kinesis/stapelberg/keyboard.json @@ -12,9 +12,7 @@ "command": false, "mousekey": true, "extrakey": true, - "nkro": true, - "audio": false, - "backlight": false + "nkro": true }, "matrix_pins": { "cols": ["B0", "B1", "B2", "B3", "B4", "B5", "B6"], diff --git a/keyboards/kinesis/stapelberg/rules.mk b/keyboards/kinesis/stapelberg/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/kinesis/stapelberg/rules.mk +++ /dev/null |