Merge branch 'master' into taamas

15 files changed, 164 insertions, 34 deletions

diff --git a/keyboards/spaceman/2_milk/config.h b/keyboards/spaceman/2_milk/config.h
index 5c264f44ac..2a4b2889d0 100644
--- a/keyboards/spaceman/2_milk/config.h
+++ b/keyboards/spaceman/2_milk/config.h
@@ -16,13 +16,6 @@
 #pragma once
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x5342 // "SB"
-#define PRODUCT_ID      0x3225 // "2%"
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Spaceman
-#define PRODUCT         2% Milk
-
 /* key matrix size */
 #define MATRIX_ROWS 2
 #define MATRIX_COLS 1
@@ -32,7 +25,6 @@
     {D4}, \
     {C6}  \
 }
-#define UNUSED_PINS
 
 #ifdef RGBLIGHT_ENABLE
 #define RGB_DI_PIN B6
diff --git a/keyboards/spaceman/2_milk/info.json b/keyboards/spaceman/2_milk/info.json
index 288bc0144c..8cdf474517 100644
--- a/keyboards/spaceman/2_milk/info.json
+++ b/keyboards/spaceman/2_milk/info.json
@@ -1,7 +1,13 @@
 {
   "keyboard_name": "2% Milk",
+  "manufacturer": "Spaceman",
   "url": "",
   "maintainer": "Spaceman",
+  "usb": {
+    "vid": "0x5342",
+    "pid": "0x3225",
+    "device_version": "0.0.1"
+  },
   "layouts": {
     "LAYOUT": {
       "layout": [ {"x": 0, "y": 0 }, {"x": 0, "y": 1 }]
diff --git a/keyboards/spaceman/2_milk/keymaps/copypasta_macfancy/config.h b/keyboards/spaceman/2_milk/keymaps/copypasta_macfancy/config.h
new file mode 100644
index 0000000000..bbd93cfc16
--- /dev/null
+++ b/keyboards/spaceman/2_milk/keymaps/copypasta_macfancy/config.h
@@ -0,0 +1,6 @@
+// Copyright 2022 Ryan Neff (@JellyTitan)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define TAPPING_TERM 200
diff --git a/keyboards/spaceman/2_milk/keymaps/copypasta_macfancy/keymap.c b/keyboards/spaceman/2_milk/keymaps/copypasta_macfancy/keymap.c
new file mode 100644
index 0000000000..6f21c630bf
--- /dev/null
+++ b/keyboards/spaceman/2_milk/keymaps/copypasta_macfancy/keymap.c
@@ -0,0 +1,56 @@
+// Copyright 2022 Ryan Neff (@JellyTitan)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum tapdance_keycodes { 
+    TD_KEY_1,
+    TD_KEY_2
+};
+
+void dance_key_one(qk_tap_dance_state_t *state, void *user_data) {
+    if (state->count == 1) {
+        /* Copy for Mac. */
+        /* Windows & Linux use Ctrl+C: tap_code16(C(KC_C)) */
+        tap_code16(G(KC_C));
+        reset_tap_dance(state);
+    } else if (state->count == 2) {
+        /* Cut for Mac. */
+        /* Windows & Linux use Ctrl+X: tap_code16(C(KC_X)) */
+        tap_code16(G(KC_X));
+        reset_tap_dance(state);
+    } else if (state->count == 3) {
+        /* Plain old Tab. */
+        tap_code(KC_TAB);
+        reset_tap_dance(state);
+    }
+}
+
+void dance_key_two(qk_tap_dance_state_t *state, void *user_data) {
+    if (state->count == 1) {
+        /* Paste for Mac. */
+        /* Windows & Linux use Ctrl+V: tap_code16(C(KC_V)) */
+        tap_code16(G(KC_V));
+        reset_tap_dance(state);
+    } else if (state->count == 2) {
+        /* Paste as value Gui+Shift+V for Mac. */
+        /* Windows & Linux use Ctrl+Shift V: tap_code16(C(S(KC_V))) */
+        tap_code16(G(S(KC_V)));
+        reset_tap_dance(state);
+    } else if (state->count == 3) {
+        /* Tab between programs for mac Gui+Tab.  */
+        /* Windows & Linux use Ctrl+Tab: tap_code16(C(KC_TAB)) */
+        tap_code16(G(KC_TAB));
+        reset_tap_dance(state);
+    }
+}
+
+qk_tap_dance_action_t tap_dance_actions[] = {
+    [TD_KEY_1] = ACTION_TAP_DANCE_FN(dance_key_one), 
+    [TD_KEY_2] = ACTION_TAP_DANCE_FN(dance_key_two)
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(TD(TD_KEY_1),
+    TD(TD_KEY_2))
+};
diff --git a/keyboards/spaceman/2_milk/keymaps/copypasta_macfancy/readme.md b/keyboards/spaceman/2_milk/keymaps/copypasta_macfancy/readme.md
new file mode 100644
index 0000000000..722e7491bc
--- /dev/null
+++ b/keyboards/spaceman/2_milk/keymaps/copypasta_macfancy/readme.md
@@ -0,0 +1,18 @@
+# Copypasta Macfancy Keymap for Milk 2%
+
+![copypasta_macfancy](https://i.imgur.com/7LMZZrL.png)
+
+Extra fancy copy/paste utilities for the Milk 2% keyboard on MacOS. Milk 2% designed by [Spaceman](https://github.com/Spaceboards/SpaceboardsHardware/tree/master/Keyboards/2%25%20Milk).
+
+Uses Tapping term for double and tripple tapping.
+Tapping speed can be adjusted with TAPPING_TERM in config.h
+
+### Key One
+- 1 Tap: Copy
+- 2 Taps: Cut
+- 3 Taps: Tab
+
+### Key Two
+- 1 Tap: Paste
+- 2 Taps: Paste as Value
+- 3 Taps: Tab between programs
diff --git a/keyboards/spaceman/2_milk/keymaps/copypasta_macfancy/rules.mk b/keyboards/spaceman/2_milk/keymaps/copypasta_macfancy/rules.mk
new file mode 100644
index 0000000000..628a960a71
--- /dev/null
+++ b/keyboards/spaceman/2_milk/keymaps/copypasta_macfancy/rules.mk
@@ -0,0 +1,4 @@
+# Copyright 2022 Ryan Neff (@JellyTitan)
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+TAP_DANCE_ENABLE = yes	# Tap Dance
diff --git a/keyboards/spaceman/pancake/rev1/config.h b/keyboards/spaceman/pancake/rev1/config.h
index e05a618e4a..46eb28d6ba 100644
--- a/keyboards/spaceman/pancake/rev1/config.h
+++ b/keyboards/spaceman/pancake/rev1/config.h
@@ -16,13 +16,6 @@
 #pragma once
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x5342 // SB 
-#define PRODUCT_ID      0x504B // PK
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Spaceman
-#define PRODUCT         Pancake
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 12
diff --git a/keyboards/spaceman/pancake/rev1/feather/config.h b/keyboards/spaceman/pancake/rev1/feather/config.h
index cb80721e46..c593147151 100644
--- a/keyboards/spaceman/pancake/rev1/feather/config.h
+++ b/keyboards/spaceman/pancake/rev1/feather/config.h
@@ -19,6 +19,5 @@
 /* Pancake default pinout */
 #define MATRIX_ROW_PINS { B5, D7, C6, D0 }
 #define MATRIX_COL_PINS { C7, D6, B7, B6, F0, D2, D3, F1, F4, F5, F6, F7 }
-#define UNUSED_PINS
 
 #define VIA_HAS_BROKEN_KEYCODES
diff --git a/keyboards/spaceman/pancake/rev1/info.json b/keyboards/spaceman/pancake/rev1/info.json
index 7462b5bf6b..b05601cfa4 100644
--- a/keyboards/spaceman/pancake/rev1/info.json
+++ b/keyboards/spaceman/pancake/rev1/info.json
@@ -1,7 +1,13 @@
 {
   "keyboard_name": "Pancake",
+  "manufacturer": "Spaceman",
   "url": "",
   "maintainer": "Spaceman",
+  "usb": {
+    "vid": "0x5342",
+    "pid": "0x504B",
+    "device_version": "0.0.1"
+  },
   "layouts": {
     "LAYOUT_planck_mit": {
       "layout": [ 
diff --git a/keyboards/spaceman/pancake/rev1/promicro/config.h b/keyboards/spaceman/pancake/rev1/promicro/config.h
index ee02bff2b8..e96d9f152c 100644
--- a/keyboards/spaceman/pancake/rev1/promicro/config.h
+++ b/keyboards/spaceman/pancake/rev1/promicro/config.h
@@ -19,4 +19,3 @@
 /* Pancake default pinout */
 #define MATRIX_ROW_PINS { B1, B3, B2, B6 }
 #define MATRIX_COL_PINS { F4, F5, F6, F7, E6, B4, B5, D7, C6, D4, D0, D1 }
-#define UNUSED_PINS
\ No newline at end of file
diff --git a/keyboards/spaceman/pancake/rev2/config.h b/keyboards/spaceman/pancake/rev2/config.h
index a4d3b439c4..15d483a82e 100644
--- a/keyboards/spaceman/pancake/rev2/config.h
+++ b/keyboards/spaceman/pancake/rev2/config.h
@@ -16,13 +16,6 @@
 #pragma once
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x5342 // SB
-#define PRODUCT_ID      0x5032 // P2
-#define DEVICE_VER      0x0002
-#define MANUFACTURER    Spaceman
-#define PRODUCT         Pancake 2
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 12
@@ -31,4 +24,3 @@
 
 #define MATRIX_ROW_PINS { C7, C6, B6, B5 }
 #define MATRIX_COL_PINS { B7, B3, B2, B1 ,B0, E6, F0, F1, F4, F5, F6, F7 }
-#define UNUSED_PINS
diff --git a/keyboards/spaceman/pancake/rev2/info.json b/keyboards/spaceman/pancake/rev2/info.json
index a5a4aad132..300d0f6090 100644
--- a/keyboards/spaceman/pancake/rev2/info.json
+++ b/keyboards/spaceman/pancake/rev2/info.json
@@ -1,7 +1,13 @@
 {
   "keyboard_name": "Pancake 2",
+  "manufacturer": "Spaceman",
   "url": "",
   "maintainer": "Spaceman",
+  "usb": {
+    "vid": "0x5342",
+    "pid": "0x5032",
+    "device_version": "0.0.2"
+  },
   "layouts": {
 		"LAYOUT_ortho_4x12": {
       "layout": [ 
diff --git a/keyboards/spaceman/pancake/rev2/readme.md b/keyboards/spaceman/pancake/rev2/readme.md
index e8b65c4888..5b68180741 100644
--- a/keyboards/spaceman/pancake/rev2/readme.md
+++ b/keyboards/spaceman/pancake/rev2/readme.md
@@ -10,3 +10,58 @@ Make example for this keyboard (after setting up your build environment):
     make spaceman/pancake/rev2: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).
+
+
+Alternative OLED Logos:
+
+![Japanese](https://i.imgur.com/g666Wvn.png)
+```C
+    0x00, 0xC0, 0x3C, 0x00, 0x04, 0x1A,
+    0xE4, 0x00, 0x82, 0x84, 0x40, 0x20,
+    0x18, 0x00, 0x10, 0x0E, 0x84, 0x7C,
+    0x04, 0x00, 0x10, 0x10, 0x10, 0x10,
+    0x10, 0x00, 0x24, 0x24, 0xFE, 0x24,
+    0x24, 0x00, 0x00, 0xC0, 0x20, 0x10,
+    0x10, 0x08, 0x08, 0x08, 0x08, 0x04,
+    0x04, 0x04, 0x04, 0x04, 0x64, 0x74,
+    0x74, 0x34, 0x04, 0x04, 0x04, 0x04,
+    0x04, 0x08, 0x08, 0x08, 0x08, 0x10,
+    0x10, 0x20, 0xC0, 0x00, 0x00, 0x8C,
+    0x53, 0x22, 0x22, 0x44, 0xC4, 0x5C,
+    0x4C, 0x88, 0x88, 0x88, 0x88, 0x88,
+    0x88, 0x88, 0x88, 0x88, 0x88, 0x88,
+    0x88, 0x88, 0x88, 0x44, 0x44, 0x44,
+    0xC4, 0x22, 0x22, 0x53, 0x8C, 0x00,
+    0x00, 0x01, 0x0E, 0x04, 0x04, 0x08,
+    0x09, 0x08, 0x08, 0x10, 0x10, 0x10,
+    0x10, 0x10, 0x10, 0x11, 0x13, 0x10,
+    0x10, 0x10, 0x10, 0x10, 0x10, 0x18,
+    0x08, 0x08, 0x08, 0x04, 0x04, 0x02,
+    0x01, 0x00,
+```
+![Trans Rights](https://i.imgur.com/TijjY6j.png)
+
+```c
+    0x00, 0x00, 0x00, 0x02, 0x02, 0xFE,
+    0x02, 0x02, 0x00, 0xFE, 0x12, 0x12,
+    0xEC, 0x00, 0xFC, 0x12, 0x12, 0xFC,
+    0x00, 0xFE, 0x04, 0x18, 0x20, 0xFE,
+    0x00, 0x8C, 0x92, 0x92, 0x62, 0x00,
+    0x00, 0x00, 0x00, 0xFE, 0x12, 0x12,
+    0xEC, 0x00, 0x82, 0xFE, 0x82, 0x00,
+    0x7C, 0x82, 0x82, 0x92, 0x70, 0x00,
+    0xFE, 0x10, 0x10, 0xFE, 0x00, 0x02,
+    0x02, 0xFE, 0x02, 0x02, 0x00, 0x8C,
+    0x92, 0x92, 0x62, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0xC0, 0xF0, 0xF0, 0xF8,
+    0x98, 0x98, 0xF8, 0xF8, 0xF8, 0xF8,
+    0xFC, 0xFE, 0xFE, 0xFE, 0xF6, 0xF2,
+    0xF0, 0xE0, 0xE0, 0xC0, 0xC0, 0xC0,
+    0xE0, 0xF0, 0x70, 0x30, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x01, 0x03,
+    0x07, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F,
+    0x0F, 0x0F, 0x0F, 0x1F, 0x3F, 0x7F,
+    0x7F, 0x6F, 0x07, 0x07, 0x03, 0x03,
+    0x03, 0x03, 0x0F, 0x1F, 0x1E, 0x18,
+    0x00, 0x00,
+```
diff --git a/keyboards/spaceman/yun65/config.h b/keyboards/spaceman/yun65/config.h
index def4bb9576..6f4c4e4050 100644
--- a/keyboards/spaceman/yun65/config.h
+++ b/keyboards/spaceman/yun65/config.h
@@ -16,13 +16,6 @@
 #pragma once
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x5342 // "SB"
-#define PRODUCT_ID      0x594E // "YN"
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Spaceman
-#define PRODUCT         Yun 65
-
 /* Key Matrix perameter */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 16
@@ -31,4 +24,3 @@
 #define MATRIX_ROW_PINS { E6, D3, D2, D1, D0 }
 #define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, D4, D6, D7, B4, B5, B6, C6, C7, D5, B3 }
 
-#define UNUSED_PINS
diff --git a/keyboards/spaceman/yun65/info.json b/keyboards/spaceman/yun65/info.json
index 113b6983a6..0caaa1521e 100644
--- a/keyboards/spaceman/yun65/info.json
+++ b/keyboards/spaceman/yun65/info.json
@@ -1,7 +1,13 @@
 {
-  "keyboard_name": "yun65",
+  "keyboard_name": "Yun 65",
+  "manufacturer": "Spaceman",
   "url": "",
   "maintainer": "Spaceman",
+  "usb": {
+    "vid": "0x5342",
+    "pid": "0x594E",
+    "device_version": "0.0.1"
+  },
   "layouts": {
     "LAYOUT": {
       "layout": [