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

8 files changed, 355 insertions, 0 deletions

diff --git a/keyboards/dyz/synthesis60/config.h b/keyboards/dyz/synthesis60/config.h
new file mode 100644
index 0000000000..8b14dd4fe6
--- /dev/null
+++ b/keyboards/dyz/synthesis60/config.h
@@ -0,0 +1,37 @@
+/*
+Copyright 2022 dayatz
+
+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 MANUFACTURER    dyz
+#define PRODUCT         Synthesis60 v2.1
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* Bootmagic Lite key configuration */
+#define BOOTMAGIC_LITE_ROW 0
+#define BOOTMAGIC_LITE_COLUMN 0
+
+#define LED_CAPS_LOCK_PIN D5
+#define LED_NUM_LOCK_PIN C7
+#define LED_PIN_ON_STATE 0
+
+#define DYNAMIC_KEYMAP_LAYER_COUNT 3
diff --git a/keyboards/dyz/synthesis60/info.json b/keyboards/dyz/synthesis60/info.json
new file mode 100644
index 0000000000..381e7efb36
--- /dev/null
+++ b/keyboards/dyz/synthesis60/info.json
@@ -0,0 +1,113 @@
+{
+    "keyboard_name": "synthesis60",
+    "url": "https://github.com/dayatz/mechanical-keyboards/tree/master/synthesis60",
+    "maintainer": "dayatz",
+    "diode_direction": "COL2ROW",
+    "matrix_pins": {
+        "cols": [
+            "F7",
+            "F6",
+            "F5",
+            "F4",
+            "F1",
+            "F0",
+            "D7",
+            "D3",
+            "D2",
+            "E6",
+            "B3",
+            "B2",
+            "B1",
+            "B0"
+        ],
+        "rows": ["B4", "B5", "B6", "D6", "D4"]
+    },
+    "rgblight": {
+        "led_count": 19,
+        "pin": "B7",
+        "hue_steps": 10,
+        "saturation_steps": 10,
+        "brightness_steps": 10,
+        "animations": {
+            "all": true
+        }
+    },
+    "usb": {
+        "vid": "0xD772",
+        "pid": "0x0017",
+        "device_ver": "0x0001"
+    },
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                { "label": "Home", "x": 0, "y": 0 },
+                { "label": "~", "x": 1.25, "y": 0 },
+                { "label": "!", "x": 2.25, "y": 0 },
+                { "label": "@", "x": 3.25, "y": 0 },
+                { "label": "#", "x": 4.25, "y": 0 },
+                { "label": "$", "x": 5.25, "y": 0 },
+                { "label": "%", "x": 6.25, "y": 0 },
+                { "label": "^", "x": 7.25, "y": 0 },
+                { "label": "&", "x": 10.25, "y": 0 },
+                { "label": "*", "x": 11.25, "y": 0 },
+                { "label": "(", "x": 12.25, "y": 0 },
+                { "label": ")", "x": 13.25, "y": 0 },
+                { "label": "_", "x": 14.25, "y": 0 },
+                { "label": "+", "x": 15.25, "y": 0 },
+                { "label": "|", "x": 16.25, "y": 0 },
+                { "label": "~", "x": 17.25, "y": 0 },
+                { "label": "PgUp", "x": 0, "y": 1 },
+                { "label": "Tab", "x": 1.25, "y": 1, "w": 1.5 },
+                { "label": "Q", "x": 2.75, "y": 1 },
+                { "label": "W", "x": 3.75, "y": 1 },
+                { "label": "E", "x": 4.75, "y": 1 },
+                { "label": "R", "x": 5.75, "y": 1 },
+                { "label": "T", "x": 6.75, "y": 1 },
+                { "label": "Y", "x": 9.75, "y": 1 },
+                { "label": "U", "x": 10.75, "y": 1 },
+                { "label": "I", "x": 11.75, "y": 1 },
+                { "label": "O", "x": 12.75, "y": 1 },
+                { "label": "P", "x": 13.75, "y": 1 },
+                { "label": "{", "x": 14.75, "y": 1 },
+                { "label": "}", "x": 15.75, "y": 1 },
+                { "label": "Backspace", "x": 16.75, "y": 1, "w": 1.5 },
+                { "label": "PgDn", "x": 0, "y": 2 },
+                { "label": "Caps Lock", "x": 1.25, "y": 2, "w": 1.75 },
+                { "label": "A", "x": 3, "y": 2 },
+                { "label": "S", "x": 4, "y": 2 },
+                { "label": "D", "x": 5, "y": 2 },
+                { "label": "F", "x": 6, "y": 2 },
+                { "label": "G", "x": 7, "y": 2 },
+                { "label": "H", "x": 10, "y": 2 },
+                { "label": "J", "x": 11, "y": 2 },
+                { "label": "K", "x": 12, "y": 2 },
+                { "label": "L", "x": 13, "y": 2 },
+                { "label": ":", "x": 14, "y": 2 },
+                { "label": "\"", "x": 15, "y": 2 },
+                { "label": "Enter", "x": 16, "y": 2, "w": 2.25 },
+                { "label": "Shift", "x": 1.25, "y": 3, "w": 2.25 },
+                { "label": "Z", "x": 3.5, "y": 3 },
+                { "label": "X", "x": 4.5, "y": 3 },
+                { "label": "C", "x": 5.5, "y": 3 },
+                { "label": "V", "x": 6.5, "y": 3 },
+                { "label": "B", "x": 7.5, "y": 3 },
+                { "label": "B", "x": 9.5, "y": 3 },
+                { "label": "N", "x": 10.5, "y": 3 },
+                { "label": "M", "x": 11.5, "y": 3 },
+                { "label": "<", "x": 12.5, "y": 3 },
+                { "label": ">", "x": 13.5, "y": 3 },
+                { "label": "?", "x": 14.5, "y": 3 },
+                { "label": "Shift", "x": 15.5, "y": 3, "w": 1.75 },
+                { "label": "Fn", "x": 17.25, "y": 3 },
+                { "label": "Ctrl", "x": 1.25, "y": 4, "w": 1.5 },
+                { "label": "Alt", "x": 4, "y": 4, "w": 1.5 },
+                { "label": "Space", "x": 5.5, "y": 4, "w": 2.25 },
+                { "label": "Space", "x": 7.75, "y": 4 },
+                { "label": "Space", "x": 9.5, "y": 4, "w": 1.5 },
+                { "label": "Space", "x": 11, "y": 4, "w": 1.25 },
+                { "label": "Alt", "x": 12.25, "y": 4, "w": 1.5 },
+                { "label": "Ctrl", "x": 16.75, "y": 4, "w": 1.5 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/dyz/synthesis60/keymaps/default/keymap.c b/keyboards/dyz/synthesis60/keymaps/default/keymap.c
new file mode 100644
index 0000000000..5cf1b94cf3
--- /dev/null
+++ b/keyboards/dyz/synthesis60/keymaps/default/keymap.c
@@ -0,0 +1,56 @@
+/* Copyright 2019 Ryota Goto
+ *
+ * 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,
+    _FN2
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [_BASE] = LAYOUT_all( /* Base */
+    KC_HOME, 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_DEL,
+    KC_PGUP, 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_PGDN, 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_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                  KC_B, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_DEL,
+             KC_LCTL,                    KC_LALT, KC_SPC, MO(1),                 KC_SPC, KC_SPC, KC_RALT, KC_RCTL
+  ),
+  [_FN] = LAYOUT_all(
+    RGB_TOG, _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,    KC_F11, KC_F12,  _______, _______,
+    KC_VOLU, _______,  _______,    KC_HOME,    KC_UP,    KC_END,    _______,    _______,    _______,    _______,    _______,    _______,    _______, _______,          _______,
+    KC_VOLD, _______, _______,    KC_LEFT,    KC_DOWN,    KC_RIGHT,    _______,    _______,    _______,    _______,    _______,    _______, _______,                   _______,
+             _______, _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______, _______,  _______,          _______, _______,
+             _______,          _______, _______, _______, _______, _______, _______, _______, _______
+  ),
+  [_FN2] = LAYOUT_all(
+    _______, _______,  _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______, _______,  _______, _______,
+    _______, _______,  _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______, _______,          _______,
+    _______, _______, _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______, _______,                   _______,
+             _______, _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______, _______,  _______,          _______, _______,
+             _______,          _______, _______, _______, _______, _______, _______, _______, _______
+  )
+};
+
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+    if (get_highest_layer(state) != 0) {
+        writePinLow(C6);
+    } else {
+        writePinHigh(C6);
+    }
+    return state;
+}
diff --git a/keyboards/dyz/synthesis60/keymaps/via/keymap.c b/keyboards/dyz/synthesis60/keymaps/via/keymap.c
new file mode 100644
index 0000000000..5cf1b94cf3
--- /dev/null
+++ b/keyboards/dyz/synthesis60/keymaps/via/keymap.c
@@ -0,0 +1,56 @@
+/* Copyright 2019 Ryota Goto
+ *
+ * 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,
+    _FN2
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [_BASE] = LAYOUT_all( /* Base */
+    KC_HOME, 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_DEL,
+    KC_PGUP, 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_PGDN, 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_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                  KC_B, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_DEL,
+             KC_LCTL,                    KC_LALT, KC_SPC, MO(1),                 KC_SPC, KC_SPC, KC_RALT, KC_RCTL
+  ),
+  [_FN] = LAYOUT_all(
+    RGB_TOG, _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,    KC_F11, KC_F12,  _______, _______,
+    KC_VOLU, _______,  _______,    KC_HOME,    KC_UP,    KC_END,    _______,    _______,    _______,    _______,    _______,    _______,    _______, _______,          _______,
+    KC_VOLD, _______, _______,    KC_LEFT,    KC_DOWN,    KC_RIGHT,    _______,    _______,    _______,    _______,    _______,    _______, _______,                   _______,
+             _______, _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______, _______,  _______,          _______, _______,
+             _______,          _______, _______, _______, _______, _______, _______, _______, _______
+  ),
+  [_FN2] = LAYOUT_all(
+    _______, _______,  _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______, _______,  _______, _______,
+    _______, _______,  _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______, _______,          _______,
+    _______, _______, _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______, _______,                   _______,
+             _______, _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______, _______,  _______,          _______, _______,
+             _______,          _______, _______, _______, _______, _______, _______, _______, _______
+  )
+};
+
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+    if (get_highest_layer(state) != 0) {
+        writePinLow(C6);
+    } else {
+        writePinHigh(C6);
+    }
+    return state;
+}
diff --git a/keyboards/dyz/synthesis60/keymaps/via/rules.mk b/keyboards/dyz/synthesis60/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/dyz/synthesis60/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/dyz/synthesis60/rules.mk b/keyboards/dyz/synthesis60/rules.mk
new file mode 100644
index 0000000000..fe65a2143c
--- /dev/null
+++ b/keyboards/dyz/synthesis60/rules.mk
@@ -0,0 +1,20 @@
+# 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 = 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
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+ENCODER_ENABLE = no
+OLED_ENABLE = yes
diff --git a/keyboards/dyz/synthesis60/synthesis60.c b/keyboards/dyz/synthesis60/synthesis60.c
new file mode 100644
index 0000000000..c56a61b1ec
--- /dev/null
+++ b/keyboards/dyz/synthesis60/synthesis60.c
@@ -0,0 +1,31 @@
+/* Copyright 2019 Ryota Goto
+ *
+ * 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 "synthesis60.h"
+
+#ifdef OLED_ENABLE
+bool oled_task_kb(void) {
+    if (!oled_task_kb()) { return false; }
+    // Host Keyboard Layer Status
+    oled_write_P(PSTR("Synthesis60\nLayer: "), false);
+    // Host Keyboard LED Status
+    led_t led_state = host_keyboard_led_state();
+    oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR("    "), false);
+    oled_write_P(led_state.caps_lock ? PSTR("CAP ") : PSTR("    "), false);
+    oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR("    "), false);
+
+    return true;
+}
+#endif
diff --git a/keyboards/dyz/synthesis60/synthesis60.h b/keyboards/dyz/synthesis60/synthesis60.h
new file mode 100644
index 0000000000..0ad730e128
--- /dev/null
+++ b/keyboards/dyz/synthesis60/synthesis60.h
@@ -0,0 +1,41 @@
+/* Copyright 2019 Ryota Goto
+ *
+ * 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 KNO KC_NO
+
+/* This a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+#define LAYOUT_all( \
+	K40, K00, K01, K02, K03, K04, K05, K06,     K07, K08, K09, K0A, K0B, K0C, K0D, K4D, \
+    K41, K10, K11, K12, K13, K14, K15,          K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
+    K42, K20, K21, K22, K23, K24, K25,          K26, K27, K28, K29, K2A, K2B, K2C,     \
+         K30, K31, K32, K33, K34, K35,          K36, K37, K38, K39, K3A, K3B, K3C, K3D, \
+         K43,           K44, K45, K46,          K47, K48, K49,                     K4C \
+) { \
+	{ K00,  K01,  K02,  K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
+	{ K10,  K11,  K12,  K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
+	{ K20,  K21,  K22,  K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, KNO }, \
+	{ K30,  K31,  K32,  K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \
+	{ K40,  K41,  K42,  K43, K44, K45, K46, K47, K48, K49, KNO, KNO, K4C, K4D }  \
+}