From e6a64c307b4f2d31d63952d244a9fa51f207e004 Mon Sep 17 00:00:00 2001
From: Dave Gymer <gizmo@davegymer.org>
Date: Thu, 5 Dec 2024 16:38:33 +0000
Subject: [PATCH 1/3] Move wibbleator input event from controller test.

---
 .../{SimConnectzmo => GameControllers}/Wibbleator.cs       | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
 rename Controlzmo/{SimConnectzmo => GameControllers}/Wibbleator.cs (96%)

diff --git a/Controlzmo/SimConnectzmo/Wibbleator.cs b/Controlzmo/GameControllers/Wibbleator.cs
similarity index 96%
rename from Controlzmo/SimConnectzmo/Wibbleator.cs
rename to Controlzmo/GameControllers/Wibbleator.cs
index 4dd79e3..998530e 100644
--- a/Controlzmo/SimConnectzmo/Wibbleator.cs
+++ b/Controlzmo/GameControllers/Wibbleator.cs
@@ -1,11 +1,10 @@
-using Controlzmo;
-using Controlzmo.GameControllers;
-using Lombok.NET;
+using Lombok.NET;
 using Microsoft.Extensions.Logging;
 using Microsoft.FlightSimulator.SimConnect;
+using SimConnectzmo;
 using System;
 
-namespace SimConnectzmo
+namespace Controlzmo.GameControllers
 {
     [Component, RequiredArgsConstructor]
     public partial class Wibbleator : IButtonCallback<T16000mHotas>, IEvent, IEventNotification

From 3ae1bbc413936d6860dc0dc469a6ca430a056088 Mon Sep 17 00:00:00 2001
From: Dave Gymer <gizmo@davegymer.org>
Date: Thu, 5 Dec 2024 16:56:16 +0000
Subject: [PATCH 2/3] Wibbleator in ESC.

---
 Controlzmo/SimConnectzmo/ExtendedSimConnect.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Controlzmo/SimConnectzmo/ExtendedSimConnect.cs b/Controlzmo/SimConnectzmo/ExtendedSimConnect.cs
index 7c7a57a..bf9098f 100644
--- a/Controlzmo/SimConnectzmo/ExtendedSimConnect.cs
+++ b/Controlzmo/SimConnectzmo/ExtendedSimConnect.cs
@@ -34,7 +34,7 @@ public class ExtendedSimConnect : SimConnect
         private IEnumerable<IOnSimStarted>? onSimStartedHandlers;
         private IEnumerable<IOnSimFrame>? onSimFrameHandlers;
         private IEnumerable<IOnAircraftLoaded> onAircraftLoadedHandlers;
-private Wibbleator wibble;
+        private Wibbleator wibble;
         private InputEvents inputEventsHandler;
 
         public bool? IsSimStarted;
@@ -70,7 +70,7 @@ internal ExtendedSimConnect AssignIds(IServiceProvider serviceProvider)
             _logging = serviceProvider.GetRequiredService<ILogger<ExtendedSimConnect>>();
             serializedExecutor = serviceProvider.GetRequiredService<SerializedExecutor>();
             inputEventsHandler = serviceProvider.GetRequiredService<InputEvents>();
-wibble = serviceProvider.GetRequiredService<Wibbleator>();
+            wibble = serviceProvider.GetRequiredService<Wibbleator>();
 
             typeToStruct = serviceProvider
                 .GetServices<IData>()

From f6516e03732e3c70693fb0fa081de2f0f50bb58a Mon Sep 17 00:00:00 2001
From: Gizmo <gizmo@davegymer.org>
Date: Thu, 5 Dec 2024 20:58:29 +0000
Subject: [PATCH 3/3] Bah, missed a bit of merging.

---
 Controlzmo/SimConnectzmo/ExtendedSimConnect.cs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/Controlzmo/SimConnectzmo/ExtendedSimConnect.cs b/Controlzmo/SimConnectzmo/ExtendedSimConnect.cs
index 8a45abd..61fe523 100644
--- a/Controlzmo/SimConnectzmo/ExtendedSimConnect.cs
+++ b/Controlzmo/SimConnectzmo/ExtendedSimConnect.cs
@@ -71,10 +71,7 @@ internal ExtendedSimConnect AssignIds(IServiceProvider serviceProvider)
             _logging = serviceProvider.GetRequiredService<ILogger<ExtendedSimConnect>>();
             serializedExecutor = serviceProvider.GetRequiredService<SerializedExecutor>();
             inputEventsHandler = serviceProvider.GetRequiredService<InputEvents>();
-<<<<<<< HEAD
-            wibble = serviceProvider.GetRequiredService<Wibbleator>();
-=======
->>>>>>> origin/master
+wibble = serviceProvider.GetRequiredService<Wibbleator>();
 
             typeToStruct = serviceProvider
                 .GetServices<IData>()