Skip to content

Commit 3a6a03c

Browse files
Version 1.0.0 (#1)
* Initial commit of version 1.0.0 --------- Co-authored-by: Ingo Koglin <131916494+kogliinSICKAG@users.noreply.github.com>
1 parent 1b22391 commit 3a6a03c

14 files changed

Lines changed: 3176 additions & 609 deletions

File tree

CHANGELOG.md

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,5 @@
11
# Changelog
22
All notable changes to this project will be documented in this file.
33

4-
## Release 0.1.0
5-
- Initial commit
6-
7-
### New features
8-
- ...
9-
10-
### Improvements
11-
- ...
12-
13-
### Bugfix
14-
- ...
4+
## Release 1.0.0
5+
- Initial commit

CSK_Module_MultiTCPIPClient/pages/pages/CSK_Module_MultiTCPIPClient/CSK_Module_MultiTCPIPClient.css

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,6 @@
55
margin: 6px;
66
}
77

8-
.myCustomCssClass_CSK_Module_MultiTCPIPClient {
8+
.myCustomMinHeight200px_CSK_Module_MultiTCPIPClient {
9+
min-height: 200px;
910
}

CSK_Module_MultiTCPIPClient/pages/pages/CSK_Module_MultiTCPIPClient/CSK_Module_MultiTCPIPClient.html

Lines changed: 400 additions & 102 deletions
Large diffs are not rendered by default.
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
document.addEventListener('sopasjs-ready', () => {
2+
setTimeout(() => {
3+
document.title = 'CSK_Module_MultiTCPIPClient'
4+
}, 500);
5+
})

CSK_Module_MultiTCPIPClient/project.mf.xml

Lines changed: 192 additions & 24 deletions
Large diffs are not rendered by default.

CSK_Module_MultiTCPIPClient/scripts/CSK_Module_MultiTCPIPClient.lua

Lines changed: 23 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@
3030

3131
-- If app property "LuaLoadAllEngineAPI" is FALSE, use this to load and check for required APIs
3232
-- This can improve performance of garbage collection
33-
34-
-- _G.availableAPIs = require('Communication/MultiTCPIPClient/helper/checkAPIs') -- can be used to adjust function scope of the module related on available APIs of the device
33+
_G.availableAPIs = require('Communication/MultiTCPIPClient/helper/checkAPIs') -- can be used to adjust function scope of the module related on available APIs of the device
3534
-----------------------------------------------------------
3635
-- Logger
3736
_G.logger = Log.SharedLogger.create('ModuleLogger')
@@ -60,31 +59,6 @@ multiTCPIPClientController.setMultiTCPIPClient_Instances_Handle(multiTCPIPClient
6059
--**********************Start Function Scope *******************************
6160
--**************************************************************************
6261

63-
--[[
64-
--- Function to show how this module could be used
65-
local function startProcessing()
66-
67-
CSK_MultiTCPIPClient.setSelectedInstance(1) --> select instance of module
68-
CSK_MultiTCPIPClient.doSomething() --> preparation
69-
70-
-- Option A --> prepare an event to trigger processing via this one
71-
--Script.serveEvent("CSK_MultiTCPIPClient.OnNewTestEvent", "MultiTCPIPClient_OnNewTestEvent") --> Create event to listen to and process forwarded object
72-
--CSK_MultiTCPIPClient.setRegisterEvent('CSK_MultiTCPIPClient.OnNewTestEvent') --> Register processing to the event
73-
74-
--Script.notifyEvent('OnNewTestEvent', data)
75-
76-
-- Option B --> trigger processing via function call
77-
local result = CSK_MultiTCPIPClient.processSomething(data)
78-
79-
end
80-
end
81-
82-
-- Call processing function after persistent data was loaded
83-
--Script.register("CSK_MultiTCPIPClient.OnDataLoadedOnReboot", startProcessing)
84-
]]
85-
86-
--OR
87-
8862
--- Function to react on startup event of the app
8963
local function main()
9064

@@ -97,9 +71,30 @@ local function main()
9771
-- If so, the app will trigger the "OnDataLoadedOnReboot" event if ready after loading parameters
9872
--
9973
-- Can be used e.g. like this
74+
--
75+
--[[
76+
CSK_MultiTCPIPClient.setSelectedInstance(1)
77+
CSK_MultiTCPIPClient.setInterface('ETH1')
78+
CSK_MultiTCPIPClient.setPort(1234)
79+
CSK_MultiTCPIPClient.setServerAddress('192.168.0.99')
80+
81+
CSK_MultiTCPIPClient.setRxFraming('STX-ETX')
82+
CSK_MultiTCPIPClient.setTxFraming('STX-ETX')
83+
84+
CSK_MultiTCPIPClient.startTCPIPClient()
85+
86+
CSK_MultiTCPIPClient.transmitData1('TestData')
87+
88+
CSK_MultiTCPIPClient.addEventToForward('CSK_OtherModule.OnNewEvent') -- Transmit content of this event via TCP/IP
89+
90+
-- Will create "CSK_MultiTCPIPClient.OnNewEvent" and if module receives 'TRG' it will trigger this event
91+
CSK_MultiTCPIPClient.addTriggerEventPair('TRG', 'OnNewEvent')
92+
93+
--Register on event 'CSK_MultiTCPIPClient.OnNewData1' to get incoming data
94+
]]
10095
----------------------------------------------------------------------------------------
10196

102-
--startProcessing() --> see above
97+
CSK_MultiTCPIPClient.setSelectedInstance(1)
10398
CSK_MultiTCPIPClient.pageCalled() -- Update UI
10499

105100
end

0 commit comments

Comments
 (0)