diff options
Diffstat (limited to 'keyboards/handwired/frenchdev')
-rw-r--r-- | keyboards/handwired/frenchdev/frenchdev.c | 4 | ||||
-rw-r--r-- | keyboards/handwired/frenchdev/keyboard.json (renamed from keyboards/handwired/frenchdev/info.json) | 8 | ||||
-rw-r--r-- | keyboards/handwired/frenchdev/matrix.c | 6 | ||||
-rw-r--r-- | keyboards/handwired/frenchdev/rules.mk | 14 |
4 files changed, 14 insertions, 18 deletions
diff --git a/keyboards/handwired/frenchdev/frenchdev.c b/keyboards/handwired/frenchdev/frenchdev.c index 65f1ccce4b..818c395c8e 100644 --- a/keyboards/handwired/frenchdev/frenchdev.c +++ b/keyboards/handwired/frenchdev/frenchdev.c @@ -84,14 +84,14 @@ uint8_t init_mcp23018(void) { // - input : input : 1 // - driving : output : 0 uint8_t data[] = {0b00000000, 0b00111111}; - mcp23018_status = i2c_writeReg(I2C_ADDR, IODIRA, data, sizeof(data), I2C_TIMEOUT); + mcp23018_status = i2c_write_register(I2C_ADDR, IODIRA, data, sizeof(data), I2C_TIMEOUT); if (!mcp23018_status) { // set pull-up // - unused : on : 1 // - input : on : 1 // - driving : off : 0 - mcp23018_status = i2c_writeReg(I2C_ADDR, GPPUA, data, sizeof(data), I2C_TIMEOUT); + mcp23018_status = i2c_write_register(I2C_ADDR, GPPUA, data, sizeof(data), I2C_TIMEOUT); } // SREG=sreg_prev; diff --git a/keyboards/handwired/frenchdev/info.json b/keyboards/handwired/frenchdev/keyboard.json index 8d031b3c42..ab811888a9 100644 --- a/keyboards/handwired/frenchdev/info.json +++ b/keyboards/handwired/frenchdev/keyboard.json @@ -9,6 +9,14 @@ }, "processor": "atmega32u4", "bootloader": "halfkay", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true + }, "tapping": { "toggle": 1 }, diff --git a/keyboards/handwired/frenchdev/matrix.c b/keyboards/handwired/frenchdev/matrix.c index af7c8b5444..68ec8e0801 100644 --- a/keyboards/handwired/frenchdev/matrix.c +++ b/keyboards/handwired/frenchdev/matrix.c @@ -224,7 +224,7 @@ static matrix_row_t read_cols(uint8_t row) return 0; } else { uint8_t data = 0; - mcp23018_status = i2c_readReg(I2C_ADDR, GPIOB, &data, 1, I2C_TIMEOUT); + mcp23018_status = i2c_read_register(I2C_ADDR, GPIOB, &data, 1, I2C_TIMEOUT); return ~data; } @@ -259,7 +259,7 @@ static void unselect_rows(void) // set all rows hi-Z : 1 uint8_t data; data = 0xFF & ~(0<<8); - mcp23018_status = i2c_writeReg(I2C_ADDR, GPIOA, &data, 1, I2C_TIMEOUT); + mcp23018_status = i2c_write_register(I2C_ADDR, GPIOA, &data, 1, I2C_TIMEOUT); } @@ -283,7 +283,7 @@ static void select_row(uint8_t row) // set active row low : 0 // set other rows hi-Z : 1 uint8_t data = 0xFF & ~(1<<row) & ~(0<<8); - mcp23018_status = i2c_writeReg(I2C_ADDR, GPIOA, &data, 1, I2C_TIMEOUT); + mcp23018_status = i2c_write_register(I2C_ADDR, GPIOA, &data, 1, I2C_TIMEOUT); } } else { // select on teensy diff --git a/keyboards/handwired/frenchdev/rules.mk b/keyboards/handwired/frenchdev/rules.mk index e226d0b517..9b396b7668 100644 --- a/keyboards/handwired/frenchdev/rules.mk +++ b/keyboards/handwired/frenchdev/rules.mk @@ -1,16 +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 = yes # Commands for debug and configuration -CUSTOM_MATRIX = yes # Custom matrix file (taken and adapted from the ErgoDox EZ to handle custom number of columns) -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no +CUSTOM_MATRIX = yes # project specific files SRC = matrix.c |