From 3adaa16537c53e1de6f5780fdb6c20ea52e35449 Mon Sep 17 00:00:00 2001
From: Martin Morrell <mjmorrell84@gmail.com>
Date: Mon, 15 Dec 2025 19:52:30 +0000
Subject: [PATCH] Add 4P3T AxLabs Lever Switch variant

---
 .../diylc/components/guitar/LeverSwitch.java  | 20 ++++++++++++++++++-
 .../org/diylc/netlist/LeverSwitchTests.java   | 13 ++++++++++++
 knowledge/component_types.sql                 |  2 +-
 3 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/diylc/diylc-library/src/main/java/org/diylc/components/guitar/LeverSwitch.java b/diylc/diylc-library/src/main/java/org/diylc/components/guitar/LeverSwitch.java
index 597db8c8..76cbeea2 100644
--- a/diylc/diylc-library/src/main/java/org/diylc/components/guitar/LeverSwitch.java
+++ b/diylc/diylc-library/src/main/java/org/diylc/components/guitar/LeverSwitch.java
@@ -208,6 +208,8 @@ public class LeverSwitch extends AbstractAngledComponent<LeverSwitch.LeverSwitch
       } else if (type == LeverSwitchType._6_WAY_OG) {
         x += terminalLength;
         yOffset = 8;
+      } else if (type == LeverSwitchType._4P3T) {
+        yOffset = 8;
       } else {
         yOffset = 12;
       }      
@@ -236,6 +238,11 @@ public class LeverSwitch extends AbstractAngledComponent<LeverSwitch.LeverSwitch
                 - (waferLength - terminalSpacing * 12) / 2, waferThickness,
                 waferLength)));
       }
+      if (type == LeverSwitchType._4P3T) {
+        waferArea.add(new Area(new Rectangle2D.Double(x - terminalLength / 2 - waferThickness / 2 + waferSpacing, y
+                - (waferLength - terminalSpacing * 8) / 2, waferThickness,
+                waferLength)));
+      }
 
       double theta = getAngle().getValueRad();
 
@@ -332,6 +339,13 @@ public class LeverSwitch extends AbstractAngledComponent<LeverSwitch.LeverSwitch
           controlPoints[i + 24] = new Point2D.Double(x + waferSpacing * 2, y + i * terminalSpacing + (i >= 6 ? terminalSpacing : 0));
         }
         break;
+      case _4P3T:
+        controlPoints = new Point2D[16];
+        for (int i = 0; i < controlPoints.length / 2; i++) {
+          controlPoints[i] = new Point2D.Double(x, y + i * terminalSpacing + (i >= 4 ? terminalSpacing : 0));
+          controlPoints[i + 8] = new Point2D.Double(x + waferSpacing, y + i * terminalSpacing + (i >= 4 ? terminalSpacing : 0));
+        }
+        break;
     }
 
     // Rotate if needed
@@ -464,6 +478,9 @@ public class LeverSwitch extends AbstractAngledComponent<LeverSwitch.LeverSwitch
       case _6P5T:
         return ((index1 == 0 || index1 == 12 || index1 == 24) && index2 - index1 == position + 1)
             || ((index2 == 11 || index2 == 23 || index2 == 35) && index2 - index1 == 5 - position);
+      case _4P3T:
+        return ((index1 == 0 || index1 == 8) && index2 - index1 == position + 1)
+                || ((index2 == 7 || index2 == 15) && index2 - index1 == 3 - position);
     }
     
     if (positionConnections != null) {
@@ -576,7 +593,8 @@ public class LeverSwitch extends AbstractAngledComponent<LeverSwitch.LeverSwitch
     DP4T("DP4T (4-Position Tele)", 4),
     _6_WAY_OG("DP4T (6-Position Oak Grigsby)", 6),
     DP5T("DP5T", 5),
-    _6P5T("6P5T (5-Position 6 Pole AxLabs)", 5);
+    _6P5T("6P5T (5-Position 6 Pole AxLabs)", 5),
+    _4P3T("4P3T (3-Position 3 Pole AxLabs)", 3);
 
     private final int positionCount;
     private String title;
diff --git a/diylc/diylc-library/src/test/java/org/diylc/netlist/LeverSwitchTests.java b/diylc/diylc-library/src/test/java/org/diylc/netlist/LeverSwitchTests.java
index 644dffe0..7da4e551 100644
--- a/diylc/diylc-library/src/test/java/org/diylc/netlist/LeverSwitchTests.java
+++ b/diylc/diylc-library/src/test/java/org/diylc/netlist/LeverSwitchTests.java
@@ -43,6 +43,19 @@ public class LeverSwitchTests extends AbstractSwitchTests {
     leverSwitch.setValue(LeverSwitchType._6P5T);
     testSwitch(leverSwitch, validCombinations);
   }
+
+  @Test
+  public void testLeverSwitch4P3T() {
+    LeverSwitch leverSwitch = new LeverSwitch();
+
+    String[] validCombinations = new String[] {
+            "0,0,1", "0,4,7", "0,8,9", "0,12,15",
+            "1,0,2", "1,5,7", "1,8,10", "1,13,15",
+            "2,0,3", "2,6,7", "2,8,11", "2,14,15",
+    };
+    leverSwitch.setValue(LeverSwitchType._4P3T);
+    testSwitch(leverSwitch, validCombinations);
+  }
   
   @Test
   public void testLeverSwitchImport() {
diff --git a/knowledge/component_types.sql b/knowledge/component_types.sql
index 6aff52f4..c6b0130d 100644
--- a/knowledge/component_types.sql
+++ b/knowledge/component_types.sql
@@ -129,7 +129,7 @@ INSERT INTO diylc_knowledge_base (category, section, content) ('Component Types'
     "type" : "java.lang.Boolean"
   }, {
     "name" : "Type",
-    "type" : "org.diylc.components.guitar.LeverSwitch$LeverSwitchType(DP3T (Standard 3-Position Strat),DP3T (Standard 5-Position Strat),DP3T (Import 5-Position Strat),4P5T (Super/Mega),DP4T (4-Position Tele),DP4T (6-Position Oak Grigsby),DP5T,6P5T (5-Position 6 Pole AxLabs))"
+    "type" : "org.diylc.components.guitar.LeverSwitch$LeverSwitchType(DP3T (Standard 3-Position Strat),DP3T (Standard 5-Position Strat),DP3T (Import 5-Position Strat),4P5T (Super/Mega),DP4T (4-Position Tele),DP4T (6-Position Oak Grigsby),DP5T,6P5T (5-Position 6 Pole AxLabs)),4P3T (3-Position 3 Pole AxLabs)"
   }, {
     "name" : "Angle",
     "type" : "org.diylc.core.Angle"