From f1996f386419f1fa074800b617f2f01500897ec8 Mon Sep 17 00:00:00 2001
From: David Khachaturov <d77777k@gmail.com>
Date: Sun, 18 Apr 2021 08:56:04 +0100
Subject: [PATCH]  - Fix application of UseIncrementalLights

---
 BetterJoyForCemu/App.config | 2 +-
 BetterJoyForCemu/Joycon.cs  | 6 +++---
 BetterJoyForCemu/Program.cs | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/BetterJoyForCemu/App.config b/BetterJoyForCemu/App.config
index ecca3f9..b665913 100644
--- a/BetterJoyForCemu/App.config
+++ b/BetterJoyForCemu/App.config
@@ -79,7 +79,7 @@
         <!-- Default: true -->
         <add key="HomeLEDOn" value="true"/>
         <!-- Will use multiple lights to display the current player rather than a single LED-->
-        <add key="UseJoyconIncrementalLights" value="true" />
+        <add key="UseIncrementalLights" value="true" />
 
         <!-- Determines whether or not to translate gyro movements into joystick ("joy") or mouse movement ("mouse"), or have no effect ("none") -->
         <!-- When "joy", turn gyro movements into joystick movement (left/right depends on setting) [not yet implemented]-->
diff --git a/BetterJoyForCemu/Joycon.cs b/BetterJoyForCemu/Joycon.cs
index 9551e0b..ef6b84f 100644
--- a/BetterJoyForCemu/Joycon.cs
+++ b/BetterJoyForCemu/Joycon.cs
@@ -261,7 +261,7 @@ namespace BetterJoyForCemu {
                 id = 3;
             }
 
-            if (ConfigurationManager.OpenExeConfiguration(ConfigurationUserLevel.None).AppSettings.Settings["UseJoyconIncrementalLights"].Value.ToLower() == "true") {
+            if (ConfigurationManager.OpenExeConfiguration(ConfigurationUserLevel.None).AppSettings.Settings["UseIncrementalLights"].Value.ToLower() == "true") {
                 // Set all LEDs from 0 to the given id to lit
                 int ledId = id;
                 LED = 0x0;
@@ -364,7 +364,7 @@ namespace BetterJoyForCemu {
         public Vector3 GetAccel() {
             return acc_g;
         }
-        public int Attach(byte leds_ = 0x0) {
+        public int Attach() {
             state = state_.ATTACHED;
 
             // Make sure command is received
@@ -422,7 +422,7 @@ namespace BetterJoyForCemu {
             //Subcommand(0x01, new byte[] { 0x03 }, 1, true);
 
             BlinkHomeLight();
-            SetPlayerLED(leds_);
+            SetLEDByPlayerNum(PadId);
 
             Subcommand(0x40, new byte[] { (imu_enabled ? (byte)0x1 : (byte)0x0) }, 1);
             Subcommand(0x48, new byte[] { 0x01 }, 1);
diff --git a/BetterJoyForCemu/Program.cs b/BetterJoyForCemu/Program.cs
index 3ff7be8..84bb4b6 100644
--- a/BetterJoyForCemu/Program.cs
+++ b/BetterJoyForCemu/Program.cs
@@ -304,7 +304,7 @@ namespace BetterJoyForCemu {
                         jc.out_ds4.Connect();
 
                     try {
-                        jc.Attach(leds_: jc.LED);
+                        jc.Attach();
                     } catch (Exception e) {
                         jc.state = Joycon.state_.DROPPED;
                         continue;