Skip to content

Commit c11123f

Browse files
golluroSICKAGgolluroSICKAG
committed
# Version 3.0.0
## Repository moved to GitHub organization
1 parent 9627054 commit c11123f

22 files changed

Lines changed: 4717 additions & 22 deletions

‎CHANGELOG.md‎

Lines changed: 61 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,70 @@
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 3.0.0
5+
6+
### Improvements
7+
- Renamed "Ftp" to "FTP" / "Ip" to "IP" within functions/events
8+
- Using recursive helper functions to convert Container <-> Lua table
9+
10+
## Release 2.6.0
11+
12+
### Improvements
13+
- Update to EmmyLua annotations
14+
- Usage of lua diagnostics
15+
- Documentation updates
16+
17+
## Release 2.5.0
18+
19+
### Improvements
20+
- Using internal moduleName variable to be usable in merged apps instead of _APPNAME, as this did not work with PersistentData module in merged apps.
21+
22+
## Release 2.4.0
623

724
### New features
8-
- ...
25+
- FTP VerboseMode configurable
26+
27+
### Improvements
28+
- optional image name parameter within "sendImage" function
29+
- FTP VerboseMode / AsyncTransferMode status available via UI
30+
- Naming of UI elements and adding some mouse over info texts
31+
- Appname added to log messages
32+
- Minor edits, docu, added log messages
33+
34+
### Bugfix
35+
- UI events notified after pageLoad after 300ms instead of 100ms to not miss
36+
37+
## Release 2.3.0
938

1039
### Improvements
11-
- ...
40+
- Update of helper funcs
41+
- Minor code edits / docu updates
1242

1343
### Bugfix
14-
- ...
44+
- Error because model tried to use "parameters" before they were created
45+
46+
## Release 2.2.0
47+
48+
### New features
49+
- Check futureHandle in Async mode
50+
51+
### Improvements
52+
- ParameterName available on UI
53+
- Prepared for all CSK user levels: Operator, Maintenance, Service, Admin
54+
- Changed status type of user levels from string to bool
55+
- Renamed page folder accordingly to module name
56+
- Loading only required APIs ('LuaLoadAllEngineAPI = false') -> less time for GC needed
57+
- Updated documentation
58+
59+
## Release 2.1.0
60+
61+
### New features
62+
- Added support for userlevels, required userlevel is Maintenance
63+
64+
## Release 2.0.0
65+
66+
### New features
67+
- Update handling of persistent data according to CSK_PersistentData module ver. 2.0.0
68+
69+
## Release 1.0.0
70+
- Initial commit

‎CSK_Module_FTPClient/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_FTPClient/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_FTPClient/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_FTPClient/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_FTPClient/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_FTPClient/pages/package.json‎

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

‎CSK_Module_FTPClient/pages/pages/CSK_Module_FTPClient/CSK_Module_FTPClient.css‎

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

‎CSK_Module_FTPClient/pages/pages/CSK_Module_FTPClient/CSK_Module_FTPClient.html‎

