[Keyboard] Add Free Willy Keyboard (#14394)

Co-authored-by: Ryan <fauxpark@gmail.com>
author: Caleb Lightfoot <61706196+Tsquash@users.noreply.github.com> 2021-09-21 23:24:44 -0500
committer: GitHub <noreply@github.com> 2021-09-21 21:24:44 -0700
commit: c8a3353003bbe706258adc0a4a859b5c2c987cd3 (patch)
tree: e38a0484ded9999e4892e8b200f61cad542c102a
parent: 02556b3d8adcca4301ba88762e30244accbc0327 (diff)
download: qmk_firmware-c8a3353003bbe706258adc0a4a859b5c2c987cd3.tar.gz
qmk_firmware-c8a3353003bbe706258adc0a4a859b5c2c987cd3.zip
12 files changed, 368 insertions, 0 deletions
diff --git a/keyboards/free_willy/config.h b/keyboards/free_willy/config.h
new file mode 100644
index 000000000..cecd2a821
--- /dev/null
+++ b/keyboards/free_willy/config.h
@@ -0,0 +1,39 @@
+/* Copyright 2021 Caleb Lightfoot
+ *
+ * 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 0x5351 // SQ
+#define PRODUCT_ID 0x4657 // FW
+#define DEVICE_VER 0x0001
+#define MANUFACTURER squashkb
+#define PRODUCT free willy
+/* key matrix size */
+#define MATRIX_ROWS 4
+#define MATRIX_COLS 10
+#define MATRIX_ROW_PINS { F4, F5, F6, F7 }
+#define MATRIX_COL_PINS { D3, D2, D1, D0, D4, C6, D7, E6, B4, B5 }
+#define UNUSED_PINS
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
diff --git a/keyboards/free_willy/free_willy.c b/keyboards/free_willy/free_willy.c
new file mode 100644
index 000000000..71a912fdc
--- /dev/null
+++ b/keyboards/free_willy/free_willy.c
@@ -0,0 +1,16 @@
+/* Copyright 2021 Caleb Lightfoot
+ *
+ * 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 "free_willy.h"
diff --git a/keyboards/free_willy/free_willy.h b/keyboards/free_willy/free_willy.h
new file mode 100644
index 000000000..88597a053
--- /dev/null
+++ b/keyboards/free_willy/free_willy.h
@@ -0,0 +1,33 @@
+/* Copyright 2021 Caleb Lightfoot
+ *
+ * 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 XXX KC_NO
+#define LAYOUT( \
+  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \
+  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \
+  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \
+            K32, K33, K34, K35, K36, K37           \
+) \
+{ \
+  { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09  }, \
+  { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19  }, \
+  { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29  }, \
+  { XXX, XXX, K32, K33, K34, K35, K36, K37, XXX, XXX  }  \
+}
diff --git a/keyboards/free_willy/info.json b/keyboards/free_willy/info.json
new file mode 100644
index 000000000..c2bb3b95d
--- /dev/null
+++ b/keyboards/free_willy/info.json
@@ -0,0 +1,47 @@
+{
+    "keyboard_name": "free willy",
+    "url": "https://www.squashkb.com/product/free-willy",
+    "maintainer": "tsquash",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":0, "y":1},
+                {"x":1, "y":1},
+                {"x":2, "y":1},
+                {"x":3, "y":1},
+                {"x":4, "y":1},
+                {"x":5, "y":1},
+                {"x":6, "y":1},
+                {"x":7, "y":1},
+                {"x":8, "y":1},
+                {"x":9, "y":1},
+                {"x":0, "y":2},
+                {"x":1, "y":2},
+                {"x":2, "y":2},
+                {"x":3, "y":2},
+                {"x":4, "y":2},
+                {"x":5, "y":2},
+                {"x":6, "y":2},
+                {"x":7, "y":2},
+                {"x":8, "y":2},
+                {"x":9, "y":2},
+                {"x":2, "y":3},
+                {"x":3, "y":3},
+                {"x":4, "y":3},
+                {"x":5, "y":3},
+                {"x":6, "y":3},
+                {"x":7, "y":3}
+             ]
+        }
+    }
+}
diff --git a/keyboards/free_willy/keymaps/colemak/config.h b/keyboards/free_willy/keymaps/colemak/config.h
new file mode 100644
index 000000000..a9f255d42
--- /dev/null
+++ b/keyboards/free_willy/keymaps/colemak/config.h
@@ -0,0 +1,20 @@
+/* Copyright 2021 Caleb Lightfoot
+ *
+ * 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
+/* Combos */
+#define COMBO_COUNT 5
+#define COMBO_TERM 50
diff --git a/keyboards/free_willy/keymaps/colemak/keymap.c b/keyboards/free_willy/keymaps/colemak/keymap.c
new file mode 100644
index 000000000..9d666e1bf
--- /dev/null
+++ b/keyboards/free_willy/keymaps/colemak/keymap.c
@@ -0,0 +1,75 @@
+/* Copyright 2021 Caleb Lightfoot
+ *
+ * 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,
+  _SYM,
+  _NAV
+};
+#define KC_SYM_SPC LT(_SYM, KC_SPC)
+enum combo_events {
+  COMBO_NUMBAK,
+  COMBO_TAB,
+  COMBO_ESC,
+  COMBO_DEL,
+  COMBO_RET,
+};
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [_BASE] = LAYOUT(
+    KC_Q,   KC_W,   KC_F,    KC_P,       KC_B,    KC_J,     KC_L,       KC_U,    KC_Y,    KC_BSPC,
+    KC_A,   KC_R,   KC_S,    KC_T,       KC_G,    KC_M,     KC_N,       KC_E,    KC_I,    KC_O,
+    KC_X,   KC_C,   KC_D,    KC_V,       KC_Z,    KC_K,     KC_H,       KC_COMM, KC_DOT,  KC_SLSH,
+                    KC_LCTL, KC_LSFT, KC_LALT, KC_LGUI , KC_SYM_SPC, MO(_NAV)
+  ),
+  [_SYM] = LAYOUT(
+    KC_1,       KC_2,     KC_3,      KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,
+    KC_EXLM,    KC_AT,    KC_HASH,   KC_DLR,   KC_PERC,  KC_CIRC,  KC_AMPR,  KC_ASTR,  KC_EQUAL, KC_MINS,
+    KC_BSLS,    KC_SCLN,   KC_LCBR,   KC_LBRC,  KC_LPRN,  KC_RPRN,  KC_RBRC,  KC_RCBR,  KC_QUOT,  KC_GRV,
+                          KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS
+  ),
+  [_NAV] = LAYOUT(
+    RESET,    KC_NO,    KC_NO,    KC_NO,  KC_NO,   KC_NO,  KC_NO,    KC_NO,  KC_NO,  KC_NO,
+    KC_LEFT,  KC_DOWN,  KC_UP,  KC_RGHT,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,   KC_NO,
+    KC_NO,  KC_NO, KC_NO,  KC_NO,  KC_NO,  KC_NO,    KC_NO,  KC_NO,   KC_NO,  KC_NO,
+                   KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,   KC_TRNS,   KC_TRNS
+  ),
+};
+#ifdef COMBO_ENABLE
+//const uint16_t PROGMEM combo_bspc[] = {KC_O, KC_P, COMBO_END};
+const uint16_t PROGMEM combo_numbak[] = {KC_0, KC_9, COMBO_END};
+const uint16_t PROGMEM combo_tab[] = {KC_F, KC_W, COMBO_END};
+const uint16_t PROGMEM combo_esc[] = {KC_N, KC_T, COMBO_END};
+const uint16_t PROGMEM combo_del[] = {KC_MINS, KC_EQL, COMBO_END};
+const uint16_t PROGMEM combo_ret[] = {KC_LGUI, KC_LALT, COMBO_END};
+combo_t key_combos[COMBO_COUNT] = {
+  //[COMBO_BSPC] = COMBO(combo_bspc,KC_BSPC),
+  [COMBO_NUMBAK] = COMBO(combo_numbak,KC_BSPC),
+  [COMBO_TAB] = COMBO(combo_tab,KC_TAB),
+  [COMBO_ESC] = COMBO(combo_esc,KC_ESC),
+  [COMBO_DEL] = COMBO(combo_del,KC_DEL),
+  [COMBO_RET] = COMBO(combo_ret,KC_ENTER),
+};
+#endif
diff --git a/keyboards/free_willy/keymaps/colemak/rules.mk b/keyboards/free_willy/keymaps/colemak/rules.mk
new file mode 100644
index 000000000..ab1e43818
--- /dev/null
+++ b/keyboards/free_willy/keymaps/colemak/rules.mk
@@ -0,0 +1 @@
+COMBO_ENABLE = yes
diff --git a/keyboards/free_willy/keymaps/default/config.h b/keyboards/free_willy/keymaps/default/config.h
new file mode 100644
index 000000000..a9f255d42
--- /dev/null
+++ b/keyboards/free_willy/keymaps/default/config.h
@@ -0,0 +1,20 @@
+/* Copyright 2021 Caleb Lightfoot
+ *
+ * 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
+/* Combos */
+#define COMBO_COUNT 5
+#define COMBO_TERM 50
diff --git a/keyboards/free_willy/keymaps/default/keymap.c b/keyboards/free_willy/keymaps/default/keymap.c
new file mode 100644
index 000000000..d2b62a3a1
--- /dev/null
+++ b/keyboards/free_willy/keymaps/default/keymap.c
@@ -0,0 +1,74 @@
+/* Copyright 2021 Caleb Lightfoot
+ *
+ * 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,
+  _SYM,
+  _NAV
+};
+#define KC_SYM_SPC LT(_SYM, KC_SPC)
+#define KC_SFT_BCK LSFT_T(KC_BSPC)
+enum combo_events {
+  COMBO_NUMBAK,
+  COMBO_TAB,
+  COMBO_ESC,
+  COMBO_DEL,
+};
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [_BASE] = LAYOUT(
+    KC_Q,   KC_W,   KC_E,    KC_R,       KC_T,    KC_Y,     KC_U,       KC_I,    KC_O,    KC_P,
+    KC_A,   KC_S,   KC_D,    KC_F,       KC_G,    KC_H,     KC_J,       KC_K,    KC_L,    KC_ENT,
+    KC_Z,   KC_X,   KC_C,    KC_V,       KC_B,    KC_N,     KC_M,       KC_COMM, KC_DOT,  KC_SLSH,
+                    KC_LCTL, KC_SFT_BCK, KC_LALT, KC_LGUI , KC_SYM_SPC, MO(_NAV)
+  ),
+  [_SYM] = LAYOUT(
+    KC_1,       KC_2,     KC_3,      KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,
+    KC_EXLM,    KC_AT,    KC_HASH,   KC_DLR,   KC_PERC,  KC_CIRC,  KC_AMPR,  KC_ASTR,  KC_EQUAL, KC_MINS,
+    KC_BSLS,    KC_SCLN,   KC_LCBR,   KC_LBRC,  KC_LPRN,  KC_RPRN,  KC_RBRC,  KC_RCBR,  KC_QUOT,  KC_GRV,
+                          KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS
+  ),
+  [_NAV] = LAYOUT(
+    RESET,    KC_NO,    KC_NO,    KC_NO,  KC_NO,   KC_NO,  KC_NO,    KC_NO,  KC_NO,  KC_NO,
+    KC_LEFT,  KC_DOWN,  KC_UP,  KC_RGHT,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,   KC_NO,
+    KC_NO,  KC_NO, KC_NO,  KC_NO,  KC_NO,  KC_NO,    KC_NO,  KC_NO,   KC_NO,  KC_NO,
+                   KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,   KC_TRNS,   KC_TRNS
+  ),
+};
+#ifdef COMBO_ENABLE
+//const uint16_t PROGMEM combo_bspc[] = {KC_O, KC_P, COMBO_END};
+const uint16_t PROGMEM combo_numbak[] = {KC_0, KC_9, COMBO_END};
+const uint16_t PROGMEM combo_tab[] = {KC_Q, KC_W, COMBO_END};
+const uint16_t PROGMEM combo_esc[] = {KC_J, KC_F, COMBO_END};
+const uint16_t PROGMEM combo_del[] = {KC_MINS, KC_EQL, COMBO_END};
+combo_t key_combos[COMBO_COUNT] = {
+  //[COMBO_BSPC] = COMBO(combo_bspc,KC_BSPC),
+  [COMBO_NUMBAK] = COMBO(combo_numbak,KC_BSPC),
+  [COMBO_TAB] = COMBO(combo_tab,KC_TAB),
+  [COMBO_ESC] = COMBO(combo_esc,KC_ESC),
+  [COMBO_DEL] = COMBO(combo_del,KC_DEL),
+};
+#endif
diff --git a/keyboards/free_willy/keymaps/default/rules.mk b/keyboards/free_willy/keymaps/default/rules.mk
new file mode 100644
index 000000000..ab1e43818
--- /dev/null
+++ b/keyboards/free_willy/keymaps/default/rules.mk
@@ -0,0 +1 @@
+COMBO_ENABLE = yes
diff --git a/keyboards/free_willy/readme.md b/keyboards/free_willy/readme.md
new file mode 100644
index 000000000..0b34cc712
--- /dev/null
+++ b/keyboards/free_willy/readme.md
@@ -0,0 +1,21 @@
+# Free Willy
+![Free Willy](https://i.imgur.com/JBNV3Hk.png)
+Free willy is an ortholinear, 36 key keyboard featuring HHKB like corner blockers.
+* Keyboard Maintainer: [Caleb Lightfoot](https://github.com/Tsquash)
+* Hardware Supported: Free Willy PCB v1.0
+* Hardware Availability: [squashkb](https://www.squashkb.com/product/free-willy)
+Make example for this keyboard (after setting up your build environment):
+    make free_willy:default
+    
+To reset the keyboard, jump the reset and ground pins located on the pro micro.
+Flashing example for this keyboard:
+    make free_willy:default:flash
+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/free_willy/rules.mk b/keyboards/free_willy/rules.mk
new file mode 100644
index 000000000..45b153a57
--- /dev/null
+++ b/keyboards/free_willy/rules.mk
@@ -0,0 +1,21 @@
+# MCU name
+MCU = atmega32u4
+# Bootloader selection
+BOOTLOADER = caterina
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no        # 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
author	Caleb Lightfoot <61706196+Tsquash@users.noreply.github.com>	2021-09-21 23:24:44 -0500
committer	GitHub <noreply@github.com>	2021-09-21 21:24:44 -0700
commit	c8a3353003bbe706258adc0a4a859b5c2c987cd3 (patch)
tree	e38a0484ded9999e4892e8b200f61cad542c102a
parent	02556b3d8adcca4301ba88762e30244accbc0327 (diff)
download	qmk_firmware-c8a3353003bbe706258adc0a4a859b5c2c987cd3.tar.gz qmk_firmware-c8a3353003bbe706258adc0a4a859b5c2c987cd3.zip

diff --git a/keyboards/free_willy/config.h b/keyboards/free_willy/config.h new file mode 100644 index 000000000..cecd2a821 --- /dev/null +++ b/keyboards/free_willy/config.h
@@ -0,0 +1,39 @@
	1	/* Copyright 2021 Caleb Lightfoot
	2	*
	3	* This program is free software: you can redistribute it and/or modify
	4	* it under the terms of the GNU General Public License as published by
	5	* the Free Software Foundation, either version 2 of the License, or
	6	* (at your option) any later version.
	7	*
	8	* This program is distributed in the hope that it will be useful,
	9	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	10	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	11	* GNU General Public License for more details.
	12	*
	13	* You should have received a copy of the GNU General Public License
	14	* along with this program. If not, see <http://www.gnu.org/licenses/>.
	15	*/
	16	#pragma once
	17
	18	#include "config_common.h"
	19
	20	/* USB Device descriptor parameter */
	21	#define VENDOR_ID 0x5351 // SQ
	22	#define PRODUCT_ID 0x4657 // FW
	23	#define DEVICE_VER 0x0001
	24	#define MANUFACTURER squashkb
	25	#define PRODUCT free willy
	26
	27	/* key matrix size */
	28	#define MATRIX_ROWS 4
	29	#define MATRIX_COLS 10
	30
	31	#define MATRIX_ROW_PINS { F4, F5, F6, F7 }
	32	#define MATRIX_COL_PINS { D3, D2, D1, D0, D4, C6, D7, E6, B4, B5 }
	33	#define UNUSED_PINS
	34
	35	/* COL2ROW, ROW2COL*/
	36	#define DIODE_DIRECTION COL2ROW
	37
	38	/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
	39	#define DEBOUNCE 5


diff --git a/keyboards/free_willy/free_willy.c b/keyboards/free_willy/free_willy.c new file mode 100644 index 000000000..71a912fdc --- /dev/null +++ b/keyboards/free_willy/free_willy.c
@@ -0,0 +1,16 @@
	1	/* Copyright 2021 Caleb Lightfoot
	2	*
	3	* This program is free software: you can redistribute it and/or modify
	4	* it under the terms of the GNU General Public License as published by
	5	* the Free Software Foundation, either version 2 of the License, or
	6	* (at your option) any later version.
	7	*
	8	* This program is distributed in the hope that it will be useful,
	9	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	10	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	11	* GNU General Public License for more details.
	12	*
	13	* You should have received a copy of the GNU General Public License
	14	* along with this program. If not, see <http://www.gnu.org/licenses/>.
	15	*/
	16	#include "free_willy.h"


diff --git a/keyboards/free_willy/free_willy.h b/keyboards/free_willy/free_willy.h new file mode 100644 index 000000000..88597a053 --- /dev/null +++ b/keyboards/free_willy/free_willy.h
@@ -0,0 +1,33 @@
	1	/* Copyright 2021 Caleb Lightfoot
	2	*
	3	* This program is free software: you can redistribute it and/or modify
	4	* it under the terms of the GNU General Public License as published by
	5	* the Free Software Foundation, either version 2 of the License, or
	6	* (at your option) any later version.
	7	*
	8	* This program is distributed in the hope that it will be useful,
	9	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	10	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	11	* GNU General Public License for more details.
	12	*
	13	* You should have received a copy of the GNU General Public License
	14	* along with this program. If not, see <http://www.gnu.org/licenses/>.
	15	*/
	16	#pragma once
	17
	18	#include "quantum.h"
	19
	20	#define XXX KC_NO
	21
	22	#define LAYOUT( \
	23	K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \
	24	K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \
	25	K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \
	26	K32, K33, K34, K35, K36, K37 \
	27	) \
	28	{ \
	29	{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09 }, \
	30	{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19 }, \
	31	{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29 }, \
	32	{ XXX, XXX, K32, K33, K34, K35, K36, K37, XXX, XXX } \
	33	}


