diff options
Diffstat (limited to 'keyboards/dc01')
-rw-r--r-- | keyboards/dc01/arrow/keyboard.json (renamed from keyboards/dc01/arrow/info.json) | 9 | ||||
-rw-r--r-- | keyboards/dc01/arrow/rules.mk | 14 | ||||
-rw-r--r-- | keyboards/dc01/left/keyboard.json (renamed from keyboards/dc01/left/info.json) | 6 | ||||
-rw-r--r-- | keyboards/dc01/left/matrix.c | 2 | ||||
-rw-r--r-- | keyboards/dc01/left/rules.mk | 14 | ||||
-rw-r--r-- | keyboards/dc01/numpad/keyboard.json (renamed from keyboards/dc01/numpad/info.json) | 9 | ||||
-rw-r--r-- | keyboards/dc01/numpad/rules.mk | 14 | ||||
-rw-r--r-- | keyboards/dc01/right/keyboard.json (renamed from keyboards/dc01/right/info.json) | 9 | ||||
-rw-r--r-- | keyboards/dc01/right/matrix.c | 3 | ||||
-rw-r--r-- | keyboards/dc01/right/rules.mk | 14 |
10 files changed, 35 insertions, 59 deletions
diff --git a/keyboards/dc01/arrow/info.json b/keyboards/dc01/arrow/keyboard.json index 992b623d45..85ca25c23e 100644 --- a/keyboards/dc01/arrow/info.json +++ b/keyboards/dc01/arrow/keyboard.json @@ -6,10 +6,17 @@ "usb": { "vid": "0x8968", "pid": "0x1012", - "device_version": "0.0.1" + "device_version": "0.0.1", + "no_startup_check": true }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/dc01/arrow/rules.mk b/keyboards/dc01/arrow/rules.mk index b2c66861ea..d4c0eb2672 100644 --- a/keyboards/dc01/arrow/rules.mk +++ b/keyboards/dc01/arrow/rules.mk @@ -1,15 +1,3 @@ -# 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 = 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 -NO_USB_STARTUP_CHECK = yes # Disable initialization only when usb is plugged in -CUSTOM_MATRIX = yes # Use custom matrix +CUSTOM_MATRIX = yes SRC += matrix.c \ i2c_slave.c diff --git a/keyboards/dc01/left/info.json b/keyboards/dc01/left/keyboard.json index 17fe3c64a2..e296790995 100644 --- a/keyboards/dc01/left/info.json +++ b/keyboards/dc01/left/keyboard.json @@ -10,6 +10,12 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true + }, "debounce": 0, "layouts": { "LAYOUT_ansi": { diff --git a/keyboards/dc01/left/matrix.c b/keyboards/dc01/left/matrix.c index fd21d4333b..39e5be5a1d 100644 --- a/keyboards/dc01/left/matrix.c +++ b/keyboards/dc01/left/matrix.c @@ -388,7 +388,7 @@ static void unselect_cols(void) // Complete rows from other modules over i2c i2c_status_t i2c_transaction(uint8_t address, uint32_t mask, uint8_t col_offset) { uint8_t data[MATRIX_ROWS + 1]; - i2c_status_t status = i2c_readReg(address, 0x01, data, (MATRIX_ROWS + 1), 5); + i2c_status_t status = i2c_read_register(address, 0x01, data, (MATRIX_ROWS + 1), 5); for (uint8_t i = 0; i < (MATRIX_ROWS) && status >= 0; i++) { //assemble slave matrix in main matrix matrix[i] &= mask; //mask bits to keep diff --git a/keyboards/dc01/left/rules.mk b/keyboards/dc01/left/rules.mk index 3a9422733c..2493924f46 100644 --- a/keyboards/dc01/left/rules.mk +++ b/keyboards/dc01/left/rules.mk @@ -1,15 +1,3 @@ -# 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 = 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 - -CUSTOM_MATRIX = yes # Use custom matrix +CUSTOM_MATRIX = yes SRC += matrix.c I2C_DRIVER_REQUIRED = yes diff --git a/keyboards/dc01/numpad/info.json b/keyboards/dc01/numpad/keyboard.json index eab2d0c33f..0cf73c23e3 100644 --- a/keyboards/dc01/numpad/info.json +++ b/keyboards/dc01/numpad/keyboard.json @@ -6,10 +6,17 @@ "usb": { "vid": "0x8968", "pid": "0x1013", - "device_version": "0.0.1" + "device_version": "0.0.1", + "no_startup_check": true }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true + }, "community_layouts": ["numpad_5x4", "ortho_5x4"], "layouts": { "LAYOUT_numpad_5x4": { diff --git a/keyboards/dc01/numpad/rules.mk b/keyboards/dc01/numpad/rules.mk index b2c66861ea..d4c0eb2672 100644 --- a/keyboards/dc01/numpad/rules.mk +++ b/keyboards/dc01/numpad/rules.mk @@ -1,15 +1,3 @@ -# 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 = 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 -NO_USB_STARTUP_CHECK = yes # Disable initialization only when usb is plugged in -CUSTOM_MATRIX = yes # Use custom matrix +CUSTOM_MATRIX = yes SRC += matrix.c \ i2c_slave.c diff --git a/keyboards/dc01/right/info.json b/keyboards/dc01/right/keyboard.json index 2b89117c44..6f48e05483 100644 --- a/keyboards/dc01/right/info.json +++ b/keyboards/dc01/right/keyboard.json @@ -6,10 +6,17 @@ "usb": { "vid": "0x8968", "pid": "0x1011", - "device_version": "0.0.1" + "device_version": "0.0.1", + "no_startup_check": true }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/dc01/right/matrix.c b/keyboards/dc01/right/matrix.c index 04a6d03804..f9b6738145 100644 --- a/keyboards/dc01/right/matrix.c +++ b/keyboards/dc01/right/matrix.c @@ -15,8 +15,6 @@ 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> #if defined(__AVR__) #include <avr/io.h> #include <avr/wdt.h> @@ -31,7 +29,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "timer.h" #include "i2c_slave.h" #include "lufa.h" -#include "quantum.h" #define SLAVE_I2C_ADDRESS 0x32 diff --git a/keyboards/dc01/right/rules.mk b/keyboards/dc01/right/rules.mk index b2c66861ea..d4c0eb2672 100644 --- a/keyboards/dc01/right/rules.mk +++ b/keyboards/dc01/right/rules.mk @@ -1,15 +1,3 @@ -# 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 = 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 -NO_USB_STARTUP_CHECK = yes # Disable initialization only when usb is plugged in -CUSTOM_MATRIX = yes # Use custom matrix +CUSTOM_MATRIX = yes SRC += matrix.c \ i2c_slave.c |