[Keyboard] add bajjak keyboard (#12377)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: peepeetee <43021794+peepeetee@users.noreply.github.com>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>

9 files changed, 1233 insertions, 0 deletions

diff --git a/keyboards/bajjak/bajjak.c b/keyboards/bajjak/bajjak.c
new file mode 100644
index 0000000000..74e2b2aa8c
--- /dev/null
+++ b/keyboards/bajjak/bajjak.c
@@ -0,0 +1,227 @@
+/*
+Copyright 2012 Jun Wako <wakojun@gmail.com>
+Copyright 2013 Oleg Kostyuk <cub.uanic@gmail.com>
+Copyright 2015 ZSA Technology Labs Inc (@zsa)
+Copyright 2020 Christopher Courtney <drashna@live.com> (@drashna)
+Copyright 2021 Gary Kong <kongkm88@gmail.com> (@garykong)
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+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 "bajjak.h"
+
+extern inline void bajjak_board_led_on(void);
+extern inline void bajjak_right_led_1_on(void);
+extern inline void bajjak_right_led_2_on(void);
+extern inline void bajjak_right_led_3_on(void);
+extern inline void bajjak_right_led_on(uint8_t led);
+
+extern inline void bajjak_board_led_off(void);
+extern inline void bajjak_right_led_1_off(void);
+extern inline void bajjak_right_led_2_off(void);
+extern inline void bajjak_right_led_3_off(void);
+extern inline void bajjak_right_led_off(uint8_t led);
+
+extern inline void bajjak_led_all_on(void);
+extern inline void bajjak_led_all_off(void);
+
+extern inline void bajjak_right_led_1_set(uint8_t n);
+extern inline void bajjak_right_led_2_set(uint8_t n);
+extern inline void bajjak_right_led_3_set(uint8_t n);
+extern inline void bajjak_right_led_set(uint8_t led, uint8_t n);
+
+extern inline void bajjak_led_all_set(uint8_t n);
+
+keyboard_config_t keyboard_config;
+
+bool i2c_initialized = 0;
+i2c_status_t mcp23018_status = 0x20;
+
+void matrix_init_kb(void) {
+   // keyboard LEDs (see "PWM on ports OC1(A|B|C)" in "teensy-2-0.md")
+    TCCR1A = 0b10101001;  // set and configure fast PWM
+    TCCR1B = 0b00001001;  // set and configure fast PWM
+
+    // (tied to Vcc for hardware convenience)
+    DDRB  &= ~(1<<4);  // set B(4) as input
+    PORTB &= ~(1<<4);  // set B(4) internal pull-up disabled
+
+    // unused pins - D4, D5, E6
+    // set as input with internal pull-up enabled
+    DDRD  &= ~(1<<5 | 1<<4);
+    DDRE  &= ~(1<<6);
+    PORTD |=  (1<<5 | 1<<4);
+    PORTE |=  (1<<6);
+
+    keyboard_config.raw = eeconfig_read_kb();
+    bajjak_led_all_set((uint8_t)keyboard_config.led_level * 255 / 4 );
+    bajjak_blink_all_leds();
+
+    matrix_init_user();
+}
+
+void bajjak_blink_all_leds(void)
+{
+    bajjak_led_all_off();
+    bajjak_led_all_set(LED_BRIGHTNESS_DEFAULT);
+    bajjak_right_led_1_on();
+    wait_ms(50);
+    bajjak_right_led_2_on();
+    wait_ms(50);
+    bajjak_right_led_3_on();
+    wait_ms(50);
+#ifdef LEFT_LEDS
+    bajjak_left_led_1_on();
+    wait_ms(50);
+    if (!mcp23018_status) {
+      mcp23018_status = bajjak_left_leds_update();
+    }
+    bajjak_left_led_2_on();
+    wait_ms(50);
+    if (!mcp23018_status) {
+      mcp23018_status = bajjak_left_leds_update();
+    }
+#endif
+    bajjak_right_led_1_off();
+    wait_ms(50);
+    bajjak_right_led_2_off();
+    wait_ms(50);
+    bajjak_right_led_3_off();
+#ifdef LEFT_LEDS
+    wait_ms(50);
+    bajjak_left_led_1_off();
+    if (!mcp23018_status) {
+      mcp23018_status = bajjak_left_leds_update();
+    }
+    wait_ms(50);
+    bajjak_left_led_2_off();
+    if (!mcp23018_status) {
+      mcp23018_status = bajjak_left_leds_update();
+    }
+#endif
+
+    //bajjak_led_all_on();
+    //wait_ms(333);
+    bajjak_led_all_off();
+}
+
+uint8_t init_mcp23018(void) {
+    mcp23018_status = 0x20;
+
+    // I2C subsystem
+
+    // uint8_t sreg_prev;
+    // sreg_prev=SREG;
+    // cli();
+
+    if (i2c_initialized == 0) {
+        i2c_init();  // on pins D(1,0)
+        i2c_initialized = true;
+        wait_ms(1000);
+    }
+    // i2c_init(); // on pins D(1,0)
+    // wait_ms(1000);
+
+    // set pin direction
+    // - unused  : input  : 1
+    // - input   : input  : 1
+    // - driving : output : 0
+    mcp23018_status = i2c_start(I2C_ADDR_WRITE, BAJJAK_EZ_I2C_TIMEOUT);    if (mcp23018_status) goto out;
+    mcp23018_status = i2c_write(IODIRA, BAJJAK_EZ_I2C_TIMEOUT);            if (mcp23018_status) goto out;
+    mcp23018_status = i2c_write(0b00000000, BAJJAK_EZ_I2C_TIMEOUT);        if (mcp23018_status) goto out;
+    mcp23018_status = i2c_write(0b00111111, BAJJAK_EZ_I2C_TIMEOUT);        if (mcp23018_status) goto out;
+    i2c_stop();
+
+    // set pull-up
+    // - unused  : on  : 1
+    // - input   : on  : 1
+    // - driving : off : 0
+    mcp23018_status = i2c_start(I2C_ADDR_WRITE, BAJJAK_EZ_I2C_TIMEOUT);    if (mcp23018_status) goto out;
+    mcp23018_status = i2c_write(GPPUA, BAJJAK_EZ_I2C_TIMEOUT);             if (mcp23018_status) goto out;
+    mcp23018_status = i2c_write(0b00000000, BAJJAK_EZ_I2C_TIMEOUT);        if (mcp23018_status) goto out;
+    mcp23018_status = i2c_write(0b01111111, BAJJAK_EZ_I2C_TIMEOUT);        if (mcp23018_status) goto out;
+
+out:
+    i2c_stop();
+
+#ifdef LEFT_LEDS
+    if (!mcp23018_status) mcp23018_status = bajjak_left_leds_update();
+#endif // LEFT_LEDS
+
+    // SREG=sreg_prev;
+
+    return mcp23018_status;
+}
+
+#ifdef LEFT_LEDS
+uint8_t bajjak_left_leds_update(void) {
+    if (mcp23018_status) { // if there was an error
+        return mcp23018_status;
+    }
+#define LEFT_LED_1_SHIFT        7       // in MCP23018 port A
+#define LEFT_LED_2_SHIFT        7       // in MCP23018 port B
+
+    // set logical value (doesn't matter on inputs)
+    // - unused  : hi-Z : 1
+    // - input   : hi-Z : 1
+    // - driving : hi-Z : 1
+    mcp23018_status = i2c_start(I2C_ADDR_WRITE, BAJJAK_EZ_I2C_TIMEOUT);
+    if (mcp23018_status) goto out;
+    mcp23018_status = i2c_write(OLATA, BAJJAK_EZ_I2C_TIMEOUT);
+    if (mcp23018_status) goto out;
+    mcp23018_status = i2c_write(0b11111111
+                                & ~(bajjak_left_led_1<<LEFT_LED_1_SHIFT),
+                                BAJJAK_EZ_I2C_TIMEOUT);
+    if (mcp23018_status) goto out;
+    mcp23018_status = i2c_write(0b11111111
+                                & ~(bajjak_left_led_2<<LEFT_LED_2_SHIFT),
+                                BAJJAK_EZ_I2C_TIMEOUT);
+    if (mcp23018_status) goto out;
+
+ out:
+    i2c_stop();
+    return mcp23018_status;
+}
+#endif
+
+
+#ifdef SWAP_HANDS_ENABLE
+__attribute__ ((weak))
+// swap-hands action needs a matrix to define the swap
+const keypos_t hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
+    /* Left hand, matrix positions */
+    {{0, 13}, {1, 13}, {2, 13}, {3, 13}, {4, 13}, {5, 13}, {6, 13}},
+    {{0, 12}, {1, 12}, {2, 12}, {3, 12}, {4, 12}, {5, 12}, {6, 12}},
+    {{0, 11}, {1, 11}, {2, 11}, {3, 11}, {4, 11}, {5, 11}, {6, 11}},
+    {{0, 10}, {1, 10}, {2, 10}, {3, 10}, {4, 10}, {5, 10}, {6, 10}},
+    {{0, 9}, {1, 9}, {2, 9}, {3, 9}, {4, 9}, {5, 9}, {6, 9}},
+    {{0, 8}, {1, 8}, {2, 8}, {3, 8}, {4, 8}, {5, 8}, {6, 8}},
+    {{0, 7}, {1, 7}, {2, 7}, {3, 7}, {4, 7}, {5, 7}, {6, 7}},
+    /* Right hand, matrix positions */
+    {{0, 6}, {1, 6}, {2, 6}, {3, 6}, {4, 6}, {5, 6}, {6, 6}},
+    {{0, 5}, {1, 5}, {2, 5}, {3, 5}, {4, 5}, {5, 5}, {6, 5}},
+    {{0, 4}, {1, 4}, {2, 4}, {3, 4}, {4, 4}, {5, 4}, {6, 4}},
+    {{0, 3}, {1, 3}, {2, 3}, {3, 3}, {4, 3}, {5, 3}, {6, 3}},
+    {{0, 2}, {1, 2}, {2, 2}, {3, 2}, {4, 2}, {5, 2}, {6, 2}},
+    {{0, 1}, {1, 1}, {2, 1}, {3, 1}, {4, 1}, {5, 1}, {6, 1}},
+    {{0, 0}, {1, 0}, {2, 0}, {3, 0}, {4, 0}, {5, 0}, {6, 0}},
+};
+#endif
+
+void eeconfig_init_kb(void) {  // EEPROM is getting reset!
+    keyboard_config.raw = 0;
+    keyboard_config.led_level = 4;
+    eeconfig_update_kb(keyboard_config.raw);
+    eeconfig_init_user();
+}
diff --git a/keyboards/bajjak/bajjak.h b/keyboards/bajjak/bajjak.h
new file mode 100644
index 0000000000..126df7932c
--- /dev/null
+++ b/keyboards/bajjak/bajjak.h
@@ -0,0 +1,165 @@
+/*
+Copyright 2012 Jun Wako <wakojun@gmail.com>
+Copyright 2013 Oleg Kostyuk <cub.uanic@gmail.com>
+Copyright 2015 ZSA Technology Labs Inc (@zsa)
+Copyright 2020 Christopher Courtney <drashna@live.com> (@drashna)
+Copyright 2021 Gary Kong <kongkm88@gmail.com> (@garykong)
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+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/>.
+*/
+
+#pragma once
+
+#include "quantum.h"
+#include <stdint.h>
+#include <stdbool.h>
+#include "i2c_master.h"
+
+// I2C aliases and register addresses (see "mcp23018.md")
+#define I2C_ADDR        0b0100000
+#define I2C_ADDR_WRITE  ( (I2C_ADDR<<1) | I2C_WRITE )
+#define I2C_ADDR_READ   ( (I2C_ADDR<<1) | I2C_READ  )
+#define IODIRA          0x00            // i/o direction register
+#define IODIRB          0x01
+#define GPPUA           0x0C            // GPIO pull-up resistor register
+#define GPPUB           0x0D
+#define GPIOA           0x12            // general purpose i/o port register (write modifies OLAT)
+#define GPIOB           0x13
+#define OLATA           0x14            // output latch register
+#define OLATB           0x15
+
+extern i2c_status_t mcp23018_status;
+#define BAJJAK_EZ_I2C_TIMEOUT 100
+
+void init_bajjak(void);
+void bajjak_blink_all_leds(void);
+uint8_t init_mcp23018(void);
+uint8_t bajjak_left_leds_update(void);
+
+#ifndef LED_BRIGHTNESS_LO
+#define LED_BRIGHTNESS_LO       15
+#endif
+#ifndef LED_BRIGHTNESS_HI
+#define LED_BRIGHTNESS_HI       255
+#endif
+
+
+inline void bajjak_board_led_on(void)      { setPinOutput(D6); writePinHigh(D6); }
+inline void bajjak_right_led_1_on(void)    { setPinOutput(B5); writePinHigh(B5); }
+inline void bajjak_right_led_2_on(void)    { setPinOutput(B6); writePinHigh(B6); }
+inline void bajjak_right_led_3_on(void)    { setPinOutput(B7); writePinHigh(B7); }
+inline void bajjak_right_led_on(uint8_t led) { setPinOutput(led+4); writePinHigh(led+4); }
+
+inline void bajjak_board_led_off(void)     { setPinInput(D6); writePinLow(D6); }
+inline void bajjak_right_led_1_off(void)   { setPinInput(B5); writePinLow(B5); }
+inline void bajjak_right_led_2_off(void)   { setPinInput(B6); writePinLow(B6); }
+inline void bajjak_right_led_3_off(void)   { setPinInput(B7); writePinLow(B7); }
+inline void bajjak_right_led_off(uint8_t led) { setPinInput(led+4); writePinLow(led+4); }
+
+#ifdef LEFT_LEDS
+bool bajjak_left_led_1;
+bool bajjak_left_led_2;
+bool bajjak_left_led_3;
+
+inline void bajjak_left_led_1_on(void)    { bajjak_left_led_1 = 1; }
+inline void bajjak_left_led_2_on(void)    { bajjak_left_led_2 = 1; }
+
+inline void bajjak_left_led_1_off(void)    { bajjak_left_led_1 = 0; }
+inline void bajjak_left_led_2_off(void)    { bajjak_left_led_2 = 0; }
+#endif // LEFT_LEDS
+
+inline void bajjak_led_all_on(void) {
+    bajjak_board_led_on();
+    bajjak_right_led_1_on();
+    bajjak_right_led_2_on();
+    bajjak_right_led_3_on();
+#ifdef LEFT_LEDS
+    bajjak_left_led_1_on();
+    bajjak_left_led_2_on();
+#endif // LEFT_LEDS
+}
+
+inline void bajjak_led_all_off(void)
+{
+    bajjak_board_led_off();
+    bajjak_right_led_1_off();
+    bajjak_right_led_2_off();
+    bajjak_right_led_3_off();
+#ifdef LEFT_LEDS
+    bajjak_left_led_1_off();
+    bajjak_left_led_2_off();
+#endif // LEFT_LEDS
+}
+
+inline void bajjak_right_led_1_set(uint8_t n)    { OCR1A = n; }
+inline void bajjak_right_led_2_set(uint8_t n)    { OCR1B = n; }
+inline void bajjak_right_led_3_set(uint8_t n)    { OCR1C = n; }
+inline void bajjak_right_led_set(uint8_t led, uint8_t n)  {
+    (led == 1) ? (OCR1A = n) :
+    (led == 2) ? (OCR1B = n) :
+                 (OCR1C = n);
+}
+
+inline void bajjak_led_all_set(uint8_t n) {
+    bajjak_right_led_1_set(n);
+    bajjak_right_led_2_set(n);
+    bajjak_right_led_3_set(n);
+}
+
+enum BAJJAK_ez_keycodes {
+    LED_LEVEL = SAFE_RANGE,
+    TOGGLE_LAYER_COLOR,
+    EZ_SAFE_RANGE,
+};
+
+#ifndef WEBUSB_ENABLE
+#    define WEBUSB_PAIR KC_NO
+#endif
+
+typedef union {
+  uint32_t raw;
+  struct {
+    uint8_t    led_level :3;
+    bool       disable_layer_led   :1;
+  };
+} keyboard_config_t;
+
+extern keyboard_config_t keyboard_config;
+
+#define LAYOUT_6x7( \
+                        L00, L01, L02, L03, L04, L05, L06,  R00, R01, R02, R03, R04, R05, R06, \
+                        L10, L11, L12, L13, L14, L15, L16,  R10, R11, R12, R13, R14, R15, R16, \
+                        L20, L21, L22, L23, L24, L25, L26,  R20, R21, R22, R23, R24, R25, R26, \
+                        L30, L31, L32, L33, L34, L35, L36,  R30, R31, R32, R33, R34, R35, R36, \
+                        L40, L41, L42, L43, L44, L45,            R41, R42, R43, R44, R45, R46, \
+                        L50, L51, L52, L53, L54,                      R52, R53, R54, R55, R56, \
+                                                 L65, L66,  R60, R61,                          \
+                                                      L64,  R62,                               \
+                                            L63, L62, L61,  R65, R64, R63                      \
+                        ) { \
+        { L00, L10, L20, L30, L40,   L50,   KC_NO }, \
+        { L01, L11, L21, L31, L41,   L51,   L61   }, \
+        { L02, L12, L22, L32, L42,   L52,   L62   }, \
+        { L03, L13, L23, L33, L43,   L53,   L63   }, \
+        { L04, L14, L24, L34, L44,   L54,   L64   }, \
+        { L05, L15, L25, L35, L45,   KC_NO, L65   }, \
+        { L06, L16, L26, L36, KC_NO, KC_NO, L66   }, \
+        { R00, R10, R20, R30, KC_NO, KC_NO, R60   }, \
+        { R01, R11, R21, R31, R41,   KC_NO, R61   }, \
+        { R02, R12, R22, R32, R42,   R52,   R62   }, \
+        { R03, R13, R23, R33, R43,   R53,   R63   }, \
+        { R04, R14, R24, R34, R44,   R54,   R64   }, \
+        { R05, R15, R25, R35, R45,   R55,   R65   },\
+        { R06, R16, R26, R36, R46,   R56,   KC_NO } \
+    }
diff --git a/keyboards/bajjak/config.h b/keyboards/bajjak/config.h
new file mode 100644
index 0000000000..344bc9040e
--- /dev/null
+++ b/keyboards/bajjak/config.h
@@ -0,0 +1,117 @@
+/*
+Copyright 2012 Jun Wako <wakojun@gmail.com>
+Copyright 2013 Oleg Kostyuk <cub.uanic@gmail.com>
+Copyright 2015 ZSA Technology Labs Inc (@zsa)
+Copyright 2020 Christopher Courtney <drashna@live.com> (@drashna)
+Copyright 2021 Gary Kong <kongkm88@gmail.com> (@garykong)
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+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/>.
+*/
+
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x1209
+#define PRODUCT_ID      0x0002
+#define DEVICE_VER      0x0001
+#define PRODUCT         BAJJAK
+
+/* key matrix size */
+#define MATRIX_ROWS 14
+#define MATRIX_ROWS_PER_SIDE (MATRIX_ROWS / 2)
+#define MATRIX_COLS 7
+
+#define COL_EXPANDED { true, true, true, true, true, true, true, false, false, false, false, false, false, false }
+#define MATRIX_ONBOARD_ROW_PINS { 0, 0, 0, 0, 0, 0, 0, B0,  B1,  B2,  B3,  D2,  D3,  C6 }
+#define MATRIX_ONBOARD_COL_PINS { F0,  F1,  F4,  F5,  F6,  F7, D7 }
+#define DIODE_DIRECTION COL2ROW
+#define EXPANDER_COL_REGISTER GPIOB
+#define EXPANDER_ROW_REGISTER GPIOA
+#define MATRIX_EXPANDER_COL_PINS { 6, 5, 4, 3, 2, 1, 0 }
+#define MATRIX_EXPANDER_ROW_PINS { 0, 1, 2, 3, 4, 5, 6 }
+
+
+#define MOUSEKEY_INTERVAL       20
+#define MOUSEKEY_DELAY          0
+#define MOUSEKEY_TIME_TO_MAX    60
+#define MOUSEKEY_MAX_SPEED      7
+#define MOUSEKEY_WHEEL_DELAY 0
+
+#define DEBOUNCE 30
+
+#define TAPPING_TOGGLE  1
+
+/* define if matrix has ghost */
+//#define MATRIX_HAS_GHOST
+
+#define TAPPING_TERM    200
+#define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.)
+
+/* 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)) || \
+    get_mods() == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)) \
+)
+
+/* number of backlight levels */
+#define BACKLIGHT_LEVELS 3
+
+#ifndef LED_BRIGHTNESS_LO
+#define LED_BRIGHTNESS_LO       15
+#endif
+#ifndef LED_BRIGHTNESS_HI
+#define LED_BRIGHTNESS_HI       255
+#endif
+#define LED_BRIGHTNESS_DEFAULT (LED_BRIGHTNESS_HI)
+
+/* fix space cadet rollover issue */
+#define DISABLE_SPACE_CADET_ROLLOVER
+
+/*
+ * The debounce filtering reports a key/switch change directly,
+ * without any extra delay. After that the debounce logic will filter
+ * all further changes, until the key/switch reports the same state for
+ * the given count of scans.
+ * So a perfect switch will get a short debounce period and
+ * a bad key will get a much longer debounce period.
+ * The result is an adaptive debouncing period for each switch.
+ *
+ * If you don't define it here, the matrix code will default to
+ * 5, which is now closer to 10ms, but still plenty according to
+ * manufacturer specs.
+ */
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+// #define NO_DEBUG
+
+/* disable print */
+// #define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+//#define DEBUG_MATRIX_SCAN_RATE
diff --git a/keyboards/bajjak/info.json b/keyboards/bajjak/info.json
new file mode 100644
index 0000000000..072ca33f5b
--- /dev/null
+++ b/keyboards/bajjak/info.json
@@ -0,0 +1,31 @@
+{
+    "keyboard_name": "bajjak",
+    "maintainer": "garykong",
+    "layouts": {
+        "LAYOUT_6x7": {
+            "layout": [
+            {"x":0, "y":0.375, "w":1.5},    {"x":1.5, "y":0.375},   {"x":2.5, "y":0.125},   {"x":3.5, "y":0},       {"x":4.5, "y":0.125},   {"x":5.5, "y":0.25},    {"x":6.5, "y":0.25},
+            {"x":9.5, "y":0.25},            {"x":10.5, "y":0.25}, {"x":11.5, "y":0.125},    {"x":12.5, "y":0},      {"x":13.5, "y":0.125},  {"x":14.5, "y":0.375},  {"x":15.5, "y":0.375, "w":1.5},
+
+            {"x":0, "y":1.375, "w":1.5},    {"x":1.5, "y":1.375},   {"x":2.5, "y":1.125},   {"x":3.5, "y":1},       {"x":4.5, "y":1.125},   {"x":5.5, "y":1.25},    {"x":6.5, "y":1.25},
+            {"x":9.5, "y":1.25},            {"x":10.5, "y":1.25},   {"x":11.5, "y":1.125},  {"x":12.5, "y":1},      {"x":13.5, "y":1.125},  {"x":14.5, "y":1.375},  {"x":15.5, "y":1.375, "w":1.5},
+
+            {"x":0, "y":2.375, "w":1.5},    {"x":1.5, "y":2.375},   {"x":2.5, "y":2.125},   {"x":3.5, "y":2},       {"x":4.5, "y":2.125},   {"x":5.5, "y":2.25},    {"x":6.5, "y":2.25},
+            {"x":9.5, "y":2.25},            {"x":10.5, "y":2.25},   {"x":11.5, "y":2.125},  {"x":12.5, "y":2},      {"x":13.5, "y":2.125},  {"x":14.5, "y":2.375},  {"x":15.5, "y":2.375, "w":1.5},
+
+            {"x":0, "y":3.375, "w":1.5},    {"x":1.5, "y":3.375},   {"x":2.5, "y":3.125},   {"x":3.5, "y":3},       {"x":4.5, "y":3.125},   {"x":5.5, "y":3.25},    {"x":6.5, "y":3.25},
+            {"x":9.5, "y":3.25},            {"x":10.5, "y":3.25},   {"x":11.5, "y":3.125},  {"x":12.5, "y":3},      {"x":13.5, "y":3.125},  {"x":14.5, "y":3.375},  {"x":15.5, "y":3.375, "w":1.5},
+
+            {"x":0, "y":4.375, "w":1.5},    {"x":1.5, "y":4.375},   {"x":2.5, "y":4.125},   {"x":3.5, "y":4},       {"x":4.5, "y":4.125},   {"x":5.5, "y":4.25},
+            {"x":10.5, "y":4.25},           {"x":11.5, "y":4.125},  {"x":12.5, "y":4},      {"x":13.5, "y":4.125},  {"x":14.5, "y":4.375},  {"x":15.5, "y":4.375, "w":1.5},
+
+            {"x":0, "y":5.375, "w":1.5},    {"x":1.5, "y":5.375},   {"x":2.5, "y":5.125},   {"x":3.5, "y":5},       {"x":4.5, "y":5.125},
+            {"x":11.5, "y":5.125},          {"x":12.5, "y":5},      {"x":13.5, "y":5.125},  {"x":14.5, "y":5.375},  {"x":15.5, "y":5.375, "w":1.5},
+
+                                            {"x":6, "y":6}, {"x":7, "y":6},      {"x":9, "y":6}, {"x":10, "y":6},
+                                                            {"x":7, "y":7},      {"x":9, "y":7},
+              {"x":5, "y":7, "h":2}, {"x":6, "y":7, "h":2}, {"x":7, "y":8},      {"x":9, "y":8}, {"x":10, "y":7, "h":2}, {"x":11, "y":7, "h":2}
+            ]
+        }
+    }
+}
diff --git a/keyboards/bajjak/keymaps/5x6/keymap.c b/keyboards/bajjak/keymaps/5x6/keymap.c
new file mode 100644
index 0000000000..e97d0360b7
--- /dev/null
+++ b/keyboards/bajjak/keymaps/5x6/keymap.c
@@ -0,0 +1,187 @@
+/* Copyright 2021 Gary Kong
+  *
+  * This program is free software: you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published by
+  * the Free Software Foundation, either version 2 of the License, or
+  * (at your option) any later version.
+  *
+  * This program is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  * 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 QMK_KEYBOARD_H
+#include "version.h"
+
+enum layers {
+    BASE, // default layer
+    SYMB, // symbols
+    MDIA,  // media keys
+};
+
+enum custom_keycodes {
+  VRSN = SAFE_RANGE,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+/* Keymap 0: Basic layer
+ *
+ *  -------------------------------------------             -------------------------------------------
+ * |   =    |   1  |   2  |   3  |   4  |   5  |           |   6  |   7  |   8  |   9  |   0  |   -    |
+ * |--------+------+------+------+------+------|           |------+------+------+------+------+--------|
+ * | Tab    |   Q  |   W  |   E  |   R  |   T  |           |   Y  |   U  |   I  |   O  |   P  |   \    |
+ * |--------+------+------+------+------+------|           |------+------+------+------+------+--------|
+ * | Caps   |   A  |   S  |   D  |   F  |   G  |           |   H  |   J  |   K  |   L  |   ;  |    '   |
+ * |--------+------+------+------+------+------|           |------+------+------+------+------+--------|
+ * | LShift |   Z  |   X  |   C  |   V  |   B  |           |   N  |   M  |   ,  |   .  |   /  | RShift |
+ *  -------------------------------------------             -------------------------------------------
+ *   | CTRL |GUI\` |ALT \ | Left |Right |                         |  Up  | Down |   [  |   ]  |  L1  |
+ *    ----------------------------------                           ----------------------------------
+ *                                         -------------         ---------------
+ *                                        |Ctrl/ESC|LALT|       | RGUI |Ctrl/Alt|
+ *                                  ------|------|------|       |------+--------+------
+ *                                 |      |      | Home |       | PgUp |        |      |
+ *                                 |Back  | Del  |------|       |------| Enter  |Space |
+ *                                 |Space |      | End  |       | PgDn |        |      |
+ *                                  --------------------         ----------------------
+ *
+ */
+[BASE] = LAYOUT_6x7(
+//  Left hand                                                                                             Right hand
+    XXXXXXX,    XXXXXXX,        XXXXXXX,            XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,        XXXXXXX,  XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,
+    KC_EQL,     KC_1,           KC_2,               KC_3,       KC_4,       KC_5,       XXXXXXX,        XXXXXXX,  KC_6,       KC_7,       KC_8,       KC_9,       KC_0,       KC_MINS,
+    KC_TAB,     KC_Q,           KC_W,               KC_E,       KC_R,       KC_T,       XXXXXXX,        XXXXXXX,  KC_Y,       KC_U,       KC_I,       KC_O,       KC_P,       KC_BSLS,
+    KC_CAPS,    KC_A,           KC_S,               KC_D,       KC_F,       KC_G,       XXXXXXX,        XXXXXXX,  KC_H,       KC_J,       KC_K,       KC_L,       KC_SCLN,    KC_QUOT,
+    KC_LSFT,    KC_Z,           KC_X,               KC_C,       KC_V,       KC_B,                                 KC_N,       KC_M,       KC_COMM,    KC_DOT,     KC_SLSH,    KC_RSFT,
+    KC_LCTRL,   GUI_T(KC_GRV),  ALT_T(KC_BSLS),     KC_LEFT,    KC_RGHT,                                                      KC_UP,      KC_DOWN,    KC_LBRC,    KC_RBRC,    DF(SYMB),
+                                                                         CTL_T(KC_ESC), KC_LALT,        KC_RGUI, CTL_T(KC_HAEN),
+                                                                                        KC_HOME,        KC_PGUP,
+                                                                        KC_BSPC, KC_DEL, KC_END,        KC_PGDN, KC_ENT, KC_SPC
+),
+/* Keymap 1: Sybol layer
+ *
+ *  -------------------------------------------             -------------------------------------------
+ * |   F1   |  F2  |  F3  |  F4  |  F5  |  F6  |           |  F7  |  F8  |  F9  |  F10 |  F11 |   F12  |
+ * |--------+------+------+------+------+------|           |------+------+------+------+------+--------|
+ * | Tab    |   !  |   @  |   {  |   }  |      |           |NUMLCK|   7  |   8  |   9  |   -  |    /   |
+ * |--------+------+------+------+------+------|           |------+------+------+------+------+--------|
+ * |        |   #  |   $  |   (  |   )  |      |           |      |   4  |   5  |   6  |   +  |    *   |
+ * |--------+------+------+------+------+------|           |------+------+------+------+------+--------|
+ * | LShift |   %  |   ^  |   [  |   ]  |      |           |  L2  |   1  |   2  |   3  |   =  | RShift |
+ *  -------------------------------------------             -------------------------------------------
+ *   | CTRL |GUI\~`|ALT \ | Left | Right|                         |  Up  | Down |    . |   0  |      |
+ *    ----------------------------------                           ----------------------------------
+ *                                  -------------         ---------------
+ *                                 |Ctrl/ESC|LALT|       | RGUI |Ctrl/Alt|
+ *                           ------|------|------|       |------+--------+------
+ *                          |      |      | Home |       | PgUp |        |      |
+ *                          |BackSp| Del  |------|       |------|  Enter |Space |
+ *                          |      |      | End  |       | PgDn |        |      |
+ *                           --------------------         ----------------------
+ *
+ */
+[SYMB] = LAYOUT_6x7(
+//  Left hand                                                                                       Right hand
+    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,        XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,
+    KC_F1,      KC_F2,      KC_F3,      KC_F4,      KC_F5,      KC_F6,      XXXXXXX,        XXXXXXX,    KC_F7,      KC_F8,      KC_F9,      KC_F10,     KC_F11,     KC_F12,
+    _______,    KC_EXLM,    KC_AT,      KC_LCBR,    KC_RCBR,    XXXXXXX,    XXXXXXX,        XXXXXXX,    KC_NLCK,    KC_P7 ,     KC_P8 ,     KC_P9,      KC_MINS,    KC_PSLS,
+    XXXXXXX,    KC_HASH,    KC_DLR,     KC_LPRN,    KC_RPRN,    XXXXXXX,    XXXXXXX,        XXXXXXX,    XXXXXXX,    KC_P4 ,     KC_P5 ,     KC_P6,      KC_PLUS,    KC_PAST,
+    _______,    KC_PERC,    KC_CIRC,    KC_LBRC,    KC_RBRC,    XXXXXXX,                                DF(MDIA),   KC_P1 ,     KC_P2 ,     KC_P3,      KC_PEQL,    _______,
+    _______,    _______,    _______,    _______,    _______,                                                        _______,    _______,    KC_PDOT,    KC_P0,      DF(BASE),
+                                                                   _______, _______,        _______, _______,
+                                                                            _______,        _______,
+                                                          _______, _______, _______,        _______, _______, _______
+),
+/* Keymap 2: Media and mouse keys
+ *
+ *  -------------------------------------------             -------------------------------------------
+ * | SLEEP  |BR_Up |BR_Dn |      |      |Eject |           | Prev | Play | Next | Mute |Vol_Up| Vol_Dn |
+ * |--------+------+------+------+------+------|           |------+------+------+------+------+--------|
+ * |        |      | Lclk | MsUp | Rclk |MsWhUp|           |      |      |      |      |      |        |
+ * |--------+------+------+------+------+------|           |------+------+------+------+------+--------|
+ * | RESET  |      |MsLeft|MsDown|MsRght|MsWhDw|           |      |      |      |      |      |        |
+ * |--------+------+------+------+------+------|           |------|------+------+------+------+--------|
+ * | LShift |      |MsWhL |      |MsWhR |      |           |      |      |      |      |      | RShift |
+ *  -------------------------------------------             -------------------------------------------
+ *   | CTRL |GUI\~`|ALT \ | Left | Right|                         |  Up  | Down |      |      |  L0  |
+*    ----------------------------------                           -----------------------------------
+ *                                  -------------         ---------------
+ *                                 |Ctrl/ESC|LALT|       | RGUI |Ctrl/Alt|
+ *                           ------|------|------|       |------+--------+------
+ *                          |      |      | Home |       | PgUp |        |      |
+ *                          |BackSp| Del  |------|       |------|  Enter |Space |
+ *                          |      |      | End  |       | PgDn |        |      |
+ *                           --------------------         ----------------------
+ *
+ */
+[MDIA] = LAYOUT_6x7(
+//  Left hand                                                                                          Right hand
+    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,    XXXXXXX,      XXXXXXX,      XXXXXXX,       XXXXXXX,     XXXXXXX,    XXXXXXX,    XXXXXXX,  XXXXXXX,    XXXXXXX,    XXXXXXX,
+    KC_SLEP,    KC_BRID,    KC_BRIU,    XXXXXXX,    XXXXXXX,      XXXXXXX,      KC_EJCT,       XXXXXXX,     KC_MPRV,    KC_MPLY,    KC_MNXT,  KC_MUTE,    KC_VOLD,    KC_VOLU,
+    XXXXXXX,    XXXXXXX,    KC_BTN1,    KC_MS_U,    KC_BTN2,      KC_WH_U,      XXXXXXX,       XXXXXXX,     XXXXXXX,    XXXXXXX,    XXXXXXX,  XXXXXXX,    XXXXXXX,    XXXXXXX,
+    RESET,      XXXXXXX,    KC_MS_L,    KC_MS_D,    KC_MS_R,      KC_WH_D,      XXXXXXX,       XXXXXXX,     XXXXXXX,    XXXXXXX,    XXXXXXX,  XXXXXXX,    XXXXXXX,    XXXXXXX,
+    _______,    XXXXXXX,    KC_WH_L,    XXXXXXX,    KC_WH_R,      XXXXXXX,                                  DF(SYMB),   XXXXXXX,    XXXXXXX,  XXXXXXX,    XXXXXXX,    XXXXXXX,
+    _______,    _______,    _______,    _______,    _______,                                                            _______,    _______,  XXXXXXX,    XXXXXXX,    DF(BASE),
+                                                                       _______, _______,        _______, _______,
+                                                                                _______,        _______,
+                                                              _______, _______, _______,        _______, _______, _______
+),
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    if (record->event.pressed) {
+        switch (keycode) {
+            case VRSN:
+                SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
+                return false;
+        }
+    }
+    return true;
+}
+
+// Runs whenever there is a layer state change.
+layer_state_t layer_state_set_user(layer_state_t state) {
+    bajjak_right_led_1_off();
+    bajjak_right_led_2_off();
+    bajjak_right_led_3_off();
+
+    uint8_t layer = get_highest_layer(state);
+    switch (layer) {
+        case 0:
+            break;
+        case 1:
+            bajjak_right_led_1_on();
+            break;
+        case 2:
+            bajjak_right_led_2_on();
+            break;
+        case 3:
+            bajjak_right_led_3_on();
+            break;
+        case 4:
+            bajjak_right_led_1_on();
+            bajjak_right_led_2_on();
+            break;
+        case 5:
+            bajjak_right_led_1_on();
+            bajjak_right_led_3_on();
+            break;
+        case 6:
+            bajjak_right_led_2_on();
+            bajjak_right_led_3_on();
+            break;
+        case 7:
+            bajjak_right_led_1_on();
+            bajjak_right_led_2_on();
+            bajjak_right_led_3_on();
+            break;
+        default:
+            break;
+    }
+
+    return state;
+};
diff --git a/keyboards/bajjak/keymaps/default/keymap.c b/keyboards/bajjak/keymaps/default/keymap.c
new file mode 100644
index 0000000000..4c79261307
--- /dev/null
+++ b/keyboards/bajjak/keymaps/default/keymap.c
@@ -0,0 +1,193 @@
+/* Copyright 2021 Gary Kong
+  *
+  * This program is free software: you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published by
+  * the Free Software Foundation, either version 2 of the License, or
+  * (at your option) any later version.
+  *
+  * This program is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  * 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 QMK_KEYBOARD_H
+#include "version.h"
+
+enum layers {
+    BASE, // default layer
+    SYMB, // symbols
+    MDIA,  // media keys
+};
+
+enum custom_keycodes {
+  VRSN = SAFE_RANGE,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+/* Keymap 0: Basic layer
+ *
+ * ,--------------------------------------------------.           ,--------------------------------------------------.
+ * |  ESC   |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |           |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |  Eject |
+ * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
+ * |   =    |   1  |   2  |   3  |   4  |   5  |      |           |      |   6  |   7  |   8  |   9  |   0  |   -    |
+ * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
+ * | Tab    |   Q  |   W  |   E  |   R  |   T  |      |           |      |   Y  |   U  |   I  |   O  |   P  |   \    |
+ * |--------+------+------+------+------+------+------|           |------+------+------+------+------+------+--------|
+ * | Caps   |   A  |   S  |   D  |   F  |   G  |  L2  |           |  L1  |   H  |   J  |   K  |   L  |   ;  |    '   |
+ * |--------+------+------+------+------+------+------'           `------+------+------+------+------+------+--------|
+ * | LShift |   Z  |   X  |   C  |   V  |   B  |                         |   N  |   M  |   ,  |   .  |   /  | RShift |
+ * `--------+------+------+------+------+------'                          `-----+------+------+------+------+-------'
+ *   | CTRL |iGUI\'"|ALT \ | Left | Right|                                       |  Up  | Down |   [  |   ]  | ~L1  |
+ *   `----------------------------------'                                       `----------------------------------'
+ *                                        ,-------------.       ,-------------.
+ *                                        |Ctrl/ESC|LALT|       | RGUI |Ctrl/Alt|
+ *                                 ,------|------|------|       |------+--------+------.
+ *                                 |      |      | Home |       | PgUp |        |      |
+ *                                 |BackSp| Del  |------|       |------|  Enter |Space |
+ *                                 |      |      | End  |       | PgDn |        |      |
+ *                                 `--------------------'       `----------------------'
+ *
+ */
+[BASE] = LAYOUT_6x7(
+//  Left hand                                                                                             Right hand
+    KC_ESC,     KC_F1,             KC_F2,             KC_F3,      KC_F4,      KC_F5,      KC_F6,          KC_F7,      KC_F8,      KC_F9,      KC_F10,     KC_F11,     KC_F12,     KC_EJCT,
+    KC_EQL,     KC_1,              KC_2,              KC_3,       KC_4,       KC_5,       _______,        _______,    KC_6,       KC_7,       KC_8,       KC_9,       KC_0,       KC_MINS,
+    KC_TAB,     KC_Q,              KC_W,              KC_E,       KC_R,       KC_T,       _______,        _______,    KC_Y,       KC_U,       KC_I,       KC_O,       KC_P,       KC_BSLS,
+    KC_CAPS,    KC_A,              KC_S,              KC_D,       KC_F,       KC_G,       TG(MDIA),       TG(SYMB),   KC_H,       KC_J,       KC_K,       KC_L,       KC_SCLN,    KC_QUOT,
+    KC_LSFT,    KC_Z,              KC_X,              KC_C,       KC_V,       KC_B,                                   KC_N,       KC_M,       KC_COMM,    KC_DOT,     KC_SLSH,    KC_RSFT,
+    KC_LCTRL,   GUI_T(KC_GRV),     ALT_T(KC_BSLS),    KC_LEFT,    KC_RGHT,                                                        KC_UP,      KC_DOWN,    KC_LBRC,    KC_RBRC,    TT(SYMB),
+                                                                             CTL_T(KC_ESC), KC_LALT,      KC_RGUI, CTL_T(KC_RALT),
+                                                                                            KC_HOME,      KC_PGUP,
+                                                                            KC_BSPC, KC_DEL, KC_END,      KC_PGDN, KC_ENT, KC_SPC
+),
+/* Keymap 1: Sybol layer
+ *
+ * ,--------------------------------------------------.           ,--------------------------------------------------.
+ * |  ESC   |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |           |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |  Eject |
+ * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
+ * |        |      |      |      |      |      |      |           |      |      |NUMLCK|   =  |   \  |   *  |PSCREEN |
+ * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
+ * | Tab    |   !  |   @  |   {  |   }  |   |  |      |           |      |      |   7  |   8  |   9  |   -  |  SLCK  |
+ * |--------+------+------+------+------+------+------|           |------+------+------+------+------+------+--------|
+ * | Caps   |   #  |   $  |   (  |   )  |   `  |      |           |      |      |   4  |   5  |   6  |   +  | PAUSE  |
+ * |--------+------+------+------+------+------+------'           `------+------+------+------+------+------+--------|
+ * | LShift |   %  |   ^  |   [  |   ]  |   ~  |                         |      |   1  |   2  |   3  |Enter | RShift |
+ * `--------+------+------+------+------+------'                          `-----+------+------+------+------+-------'
+ *   | CTRL |GUI\'"|ALT \ | Left | Right|                                       |  Up  | Down |    . |   0  |       |
+ *   `----------------------------------'                                       `----------------------------------'
+ *                                        ,-------------.       ,-------------.
+ *                                        |Ctrl/ESC|LALT|       | RGUI |Ctrl/Alt|
+ *                                 ,------|------|------|       |------+--------+------.
+ *                                 |      |      | Home |       | PgUp |        |      |
+ *                                 |BackSp| Del  |------|       |------|  Enter |Space |
+ *                                 |      |      | End  |       | PgDn |        |      |
+ *                                 `--------------------'       `----------------------'
+ *
+ */
+[SYMB] = LAYOUT_6x7(
+//  Left hand                                                                                       Right hand
+    KC_ESC,     KC_F1,      KC_F2,              KC_F3,      KC_F4,      KC_F5,      KC_F6,          KC_F7,      KC_F8,      KC_F9,      KC_F10,     KC_F11,     KC_F12,     KC_EJCT,
+    _______,    _______,    _______,            _______,    _______,    _______,    _______,        _______,    _______,    KC_NLCK,    KC_PEQL,    KC_PSLS,    KC_PAST,    KC_PSCR,
+    KC_TAB,     KC_EXLM,    KC_AT,              KC_LCBR,    KC_RCBR,    KC_PIPE,    _______,        _______,    _______,    KC_P7 ,     KC_P8 ,     KC_P9,      KC_MINS,    KC_SLCK,
+    KC_CAPS,    KC_HASH,    KC_DLR,             KC_LPRN,    KC_RPRN,    KC_GRV,     _______,        _______,    _______,    KC_P4 ,     KC_P5 ,     KC_P6,      KC_PLUS,    KC_PAUS,
+    KC_LSFT,    KC_PERC,    KC_CIRC,            KC_LBRC,    KC_RBRC,    KC_TILD,                                _______,    KC_P1 ,     KC_P2 ,     KC_P3,      KC_PENT,    KC_RSFT,
+    KC_LCTRL,   KC_LGUI,    ALT_T(KC_INSERT),   KC_LEFT,    KC_RGHT,                                                        KC_UP,      KC_DOWN,    KC_PDOT,    KC_P0,      _______,
+                                                                     CTL_T(KC_ESC), KC_LALT,       KC_RGUI, CTL_T(KC_RALT),
+                                                                                    KC_HOME,       KC_PGUP,
+                                                                    KC_BSPC, KC_DEL, KC_END,       KC_PGDN, KC_ENT, KC_SPC
+),
+/* Keymap 2: Media and mouse keys
+ *
+ * ,--------------------------------------------------.           ,--------------------------------------------------.
+ * | SLEEP  |BR_Up |BR_Dn |      |      |      |      |           | Prev | Play | Next | Mute |Vol_Up|Vol_Dn|  Eject |
+ * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
+ * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
+ * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
+ * | Tab    |      | Lclk | MsUp | Rclk |MsWhUp|      |           |      |      |      |      |      |      |        |
+ * |--------+------+------+------+------+------+------|           |------+------+------+------+------+------+--------|
+ * | Caps   |      |MsLeft|MsDown|MsRght|MsWhDw|     |           |      |      |      |      |      |      |        |
+ * |--------+------+------+------+------+------+------'           `------+------+------+------+------+------+--------|
+ * | LShift |      |MsWhL |      |MsWhR |      |                         |      |      |      |      |      |        |
+ * `--------+------+------+------+------+------'                          `-----+------+------+------+------+-------'
+ *   | CTRL |GUI\'"|ALT \ | Left | Right|                                       |  Up  | Down |      |      | RESET |
+ *   `----------------------------------'                                       `----------------------------------'
+ *                                        ,-------------.       ,-------------.
+ *                                        |Ctrl/ESC|LALT|       | RGUI |Ctrl/Alt|
+ *                                 ,------|------|------|       |------+--------+------.
+ *                                 |      |      | Home |       | PgUp |        |      |
+ *                                 |BackSp| Del  |------|       |------|  Enter |Space |
+ *                                 |      |      | End  |       | PgDn |        |      |
+ *                                 `--------------------'       `----------------------'
+ *
+ */
+[MDIA] = LAYOUT_6x7(
+//  Left hand                                                                                          Right hand
+    KC_SLEP,    KC_BRID,    KC_BRIU,            _______,    _______,      _______,      _______,       KC_MPRV,     KC_MPLY,      KC_MNXT,      KC_MUTE,    KC_VOLD,    KC_VOLU,    KC_EJCT,
+    _______,    _______,    _______,            _______,    _______,      _______,      _______,       _______,     _______,      _______,      _______,    _______,    _______,    _______,
+    KC_TAB,     _______,    KC_BTN1,            KC_MS_U,    KC_BTN2,      KC_WH_U,      _______,       _______,     _______,      _______,      _______,    _______,    _______,    _______,
+    KC_CAPS,    _______,    KC_MS_L,            KC_MS_D,    KC_MS_R,      KC_WH_D,      _______,       _______,     _______,      _______,      _______,    _______,    _______,    _______,
+    KC_LSFT,    _______,    KC_WH_L,            _______,    KC_WH_R,      _______,                                  _______,      _______,      _______,    _______,    _______,    _______,
+    KC_LCTRL,   KC_LGUI,    ALT_T(KC_INSERT),   KC_LEFT,    KC_RGHT,                                                              KC_UP,        KC_DOWN,    _______,    _______,    RESET,
+                                                                 CTL_T(KC_ESC), KC_LALT,       KC_RGUI, CTL_T(KC_RALT),
+                                                                                KC_HOME,       KC_PGUP,
+                                                                KC_BSPC, KC_DEL, KC_END,       KC_PGDN, KC_ENT, KC_SPC
+),
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    if (record->event.pressed) {
+        switch (keycode) {
+            case VRSN:
+                SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
+                return false;
+        }
+    }
+    return true;
+}
+
+// Runs whenever there is a layer state change.
+layer_state_t layer_state_set_user(layer_state_t state) {
+    bajjak_right_led_1_off();
+    bajjak_right_led_2_off();
+    bajjak_right_led_3_off();
+
+    uint8_t layer = get_highest_layer(state);
+    switch (layer) {
+        case 0:
+            break;
+        case 1:
+            bajjak_right_led_1_on();
+            break;
+        case 2:
+            bajjak_right_led_2_on();
+            break;
+        case 3:
+            bajjak_right_led_3_on();
+            break;
+        case 4:
+            bajjak_right_led_1_on();
+            bajjak_right_led_2_on();
+            break;
+        case 5:
+            bajjak_right_led_1_on();
+            bajjak_right_led_3_on();
+            break;
+        case 6:
+            bajjak_right_led_2_on();
+            bajjak_right_led_3_on();
+            break;
+        case 7:
+            bajjak_right_led_1_on();
+            bajjak_right_led_2_on();
+            bajjak_right_led_3_on();
+            break;
+        default:
+            break;
+    }
+
+    return state;
+};
diff --git a/keyboards/bajjak/matrix.c b/keyboards/bajjak/matrix.c
new file mode 100644
index 0000000000..20fc3c8f23
--- /dev/null
+++ b/keyboards/bajjak/matrix.c
@@ -0,0 +1,253 @@
+/*
+Copyright 2012 Jun Wako <wakojun@gmail.com>
+Copyright 2013 Oleg Kostyuk <cub.uanic@gmail.com>
+Copyright 2015 ZSA Technology Labs Inc (@zsa)
+Copyright 2020 Christopher Courtney <drashna@live.com> (@drashna)
+Copyright 2021 Gary Kong <kongkm88@gmail.com> (@garykong)
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+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/>.
+*/
+
+
+/*
+ * scan matrix
+ */
+#include <stdint.h>
+#include <stdbool.h>
+#include <avr/io.h>
+#include "wait.h"
+#include "action_layer.h"
+#include "print.h"
+#include "debug.h"
+#include "util.h"
+#include "matrix.h"
+#include "debounce.h"
+#include "bajjak.h"
+
+
+/*
+ * This constant define not debouncing time in msecs, assuming eager_pr.
+ *
+ * On BAJJAK matrix scan rate is relatively low, because of slow I2C.
+ * Now it's only 317 scans/second, or about 3.15 msec/scan.
+ * According to Cherry specs, debouncing time is 5 msec.
+ *
+ * However, some switches seem to have higher debouncing requirements, or
+ * something else might be wrong. (Also, the scan speed has improved since
+ * that comment was written.)
+ */
+
+/* matrix state(1:on, 0:off) */
+extern matrix_row_t matrix[MATRIX_ROWS];      // debounced values
+extern matrix_row_t raw_matrix[MATRIX_ROWS];  // raw values
+
+static matrix_row_t read_cols(uint8_t row);
+static void         init_cols(void);
+static void         unselect_rows(void);
+static void         select_row(uint8_t row);
+
+static uint8_t mcp23018_reset_loop;
+
+void matrix_init_custom(void) {
+    // initialize row and col
+
+    mcp23018_status = init_mcp23018();
+
+    unselect_rows();
+    init_cols();
+}
+
+// Reads and stores a row, returning
+// whether a change occurred.
+static inline bool store_raw_matrix_row(uint8_t index) {
+    matrix_row_t temp = read_cols(index);
+    if (raw_matrix[index] != temp) {
+        raw_matrix[index] = temp;
+        return true;
+    }
+    return false;
+}
+
+bool matrix_scan_custom(matrix_row_t current_matrix[]) {
+    if (mcp23018_status) {  // if there was an error
+        if (++mcp23018_reset_loop == 0) {
+            print("trying to reset mcp23018\n");
+            mcp23018_status = init_mcp23018();
+            if (mcp23018_status) {
+                print("left side not responding\n");
+            } else {
+                print("left side attached\n");
+                bajjak_blink_all_leds();
+            }
+        }
+    }
+
+#ifdef LEFT_LEDS
+    mcp23018_status = bajjak_left_leds_update();
+#endif  // LEFT_LEDS
+    bool changed = false;
+    for (uint8_t i = 0; i < MATRIX_ROWS_PER_SIDE; i++) {
+        // select rows from left and right hands
+        uint8_t left_index  = i;
+        uint8_t right_index = i + MATRIX_ROWS_PER_SIDE;
+        select_row(left_index);
+        select_row(right_index);
+
+        changed |= store_raw_matrix_row(left_index);
+        changed |= store_raw_matrix_row(right_index);
+
+        unselect_rows();
+    }
+
+    return changed;
+}
+
+/* Column pin configuration
+ *
+ * Teensy
+ * col: 0   1   2   3   4   5
+ * pin: F0  F1  F4  F5  F6  F7
+ *
+ * MCP23018
+ * col: 0   1   2   3   4   5
+ * pin: B5  B4  B3  B2  B1  B0
+ */
+static void init_cols(void) {
+    // init on mcp23018
+    // not needed, already done as part of init_mcp23018()
+
+    // init on teensy
+    setPinInputHigh(F0);
+    setPinInputHigh(F1);
+    setPinInputHigh(F4);
+    setPinInputHigh(F5);
+    setPinInputHigh(F6);
+    setPinInputHigh(F7);
+    setPinInputHigh(D7);
+}
+
+static matrix_row_t read_cols(uint8_t row) {
+    if (row < 7) {
+        if (mcp23018_status) {  // if there was an error
+            return 0;
+        } else {
+            uint8_t data = 0;
+            // reading GPIOB (column port) since in mcp23018's sequential mode
+            // it is addressed directly after writing to GPIOA in select_row()
+            mcp23018_status = i2c_start(I2C_ADDR_READ, BAJJAK_EZ_I2C_TIMEOUT);    if (mcp23018_status) goto out;
+            mcp23018_status = i2c_read_nack(BAJJAK_EZ_I2C_TIMEOUT);               if (mcp23018_status < 0) goto out;
+            data            = ~((uint8_t)mcp23018_status);
+            mcp23018_status = I2C_STATUS_SUCCESS;
+        out:
+            i2c_stop();
+            return data;
+        }
+    } else {
+        /* read from teensy
+         * bitmask is 0b11110011, but we want those all
+         * in the lower six bits.
+         * we'll return 1s for the top two, but that's harmless.
+         */
+
+        return ~( (PINF & 0x03) | ((PINF & 0xF0) >> 2) | ((PIND & 0x80) >> 1) );
+    }
+}
+
+/* Row pin configuration
+ *
+ * Teensy
+ * row: 7   8   9   10  11  12  13
+ * pin: B0  B1  B2  B3  D2  D3  C6
+ *
+ * MCP23018
+ * row: 0   1   2   3   4   5   6
+ * pin: A0  A1  A2  A3  A4  A5  A6
+ */
+static void unselect_rows(void) {
+    // no need to unselect on mcp23018, because the select step sets all
+    // the other row bits high, and it's not changing to a different
+    // direction
+
+    // unselect on teensy
+    setPinInput(B0);
+    setPinInput(B1);
+    setPinInput(B2);
+    setPinInput(B3);
+    setPinInput(D2);
+    setPinInput(D3);
+    setPinInput(C6);
+}
+
+static void select_row(uint8_t row) {
+    if (row < 7) {
+        // select on mcp23018
+        if (!mcp23018_status) {
+            // set active row low  : 0
+            // set other rows hi-Z : 1
+            mcp23018_status = i2c_start(I2C_ADDR_WRITE, BAJJAK_EZ_I2C_TIMEOUT);        if (mcp23018_status) goto out;
+            mcp23018_status = i2c_write(GPIOA, BAJJAK_EZ_I2C_TIMEOUT);                 if (mcp23018_status) goto out;
+            mcp23018_status = i2c_write(0xFF & ~(1 << row), BAJJAK_EZ_I2C_TIMEOUT);    if (mcp23018_status) goto out;
+        out:
+            i2c_stop();
+        }
+    } else {
+        // select on teensy
+        // Output low(DDR:1, PORT:0) to select
+        switch (row) {
+            case 7:
+                setPinOutput(B0);
+                writePinLow(B0);
+                break;
+            case 8:
+                setPinOutput(B1);
+                writePinLow(B1);
+                break;
+            case 9:
+                setPinOutput(B2);
+                writePinLow(B2);
+                break;
+            case 10:
+                setPinOutput(B3);
+                writePinLow(B3);
+                break;
+            case 11:
+                setPinOutput(D2);
+                writePinLow(D2);
+                break;
+            case 12:
+                setPinOutput(D3);
+                writePinLow(D3);
+                break;
+            case 13:
+                setPinOutput(C6);
+                writePinLow(C6);
+                break;
+        }
+    }
+}
+
+// DO NOT REMOVE
+// Needed for proper wake/sleep
+void matrix_power_up(void) {
+    mcp23018_status = init_mcp23018();
+
+    unselect_rows();
+    init_cols();
+
+    // initialize matrix state: all keys off
+    for (uint8_t i=0; i < MATRIX_ROWS; i++) {
+        matrix[i] = 0;
+    }
+
+}
diff --git a/keyboards/bajjak/readme.md b/keyboards/bajjak/readme.md
new file mode 100644
index 0000000000..7e86d0243d
--- /dev/null
+++ b/keyboards/bajjak/readme.md
@@ -0,0 +1,23 @@
+# bajjak
+
+This keyboard is a 6x7 array keyboard, similar in design to the Ergodox EZ.
+
+* Keyboard Maintainer: [Gary Kong](https://github.com/garykong)
+* Hardware Supported: bajjak keyboard (ATmega32U4)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make bajjak:default
+
+Flashing example for this keyboard:
+
+    make bajjak:default:flash
+
+## Bootloader
+
+Enter the bootloader in 2 ways:
+
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/bajjak/rules.mk b/keyboards/bajjak/rules.mk
new file mode 100644
index 0000000000..6bbe7e3b28
--- /dev/null
+++ b/keyboards/bajjak/rules.mk
@@ -0,0 +1,37 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = halfkay
+
+# If you have Left LEDs (see
+# https://geekhack.org/index.php?topic=22780.msg873819#msg873819 for
+# 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
+AUDIO_SUPPORTED = no
+
+DEBOUNCE_TYPE = sym_eager_pr
+
+# project specific files
+SRC += matrix.c 
+QUANTUM_LIB_SRC += i2c_master.c