summaryrefslogtreecommitdiff
path: root/keyboards
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2023-03-10 17:40:52 +0000
committerQMK Bot <hello@qmk.fm>2023-03-10 17:40:52 +0000
commit4a91caf4fefbba3ef23f29e98b14a52ec4a1f2f0 (patch)
treee4a1a8e9fe8e27511f1cc6074e2262da3aaa3d4e /keyboards
parent45f540f3bb1bb833f89fded4c776fa1a9df33820 (diff)
parent7be63bb5243c6c95457001e429e928ed1203257a (diff)
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards')
-rw-r--r--keyboards/macro3/info.json12
-rw-r--r--keyboards/macro3/post_config.h19
-rw-r--r--keyboards/macro3/rules.mk14
3 files changed, 11 insertions, 34 deletions
diff --git a/keyboards/macro3/info.json b/keyboards/macro3/info.json
index 780dfca303..fa6cd1c471 100644
--- a/keyboards/macro3/info.json
+++ b/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"],
diff --git a/keyboards/macro3/post_config.h b/keyboards/macro3/post_config.h
deleted file mode 100644
index 4e2b6cf1b9..0000000000
--- a/keyboards/macro3/post_config.h
+++ /dev/null
@@ -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
-
diff --git a/keyboards/macro3/rules.mk b/keyboards/macro3/rules.mk
index b03b6fa905..6e7633bfe0 100644
--- a/keyboards/macro3/rules.mk
+++ b/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