diff options
Diffstat (limited to 'keyboards/sixkeyboard')
-rw-r--r-- | keyboards/sixkeyboard/keyboard.json (renamed from keyboards/sixkeyboard/info.json) | 6 | ||||
-rw-r--r-- | keyboards/sixkeyboard/matrix.c | 13 | ||||
-rw-r--r-- | keyboards/sixkeyboard/rules.mk | 11 | ||||
-rw-r--r-- | keyboards/sixkeyboard/sixkeyboard.c | 29 |
4 files changed, 26 insertions, 33 deletions
diff --git a/keyboards/sixkeyboard/info.json b/keyboards/sixkeyboard/keyboard.json index 247b255a36..aff5c985f7 100644 --- a/keyboards/sixkeyboard/info.json +++ b/keyboards/sixkeyboard/keyboard.json @@ -9,6 +9,12 @@ "device_version": "0.0.1", "force_nkro": true }, + "features": { + "bootmagic": false, + "extrakey": false, + "mousekey": false, + "nkro": false + }, "processor": "atmega16u2", "bootloader": "atmel-dfu", "community_layouts": ["ortho_2x3"], diff --git a/keyboards/sixkeyboard/matrix.c b/keyboards/sixkeyboard/matrix.c index ddbd41ac55..24cb647297 100644 --- a/keyboards/sixkeyboard/matrix.c +++ b/keyboards/sixkeyboard/matrix.c @@ -71,13 +71,12 @@ uint8_t matrix_cols(void) void matrix_init(void) { - - DDRC &= ~(1<<7); - PORTC |= (1<<7); - DDRB &= ~(1<<7 | 1<<5); - PORTB |= (1<<7 | 1<<5); - DDRD &= ~(1<<6 | 1<<4 | 1<<1); - PORTD |= (1<<6 | 1<<4 | 1<<1); + gpio_set_pin_input_high(C7); + gpio_set_pin_input_high(B5); + gpio_set_pin_input_high(B7); + gpio_set_pin_input_high(D1); + gpio_set_pin_input_high(D4); + gpio_set_pin_input_high(D6); for (uint8_t i=0; i < MATRIX_ROWS; i++) { matrix[i] = 0; diff --git a/keyboards/sixkeyboard/rules.mk b/keyboards/sixkeyboard/rules.mk index d1d7bc4881..09c02c88b0 100644 --- a/keyboards/sixkeyboard/rules.mk +++ b/keyboards/sixkeyboard/rules.mk @@ -1,14 +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 = 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 -AUDIO_ENABLE = no CUSTOM_MATRIX = yes SRC += matrix.c diff --git a/keyboards/sixkeyboard/sixkeyboard.c b/keyboards/sixkeyboard/sixkeyboard.c index 7667ee7f44..5a5c818d13 100644 --- a/keyboards/sixkeyboard/sixkeyboard.c +++ b/keyboards/sixkeyboard/sixkeyboard.c @@ -4,27 +4,26 @@ void matrix_init_kb(void) { // put your keyboard start-up code here // runs once when the firmware starts up - DDRC |= (1<<4); - PORTC &= ~(1<<4); + gpio_set_pin_output(C4); + gpio_write_pin_low(C4); + gpio_set_pin_output(C6); + gpio_write_pin_low(C6); - DDRC |= (1<<6); - PORTC &= ~(1<<6); + gpio_set_pin_output(B6); + gpio_write_pin_low(B6); - DDRB |= (1<<6); - PORTB &= ~(1<<6); + gpio_set_pin_output(B4); + gpio_write_pin_low(B4); - DDRB |= (1<<4); - PORTB &= ~(1<<4); + gpio_set_pin_output(D5); + gpio_write_pin_low(D5); - DDRD |= (1<<5); - PORTD &= ~(1<<5); + gpio_set_pin_output(D2); + gpio_write_pin_low(D2); - DDRD |= (1<<2); - PORTD &= ~(1<<2); - - DDRD |= (1<<3); - PORTD &= ~(1<<3); + gpio_set_pin_output(D3); + gpio_write_pin_low(D3); matrix_init_user(); };
\ No newline at end of file |