Skip to content

Commit a74b249

Browse files
golluroSICKAGgolluroSICKAG
committed
# Version 2.0.0
## Repository moved to GitHub organization
1 parent 53a013a commit a74b249

22 files changed

Lines changed: 3600 additions & 24 deletions

‎CHANGELOG.md‎

Lines changed: 77 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,85 @@
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 'setSubnetMaks' to 'setSubnetMask' / 'OnNewDhcpStatus' to 'OnNewDHCPStatus' / 'getDeviceListJson' to 'getDeviceListJSON'
8+
9+
## Release 1.8.0
10+
11+
### Improvements
12+
- Minor code restructure
13+
- Update to EmmyLua annotations
14+
- Usage of lua diagnostics
15+
- Documentation updates
16+
17+
## Release 1.7.1
18+
19+
### Bugfix
20+
- Removed internal docu of functions if manifest docu is available in parallel
21+
- Added missing docu
22+
23+
## Release 1.7.0
24+
25+
### Improvements
26+
- Using internal moduleName variable to be usable in merged apps instead of _APPNAME, as this did not work with PersistentData module in merged apps.
27+
28+
## Release 1.6.2
29+
30+
### Improvements
31+
- Naming of UI elements and adding some mouse over info texts
32+
- Appname added to log messages
33+
- Minor edits
34+
35+
## Release 1.6.2
36+
37+
### Improvements
38+
- Minor code edits / docu updates
39+
40+
## Release 1.6.0
941

1042
### Improvements
11-
- ...
43+
- Loading only required APIs ('LuaLoadAllEngineAPI = false') -> less time for GC needed
44+
- Updated documentation
45+
46+
## Release 1.5.0
47+
48+
### Improvements
49+
- Prepared for all CSK user levels: Operator, Maintenance, Service, Admin
50+
- Changed status type of user levels from string to bool
51+
- Renamed page folder accordingly to module name
52+
- Updated documentation
53+
54+
## Release 1.4.0
55+
56+
### New features
57+
- Added support for userlevels
58+
59+
## Release 1.3.0
60+
61+
### Improvement
62+
- Add function scope limitiation infos to UI
63+
- Changed "OnNewSearchActive" to "OnNewScanStatus" to respond success of setting new config
64+
- Clear device list on UI ("OnNewDeviceTable") if new scan is triggered
65+
- No auto scan after setting new config
66+
67+
## Release 1.2.1
1268

1369
### Bugfix
14-
- ...
70+
- Documentation added (incl. API html-file)
71+
- Minor renaming
72+
73+
## Release 1.2.0
74+
75+
### Improvements
76+
- New function to load/save parameters with SubContainer
77+
78+
## Release 1.1.0
79+
80+
### Improvements
81+
- Interface to scan now selectable
82+
- Show interface where device was found on
83+
84+
## Release 1.0.0
85+
- Initial commit

‎CSK_Module_DeviceScanner/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_DeviceScanner/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_DeviceScanner/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_DeviceScanner/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_DeviceScanner/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_DeviceScanner/pages/package.json‎

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

‎CSK_Module_DeviceScanner/pages/pages/CSK_Module_DeviceScanner/CSK_Module_DeviceScanner.css‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
.myCustomSpace10px_CSK_Module_DeviceScanner {
2+
min-height: 10px;
3+
}

‎CSK_Module_DeviceScanner/pages/pages/CSK_Module_DeviceScanner/CSK_Module_DeviceScanner.html‎

