diff --git a/ESP32/include/ESPNOW_lib.h b/ESP32/include/ESPNOW_lib.h index c1c3642e..d3ea72c9 100644 --- a/ESP32/include/ESPNOW_lib.h +++ b/ESP32/include/ESPNOW_lib.h @@ -454,7 +454,8 @@ void ESPNow_initialize() } } } - #endif + #endif + if(dap_config_st.payLoadPedalConfig_.pedal_type==1) { Recv_mac=Gas_mac; @@ -466,6 +467,12 @@ void ESPNow_initialize() Recv_mac=Brk_mac; ESPNow.add_peer(Recv_mac); } + if(dap_config_st.payLoadPedalConfig_.pedal_type==0) + { + Recv_mac=Brk_mac; + ESPNow.add_peer(Recv_mac); + } + diff --git a/ESP32/src/Main.cpp b/ESP32/src/Main.cpp index 5695bfaf..7f90e268 100644 --- a/ESP32/src/Main.cpp +++ b/ESP32/src/Main.cpp @@ -663,7 +663,7 @@ pinMode(Pairing_GPIO, INPUT_PULLUP); xTaskCreatePinnedToCore( ESPNOW_SyncTask, "ESPNOW_update_Task", - 3000, + 5000, //STACK_SIZE_FOR_TASK_2, NULL, 1, diff --git a/SimHubPlugin/.vs/User.PluginSdkDemo/FileContentIndex/0a3a28c1-7c5f-4a16-b89c-704b0844d1c7.vsidx b/SimHubPlugin/.vs/User.PluginSdkDemo/FileContentIndex/0a3a28c1-7c5f-4a16-b89c-704b0844d1c7.vsidx deleted file mode 100644 index 67ae73f4..00000000 Binary files a/SimHubPlugin/.vs/User.PluginSdkDemo/FileContentIndex/0a3a28c1-7c5f-4a16-b89c-704b0844d1c7.vsidx and /dev/null differ diff --git a/SimHubPlugin/.vs/User.PluginSdkDemo/FileContentIndex/5249fa53-2e65-4d4d-aaca-6a5fac6bd372.vsidx b/SimHubPlugin/.vs/User.PluginSdkDemo/FileContentIndex/5249fa53-2e65-4d4d-aaca-6a5fac6bd372.vsidx deleted file mode 100644 index ae307d09..00000000 Binary files a/SimHubPlugin/.vs/User.PluginSdkDemo/FileContentIndex/5249fa53-2e65-4d4d-aaca-6a5fac6bd372.vsidx and /dev/null differ diff --git a/SimHubPlugin/.vs/User.PluginSdkDemo/FileContentIndex/55a1e1e3-da11-4593-9f3e-850c008219a6.vsidx b/SimHubPlugin/.vs/User.PluginSdkDemo/FileContentIndex/55a1e1e3-da11-4593-9f3e-850c008219a6.vsidx deleted file mode 100644 index 5f4497f0..00000000 Binary files a/SimHubPlugin/.vs/User.PluginSdkDemo/FileContentIndex/55a1e1e3-da11-4593-9f3e-850c008219a6.vsidx and /dev/null differ diff --git a/SimHubPlugin/.vs/User.PluginSdkDemo/FileContentIndex/a1fd4c7c-e114-4a13-8c1f-80024347cf5b.vsidx b/SimHubPlugin/.vs/User.PluginSdkDemo/FileContentIndex/a1fd4c7c-e114-4a13-8c1f-80024347cf5b.vsidx new file mode 100644 index 00000000..d8128afc Binary files /dev/null and b/SimHubPlugin/.vs/User.PluginSdkDemo/FileContentIndex/a1fd4c7c-e114-4a13-8c1f-80024347cf5b.vsidx differ diff --git a/SimHubPlugin/.vs/User.PluginSdkDemo/FileContentIndex/b62eb3a1-6bdf-49d5-8e8b-6e7bc04cdbc0.vsidx b/SimHubPlugin/.vs/User.PluginSdkDemo/FileContentIndex/b62eb3a1-6bdf-49d5-8e8b-6e7bc04cdbc0.vsidx deleted file mode 100644 index af7849df..00000000 Binary files a/SimHubPlugin/.vs/User.PluginSdkDemo/FileContentIndex/b62eb3a1-6bdf-49d5-8e8b-6e7bc04cdbc0.vsidx and /dev/null differ diff --git a/SimHubPlugin/.vs/User.PluginSdkDemo/v17/.suo b/SimHubPlugin/.vs/User.PluginSdkDemo/v17/.suo index 77e179bd..14432892 100644 Binary files a/SimHubPlugin/.vs/User.PluginSdkDemo/v17/.suo and b/SimHubPlugin/.vs/User.PluginSdkDemo/v17/.suo differ diff --git a/SimHubPlugin/.vs/User.PluginSdkDemo/v17/DocumentLayout.json b/SimHubPlugin/.vs/User.PluginSdkDemo/v17/DocumentLayout.json new file mode 100644 index 00000000..f2dac144 --- /dev/null +++ b/SimHubPlugin/.vs/User.PluginSdkDemo/v17/DocumentLayout.json @@ -0,0 +1,110 @@ +{ + "Version": 1, + "WorkspaceRootPath": "C:\\Users\\tcfshcrw\\Documents\\GitHub\\DIY-Sim-Racing-FFB-Pedal\\SimHubPlugin\\", + "Documents": [ + { + "AbsoluteMoniker": "D:0:0:{833040C9-FE5E-4CCF-B21D-71979E049B6B}|User.PluginSdkDemo.csproj|c:\\users\\tcfshcrw\\documents\\github\\diy-sim-racing-ffb-pedal\\simhubplugin\\settingscontroldemo.xaml||{F11ACC28-31D1-4C80-A34B-F4E09D3D753C}", + "RelativeMoniker": "D:0:0:{833040C9-FE5E-4CCF-B21D-71979E049B6B}|User.PluginSdkDemo.csproj|solutionrelative:settingscontroldemo.xaml||{F11ACC28-31D1-4C80-A34B-F4E09D3D753C}" + }, + { + "AbsoluteMoniker": "D:0:0:{833040C9-FE5E-4CCF-B21D-71979E049B6B}|User.PluginSdkDemo.csproj|C:\\Users\\tcfshcrw\\Documents\\GitHub\\DIY-Sim-Racing-FFB-Pedal\\SimHubPlugin\\settingscontroldemo.xaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{833040C9-FE5E-4CCF-B21D-71979E049B6B}|User.PluginSdkDemo.csproj|solutionrelative:settingscontroldemo.xaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{833040C9-FE5E-4CCF-B21D-71979E049B6B}|User.PluginSdkDemo.csproj|C:\\Users\\tcfshcrw\\Documents\\GitHub\\DIY-Sim-Racing-FFB-Pedal\\SimHubPlugin\\dataplugindemosettings.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{833040C9-FE5E-4CCF-B21D-71979E049B6B}|User.PluginSdkDemo.csproj|solutionrelative:dataplugindemosettings.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{833040C9-FE5E-4CCF-B21D-71979E049B6B}|User.PluginSdkDemo.csproj|C:\\Users\\tcfshcrw\\Documents\\GitHub\\DIY-Sim-Racing-FFB-Pedal\\SimHubPlugin\\dataplugindemo.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{833040C9-FE5E-4CCF-B21D-71979E049B6B}|User.PluginSdkDemo.csproj|solutionrelative:dataplugindemo.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{00000000-0000-0000-0000-000000000000}|\u003CSolution\u003E|User.PluginSdkDemo||{04B8AB82-A572-4FEF-95CE-5222444B6B64}|" + } + ], + "DocumentGroupContainers": [ + { + "Orientation": 0, + "VerticalTabListWidth": 256, + "DocumentGroups": [ + { + "DockedWidth": 1796, + "SelectedChildIndex": 3, + "Children": [ + { + "$type": "Document", + "DocumentIndex": 3, + "Title": "DataPluginDemo.cs", + "DocumentMoniker": "C:\\Users\\tcfshcrw\\Documents\\GitHub\\DIY-Sim-Racing-FFB-Pedal\\SimHubPlugin\\DataPluginDemo.cs", + "RelativeDocumentMoniker": "DataPluginDemo.cs", + "ToolTip": "C:\\Users\\tcfshcrw\\Documents\\GitHub\\DIY-Sim-Racing-FFB-Pedal\\SimHubPlugin\\DataPluginDemo.cs", + "RelativeToolTip": "DataPluginDemo.cs", + "ViewState": "AQIAANAAAAAAAAAAAAAcwN8DAAA3AAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-09-22T01:27:42.551Z" + }, + { + "$type": "Document", + "DocumentIndex": 1, + "Title": "SettingsControlDemo.xaml.cs", + "DocumentMoniker": "C:\\Users\\tcfshcrw\\Documents\\GitHub\\DIY-Sim-Racing-FFB-Pedal\\SimHubPlugin\\SettingsControlDemo.xaml.cs", + "RelativeDocumentMoniker": "SettingsControlDemo.xaml.cs", + "ToolTip": "C:\\Users\\tcfshcrw\\Documents\\GitHub\\DIY-Sim-Racing-FFB-Pedal\\SimHubPlugin\\SettingsControlDemo.xaml.cs", + "RelativeToolTip": "SettingsControlDemo.xaml.cs", + "ViewState": "AQIAADoKAAAAAAAAAAAawMwEAAA7AAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-09-22T01:27:42.579Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 2, + "Title": "DataPluginDemoSettings.cs", + "DocumentMoniker": "C:\\Users\\tcfshcrw\\Documents\\GitHub\\DIY-Sim-Racing-FFB-Pedal\\SimHubPlugin\\DataPluginDemoSettings.cs", + "RelativeDocumentMoniker": "DataPluginDemoSettings.cs", + "ToolTip": "C:\\Users\\tcfshcrw\\Documents\\GitHub\\DIY-Sim-Racing-FFB-Pedal\\SimHubPlugin\\DataPluginDemoSettings.cs", + "RelativeToolTip": "DataPluginDemoSettings.cs", + "ViewState": "AQIAAB0AAAAAAAAAAAAAwCgAAAA/AAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-09-22T01:27:42.58Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 0, + "Title": "SettingsControlDemo.xaml", + "DocumentMoniker": "C:\\Users\\tcfshcrw\\Documents\\GitHub\\DIY-Sim-Racing-FFB-Pedal\\SimHubPlugin\\SettingsControlDemo.xaml", + "RelativeDocumentMoniker": "SettingsControlDemo.xaml", + "ToolTip": "C:\\Users\\tcfshcrw\\Documents\\GitHub\\DIY-Sim-Racing-FFB-Pedal\\SimHubPlugin\\SettingsControlDemo.xaml", + "RelativeToolTip": "SettingsControlDemo.xaml", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003549|", + "WhenOpened": "2024-09-22T01:27:42.788Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 4, + "Title": "User.PluginSdkDemo", + "DocumentMoniker": "C:\\Users\\tcfshcrw\\Documents\\GitHub\\DIY-Sim-Racing-FFB-Pedal\\SimHubPlugin\\User.PluginSdkDemo.csproj", + "RelativeDocumentMoniker": "User.PluginSdkDemo.csproj", + "ToolTip": "C:\\Users\\tcfshcrw\\Documents\\GitHub\\DIY-Sim-Racing-FFB-Pedal\\SimHubPlugin\\User.PluginSdkDemo.csproj", + "RelativeToolTip": "User.PluginSdkDemo.csproj", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000758|", + "WhenOpened": "2024-01-21T21:54:53.464Z" + } + ] + }, + { + "DockedWidth": 583, + "SelectedChildIndex": -1, + "Children": [ + { + "$type": "Bookmark", + "Name": "ST:0:0:{d78612c7-9962-4b83-95d9-268046dad23a}" + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/SimHubPlugin/DataPluginDemoSettings.cs b/SimHubPlugin/DataPluginDemoSettings.cs index 8933be7b..1e6ce0f0 100644 --- a/SimHubPlugin/DataPluginDemoSettings.cs +++ b/SimHubPlugin/DataPluginDemoSettings.cs @@ -39,6 +39,7 @@ public class DataPluginDemoSettings 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[] USING_ESP32S3 = new bool[3] { true, true, true }; 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] { "","",""}; diff --git a/SimHubPlugin/SettingsControlDemo.xaml b/SimHubPlugin/SettingsControlDemo.xaml index 2c675f27..1cfbe86a 100644 --- a/SimHubPlugin/SettingsControlDemo.xaml +++ b/SimHubPlugin/SettingsControlDemo.xaml @@ -924,15 +924,19 @@