Merge remote-tracking branch 'origin/master' into develop

9 files changed, 344 insertions, 0 deletions

diff --git a/keyboards/bobpad/bobpad.c b/keyboards/bobpad/bobpad.c
new file mode 100644
index 0000000000..59507d7d8c
--- /dev/null
+++ b/keyboards/bobpad/bobpad.c
@@ -0,0 +1,45 @@
+/* Copyright 2021 Ananya Kirti
+ *
+ * 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 "bobpad.h"
+
+bool led_update_kb(led_t led_state) {
+    if (!led_update_user(led_state)) { return false; }
+    
+    writePin(LED_CAPS_LOCK_PIN, led_state.caps_lock);
+    return true;
+};
+
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!encoder_update_user(index, clockwise)) { return false; }
+    
+    if(IS_LAYER_ON(1)) { // on Raise layer
+      if (clockwise) {
+          tap_code(KC_A);
+      } else {
+          tap_code(KC_B);
+      }
+    }
+    // default layer
+    else {
+      if (clockwise) {
+          tap_code(KC_C);
+      } else {
+          tap_code(KC_D);
+      }
+    }
+    return true;
+}
\ No newline at end of file
diff --git a/keyboards/bobpad/bobpad.h b/keyboards/bobpad/bobpad.h
new file mode 100644
index 0000000000..da9c0fa025
--- /dev/null
+++ b/keyboards/bobpad/bobpad.h
@@ -0,0 +1,27 @@
+/* Copyright 2021 Ananya Kirti
+ *
+ * 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_ortho_2x3( \
+    K00, K01, K02,   \
+    K10, K11, K12    \
+) { \
+    { K00,   K01,   K02   }, \
+    { K10,   K11,   K12   }, \
+}
diff --git a/keyboards/bobpad/config.h b/keyboards/bobpad/config.h
new file mode 100644
index 0000000000..c744a455e3
--- /dev/null
+++ b/keyboards/bobpad/config.h
@@ -0,0 +1,63 @@
+/* Copyright 2021 Ananya Kirti
+ *
+ * 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       0x416B
+#define PRODUCT_ID      0x0002
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Desiboards
+#define PRODUCT         bobpad
+
+/* key matrix size */
+#define MATRIX_ROWS 2
+#define MATRIX_COLS 3
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+ */
+#define MATRIX_ROW_PINS { F7, B1 }
+#define MATRIX_COL_PINS { F6, F5, F4 }
+
+#define DIODE_DIRECTION COL2ROW
+
+
+
+
+
+// D4 D0
+// C6 E6 D7
+
+#define LED_NUM_LOCK_PIN    D4
+#define LED_CAPS_LOCK_PIN   D0
+#define LED_SCROLL_LOCK_PIN C6
+#define LED_COMPOSE_PIN     E6
+#define LED_KANA_PIN        D7
+
+
+
+#define ENCODERS_PAD_A { B3 }
+#define ENCODERS_PAD_B { B2 }
\ No newline at end of file
diff --git a/keyboards/bobpad/info.json b/keyboards/bobpad/info.json
new file mode 100644
index 0000000000..53ac20e9dc
--- /dev/null
+++ b/keyboards/bobpad/info.json
@@ -0,0 +1,17 @@
+{
+    "keyboard_name": "bobPad",
+    "url": "",
+    "maintainer": "Ananya Kirti",
+    "layouts": {
+        "LAYOUT_ortho_2x3": {
+            "layout": [
+                {"label":"K00 (B0,B2)", "x":0, "y":0},
+                {"label":"K01 (B0,B3)", "x":1, "y":0},
+                {"label":"K02 (B0,B4)", "x":2, "y":0},
+                {"label":"K10 (B1,B2)", "x":0, "y":1},
+                {"label":"K11 (B1,B3)", "x":1, "y":1},
+                {"label":"K12 (B1,B4)", "x":2, "y":1}
+            ]
+        }
+    }
+}
diff --git a/keyboards/bobpad/keymaps/default/keymap.c b/keyboards/bobpad/keymaps/default/keymap.c
new file mode 100644
index 0000000000..a6e7e190da
--- /dev/null
+++ b/keyboards/bobpad/keymaps/default/keymap.c
@@ -0,0 +1,35 @@
+/* Copyright 2021 Ananya Kirti
+ *
+ * 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
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_ortho_2x3(
+        KC_CAPSLOCK,  MO(1), KC_PGUP,
+        KC_DEL,  KC_END,  KC_PGDN
+    ),
+    [1] = LAYOUT_ortho_2x3(
+        KC_CAPSLOCK,  MO(1), KC_PGUP,
+        KC_DEL,  KC_END,  KC_PGDN
+    ),
+
+};
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+    writePin(D0, IS_LAYER_ON_STATE(state, 1));
+    
+    return state;
+}
diff --git a/keyboards/bobpad/keymaps/via/keymap.c b/keyboards/bobpad/keymaps/via/keymap.c
new file mode 100644
index 0000000000..e4fb137c41
--- /dev/null
+++ b/keyboards/bobpad/keymaps/via/keymap.c
@@ -0,0 +1,106 @@
+/* Copyright 2021 Ananya Kirti
+ *
+ * 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
+
+
+bool is_alt_tab_active = false;
+uint16_t alt_tab_timer = 0;
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_ortho_2x3(
+        KC_MEDIA_STOP,  KC_MEDIA_PLAY_PAUSE, KC__MUTE,
+        KC_MEDIA_REWIND,  KC_MEDIA_FAST_FORWARD,  KC_PGDN
+    ),
+    [1] = LAYOUT_ortho_2x3(
+        _______,  _______,  _______,
+        _______,  _______,  _______
+    ),
+    [2] = LAYOUT_ortho_2x3(
+        _______,  _______, _______,
+        _______,  _______, _______
+    ),
+    [3] = LAYOUT_ortho_2x3(
+        _______,  _______, _______,
+        _______,  _______, _______
+    ),
+};
+
+
+
+// D4 D0
+// C6 E6 D7
+
+void matrix_scan_user(void) {
+    writePin(C6, layer_state_is(1));
+    writePin(E6, layer_state_is(2));
+    writePin(D7, layer_state_is(3));
+    writePin(D4, layer_state_is(4));
+    writePin(D0, layer_state_is(5));
+    if (is_alt_tab_active) {
+        if (timer_elapsed(alt_tab_timer) > 1000) {
+        unregister_code(KC_LWIN);
+        is_alt_tab_active = false;
+        }
+  }
+}
+
+bool led_update_user(led_t led_state) {
+    return false;
+};
+
+
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    if(IS_LAYER_ON(1)) { // on 1st layer
+        if (clockwise) {
+          if (!is_alt_tab_active) {
+            is_alt_tab_active = true;
+            register_code(KC_LWIN);
+          }
+          alt_tab_timer = timer_read();
+          tap_code16(KC_TAB);
+        } else {
+          alt_tab_timer = timer_read();
+          tap_code16(S(KC_TAB));
+        }
+    }
+    // 2nd layer
+    else if(IS_LAYER_ON(2)) { 
+      if (clockwise) {
+          tap_code(KC_DOWN);
+      } else {
+          tap_code(KC_UP);
+      }
+    }
+    else if(IS_LAYER_ON(3)) { 
+      if (clockwise) {
+          tap_code(KC_BRIU);
+      } else {
+          tap_code(KC_BRID);
+      }
+    }
+    // default layer
+    else if(IS_LAYER_ON(0)) { 
+      if (clockwise) {
+        tap_code(KC_VOLU);
+      } else {
+          tap_code(KC_VOLD);
+      }
+    }
+    return false;
+}
diff --git a/keyboards/bobpad/keymaps/via/rules.mk b/keyboards/bobpad/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/bobpad/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/bobpad/readme.md b/keyboards/bobpad/readme.md
new file mode 100644
index 0000000000..776ef58e47
--- /dev/null
+++ b/keyboards/bobpad/readme.md
@@ -0,0 +1,25 @@
+# bobpad
+
+![bobpad](https://i.imgur.com/93zguh1h.jpg)
+
+A bentopad based macropad with incline
+
+* Keyboard Maintainer: [Ananya Kirti](https://github.com/AnanyaKirti)
+* Hardware Supported: Custom 3D printed Case
+* Hardware Availability: Contact bob at IMKC Discord
+
+Make example for this keyboard (after setting up your build environment):
+
+    make bobpad:default
+
+Flashing example for this keyboard:
+
+    make bobpad:default:flash
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+* **Physical reset button**: Briefly short the pad connected to RESET and GND on the back
+* **Keycode in layout**: Press the key mapped to `RESET`, this is the recommened method
+
+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/bobpad/rules.mk b/keyboards/bobpad/rules.mk
new file mode 100644
index 0000000000..31a2d9df52
--- /dev/null
+++ b/keyboards/bobpad/rules.mk
@@ -0,0 +1,25 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration
+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
+# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
+SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
+# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+NKRO_ENABLE = no            # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
+ENCODER_ENABLE = yes
+
+LAYOUTS = ortho_2x3