Skip to content

Commit 2b43c2d

Browse files
golluroSICKAGgolluroSICKAG
committed
# Version 1.2.0
## Repository moved to GitHub organization
1 parent 06a9e86 commit 2b43c2d

61 files changed

Lines changed: 23437 additions & 21 deletions

File tree

Some content is hidden

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

‎CHANGELOG.md‎

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,26 @@
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 1.2.0
65

76
### New features
8-
- ...
7+
- Merged updated versions of related CSK modules (see README.md)
98

109
### Improvements
11-
- ...
10+
- Update to EmmyLua annotations
11+
- Usage of lua diagnostics
12+
- Documentation updates
1213

1314
### Bugfix
14-
- ...
15+
- Fixed link to GigE Vision UI in CSK_MultiRemoteCamera UI
16+
17+
## Release 1.1.1
18+
### Bugfix
19+
- Added missing info in docu
20+
21+
## Release 1.1.0
22+
### New features
23+
- PersistentData functionality
24+
25+
## Release 1.0.0
26+
- Initial commit

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

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

‎CSK_Template_CameraSetupMerged/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_Template_CameraSetupMerged/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_Template_CameraSetupMerged/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_Template_CameraSetupMerged/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_Template_CameraSetupMerged/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_Application_CameraSetupTemplateMerged",
3+
"version": "1.0.0",
4+
"description": "Generated",
5+
"components": [
6+
"@sick-davinci/basic-elements"
7+
],
8+
"dependencies": {
9+
"@sick-davinci/basic-elements": "^5.6.3"
10+
}
11+
}

‎CSK_Template_CameraSetupMerged/pages/pages/CSK_Application_CameraSetup/CSK_Application_CameraSetupTemplate.css‎

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

‎CSK_Template_CameraSetupMerged/pages/pages/CSK_Application_CameraSetup/CSK_Application_CameraSetupTemplate.html‎

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
<layout-row id="RowLayout1" style="align-items: stretch">
2+
<layout-column id="ColumnLayout7" style="align-items: stretch">
3+
<davinci-value-display id="VD_CameraSetup"
4+
label="CameraSetupTemplate">
5+
</davinci-value-display>
6+
<stacked-view id="SV_WaitingForSetup">
7+
<stacked-pane id="SP_WaitingActive" value="true">
8+
<davinci-callout id="Callout2" type="info">
9+
<span>Currently waiting for camera boot up...</span>
10+
</davinci-callout>
11+
</stacked-pane>
12+
<stacked-pane id="SP_NoWaiting" value="false"></stacked-pane>
13+
<crown-edpws-binding property="value"
14+
name="CSK_CameraSetupTemplate/OnNewStatusWaitingForSetup"
15+
update-on-resume
16+
converter="function(value) {return value.toString();}">
17+
</crown-edpws-binding>
18+
</stacked-view>
19+
<davinci-collapse id="Collapse_DefaultSetupInfo"
20+
collapsed-title="Show Info" expanded-title="Hide">
21+
<davinci-callout id="Callout_DefaultSetupInfos" type="info">
22+
<span>
23+
Function to load default camera setup config: Camera powered on S1/S2 and connected to ETH1 / ETH2 with IPs 192.168.1.100 / 192.168.2.100
24+
</span>
25+
</davinci-callout>
26+
</davinci-collapse>
27+
<davinci-button id="Button_LoadDefaultSetup" type="primary"
28+
icon-position="append">
29+
<span>Load Default Setup</span>
30+
<crown-binding event="submit"
31+
name="CSK_CameraSetupTemplate/loadDefaultSetup" auto-commit>
32+
</crown-binding>
33+
</davinci-button>
34+
<layout-row id="RowLayout11"
35+
style="justify-content: space-between; flex-grow: 0; align-items: center">
36+
<layout-column id="ColumnLayout23" style="align-items: stretch">
37+
<davinci-value-display id="VD_SelecteCamera" value="Selected camera:">
38+
</davinci-value-display>
39+
</layout-column>
40+
<layout-column id="ColumnLayout22" style="align-items: stretch">
41+
<davinci-drop-down id="DD_CameraInstance">
42+
<crown-binding event="change"
43+
name="CSK_MultiRemoteCamera/setSelectedCam"
44+
path="param/args/camNo" auto-commit
45+
converter="function(value) {return Number(value);}">
46+
</crown-binding>
47+
<crown-edpws-binding property="value"
48+
name="CSK_MultiRemoteCamera/OnNewSelectedCam" update-on-resume
49+
converter="function(value) {return value.toString();}">
50+
</crown-edpws-binding>
51+
<crown-edpws-binding property="data"
52+
name="CSK_MultiRemoteCamera/OnNewCameraList" update-on-resume
53+
converter="convertToList">
54+
</crown-edpws-binding>
55+
</davinci-drop-down>
56+
</layout-column>
57+
</layout-row>
58+
<layout-row id="RowLayout5" style="align-items: stretch">
59+
<layout-column id="ColumnLayout8" style="align-items: stretch">
60+
<sick-viewer2d id="ViewerApp" viewer-id="multiRemoteCameraViewer1"
61+
protocol="auto" style="width: 100%; height: 100%">
62+
</sick-viewer2d>
63+
</layout-column>
64+
</layout-row>
65+
<stacked-view id="SV_PageCalled">
66+
<crown-edpws-binding property="value"
67+
name="CSK_MultiRemoteCamera/OnNewViewerId" update-on-resume
68+
converter="changeIDApp">
69+
</crown-edpws-binding>
70+
<crown-binding property="value"
71+
name="CSK_MultiRemoteCamera/pageCalled"
72+
path="result/data/emptyString" auto-update="0" update-on-resume>
73+
</crown-binding>
74+
</stacked-view>
75+
</layout-column>
76+
<layout-column id="ColumnLayout3"></layout-column>
77+
</layout-row>

‎CSK_Template_CameraSetupMerged/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+
}

0 commit comments

Comments
 (0)