diff options
Diffstat (limited to 'keyboards/keyboardio')
| -rw-r--r-- | keyboards/keyboardio/atreus/keyboard.json (renamed from keyboards/keyboardio/atreus/info.json) | 9 | ||||
| -rw-r--r-- | keyboards/keyboardio/atreus/keymaps/default/keymap.c | 2 | ||||
| -rw-r--r-- | keyboards/keyboardio/atreus/keymaps/via/keymap.c | 2 | ||||
| -rw-r--r-- | keyboards/keyboardio/atreus/rules.mk | 14 | ||||
| -rw-r--r-- | keyboards/keyboardio/model01/keyboard.json (renamed from keyboards/keyboardio/model01/info.json) | 7 | ||||
| -rw-r--r-- | keyboards/keyboardio/model01/leds.c | 10 | ||||
| -rw-r--r-- | keyboards/keyboardio/model01/leds.h | 3 | ||||
| -rw-r--r-- | keyboards/keyboardio/model01/matrix.c | 6 | ||||
| -rw-r--r-- | keyboards/keyboardio/model01/model01.c | 4 | ||||
| -rw-r--r-- | keyboards/keyboardio/model01/rules.mk | 13 |
10 files changed, 29 insertions, 41 deletions
diff --git a/keyboards/keyboardio/atreus/info.json b/keyboards/keyboardio/atreus/keyboard.json index b251151be4..4bdea354bd 100644 --- a/keyboards/keyboardio/atreus/info.json +++ b/keyboards/keyboardio/atreus/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x2303", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "unicode": true + }, "matrix_pins": { "cols": ["F7", "E2", "C7", "C6", "B6", "B5", "D7", "D6", "D4", "D5", "D3", "D2"], "rows": ["F6", "F5", "F4", "F1"] diff --git a/keyboards/keyboardio/atreus/keymaps/default/keymap.c b/keyboards/keyboardio/atreus/keymaps/default/keymap.c index f24cc7595d..eb7c3c951a 100644 --- a/keyboards/keyboardio/atreus/keymaps/default/keymap.c +++ b/keyboards/keyboardio/atreus/keymaps/default/keymap.c @@ -38,6 +38,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_LW] = LAYOUT( /* [> LOWER <] */ KC_INS, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_UP, KC_F7, KC_F8, KC_F9, KC_F10 , KC_DEL, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_DOWN, KC_F4, KC_F5, KC_F6, KC_F11 , - KC_NO, KC_VOLU, KC_NO, KC_NO, QK_BOOT, _______, _______, KC_NO, KC_F1, KC_F2, KC_F3, KC_F12 , + KC_NO, KC_VOLU, KC_NO, KC_NO, QK_BOOT, _______, _______, KC_NO, KC_F1, KC_F2, KC_F3, KC_F12 , KC_NO, KC_VOLD, KC_LGUI, KC_LSFT, KC_BSPC, KC_LCTL, KC_LALT, KC_SPC, TO(_QW), KC_PSCR, KC_SCRL, KC_PAUS ) }; diff --git a/keyboards/keyboardio/atreus/keymaps/via/keymap.c b/keyboards/keyboardio/atreus/keymaps/via/keymap.c index 87d6102bc3..7521d0d6a1 100644 --- a/keyboards/keyboardio/atreus/keymaps/via/keymap.c +++ b/keyboards/keyboardio/atreus/keymaps/via/keymap.c @@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [2] = LAYOUT( /* [> LOWER <] */ KC_INS, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_UP, KC_F7, KC_F8, KC_F9, KC_F10 , KC_DEL, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_DOWN, KC_F4, KC_F5, KC_F6, KC_F11 , - KC_NO, KC_VOLU, KC_NO, KC_NO, QK_BOOT, KC_TRNS, KC_TRNS, KC_NO, KC_F1, KC_F2, KC_F3, KC_F12 , + KC_NO, KC_VOLU, KC_NO, KC_NO, QK_BOOT, KC_TRNS, KC_TRNS, KC_NO, KC_F1, KC_F2, KC_F3, KC_F12 , TO(0), KC_VOLD, KC_LGUI, KC_LSFT, KC_BSPC, KC_LCTL, KC_LALT, KC_SPC, TO(0), KC_PSCR, KC_SCRL, KC_PAUS ), [3] = LAYOUT( /* blank */ diff --git a/keyboards/keyboardio/atreus/rules.mk b/keyboards/keyboardio/atreus/rules.mk deleted file mode 100644 index 2513240d91..0000000000 --- a/keyboards/keyboardio/atreus/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # 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 - -UNICODE_ENABLE = yes # Unicode diff --git a/keyboards/keyboardio/model01/info.json b/keyboards/keyboardio/model01/keyboard.json index fd17535be4..c2438047b0 100644 --- a/keyboards/keyboardio/model01/info.json +++ b/keyboards/keyboardio/model01/keyboard.json @@ -110,6 +110,13 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "console": true, + "rgb_matrix": true + }, "debounce": 0, "layouts": { "LAYOUT": { diff --git a/keyboards/keyboardio/model01/leds.c b/keyboards/keyboardio/model01/leds.c index 3fb502cb27..c9a037906a 100644 --- a/keyboards/keyboardio/model01/leds.c +++ b/keyboards/keyboardio/model01/leds.c @@ -13,7 +13,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 "quantum.h" + +#include "leds.h" #include "i2c_master.h" #include "led_tables.h" #include "rgb_matrix.h" @@ -64,12 +65,11 @@ static void set_color_all(uint8_t r, uint8_t g, uint8_t b) { static void init(void) { // Enable high current pathway to LEDs - this does violate the USB spec though! (1.6 amps...) - DDRE |= _BV(6); - PORTE &= ~_BV(6); + gpio_set_pin_output(E6); + gpio_write_pin_low(E6); // Overcurrent check input - DDRB &= ~_BV(4); - PORTB &= ~_BV(4); + gpio_set_pin_input(B4); } static void flush(void) { diff --git a/keyboards/keyboardio/model01/leds.h b/keyboards/keyboardio/model01/leds.h index 4d185919b0..6f5e12a6a8 100644 --- a/keyboards/keyboardio/model01/leds.h +++ b/keyboards/keyboardio/model01/leds.h @@ -15,8 +15,7 @@ */ #pragma once -#include "quantum.h" -#include "rgb_matrix.h" +#include <stdint.h> void set_all_leds_to(uint8_t r, uint8_t g, uint8_t b); void set_led_to(int led, uint8_t r, uint8_t g, uint8_t b); diff --git a/keyboards/keyboardio/model01/matrix.c b/keyboards/keyboardio/model01/matrix.c index 4b788d2812..72948fc0b7 100644 --- a/keyboards/keyboardio/model01/matrix.c +++ b/keyboards/keyboardio/model01/matrix.c @@ -13,7 +13,7 @@ * 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 "quantum.h" +#include "matrix.h" #include "i2c_master.h" #include <string.h> #include "model01.h" @@ -69,8 +69,8 @@ static int i2c_set_keyscan_interval(int hand, int delay) { void matrix_init(void) { /* Ensure scanner power is on - else right hand will not work */ - DDRC |= _BV(7); - PORTC |= _BV(7); + gpio_set_pin_output(C7); + gpio_write_pin_high(C7); i2c_init(); i2c_set_keyscan_interval(LEFT, 2); diff --git a/keyboards/keyboardio/model01/model01.c b/keyboards/keyboardio/model01/model01.c index 3644f04516..33198423de 100644 --- a/keyboards/keyboardio/model01/model01.c +++ b/keyboards/keyboardio/model01/model01.c @@ -13,10 +13,10 @@ * 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 "quantum.h" + +#include "model01.h" #include "i2c_master.h" #include <string.h> -#include "model01.h" void matrix_init_kb(void) { /* the bootloader can leave LEDs on, so */ diff --git a/keyboards/keyboardio/model01/rules.mk b/keyboards/keyboardio/model01/rules.mk index 29e1f4fea8..952c9f6a4e 100644 --- a/keyboards/keyboardio/model01/rules.mk +++ b/keyboards/keyboardio/model01/rules.mk @@ -1,17 +1,4 @@ -# 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 = no # Enable N-Key Rollover - CUSTOM_MATRIX = yes I2C_DRIVER_REQUIRED = yes SRC += leds.c \ matrix.c - -# You can set RGB_MATRIX_ENABLE = no in your rules.mk to disable this and save the Flash -RGB_MATRIX_ENABLE = yes # Enable RGB matrix effects. |
