Merge remote-tracking branch 'upstream/develop'

5 files changed, 45 insertions, 72 deletions

diff --git a/keyboards/lime/config.h b/keyboards/lime/config.h
deleted file mode 100644
index 22d4f632d0..0000000000
--- a/keyboards/lime/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright 2021 HellSingCoder
-  *
-  * 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 "config_common.h"
-
diff --git a/keyboards/lime/lime.c b/keyboards/lime/lime.c
index 95a0582347..3f51811329 100644
--- a/keyboards/lime/lime.c
+++ b/keyboards/lime/lime.c
@@ -9,38 +9,38 @@ const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] =
 
     // This is the identity layout.
 /*
-{ \
-    { {0, 0}, {1, 0}, {2, 0}, {3, 0}, {4, 0}, {5, 0} }, \
-    { {0, 1}, {1, 1}, {2, 1}, {3, 1}, {4, 1}, {5, 1} }, \
-    { {0, 2}, {1, 2}, {2, 2}, {3, 2}, {4, 2}, {5, 2} }, \
-    { {0, 3}, {1, 3}, {2, 3}, {3, 3}, {4, 3}, {5, 3} }, \
-    { {0, 4}, {1, 4}, {2, 4}, {3, 4}, {4, 4}, {5, 4} }, \
-    { {0, 5}, {1, 5}, {2, 5}, {3, 5}, {4, 5}, {5, 5} }, \
-    \
-    { {0, 5}, {1, 5}, {2, 5}, {3, 5}, {4, 5}, {5, 5} }, \
-    { {0, 6}, {1, 6}, {2, 6}, {3, 6}, {4, 6}, {5, 6} }, \
-    { {0, 7}, {1, 7}, {2, 7}, {3, 7}, {4, 7}, {5, 7} }, \
-    { {0, 8}, {1, 8}, {2, 8}, {3, 8}, {4, 8}, {5, 8} }, \
-    { {0, 9}, {1, 9}, {2, 9}, {3, 9}, {4, 9}, {5, 9} }, \
-    { {0, 10}, {1, 10}, {2, 10}, {3, 10}, {4, 10}, {5, 10} }, \
+{
+    { {0, 0}, {1, 0}, {2, 0}, {3, 0}, {4, 0}, {5, 0} },
+    { {0, 1}, {1, 1}, {2, 1}, {3, 1}, {4, 1}, {5, 1} },
+    { {0, 2}, {1, 2}, {2, 2}, {3, 2}, {4, 2}, {5, 2} },
+    { {0, 3}, {1, 3}, {2, 3}, {3, 3}, {4, 3}, {5, 3} },
+    { {0, 4}, {1, 4}, {2, 4}, {3, 4}, {4, 4}, {5, 4} },
+    { {0, 5}, {1, 5}, {2, 5}, {3, 5}, {4, 5}, {5, 5} },
+
+    { {0, 5}, {1, 5}, {2, 5}, {3, 5}, {4, 5}, {5, 5} },
+    { {0, 6}, {1, 6}, {2, 6}, {3, 6}, {4, 6}, {5, 6} },
+    { {0, 7}, {1, 7}, {2, 7}, {3, 7}, {4, 7}, {5, 7} },
+    { {0, 8}, {1, 8}, {2, 8}, {3, 8}, {4, 8}, {5, 8} },
+    { {0, 9}, {1, 9}, {2, 9}, {3, 9}, {4, 9}, {5, 9} },
+    { {0, 10}, {1, 10}, {2, 10}, {3, 10}, {4, 10}, {5, 10} },
 };
 */
 
     // This is the mirror, q <-> p, w <-> o, etc...