Lines changed: 200 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,200 @@
1+
<layout-row id="RowLayout1">
2+
<layout-column id="ColumnLayout6" 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-text-field id="TF_ServerIP" type="text" label="Server IP">
8+
<crown-edpws-binding property="value"
9+
name="CSK_FTPClient/OnNewServerIP" update-on-resume>
10+
</crown-edpws-binding>
11+
<crown-edpws-binding property="error"
12+
name="CSK_FTPClient/OnNewIPCheck" update-on-resume>
13+
</crown-edpws-binding>
14+
<crown-binding event="change" name="CSK_FTPClient/setFTPServerIP"
15+
path="param/args/ip" auto-commit>
16+
</crown-binding>
17+
</davinci-text-field>
18+
<davinci-value-display id="VD_Port" value="Port">
19+
</davinci-value-display>
20+
<davinci-numeric-field id="NF_Port" type="outline" min="1" max="60000"
21+
ticks="1" group-separator="," decimal-separator="."
22+
format-pattern="0">
23+
<crown-edpws-binding property="value" name="CSK_FTPClient/OnNewPort"
24+
update-on-resume>
25+
</crown-edpws-binding>
26+
<crown-binding event="change" name="CSK_FTPClient/setFTPPort"
27+
path="param/args/port" auto-commit>
28+
</crown-binding>
29+
</davinci-numeric-field>
30+
<davinci-text-field id="TF_Username" type="text" label="Username">
31+
<crown-edpws-binding property="value"
32+
name="CSK_FTPClient/OnNewUsername" update-on-resume>
33+
</crown-edpws-binding>
34+
<crown-binding event="change" name="CSK_FTPClient/setUsername"
35+
path="param/args/user" auto-commit>
36+
</crown-binding>
37+
</davinci-text-field>
38+
<davinci-text-field id="TF_Password" type="password" label="Password">
39+
<crown-edpws-binding property="value"
40+
name="CSK_FTPClient/OnNewPassword" update-on-resume>
41+
</crown-edpws-binding>
42+
<crown-binding event="change" name="CSK_FTPClient/setPassword"
43+
path="param/args/password" auto-commit>
44+
</crown-binding>
45+
</davinci-text-field>
46+
<davinci-checkbox id="CB_PassiveMode"
47+
title="Status will be used with next connection.">
48+
<span>FTP Passive Mode</span>
49+
<crown-edpws-binding property="checked"
50+
name="CSK_FTPClient/OnNewPassiveModeStatus" update-on-resume>
51+
</crown-edpws-binding>
52+
<crown-binding event="change" name="CSK_FTPClient/setPassiveMode"
53+
path="param/args/status" auto-commit>
54+
</crown-binding>
55+
</davinci-checkbox>
56+
<davinci-checkbox id="CB_AsyncMode">
57+
<span>Asynchronous mode:</span>
58+
<crown-binding event="change" name="CSK_FTPClient/setAsyncMode"
59+
path="param/args/status" auto-commit>
60+
</crown-binding>
61+
<crown-edpws-binding property="checked"
62+
name="CSK_FTPClient/OnNewStatusAsyncMode" update-on-resume>
63+
</crown-edpws-binding>
64+
</davinci-checkbox>
65+
<davinci-checkbox id="CB_VerboseMode"
66+
title="Status will be used with next connection.">
67+
<span>Verbose Mode</span>
68+
<crown-edpws-binding property="checked"
69+
name="CSK_FTPClient/OnNewStatusVerboseMode" update-on-resume>
70+
</crown-edpws-binding>
71+
<crown-binding event="change" name="CSK_FTPClient/setVerboseMode"
72+
path="param/args/status" auto-commit>
73+
</crown-binding>
74+
</davinci-checkbox>
75+
<davinci-status-indicator id="SI_ConnectionStatus">
76+
<span>Current Status</span>
77+
<crown-edpws-binding property="status"
78+
name="CSK_FTPClient/OnNewStatusConnected" update-on-resume>
79+
</crown-edpws-binding>
80+
</davinci-status-indicator>
81+
<davinci-button id="Button_Connect" type="primary"
82+
icon-position="append">
83+
<span>Connect</span>
84+
<crown-binding event="submit" name="CSK_FTPClient/connectFTPClient"
85+
auto-commit>
86+
</crown-binding>
87+
</davinci-button>
88+
<davinci-button id="Button_Disconnect" type="primary"
89+
icon-position="append">
90+
<span>Disconnect</span>
91+
<crown-binding event="submit" name="CSK_FTPClient/disconnectFTPClient"
92+
auto-commit>
93+
</crown-binding>
94+
</davinci-button>
95+
<layout-column id="Column_PersistentData"
96+
class="myCustomFrame_CSK_Module_FTPClient"
97+
style="align-items: stretch">
98+
<layout-row id="RowLayout41"
99+
style="justify-content: space-between; align-items: center">
100+
<layout-column id="ColumnLayout51" style="align-items: stretch">
101+
<davinci-value-display id="VD_ParameterName" value="Parameter name:"
102+
title="Name of the parameters within the CSK_PersistentData module to be uses for this module.">
103+
</davinci-value-display>
104+
</layout-column>
105+
<layout-column id="ColumnLayout62" style="align-items: stretch">
106+
<davinci-text-field id="TF_ParameterName" type="text"
107+
title="Name of the parameters within the CSK_PersistentData module to be uses for this module.">
108+
<crown-edpws-binding property="value"
109+
name="CSK_FTPClient/OnNewParameterName" update-on-resume>
110+
</crown-edpws-binding>
111+
<crown-binding event="change" name="CSK_FTPClient/setParameterName"
112+
path="param/args/name" auto-commit>
113+
</crown-binding>
114+
<crown-edpws-binding property="disabled"
115+
name="CSK_FTPClient/OnPersistentDataModuleAvailable"
116+
update-on-resume converter="function(value) {return !value;}">
117+
</crown-edpws-binding>
118+
</davinci-text-field>
119+
</layout-column>
120+
</layout-row>
121+
<layout-row id="RowLayout2"
122+
style="justify-content: space-between; align-items: center">
123+
<davinci-value-display id="VD_LoadConfig"
124+
value="Load config on app start:"
125+
title="Load configured parameters from CSK_PersistentData on app start.">
126+
</davinci-value-display>
127+
<davinci-checkbox id="CB_LoadConfig"
128+
title="Load configured parameters from CSK_PersistentData on app start.">
129+
<span></span>
130+
<crown-edpws-binding property="checked"
131+
name="CSK_FTPClient/OnNewStatusLoadParameterOnReboot"
132+
update-on-resume>
133+
</crown-edpws-binding>
134+
<crown-binding event="change" name="CSK_FTPClient/setLoadOnReboot"
135+
path="param/args/status" auto-commit>
136+
</crown-binding>
137+
<crown-edpws-binding property="disabled"
138+
name="CSK_FTPClient/OnPersistentDataModuleAvailable"
139+
update-on-resume converter="function(value) {return !value;}">
140+
</crown-edpws-binding>
141+
</davinci-checkbox>
142+
</layout-row>
143+
<layout-row id="RowLayout3">
144+
<layout-column id="ColumnLayout3" style="align-items: stretch">
145+
<davinci-button id="B_LoadConfig" type="primary"
146+
icon-position="append"
147+
title="Load configured parameters from CSK_PersistentData module.">
148+
<span>Load Config</span>
149+
<crown-binding event="submit" name="CSK_FTPClient/loadParameters"
150+
auto-commit>
151+
</crown-binding>
152+
<crown-edpws-binding property="disabled"
153+
name="CSK_FTPClient/OnPersistentDataModuleAvailable"
154+
update-on-resume converter="function(value) {return !value;}">
155+
</crown-edpws-binding>
156+
</davinci-button>
157+
</layout-column>
158+
<layout-column id="ColumnLayout4" style="align-items: stretch">
159+
<davinci-button id="B_SaveConfig" type="primary"
160+
icon-position="append"
161+
title="Save current configured parameters of this module within CSK_PersistentData module.">
162+
<span>Save Config</span>
163+
<crown-binding event="submit" name="CSK_FTPClient/sendParameters"
164+
auto-commit>
165+
</crown-binding>
166+
<crown-edpws-binding property="disabled"
167+
name="CSK_FTPClient/OnPersistentDataModuleAvailable"
168+
update-on-resume converter="function(value) {return !value;}">
169+
</crown-edpws-binding>
170+
</davinci-button>
171+
</layout-column>
172+
</layout-row>
173+
</layout-column>
174+
</layout-column>
175+
<layout-column id="ColumnLayout2" style="flex-grow: 3">
176+
</layout-column>
177+
</layout-row>
178+
</stacked-pane>
179+
<stacked-pane id="SP_LoginNOK" value="false">
180+
<layout-column id="ColumnLayout5" style="align-items: stretch">
181+
<davinci-callout id="Callout1" type="info">
182+
<span>
183+
Please login with user level Maintenance to see this page.
184+
</span>
185+
</davinci-callout>
186+
</layout-column>
187+
</stacked-pane>
188+
<crown-edpws-binding property="value"
189+
name="CSK_FTPClient/OnUserLevelMaintenanceActive" update-on-resume
190+
converter="function(value) {return value.toString();}">
191+
</crown-edpws-binding>
192+
</stacked-view>
193+
<stacked-view id="SV_PageCalled">
194+
<crown-binding property="value" name="CSK_FTPClient/pageCalled"
195+
path="result/data/empty" auto-update="0" update-on-resume>
196+
</crown-binding>
197+
</stacked-view>
198+
</layout-column>
199+
200+
</layout-row>

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