Code development platform for open source projects from the European Union institutions :large_blue_circle: EU Login authentication by SMS will be completely phased out by mid-2025. To see alternatives please check here

Skip to content
Snippets Groups Projects
Commit 5782f95f authored by Markus Quaritsch's avatar Markus Quaritsch
Browse files

Merge pull request #22 in VECTO/vecto-dev from...

Merge pull request #22 in VECTO/vecto-dev from VECTO/mq_vecto-dev:bugfix/VECTO-1276-0.6.1.1975-unable-to-run-with-hvac-systemconfiguration-4-and-passengerac-none to develop

* commit '0694630e':
  correction which system configuration requires Driver AC/Passenger AC
  re-adding dlls for new GUI
parents 8e9eb9a3 0694630e
No related branches found
No related tags found
No related merge requests found
......@@ -85,13 +85,13 @@
<VectoConfigurationSample Include="$(SolutionDir)VECTO\install.ini"/>
<Vecto3GUI Include="$(SolutionDir)VECTO3GUI\bin\Release\VECTO3.exe*"/>
<!-- <Vecto3GUI Include="$(SolutionDir)VECTO3GUI\bin\Release\System.Windows.Interactivity.dll"/> -->
<Vecto3GUI Include="$(SolutionDir)VECTO3GUI\bin\Release\System.Windows.Interactivity.dll"/>
<Vecto3GUI Include="$(SolutionDir)VECTO3GUI\bin\Release\Microsoft.WindowsAPICodePack*.dll"/>
<Vecto3GUI Include="$(SolutionDir)VECTO3GUI\bin\Release\Microsoft.WindowsAPICodePack*.dll"/>
<!-- <Vecto3GUI Include="$(SolutionDir)VECTO3GUI\bin\Release\Microsoft.Expression.Interactions.dll"/> -->
<Vecto3GUI Include="$(SolutionDir)VECTO3GUI\bin\Release\MahApps.*.dll"/>
<!-- <Vecto3GUI Include="$(SolutionDir)VECTO3GUI\bin\Release\ICSharpCode.AvalonEdit.dll"/> -->
<!-- <Vecto3GUI Include="$(SolutionDir)VECTO3GUI\bin\Release\ControlzEx.dll"/> -->
<Vecto3GUI Include="$(SolutionDir)VECTO3GUI\bin\Release\ICSharpCode.AvalonEdit.dll"/>
<Vecto3GUI Include="$(SolutionDir)VECTO3GUI\bin\Release\ControlzEx.dll"/>
</ItemGroup>
<Message Text="@(VectoCommandLine)"/>
......
......@@ -72,6 +72,8 @@ namespace TUGraz.VectoCommon.BusAuxiliaries {
switch (hvacConfig) {
case BusHVACSystemConfiguration.Configuration1:
case BusHVACSystemConfiguration.Configuration2:
case BusHVACSystemConfiguration.Configuration3:
case BusHVACSystemConfiguration.Configuration4:
return false;
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment