diff --git a/StandardScene.Fass2Simulator/Fass2SimConfig.cs b/StandardScene.Fass2Simulator/Fass2SimConfig.cs index e21b3fc..7172e00 100644 --- a/StandardScene.Fass2Simulator/Fass2SimConfig.cs +++ b/StandardScene.Fass2Simulator/Fass2SimConfig.cs @@ -6,7 +6,7 @@ namespace StandardScene.Fass2Simulator { public ushort VehicleCode { get; set; } = 1; public string VehicleListenAddress { get; set; } = "0.0.0.0"; - public int VehicleListenPort { get; set; } = 5000; + public int VehicleListenPort { get; set; } = 5001; public string SchedulerHost { get; set; } = "127.0.0.1"; public int SchedulerListenPort { get; set; } = 20103; public int ReportIntervalMs { get; set; } = 200; diff --git a/StandardScene.Fass2Simulator/Fass2SimUdpHost.cs b/StandardScene.Fass2Simulator/Fass2SimUdpHost.cs index 87c0646..708e7bd 100644 --- a/StandardScene.Fass2Simulator/Fass2SimUdpHost.cs +++ b/StandardScene.Fass2Simulator/Fass2SimUdpHost.cs @@ -69,7 +69,8 @@ namespace StandardScene.Fass2Simulator Fass2SimLog.WriteLine($" 路段模拟 : dist={_config.DefaultSegmentDistance}mm 或 node.Distance, speed={_config.DefaultSpeed}mm/s"); Fass2SimLog.WriteLine($" 动作延时 : {_config.ActionDelayMs}ms(0xA1 到位),AutoComplete={_config.AutoCompleteStationActions}"); Fass2SimLog.WriteLine($" 初始节点 : {_config.InitialNode}, 状态={Fass2SimProtocol.StateText(_config.InitialState)}"); - Fass2SimLog.WriteLine("等待 Mag2Car 联调(address=127.0.0.1, Port=5000, ListenPort=20103, VehicleCode=1)"); + Fass2SimLog.WriteLine( + $"等待 Mag2Car 联调(address=127.0.0.1, Port={_config.VehicleListenPort}, ListenPort={_config.SchedulerListenPort}, VehicleCode={_config.VehicleCode})"); } public void Stop() diff --git a/scripts/run-fass2-multi-car-udp.ps1 b/scripts/run-fass2-multi-car-udp.ps1 index 243f2f3..63ee426 100644 --- a/scripts/run-fass2-multi-car-udp.ps1 +++ b/scripts/run-fass2-multi-car-udp.ps1 @@ -41,9 +41,9 @@ if ($StartSimulators) { Write-Host "" Write-Host "== Starting dual simulators ==" -ForegroundColor Cyan - Write-Host "Car1: VehicleCode=1, Listen=5000 -> 127.0.0.1:20103" - Write-Host "Car2: VehicleCode=2, Listen=5001 -> 127.0.0.1:20103" - Write-Host "SimpleLite: two Mag2Car, VehicleCode 1/2, Port 5000/5001, ListenPort 20103" + Write-Host "Car1: VehicleCode=1, Listen=5001 -> 127.0.0.1:20103" + Write-Host "Car2: VehicleCode=2, Listen=5002 -> 127.0.0.1:20103" + Write-Host "Simple3: two Mag2Car, VehicleCode 1/2, Port 5001/5002, ListenPort 20103" Start-Process $exe -WorkingDirectory $simDir Start-Process $exe -WorkingDirectory $simDir -ArgumentList @("--config", "appsettings.car2.json")