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

18 files changed, 650 insertions, 179 deletions

diff --git a/keyboards/atlantis/ps17/config.h b/keyboards/atlantis/ps17/config.h
new file mode 100644
index 0000000000..5638e334bd
--- /dev/null
+++ b/keyboards/atlantis/ps17/config.h
@@ -0,0 +1,53 @@
+// Copyright 2023 mjbogusz (@mjbogusz)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+/* Indicator LEDs */
+#define LED_INDICATOR_0_PIN D0
+#define LED_INDICATOR_1_PIN D5
+#define LED_INDICATOR_2_PIN D4
+
+/* RGB matrix */
+#define RGB_DI_PIN B7
+#define RGB_MATRIX_LED_COUNT 28
+#define RGB_MATRIX_KEYPRESSES
+#define RGB_DISABLE_WHEN_USB_SUSPENDED
+
+#ifdef RGB_MATRIX_ENABLE
+	// RGB Matrix Animation modes. Explicitly enabled
+	// For full list of effects, see:
+	// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
+	#define ENABLE_RGB_MATRIX_SOLID_COLOR
+	// #define ENABLE_RGB_MATRIX_ALPHAS_MODS
+	// #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+	// #define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+	// #define ENABLE_RGB_MATRIX_BREATHING
+	// #define ENABLE_RGB_MATRIX_BAND_SAT
+	// #define ENABLE_RGB_MATRIX_BAND_VAL
+	// #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+	// #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+	// #define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+	// #define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+	#define ENABLE_RGB_MATRIX_CYCLE_ALL
+	// #define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+	// #define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+	// #define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+	// #define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+	// #define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+	#define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+	// #define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+	// #define ENABLE_RGB_MATRIX_DUAL_BEACON
+	#define ENABLE_RGB_MATRIX_RAINBOW_BEACON
+	// #define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+	// #define ENABLE_RGB_MATRIX_RAINDROPS
+	// #define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+	// #define ENABLE_RGB_MATRIX_HUE_BREATHING
+	// #define ENABLE_RGB_MATRIX_HUE_PENDULUM
+	// #define ENABLE_RGB_MATRIX_HUE_WAVE
+	// #define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+	// #define ENABLE_RGB_MATRIX_PIXEL_FLOW
+	#define ENABLE_RGB_MATRIX_PIXEL_RAIN
+	// #define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+	// #define ENABLE_RGB_MATRIX_DIGITAL_RAIN
+#endif
diff --git a/keyboards/atlantis/ps17/info.json b/keyboards/atlantis/ps17/info.json
new file mode 100644
index 0000000000..5b025c83f7
--- /dev/null
+++ b/keyboards/atlantis/ps17/info.json
@@ -0,0 +1,99 @@
+{
+    "manufacturer": "Atlantis",
+    "keyboard_name": "PS17",
+    "maintainer": "mjbogusz",
+    "url": "https://qmk.fm/keyboards/",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "bootloader_instructions": "To reset the board into bootloader mode, tap the Reset switch mounted on the bottom of the PCB.",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x414B",
+        "vid": "0x0015"
+    },
+    "features": {
+        "bootmagic": false,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "encoder": true,
+        "rgb_matrix": true
+    },
+    "diode_direction": "COL2ROW",
+    "matrix_pins": {
+        "cols": ["F6", "F7", "D3", "D6"],
+        "rows": ["F0", "B4", "B5", "B6", "C6", "C7", "NO_PIN", "NO_PIN", "NO_PIN", "NO_PIN", "NO_PIN"]
+    },
+    "encoder": {
+        "rotary": [{
+            "pin_a": "D2",
+            "pin_b": "D1"
+        }]
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                { "matrix": [0, 1], "x": 0, "y": 0},
+
+                { "matrix": [1, 0], "x": 0, "y": 1.5},
+                { "matrix": [1, 1], "x": 1, "y": 1.5},
+                { "matrix": [1, 2], "x": 2, "y": 1.5},
+                { "matrix": [1, 3], "x": 3, "y": 1.5},
+
+                { "matrix": [2, 0], "x": 0, "y": 2.5},
+                { "matrix": [2, 1], "x": 1, "y": 2.5},
+                { "matrix": [2, 2], "x": 2, "y": 2.5},
+                { "matrix": [2, 3], "x": 3, "y": 2.5, "h": 2},
+
+                { "matrix": [3, 0], "x": 0, "y": 3.5},
+                { "matrix": [3, 1], "x": 1, "y": 3.5},
+                { "matrix": [3, 2], "x": 2, "y": 3.5},
+
+                { "matrix": [4, 0], "x": 0, "y": 4.5},
+                { "matrix": [4, 1], "x": 1, "y": 4.5},
+                { "matrix": [4, 2], "x": 2, "y": 4.5},
+                { "matrix": [4, 3], "x": 3, "y": 4.5, "h": 2},
+
+                { "matrix": [5, 0], "x": 0, "y": 5.5, "w": 2},
+                { "matrix": [5, 2], "x": 2, "y": 5.5}
+            ]
+        }
+    },
+    "rgb_matrix": {
+        "driver": "WS2812",
+        "center_point": [126, 126],
+        "layout": [
+            { "flags": 4, "matrix": [1, 0], "x": 74, "y": 165 },
+            { "flags": 4, "matrix": [1, 1], "x": 108, "y": 165 },
+            { "flags": 4, "matrix": [1, 2], "x": 144, "y": 165 },
+            { "flags": 4, "matrix": [1, 3], "x": 179, "y": 165 },
+            { "flags": 4, "matrix": [2, 0], "x": 74, "y": 129 },
+            { "flags": 4, "matrix": [2, 1], "x": 109, "y": 129 },
+            { "flags": 4, "matrix": [2, 2], "x": 143, "y": 129 },
+            { "flags": 4, "matrix": [2, 3], "x": 188, "y": 121 },
+            { "flags": 4, "matrix": [3, 0], "x": 74, "y": 95 },
+            { "flags": 4, "matrix": [3, 1], "x": 109, "y": 95 },
+            { "flags": 4, "matrix": [3, 2], "x": 143, "y": 95 },
+            { "flags": 4, "matrix": [4, 0], "x": 73, "y": 60 },
+            { "flags": 4, "matrix": [4, 1], "x": 109, "y": 60 },
+            { "flags": 4, "matrix": [4, 2], "x": 144, "y": 60 },
+            { "flags": 4, "matrix": [4, 3], "x": 188, "y": 51 },
+            { "flags": 4, "matrix": [5, 0], "x": 91, "y": 25 },
+            { "flags": 4, "matrix": [5, 2], "x": 144, "y": 25 },
+
+            { "flags": 2, "x": 61, "y": 26},
+            { "flags": 2, "x": 61, "y": 88},
+            { "flags": 2, "x": 61, "y": 158},
+            { "flags": 2, "x": 61, "y": 197},
+            { "flags": 2, "x": 61, "y": 232},
+            { "flags": 2, "x": 192, "y": 232},
+            { "flags": 2, "x": 192, "y": 196},
+            { "flags": 2, "x": 192, "y": 158},
+            { "flags": 2, "x": 192, "y": 87},
+            { "flags": 2, "x": 183, "y": 26},
+            { "flags": 2, "x": 127, "y": 24}
+        ]
+    }
+}
diff --git a/keyboards/atlantis/ps17/keymaps/default/keymap.c b/keyboards/atlantis/ps17/keymaps/default/keymap.c
new file mode 100644
index 0000000000..b5d36f02a7
--- /dev/null
+++ b/keyboards/atlantis/ps17/keymaps/default/keymap.c
@@ -0,0 +1,49 @@
+// Copyright 2023 mjbogusz (@mjbogusz)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    // Default layer: numpad + volume control
+    [0] = LAYOUT(
+                 KC_MUTE,
+        TO(1),   KC_PSLS, KC_PAST, KC_PMNS,
+        KC_KP_7, KC_KP_8, KC_KP_9, KC_PPLS,
+        KC_KP_4, KC_KP_5, KC_KP_6,
+        KC_KP_1, KC_KP_2, KC_KP_3, KC_PENT,
+        KC_KP_0,          KC_PDOT
+    ),
+    [1] = LAYOUT(
+                 RGB_MOD,
+        TO(2),   KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,          KC_TRNS
+    ),
+    [2] = LAYOUT(
+                 RGB_MOD,
+        TO(3),   KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,          KC_TRNS
+    ),
+    [3] = LAYOUT(
+                 RGB_MOD,
+        TO(0),   KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,          KC_TRNS
+    ),
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [1] = { ENCODER_CCW_CW(RGB_HUI, RGB_HUD) },
+    [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    [3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+};
+#endif
diff --git a/keyboards/atlantis/ps17/keymaps/multimedia/keymap.c b/keyboards/atlantis/ps17/keymaps/multimedia/keymap.c
new file mode 100644
index 0000000000..32d20ef86c
--- /dev/null
+++ b/keyboards/atlantis/ps17/keymaps/multimedia/keymap.c
@@ -0,0 +1,49 @@
+// Copyright 2023 mjbogusz (@mjbogusz)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    // Default layer: numpad + volume control
+    [0] = LAYOUT(
+                 KC_MUTE,
+        TO(1),   KC_PSLS, KC_PAST, KC_PMNS,
+        KC_KP_7, KC_KP_8, KC_KP_9, KC_PPLS,
+        KC_KP_4, KC_KP_5, KC_KP_6,
+        KC_KP_1, KC_KP_2, KC_KP_3, KC_PENT,
+        KC_KP_0,          KC_PDOT
+    ),
+    [1] = LAYOUT(
+                 KC_MUTE,
+        TO(2),   XXXXXXX, XXXXXXX, KC_VOLD,
+        XXXXXXX, XXXXXXX, XXXXXXX, KC_VOLU,
+        KC_MRWD, KC_MPLY, KC_MFFD,
+        KC_MPRV, KC_MSTP, KC_MNXT, KC_MSEL,
+        XXXXXXX,          XXXXXXX
+    ),
+    [2] = LAYOUT(
+                 RGB_MOD,
+        TO(3),   KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,          KC_TRNS
+    ),
+    [3] = LAYOUT(
+                 KC_TRNS,
+        TO(0),   KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,          KC_TRNS
+    ),
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [1] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [2] = { ENCODER_CCW_CW(RGB_HUI, RGB_HUD) },
+    [3] = { ENCODER_CCW_CW(RGB_HUI, RGB_HUD) },
+};
+#endif
diff --git a/keyboards/atlantis/ps17/keymaps/multimedia/rules.mk b/keyboards/atlantis/ps17/keymaps/multimedia/rules.mk
new file mode 100644
index 0000000000..ee32568148
--- /dev/null
+++ b/keyboards/atlantis/ps17/keymaps/multimedia/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/atlantis/ps17/keymaps/via/keymap.c b/keyboards/atlantis/ps17/keymaps/via/keymap.c
new file mode 100644
index 0000000000..93a158172d
--- /dev/null
+++ b/keyboards/atlantis/ps17/keymaps/via/keymap.c
@@ -0,0 +1,49 @@
+// Copyright 2023 mjbogusz (@mjbogusz)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    // Default layer: numpad + volume control
+    [0] = LAYOUT(
+                 KC_MUTE,
+        TO(1),   KC_PSLS, KC_PAST, KC_PMNS,
+        KC_KP_7, KC_KP_8, KC_KP_9, KC_PPLS,
+        KC_KP_4, KC_KP_5, KC_KP_6,
+        KC_KP_1, KC_KP_2, KC_KP_3, KC_PENT,
+        KC_KP_0,          KC_PDOT
+    ),
+    [1] = LAYOUT(
+                 RGB_MOD,
+        TO(2),   KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,          KC_TRNS
+    ),
+    [2] = LAYOUT(
+                 KC_TRNS,
+        TO(3),   KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,          KC_TRNS
+    ),
+    [3] = LAYOUT(
+                 KC_TRNS,
+        TO(0),   KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,          KC_TRNS
+    ),
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [1] = { ENCODER_CCW_CW(RGB_HUI, RGB_HUD) },
+    [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    [3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+};
+#endif
diff --git a/keyboards/atlantis/ps17/keymaps/via/rules.mk b/keyboards/atlantis/ps17/keymaps/via/rules.mk
new file mode 100644
index 0000000000..715838ecc5
--- /dev/null
+++ b/keyboards/atlantis/ps17/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+ENCODER_MAP_ENABLE = yes
+VIA_ENABLE = yes
diff --git a/keyboards/atlantis/ps17/ps17.c b/keyboards/atlantis/ps17/ps17.c
new file mode 100644
index 0000000000..ccac1ce923
--- /dev/null
+++ b/keyboards/atlantis/ps17/ps17.c
@@ -0,0 +1,53 @@
+// Copyright 2023 mjbogusz (@mjbogusz)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "quantum.h"
+
+layer_state_t layer_state_set_kb(layer_state_t state) {
+    /* Display current layer using indicator LEDs */
+    writePin(LED_INDICATOR_0_PIN, !IS_LAYER_ON_STATE(state, 1));
+    writePin(LED_INDICATOR_1_PIN, !IS_LAYER_ON_STATE(state, 2));
+    writePin(LED_INDICATOR_2_PIN, !IS_LAYER_ON_STATE(state, 3));
+    return layer_state_set_user(state);
+}
+
+void keyboard_pre_init_kb(void) {
+    /* Set indicator LEDs as outputs */
+    setPinOutput(LED_INDICATOR_0_PIN);
+    setPinOutput(LED_INDICATOR_1_PIN);
+    setPinOutput(LED_INDICATOR_2_PIN);
+    keyboard_pre_init_user();
+}
+
+#if defined(ENCODER_ENABLE)
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!encoder_update_user(index, clockwise)) {
+        /* Don't process further events if user function exists and returns false */
+        return false;
+    }
+
+    /* Ignore index - only one encoder on this board */
+    if (clockwise) {
+        tap_code_delay(KC_VOLU, 10);
+    } else {
+        tap_code_delay(KC_VOLD, 10);
+    }
+    return false;
+}
+#endif
+
+#ifdef RGB_MATRIX_ENABLE
+void suspend_power_down_kb(void) {
+    /* Disable indicator LEDs when going to sleep */
+    writePin(LED_INDICATOR_0_PIN, 1);
+    writePin(LED_INDICATOR_1_PIN, 1);
+    writePin(LED_INDICATOR_2_PIN, 1);
+    suspend_power_down_user();
+}
+
+void suspend_wakeup_init_kb(void) {
+    /* Restore indicator LEDs state */
+    layer_state_set_kb(layer_state);
+    suspend_wakeup_init_user();
+}
+#endif
diff --git a/keyboards/atlantis/ps17/readme.md b/keyboards/atlantis/ps17/readme.md
new file mode 100644
index 0000000000..69d735739b
--- /dev/null
+++ b/keyboards/atlantis/ps17/readme.md
@@ -0,0 +1,34 @@
+# atlantis/ps17
+
+![atlantis/ps17](https://i.imgur.com/5qGIv2Kh.jpg)
+
+A 17-key hot-swap numpad/macropad with an EC11 clickable rotary encoder (knob) and RGB backlight and underglow
+
+* Keyboard Maintainer: [mjbogusz](https://github.com/mjbogusz)
+* Hardware Supported: Atlantis PS17
+* Hardware Availability: [AliExpress, SpiderIsland Tech Co., Ltd Store](https://www.aliexpress.com/item/1005003058226085.html)
+* Additional photos:
+    * [Full size](https://i.imgur.com/5qGIv2K.jpg)
+    * [PCB front](https://i.imgur.com/OmGBqvC.jpg)
+    * [PCB back](https://i.imgur.com/rvoZZ5f.jpg)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make atlantis/ps17:default
+
+Flashing example for this keyboard:
+
+    make atlantis/ps17: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).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Physical reset button**: Briefly press the button on the back of the PCB
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
+
+## Attributions
+
+Pin mapping and LED physical layout based on [Solartempest work](https://github.com/solartempest/qmk_firmware/tree/master/keyboards/solartempest/ps17)
diff --git a/keyboards/atlantis/ps17/rules.mk b/keyboards/atlantis/ps17/rules.mk
new file mode 100644
index 0000000000..4da205a168
--- /dev/null
+++ b/keyboards/atlantis/ps17/rules.mk
@@ -0,0 +1 @@
+LTO_ENABLE = yes
diff --git a/keyboards/gray_studio/space65r3/readme.md b/keyboards/gray_studio/space65r3/readme.md
index 4f89d3851a..2de127bd7a 100644
--- a/keyboards/gray_studio/space65r3/readme.md
+++ b/keyboards/gray_studio/space65r3/readme.md
@@ -1,4 +1,4 @@
-# Gray Studio 65 R3
+# Gray Studio Space65 R3
 
 A 65% keyboard by Graystudio. PCB designed and manufactured by DEMO Studio.
 
diff --git a/keyboards/kbdfans/tiger80/config.h b/keyboards/kbdfans/tiger80/config.h
index e4a815d584..58b4d3f933 100644
--- a/keyboards/kbdfans/tiger80/config.h
+++ b/keyboards/kbdfans/tiger80/config.h
@@ -13,13 +13,9 @@
  * 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
 
-#define LOCKING_SUPPORT_ENABLE
-#define LOCKING_RESYNC_ENABLE
+#pragma once
 
-#define RGB_DI_PIN B3
 #ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
@@ -31,13 +27,8 @@
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_EFFECT_RAINBOW_MOOD + 6) 
+#define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_EFFECT_RAINBOW_MOOD + 6)
 #define RGBLIGHT_DEFAULT_SPD 15
-#define RGBLED_NUM 20
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 10
-#define RGBLIGHT_VAL_STEP 10
-#define RGBLIGHT_SLEEP
 #endif
 
 #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
diff --git a/keyboards/kbdfans/tiger80/info.json b/keyboards/kbdfans/tiger80/info.json
index b8e4258ed7..c5d677d26e 100644
--- a/keyboards/kbdfans/tiger80/info.json
+++ b/keyboards/kbdfans/tiger80/info.json
@@ -1,12 +1,19 @@
 {
-    "keyboard_name": "Tiger80", 
     "manufacturer": "KBDFans",
-    "url": "", 
-    "maintainer": "kbdfans", 
-    "usb": {
-        "vid": "0x4B42",
-        "pid": "0x0011",
-        "device_version": "0.0.1"
+    "keyboard_name": "Tiger80",
+    "maintainer": "kbdfans",
+    "bootloader": "atmel-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "audio": false,
+        "backlight": false,
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
     },
     "matrix_pins": {
         "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "D3", "D5", "D4", "D6", "D7", "B5", "B6", "C6", "E2", "D0"],
@@ -15,110 +22,213 @@
     "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "C7",
+        "on_state": 1,
         "scroll_lock": "B2"
     },
+    "matrix_pins": {
+        "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "D3", "D5", "D4", "D6", "D7", "B5", "B6", "C6", "E2", "D0"],
+        "rows": ["B0", "E6", "B1", "B4", "D1", "D2"]
+    },
     "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layout_aliases": {
-        "LAYOUT_all": "LAYOUT_tkl_f13_ansi_tsangan"
+    "rgblight": {
+        "brightness_steps": 10,
+        "hue_steps": 10,
+        "led_count": 20,
+        "pin": "B3",
+        "saturation_steps": 10,
+        "sleep": true
+    },
+    "url": "",
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x0011",
+        "vid": "0x4B42"        
     },
-    "community_layouts": ["tkl_f13_ansi_tsangan"],
+    "community_layouts": ["tkl_f13_ansi_tsangan", "tkl_f13_iso_tsangan"],
     "layouts": {
         "LAYOUT_tkl_f13_ansi_tsangan": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0}, 
-                {"label":"F1", "x":1.25, "y":0}, 
-                {"label":"F2", "x":2.25, "y":0}, 
-                {"label":"F3", "x":3.25, "y":0}, 
-                {"label":"F4", "x":4.25, "y":0}, 
-                {"label":"F5", "x":5.5, "y":0}, 
-                {"label":"F6", "x":6.5, "y":0}, 
-                {"label":"F7", "x":7.5, "y":0}, 
-                {"label":"F8", "x":8.5, "y":0}, 
-                {"label":"F9", "x":9.75, "y":0}, 
-                {"label":"F10", "x":10.75, "y":0}, 
-                {"label":"F11", "x":11.75, "y":0}, 
-                {"label":"F12", "x":12.75, "y":0}, 
-                {"label":"F13", "x":14, "y":0}, 
-                {"label":"PrtSc", "x":15.25, "y":0}, 
-                {"label":"Scroll Lock", "x":16.25, "y":0}, 
-                {"label":"Pause", "x":17.25, "y":0}, 
-
-                {"label":"`~", "x":0, "y":1.5}, 
-                {"label":"1!", "x":1, "y":1.5}, 
-                {"label":"2@", "x":2, "y":1.5}, 
-                {"label":"3#", "x":3, "y":1.5}, 
-                {"label":"4$", "x":4, "y":1.5}, 
-                {"label":"5%", "x":5, "y":1.5}, 
-                {"label":"6^", "x":6, "y":1.5}, 
-                {"label":"7", "x":7, "y":1.5}, 
-                {"label":"8*", "x":8, "y":1.5}, 
-                {"label":"9(", "x":9, "y":1.5}, 
-                {"label":"0)", "x":10, "y":1.5}, 
-                {"label":"-_", "x":11, "y":1.5}, 
-                {"label":"=+", "x":12, "y":1.5}, 
-                {"label":"Backspace", "x":13, "y":1.5, "w":2}, 
-                {"label":"Insert", "x":15.25, "y":1.5}, 
-                {"label":"Home", "x":16.25, "y":1.5}, 
-                {"label":"PgUp", "x":17.25, "y":1.5}, 
-
-                {"label":"Tab", "x":0, "y":2.5, "w":1.5}, 
-                {"label":"Q", "x":1.5, "y":2.5}, 
-                {"label":"W", "x":2.5, "y":2.5}, 
-                {"label":"E", "x":3.5, "y":2.5}, 
-                {"label":"R", "x":4.5, "y":2.5}, 
-                {"label":"T", "x":5.5, "y":2.5}, 
-                {"label":"Y", "x":6.5, "y":2.5}, 
-                {"label":"U", "x":7.5, "y":2.5}, 
-                {"label":"I", "x":8.5, "y":2.5}, 
-                {"label":"O", "x":9.5, "y":2.5}, 
-                {"label":"P", "x":10.5, "y":2.5}, 
-                {"label":"[{", "x":11.5, "y":2.5}, 
-                {"label":"]}", "x":12.5, "y":2.5}, 
-                {"label":"\\|", "x":13.5, "y":2.5, "w":1.5}, 
-                {"label":"Delete", "x":15.25, "y":2.5}, 
-                {"label":"End", "x":16.25, "y":2.5}, 
-                {"label":"PgDn", "x":17.25, "y":2.5}, 
-
-                {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, 
-                {"label":"A", "x":1.75, "y":3.5}, 
-                {"label":"S", "x":2.75, "y":3.5}, 
-                {"label":"D", "x":3.75, "y":3.5}, 
-                {"label":"F", "x":4.75, "y":3.5}, 
-                {"label":"G", "x":5.75, "y":3.5}, 
-                {"label":"H", "x":6.75, "y":3.5}, 
-                {"label":"J", "x":7.75, "y":3.5}, 
-                {"label":"K", "x":8.75, "y":3.5}, 
-                {"label":"L", "x":9.75, "y":3.5}, 
-                {"label":";:", "x":10.75, "y":3.5}, 
-                {"label":"'\"", "x":11.75, "y":3.5}, 
-                {"label":"Enter", "x":12.75, "y":3.5, "w":2.25}, 
-
-                {"label":"Shift", "x":0, "y":4.5, "w":2.25}, 
-                {"label":"Z", "x":2.25, "y":4.5}, 
-                {"label":"X", "x":3.25, "y":4.5}, 
-                {"label":"C", "x":4.25, "y":4.5}, 
-                {"label":"V", "x":5.25, "y":4.5}, 
-                {"label":"B", "x":6.25, "y":4.5}, 
-                {"label":"N", "x":7.25, "y":4.5}, 
-                {"label":"M", "x":8.25, "y":4.5}, 
-                {"label":",<", "x":9.25, "y":4.5}, 
-                {"label":".>", "x":10.25, "y":4.5}, 
-                {"label":"/?", "x":11.25, "y":4.5}, 
-                {"label":"Shift", "x":12.25, "y":4.5, "w":2.75}, 
-                {"label":"\u2191", "x":16.25, "y":4.5}, 
-
-                {"label":"Ctrl", "x":0, "y":5.5, "w":1.5}, 
-                {"label":"Win", "x":1.5, "y":5.5}, 
-                {"label":"Alt", "x":2.5, "y":5.5, "w":1.5}, 
-                {"label":"Space", "x":4, "y":5.5, "w":7}, 
-                {"label":"Alt", "x":11, "y":5.5, "w":1.5}, 
-                {"label":"Win", "x":12.5, "y":5.5}, 
-                {"label":"Ctrl", "x":13.5, "y":5.5, "w":1.5}, 
-                {"label":"\u2190", "x":15.25, "y":5.5}, 
-                {"label":"\u2193", "x":16.25, "y":5.5}, 
-                {"label":"\u2192", "x":17.25, "y":5.5}
+                { "label": "Esc", "matrix": [0, 0],  "x": 0, "y": 0 },
+                { "label": "F1", "matrix": [0, 1],  "x": 1.25, "y": 0 },
+                { "label": "F2", "matrix": [0, 2],  "x": 2.25, "y": 0 },
+                { "label": "F3", "matrix": [0, 3],  "x": 3.25, "y": 0 },
+                { "label": "F4", "matrix": [0, 4],  "x": 4.25, "y": 0 },
+                { "label": "F5", "matrix": [0, 5],  "x": 5.5, "y": 0 },
+                { "label": "F6", "matrix": [0, 6],  "x": 6.5, "y": 0 },
+                { "label": "F7", "matrix": [0, 7],  "x": 7.5, "y": 0 },
+                { "label": "F8", "matrix": [0, 8],  "x": 8.5, "y": 0 },
+                { "label": "F9", "matrix": [0, 9],  "x": 9.75, "y": 0 },
+                { "label": "F10", "matrix": [0, 10],  "x": 10.75, "y": 0 },
+                { "label": "F11", "matrix": [0, 11],  "x": 11.75, "y": 0 },
+                { "label": "F12", "matrix": [0, 12],  "x": 12.75, "y": 0 },
+                { "label": "F13", "matrix": [0, 13],  "x": 14, "y": 0 },
+                { "label": "PrtSc", "matrix": [0, 14],  "x": 15.25, "y": 0 },
+                { "label": "Scroll Lock", "matrix": [0, 15],  "x": 16.25, "y": 0 },
+                { "label": "Pause", "matrix": [3, 15],  "x": 17.25, "y": 0 },
+                { "label": "`~", "matrix": [1, 0],  "x": 0, "y": 1.5 },
+                { "label": "1!", "matrix": [1, 1],  "x": 1, "y": 1.5 },
+                { "label": "2@", "matrix": [1, 2],  "x": 2, "y": 1.5 },
+                { "label": "3#", "matrix": [1, 3],  "x": 3, "y": 1.5 },
+                { "label": "4$", "matrix": [1, 4],  "x": 4, "y": 1.5 },
+                { "label": "5%", "matrix": [1, 5],  "x": 5, "y": 1.5 },
+                { "label": "6^", "matrix": [1, 6],  "x": 6, "y": 1.5 },
+                { "label": "7", "matrix": [1, 7],  "x": 7, "y": 1.5 },
+                { "label": "8*", "matrix": [1, 8],  "x": 8, "y": 1.5 },
+                { "label": "9(", "matrix": [1, 9],  "x": 9, "y": 1.5 },
+                { "label": "0)", "matrix": [1, 10],  "x": 10, "y": 1.5 },
+                { "label": "-_", "matrix": [1, 11],  "x": 11, "y": 1.5 },
+                { "label": "=+", "matrix": [1, 12],  "x": 12, "y": 1.5 },
+                { "label": "Backspace", "matrix": [1, 13], "w": 2, "x": 13, "y": 1.5 },
+                { "label": "Insert", "matrix": [1, 14],  "x": 15.25, "y": 1.5 },
+                { "label": "Home", "matrix": [1, 15],  "x": 16.25, "y": 1.5 },
+                { "label": "PgUp", "matrix": [3, 14],  "x": 17.25, "y": 1.5 },
+                { "label": "Tab", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.5 },
+                { "label": "Q", "matrix": [2, 1],  "x": 1.5, "y": 2.5 },
+                { "label": "W", "matrix": [2, 2],  "x": 2.5, "y": 2.5 },
+                { "label": "E", "matrix": [2, 3],  "x": 3.5, "y": 2.5 },
+                { "label": "R", "matrix": [2, 4],  "x": 4.5, "y": 2.5 },
+                { "label": "T", "matrix": [2, 5],  "x": 5.5, "y": 2.5 },
+                { "label": "Y", "matrix": [2, 6],  "x": 6.5, "y": 2.5 },
+                { "label": "U", "matrix": [2, 7],  "x": 7.5, "y": 2.5 },
+                { "label": "I", "matrix": [2, 8],  "x": 8.5, "y": 2.5 },
+                { "label": "O", "matrix": [2, 9],  "x": 9.5, "y": 2.5 },
+                { "label": "P", "matrix": [2, 10],  "x": 10.5, "y": 2.5 },
+                { "label": "[{", "matrix": [2, 11],  "x": 11.5, "y": 2.5 },
+                { "label": "]}", "matrix": [2, 12],  "x": 12.5, "y": 2.5 },
+                { "label": "\\|", "matrix": [2, 13], "w": 1.5, "x": 13.5, "y": 2.5 },
+                { "label": "Delete", "matrix": [2, 14],  "x": 15.25, "y": 2.5 },
+                { "label": "End", "matrix": [2, 15],  "x": 16.25, "y": 2.5 },
+                { "label": "PgDn", "matrix": [4, 14],  "x": 17.25, "y": 2.5 },
+                { "label": "Caps Lock", "matrix": [3, 0], "w": 1.75, "x": 0, "y": 3.5 },
+                { "label": "A", "matrix": [3, 1],  "x": 1.75, "y": 3.5 },
+                { "label": "S", "matrix": [3, 2],  "x": 2.75, "y": 3.5 },
+                { "label": "D", "matrix": [3, 3],  "x": 3.75, "y": 3.5 },
+                { "label": "F", "matrix": [3, 4],  "x": 4.75, "y": 3.5 },
+                { "label": "G", "matrix": [3, 5],  "x": 5.75, "y": 3.5 },
+                { "label": "H", "matrix": [3, 6],  "x": 6.75, "y": 3.5 },
+                { "label": "J", "matrix": [3, 7],  "x": 7.75, "y": 3.5 },
+                { "label": "K", "matrix": [3, 8],  "x": 8.75, "y": 3.5 },
+                { "label": "L", "matrix": [3, 9],  "x": 9.75, "y": 3.5 },
+                { "label": ";:", "matrix": [3, 10],  "x": 10.75, "y": 3.5 },
+                { "label": "'\"", "matrix": [3, 11],  "x": 11.75, "y": 3.5 },
+                { "label": "Enter", "matrix": [3, 13], "w": 2.25, "x": 12.75, "y": 3.5 },
+                { "label": "Shift", "matrix": [4, 0], "w": 2.25, "x": 0, "y": 4.5 },
+                { "label": "Z", "matrix": [4, 2],  "x": 2.25, "y": 4.5 },
+                { "label": "X", "matrix": [4, 3],  "x": 3.25, "y": 4.5 },
+                { "label": "C", "matrix": [4, 4],  "x": 4.25, "y": 4.5 },
+                { "label": "V", "matrix": [4, 5],  "x": 5.25, "y": 4.5 },
+                { "label": "B", "matrix": [4, 6],  "x": 6.25, "y": 4.5 },
+                { "label": "N", "matrix": [4, 7],  "x": 7.25, "y": 4.5 },
+                { "label": "M", "matrix": [4, 8],  "x": 8.25, "y": 4.5 },
+                { "label": ",<", "matrix": [4, 9],  "x": 9.25, "y": 4.5 },
+                { "label": ".>", "matrix": [4, 10],  "x": 10.25, "y": 4.5 },
+                { "label": "/?", "matrix": [4, 11],  "x": 11.25, "y": 4.5 },
+                { "label": "Shift", "matrix": [4, 13], "w": 2.75, "x": 12.25, "y": 4.5 },
+                { "label": "\u2191", "matrix": [4, 15],  "x": 16.25, "y": 4.5 },
+                { "label": "Ctrl", "matrix": [5, 0], "w": 1.5, "x": 0, "y": 5.5 },
+                { "label": "Win", "matrix": [5, 1],  "x": 1.5, "y": 5.5 },
+                { "label": "Alt", "matrix": [5, 2], "w": 1.5, "x": 2.5, "y": 5.5 },
+                { "label": "Space", "matrix": [5, 6], "w": 7, "x": 4, "y": 5.5 },
+                { "label": "Alt", "matrix": [5, 10], "w": 1.5, "x": 11, "y": 5.5 },
+                { "label": "Win", "matrix": [5, 11],  "x": 12.5, "y": 5.5 },
+                { "label": "Ctrl", "matrix": [5, 12], "w": 1.5, "x": 13.5, "y": 5.5 },
+                { "label": "\u2190", "matrix": [5, 13],  "x": 15.25, "y": 5.5 },
+                { "label": "\u2193", "matrix": [5, 14],  "x": 16.25, "y": 5.5 },
+                { "label": "\u2192", "matrix": [5, 15],  "x": 17.25, "y": 5.5 }
+            ]
+        },
+        "LAYOUT_tkl_f13_iso_tsangan": {
+            "layout": [
+                { "label": "K00", "matrix": [0, 0],  "x": 0, "y": 0 },
+                { "label": "K01", "matrix": [0, 1],  "x": 1, "y": 0 },
+                { "label": "K02", "matrix": [0, 2],  "x": 2, "y": 0 },
+                { "label": "K03", "matrix": [0, 3],  "x": 3, "y": 0 },
+                { "label": "K04", "matrix": [0, 4],  "x": 4, "y": 0 },
+                { "label": "K05", "matrix": [0, 5],  "x": 5, "y": 0 },
+                { "label": "K06", "matrix": [0, 6],  "x": 6, "y": 0 },
+                { "label": "K07", "matrix": [0, 7],  "x": 7, "y": 0 },
+                { "label": "K08", "matrix": [0, 8],  "x": 8, "y": 0 },
+                { "label": "K09", "matrix": [0, 9],  "x": 9, "y": 0 },
+                { "label": "K0A", "matrix": [0, 10],  "x": 10, "y": 0 },
+                { "label": "K0B", "matrix": [0, 11],  "x": 11, "y": 0 },
+                { "label": "K0C", "matrix": [0, 12],  "x": 12, "y": 0 },
+                { "label": "K0D", "matrix": [0, 13],  "x": 13, "y": 0 },
+                { "label": "K0E", "matrix": [0, 14],  "x": 14, "y": 0 },
+                { "label": "K0F", "matrix": [0, 15],  "x": 15, "y": 0 },
+                { "label": "K3F", "matrix": [3, 15],  "x": 16, "y": 0 },
+                { "label": "K10", "matrix": [1, 0],  "x": 17, "y": 0 },
+                { "label": "K11", "matrix": [1, 1],  "x": 18, "y": 0 },
+                { "label": "K12", "matrix": [1, 2],  "x": 19, "y": 0 },
+                { "label": "K13", "matrix": [1, 3],  "x": 20, "y": 0 },
+                { "label": "K14", "matrix": [1, 4],  "x": 21, "y": 0 },
+                { "label": "K15", "matrix": [1, 5],  "x": 22, "y": 0 },
+                { "label": "K16", "matrix": [1, 6],  "x": 23, "y": 0 },
+                { "label": "K17", "matrix": [1, 7],  "x": 24, "y": 0 },
+                { "label": "K18", "matrix": [1, 8],  "x": 25, "y": 0 },
+                { "label": "K19", "matrix": [1, 9],  "x": 26, "y": 0 },
+                { "label": "K1A", "matrix": [1, 10],  "x": 27, "y": 0 },
+                { "label": "K1B", "matrix": [1, 11],  "x": 28, "y": 0 },
+                { "label": "K1C", "matrix": [1, 12],  "x": 29, "y": 0 },
+                { "label": "K1D", "matrix": [1, 13],  "x": 30, "y": 0 },
+                { "label": "K1E", "matrix": [1, 14],  "x": 31, "y": 0 },
+                { "label": "K1F", "matrix": [1, 15],  "x": 32, "y": 0 },
+                { "label": "K3E", "matrix": [3, 14],  "x": 33, "y": 0 },
+                { "label": "K20", "matrix": [2, 0],  "x": 34, "y": 0 },
+