Skip to content

Commit ca7f799

Browse files
golluroSICKAGgolluroSICKAG
committed
# Version 2.0.0
## Repository moved to GitHub organization
1 parent 3542a95 commit ca7f799

21 files changed

Lines changed: 4104 additions & 22 deletions

‎CHANGELOG.md‎

Lines changed: 36 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,44 @@
11
# Changelog
22
All notable changes to this project will be documented in this file.
33

4-
## Release 0.1.0
5-
- Initial commit
4+
## Release 2.0.0
65

7-
### New features
8-
- ...
6+
### Improvements
7+
- Renamed function 'setPingIpAddress' to 'setPingIPAddress'
8+
- Using recursive helper functions to convert Container <-> Lua table
9+
10+
## Release 1.4.0
911

1012
### Improvements
11-
- ...
13+
- Update to EmmyLua annotations
14+
- Usage of lua diagnostics
15+
- Documentation updates
16+
17+
## Release 1.3.0
18+
19+
### Improvements
20+
- Prepared for CSK_UserManagement user levels: Operator, Maintenance, Service, Admin to optionally hide content related to UserManagement module (using bool parameter)
21+
- Module name added to log messages
22+
- Renamed page folder accordingly to module name
23+
- Hiding SOPAS Login
24+
- Documentation updates (manifest, code internal, UI elements)
25+
- camelCase renamed functions
26+
- Minor code edits
27+
- Using prefix for events
1228

1329
### Bugfix
14-
- ...
30+
- UI events notified after pageLoad after 300ms instead of 100ms to not miss
31+
32+
## Release 1.2.0
33+
- Initial commit
34+
35+
### Improvements
36+
- Hide IPs in the list if DHCP is enabled
37+
38+
## Release 1.1.0
39+
40+
### New features
41+
- Added IP utils
42+
43+
## Release 1.0.0
44+
- Initial commit

‎CSK_Module_DeviceNetworkConfig/pages/assets/legacy/resources.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
[]

‎CSK_Module_DeviceNetworkConfig/pages/assets/legacy/settings.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"showLoginButton": false
3+
}

‎CSK_Module_DeviceNetworkConfig/pages/global.css‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/* Add project wide CSS settings here */

‎CSK_Module_DeviceNetworkConfig/pages/i18n/de.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
3+
}

‎CSK_Module_DeviceNetworkConfig/pages/i18n/en.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
3+
}

‎CSK_Module_DeviceNetworkConfig/pages/package.json‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"name": "CSK_Module_DeviceNetworkConfig",
3+
"version": "1.0.0",
4+
"description": "Generated",
5+
"components": [
6+
"@sick-davinci/basic-elements"
7+
],
8+
"dependencies": {
9+
"@sick-davinci/basic-elements": "^5.0.5"
10+
}
11+
}

‎CSK_Module_DeviceNetworkConfig/pages/pages/CSK_Module_DeviceNetworkConfig/CSK_Module_DeviceNetworkConfig.css‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
.myCustomFrame_CSK_Module_DeviceNetworkConfig {
2+
border-style: solid;
3+
border-width: 1px;
4+
border-color: grey;
5+
margin: 6px;
6+
}
7+
8+
.myCustomMinWidth_CSK_Module_DeviceNetworkConfig {
9+
min-width: 60px;
10+
}

‎CSK_Module_DeviceNetworkConfig/pages/pages/CSK_Module_DeviceNetworkConfig/CSK_Module_DeviceNetworkConfig.html‎