-{ \
- { {0, 5}, {1, 5}, {2, 5}, {3, 5}, {4, 5}, {5, 5} }, \
- { {0, 6}, {1, 6}, {2, 6}, {3, 6}, {4, 6}, {5, 6} }, \
- { {0, 7}, {1, 7}, {2, 7}, {3, 7}, {4, 7}, {5, 7} }, \
- { {0, 8}, {1, 8}, {2, 8}, {3, 8}, {4, 8}, {5, 8} }, \
- { {0, 9}, {1, 9}, {2, 9}, {3, 9}, {4, 9}, {5, 9} }, \
- { {0, 10}, {1, 10}, {2, 10}, {3, 10}, {4, 10}, {5, 10} }, \
-                                                     \
- { {0, 0}, {1, 0}, {2, 0}, {3, 0}, {4, 0}, {5, 0} }, \
- { {0, 1}, {1, 1}, {2, 1}, {3, 1}, {4, 1}, {5, 1} }, \
- { {0, 2}, {1, 2}, {2, 2}, {3, 2}, {4, 2}, {5, 2} }, \
- { {0, 3}, {1, 3}, {2, 3}, {3, 3}, {4, 3}, {5, 3} }, \
- { {0, 4}, {1, 4}, {2, 4}, {3, 4}, {4, 4}, {5, 4} }, \
- { {0, 5}, {1, 5}, {2, 5}, {3, 5}, {4, 5}, {5, 5} }, \
+{
+ { {0, 5}, {1, 5}, {2, 5}, {3, 5}, {4, 5}, {5, 5} },
+ { {0, 6}, {1, 6}, {2, 6}, {3, 6}, {4, 6}, {5, 6} },
+ { {0, 7}, {1, 7}, {2, 7}, {3, 7}, {4, 7}, {5, 7} },
+ { {0, 8}, {1, 8}, {2, 8}, {3, 8}, {4, 8}, {5, 8} },
+ { {0, 9}, {1, 9}, {2, 9}, {3, 9}, {4, 9}, {5, 9} },
+ { {0, 10}, {1, 10}, {2, 10}, {3, 10}, {4, 10}, {5, 10} },
+
+ { {0, 0}, {1, 0}, {2, 0}, {3, 0}, {4, 0}, {5, 0} },
+ { {0, 1}, {1, 1}, {2, 1}, {3, 1}, {4, 1}, {5, 1} },
+ { {0, 2}, {1, 2}, {2, 2}, {3, 2}, {4, 2}, {5, 2} },
+ { {0, 3}, {1, 3}, {2, 3}, {3, 3}, {4, 3}, {5, 3} },
+ { {0, 4}, {1, 4}, {2, 4}, {3, 4}, {4, 4}, {5, 4} },
+ { {0, 5}, {1, 5}, {2, 5}, {3, 5}, {4, 5}, {5, 5} },
 };
 
 #    ifdef ENCODER_MAP_ENABLE
diff --git a/keyboards/lime/rev1/config.h b/keyboards/lime/rev1/config.h
index 70f1cc419b..841a7bb764 100644
--- a/keyboards/lime/rev1/config.h
+++ b/keyboards/lime/rev1/config.h
@@ -16,27 +16,12 @@
 
 #pragma once
 
-/* key matrix size */
-// Rows are doubled-up
-#define MATRIX_ROWS 12
-#define MATRIX_COLS 6
-
 // wiring of each half
 #define MATRIX_ROW_PINS { D4, C6, D7, E6, B4, B5 }
 #define MATRIX_COL_PINS { F6, F7, B1, B3, B2, B6 }
 #define DIODE_DIRECTION COL2ROW
 
 #define TAPPING_TERM 100
-#define DEBOUNCE 5
-
-/* encoder support */
-#ifdef ENCODER_ENABLE
-#   define ENCODERS_PAD_A { F5 }
-#   define ENCODERS_PAD_B { F4 }
-#   define ENCODERS_PAD_A_RIGHT { F4 }
-#   define ENCODERS_PAD_B_RIGHT { F5 }
-#   define ENCODER_RESOLUTION 2
-#endif
 
 /* joystick support */
 #ifdef JOYSTICK_ENABLE
@@ -47,9 +32,6 @@
 
 #define TAP_CODE_DELAY 10
 
-/* communication between sides */
-#define SOFT_SERIAL_PIN D2
-
 #define SPLIT_USB_DETECT
 
 #ifdef WPM_ENABLE
diff --git a/keyboards/lime/rev1/info.json b/keyboards/lime/rev1/info.json
index 3357ba536f..fb05828f6d 100644
--- a/keyboards/lime/rev1/info.json
+++ b/keyboards/lime/rev1/info.json
@@ -8,6 +8,23 @@
         "pid": "0x2784",
         "device_version": "0.0.1"
     },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "F5", "pin_b": "F4", "resolution": 2}
+        ]
+    },
+    "split": {
+        "soft_serial_pin": "D2",
+        "encoder": {
+            "right": {
+                "rotary": [
+                    {"pin_a": "F4", "pin_b": "F5", "resolution": 2}
+                ]
+            }
+        }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/lime/rules.mk b/keyboards/lime/rules.mk
index 17e83d045c..1d1f049a53 100644
--- a/keyboards/lime/rules.mk
+++ b/keyboards/lime/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
 # Build Options
 #   change yes to no to disable
 #