Build for Binary file

Pedal: 1. Add the warning when not finish pedal assignment. Bridge: 1. Verison Bumpup Plugin: 1. Add preview into online config 2. Remove export online config, now local config is shareable 3. Remove Serial monitor in pedal tab. 4. Add floating serial monitor with a "Pedal log monitor" button 5. Add check for Bridge version 6. UI tweaking
ChrGri · Dec 20, 2024 · e27cf7e · e27cf7e
1 parent a549ee8
commit e27cf7e
Show file tree

Hide file tree

Showing 12 changed files with 23 additions and 3 deletions.
diff --git a/ESP32/include/Version_Board.h b/ESP32/include/Version_Board.h
@@ -1,4 +1,4 @@
-#define DAP_FIRMWARE_VERSION "0.89.01"
+#define DAP_FIRMWARE_VERSION "0.89.02"
 #if PCB_VERSION==3
 	#define CONTROL_BOARD "V3_ESP32"
 #endif

diff --git a/ESP32_master/include/Version_Board.h b/ESP32_master/include/Version_Board.h
@@ -1,4 +1,4 @@
-#define BRIDGE_FIRMWARE_VERSION "0.89.01"
+#define BRIDGE_FIRMWARE_VERSION "0.89.02"
 #if PCB_VERSION==5
 	#define BRIDGE_BOARD   "Bridge_FANATEC"
 #endif

diff --git a/OTA/Bridge/Fanatec_Bridge/firmware.bin b/OTA/Bridge/Fanatec_Bridge/firmware.bin
diff --git a/OTA/Bridge/Gilphilbert_dongle/firmware.bin b/OTA/Bridge/Gilphilbert_dongle/firmware.bin
diff --git a/OTA/Bridge/dev_kit/firmware.bin b/OTA/Bridge/dev_kit/firmware.bin
diff --git a/OTA/ControlBoard/Gilphilbert_1_2/firmware.bin b/OTA/ControlBoard/Gilphilbert_1_2/firmware.bin
diff --git a/OTA/ControlBoard/Gilphilbert_2_0/firmware.bin b/OTA/ControlBoard/Gilphilbert_2_0/firmware.bin
diff --git a/OTA/ControlBoard/Speedcrafter/firmware.bin b/OTA/ControlBoard/Speedcrafter/firmware.bin
diff --git a/OTA/ControlBoard/esp32/firmware.bin b/OTA/ControlBoard/esp32/firmware.bin
diff --git a/OTA/ControlBoard/esp32S3/firmware.bin b/OTA/ControlBoard/esp32S3/firmware.bin
diff --git a/SimHubPlugin/SettingsControlDemo.xaml b/SimHubPlugin/SettingsControlDemo.xaml
@@ -1612,7 +1612,7 @@
                                             <TextBox x:Name="TextBox_rudder_debug" HorizontalAlignment="Left" Grid.Column="2" Grid.Row="0" Grid.RowSpan="3" TextWrapping="Wrap" Text="" VerticalAlignment="Top" Width="160" Height="25" AutomationProperties.Name="TextBox2" BorderBrush="#00CCCCCC" Background="#00252525" FontSize="8" FontFamily="Arial" />
                                             <styles:SHButtonPrimary x:Name="btn_rudder_initialize" Click="btn_rudder_initialize_Click" Width="160" Height="25" Content="Rudder" Margin="0,2,0,0" HorizontalAlignment="Center" VerticalContentAlignment="Center" Padding="15,0,15,0" />
                                             <styles:SHButtonPrimary Click="SHButtonPrimary_Click" Width="160" Content="Load Config from Local" Height="25" Margin="0,2,0,0" HorizontalAlignment="Left" VerticalAlignment="Top" Padding="15,0,15,0" VerticalContentAlignment="Center" />
-                                            <styles:SHButtonPrimary Click="SaveButton_Click" Width="160" Content="Save Config to Local" Height="25" Margin="0,2,0,0" HorizontalAlignment="Left" Padding="15,0,15,0" VerticalContentAlignment="Center" />
+                                            <styles:SHButtonPrimary Click="SaveButton_Click" Width="160" Content="Export Config to Local" Height="25" Margin="0,2,0,0" HorizontalAlignment="Left" Padding="15,0,15,0" VerticalContentAlignment="Center" />
 
                                         </StackPanel>
                                     </Border>

diff --git a/SimHubPlugin/SettingsControlDemo.xaml.cs b/SimHubPlugin/SettingsControlDemo.xaml.cs
@@ -129,6 +129,7 @@ public partial class SettingsControlDemo : System.Windows.Controls.UserControl
         public bool Update_CV_textbox = false;
         public bool[] Version_error_warning_b = new bool[3] { false, false, false };
         public bool[] Version_warning_first_show_b= new bool[3] { false, false, false };
+        public bool Version_warning_first_show_b_bridge = false;
         public byte[] Pedal_version = new byte[3];
         private SerialMonitor_Window _serial_monitor_window;
         public bool Pedal_Log_warning_1st_show_b = true;
@@ -6887,6 +6888,25 @@ unsafe public void timerCallback_serial_esphost(object sender, EventArgs e)
                                     check_payload_state_b = true;
                                 }
 
+                                if (bridge_state.payLoadHeader_.version != Constants.pedalConfigPayload_version && bridge_state.payLoadHeader_.payloadType== Constants.bridgeStatePayloadType)
+                                {
+                                    if (!Version_warning_first_show_b_bridge)
+                                    {
+                                        Version_warning_first_show_b_bridge = true;
+                                        if (bridge_state.payLoadHeader_.version > Constants.pedalConfigPayload_version)
+                                        {
+                                            String MSG_tmp;
+                                            MSG_tmp = "Bridge Dap version: " + bridge_state.payLoadHeader_.version + ", Plugin DAP version: " + Constants.pedalConfigPayload_version + ". Please update Simhub Plugin.";
+                                            System.Windows.MessageBox.Show(MSG_tmp, "Error", MessageBoxButton.OK, MessageBoxImage.Warning);
+                                        }
+                                        else
+                                        {
+                                            String MSG_tmp;
+                                            MSG_tmp = "Bridge Dap version: " + bridge_state.payLoadHeader_.version + ", Plugin DAP version: " + Constants.pedalConfigPayload_version + ". Please update Bridge Firmware.";
+                                            System.Windows.MessageBox.Show(MSG_tmp, "Error", MessageBoxButton.OK, MessageBoxImage.Warning); 
+                                        }
+                                    }
+                                }
                                 // CRC check
                                 bool check_crc_state_b = false;
                                 if (Plugin.checksumCalc(p_state, sizeof(payloadHeader) + sizeof(payloadBridgeState)) == bridge_state.payloadFooter_.checkSum)