Lines changed: 241 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,241 @@
1+
<layout-row id="RowLayout1"
2+
style="justify-content: space-between; flex-shrink: 0">
3+
<stacked-view id="SV_Login" style="flex-grow: 1">
4+
<stacked-pane id="SP_LoggedIn" value="true" style="flex-grow: 1">
5+
<layout-row id="RowLayout8"
6+
style="justify-content: space-between; flex-shrink: 0">
7+
<layout-column id="ColumnLayout2"
8+
style="align-items: stretch; flex-shrink: 0">
9+
<stacked-view id="SV_Callouts">
10+
<stacked-pane id="SP_Processing" value="processing">
11+
<davinci-callout id="Callout2" type="info">
12+
<span>... Currently processing...</span>
13+
</davinci-callout>
14+
</stacked-pane>
15+
<stacked-pane id="SP_Success" value="success">
16+
<davinci-callout id="Callout7" type="success">
17+
<span>
18+
New config accepted! Trigger rescan to update the list.
19+
</span>
20+
</davinci-callout>
21+
</stacked-pane>
22+
<stacked-pane id="SP_Error" value="error">
23+
<davinci-callout id="Callout8" type="error">
24+
<span>
25+
New config NOT accepted (maybe just temporarly active)! Trigger rescan to update the list.
26+
</span>
27+
</davinci-callout>
28+
</stacked-pane>
29+
<stacked-pane id="SP_Empty" value="empty"></stacked-pane>
30+
<crown-edpws-binding property="value"
31+
name="CSK_DeviceScanner/OnNewScanStatus" update-on-resume>
32+
</crown-edpws-binding>
33+
</stacked-view>
34+
<davinci-drop-down id="DD_Interface" label="Selected Interface">
35+
<crown-edpws-binding property="data"
36+
name="CSK_DeviceScanner/OnNewInterfaceList" update-on-resume
37+
converter="convertToList">
38+
</crown-edpws-binding>
39+
<crown-edpws-binding property="value"
40+
name="CSK_DeviceScanner/OnNewInterfaceSelected" update-on-resume>
41+
</crown-edpws-binding>
42+
<crown-binding event="change" name="CSK_DeviceScanner/selectInterface"
43+
path="param/args/selection" auto-commit>
44+
</crown-binding>
45+
</davinci-drop-down>
46+
<davinci-button id="B_Scan" type="primary" icon-position="append">
47+
<span>Scan for Device</span>
48+
<crown-binding event="submit" name="CSK_DeviceScanner/scanForDevices"
49+
auto-commit>
50+
</crown-binding>
51+
</davinci-button>
52+
<layout-row id="RowLayout2" style="width: 100%; align-items: stretch">
53+
<curie-table id="DT_FoundDevices" selectable
54+
select-mode="highlight_row" style="height: 100%; width: 100%">
55+
<curie-table-column id="DeviceNo" header="DeviceNo">
56+
</curie-table-column>
57+
<curie-table-column id="DeviceName" header="DeviceName">
58+
</curie-table-column>
59+
<curie-table-column id="Interface" header="Interface">
60+
</curie-table-column>
61+
<curie-table-column id="IP" header="IP"></curie-table-column>
62+
<curie-table-column id="SubnetMask" header="SubnetMask">
63+
</curie-table-column>
64+
<curie-table-column id="MAC" header="MAC"></curie-table-column>
65+
<curie-table-column id="DefaultGateway" header="DefaultGateway">
66+
</curie-table-column>
67+
<curie-table-column id="DHCP" header="DHCP">
68+
</curie-table-column>
69+
<crown-edpws-binding property="data"
70+
name="CSK_DeviceScanner/OnNewDeviceTable" update-on-resume>
71+
</crown-edpws-binding>
72+
<crown-binding event="row-selected"
73+
name="CSK_DeviceScanner/selectDevice" path="param/args/selection"
74+
auto-commit>
75+
</crown-binding>
76+
</curie-table>
77+
</layout-row>
78+
<layout-row id="Placeholder"
79+
class="myCustomSpace10px_CSK_Module_DeviceScanner">
80+
</layout-row>
81+
<layout-row id="RowLayout7"
82+
style="justify-content: space-between; align-items: center">
83+
<layout-column id="ColumnLayout3" style="align-items: stretch">
84+
<layout-row id="RowLayout3" style="align-items: center">
85+
<davinci-value-display id="VD_IP" label="IP" title="Preset IP">
86+
</davinci-value-display>
87+
<davinci-text-field id="TF_IP" type="text" title="Preset IP">
88+
<crown-edpws-binding property="value" name="CSK_DeviceScanner/OnNewIP"
89+
update-on-resume>
90+
</crown-edpws-binding>
91+
<crown-binding event="change" name="CSK_DeviceScanner/setDeviceIP"
92+
path="param/args/ip" auto-commit>
93+
</crown-binding>
94+
<crown-on property="disabled"
95+
crown-event="CSK_DeviceScanner/OnUserLevelMaintenanceActive"
96+
converter="function(value) {return !value;}">
97+
</crown-on>
98+
</davinci-text-field>
99+
</layout-row>
100+
</layout-column>
101+
<layout-column id="ColumnLayout1" style="align-items: stretch">
102+
<layout-row id="RowLayout4" style="align-items: center">
103+
<davinci-value-display id="VD_Subnet" label="Subnet"
104+
title="Preset subnet">
105+
</davinci-value-display>
106+
<davinci-text-field id="TF_Subnet" type="text" title="Preset subnet">
107+
<crown-edpws-binding property="value"
108+
name="CSK_DeviceScanner/OnNewSubnetMask" update-on-resume>
109+
</crown-edpws-binding>
110+
<crown-binding event="change" name="CSK_DeviceScanner/setSubnetMask"
111+
path="param/args/subnetMask" auto-commit>
112+
</crown-binding>
113+
<crown-on property="disabled"
114+
crown-event="CSK_DeviceScanner/OnUserLevelMaintenanceActive"
115+
converter="function(value) {return !value;}">
116+
</crown-on>
117+
</davinci-text-field>
118+
</layout-row>
119+
</layout-column>
120+
<layout-column id="ColumnLayout4" style="align-items: stretch">
121+
<layout-row id="RowLayout5" style="align-items: center">
122+
<davinci-value-display id="VD_GateWay" label="Gateway"
123+
title="Preset Gateway">
124+
</davinci-value-display>
125+
<davinci-text-field id="TF_Gateway" type="text"
126+
title="Preset Gateway">
127+
<crown-edpws-binding property="value"
128+
name="CSK_DeviceScanner/OnNewGateway" update-on-resume>
129+
</crown-edpws-binding>
130+
<crown-binding event="change" name="CSK_DeviceScanner/setGateway"
131+
path="param/args/gateway" auto-commit>
132+
</crown-binding>
133+
<crown-on property="disabled"
134+
crown-event="CSK_DeviceScanner/OnUserLevelMaintenanceActive"
135+
converter="function(value) {return !value;}">
136+
</crown-on>
137+
</davinci-text-field>
138+
</layout-row>
139+
</layout-column>
140+
<layout-column id="ColumnLayout5" style="align-items: stretch">
141+
<layout-row id="RowLayout6" style="align-items: center">
142+
<davinci-value-display id="VD_DHCP" label="DHCP" title="Preset DHCP">
143+
</davinci-value-display>
144+
<davinci-checkbox id="CB_DHCP" title="Preset DHCP">
145+
<span></span>
146+
<crown-edpws-binding property="checked"
147+
name="CSK_DeviceScanner/OnNewDHCPStatus" update-on-resume>
148+
</crown-edpws-binding>
149+
<crown-binding event="change" name="CSK_DeviceScanner/setDHCP"
150+
path="param/args/status" auto-commit>
151+
</crown-binding>
152+
<crown-on property="disabled"
153+
crown-event="CSK_DeviceScanner/OnUserLevelMaintenanceActive"
154+
converter="function(value) {return !value;}">
155+
</crown-on>
156+
</davinci-checkbox>
157+
</layout-row>
158+
</layout-column>
159+
</layout-row>
160+
<davinci-button id="B_SendConfig" type="primary"
161+
icon-position="append" title="Send new config to device">
162+
<span>Send new config</span>
163+
<crown-binding event="submit" name="CSK_DeviceScanner/sendNewConfig"
164+
auto-commit>
165+
</crown-binding>
166+
<crown-edpws-binding property="disabled"
167+
name="CSK_DeviceScanner/OnDeviceSelected" update-on-resume
168+
converter="function(value) {return !value;}">
169+
</crown-edpws-binding>
170+
</davinci-button>
171+
<stacked-view id="SV_InfoTexts">
172+
<stacked-pane id="StackedPane7" value="true">
173+
<layout-column id="ColumnLayout6"
174+
style="align-items: stretch; flex-shrink: 0">
175+
<davinci-callout id="Callout3" type="info">
176+
<span>
177+
INFO: There can be following limitations related to the feature scope of the device firmware (please update to latest firmware version):
178+
</span>
179+
</davinci-callout>
180+
<davinci-callout id="Callout6" type="warning">
181+
<span>
182+
1) Devices with identical IP address as one of the ETH interfaces of the device may not be detected. If so, check ALL ETH interfaces and modify relevant SIM-IP addresses (temporarily) in order to detect such connected devices and to edit their IP-address. This is quite common with factory setup of new devices (e.g. cameras with IP 192.168.0.1)
183+
</span>
184+
</davinci-callout>
185+
<davinci-callout id="Callout5" type="warning">
186+
<span>
187+
2) Setting IP config of GigE Vision cameras may only be possible TO or FROM same subnet. E.g. if connected SIM interface has IP 192.168.0.x / 255.255.255.0 you can set new config for cameras with IP 192.168.0.x to other addresses OR from another setting to this address range. If you want to change FROM another subnet TO another subnet, you need to do this by using this twice (first set to same subnet and after that change to desired address...)
188+
</span>
189+
</davinci-callout>
190+
<davinci-callout id="Callout4" type="warning">
191+
<span>
192+
3) Editing GigE Vision cameras with an current IP in a different subnet than the interface of the SIM may not be possible with SIM1012 firmware <2.2.0.
193+
</span>
194+
</davinci-callout>
195+
<davinci-callout id="Callout9" type="warning">
196+
<span>
197+
4) After setting new GigE Vision camera IP with SIM1012 a power cycle of the camera may be required to activate the new setting!
198+
</span>
199+
</davinci-callout>
200+
</layout-column>
201+
</stacked-pane>
202+
<crown-on property="value"
203+
crown-event="CSK_DeviceScanner/OnUserLevelMaintenanceActive"
204+
converter="function(value) {return value.toString();}">
205+
</crown-on>
206+
</stacked-view>
207+
<stacked-view id="SV_ErrorMessage">
208+
<stacked-pane id="SP_true" value="true">
209+
<davinci-callout id="Callout1" type="error">
210+
<span>Please check your setting!</span>
211+
</davinci-callout>
212+
</stacked-pane>
213+
<stacked-pane id="SP_false" value="false"></stacked-pane>
214+
<crown-edpws-binding property="value"
215+
name="CSK_DeviceScanner/OnNewErrorActive" update-on-resume
216+
converter="function(value) {return value.toString();}">
217+
</crown-edpws-binding>
218+
</stacked-view>
219+
<stacked-view id="SV_pageCalled">
220+
<crown-binding property="value" name="CSK_DeviceScanner/pageCalled"
221+
path="result/data/empty" auto-update="0" update-on-resume>
222+
</crown-binding>
223+
</stacked-view>
224+
</layout-column>
225+
</layout-row>
226+
</stacked-pane>
227+
<stacked-pane id="SP_NotLoggedIn" value="false">
228+
<layout-column id="ColumnLayout7" style="align-items: stretch">
229+
<davinci-callout id="Callout10" type="info">
230+
<span>
231+
Please login with minimum user level Operator to see this page.
232+
</span>
233+
</davinci-callout>
234+
</layout-column>
235+
</stacked-pane>
236+
<crown-on property="value"
237+
crown-event="CSK_DeviceScanner/OnUserLevelOperatorActive"
238+
converter="function(value) {return value.toString();}">
239+
</crown-on>
240+
</stacked-view>
241+
</layout-row>

‎CSK_Module_DeviceScanner/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)