diff options
Diffstat (limited to 'keyboards/ferris')
17 files changed, 26 insertions, 38 deletions
diff --git a/keyboards/ferris/0_1/info.json b/keyboards/ferris/0_1/keyboard.json index 5a65369f61..a7f7c08bec 100644 --- a/keyboards/ferris/0_1/info.json +++ b/keyboards/ferris/0_1/keyboard.json @@ -4,10 +4,20 @@ "usb": { "vid": "0xC2AB", "pid": "0x0000", - "device_version": "0.0.1" + "device_version": "0.0.1", + "no_startup_check": true }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "unicode": true + }, + "build": { + "lto": true + }, "community_layouts": ["split_3x5_2"], "layout_aliases": { "LAYOUT": "LAYOUT_split_3x5_2" diff --git a/keyboards/ferris/0_1/rules.mk b/keyboards/ferris/0_1/rules.mk index f971aa9a48..c04c3c92ed 100644 --- a/keyboards/ferris/0_1/rules.mk +++ b/keyboards/ferris/0_1/rules.mk @@ -1,19 +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 = 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 -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -UNICODE_ENABLE = yes CUSTOM_MATRIX = lite -NO_USB_STARTUP_CHECK = yes -LTO_ENABLE = yes SRC += matrix.c I2C_DRIVER_REQUIRED = yes diff --git a/keyboards/ferris/0_2/base/info.json b/keyboards/ferris/0_2/base/keyboard.json index d0d22b8047..d0d22b8047 100644 --- a/keyboards/ferris/0_2/base/info.json +++ b/keyboards/ferris/0_2/base/keyboard.json diff --git a/keyboards/ferris/0_2/base/rules.mk b/keyboards/ferris/0_2/base/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/ferris/0_2/base/rules.mk +++ /dev/null diff --git a/keyboards/ferris/0_2/bling/info.json b/keyboards/ferris/0_2/bling/keyboard.json index 06a826450b..22ef500d6d 100644 --- a/keyboards/ferris/0_2/bling/info.json +++ b/keyboards/ferris/0_2/bling/keyboard.json @@ -50,5 +50,8 @@ "solid_multisplash": true }, "driver": "is31fl3731" + }, + "features": { + "rgb_matrix": true } } diff --git a/keyboards/ferris/0_2/bling/rules.mk b/keyboards/ferris/0_2/bling/rules.mk deleted file mode 100644 index aad92997d0..0000000000 --- a/keyboards/ferris/0_2/bling/rules.mk +++ /dev/null @@ -1 +0,0 @@ -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/ferris/0_2/compact/info.json b/keyboards/ferris/0_2/compact/keyboard.json index 4ca1555776..4ca1555776 100644 --- a/keyboards/ferris/0_2/compact/info.json +++ b/keyboards/ferris/0_2/compact/keyboard.json diff --git a/keyboards/ferris/0_2/compact/rules.mk b/keyboards/ferris/0_2/compact/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/ferris/0_2/compact/rules.mk +++ /dev/null diff --git a/keyboards/ferris/0_2/high/info.json b/keyboards/ferris/0_2/high/keyboard.json index adb9d07af3..adb9d07af3 100644 --- a/keyboards/ferris/0_2/high/info.json +++ b/keyboards/ferris/0_2/high/keyboard.json diff --git a/keyboards/ferris/0_2/high/rules.mk b/keyboards/ferris/0_2/high/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/ferris/0_2/high/rules.mk +++ /dev/null diff --git a/keyboards/ferris/0_2/info.json b/keyboards/ferris/0_2/info.json index c6584ecf01..d1108b51c4 100644 --- a/keyboards/ferris/0_2/info.json +++ b/keyboards/ferris/0_2/info.json @@ -2,10 +2,17 @@ "manufacturer": "Cuddly Keyboards Ltd.", "usb": { "vid": "0xC2AB", - "device_version": "0.0.2" + "device_version": "0.0.2", + "no_startup_check": true }, "processor": "STM32F072", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "unicode": true + }, "community_layouts": ["split_3x5_2"], "layout_aliases": { "LAYOUT": "LAYOUT_split_3x5_2" diff --git a/keyboards/ferris/0_2/matrix.c b/keyboards/ferris/0_2/matrix.c index cf26385f4c..41b100b659 100644 --- a/keyboards/ferris/0_2/matrix.c +++ b/keyboards/ferris/0_2/matrix.c @@ -77,7 +77,7 @@ uint8_t init_mcp23017(void) { // This means: we will write to the pins 0-4 on GPIOB (in select_rows) uint8_t buf[] = {0b11111111, 0b11110000}; print("before transmit\n"); - mcp23017_status = i2c_writeReg(I2C_ADDR, IODIRA, buf, sizeof(buf), MCP23017_I2C_TIMEOUT) + mcp23017_status = i2c_write_register(I2C_ADDR, IODIRA, buf, sizeof(buf), MCP23017_I2C_TIMEOUT); uprintf("after transmit %i\n", mcp23017_status); if (!mcp23017_status) { // set pull-up @@ -86,7 +86,7 @@ uint8_t init_mcp23017(void) { // - driving : off : 0 // This means: we will read all the bits on GPIOA // This means: we will write to the pins 0-4 on GPIOB (in select_rows) - mcp23017_status = i2c_writeReg(I2C_ADDR, GPPUA, buf, sizeof(buf), MCP23017_I2C_TIMEOUT) + mcp23017_status = i2c_write_register(I2C_ADDR, GPPUA, buf, sizeof(buf), MCP23017_I2C_TIMEOUT); uprintf("after transmit2 %i\n", mcp23017_status); } return mcp23017_status; @@ -191,7 +191,7 @@ static matrix_row_t read_cols(uint8_t row) { // The return value is a row as represented in the generic matrix code were the rightmost bits represent the lower columns and zeroes represent non-depressed keys while ones represent depressed keys. // Since the pins connected to eact columns are sequential, and counting from zero up (col 5 -> GPIOA0, col 6 -> GPIOA1 and so on), the only transformation needed is a bitwise not to swap all zeroes and ones. uint8_t data[] = {0}; - mcp23017_status = i2c_readReg(I2C_ADDR, MCP23017_GPIOA, data, sizeof(data), MCP23017_I2C_TIMEOUT); + mcp23017_status = i2c_read_register(I2C_ADDR, MCP23017_GPIOA, data, sizeof(data), MCP23017_I2C_TIMEOUT); return ~data[0]; } } @@ -237,7 +237,7 @@ static void select_row(uint8_t row) { // Select the desired row by writing a byte for the entire GPIOB bus where only the bit representing the row we want to select is a zero (write instruction) and every other bit is a one. // Note that the row - MATRIX_ROWS_PER_SIDE reflects the fact that being on the right hand, the columns are numbered from MATRIX_ROWS_PER_SIDE to MATRIX_ROWS, but the pins we want to write to are indexed from zero up on the GPIOB bus. uint8_t buf[] = {0xFF & ~(1 << (row - MATRIX_ROWS_PER_SIDE))}; - mcp23017_status = i2c_writeReg(I2C_ADDR, MCP23017_GPIOB, buf, sizeof(buf), MCP23017_I2C_TIMEOUT); + mcp23017_status = i2c_write_register(I2C_ADDR, MCP23017_GPIOB, buf, sizeof(buf), MCP23017_I2C_TIMEOUT); } } } diff --git a/keyboards/ferris/0_2/mini/info.json b/keyboards/ferris/0_2/mini/keyboard.json index 0ab5db559a..0ab5db559a 100644 --- a/keyboards/ferris/0_2/mini/info.json +++ b/keyboards/ferris/0_2/mini/keyboard.json diff --git a/keyboards/ferris/0_2/mini/rules.mk b/keyboards/ferris/0_2/mini/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/ferris/0_2/mini/rules.mk +++ /dev/null diff --git a/keyboards/ferris/0_2/rules.mk b/keyboards/ferris/0_2/rules.mk index 6f67e3dece..11b9d33a69 100644 --- a/keyboards/ferris/0_2/rules.mk +++ b/keyboards/ferris/0_2/rules.mk @@ -1,19 +1,4 @@ -# 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 = no # 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 CUSTOM_MATRIX = lite -NO_USB_STARTUP_CHECK = yes -LTO_ENABLE = no SRC += matrix.c I2C_DRIVER_REQUIRED = yes diff --git a/keyboards/ferris/sweep/info.json b/keyboards/ferris/sweep/keyboard.json index 567ef16a86..567ef16a86 100644 --- a/keyboards/ferris/sweep/info.json +++ b/keyboards/ferris/sweep/keyboard.json diff --git a/keyboards/ferris/sweep/rules.mk b/keyboards/ferris/sweep/rules.mk deleted file mode 100644 index 6e7633bfe0..0000000000 --- a/keyboards/ferris/sweep/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank |