diff --git a/Build/Packaging.targets b/Build/Packaging.targets index 50dbc6e363f5401f5bc2d5b1eed3427077d80527..3237fedfa22bf01c6bbb5aaefdeab25d278c5c7b 100644 --- a/Build/Packaging.targets +++ b/Build/Packaging.targets @@ -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)"/> diff --git a/VectoCommon/VectoCommon/BusAuxiliaries/BusHVACSystemConfiguration.cs b/VectoCommon/VectoCommon/BusAuxiliaries/BusHVACSystemConfiguration.cs index 911df16a567262016d7318f8c47b5166da2b3a95..3eaf29d7a014f36b2076a88e0dbef5ab5c6967d4 100644 --- a/VectoCommon/VectoCommon/BusAuxiliaries/BusHVACSystemConfiguration.cs +++ b/VectoCommon/VectoCommon/BusAuxiliaries/BusHVACSystemConfiguration.cs @@ -72,6 +72,8 @@ namespace TUGraz.VectoCommon.BusAuxiliaries { switch (hvacConfig) { case BusHVACSystemConfiguration.Configuration1: case BusHVACSystemConfiguration.Configuration2: + case BusHVACSystemConfiguration.Configuration3: + case BusHVACSystemConfiguration.Configuration4: return false; }