-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
## Repository moved to GitHub organization
- Loading branch information
1 parent
3542a95
commit ca7f799
Showing
21 changed files
with
4,104 additions
and
22 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,44 @@ | ||
| # Changelog | ||
| All notable changes to this project will be documented in this file. | ||
|
|
||
| ## Release 0.1.0 | ||
| - Initial commit | ||
| ## Release 2.0.0 | ||
|
|
||
| ### New features | ||
| - ... | ||
| ### Improvements | ||
| - Renamed function 'setPingIpAddress' to 'setPingIPAddress' | ||
| - Using recursive helper functions to convert Container <-> Lua table | ||
|
|
||
| ## Release 1.4.0 | ||
|
|
||
| ### Improvements | ||
| - ... | ||
| - Update to EmmyLua annotations | ||
| - Usage of lua diagnostics | ||
| - Documentation updates | ||
|
|
||
| ## Release 1.3.0 | ||
|
|
||
| ### Improvements | ||
| - Prepared for CSK_UserManagement user levels: Operator, Maintenance, Service, Admin to optionally hide content related to UserManagement module (using bool parameter) | ||
| - Module name added to log messages | ||
| - Renamed page folder accordingly to module name | ||
| - Hiding SOPAS Login | ||
| - Documentation updates (manifest, code internal, UI elements) | ||
| - camelCase renamed functions | ||
| - Minor code edits | ||
| - Using prefix for events | ||
|
|
||
| ### Bugfix | ||
| - ... | ||
| - UI events notified after pageLoad after 300ms instead of 100ms to not miss | ||
|
|
||
| ## Release 1.2.0 | ||
| - Initial commit | ||
|
|
||
| ### Improvements | ||
| - Hide IPs in the list if DHCP is enabled | ||
|
|
||
| ## Release 1.1.0 | ||
|
|
||
| ### New features | ||
| - Added IP utils | ||
|
|
||
| ## Release 1.0.0 | ||
| - Initial commit |
1 change: 1 addition & 0 deletions
1
CSK_Module_DeviceNetworkConfig/pages/assets/legacy/resources.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| [] |
3 changes: 3 additions & 0 deletions
3
CSK_Module_DeviceNetworkConfig/pages/assets/legacy/settings.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| { | ||
| "showLoginButton": false | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| /* Add project wide CSS settings here */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| { | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| { | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| { | ||
| "name": "CSK_Module_DeviceNetworkConfig", | ||
| "version": "1.0.0", | ||
| "description": "Generated", | ||
| "components": [ | ||
| "@sick-davinci/basic-elements" | ||
| ], | ||
| "dependencies": { | ||
| "@sick-davinci/basic-elements": "^5.0.5" | ||
| } | ||
| } |
10 changes: 10 additions & 0 deletions
10
...tworkConfig/pages/pages/CSK_Module_DeviceNetworkConfig/CSK_Module_DeviceNetworkConfig.css
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| .myCustomFrame_CSK_Module_DeviceNetworkConfig { | ||
| border-style: solid; | ||
| border-width: 1px; | ||
| border-color: grey; | ||
| margin: 6px; | ||
| } | ||
|
|
||
| .myCustomMinWidth_CSK_Module_DeviceNetworkConfig { | ||
| min-width: 60px; | ||
| } |
226 changes: 226 additions & 0 deletions
226
...workConfig/pages/pages/CSK_Module_DeviceNetworkConfig/CSK_Module_DeviceNetworkConfig.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,226 @@ | ||
| <layout-row id="RowLayout1"> | ||
| <layout-column id="ColumnLayout2" style="align-items: stretch"> | ||
| <stacked-view id="SV_Login"> | ||
| <stacked-pane id="SP_LoginOK" value="true"> | ||
| <layout-row id="RowLayout4"> | ||
| <layout-column id="ColumnLayout1" style="align-items: stretch"> | ||
| <davinci-collapse id="Collapse1" collapsed-title="Info" | ||
| expanded-title="Hide"> | ||
| <davinci-callout id="Callout5" type="info"> | ||
| <span> | ||
| Applied network configuration will be saved persistently. | ||
| </span> | ||
| </davinci-callout> | ||
| </davinci-collapse> | ||
| <stacked-view id="SV_ShowStatus"> | ||
| <stacked-pane id="SP_Processing" value="processing"> | ||
| <davinci-callout id="Callout1" type="info"> | ||
| <span>... Currently processing ...</span> | ||
| </davinci-callout> | ||
| </stacked-pane> | ||
| <crown-edpws-binding property="value" | ||
| name="CSK_DeviceNetworkConfig/OnNewEthernetConfigStatus" | ||
| update-on-resume> | ||
| </crown-edpws-binding> | ||
| <stacked-pane id="SP_Success" value="success"> | ||
| <davinci-callout id="Callout2" type="success"> | ||
| <span>New config accepted</span> | ||
| </davinci-callout> | ||
| </stacked-pane> | ||
| <stacked-pane id="SP_Error" value="error"> | ||
| <davinci-callout id="Callout3" type="error"> | ||
| <span>New config NOT accepted</span> | ||
| </davinci-callout> | ||
| </stacked-pane> | ||
| <stacked-pane id="SP_empty" value="empty"></stacked-pane> | ||
| </stacked-view> | ||
| <davinci-button id="Button_Refresh" type="primary" | ||
| icon-position="append"> | ||
| <span>Refresh</span> | ||
| <crown-binding event="submit" name="CSK_DeviceNetworkConfig/refresh" | ||
| auto-commit> | ||
| </crown-binding> | ||
| </davinci-button> | ||
| <curie-table id="InterfacesTable" selectable | ||
| select-mode="highlight_row"> | ||
| <curie-table-column id="Interface" header="Interface"> | ||
| </curie-table-column> | ||
| <curie-table-column id="IP" header="IPv4"></curie-table-column> | ||
| <curie-table-column id="SubnetMask" header="Subnet mask"> | ||
| </curie-table-column> | ||
| <curie-table-column id="DefaultGateway" header="Default gateway"> | ||
| </curie-table-column> | ||
| <curie-table-column id="DHCP" header="DHCP enabled"> | ||
| </curie-table-column> | ||
| <curie-table-column id="Connected" header="Connected"> | ||
| </curie-table-column> | ||
| <crown-edpws-binding property="data" | ||
| name="CSK_DeviceNetworkConfig/OnNewInterfaceTable" | ||
| update-on-resume> | ||
| </crown-edpws-binding> | ||
| <crown-binding event="row-selected" | ||
| name="CSK_DeviceNetworkConfig/selectInterface" | ||
| path="param/args/row_selected" auto-commit> | ||
| </crown-binding> | ||
| <curie-table-column id="MACAddress" header="MAC address"> | ||
| </curie-table-column> | ||
| </curie-table> | ||
| <layout-row id="RowLayout5" style="align-items: center"> | ||
| <davinci-value-display id="VD_SelectedInterface" | ||
| class="myCustomMinWidth_CSK_Module_DeviceNetworkConfig"> | ||
| <crown-edpws-binding property="label" | ||
| name="CSK_DeviceNetworkConfig/OnNewInterfaceChoice" | ||
| update-on-resume> | ||
| </crown-edpws-binding> | ||
| </davinci-value-display> | ||
| <layout-column id="ColumnLayout7"> | ||
| <layout-row id="RowLayout6" style="align-items: center"> | ||
| <davinci-value-display id="VD_IP" label="IPv4"> | ||
| </davinci-value-display> | ||
| <davinci-text-field id="TF_IP" type="text"> | ||
| <crown-edpws-binding property="value" | ||
| name="CSK_DeviceNetworkConfig/OnNewIP" update-on-resume> | ||
| </crown-edpws-binding> | ||
| <crown-edpws-binding property="error" | ||
| name="CSK_DeviceNetworkConfig/OnIPError" update-on-resume> | ||
| </crown-edpws-binding> | ||
| <crown-edpws-binding property="disabled" | ||
| name="CSK_DeviceNetworkConfig/OnIPDisabled" update-on-resume> | ||
| </crown-edpws-binding> | ||
| <crown-binding event="change" | ||
| name="CSK_DeviceNetworkConfig/setInterfaceIP" | ||
| path="param/args/newIP" auto-commit> | ||
| </crown-binding> | ||
| </davinci-text-field> | ||
| </layout-row> | ||
| </layout-column> | ||
| <layout-column id="ColumnLayout8"> | ||
| <layout-row id="RowLayout7" style="align-items: center"> | ||
| <davinci-value-display id="VD_SubnetMask" label="Subnet mask"> | ||
| </davinci-value-display> | ||
| <davinci-text-field id="TF_Subnet" type="text"> | ||
| <crown-edpws-binding property="value" | ||
| name="CSK_DeviceNetworkConfig/OnNewSubnetMask" update-on-resume> | ||
| </crown-edpws-binding> | ||
| <crown-edpws-binding property="disabled" | ||
| name="CSK_DeviceNetworkConfig/OnSubnetDisabled" update-on-resume> | ||
| </crown-edpws-binding> | ||
| <crown-edpws-binding property="error" | ||
| name="CSK_DeviceNetworkConfig/OnSubnetError" update-on-resume> | ||
| </crown-edpws-binding> | ||
| <crown-binding event="change" | ||
| name="CSK_DeviceNetworkConfig/setSubnetMask" | ||
| path="param/args/newSubnetMask" auto-commit> | ||
| </crown-binding> | ||
| </davinci-text-field> | ||
| </layout-row> | ||
| </layout-column> | ||
| <layout-column id="ColumnLayout9"> | ||
| <layout-row id="RowLayout8" style="align-items: center"> | ||
| <davinci-value-display id="VD_DefaultGateway" label="Default gateway"> | ||
| </davinci-value-display> | ||
| <davinci-text-field id="TF_Gateway" type="text"> | ||
| <crown-edpws-binding property="value" | ||
| name="CSK_DeviceNetworkConfig/OnNewDefaultGateway" | ||
| update-on-resume> | ||
| </crown-edpws-binding> | ||
| <crown-edpws-binding property="disabled" | ||
| name="CSK_DeviceNetworkConfig/OnGatewayDisabled" update-on-resume> | ||
| </crown-edpws-binding> | ||
| <crown-edpws-binding property="error" | ||
| name="CSK_DeviceNetworkConfig/OnGatewayError" update-on-resume> | ||
| </crown-edpws-binding> | ||
| <crown-binding event="change" | ||
| name="CSK_DeviceNetworkConfig/setDefaultGateway" | ||
| path="param/args/newDefaultGateway" auto-commit> | ||
| </crown-binding> | ||
| </davinci-text-field> | ||
| </layout-row> | ||
| </layout-column> | ||
| <layout-column id="ColumnLayout10"> | ||
| <layout-row id="RowLayout9" style="align-items: center"> | ||
| <davinci-value-display id="VD_DHCP" label="DHCP enabled"> | ||
| </davinci-value-display> | ||
| <davinci-checkbox id="CB_DHCP"> | ||
| <span></span> | ||
| <crown-edpws-binding property="checked" | ||
| name="CSK_DeviceNetworkConfig/OnNewDHCPStatus" update-on-resume> | ||
| </crown-edpws-binding> | ||
| <crown-edpws-binding property="disabled" | ||
| name="CSK_DeviceNetworkConfig/OnDHCPDisabled" update-on-resume> | ||
| </crown-edpws-binding> | ||
| <crown-binding event="change" | ||
| name="CSK_DeviceNetworkConfig/setDHCPState" | ||
| path="param/args/newDHCPstate" auto-commit> | ||
| </crown-binding> | ||
| </davinci-checkbox> | ||
| </layout-row> | ||
| </layout-column> | ||
| </layout-row> | ||
| <davinci-button id="Button_ApplyNewConfig" type="primary" | ||
| icon-position="append"> | ||
| <span>Apply new network configuration</span> | ||
| <crown-edpws-binding property="disabled" | ||
| name="CSK_DeviceNetworkConfig/OnApplyButtonDisabled" | ||
| update-on-resume> | ||
| </crown-edpws-binding> | ||
| <crown-binding event="submit" | ||
| name="CSK_DeviceNetworkConfig/applyConfig" auto-commit> | ||
| </crown-binding> | ||
| </davinci-button> | ||
| <h1 id="Heading11">Tools</h1> | ||
| <layout-row id="RowLayout3"> | ||
| <davinci-text-field id="TF_PingIP" type="text" label="Ping" | ||
| placeholder="IPv4 address"> | ||
| <crown-binding event="change" | ||
| name="CSK_DeviceNetworkConfig/setPingIPAddress" | ||
| path="param/args/ping_ip" auto-commit> | ||
| </crown-binding> | ||
| </davinci-text-field> | ||
| <davinci-button id="Button_Ping" type="primary" | ||
| icon-position="append"> | ||
| <span>PING</span> | ||
| <crown-set event="submit" | ||
| crown-function="CSK_DeviceNetworkConfig/ping" | ||
| protocol="crownMSGPACK"> | ||
| </crown-set> | ||
| </davinci-button> | ||
| <davinci-status-indicator id="SI_Ping" style="align-self: center"> | ||
| <span></span> | ||
| <crown-edpws-binding property="status" | ||
| name="CSK_DeviceNetworkConfig/OnNewPingResult" update-on-resume> | ||
| </crown-edpws-binding> | ||
| </davinci-status-indicator> | ||
| <davinci-value-display id="VD_PingDetails" style="align-self: center"> | ||
| <crown-edpws-binding property="value" | ||
| name="CSK_DeviceNetworkConfig/OnNewPingDetails" update-on-resume> | ||
| </crown-edpws-binding> | ||
| </davinci-value-display> | ||
| </layout-row> | ||
| </layout-column> | ||
| </layout-row> | ||
| </stacked-pane> | ||
| <stacked-pane id="SP_LoginNOK" value="false"> | ||
| <layout-row id="RowLayout2"> | ||
| <davinci-callout id="Callout4" type="warning"> | ||
| <span> | ||
| Please login with at least user level 'Maintenance' or higher to see this page. | ||
| </span> | ||
| </davinci-callout> | ||
| </layout-row> | ||
| </stacked-pane> | ||
| <crown-edpws-binding property="value" | ||
| name="CSK_DeviceNetworkConfig/OnUserLevelMaintenanceActive" | ||
| update-on-resume | ||
| converter="function(value) {return value.toString();}"> | ||
| </crown-edpws-binding> | ||
| </stacked-view> | ||
| <stacked-view id="SV_pageCalled"> | ||
| <crown-binding property="value" | ||
| name="CSK_DeviceNetworkConfig/pageCalled" path="result/data/empty" | ||
| auto-update="0" update-on-resume> | ||
| </crown-binding> | ||
| </stacked-view> | ||
| </layout-column> | ||
|
|
||
| </layout-row> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| { | ||
| "version": "1.0", | ||
| "pages": [] | ||
| } |
Empty file.
Empty file.
Oops, something went wrong.