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

keyboards/macro3/info.json

@@ -14,8 +14,16 @@
             {"pin_a": "F7", "pin_b": "F6"}
         ]
     },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
+    "development_board": "promicro",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "encoder": true
+    },
+    "bootmagic": {
+        "matrix": [0, 3]
+    },
     "matrix_pins": {
         "direct": [
             ["D7", "C6", "D4", "D1"],

keyboards/macro3/post_config.h

@@ -1,19 +0,0 @@
-/* Copyright 2020 David Philip Barr <@davidphilipbarr>
- * Copyright 2021 @filterpaper
- * SPDX-License-Identifier: GPL-2.0+
- */
-
-#pragma once
-
-/* Top right key */
-#ifndef BOOTMAGIC_LITE_ROW
-#    define BOOTMAGIC_LITE_ROW 0
-#endif
-#ifndef BOOTMAGIC_LITE_COLUMN
-#    define BOOTMAGIC_LITE_COLUMN 3
-#endif
-
-#ifndef ENCODER_RESOLUTION
-#    define ENCODER_RESOLUTION 2
-#endif
-

keyboards/macro3/rules.mk

@@ -1,13 +1 @@
-# 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 = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes
+# This file intentionally left blank