diff --git a/keyboards/free_willy/info.json b/keyboards/free_willy/info.json new file mode 100644 index 000000000..c2bb3b95d --- /dev/null +++ b/keyboards/free_willy/info.json
@@ -0,0 +1,47 @@
	1	{
	2	"keyboard_name": "free willy",
	3	"url": "https://www.squashkb.com/product/free-willy",
	4	"maintainer": "tsquash",
	5	"layouts": {
	6	"LAYOUT": {
	7	"layout": [
	8	{"x":0, "y":0},
	9	{"x":1, "y":0},
	10	{"x":2, "y":0},
	11	{"x":3, "y":0},
	12	{"x":4, "y":0},
	13	{"x":5, "y":0},
	14	{"x":6, "y":0},
	15	{"x":7, "y":0},
	16	{"x":8, "y":0},
	17	{"x":9, "y":0},
	18	{"x":0, "y":1},
	19	{"x":1, "y":1},
	20	{"x":2, "y":1},
	21	{"x":3, "y":1},
	22	{"x":4, "y":1},
	23	{"x":5, "y":1},
	24	{"x":6, "y":1},
	25	{"x":7, "y":1},
	26	{"x":8, "y":1},
	27	{"x":9, "y":1},
	28	{"x":0, "y":2},
	29	{"x":1, "y":2},
	30	{"x":2, "y":2},
	31	{"x":3, "y":2},
	32	{"x":4, "y":2},
	33	{"x":5, "y":2},
	34	{"x":6, "y":2},
	35	{"x":7, "y":2},
	36	{"x":8, "y":2},
	37	{"x":9, "y":2},
	38	{"x":2, "y":3},
	39	{"x":3, "y":3},
	40	{"x":4, "y":3},
	41	{"x":5, "y":3},
	42	{"x":6, "y":3},
	43	{"x":7, "y":3}
	44	]
	45	}
	46	}
	47	}


