12 files changed, 257 insertions, 0 deletions

diff --git a/keyboards/mechllama/g35/config.h b/keyboards/mechllama/g35/config.h
new file mode 100644
index 000000000..61400fe9c
--- /dev/null
+++ b/keyboards/mechllama/g35/config.h
@@ -0,0 +1,39 @@
+/*
+Copyright 2019 Kaylyn Bogle
+
+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"
+
+#define VENDOR_ID       0xCEEB
+#define PRODUCT_ID      0x0035
+#define MANUFACTURER    kaylynb
+#define PRODUCT         MechLlama G35
+#define DESCRIPTION     35 key macropad
+
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 7
+
+#define DIODE_DIRECTION COL2ROW
+
+#define QMK_ESC_OUTPUT D6
+#define QMK_ESC_INPUT F5
+#define QMK_SPEAKER D2
+
+#define RGB_DI_PIN F7
+
+#define FORCE_NKRO
diff --git a/keyboards/mechllama/g35/g35.c b/keyboards/mechllama/g35/g35.c
new file mode 100644
index 000000000..e3925674f
--- /dev/null
+++ b/keyboards/mechllama/g35/g35.c
@@ -0,0 +1,16 @@
+/* Copyright 2019 Kaylyn Bogle
+ *
+ * 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 "g35.h"
diff --git a/keyboards/mechllama/g35/g35.h b/keyboards/mechllama/g35/g35.h
new file mode 100644
index 000000000..227527245
--- /dev/null
+++ b/keyboards/mechllama/g35/g35.h
@@ -0,0 +1,33 @@
+/* Copyright 2019 Kaylyn Bogle
+ *
+ * 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"
+
+#define LAYOUT( \
+    K00, K01, K02, K03, K04, K05, K06, \
+    K10, K11, K12, K13, K14, K15, K16, \
+    K20, K21, K22, K23, K24, K25, K26, \
+    K30, K31, K32, K33, K34, K35, K36, \
+    K40, K41, K42, K43, K44, K45, K46  \
+) \
+{ \
+    { K00, K01, K02, K03, K04, K05, K06, }, \
+    { K10, K11, K12, K13, K14, K15, K16, }, \
+    { K20, K21, K22, K23, K24, K25, K26, }, \
+    { K30, K31, K32, K33, K34, K35, K36, }, \
+    { K40, K41, K42, K43, K44, K45, K46  } \
+}
diff --git a/keyboards/mechllama/g35/info.json b/keyboards/mechllama/g35/info.json
new file mode 100644
index 000000000..f37ca63b0
--- /dev/null
+++ b/keyboards/mechllama/g35/info.json
@@ -0,0 +1,14 @@
+{
+    "keyboard_name": "G35",
+    "url": "https://github.com/kaylynb/MechLlama-G35",
+    "maintainer": "kaylynb",
+    "width": 7,
+    "height": 5.75,
+    "key_count": 35,
+    "layouts": {
+        "LAYOUT": {
+            "layout": [{"label":"F1", "x":0, "y":0.5}, {"label":"Esc", "x":1, "y":0.5}, {"label":"1", "x":2, "y":0}, {"label":"2", "x":3, "y":0.15}, {"label":"3", "x":4, "y":0}, {"label":"4", "x":5, "y":0}, {"label":"5", "x":6, "y":0}, {"label":"F2", "x":0, "y":1.5}, {"label":"Tab", "x":1, "y":1.5}, {"label":"Q", "x":2, "y":1}, {"label":"W", "x":3, "y":1.15}, {"label":"E", "x":4, "y":1}, {"label":"R", "x":5, "y":1}, {"label":"T", "x":6, "y":1}, {"label":"F3", "x":0, "y":2.5}, {"label":"Shift", "x":1, "y":2.5}, {"label":"A", "x":2, "y":2}, {"label":"S", "x":3, "y":2.15}, {"label":"D", "x":4, "y":2}, {"label":"F", "x":5, "y":2}, {"label":"G", "x":6, "y":2}, {"label":"F4", "x":0, "y":3.5}, {"label":"Ctrl", "x":1, "y":3.5}, {"label":"Z", "x":2, "y":3}, {"label":"X", "x":3, "y":3.15}, {"label":"C", "x":4, "y":3}, {"label":"V", "x":5, "y":3}, {"label":"B", "x":6, "y":3}, {"label":"F5", "x":0, "y":4.5}, {"label":"Super", "x":1, "y":4.5}, {"label":"Alt", "x":2, "y":4, "h":1.5}, {"label":"Bksp", "x":3, "y":4.25, "h":1.25}, {"label":"Enter", "x":4, "y":4, "h":1.5}, {"label":"Space", "x":5, "y":4, "h":1.75}, {"label":"Fn", "x":6, "y":4, "h":1.75}]
+        }
+    }
+}
+rt
diff --git a/keyboards/mechllama/g35/keymaps/default/keymap.c b/keyboards/mechllama/g35/keymaps/default/keymap.c
new file mode 100644
index 000000000..4b7bf7651
--- /dev/null
+++ b/keyboards/mechllama/g35/keymaps/default/keymap.c
@@ -0,0 +1,72 @@
+/* Copyright 2019 Kaylyn Bogle
+ *
+ * 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
+
+enum layers {
+    _BASE = 0,
+    _ADJUST,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_BASE] = LAYOUT(
+    //┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐
+        KC_F1,   KC_ESC,   KC_1,    KC_2,    KC_3,    KC_4,    KC_5,
+    //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+        KC_F2,   KC_TAB,   KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,
+    //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+        KC_F3,  KC_LSFT,   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,
+    //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+        KC_F4,  KC_LCTL,   KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,
+    //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+    //
+    MO(_ADJUST),KC_LGUI, KC_LALT, KC_BSPC,  KC_ENT,  KC_SPC, KC_MINUS
+    //└────────┴────────┴────────┴────────┴────────┴────────┴────────┘
+    ),
+    [_ADJUST] = LAYOUT(
+    //┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐
+       RGB_TOG,TO(_BASE),XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  RESET,
+    //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+       RGB_M_K, XXXXXXX, RGB_RMOD,RGB_HUI, RGB_MOD, XXXXXXX, XXXXXXX,
+    //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+       XXXXXXX, XXXXXXX, RGB_SAD, RGB_HUD, RGB_SAI, XXXXXXX, XXXXXXX,
+    //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼
+       XXXXXXX, XXXXXXX, RGB_VAD, XXXXXXX, RGB_VAI, XXXXXXX, XXXXXXX,
+    //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼
+    //
+       _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
+    //└────────┴────────┴────────┴────────┴────────┴────────┴────────┘
+    ),
+};
+
+#if defined(OLED_DRIVER_ENABLE)
+const char* get_layer_name(uint8_t layer) {
+    switch (layer) {
+        case _BASE:
+            return PSTR("Default");
+            break;
+        case _ADJUST:
+            return PSTR("Adjust");
+            break;
+        default:
+            return PSTR("Unknown");
+            break;
+    }
+}
+
+void oled_task_user(void) {
+    oled_write_ln_P(get_layer_name(biton32(layer_state)), false);
+}
+#endif
diff --git a/keyboards/mechllama/g35/keymaps/default/readme.md b/keyboards/mechllama/g35/keymaps/default/readme.md
new file mode 100644
index 000000000..200a42f19
--- /dev/null
+++ b/keyboards/mechllama/g35/keymaps/default/readme.md
@@ -0,0 +1,4 @@
+![G35 Layout Image](https://i.imgur.com/fDlRAN9.png)
+# Default G35 Layout
+
+This is the default layout for the G35.
diff --git a/keyboards/mechllama/g35/readme.md b/keyboards/mechllama/g35/readme.md
new file mode 100644
index 000000000..e0d895b4e
--- /dev/null
+++ b/keyboards/mechllama/g35/readme.md
@@ -0,0 +1,15 @@
+# MechLlama G35
+
+![Photo](https://i.imgur.com/EvIA4t0.jpg)  
+
+A 35 key left-handed columnar layout macropad.
+
+Keyboard Maintainer: [Kaylyn Bogle](https://github.com/kaylynb/)  
+Hardware Supported: G35 v1 & v2  
+Hardware Availability: [KiCad and Gerbers](https://github.com/kaylynb/MechLlama-G35)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make mechllama/g35/v2:default
+
+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/mechllama/g35/rules.mk b/keyboards/mechllama/g35/rules.mk
new file mode 100644
index 000000000..1e1487513
--- /dev/null
+++ b/keyboards/mechllama/g35/rules.mk
@@ -0,0 +1,14 @@
+MCU = atmega32u4
+F_CPU = 16000000
+ARCH = AVR8
+F_USB = $(F_CPU)
+
+OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
+
+BOOTLOADER = atmel-dfu
+
+NKRO_ENABLE = yes
+OLED_DRIVER_ENABLE = yes
+RGBLIGHT_ENABLE = yes
+
+DEFAULT_FOLDER = mechllama/g35/v2
diff --git a/keyboards/mechllama/g35/v1/config.h b/keyboards/mechllama/g35/v1/config.h
new file mode 100644
index 000000000..9e7be98ea
--- /dev/null
+++ b/keyboards/mechllama/g35/v1/config.h
@@ -0,0 +1,25 @@
+/*
+Copyright 2019 Kaylyn Bogle
+
+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
+
+#define DEVICE_VER      0x0001
+
+#define MATRIX_ROW_PINS { F5, F6, F4, F1, D4 }
+#define MATRIX_COL_PINS { D6, D7, B4, B5, B6, F0, D5 }
+
+#define RGBLED_NUM 41
diff --git a/keyboards/mechllama/g35/v1/rules.mk b/keyboards/mechllama/g35/v1/rules.mk
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/keyboards/mechllama/g35/v1/rules.mk
diff --git a/keyboards/mechllama/g35/v2/config.h b/keyboards/mechllama/g35/v2/config.h
new file mode 100644
index 000000000..09d5f607d
--- /dev/null
+++ b/keyboards/mechllama/g35/v2/config.h
@@ -0,0 +1,25 @@
+/*
+Copyright 2019 Kaylyn Bogle
+
+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
+
+#define DEVICE_VER      0x0002
+
+#define MATRIX_ROW_PINS { F5, F4, F1, F0, D4 }
+#define MATRIX_COL_PINS { D6, D7, B4, B5, B6, F6, D5 }
+
+#define RGBLED_NUM 6
diff --git a/keyboards/mechllama/g35/v2/rules.mk b/keyboards/mechllama/g35/v2/rules.mk
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/keyboards/mechllama/g35/v2/rules.mk