Skip to content

Commit 24014a2

Browse files
Merge tag '1.1.0.9' into develop
2 parents ae3d032 + b4afea6 commit 24014a2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+788
-463
lines changed

Configuration Manager.vipb

Lines changed: 188 additions & 19 deletions
Large diffs are not rendered by default.

Configuration Manager.vipc

2.96 KB
Binary file not shown.
857 KB
Binary file not shown.
1.26 KB
Binary file not shown.

_unittests/CfgManager Unit Tests.lvproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,16 @@
1717
<Item Name="config-text.txt" Type="Document" URL="../sample files/config-text.txt"/>
1818
<Item Name="config-text_chevrons.txt" Type="Document" URL="../sample files/config-text_chevrons.txt"/>
1919
<Item Name="config-text_colon.txt" Type="Document" URL="../sample files/config-text_colon.txt"/>
20+
<Item Name="config-text-ini.txt" Type="Document" URL="../sample files/config-text-ini.txt"/>
2021
</Item>
2122
<Item Name="CfgManager Main Test Suite.vi" Type="VI" URL="../CfgManager Main Test Suite.vi"/>
2223
<Item Name="CfgManager Test Launcher.vi" Type="VI" URL="../CfgManager Test Launcher.vi"/>
2324
<Item Name="CfgManager.Text Test Launcher.vi" Type="VI" URL="../CfgManager.Text Test Launcher.vi"/>
25+
<Item Name="CfgManager.Text.INI Test Launcher.vi" Type="VI" URL="../CfgManager.Text.INI Test Launcher.vi"/>
2426
<Item Name="CfgManager.Text Partial Found Test Launcher.vi" Type="VI" URL="../CfgManager.Text Partial Found Test Launcher.vi"/>
2527
<Item Name="CfgManager.Collection Test Launcher.vi" Type="VI" URL="../CfgManager.Collection Test Launcher.vi"/>
2628
<Item Name="CfgManager Cache Lifetime Tests.vi" Type="VI" URL="../CfgManager Cache Lifetime Tests.vi"/>
29+
<Item Name="Test -- INI Creation.vi" Type="VI" URL="../Test -- INI Creation.vi"/>
2730
</Item>
2831
<Item Name="CfgManager.lvlib" Type="Library" URL="../../source/CfgManager.lvlib"/>
2932
<Item Name="CfgManager.Text.lvlib" Type="Library" URL="../../source/Manager.Text/CfgManager.Text.lvlib"/>
21.4 KB
Binary file not shown.

_unittests/Test -- INI Creation.vi

18.6 KB
Binary file not shown.
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
[System]
2+
_staticdeps.Logger.sharedresource = true
3+
_staticdeps.Logger.type = "SMOLogger.lvclass"
4+
_staticdeps.Pump.sharedresource = false
5+
_staticdeps.Pump.type = "SMOPump.lvclass"
6+
7+
[System.Logger]
8+
Config.Boolean = false // there are some comments here
9+
Config.Numeric = 2.7818
10+
Config.String = "logger title here..."
11+
rate (Hz) = 2
12+
13+
[System.Pump]
14+
; this line is only a comment
15+
Config.Boolean = false
16+
Config.Numeric = 0.948999913821431 // This is a randomly generated number
17+
Config.String = "new"
18+
; this second line is also a comment
19+
location = "BOP"
20+
# some other kind of comment
21+
22+
[System.Valve]
23+
Settings.D = 0.00000000000000
24+
Settings.I = 0.00000000000000
25+
Settings.P = 1.00000000000000
26+
_staticdeps.Sensor.name = "Sensor"
27+
_staticdeps.Sensor.type = "Sensor.lvclass"
28+
_staticdeps.Sensor.sharedresource = false
29+
_staticdeps.Logger.name = "Logger"
30+
_staticdeps.Logger.type = "Logger.lvclass"
31+
_staticdeps.Logger.sharedresource = true
27.8 KB
Binary file not shown.

source/Manager.Text.INI/ConfigManager.Text.INI.lvclass

Lines changed: 99 additions & 0 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)