Merge remote-tracking branch 'upstream/develop'

14 files changed, 79 insertions, 102 deletions

diff --git a/keyboards/signum/3_0/config.h b/keyboards/signum/3_0/config.h
index 4ecd7cb9fd..b554c93b85 100644
--- a/keyboards/signum/3_0/config.h
+++ b/keyboards/signum/3_0/config.h
@@ -15,11 +15,6 @@
  */
 #pragma once
 
-#include "config_common.h"
-
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 12
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/signum/3_0/elitec/config.h b/keyboards/signum/3_0/elitec/config.h
index 0c8ad2e414..7373bfab66 100644
--- a/keyboards/signum/3_0/elitec/config.h
+++ b/keyboards/signum/3_0/elitec/config.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "config_common.h"
 
 /* key matrix pins */
 #define MATRIX_ROW_PINS { D2, D1, F5, B5 }
diff --git a/keyboards/signum/3_0/elitec/elitec.c b/keyboards/signum/3_0/elitec/elitec.c
deleted file mode 100644
index 78195260b1..0000000000
--- a/keyboards/signum/3_0/elitec/elitec.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "elitec.h"
diff --git a/keyboards/signum/3_0/elitec/elitec.h b/keyboards/signum/3_0/elitec/elitec.h
deleted file mode 100644
index dfb7e01164..0000000000
--- a/keyboards/signum/3_0/elitec/elitec.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-#include "3_0.h"
diff --git a/keyboards/signum/3_0/elitec/rules.mk b/keyboards/signum/3_0/elitec/rules.mk
index e69de29bb2..614691a01b 100644
--- a/keyboards/signum/3_0/elitec/rules.mk
+++ b/keyboards/signum/3_0/elitec/rules.mk
@@ -0,0 +1,17 @@
+# 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
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
+# Disable unsupported hardware
+RGBLIGHT_SUPPORTED = no
+AUDIO_SUPPORTED = no
+BACKLIGHT_SUPPORTED = no
diff --git a/keyboards/signum/3_0/info.json b/keyboards/signum/3_0/info.json
index 632d87e711..9b134ed610 100644
--- a/keyboards/signum/3_0/info.json
+++ b/keyboards/signum/3_0/info.json
@@ -8,9 +8,12 @@
         "pid": "0x6060",
         "device_version": "0.0.1"
     },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
     "layout_aliases": {
         "LAYOUT": "LAYOUT_ortho_4x12"
     },
