profile change now including effect status

1. Add Effect status change into profile tab 2. Add 2.0 platformio setting
ChrGri · Oct 19, 2024 · 4d05f43 · 4d05f43
1 parent 1710308
commit 4d05f43
Show file tree

Hide file tree

Showing 4 changed files with 346 additions and 150 deletions.
diff --git a/ESP32/platformio.ini b/ESP32/platformio.ini
@@ -22,7 +22,6 @@ monitor_speed = 921600
 [common]
 lib_deps_external = 
 	rfetick/Kalman @ ^1.1.0
-	lemmingdev/ESP32-BLE-Gamepad @ ^0.5.5
 	#gin66/FastAccelStepper @ ^0.30.12
 	gin66/FastAccelStepper @ ^0.31.0
 	dlloydev/QuickPID @ ^3.1.9
@@ -58,6 +57,7 @@ board = esp32dev
 lib_deps = 
 	${common.lib_deps_external}
 	regenbogencode/ESPNowW@^1.0.2
+	lemmingdev/ESP32-BLE-Gamepad @ ^0.5.5
 build_unflags = 
 	'-D PCB_VERSION=6'
 build_flags = 
@@ -68,6 +68,7 @@ board = esp-wrover-kit
 lib_deps = 
 	${common.lib_deps_external}
 	regenbogencode/ESPNowW@^1.0.2
+	lemmingdev/ESP32-BLE-Gamepad @ ^0.5.5
 build_unflags = 
 	'-D PCB_VERSION=6'
 build_flags = 
@@ -97,7 +98,7 @@ lib_deps =
 	adafruit/Adafruit MCP4725 @ ^2.0.2
 	regenbogencode/ESPNowW@^1.0.2
 
-[env:esp32s3usbotg-4R2P]
+[env:esp32s3usbotg-gilphilbert_2_0]
 board = adafruit_feather_esp32s3
 board_build.f_cpu = 240000000L
 build_flags = 
@@ -107,7 +108,7 @@ build_flags =
 	-DARDUINO_USB_CDC_ON_BOOT=1
 	-DARDUINO_USB_MSC_ON_BOOT=0
 	-DARDUINO_USB_DFU_ON_BOOT=0
-	-DPCB_VERSION=8
+	-DPCB_VERSION=7
 	-DUSB_VID=0xF011
 	-DUSB_PID=0xF011
 	'-DUSB_PRODUCT="DiyFfbPedal"'

diff --git a/SimHubPlugin/DataPluginDemoSettings.cs b/SimHubPlugin/DataPluginDemoSettings.cs
@@ -20,7 +20,7 @@ public class DataPluginDemoSettings
         public uint[] connect_flag = new uint[3] { 0, 0, 0 };
         public uint RPM_effect_type = 0;
         public uint table_selected = 0;
-        public int[] auto_connect_flag = new int[3] { 0,0,0};
+        public int[] auto_connect_flag = new int[3] { 0, 0, 0 };
         public int[] selectedComPortNamesInt = new int[3] { -1, -1, -1 };
         public int[] ABS_enable_flag = new int[3] { 0, 0, 0 };
         public int[] RPM_enable_flag = new int[3] { 0, 0, 0 };
@@ -38,11 +38,11 @@ public class DataPluginDemoSettings
         public double kinematicDiagram_zeroPos_OX = 100;
         public double kinematicDiagram_zeroPos_OY = 20;
         public double kinematicDiagram_zeroPos_scale = 1.5;
-        public bool[] RTSDTR_False = new bool[3] { true,true,true};
+        public bool[] RTSDTR_False = new bool[3] { true, true, true };
         public bool[] USING_ESP32S3 = new bool[3] { true, true, true };
-        public bool[] CV1_enable_flag = new bool[3] { false,false, false };
+        public bool[] CV1_enable_flag = new bool[3] { false, false, false };
         public int[] CV1_trigger = new int[3] { 0, 0, 0 };
-        public string[] CV1_bindings = new string[3] { "","",""};
+        public string[] CV1_bindings = new string[3] { "", "", "" };
         public bool[] CV2_enable_flag = new bool[3] { false, false, false };
         public int[] CV2_trigger = new int[3] { 0, 0, 0 };
         public string[] CV2_bindings = new string[3] { "", "", "" };
@@ -54,9 +54,10 @@ public class DataPluginDemoSettings
         public bool Using_CDC_bridge = false;
         public byte[] Pedal_action_interval = new byte[3] { 50, 51, 53 };
         public bool Rudder_RPM_effect_b = false;
-        public bool Rudder_ACC_effect_b=false;
+        public bool Rudder_ACC_effect_b = false;
         public bool Rudder_ACC_WindForce = false;
         public bool advanced_b = false;
+        public bool[,,] Effect_status_prolife = new bool[6, 3, 8] { { { false, false, false, false, false, false, false, false }, { false, false, false, false, false, false, false, false }, { false, false, false, false, false, false, false, false } }, { { false, false, false, false, false, false, false, false }, { false, false, false, false, false, false, false, false }, { false, false, false, false, false, false, false, false } }, { { false, false, false, false, false, false, false, false }, { false, false, false, false, false, false, false, false }, { false, false, false, false, false, false, false, false } }, { { false, false, false, false, false, false, false, false }, { false, false, false, false, false, false, false, false }, { false, false, false, false, false, false, false, false } }, { { false, false, false, false, false, false, false, false }, { false, false, false, false, false, false, false, false }, { false, false, false, false, false, false, false, false } }, { { false, false, false, false, false, false, false, false }, { false, false, false, false, false, false, false, false }, { false, false, false, false, false, false, false, false } } };
 
     }