Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Documents/Manual_RSMPGS1.rst
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ RSMPGS2 Interface simulator for supervision system

Installation
------------
Start installation by running ``RSMPGS1_1_0_12_Setup.exe``.
Start installation by running ``RSMPGS1_1_0_13_Setup.exe``.

The installation program recommends a suitable folder.

Expand Down
2 changes: 1 addition & 1 deletion Documents/Manual_RSMPGS2.rst
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ RSMPGS2 Interface simulator for supervision system

Installation
------------
Start installation by running ``RSMPGS2_1_0_12_Setup.exe``.
Start installation by running ``RSMPGS2_1_0_13_Setup.exe``.

The installation program recommends a suitable folder.

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ on the [release page](https://github.com/rsmp-nordic/rsmp_simulator/releases).

Installation
------------
Run `RSMPGS1_1_0_11_Setup.exe` (for road side equipment) or
`RSMPGS2_1_0_11_Setup.exe` (for supervision system) from
Run `RSMPGS1_1_0_13_Setup.exe` (for road side equipment) or
`RSMPGS2_1_0_13_Setup.exe` (for supervision system) from
the [release page](https://github.com/rsmp-nordic/rsmp_simulator/releases)

Report issues
Expand Down
6 changes: 3 additions & 3 deletions RSMPCommon/RSMPGS_Main.cs
Original file line number Diff line number Diff line change
Expand Up @@ -982,19 +982,19 @@ private void timer_System_Tick(object sender, EventArgs e)

if (bIsUpdatingAlarmEventList)
{
listView_AlarmEvents.EndUpdateWithScrollAndMaxLines(true);
listView_AlarmEvents.EndUpdateWithScrollAndMaxLines(ToolStripMenuItem_View_AutoScroll_AlarmEvents.Checked);
bIsUpdatingAlarmEventList = false;
}

if (bIsUpdatingStatusEventList)
{
listView_StatusEvents.EndUpdateWithScrollAndMaxLines(true);
listView_StatusEvents.EndUpdateWithScrollAndMaxLines(ToolStripMenuItem_View_AutoScroll_StatusEvents.Checked);
bIsUpdatingStatusEventList = false;
}

if (bIsUpdatingAggregatedStatusEventList)
{
listView_AggregatedStatusEvents.EndUpdateWithScrollAndMaxLines(true);
listView_AggregatedStatusEvents.EndUpdateWithScrollAndMaxLines(ToolStripMenuItem_View_AutoScroll_AggregatedStatusEvents.Checked);
bIsUpdatingAggregatedStatusEventList = false;
}

Expand Down
4 changes: 2 additions & 2 deletions RSMPGS1/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.12")]
[assembly: AssemblyFileVersion("1.0.12")]
[assembly: AssemblyVersion("1.0.13")]
[assembly: AssemblyFileVersion("1.0.13")]
5 changes: 5 additions & 0 deletions RSMPGS1/RSMPGS1.cs
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,11 @@
// / Don't process partial commands #133
// / Add initial support for RSMP 3.3.0 (disabled by default) #134
// / RSMP 3.3.0: Add inital support for legacy types #135
// 25.09.23 / DO / 1.0.12 / RSMP 3.3.0: Add support for 'receiveAlarms' #140
// / RSMP 3.3.0: Support "step" in version message #141
// / RSMP 3.3.0 YAML: change name of "objects" to "components" #139
// / Added a SplitContainer in TestSend tab for RSMPGS1 #142
// / Buffered status messaged should set q=old #144
//
//
//
Expand Down
2 changes: 2 additions & 0 deletions RSMPGS1/RSMPGS1_Main/RSMPGS1_Alarms.cs
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,8 @@ public void AddAlarmEventToList(cAlarmObject AlarmObject, cAlarmEvent AlarmEvent
lvItem.SubItems.Add("(array)");
}
}

listView_AlarmEvents.ScrollAndMaxLines(ToolStripMenuItem_View_AutoScroll_AlarmEvents.Checked);
}

private void listView_Alarms_MouseClick(object sender, MouseEventArgs e)
Expand Down
82 changes: 51 additions & 31 deletions RSMPGS1/RSMPGS1_Main/RSMPGS1_Main.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions RSMPGS1/RSMPGS1_Main/RSMPGS1_Main.resx
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAA2
EgAAAk1TRnQBSQFMAgEBBQEAASQBBgEkAQYBEAEAARABAAT/ARkBAAj/AUIBTQE2BwABNgMAASgDAAFA
EgAAAk1TRnQBSQFMAgEBBQEAATQBBgE0AQYBEAEAARABAAT/ARkBAAj/AUIBTQE2BwABNgMAASgDAAFA
AwABIAMAAQEBAAEYBgABGNgAAYABUQEcAYABUQEcAYABUQEcAYABUQEcAYABUQEcAYABUQEcAYABUQEc
AYABUQEcAYABUQEcAYABUQEcAYABUQEcAYABUQEcAYABUQEcmQABgAFRARwB8QPzAvUB9gL3AfgD+QL6
AfsC/AP9A/4J/wGAAVEBHJkAAYABUQEcAe8D8QPzAvUB9gL3AfgD+QL6AfsC/AP9A/4G/wGAAVEBHJkA
Expand Down Expand Up @@ -219,7 +219,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAo
CwAAAk1TRnQBSQFMAgEBAwEAAQwBBwEMAQcBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
CwAAAk1TRnQBSQFMAgEBAwEAARwBBwEcAQcBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
Expand Down
4 changes: 2 additions & 2 deletions RSMPGS2/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.12")]
[assembly: AssemblyFileVersion("1.0.12")]
[assembly: AssemblyVersion("1.0.13")]
[assembly: AssemblyFileVersion("1.0.13")]
6 changes: 6 additions & 0 deletions RSMPGS2/RSMPGS2.cs
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,12 @@
// / Don't process partial commands #133
// / Add initial support for RSMP 3.3.0 (disabled by default) #134
// / RSMP 3.3.0: Add inital support for legacy types #135
// 25.09.23 / DO / 1.0.12 / RSMP 3.3.0: Add support for 'receiveAlarms' #140
// / RSMP 3.3.0: Support "step" in version message #141
// / RSMP 3.3.0 YAML: change name of "objects" to "components" #139
// / Added a SplitContainer in TestSend tab for RSMPGS1 #142
// / Buffered status messaged should set q=old #144
//
//
//
// ---------------------------------------------------------------------------------------------------
Expand Down
Loading