# Version 1.2.0

## Repository moved to GitHub organization

CHANGELOG.md

@@ -1,14 +1,26 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
-## Release 0.1.0
-- Initial commit
+## Release 1.2.0
 
 ### New features
-- ...
+- Merged updated versions of related CSK modules (see README.md)
 
 ### Improvements
-- ...
+- Update to EmmyLua annotations
+- Usage of lua diagnostics
+- Documentation updates
 
 ### Bugfix
-- ...
+- Fixed link to GigE Vision UI in CSK_MultiRemoteCamera UI
+
+## Release 1.1.1
+### Bugfix
+- Added missing info in docu
+
+## Release 1.1.0
+### New features
+- PersistentData functionality
+
+## Release 1.0.0
+- Initial commit

CSK_Template_CameraSetupMerged/pages/assets/legacy/resources.json

@@ -0,0 +1 @@
+[]

CSK_Template_CameraSetupMerged/pages/assets/legacy/settings.json

@@ -0,0 +1,3 @@
+{}{
+"showLoginButton": false
+}

CSK_Template_CameraSetupMerged/pages/global.css

@@ -0,0 +1 @@
+/* Add project wide CSS settings here */

CSK_Template_CameraSetupMerged/pages/i18n/de.json

@@ -0,0 +1,3 @@
+{
+
+}

CSK_Template_CameraSetupMerged/pages/i18n/en.json

@@ -0,0 +1,3 @@
+{
+
+}

CSK_Template_CameraSetupMerged/pages/package.json

@@ -0,0 +1,11 @@
+{
+  "name": "CSK_Application_CameraSetupTemplateMerged",
+  "version": "1.0.0",
+  "description": "Generated",
+  "components": [
+    "@sick-davinci/basic-elements"
+  ],
+  "dependencies": {
+    "@sick-davinci/basic-elements": "^5.6.3"
+  }
+}

CSK_Template_CameraSetupMerged/pages/pages/CSK_Application_CameraSetup/CSK_Application_CameraSetupTemplate.css

@@ -0,0 +1,9 @@
+.myCustomFrame_CSK_Application_CameraSetupTemplate {
+  border-style: solid;
+  border-width: 1px;
+  border-color: grey;
+  margin: 6px;
+}
+
+.myCustomCssClass_CSK_Application_CameraSetupTemplate {
+}

CSK_Template_CameraSetupMerged/pages/pages/CSK_Application_CameraSetup/CSK_Application_CameraSetupTemplate.html

@@ -0,0 +1,77 @@
+<layout-row id="RowLayout1" style="align-items: stretch">
+	<layout-column id="ColumnLayout7" style="align-items: stretch">
+		<davinci-value-display id="VD_CameraSetup"
+			label="CameraSetupTemplate">
+		</davinci-value-display>
+        <stacked-view id="SV_WaitingForSetup">
+			<stacked-pane id="SP_WaitingActive" value="true">
+				<davinci-callout id="Callout2" type="info">
+					<span>Currently waiting for camera boot up...</span>
+				</davinci-callout>
+			</stacked-pane>
+			<stacked-pane id="SP_NoWaiting" value="false"></stacked-pane>
+			<crown-edpws-binding property="value"
+				name="CSK_CameraSetupTemplate/OnNewStatusWaitingForSetup"
+				update-on-resume
+				converter="function(value) {return value.toString();}">
+			</crown-edpws-binding>
+		</stacked-view>
+		<davinci-collapse id="Collapse_DefaultSetupInfo"
+			collapsed-title="Show Info" expanded-title="Hide">
+			<davinci-callout id="Callout_DefaultSetupInfos" type="info">
+				<span>
+					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
+				</span>
+			</davinci-callout>
+		</davinci-collapse>
+		<davinci-button id="Button_LoadDefaultSetup" type="primary"
+			icon-position="append">
+			<span>Load Default Setup</span>
+			<crown-binding event="submit"
+				name="CSK_CameraSetupTemplate/loadDefaultSetup" auto-commit>
+			</crown-binding>
+		</davinci-button>
+  <layout-row id="RowLayout11"
+			style="justify-content: space-between; flex-grow: 0; align-items: center">
+			<layout-column id="ColumnLayout23" style="align-items: stretch">
+				<davinci-value-display id="VD_SelecteCamera" value="Selected camera:">
+				</davinci-value-display>
+			</layout-column>
+			<layout-column id="ColumnLayout22" style="align-items: stretch">
+				<davinci-drop-down id="DD_CameraInstance">
+					<crown-binding event="change"
+						name="CSK_MultiRemoteCamera/setSelectedCam"
+						path="param/args/camNo" auto-commit
+						converter="function(value) {return Number(value);}">
+					</crown-binding>
+					<crown-edpws-binding property="value"
+						name="CSK_MultiRemoteCamera/OnNewSelectedCam" update-on-resume
+						converter="function(value) {return value.toString();}">
+					</crown-edpws-binding>
+					<crown-edpws-binding property="data"
+						name="CSK_MultiRemoteCamera/OnNewCameraList" update-on-resume
+						converter="convertToList">
+					</crown-edpws-binding>
+				</davinci-drop-down>
+			</layout-column>
+		</layout-row>
+		<layout-row id="RowLayout5" style="align-items: stretch">
+			<layout-column id="ColumnLayout8" style="align-items: stretch">
+				<sick-viewer2d id="ViewerApp" viewer-id="multiRemoteCameraViewer1"
+					protocol="auto" style="width: 100%; height: 100%">
+				</sick-viewer2d>
+			</layout-column>
+		</layout-row>
+		<stacked-view id="SV_PageCalled">
+			<crown-edpws-binding property="value"
+				name="CSK_MultiRemoteCamera/OnNewViewerId" update-on-resume
+				converter="changeIDApp">
+			</crown-edpws-binding>
+			<crown-binding property="value"
+				name="CSK_MultiRemoteCamera/pageCalled"
+				path="result/data/emptyString" auto-update="0" update-on-resume>
+			</crown-binding>
+		</stacked-view>
+	</layout-column>
+	<layout-column id="ColumnLayout3"></layout-column>
+</layout-row>

CSK_Template_CameraSetupMerged/pages/pages/CSK_Module_DeviceScanner/CSK_Module_DeviceScanner.css

@@ -0,0 +1,3 @@
+.myCustomSpace10px_CSK_Module_DeviceScanner {
+  min-height: 10px;
+}