diff --git a/keyboards/free_willy/keymaps/colemak/config.h b/keyboards/free_willy/keymaps/colemak/config.h new file mode 100644 index 000000000..a9f255d42 --- /dev/null +++ b/keyboards/free_willy/keymaps/colemak/config.h
@@ -0,0 +1,20 @@
	1	/* Copyright 2021 Caleb Lightfoot
	2	*
	3	* This program is free software: you can redistribute it and/or modify
	4	* it under the terms of the GNU General Public License as published by
	5	* the Free Software Foundation, either version 2 of the License, or
	6	* (at your option) any later version.
	7	*
	8	* This program is distributed in the hope that it will be useful,
	9	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	10	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	11	* GNU General Public License for more details.
	12	*
	13	* You should have received a copy of the GNU General Public License
	14	* along with this program. If not, see <http://www.gnu.org/licenses/>.
	15	*/
	16	#pragma once
	17
	18	/* Combos */
	19	#define COMBO_COUNT 5
	20	#define COMBO_TERM 50


diff --git a/keyboards/free_willy/keymaps/colemak/keymap.c b/keyboards/free_willy/keymaps/colemak/keymap.c new file mode 100644 index 000000000..9d666e1bf --- /dev/null +++ b/keyboards/free_willy/keymaps/colemak/keymap.c
@@ -0,0 +1,75 @@
	1	/* Copyright 2021 Caleb Lightfoot
	2	*
	3	* This program is free software: you can redistribute it and/or modify
	4	* it under the terms of the GNU General Public License as published by
	5	* the Free Software Foundation, either version 2 of the License, or
	6	* (at your option) any later version.
	7	*
	8	* This program is distributed in the hope that it will be useful,
	9	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	10	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	11	* GNU General Public License for more details.
	12	*
	13	* You should have received a copy of the GNU General Public License
	14	* along with this program. If not, see <http://www.gnu.org/licenses/>.
	15	*/
	16	#include QMK_KEYBOARD_H
	17
	18	enum layers{
	19	_BASE,
	20	_SYM,
	21	_NAV
	22	};
	23
	24	#define KC_SYM_SPC LT(_SYM, KC_SPC)
	25
	26	enum combo_events {
	27	COMBO_NUMBAK,
	28	COMBO_TAB,
	29	COMBO_ESC,
	30	COMBO_DEL,
	31	COMBO_RET,
	32	};
	33
	34	const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
	35	[_BASE] = LAYOUT(
	36	KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_BSPC,
	37	KC_A, KC_R, KC_S, KC_T, KC_G, KC_M, KC_N, KC_E, KC_I, KC_O,
	38	KC_X, KC_C, KC_D, KC_V, KC_Z, KC_K, KC_H, KC_COMM, KC_DOT, KC_SLSH,
	39	KC_LCTL, KC_LSFT, KC_LALT, KC_LGUI , KC_SYM_SPC, MO(_NAV)
	40	),
	41
	42	[_SYM] = LAYOUT(
	43	KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0,
	44	KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_EQUAL, KC_MINS,
	45	KC_BSLS, KC_SCLN, KC_LCBR, KC_LBRC, KC_LPRN, KC_RPRN, KC_RBRC, KC_RCBR, KC_QUOT, KC_GRV,
	46	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
	47	),
	48
	49	[_NAV] = LAYOUT(
	50	RESET, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
	51	KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
	52	KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
	53	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
	54	),
	55	};
	56
	57
	58	#ifdef COMBO_ENABLE
	59	//const uint16_t PROGMEM combo_bspc[] = {KC_O, KC_P, COMBO_END};
	60	const uint16_t PROGMEM combo_numbak[] = {KC_0, KC_9, COMBO_END};
	61	const uint16_t PROGMEM combo_tab[] = {KC_F, KC_W, COMBO_END};
	62	const uint16_t PROGMEM combo_esc[] = {KC_N, KC_T, COMBO_END};
	63	const uint16_t PROGMEM combo_del[] = {KC_MINS, KC_EQL, COMBO_END};
	64	const uint16_t PROGMEM combo_ret[] = {KC_LGUI, KC_LALT, COMBO_END};
	65
	66	combo_t key_combos[COMBO_COUNT] = {
	67	//[COMBO_BSPC] = COMBO(combo_bspc,KC_BSPC),
	68	[COMBO_NUMBAK] = COMBO(combo_numbak,KC_BSPC),
	69	[COMBO_TAB] = COMBO(combo_tab,KC_TAB),
	70	[COMBO_ESC] = COMBO(combo_esc,KC_ESC),
	71	[COMBO_DEL] = COMBO(combo_del,KC_DEL),
	72	[COMBO_RET] = COMBO(combo_ret,KC_ENTER),
	73
	74	};
	75	#endif


