From a9cae18438c69e7d9a5ce97ca4c27d7e53d56eb9 Mon Sep 17 00:00:00 2001
From: Thomas Haukland <thomas.haukland@gmail.com>
Date: Sat, 2 Jul 2022 10:30:10 +0200
Subject: [PATCH] vonreg keymap and settings

---
 .../bastardkb/blacktyl/keymaps/tompi/config.h    |  4 ++--
 keyboards/vonreg/config.h                        |  3 +++
 keyboards/vonreg/info.json                       |  2 --
 keyboards/vonreg/keymaps/tompi/keymap.json       | 16 ++++++++--------
 keyboards/vonreg/mcuconf.h                       |  4 ++--
 keyboards/vonreg/rules.mk                        |  9 +++++++++
 6 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/keyboards/bastardkb/blacktyl/keymaps/tompi/config.h b/keyboards/bastardkb/blacktyl/keymaps/tompi/config.h
index 6e0a7230fe..7c35bc2052 100644
--- a/keyboards/bastardkb/blacktyl/keymaps/tompi/config.h
+++ b/keyboards/bastardkb/blacktyl/keymaps/tompi/config.h
@@ -33,11 +33,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MOUSEKEY_WHEEL_TIME_TO_MAX 100
 
 // Pick good defaults for enabling homerow modifiers
-#define TAPPING_TERM 250
+#define TAPPING_TERM 280
 // #define PERMISSIVE_HOLD
 #define IGNORE_MOD_TAP_INTERRUPT
 #define TAPPING_FORCE_HOLD
-#define RETRO_TAPPING
+//#define RETRO_TAPPING
 
 // Underglow configuration
 #ifdef RGBLIGHT_ENABLE
diff --git a/keyboards/vonreg/config.h b/keyboards/vonreg/config.h
index b6bf7a3b40..8a33115e30 100644
--- a/keyboards/vonreg/config.h
+++ b/keyboards/vonreg/config.h
@@ -40,3 +40,6 @@
 #define BOOTMAGIC_LITE_COLUMN_RIGHT 4
 #define DEVICE_VER      0x0001
 
+#define AUDIO_PIN A1
+//#define AUDIO_PWM_DRIVER PWMD1
+//#define AUDIO_PWM_CHANNEL 1
diff --git a/keyboards/vonreg/info.json b/keyboards/vonreg/info.json
index 82a892b048..a20442ad82 100644
--- a/keyboards/vonreg/info.json
+++ b/keyboards/vonreg/info.json
@@ -5,9 +5,7 @@
     "bootloader": "stm32-dfu",
     "diode_direction": "COL2ROW",
     "features": {
-        "bootmagic_lite": false,
         "command": false,
-        "console": false,
         "extrakey": true,
         "mousekey": true,
         "nkro": true
diff --git a/keyboards/vonreg/keymaps/tompi/keymap.json b/keyboards/vonreg/keymaps/tompi/keymap.json
index abab1afb38..97cb8fabc2 100644
--- a/keyboards/vonreg/keymaps/tompi/keymap.json
+++ b/keyboards/vonreg/keymaps/tompi/keymap.json
@@ -16,7 +16,7 @@
       "KC_L",
       "KC_U",
       "KC_Y",
-      "RALT_T(KC_SCLN)",
+      "KC_SCLN",
       "LGUI_T(KC_A)",
       "LALT_T(KC_R)",
       "LCTL_T(KC_S)",
@@ -27,7 +27,7 @@
       "LCTL_T(KC_E)",
       "LALT_T(KC_I)",
       "LGUI_T(KC_O)",
-      "RALT_T(KC_Z)",
+      "KC_Z",
       "KC_X",
       "KC_C",
       "KC_D",
@@ -38,10 +38,10 @@
       "KC_DOT",
       "KC_SLSH",
       "LT(6,KC_ESC)",
-      "LT(3,KC_BSPC)",
-      "KC_TAB",
-      "KC_DEL",
-      "LT(2,KC_SPC)",
+      "LT(3,KC_SPC)",
+      "LT(5,KC_TAB)",
+      "LT(1,KC_DEL)",
+      "LT(2,KC_BSPC)",
       "LT(4,KC_ENT)"
     ],
     [
@@ -159,7 +159,7 @@
       "KC_NO"
     ],
     [
-      "KC_NO",
+      "KC_EQL",
       "KC_COLN",
       "KC_LT",
       "KC_GT",
@@ -179,7 +179,7 @@
       "KC_TRNS",
       "KC_TRNS",
       "KC_TRNS",
-      "KC_NO",
+      "KC_MINS",
       "KC_EXLM",
       "KC_LBRC",
       "KC_RBRC",
diff --git a/keyboards/vonreg/mcuconf.h b/keyboards/vonreg/mcuconf.h
index b8fa7f72bb..1c383682e7 100644
--- a/keyboards/vonreg/mcuconf.h
+++ b/keyboards/vonreg/mcuconf.h
@@ -24,8 +24,8 @@
 
 #include_next <mcuconf.h>
 
-//#undef STM32_PWM_USE_TIM3
-//#define STM32_PWM_USE_TIM3 TRUE
+#undef STM32_PWM_USE_TIM3
+#define STM32_PWM_USE_TIM3 TRUE
 
 //#undef STM32_SERIAL_USE_USART1
 //#define STM32_SERIAL_USE_USART1 TRUE
diff --git a/keyboards/vonreg/rules.mk b/keyboards/vonreg/rules.mk
index 87499eed25..8534a0312b 100644
--- a/keyboards/vonreg/rules.mk
+++ b/keyboards/vonreg/rules.mk
@@ -2,3 +2,12 @@ BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
 
 SPLIT_KEYBOARD = yes
 SERIAL_DRIVER = bitbang
+AUDIO_ENABLE = yes
+AUDIO_DRIVER = pwm_software
+
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+
+CONSOLE_ENABLE = yes
+DEBOUNCE_TYPE          = asym_eager_defer_pk
+