From 79b1e1e23be1adc80fba870280b3fc8302ed78d6 Mon Sep 17 00:00:00 2001
From: Thomas Haukland <thomas.haukland@gmail.com>
Date: Sat, 9 Apr 2022 23:57:07 +0200
Subject: [PATCH] stabilize vonreg

---
 keyboards/vonreg/config.h  | 14 +++++---------
 keyboards/vonreg/info.json |  2 +-
 keyboards/vonreg/rules.mk  |  2 +-
 keyboards/vonreg/vonreg.h  |  8 ++++----
 4 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/keyboards/vonreg/config.h b/keyboards/vonreg/config.h
index 337d77e3b1..e985437256 100644
--- a/keyboards/vonreg/config.h
+++ b/keyboards/vonreg/config.h
@@ -13,10 +13,6 @@
                      {A7, A6, B3, A5, A15}, \
                      {A4, B4, B5, A2, B6}, \
                      {B7, B8, B9, NO_PIN, NO_PIN}}
-#define DIRECT_PINS_RIGHT {{B12, B13, B15, B1, B0}, \
-                     {A15, A5, B3, A6, A7}, \
-                     {A4, A2, B5, B4, B6}, \
-                     {B9, B8, B7, NO_PIN, NO_PIN}}
 
 
 // Full duplex WORKS...
@@ -27,7 +23,7 @@
 #define EE_HANDS
 
 #define SOFT_SERIAL_PIN B14  // D0 or D1, D2, D3, E6
-#define SELECT_SOFT_SERIAL_SPEED 1 // or 0, 2, 3, 4, 5
+#define SELECT_SOFT_SERIAL_SPEED 2 // or 0, 2, 3, 4, 5
                                    //  0: about 189kbps (Experimental only)
                                    //  1: about 137kbps (default)
                                    //  2: about 75kbps
@@ -37,10 +33,10 @@
 
 
 /* Top left key on left half */
-#define BOOTMAGIC_LITE_ROW    0
-#define BOOTMAGIC_LITE_COLUMN 0
+//#define BOOTMAGIC_LITE_ROW    0
+//#define BOOTMAGIC_LITE_COLUMN 0
 /* Top right key on right half */
-#define BOOTMAGIC_LITE_ROW_RIGHT    4
-#define BOOTMAGIC_LITE_COLUMN_RIGHT 4
+//#define BOOTMAGIC_LITE_ROW_RIGHT    4
+//#define BOOTMAGIC_LITE_COLUMN_RIGHT 4
 #define DEVICE_VER      0x0001
 
diff --git a/keyboards/vonreg/info.json b/keyboards/vonreg/info.json
index bc813fe077..82a892b048 100644
--- a/keyboards/vonreg/info.json
+++ b/keyboards/vonreg/info.json
@@ -5,7 +5,7 @@
     "bootloader": "stm32-dfu",
     "diode_direction": "COL2ROW",
     "features": {
-        "bootmagic_lite": true,
+        "bootmagic_lite": false,
         "command": false,
         "console": false,
         "extrakey": true,
diff --git a/keyboards/vonreg/rules.mk b/keyboards/vonreg/rules.mk
index 87499eed25..129d3f1717 100644
--- a/keyboards/vonreg/rules.mk
+++ b/keyboards/vonreg/rules.mk
@@ -1,4 +1,4 @@
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+BOOTMAGIC_ENABLE = no      # Enable Bootmagic Lite
 
 SPLIT_KEYBOARD = yes
 SERIAL_DRIVER = bitbang
diff --git a/keyboards/vonreg/vonreg.h b/keyboards/vonreg/vonreg.h
index 42c713141d..071d8438dd 100644
--- a/keyboards/vonreg/vonreg.h
+++ b/keyboards/vonreg/vonreg.h
@@ -18,10 +18,10 @@
 #define ___ KC_NO
 
 #define LAYOUT_split_3x5_3( \
-        L01, L02, L03, L04, L05, R01, R02, R03, R04, R05, \
-        L06, L07, L08, L09, L10, R06, R07, R08, R09, R10, \
-        L11, L12, L13, L14, L15, R11, R12, R13, R14, R15, \
-                  L16, L17, L18, R16, R17, R18                 \
+        L01, L02, L03, L04, L05, R05, R04, R03, R02, R01, \
+        L06, L07, L08, L09, L10, R10, R09, R08, R07, R06, \
+        L11, L12, L13, L14, L15, R15, R14, R13, R12, R11, \
+                  L16, L17, L18, R18, R17, R16                 \
     ) \
     { \
         { L01, L02, L03, L04, L05 }, \