diff --git a/keyboards/free_willy/keymaps/colemak/rules.mk b/keyboards/free_willy/keymaps/colemak/rules.mk new file mode 100644 index 000000000..ab1e43818 --- /dev/null +++ b/keyboards/free_willy/keymaps/colemak/rules.mk
@@ -0,0 +1 @@
		COMBO_ENABLE = yes


diff --git a/keyboards/free_willy/keymaps/default/config.h b/keyboards/free_willy/keymaps/default/config.h new file mode 100644 index 000000000..a9f255d42 --- /dev/null +++ b/keyboards/free_willy/keymaps/default/config.h
@@ -0,0 +1,20 @@
	1	/* Copyright 2021 Caleb Lightfoot
	2	*
	3	* This program is free software: you can redistribute it and/or modify
	4	* it under the terms of the GNU General Public License as published by
	5	* the Free Software Foundation, either version 2 of the License, or
	6	* (at your option) any later version.
	7	*
	8	* This program is distributed in the hope that it will be useful,
	9	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	10	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	11	* GNU General Public License for more details.
	12	*
	13	* You should have received a copy of the GNU General Public License
	14	* along with this program. If not, see <http://www.gnu.org/licenses/>.
	15	*/
	16	#pragma once
	17
	18	/* Combos */
	19	#define COMBO_COUNT 5
	20	#define COMBO_TERM 50


