Skip to content
This repository has been archived by the owner on Jul 6, 2022. It is now read-only.

Commit

Permalink
Merge
Browse files Browse the repository at this point in the history
  • Loading branch information
thelsing committed May 25, 2020
2 parents b2cc8ae + c90db39 commit ad40516
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 1 deletion.
1 change: 1 addition & 0 deletions MainWindow.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@
<ComboBox Margin="3" SelectedValuePath="Tag" SelectedValue="{Binding MediumType, UpdateSourceTrigger=PropertyChanged}" Grid.Column="2" Grid.Row="8" Width="200">
<ComboBoxItem Content="{lex:Loc IP}" Tag="MT-5"/>
<ComboBoxItem Content="{lex:Loc TP}" Tag="MT-0"/>
<ComboBoxItem Content="{lex:Loc RF}" Tag="MT-2"/>
</ComboBox>
<TextBlock Margin="3" Text="{lex:Loc ReplacedVersion}" Grid.Column="1" Grid.Row="9"/>
<TextBox Margin="3" Grid.Column="2" Grid.Row="9" Text="{Binding ReplacedVersions}" />
Expand Down
7 changes: 7 additions & 0 deletions MainWindowViewModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,12 @@ private void UpdateMediumInfo()
_hardware.IsIPEnabled = true;
_hardware.BusCurrent = null;
}
else if (_hardware2Program.MediumTypes[0] == "MT-2")
{
_applicationProgram.MaskVersion = "MV-27B0";
_hardware.IsIPEnabled = false;
_hardware.BusCurrent = null;
}
else
{
_applicationProgram.MaskVersion = "MV-07B0";
Expand Down Expand Up @@ -478,6 +484,7 @@ private void CreateNew(object param)
OrderNumber = "0";

_hardware2Program.MediumTypes.Add("MT-5");
_hardware2Program.MediumTypes.Add("MT-2");

_catalogSection.Name = Ressources.Devices;
_catalogSection.Number = "1";
Expand Down
3 changes: 3 additions & 0 deletions Properties/Ressources.resx
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,9 @@
<data name="Parametertype_Enumeration" xml:space="preserve">
<value>Enumeration</value>
</data>
<data name="RF" xml:space="preserve">
<value>RF</value>
</data>
<data name="Parametertype_Float" xml:space="preserve">
<value>Float</value>
</data>
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,5 @@ C:\Program Files (x86)\ETS5\CV\4.0.1997.50261
You can also change UICulture and Culture from 'de' to 'en' there.

If ETS doesn't import the generated file, try removing underscores from product name, hardware name etc. Maybe version numbers have to be at least 10 too.

A knx-stack for multiple platforms can be found [here](https://github.com/thelsing/knx).
2 changes: 1 addition & 1 deletion azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ steps:

- task: ArchiveFiles@2
inputs:
rootFolderOrFile: '$(Build.BinariesDirectory)'
rootFolderOrFile: 'bin/$(buildConfiguration)'
includeRootFolder: true
archiveType: 'zip'
archiveFile: '$(Build.ArtifactStagingDirectory)/CreateKnxProd.zip'
Expand Down

0 comments on commit ad40516

Please sign in to comment.