diff options
Diffstat (limited to 'keyboards/bajjak')
-rw-r--r-- | keyboards/bajjak/bajjak.c | 6 | ||||
-rw-r--r-- | keyboards/bajjak/config.h | 5 | ||||
-rw-r--r-- | keyboards/bajjak/keyboard.json (renamed from keyboards/bajjak/info.json) | 15 | ||||
-rw-r--r-- | keyboards/bajjak/matrix.c | 2 | ||||
-rw-r--r-- | keyboards/bajjak/rules.mk | 15 |
5 files changed, 19 insertions, 24 deletions
diff --git a/keyboards/bajjak/bajjak.c b/keyboards/bajjak/bajjak.c index e6102e817b..6689a6ba2c 100644 --- a/keyboards/bajjak/bajjak.c +++ b/keyboards/bajjak/bajjak.c @@ -138,14 +138,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, 2, BAJJAK_EZ_I2C_TIMEOUT); + mcp23018_status = i2c_write_register(I2C_ADDR, IODIRA, data, 2, BAJJAK_EZ_I2C_TIMEOUT); if (!mcp23018_status) { // set pull-up // - unused : on : 1 // - input : on : 1 // - driving : off : 0 - mcp23018_status = i2c_writeReg(I2C_ADDR, IODIRA, data, 2, BAJJAK_EZ_I2C_TIMEOUT); + mcp23018_status = i2c_write_register(I2C_ADDR, IODIRA, data, 2, BAJJAK_EZ_I2C_TIMEOUT); } #ifdef LEFT_LEDS @@ -172,7 +172,7 @@ uint8_t bajjak_left_leds_update(void) { uint8_t data[2]; data[0] = 0b11111111 & ~(bajjak_left_led_1<<LEFT_LED_1_SHIFT); data[1] = 0b11111111 & ~(bajjak_left_led_2<<LEFT_LED_2_SHIFT); - mcp23018_status = i2c_writeReg(I2C_ADDR, OLATA, data, 2, BAJJAK_EZ_I2C_TIMEOUT); + mcp23018_status = i2c_write_register(I2C_ADDR, OLATA, data, 2, BAJJAK_EZ_I2C_TIMEOUT); return mcp23018_status; } diff --git a/keyboards/bajjak/config.h b/keyboards/bajjak/config.h index 72d296bca4..455588fb08 100644 --- a/keyboards/bajjak/config.h +++ b/keyboards/bajjak/config.h @@ -43,11 +43,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define MOUSEKEY_MAX_SPEED 7 #define MOUSEKEY_WHEEL_DELAY 0 -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - /* key combination for command */ #define IS_COMMAND() ( \ get_mods() == (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL)) || \ diff --git a/keyboards/bajjak/info.json b/keyboards/bajjak/keyboard.json index bf090bb7d6..a4ab7298ee 100644 --- a/keyboards/bajjak/info.json +++ b/keyboards/bajjak/keyboard.json @@ -8,6 +8,21 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "command": true, + "nkro": true, + "unicode": true, + "swap_hands": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "processor": "atmega32u4", "bootloader": "halfkay", "tapping": { diff --git a/keyboards/bajjak/matrix.c b/keyboards/bajjak/matrix.c index 424bc29e4e..b0d1ab531f 100644 --- a/keyboards/bajjak/matrix.c +++ b/keyboards/bajjak/matrix.c @@ -192,7 +192,7 @@ static void select_row(uint8_t row) { // set other rows hi-Z : 1 uint8_t data; data = 0xFF & ~(1 << row); - mcp23018_status = i2c_writeReg(I2C_ADDR, GPIOA, &data, 1, BAJJAK_EZ_I2C_TIMEOUT); + mcp23018_status = i2c_write_register(I2C_ADDR, GPIOA, &data, 1, BAJJAK_EZ_I2C_TIMEOUT); } } else { diff --git a/keyboards/bajjak/rules.mk b/keyboards/bajjak/rules.mk index 21db4112e0..08caba6edc 100644 --- a/keyboards/bajjak/rules.mk +++ b/keyboards/bajjak/rules.mk @@ -3,22 +3,7 @@ # details), include the following define: OPT_DEFS += -DLEFT_LEDS -# 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 = 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 - CUSTOM_MATRIX = lite # Custom matrix file for the BAJJAK -UNICODE_ENABLE = yes # Unicode -SWAP_HANDS_ENABLE = yes # Allow swapping hands of keyboard # Disable unsupported hardware BACKLIGHT_SUPPORTED = no |