diff --git a/keyboards/free_willy/keymaps/default/keymap.c b/keyboards/free_willy/keymaps/default/keymap.c new file mode 100644 index 000000000..d2b62a3a1 --- /dev/null +++ b/keyboards/free_willy/keymaps/default/keymap.c
@@ -0,0 +1,74 @@
	1	/* Copyright 2021 Caleb Lightfoot
	2	*
	3	* This program is free software: you can redistribute it and/or modify
	4	* it under the terms of the GNU General Public License as published by
	5	* the Free Software Foundation, either version 2 of the License, or
	6	* (at your option) any later version.
	7	*
	8	* This program is distributed in the hope that it will be useful,
	9	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	10	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	11	* GNU General Public License for more details.
	12	*
	13	* You should have received a copy of the GNU General Public License
	14	* along with this program. If not, see <http://www.gnu.org/licenses/>.
	15	*/
	16	#include QMK_KEYBOARD_H
	17
	18	enum layers{
	19	_BASE,
	20	_SYM,
	21	_NAV
	22	};
	23
	24	#define KC_SYM_SPC LT(_SYM, KC_SPC)
	25	#define KC_SFT_BCK LSFT_T(KC_BSPC)
	26
	27
	28	enum combo_events {
	29	COMBO_NUMBAK,
	30	COMBO_TAB,
	31	COMBO_ESC,
	32	COMBO_DEL,
	33	};
	34
	35	const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
	36	[_BASE] = LAYOUT(
	37	KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P,
	38	KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT,
	39	KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,
	40	KC_LCTL, KC_SFT_BCK, KC_LALT, KC_LGUI , KC_SYM_SPC, MO(_NAV)
	41	),
	42
	43	[_SYM] = LAYOUT(
	44	KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0,
	45	KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_EQUAL, KC_MINS,
	46	KC_BSLS, KC_SCLN, KC_LCBR, KC_LBRC, KC_LPRN, KC_RPRN, KC_RBRC, KC_RCBR, KC_QUOT, KC_GRV,
	47	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
	48	),
	49
	50	[_NAV] = LAYOUT(
	51	RESET, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
	52	KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
	53	KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
	54	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
	55	),
	56	};
	57
	58
	59	#ifdef COMBO_ENABLE
	60	//const uint16_t PROGMEM combo_bspc[] = {KC_O, KC_P, COMBO_END};
	61	const uint16_t PROGMEM combo_numbak[] = {KC_0, KC_9, COMBO_END};
	62	const uint16_t PROGMEM combo_tab[] = {KC_Q, KC_W, COMBO_END};
	63	const uint16_t PROGMEM combo_esc[] = {KC_J, KC_F, COMBO_END};
	64	const uint16_t PROGMEM combo_del[] = {KC_MINS, KC_EQL, COMBO_END};
	65
	66	combo_t key_combos[COMBO_COUNT] = {
	67	//[COMBO_BSPC] = COMBO(combo_bspc,KC_BSPC),
	68	[COMBO_NUMBAK] = COMBO(combo_numbak,KC_BSPC),
	69	[COMBO_TAB] = COMBO(combo_tab,KC_TAB),
	70	[COMBO_ESC] = COMBO(combo_esc,KC_ESC),
	71	[COMBO_DEL] = COMBO(combo_del,KC_DEL),
	72
	73	};
	74	#endif


