summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Dias <matthewdias@me.com>2021-11-15 18:29:19 -0600
committerGitHub <noreply@github.com>2021-11-15 16:29:19 -0800
commitd3ae937b50df8d98deb3dc3b9f8aa1635eac1c8b (patch)
treec7470daa2e80ad935a95c4a3a6bb23f0985c310a
parent269990ed95f80db2349661b2731b42501e3b2803 (diff)
[Keyboard] Add layout options, hotswap version to portal 66 (#14719)
Co-authored-by: Drashna Jaelre <drashna@live.com>
-rw-r--r--keyboards/portal_66/hotswap/config.h109
-rw-r--r--keyboards/portal_66/hotswap/hotswap.c (renamed from keyboards/portal_66/portal_66.c)2
-rw-r--r--keyboards/portal_66/hotswap/hotswap.h33
-rw-r--r--keyboards/portal_66/hotswap/info.json81
-rw-r--r--keyboards/portal_66/hotswap/keymaps/default/keymap.c38
-rw-r--r--keyboards/portal_66/hotswap/keymaps/default/readme.md1
-rw-r--r--keyboards/portal_66/hotswap/keymaps/via/keymap.c54
-rw-r--r--keyboards/portal_66/hotswap/keymaps/via/rules.mk (renamed from keyboards/portal_66/keymaps/via/rules.mk)0
-rw-r--r--keyboards/portal_66/hotswap/readme.md18
-rw-r--r--keyboards/portal_66/hotswap/rules.mk (renamed from keyboards/portal_66/rules.mk)2
-rw-r--r--keyboards/portal_66/soldered/config.h (renamed from keyboards/portal_66/config.h)0
-rw-r--r--keyboards/portal_66/soldered/info.json (renamed from keyboards/portal_66/info.json)36
-rw-r--r--keyboards/portal_66/soldered/keymaps/default/keymap.c (renamed from keyboards/portal_66/keymaps/default/keymap.c)4
-rw-r--r--keyboards/portal_66/soldered/keymaps/default/readme.md (renamed from keyboards/portal_66/keymaps/default/readme.md)0
-rw-r--r--keyboards/portal_66/soldered/keymaps/via/keymap.c (renamed from keyboards/portal_66/keymaps/via/keymap.c)8
-rw-r--r--keyboards/portal_66/soldered/keymaps/via/rules.mk1
-rw-r--r--keyboards/portal_66/soldered/readme.md (renamed from keyboards/portal_66/readme.md)4
-rw-r--r--keyboards/portal_66/soldered/rules.mk21
-rw-r--r--keyboards/portal_66/soldered/soldered.c17
-rw-r--r--keyboards/portal_66/soldered/soldered.h (renamed from keyboards/portal_66/portal_66.h)28
20 files changed, 413 insertions, 44 deletions
diff --git a/keyboards/portal_66/hotswap/config.h b/keyboards/portal_66/hotswap/config.h
new file mode 100644
index 0000000000..db4c59bd44
--- /dev/null
+++ b/keyboards/portal_66/hotswap/config.h
@@ -0,0 +1,109 @@
+/*
+Copyright 2021 Matthew Dias
+
+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 0x504C
+#define PRODUCT_ID 0x5067
+#define DEVICE_VER 0x0001
+#define MANUFACTURER Parallel Limited
+#define PRODUCT Portal 66
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 16
+
+/*
+ * 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 { E6, B7, F7, F4, F5 }
+#define MATRIX_COL_PINS { F6, B0, F1, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0 }
+#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
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* 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
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+//#define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * 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
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+
+/* Bootmagic Lite key configuration */
+//#define BOOTMAGIC_LITE_ROW 0
+//#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/portal_66/portal_66.c b/keyboards/portal_66/hotswap/hotswap.c
index a53989f948..4189a8a80c 100644
--- a/keyboards/portal_66/portal_66.c
+++ b/keyboards/portal_66/hotswap/hotswap.c
@@ -14,4 +14,4 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "portal_66.h"
+#include "hotswap.h"
diff --git a/keyboards/portal_66/hotswap/hotswap.h b/keyboards/portal_66/hotswap/hotswap.h
new file mode 100644
index 0000000000..734184dd77
--- /dev/null
+++ b/keyboards/portal_66/hotswap/hotswap.h
@@ -0,0 +1,33 @@
+/* Copyright 2021 Matthew Dias
+ *
+ * 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( \
+ k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k014, k015, \
+ k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k115, \
+ k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k213, k215, \
+ k300, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, k315, \
+ k400, k401, k402, k406, k409, k411, k412, k413, k415 \
+) { \
+ { k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, KC_NO, k014, k015 }, \
+ { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, KC_NO, k115 }, \
+ { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, KC_NO, k213, KC_NO, k215 }, \
+ { k300, KC_NO, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, KC_NO, k315 }, \
+ { k400, k401, k402, KC_NO, KC_NO, KC_NO, k406, KC_NO, KC_NO, k409, KC_NO, k411, k412, k413, KC_NO, k415 } \
+}
diff --git a/keyboards/portal_66/hotswap/info.json b/keyboards/portal_66/hotswap/info.json
new file mode 100644
index 0000000000..e90bdd8813
--- /dev/null
+++ b/keyboards/portal_66/hotswap/info.json
@@ -0,0 +1,81 @@
+{
+ "keyboard_name": "Portal 66 Hotswap",
+ "maintainer": "matthewdias",
+ "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":10, "y":0 },
+ { "x":11, "y":0 },
+ { "x":12, "y":0 },
+ { "x":13, "y":0, "w": 2 },
+ { "x":15, "y":0 },
+
+ { "x":0, "y":1, "w":1.5 },
+ { "x":1.5, "y":1 },
+ { "x":2.5, "y":1 },
+ { "x":3.5, "y":1 },
+ { "x":4.5, "y":1 },
+ { "x":5.5, "y":1 },
+ { "x":6.5, "y":1 },
+ { "x":7.5, "y":1 },
+ { "x":8.5, "y":1 },
+ { "x":9.5, "y":1 },
+ { "x":10.5, "y":1 },
+ { "x":11.5, "y":1 },
+ { "x":12.5, "y":1 },
+ { "x":13.5, "y":1, "w":1.5 },
+ { "x":15, "y":1 },
+
+ { "x":0, "y":2, "w":1.75 },
+ { "x":1.75, "y":2 },
+ { "x":2.75, "y":2 },
+ { "x":3.75, "y":2 },
+ { "x":4.75, "y":2 },
+ { "x":5.75, "y":2 },
+ { "x":6.75, "y":2 },
+ { "x":7.75, "y":2 },
+ { "x":8.75, "y":2 },
+ { "x":9.75, "y":2 },
+ { "x":10.75, "y":2 },
+ { "x":11.75, "y":2 },
+ { "x":12.75, "y":2, "w":2.25 },
+ { "x":15, "y":2 },
+
+ { "x":0, "y":3, "w":2.25 },
+ { "x":2.25, "y":3 },
+ { "x":3.25, "y":3 },
+ { "x":4.25, "y":3 },
+ { "x":5.25, "y":3 },
+ { "x":6.25, "y":3 },
+ { "x":7.25, "y":3 },
+ { "x":8.25, "y":3 },
+ { "x":9.25, "y":3 },
+ { "x":10.25, "y":3 },
+ { "x":11.25, "y":3 },
+ { "x":12.25, "y":3, "w":1.75 },
+ { "x":14, "y":3 },
+ { "x":15, "y":3 },
+
+ { "x":0, "y":4, "w":1.25 },
+ { "x":1.25, "y":4, "w":1.25 },
+ { "x":2.5, "y":4, "w":1.25 },
+ { "x":3.75, "y":4, "w":6.25 },
+ { "x":10, "y":4, "w":1.25 },
+ { "x":11.25, "y":4, "w":1.25 },
+ { "x":13, "y":4 },
+ { "x":14, "y":4 },
+ { "x":15, "y":4 }
+ ]
+ }
+ }
+}
diff --git a/keyboards/portal_66/hotswap/keymaps/default/keymap.c b/keyboards/portal_66/hotswap/keymaps/default/keymap.c
new file mode 100644
index 0000000000..a476f5984d
--- /dev/null
+++ b/keyboards/portal_66/hotswap/keymaps/default/keymap.c
@@ -0,0 +1,38 @@
+/* Copyright 2021 Matthew Dias
+ *
+ * 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 layer_names {
+ _BASE,
+ _FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [_BASE] = LAYOUT(
+ KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME,
+ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_END,
+ KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP,
+ 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_UP, KC_PGDN,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(_FN), KC_LEFT, KC_DOWN, KC_RGHT
+ ),
+ [_FN] = LAYOUT(
+ RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______
+ )
+};
diff --git a/keyboards/portal_66/hotswap/keymaps/default/readme.md b/keyboards/portal_66/hotswap/keymaps/default/readme.md
new file mode 100644
index 0000000000..1a4e1624e3
--- /dev/null
+++ b/keyboards/portal_66/hotswap/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for Portal 66 Hotswap
diff --git a/keyboards/portal_66/hotswap/keymaps/via/keymap.c b/keyboards/portal_66/hotswap/keymaps/via/keymap.c
new file mode 100644
index 0000000000..a89f1eee66
--- /dev/null
+++ b/keyboards/portal_66/hotswap/keymaps/via/keymap.c
@@ -0,0 +1,54 @@
+/* Copyright 2021 Matthew Dias
+ *
+ * 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 layer_names {
+ _L0,
+ _L1,
+ _L2,
+ _L3
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [_L0] = LAYOUT(
+ KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME,
+ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_END,
+ KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP,
+ 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_UP, KC_PGDN,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(_L1), KC_LEFT, KC_DOWN, KC_RGHT
+ ),
+ [_L1] = LAYOUT(
+ RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______
+ ),
+ [_L2] = LAYOUT(
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______
+ ),
+ [_L3] = LAYOUT(
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______
+ )
+};
diff --git a/keyboards/portal_66/keymaps/via/rules.mk b/keyboards/portal_66/hotswap/keymaps/via/rules.mk
index 1e5b99807c..1e5b99807c 100644
--- a/keyboards/portal_66/keymaps/via/rules.mk
+++ b/keyboards/portal_66/hotswap/keymaps/via/rules.mk
diff --git a/keyboards/portal_66/hotswap/readme.md b/keyboards/portal_66/hotswap/readme.md
new file mode 100644
index 0000000000..91434a11c0
--- /dev/null
+++ b/keyboards/portal_66/hotswap/readme.md
@@ -0,0 +1,18 @@
+# Portal 66
+
+A 65% keyboard
+
+* Keyboard Maintainer: matthewdias
+* Hardware Supported: Portal 66 Hotswap
+
+To reset the keyboard into bootloader mode, press the reset switch on the underside.
+
+Make example for this keyboard (after setting up your build environment):
+
+ make portal_66/hotswap:default
+
+Flashing example for this keyboard:
+
+ make portal_66/hotswap: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/portal_66/rules.mk b/keyboards/portal_66/hotswap/rules.mk
index a3cd44fa42..c79f74e34b 100644
--- a/keyboards/portal_66/rules.mk
+++ b/keyboards/portal_66/hotswap/rules.mk
@@ -19,5 +19,3 @@ 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
-
-LAYOUTS = 65_ansi
diff --git a/keyboards/portal_66/config.h b/keyboards/portal_66/soldered/config.h
index 3a3efc80b5..3a3efc80b5 100644
--- a/keyboards/portal_66/config.h
+++ b/keyboards/portal_66/soldered/config.h
diff --git a/keyboards/portal_66/info.json b/keyboards/portal_66/soldered/info.json
index 253e9dd7bb..730b5400ea 100644
--- a/keyboards/portal_66/info.json
+++ b/keyboards/portal_66/soldered/info.json
@@ -71,9 +71,8 @@
{ "x":1.25, "y":4, "w":1.25 },
{ "x":2.5, "y":4, "w":1.25 },
{ "x":3.75, "y":4, "w":6.25 },
- { "x":10, "y":4 },
- { "x":11, "y":4 },
- { "x":12, "y":4 },
+ { "x":10, "y":4, "w":1.25 },
+ { "x":11.25, "y":4, "w":1.25 },
{ "x":13, "y":4 },
{ "x":14, "y":4 },
{ "x":15, "y":4 }
@@ -147,15 +146,14 @@
{ "x":1.25, "y":4, "w":1.25 },
{ "x":2.5, "y":4, "w":1.25 },
{ "x":3.75, "y":4, "w":6.25 },
- { "x":10, "y":4 },
- { "x":11, "y":4 },
- { "x":12, "y":4 },
+ { "x":10, "y":4, "w":1.25 },
+ { "x":11.25, "y":4, "w":1.25 },
{ "x":13, "y":4 },
{ "x":14, "y":4 },
{ "x":15, "y":4 }
]
},
- "LAYOUT_65_ansi_split_bs_2_right_mods": {
+ "LAYOUT_65_tsangan_split_bs": {
"layout": [
{ "x":0, "y":0 },
{ "x":1, "y":0 },
@@ -220,18 +218,17 @@
{ "x":14, "y":3 },
{ "x":15, "y":3 },
- { "x":0, "y":4, "w":1.25 },
- { "x":1.25, "y":4, "w":1.25 },
- { "x":2.5, "y":4, "w":1.25 },
- { "x":3.75, "y":4, "w":6.25 },
- { "x":10, "y":4, "w":1.5 },
- { "x":11.5, "y":4, "w":1.5 },
+ { "x":0, "y":4, "w":1.5 },
+ { "x":1.5, "y":4, "w":1 },
+ { "x":2.5, "y":4, "w":1.5 },
+ { "x":4, "y":4, "w":7 },
+ { "x":11, "y":4, "w":1.5 },
{ "x":13, "y":4 },
{ "x":14, "y":4 },
{ "x":15, "y":4 }
]
},
- "LAYOUT_65_ansi_2_right_mods": {
+ "LAYOUT_65_iso": {
"layout": [
{ "x":0, "y":0 },
{ "x":1, "y":0 },
@@ -262,7 +259,6 @@
{ "x":10.5, "y":1 },
{ "x":11.5, "y":1 },
{ "x":12.5, "y":1 },
- { "x":13.5, "y":1, "w":1.5 },
{ "x":15, "y":1 },
{ "x":0, "y":2, "w":1.75 },
@@ -277,10 +273,12 @@
{ "x":9.75, "y":2 },
{ "x":10.75, "y":2 },
{ "x":11.75, "y":2 },
- { "x":12.75, "y":2, "w":2.25 },
+ { "x":12.75, "y":2 },
+ { "x":13.75, "y":1, "w":1.25, "h":2 },
{ "x":15, "y":2 },
- { "x":0, "y":3, "w":2.25 },
+ { "x":0, "y":3, "w":1.25 },
+ { "x":1.25, "y":3 },
{ "x":2.25, "y":3 },
{ "x":3.25, "y":3 },
{ "x":4.25, "y":3 },
@@ -299,8 +297,8 @@
{ "x":1.25, "y":4, "w":1.25 },
{ "x":2.5, "y":4, "w":1.25 },
{ "x":3.75, "y":4, "w":6.25 },
- { "x":10, "y":4, "w":1.5 },
- { "x":11.5, "y":4, "w":1.5 },
+ { "x":10, "y":4, "w":1.25 },
+ { "x":11.25, "y":4, "w":1.25 },
{ "x":13, "y":4 },
{ "x":14, "y":4 },
{ "x":15, "y":4 }
diff --git a/keyboards/portal_66/keymaps/default/keymap.c b/keyboards/portal_66/soldered/keymaps/default/keymap.c
index 0269d577bf..3260f412a2 100644
--- a/keyboards/portal_66/keymaps/default/keymap.c
+++ b/keyboards/portal_66/soldered/keymaps/default/keymap.c
@@ -26,13 +26,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_END,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP,
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_UP, KC_PGDN,
- KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(_FN), KC_LEFT, KC_DOWN, KC_RGHT
),
[_FN] = LAYOUT_65_ansi_split_bs(
RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ _______, _______, _______, _______, _______, _______, _______, _______, _______
)
};
diff --git a/keyboards/portal_66/keymaps/default/readme.md b/keyboards/portal_66/soldered/keymaps/default/readme.md
index 5d87fc7fe0..5d87fc7fe0 100644
--- a/keyboards/portal_66/keymaps/default/readme.md
+++ b/keyboards/portal_66/soldered/keymaps/default/readme.md
diff --git a/keyboards/portal_66/keymaps/via/keymap.c b/keyboards/portal_66/soldered/keymaps/via/keymap.c
index 59e038a541..7ea1f44b0b 100644
--- a/keyboards/portal_66/keymaps/via/keymap.c
+++ b/keyboards/portal_66/soldered/keymaps/via/keymap.c
@@ -28,27 +28,27 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_END,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP,
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_UP, KC_PGDN,
- KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(_L1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(_L1), KC_LEFT, KC_DOWN, KC_RGHT
),
[_L1] = LAYOUT_65_ansi_split_bs(
RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ _______, _______, _______, _______, _______, _______, _______, _______, _______
),
[_L2] = LAYOUT_65_ansi_split_bs(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ _______, _______, _______, _______, _______, _______, _______, _______, _______
),
[_L3] = LAYOUT_65_ansi_split_bs(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ _______, _______, _______, _______, _______, _______, _______, _______, _______
)
};
diff --git a/keyboards/portal_66/soldered/keymaps/via/rules.mk b/keyboards/portal_66/soldered/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/portal_66/soldered/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/portal_66/readme.md b/keyboards/portal_66/soldered/readme.md
index b87945af3b..d6906fbc34 100644
--- a/keyboards/portal_66/readme.md
+++ b/keyboards/portal_66/soldered/readme.md
@@ -9,10 +9,10 @@ To reset the keyboard into bootloader mode, press the reset switch on the unders
Make example for this keyboard (after setting up your build environment):
- make portal_66:default
+ make portal_66/soldered:default
Flashing example for this keyboard:
- make portal_66:default:flash
+ make portal_66/soldered: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/portal_66/soldered/rules.mk b/keyboards/portal_66/soldered/rules.mk
new file mode 100644
index 0000000000..9906266f48
--- /dev/null
+++ b/keyboards/portal_66/soldered/rules.mk
@@ -0,0 +1,21 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+# change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
+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
diff --git a/keyboards/portal_66/soldered/soldered.c b/keyboards/portal_66/soldered/soldered.c
new file mode 100644
index 0000000000..a74cd21dea
--- /dev/null
+++ b/keyboards/portal_66/soldered/soldered.c
@@ -0,0 +1,17 @@
+/* Copyright 2021 Matthew Dias
+ *
+ * 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 "soldered.h"
diff --git a/keyboards/portal_66/portal_66.h b/keyboards/portal_66/soldered/soldered.h
index 5d3525ae45..9fde7850d7 100644
--- a/keyboards/portal_66/portal_66.h
+++ b/keyboards/portal_66/soldered/soldered.h
@@ -23,13 +23,13 @@
k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k115, \
k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k213, k215, \
k300, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, k315, \
- k400, k401, k402, k406, k409, k410, k411, k412, k413, k415 \
+ k400, k401, k402, k406, k409, k411, k412, k413, k415 \
) { \
{ k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, k015 }, \
{ k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, KC_NO, k115 }, \
{ k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, KC_NO, k213, KC_NO, k215 }, \
{ k300, KC_NO, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, KC_NO, k315 }, \
- { k400, k401, k402, KC_NO, KC_NO, KC_NO, k406, KC_NO, KC_NO, k409, k410, k411, k412, k413, KC_NO, k415 } \
+ { k400, k401, k402, KC_NO, KC_NO, KC_NO, k406, KC_NO, KC_NO, k409, KC_NO, k411, k412, k413, KC_NO, k415 } \
}
#define LAYOUT_65_ansi( \
@@ -37,39 +37,39 @@
k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k115, \
k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k213, k215, \
k300, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, k315, \
- k400, k401, k402, k406, k409, k410, k411, k412, k413, k415 \
+ k400, k401, k402, k406, k409, k411, k412, k413, k415 \
) { \
{ k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, KC_NO, k014, k015 }, \
{ k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, KC_NO, k115 }, \
{ k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, KC_NO, k213, KC_NO, k215 }, \
{ k300, KC_NO, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, KC_NO, k315 }, \
- { k400, k401, k402, KC_NO, KC_NO, KC_NO, k406, KC_NO, KC_NO, k409, k410, k411, k412, k413, KC_NO, k415 } \
+ { k400, k401, k402, KC_NO, KC_NO, KC_NO, k406, KC_NO, KC_NO, k409, KC_NO, k411, k412, k413, KC_NO, k415 } \
}
-#define LAYOUT_65_ansi_split_bs_2_right_mods( \
+#define LAYOUT_65_tsangan_split_bs( \
k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, k015, \
k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k115, \
k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k213, k215, \
k300, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, k315, \
- k400, k401, k402, k406, k409, k411, k412, k413, k415 \
+ k400, k401, k402, k406, k411, k412, k413, k415 \
) { \
{ k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, k015 }, \
{ k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, KC_NO, k115 }, \
{ k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, KC_NO, k213, KC_NO, k215 }, \
{ k300, KC_NO, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, KC_NO, k315 }, \
- { k400, k401, k402, KC_NO, KC_NO, KC_NO, k406, KC_NO, KC_NO, k409, KC_NO, k411, k412, k413, KC_NO, k415 } \
+ { k400, k401, k402, KC_NO, KC_NO, KC_NO, k406, KC_NO, KC_NO, KC_NO, KC_NO, k411, k412, k413, KC_NO, k415 } \
}
-#define LAYOUT_65_ansi_2_right_mods( \
+#define LAYOUT_65_iso( \
k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k014, k015, \
- k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k115, \
- k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k213, k215, \
- k300, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, k315, \
+ k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k115, \
+ k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213, k215, \
+ k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, k315, \
k400, k401, k402, k406, k409, k411, k412, k413, k415 \
) { \
{ k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, KC_NO, k014, k015 }, \
- { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, KC_NO, k115 }, \
- { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, KC_NO, k213, KC_NO, k215 }, \
- { k300, KC_NO, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, KC_NO, k315 }, \
+ { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, KC_NO, KC_NO, k115 }, \
+ { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213, KC_NO, k215 }, \
+ { k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, KC_NO, k315 }, \
{ k400, k401, k402, KC_NO, KC_NO, KC_NO, k406, KC_NO, KC_NO, k409, KC_NO, k411, k412, k413, KC_NO, k415 } \
}