Lines changed: 226 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,226 @@
1+
<layout-row id="RowLayout1">
2+
<layout-column id="ColumnLayout2" style="align-items: stretch">
3+
<stacked-view id="SV_Login">
4+
<stacked-pane id="SP_LoginOK" value="true">
5+
<layout-row id="RowLayout4">
6+
<layout-column id="ColumnLayout1" style="align-items: stretch">
7+
<davinci-collapse id="Collapse1" collapsed-title="Info"
8+
expanded-title="Hide">
9+
<davinci-callout id="Callout5" type="info">
10+
<span>
11+
Applied network configuration will be saved persistently.
12+
</span>
13+
</davinci-callout>
14+
</davinci-collapse>
15+
<stacked-view id="SV_ShowStatus">
16+
<stacked-pane id="SP_Processing" value="processing">
17+
<davinci-callout id="Callout1" type="info">
18+
<span>... Currently processing ...</span>
19+
</davinci-callout>
20+
</stacked-pane>
21+
<crown-edpws-binding property="value"
22+
name="CSK_DeviceNetworkConfig/OnNewEthernetConfigStatus"
23+
update-on-resume>
24+
</crown-edpws-binding>
25+
<stacked-pane id="SP_Success" value="success">
26+
<davinci-callout id="Callout2" type="success">
27+
<span>New config accepted</span>
28+
</davinci-callout>
29+
</stacked-pane>
30+
<stacked-pane id="SP_Error" value="error">
31+
<davinci-callout id="Callout3" type="error">
32+
<span>New config NOT accepted</span>
33+
</davinci-callout>
34+
</stacked-pane>
35+
<stacked-pane id="SP_empty" value="empty"></stacked-pane>
36+
</stacked-view>
37+
<davinci-button id="Button_Refresh" type="primary"
38+
icon-position="append">
39+
<span>Refresh</span>
40+
<crown-binding event="submit" name="CSK_DeviceNetworkConfig/refresh"
41+
auto-commit>
42+
</crown-binding>
43+
</davinci-button>
44+
<curie-table id="InterfacesTable" selectable
45+
select-mode="highlight_row">
46+
<curie-table-column id="Interface" header="Interface">
47+
</curie-table-column>
48+
<curie-table-column id="IP" header="IPv4"></curie-table-column>
49+
<curie-table-column id="SubnetMask" header="Subnet mask">
50+
</curie-table-column>
51+
<curie-table-column id="DefaultGateway" header="Default gateway">
52+
</curie-table-column>
53+
<curie-table-column id="DHCP" header="DHCP enabled">
54+
</curie-table-column>
55+
<curie-table-column id="Connected" header="Connected">
56+
</curie-table-column>
57+
<crown-edpws-binding property="data"
58+
name="CSK_DeviceNetworkConfig/OnNewInterfaceTable"
59+
update-on-resume>
60+
</crown-edpws-binding>
61+
<crown-binding event="row-selected"
62+
name="CSK_DeviceNetworkConfig/selectInterface"
63+
path="param/args/row_selected" auto-commit>
64+
</crown-binding>
65+
<curie-table-column id="MACAddress" header="MAC address">
66+
</curie-table-column>
67+
</curie-table>
68+
<layout-row id="RowLayout5" style="align-items: center">
69+
<davinci-value-display id="VD_SelectedInterface"
70+
class="myCustomMinWidth_CSK_Module_DeviceNetworkConfig">
71+
<crown-edpws-binding property="label"
72+
name="CSK_DeviceNetworkConfig/OnNewInterfaceChoice"
73+
update-on-resume>
74+
</crown-edpws-binding>
75+
</davinci-value-display>
76+
<layout-column id="ColumnLayout7">
77+
<layout-row id="RowLayout6" style="align-items: center">
78+
<davinci-value-display id="VD_IP" label="IPv4">
79+
</davinci-value-display>
80+
<davinci-text-field id="TF_IP" type="text">
81+
<crown-edpws-binding property="value"
82+
name="CSK_DeviceNetworkConfig/OnNewIP" update-on-resume>
83+
</crown-edpws-binding>
84+
<crown-edpws-binding property="error"
85+
name="CSK_DeviceNetworkConfig/OnIPError" update-on-resume>
86+
</crown-edpws-binding>
87+
<crown-edpws-binding property="disabled"
88+
name="CSK_DeviceNetworkConfig/OnIPDisabled" update-on-resume>
89+
</crown-edpws-binding>
90+
<crown-binding event="change"
91+
name="CSK_DeviceNetworkConfig/setInterfaceIP"
92+
path="param/args/newIP" auto-commit>
93+
</crown-binding>
94+
</davinci-text-field>
95+
</layout-row>
96+
</layout-column>
97+
<layout-column id="ColumnLayout8">
98+
<layout-row id="RowLayout7" style="align-items: center">
99+
<davinci-value-display id="VD_SubnetMask" label="Subnet mask">
100+
</davinci-value-display>
101+
<davinci-text-field id="TF_Subnet" type="text">
102+
<crown-edpws-binding property="value"
103+
name="CSK_DeviceNetworkConfig/OnNewSubnetMask" update-on-resume>
104+
</crown-edpws-binding>
105+
<crown-edpws-binding property="disabled"
106+
name="CSK_DeviceNetworkConfig/OnSubnetDisabled" update-on-resume>
107+
</crown-edpws-binding>
108+
<crown-edpws-binding property="error"
109+
name="CSK_DeviceNetworkConfig/OnSubnetError" update-on-resume>
110+
</crown-edpws-binding>
111+
<crown-binding event="change"
112+
name="CSK_DeviceNetworkConfig/setSubnetMask"
113+
path="param/args/newSubnetMask" auto-commit>
114+
</crown-binding>
115+
</davinci-text-field>
116+
</layout-row>
117+
</layout-column>
118+
<layout-column id="ColumnLayout9">
119+
<layout-row id="RowLayout8" style="align-items: center">
120+
<davinci-value-display id="VD_DefaultGateway" label="Default gateway">
121+
</davinci-value-display>
122+
<davinci-text-field id="TF_Gateway" type="text">
123+
<crown-edpws-binding property="value"
124+
name="CSK_DeviceNetworkConfig/OnNewDefaultGateway"
125+
update-on-resume>
126+
</crown-edpws-binding>
127+
<crown-edpws-binding property="disabled"
128+
name="CSK_DeviceNetworkConfig/OnGatewayDisabled" update-on-resume>
129+
</crown-edpws-binding>
130+
<crown-edpws-binding property="error"
131+
name="CSK_DeviceNetworkConfig/OnGatewayError" update-on-resume>
132+
</crown-edpws-binding>
133+
<crown-binding event="change"
134+
name="CSK_DeviceNetworkConfig/setDefaultGateway"
135+
path="param/args/newDefaultGateway" auto-commit>
136+
</crown-binding>
137+
</davinci-text-field>
138+
</layout-row>
139+
</layout-column>
140+
<layout-column id="ColumnLayout10">
141+
<layout-row id="RowLayout9" style="align-items: center">
142+
<davinci-value-display id="VD_DHCP" label="DHCP enabled">
143+
</davinci-value-display>
144+
<davinci-checkbox id="CB_DHCP">
145+
<span></span>
146+
<crown-edpws-binding property="checked"
147+
name="CSK_DeviceNetworkConfig/OnNewDHCPStatus" update-on-resume>
148+
</crown-edpws-binding>
149+
<crown-edpws-binding property="disabled"
150+
name="CSK_DeviceNetworkConfig/OnDHCPDisabled" update-on-resume>
151+
</crown-edpws-binding>
152+
<crown-binding event="change"
153+
name="CSK_DeviceNetworkConfig/setDHCPState"
154+
path="param/args/newDHCPstate" auto-commit>
155+
</crown-binding>
156+
</davinci-checkbox>
157+
</layout-row>
158+
</layout-column>
159+
</layout-row>
160+
<davinci-button id="Button_ApplyNewConfig" type="primary"
161+
icon-position="append">
162+
<span>Apply new network configuration</span>
163+
<crown-edpws-binding property="disabled"
164+
name="CSK_DeviceNetworkConfig/OnApplyButtonDisabled"
165+
update-on-resume>
166+
</crown-edpws-binding>
167+
<crown-binding event="submit"
168+
name="CSK_DeviceNetworkConfig/applyConfig" auto-commit>
169+
</crown-binding>
170+
</davinci-button>
171+
<h1 id="Heading11">Tools</h1>
172+
<layout-row id="RowLayout3">
173+
<davinci-text-field id="TF_PingIP" type="text" label="Ping"
174+
placeholder="IPv4 address">
175+
<crown-binding event="change"
176+
name="CSK_DeviceNetworkConfig/setPingIPAddress"
177+
path="param/args/ping_ip" auto-commit>
178+
</crown-binding>
179+
</davinci-text-field>
180+
<davinci-button id="Button_Ping" type="primary"
181+
icon-position="append">
182+
<span>PING</span>
183+
<crown-set event="submit"
184+
crown-function="CSK_DeviceNetworkConfig/ping"
185+
protocol="crownMSGPACK">
186+
</crown-set>
187+
</davinci-button>
188+
<davinci-status-indicator id="SI_Ping" style="align-self: center">
189+
<span></span>
190+
<crown-edpws-binding property="status"
191+
name="CSK_DeviceNetworkConfig/OnNewPingResult" update-on-resume>
192+
</crown-edpws-binding>
193+
</davinci-status-indicator>
194+
<davinci-value-display id="VD_PingDetails" style="align-self: center">
195+
<crown-edpws-binding property="value"
196+
name="CSK_DeviceNetworkConfig/OnNewPingDetails" update-on-resume>
197+
</crown-edpws-binding>
198+
</davinci-value-display>
199+
</layout-row>
200+
</layout-column>
201+
</layout-row>
202+
</stacked-pane>
203+
<stacked-pane id="SP_LoginNOK" value="false">
204+
<layout-row id="RowLayout2">
205+
<davinci-callout id="Callout4" type="warning">
206+
<span>
207+
Please login with at least user level 'Maintenance' or higher to see this page.
208+
</span>
209+
</davinci-callout>
210+
</layout-row>
211+
</stacked-pane>
212+
<crown-edpws-binding property="value"
213+
name="CSK_DeviceNetworkConfig/OnUserLevelMaintenanceActive"
214+
update-on-resume
215+
converter="function(value) {return value.toString();}">
216+
</crown-edpws-binding>
217+
</stacked-view>
218+
<stacked-view id="SV_pageCalled">
219+
<crown-binding property="value"
220+
name="CSK_DeviceNetworkConfig/pageCalled" path="result/data/empty"
221+
auto-update="0" update-on-resume>
222+
</crown-binding>
223+
</stacked-view>
224+
</layout-column>
225+
226+
</layout-row>

‎CSK_Module_DeviceNetworkConfig/pages/pages/navigation.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"version": "1.0",
3+
"pages": []
4+
}

0 commit comments

Comments
 (0)