diff --git a/keyboards/free_willy/keymaps/default/rules.mk b/keyboards/free_willy/keymaps/default/rules.mk new file mode 100644 index 000000000..ab1e43818 --- /dev/null +++ b/keyboards/free_willy/keymaps/default/rules.mk
@@ -0,0 +1 @@
		COMBO_ENABLE = yes


diff --git a/keyboards/free_willy/readme.md b/keyboards/free_willy/readme.md new file mode 100644 index 000000000..0b34cc712 --- /dev/null +++ b/keyboards/free_willy/readme.md
@@ -0,0 +1,21 @@
	1	# Free Willy
	2
	3	![Free Willy](https://i.imgur.com/JBNV3Hk.png)
	4
	5	Free willy is an ortholinear, 36 key keyboard featuring HHKB like corner blockers.
	6
	7	* Keyboard Maintainer: [Caleb Lightfoot](https://github.com/Tsquash)
	8	* Hardware Supported: Free Willy PCB v1.0
	9	* Hardware Availability: [squashkb](https://www.squashkb.com/product/free-willy)
	10
	11	Make example for this keyboard (after setting up your build environment):
	12
	13	make free_willy:default
	14
	15	To reset the keyboard, jump the reset and ground pins located on the pro micro.
	16
	17	Flashing example for this keyboard:
	18
	19	make free_willy:default:flash
	20
	21	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/free_willy/rules.mk b/keyboards/free_willy/rules.mk new file mode 100644 index 000000000..45b153a57 --- /dev/null +++ b/keyboards/free_willy/rules.mk
@@ -0,0 +1,21 @@
	1	# MCU name
	2	MCU = atmega32u4
	3
	4	# Bootloader selection
	5	BOOTLOADER = caterina
	6
	7	# Build Options
	8	# change yes to no to disable
	9	#
	10	BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
	11	MOUSEKEY_ENABLE = no # Mouse keys
	12	EXTRAKEY_ENABLE = yes # Audio control and System control
	13	CONSOLE_ENABLE = no # Console for debug
	14	COMMAND_ENABLE = no # Commands for debug and configuration
	15	# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
	16	SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
	17	# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
	18	NKRO_ENABLE = no # USB Nkey Rollover
	19	BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
	20	RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
	21	AUDIO_ENABLE = no # Audio output