+    "community_layouts": ["ortho_4x12"],
     "layouts": {
         "LAYOUT_ortho_4x12": {
             "layout": [
diff --git a/keyboards/signum/3_0/keymaps/default/keymap.c b/keyboards/signum/3_0/keymaps/default/keymap.c
index e9f7816018..27f79e7692 100644
--- a/keyboards/signum/3_0/keymaps/default/keymap.c
+++ b/keyboards/signum/3_0/keymaps/default/keymap.c
@@ -312,7 +312,7 @@ ypsilon,
 zeta
 };
 
-const uint32_t PROGMEM unicode_map[] = {
+const uint32_t unicode_map[] PROGMEM = {
 	[AB_ARC] = 0x0361,  // ͡
 	[AB_LINE] = 0x0305,  // ̅
 	[AB_VEC] = 0x20d7,  // ⃗
diff --git a/keyboards/signum/3_0/keymaps/default/km_template.txt b/keyboards/signum/3_0/keymaps/default/km_template.txt
index 47b35ee514..90496170b2 100644
--- a/keyboards/signum/3_0/keymaps/default/km_template.txt
+++ b/keyboards/signum/3_0/keymaps/default/km_template.txt
@@ -7,7 +7,7 @@ enum unicode_name {
 //<enum/>
 };
 
-const uint32_t PROGMEM unicode_map[] = {
+const uint32_t unicode_map[] PROGMEM = {
 //<uc_map/>
 };
 
diff --git a/keyboards/signum/3_0/keymaps/default/layout.py b/keyboards/signum/3_0/keymaps/default/layout.py
index 68f08ef212..90fb1d9c94 100644
--- a/keyboards/signum/3_0/keymaps/default/layout.py
+++ b/keyboards/signum/3_0/keymaps/default/layout.py
@@ -388,7 +388,7 @@ qmk_dict = {
     "acc2": "KC_ACL2",
     # Modifiers missinng, add entry for each specific application
     # Mod-Tap Keys missing, add entry for each specific application
-    "_Sh_swp": "LSFT_T(SH_TG)",
+    "_Sh_swp": "LSFT_T(SH_TOGG)",
     # RGB Lighting missing
     # RGB Matrix Lighting missing
     # Thermal Printer missing
diff --git a/keyboards/signum/3_0/keymaps/sgurenkov/keymap.c b/keyboards/signum/3_0/keymaps/sgurenkov/keymap.c
index cfd848fcfd..9353d28472 100644
--- a/keyboards/signum/3_0/keymaps/sgurenkov/keymap.c
+++ b/keyboards/signum/3_0/keymaps/sgurenkov/keymap.c
@@ -92,37 +92,47 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     return true;
 }
 
-LEADER_EXTERNS();
-
-void matrix_scan_user(void) {
-    LEADER_DICTIONARY() {
-        leading = false;
-        leader_end();
-
-        // Cancel task CTRL+C
-        SEQ_ONE_KEY(KC_C) { tap_code16(C(KC_C)); }
-        // copy
-        SEQ_ONE_KEY(KC_Y) { tap_code16(G(KC_C)); }
-        // cut
-        SEQ_ONE_KEY(KC_X) { tap_code16(G(KC_X)); }
-        // paste
-        SEQ_ONE_KEY(KC_P) { tap_code16(G(KC_V)); }
-        // undo
-        SEQ_ONE_KEY(KC_U) { tap_code16(G(KC_Z)); }
-        // redo
-        SEQ_ONE_KEY(KC_R) { tap_code16(S(G(KC_Z))); }
-        // delete line
-        SEQ_TWO_KEYS(KC_D, KC_D) {
-            register_code(KC_LGUI);
+void leader_end_user(void) {
+    // Cancel task CTRL+C
+    if (leader_sequence_one_key(KC_C)) {
+        tap_code16(C(KC_C));
+    }
+    // copy
+    if (leader_sequence_one_key(KC_Y)) {
+        tap_code16(G(KC_C));
+    }
+    // cut
+    if (leader_sequence_one_key(KC_X)) {
+        tap_code16(G(KC_X));
+    }
+    // paste
+    if (leader_sequence_one_key(KC_P)) {
+        tap_code16(G(KC_V));
+    }
+    // undo
+    if (leader_sequence_one_key(KC_U)) {
+        tap_code16(G(KC_Z));
+    }
+    // redo
+    if (leader_sequence_one_key(KC_R)) {
+        tap_code16(S(G(KC_Z)));
+    }
+    // delete line
+    if (leader_sequence_two_keys(KC_D, KC_D)) {
+        register_code(KC_LGUI);
 
-            tap_code(KC_RIGHT);
+        tap_code(KC_RIGHT);
 
-            tap_code(KC_BACKSPACE);
+        tap_code(KC_BACKSPACE);
 
-            unregister_code(KC_LGUI);
-        }
-        // go to the beginning of the string
-        SEQ_ONE_KEY(KC_H) { tap_code16(G(KC_LEFT)); }
-        // go to the end of the string
-        SEQ_ONE_KEY(KC_L) { tap_code16(G(KC_RIGHT)); }
+        unregister_code(KC_LGUI);
+    }
+    // go to the beginning of the string
+    if (leader_sequence_one_key(KC_H)) {
+        tap_code16(G(KC_LEFT));
     }
+    // go to the end of the string
+    if (leader_sequence_one_key(KC_L)) {
+        tap_code16(G(KC_RIGHT));
+    }
+}
diff --git a/keyboards/signum/3_0/rules.mk b/keyboards/signum/3_0/rules.mk
deleted file mode 100644
index d1eef7d82f..0000000000
--- a/keyboards/signum/3_0/rules.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-# 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
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
-LAYOUTS = ortho_4x12
-
-# Disable unsupported hardware
-RGBLIGHT_SUPPORTED = no
-AUDIO_SUPPORTED = no
-BACKLIGHT_SUPPORTED = no
diff --git a/keyboards/signum/3_0/teensy/rules.mk b/keyboards/signum/3_0/teensy/rules.mk
index 8b13789179..614691a01b 100644
--- a/keyboards/signum/3_0/teensy/rules.mk
+++ b/keyboards/signum/3_0/teensy/rules.mk
@@ -1 +1,17 @@
+# 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
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
 
+# Disable unsupported hardware
+RGBLIGHT_SUPPORTED = no
+AUDIO_SUPPORTED = no
+BACKLIGHT_SUPPORTED = no
diff --git a/keyboards/signum/3_0/teensy/teensy.c b/keyboards/signum/3_0/teensy/teensy.c
deleted file mode 100644
index 42e993a6be..0000000000
--- a/keyboards/signum/3_0/teensy/teensy.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021 Stan Gurenkov <rococo04_fox@icloud.com>
- *
- * 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 "teensy.h"
diff --git a/keyboards/signum/3_0/teensy/teensy.h b/keyboards/signum/3_0/teensy/teensy.h
deleted file mode 100644
index 073accaa61..0000000000
--- a/keyboards/signum/3_0/teensy/teensy.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2021 Stan Gurenkov <rococo04_fox@icloud.com>
- *
- * 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 "3_0.h"