diff options
Diffstat (limited to 'keyboards/clueboard')
33 files changed, 86 insertions, 117 deletions
diff --git a/keyboards/clueboard/17/info.json b/keyboards/clueboard/17/keyboard.json index ef03bd11b1..d6aec9cfcc 100644 --- a/keyboards/clueboard/17/info.json +++ b/keyboards/clueboard/17/keyboard.json @@ -11,11 +11,9 @@ "command": false, "console": true, "extrakey": true, - "midi": false, "mousekey": true, "nkro": true, - "rgblight": true, - "unicode": false + "rgblight": true }, "matrix_pins": { "cols": ["F4", "E6", "B1", "D2"], diff --git a/keyboards/clueboard/17/rules.mk b/keyboards/clueboard/17/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/clueboard/17/rules.mk +++ /dev/null diff --git a/keyboards/clueboard/2x1800/2018/info.json b/keyboards/clueboard/2x1800/2018/keyboard.json index 49e0ae17a8..fe0b521034 100644 --- a/keyboards/clueboard/2x1800/2018/info.json +++ b/keyboards/clueboard/2x1800/2018/keyboard.json @@ -11,11 +11,9 @@ "command": false, "console": true, "extrakey": true, - "midi": false, "mousekey": true, "nkro": true, - "rgblight": true, - "unicode": false + "rgblight": true }, "indicators": { "num_lock": "B4", diff --git a/keyboards/clueboard/2x1800/2018/rules.mk b/keyboards/clueboard/2x1800/2018/rules.mk deleted file mode 100644 index 6e7633bfe0..0000000000 --- a/keyboards/clueboard/2x1800/2018/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/clueboard/2x1800/2019/2019.c b/keyboards/clueboard/2x1800/2019/2019.c index 40032cd669..8b0ba6a71e 100644 --- a/keyboards/clueboard/2x1800/2019/2019.c +++ b/keyboards/clueboard/2x1800/2019/2019.c @@ -17,14 +17,14 @@ void matrix_init_kb(void) { // Set our LED pins as output - setPinOutput(D6); - setPinOutput(B4); - setPinOutput(B5); - setPinOutput(B6); + gpio_set_pin_output(D6); + gpio_set_pin_output(B4); + gpio_set_pin_output(B5); + gpio_set_pin_output(B6); // Set our Tilt Sensor pins as input - setPinInputHigh(SHAKE_PIN_A); - setPinInputHigh(SHAKE_PIN_B); + gpio_set_pin_input_high(SHAKE_PIN_A); + gpio_set_pin_input_high(SHAKE_PIN_B); // Run the keymap level init matrix_init_user(); @@ -43,12 +43,12 @@ void check_encoder_buttons(void) { if (drawing_mode) { dprintf("Turning drawing mode off.\n"); drawing_mode = false; - writePinLow(D6); + gpio_write_pin_low(D6); unregister_code(KC_BTN1); } else { dprintf("Turning drawing mode on.\n"); drawing_mode = true; - writePinHigh(D6); + gpio_write_pin_high(D6); register_code(KC_BTN1); } } @@ -65,7 +65,7 @@ void matrix_scan_kb(void) { #ifdef SHAKE_ENABLE // Read the current state of the tilt sensor. It is physically // impossible for both pins to register a low state at the same time. - uint8_t tilt_read = (readPin(SHAKE_PIN_A) << 4) | readPin(SHAKE_PIN_B); + uint8_t tilt_read = (gpio_read_pin(SHAKE_PIN_A) << 4) | gpio_read_pin(SHAKE_PIN_B); // Check to see if the tilt sensor has changed state since our last read if (tilt_state != tilt_read) { @@ -136,9 +136,9 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { bool led_update_kb(led_t led_state) { bool res = led_update_user(led_state); if(res) { - writePin(B4, !led_state.num_lock); - writePin(B5, !led_state.caps_lock); - writePin(B6, !led_state.scroll_lock); + gpio_write_pin(B4, !led_state.num_lock); + gpio_write_pin(B5, !led_state.caps_lock); + gpio_write_pin(B6, !led_state.scroll_lock); } return res; diff --git a/keyboards/clueboard/2x1800/2019/info.json b/keyboards/clueboard/2x1800/2019/keyboard.json index fc613d6100..6f33a11ca7 100644 --- a/keyboards/clueboard/2x1800/2019/info.json +++ b/keyboards/clueboard/2x1800/2019/keyboard.json @@ -12,11 +12,8 @@ "console": true, "encoder": true, "extrakey": true, - "midi": false, "mousekey": true, - "nkro": true, - "rgblight": false, - "unicode": false + "nkro": true }, "matrix_pins": { "cols": ["D2", "D3", "D4", "D5", "D7", "E0", "E1", "B0", "E6", "B3", "B2"], diff --git a/keyboards/clueboard/2x1800/2019/rules.mk b/keyboards/clueboard/2x1800/2019/rules.mk deleted file mode 100644 index 6e7633bfe0..0000000000 --- a/keyboards/clueboard/2x1800/2019/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/clueboard/2x1800/2021/info.json b/keyboards/clueboard/2x1800/2021/keyboard.json index 8800d05cf2..8800d05cf2 100644 --- a/keyboards/clueboard/2x1800/2021/info.json +++ b/keyboards/clueboard/2x1800/2021/keyboard.json diff --git a/keyboards/clueboard/2x1800/2021/max7219.c b/keyboards/clueboard/2x1800/2021/max7219.c index 1ba22362fe..849889a52e 100644 --- a/keyboards/clueboard/2x1800/2021/max7219.c +++ b/keyboards/clueboard/2x1800/2021/max7219.c @@ -40,6 +40,10 @@ */ #include "max7219.h" +#include "spi_master.h" +#include "debug.h" +#include "gpio.h" +#include "wait.h" #include "font.h" // Datastructures @@ -202,8 +206,8 @@ void max7219_init(void) { wait_ms(1500); dprintf("max7219_init()\n"); - setPinOutput(MAX7219_LOAD); - writePinHigh(MAX7219_LOAD); + gpio_set_pin_output(MAX7219_LOAD); + gpio_write_pin_high(MAX7219_LOAD); spi_init(); for (int i=0; i<MAX7219_CONTROLLERS; i++) { diff --git a/keyboards/clueboard/2x1800/2021/max7219.h b/keyboards/clueboard/2x1800/2021/max7219.h index 95d1d9389d..6d78345d5d 100644 --- a/keyboards/clueboard/2x1800/2021/max7219.h +++ b/keyboards/clueboard/2x1800/2021/max7219.h @@ -26,8 +26,10 @@ * OTHER DEALINGS IN THE SOFTWARE. */ #pragma once -#include "quantum.h" -#include "spi_master.h" + +#include <stddef.h> +#include <stdint.h> +#include <stdbool.h> // Set defaults if they're not set #ifndef MAX7219_LOAD diff --git a/keyboards/clueboard/60/info.json b/keyboards/clueboard/60/keyboard.json index 322f842680..d0b4d34999 100644 --- a/keyboards/clueboard/60/info.json +++ b/keyboards/clueboard/60/keyboard.json @@ -9,7 +9,6 @@ "diode_direction": "COL2ROW", "features": { "audio": true, - "backlight": false, "bootmagic": false, "command": false, "console": true, diff --git a/keyboards/clueboard/66/rev1/info.json b/keyboards/clueboard/66/rev1/keyboard.json index fc186d9894..ca1e3a6553 100644 --- a/keyboards/clueboard/66/rev1/info.json +++ b/keyboards/clueboard/66/rev1/keyboard.json @@ -6,18 +6,12 @@ "bootloader": "atmel-dfu", "diode_direction": "COL2ROW", "features": { - "audio": false, - "backlight": false, - "bluetooth": false, "bootmagic": false, "command": false, "console": true, "extrakey": true, - "midi": false, "mousekey": true, - "nkro": true, - "rgblight": false, - "unicode": false + "nkro": true }, "indicators": { "caps_lock": "F0" diff --git a/keyboards/clueboard/66/rev1/rules.mk b/keyboards/clueboard/66/rev1/rules.mk deleted file mode 100644 index 6e7633bfe0..0000000000 --- a/keyboards/clueboard/66/rev1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/clueboard/66/rev2/info.json b/keyboards/clueboard/66/rev2/keyboard.json index e4a8c5a03b..fea4f8d39b 100644 --- a/keyboards/clueboard/66/rev2/info.json +++ b/keyboards/clueboard/66/rev2/keyboard.json @@ -6,18 +6,13 @@ "bootloader": "atmel-dfu", "diode_direction": "COL2ROW", "features": { - "audio": false, - "backlight": true, - "bluetooth": false, "bootmagic": false, "command": false, "console": true, "extrakey": true, - "midi": false, "mousekey": true, "nkro": true, - "rgblight": true, - "unicode": false + "rgblight": true }, "indicators": { "caps_lock": "B4" diff --git a/keyboards/clueboard/66/rev2/rev2.c b/keyboards/clueboard/66/rev2/rev2.c index 7e3ed5c9dd..ea306a764b 100644 --- a/keyboards/clueboard/66/rev2/rev2.c +++ b/keyboards/clueboard/66/rev2/rev2.c @@ -4,26 +4,26 @@ void backlight_init_ports(void) { print("init_backlight_pin()\n"); // Set our LED pins as output - DDRD |= (1<<6); // Esc - DDRB |= (1<<7); // Page Up - DDRD |= (1<<4); // Arrows + gpio_set_pin_output(D6); // Esc + gpio_set_pin_output(B7); // Page Up + gpio_set_pin_output(D4); // Arrows // Set our LED pins low - PORTD &= ~(1<<6); // Esc - PORTB &= ~(1<<7); // Page Up - PORTD &= ~(1<<4); // Arrows + gpio_write_pin_low(D6); // Esc + gpio_write_pin_low(B7); // Page Up + gpio_write_pin_low(D4); // Arrows } void backlight_set(uint8_t level) { if ( level == 0 ) { // Turn off light - PORTD |= (1<<6); // Esc - PORTB |= (1<<7); // Page Up - PORTD |= (1<<4); // Arrows + gpio_write_pin_high(D6); // Esc + gpio_write_pin_high(B7); // Page Up + gpio_write_pin_high(D4); // Arrows } else { // Turn on light - PORTD &= ~(1<<6); // Esc - PORTB &= ~(1<<7); // Page Up - PORTD &= ~(1<<4); // Arrows + gpio_write_pin_low(D6); // Esc + gpio_write_pin_low(B7); // Page Up + gpio_write_pin_low(D4); // Arrows } } diff --git a/keyboards/clueboard/66/rev2/rules.mk b/keyboards/clueboard/66/rev2/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/clueboard/66/rev2/rules.mk +++ /dev/null diff --git a/keyboards/clueboard/66/rev3/info.json b/keyboards/clueboard/66/rev3/keyboard.json index f0881e5be6..0aa3e7096f 100644 --- a/keyboards/clueboard/66/rev3/info.json +++ b/keyboards/clueboard/66/rev3/keyboard.json @@ -6,18 +6,14 @@ "bootloader": "atmel-dfu", "diode_direction": "COL2ROW", "features": { - "audio": false, "backlight": true, - "bluetooth": false, "bootmagic": false, "command": false, "console": true, "extrakey": true, - "midi": false, "mousekey": true, "nkro": true, - "rgblight": true, - "unicode": false + "rgblight": true }, "indicators": { "caps_lock": "B4" diff --git a/keyboards/clueboard/66/rev3/rev3.c b/keyboards/clueboard/66/rev3/rev3.c index 7e3ed5c9dd..ea306a764b 100644 --- a/keyboards/clueboard/66/rev3/rev3.c +++ b/keyboards/clueboard/66/rev3/rev3.c @@ -4,26 +4,26 @@ void backlight_init_ports(void) { print("init_backlight_pin()\n"); // Set our LED pins as output - DDRD |= (1<<6); // Esc - DDRB |= (1<<7); // Page Up - DDRD |= (1<<4); // Arrows + gpio_set_pin_output(D6); // Esc + gpio_set_pin_output(B7); // Page Up + gpio_set_pin_output(D4); // Arrows // Set our LED pins low - PORTD &= ~(1<<6); // Esc - PORTB &= ~(1<<7); // Page Up - PORTD &= ~(1<<4); // Arrows + gpio_write_pin_low(D6); // Esc + gpio_write_pin_low(B7); // Page Up + gpio_write_pin_low(D4); // Arrows } void backlight_set(uint8_t level) { if ( level == 0 ) { // Turn off light - PORTD |= (1<<6); // Esc - PORTB |= (1<<7); // Page Up - PORTD |= (1<<4); // Arrows + gpio_write_pin_high(D6); // Esc + gpio_write_pin_high(B7); // Page Up + gpio_write_pin_high(D4); // Arrows } else { // Turn on light - PORTD &= ~(1<<6); // Esc - PORTB &= ~(1<<7); // Page Up - PORTD &= ~(1<<4); // Arrows + gpio_write_pin_low(D6); // Esc + gpio_write_pin_low(B7); // Page Up + gpio_write_pin_low(D4); // Arrows } } diff --git a/keyboards/clueboard/66/rev3/rules.mk b/keyboards/clueboard/66/rev3/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/clueboard/66/rev3/rules.mk +++ /dev/null diff --git a/keyboards/clueboard/66/rev4/info.json b/keyboards/clueboard/66/rev4/keyboard.json index e90ec9788e..dbc1b94915 100644 --- a/keyboards/clueboard/66/rev4/info.json +++ b/keyboards/clueboard/66/rev4/keyboard.json @@ -8,17 +8,12 @@ "diode_direction": "COL2ROW", "features": { "audio": true, - "backlight": false, - "bluetooth": false, "bootmagic": false, "command": false, "console": true, "extrakey": true, - "midi": false, "mousekey": true, - "nkro": true, - "rgblight": false, - "unicode": false + "nkro": true }, "matrix_pins": { "cols": ["B10", "B2", "B1", "B0", "A7", "B4", "B3", "B5"], diff --git a/keyboards/clueboard/66/rev4/rev4.c b/keyboards/clueboard/66/rev4/rev4.c index 75befc5230..25fe606aea 100644 --- a/keyboards/clueboard/66/rev4/rev4.c +++ b/keyboards/clueboard/66/rev4/rev4.c @@ -2,23 +2,23 @@ void led_init_ports(void) { // Set our LED pins as output - setPinOutput(B13); // LED1 - writePinLow(B13); - setPinOutput(B14); // LED2 - writePinLow(B14); - setPinOutput(A8); // LED3 - writePinLow(A8); - setPinOutput(A0); // Capslock LED - writePinLow(A0); + gpio_set_pin_output(B13); // LED1 + gpio_write_pin_low(B13); + gpio_set_pin_output(B14); // LED2 + gpio_write_pin_low(B14); + gpio_set_pin_output(A8); // LED3 + gpio_write_pin_low(A8); + gpio_set_pin_output(A0); // Capslock LED + gpio_write_pin_low(A0); } bool led_update_kb(led_t led_state) { bool res = led_update_user(led_state); if(res) { - writePin(B13, led_state.num_lock); - writePin(A0, led_state.caps_lock); - writePin(B14, led_state.caps_lock); - writePin(A8, led_state.scroll_lock); + gpio_write_pin(B13, led_state.num_lock); + gpio_write_pin(A0, led_state.caps_lock); + gpio_write_pin(B14, led_state.caps_lock); + gpio_write_pin(A8, led_state.scroll_lock); } return res; } diff --git a/keyboards/clueboard/66/rev4/rules.mk b/keyboards/clueboard/66/rev4/rules.mk deleted file mode 100644 index 6e7633bfe0..0000000000 --- a/keyboards/clueboard/66/rev4/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/clueboard/66_hotswap/gen1/info.json b/keyboards/clueboard/66_hotswap/gen1/keyboard.json index 17e47e66fe..17e47e66fe 100644 --- a/keyboards/clueboard/66_hotswap/gen1/info.json +++ b/keyboards/clueboard/66_hotswap/gen1/keyboard.json diff --git a/keyboards/clueboard/66_hotswap/gen1/keymaps/66_ansi/keymap.c b/keyboards/clueboard/66_hotswap/gen1/keymaps/66_ansi/keymap.c index 4dfa570cbc..9bd7f227dc 100644 --- a/keyboards/clueboard/66_hotswap/gen1/keymaps/66_ansi/keymap.c +++ b/keyboards/clueboard/66_hotswap/gen1/keymaps/66_ansi/keymap.c @@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Keymap _CL: Control layer */ [_CL] = LAYOUT_66_ansi( - BL_STEP,RGB_M_P,RGB_M_B,RGB_M_R,RGB_M_SW,RGB_M_SN,RGB_M_K,RGB_M_X,RGB_M_G,_______,_______,_______,_______, RGB_TOG, RGB_VAI, + LM_NEXT,RGB_M_P,RGB_M_B,RGB_M_R,RGB_M_SW,RGB_M_SN,RGB_M_K,RGB_M_X,RGB_M_G,_______,_______,_______,_______, RGB_TOG, RGB_VAI, _______,_______,_______,_______,QK_BOOT, _______,_______,_______,_______,_______,_______,_______,_______,_______, RGB_VAD, _______,_______,MO(_CL),_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, _______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, RGB_SAI, diff --git a/keyboards/clueboard/66_hotswap/gen1/keymaps/default/keymap.c b/keyboards/clueboard/66_hotswap/gen1/keymaps/default/keymap.c index 2a1a772272..07f7d0f7de 100644 --- a/keyboards/clueboard/66_hotswap/gen1/keymaps/default/keymap.c +++ b/keyboards/clueboard/66_hotswap/gen1/keymaps/default/keymap.c @@ -68,11 +68,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Keymap _CL: Control layer */ [_CL] = LAYOUT( - BL_STEP,S_ONEUP,S_SCALE,RGB_M_R,RGB_M_SW,RGB_M_SN,RGB_M_K,RGB_M_X,RGB_M_G,_______,_______,_______,_______, BL_TOGG, BL_UP, - _______,_______,_______,_______,QK_BOOT, _______,_______,_______,_______,_______,_______,_______,_______,_______, BL_DOWN, + LM_NEXT,S_ONEUP,S_SCALE,RGB_M_R,RGB_M_SW,RGB_M_SN,RGB_M_K,RGB_M_X,RGB_M_G,_______,_______,_______,_______, LM_TOGG, LM_BRIU, + _______,_______,_______,_______,QK_BOOT, _______,_______,_______,_______,_______,_______,_______,_______,_______, LM_BRID, _______,_______,MO(_CL),_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, _______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, RGB_SAI, - _______,_______,_______, BL_BRTG,BL_BRTG, _______,_______,MO(_FL),_______,RGB_HUD,RGB_SAD,RGB_HUI), + _______,_______,_______, _______,_______, _______,_______,MO(_FL),_______,RGB_HUD,RGB_SAD,RGB_HUI), }; diff --git a/keyboards/clueboard/66_hotswap/gen1/rules.mk b/keyboards/clueboard/66_hotswap/gen1/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/clueboard/66_hotswap/gen1/rules.mk +++ /dev/null diff --git a/keyboards/clueboard/66_hotswap/prototype/info.json b/keyboards/clueboard/66_hotswap/prototype/keyboard.json index 779540a8c4..9d0b0dd27c 100644 --- a/keyboards/clueboard/66_hotswap/prototype/info.json +++ b/keyboards/clueboard/66_hotswap/prototype/keyboard.json @@ -8,16 +8,16 @@ "features": { "audio": true, "backlight": true, - "bluetooth": false, "bootmagic": false, "command": false, "console": true, "extrakey": true, - "midi": false, "mousekey": false, "nkro": true, - "rgblight": true, - "unicode": false + "rgblight": true + }, + "build": { + "lto": true }, "indicators": { "caps_lock": "B4" diff --git a/keyboards/clueboard/66_hotswap/prototype/prototype.c b/keyboards/clueboard/66_hotswap/prototype/prototype.c index c89fbafbff..27aa332ca4 100644 --- a/keyboards/clueboard/66_hotswap/prototype/prototype.c +++ b/keyboards/clueboard/66_hotswap/prototype/prototype.c @@ -4,26 +4,26 @@ void backlight_init_ports(void) { print("init_backlight_pin()\n"); // Set our LED pins as output - DDRD |= (1<<0); // Esc - DDRD |= (1<<4); // Page Up - DDRD |= (1<<1); // Arrows + gpio_set_pin_output(D0); // Esc + gpio_set_pin_output(D4); // Page Up + gpio_set_pin_output(D1); // Arrows // Set our LED pins low - PORTD &= ~(1<<0); // Esc - PORTD &= ~(1<<4); // Page Up - PORTD &= ~(1<<1); // Arrows + gpio_write_pin_low(D0); // Esc + gpio_write_pin_low(D4); // Page Up + gpio_write_pin_low(D1); // Arrows } void backlight_set(uint8_t level) { if ( level == 0 ) { // Turn off light - PORTD |= (1<<0); // Esc - PORTD |= (1<<4); // Page Up - PORTD |= (1<<1); // Arrows + gpio_write_pin_high(D0); // Esc + gpio_write_pin_high(D4); // Page Up + gpio_write_pin_high(D1); // Arrows } else { // Turn on light - PORTD &= ~(1<<0); // Esc - PORTD &= ~(1<<4); // Page Up - PORTD &= ~(1<<1); // Arrows + gpio_write_pin_low(D0); // Esc + gpio_write_pin_low(D4); // Page Up + gpio_write_pin_low(D1); // Arrows } } diff --git a/keyboards/clueboard/66_hotswap/prototype/rules.mk b/keyboards/clueboard/66_hotswap/prototype/rules.mk deleted file mode 100644 index 4da205a168..0000000000 --- a/keyboards/clueboard/66_hotswap/prototype/rules.mk +++ /dev/null @@ -1 +0,0 @@ -LTO_ENABLE = yes diff --git a/keyboards/clueboard/california/info.json b/keyboards/clueboard/california/keyboard.json index 66b4b484e2..66b4b484e2 100644 --- a/keyboards/clueboard/california/info.json +++ b/keyboards/clueboard/california/keyboard.json diff --git a/keyboards/clueboard/california/rules.mk b/keyboards/clueboard/california/rules.mk deleted file mode 100644 index 6e7633bfe0..0000000000 --- a/keyboards/clueboard/california/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/clueboard/card/info.json b/keyboards/clueboard/card/keyboard.json index 7799110ba6..106b6f823d 100644 --- a/keyboards/clueboard/card/info.json +++ b/keyboards/clueboard/card/keyboard.json @@ -9,16 +9,13 @@ "features": { "audio": true, "backlight": true, - "bluetooth": false, "bootmagic": false, "command": false, "console": true, "extrakey": true, - "midi": false, "mousekey": true, "nkro": false, - "rgblight": true, - "unicode": false + "rgblight": true }, "build": { "lto": true diff --git a/keyboards/clueboard/card/rules.mk b/keyboards/clueboard/card/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/clueboard/card/rules.mk +++ /dev/null |