--- a/branches/FeatureBranches/refactorpayload/SparkplugB/Function Blocks/FB_Edge/FB_Edge/Initialise/svnobj
+++ b/branches/FeatureBranches/refactorpayload/SparkplugB/Function Blocks/FB_Edge/FB_Edge/Initialise/svnobj
@@ -1,5 +1,5 @@
-Gx_l82!0…jüo_%ü`ÿ+±O°úSystem.StringL{f8a58466-d7f6-439f-bbb8-d4600e41d099}ImplementationL{3b83b776-fb25-43b8-99f2-3c507c9143fc}TextDocumentL{f3878285-8e4f-490b-bb1b-9acbb7eb04db}TextLinesL{a5de0b0b-1cb5-4913-ac21-9d70293ec00d}	Id
-longTagText
(Initialise := FALSE;^// Only use the corrected names throughout EoN!Œ_cPrimaryHostID := ReplaceIllegalCharsWithUnderscore( PrimaryHostID );€_cGroupId       := ReplaceIllegalCharsWithUnderscore( GroupId );‚_cNodeName      := ReplaceIllegalCharsWithUnderscore( NodeName );// Set Topics‚_TopicProvider.SETSTATETopic( PrimaryHostID := _cPrimaryHostID );p_TopicProvider.SETLASTWILLTopic( NodeName := _cNodeName,p                                 GroupId := _cGroupId );l_TopicProvider.SETNBIRTHTopic( NodeName := _cNodeName,l                               GroupId := _cGroupId );h_TopicProvider.SETNCMDTopic( NodeName := _cNodeName,h                             GroupId := _cGroupId );j_TopicProvider.SETNDATATopic( NodeName := _cNodeName,j                              GroupId := _cGroupId );f// Convert corrected GroupId From WSTRING TO STRINGnsPrimaryHostID := WSTRING_TO_STRING( _cPrimaryHostID );bsGroupId       := WSTRING_TO_STRING( _cGroupId ); dsNodeName      := WSTRING_TO_STRING( _cNodeName );!&//  create clientid"<sClientID := Concat( sGroupId,#B                     sNodeName );$>MakeValidClientID( sClientID );%vWriteDeviceLog( UDINT_TO_DWORD( CmpLog.LogClass.LOG_INFO ),&F                'EoN ClientId: %s','8                sClientID );(D                'EoN GroupId: %s',)6                sGroupId );*F                'EoN NodeName: %s',+8                sNodeName );,n                'EoN Connecting with Primary Host: %s',-B                sPrimaryHostID );.P                'EoN Connecting to: %s',/8                ServerUrl );0Z                'EoN Connecting on port: %s',1^                UINT_TO_STRING( ServerPort ) );2`                'EoN Session KeepAlive: %s sec',3\                UINT_TO_STRING( KeepAlive ) );4F// Setup the MQTT client connection5F_MQTT.SetBroker( sUrl := ServerUrl,6L                 uiPort := ServerPort,7X                 uiKeepAlive := KeepAlive );8N                'EoN CleanSession: %s',9b                BOOL_TO_STRING( CleanSession ) );:>                'EoN User: %s',;`                WSTRING_TO_STRING( Username ) );<>                'EoN Pass: %s',=J                '****************' );>(// Setup Credentials?v_MQTT.SetSessionCredentials( xCleanSession := CleanSession,@h                             sClientID := sClientID,A`                             wsUser := Username,Bd                             wsPass := Password );C// Setup TLSDN_MQTT.SetSessionTLS( xUseTLS := UseTLS,EL                     hCert := hCert );Fb                'EoN TLS Certificate Handle: %s',G8                SEL( UseTLS,H8                     'None',IX                     TO_STRING( hCert ) ) );J>                'EoN TLS : %s',K@                     'Disabled',LF                     'Enabled' ) );Mx(* Create the AllMetricsList by adding all metrics which we N|   ever will send, after setting the lastWill we cannot alter OR   (add/remove metrics) AllMetricsList *)PŽComposeError := ListComposer( arSparkplugBoolean := arSparkplugBoolean,Q’                              arSparkplugDateTime := arSparkplugDateTime,R†                              arSparkplugFloat := arSparkplugFloat,SŠ                              arSparkplugDouble := arSparkplugDouble,T‚                              arSparkplugInt8 := arSparkplugInt8,U†                              arSparkplugInt16 := arSparkplugInt16,V†                              arSparkplugInt32 := arSparkplugInt32,W†                              arSparkplugInt64 := arSparkplugInt64,X†                              arSparkplugUInt8 := arSparkplugUInt8,YŠ                              arSparkplugUInt16 := arSparkplugUInt16,ZŠ                              arSparkplugUInt32 := arSparkplugUInt32,[Š                              arSparkplugUInt64 := arSparkplugUInt64,\‚                              arSparkplugUUID := arSparkplugUUID,]‚                              arSparkplugText := arSparkplugText,^Š                              arSparkplugString := arSparkplugString,_€                              CompleteList := _AllMetricsList );`r _NodeControl( AllMetricsList := THIS^._AllMetricsList );ax// set Lastwill, the _AllMetricsList is now set in concrete b¤LastWillSet := SetLastWillAndTestament( AllMetricsList := THIS^._AllMetricsList );c@                'EoN LW&T: %s ',d`                BOOL_TO_STRING( LastWillSet ) );e4Initialise := LastWillSet;fInterfacegL{a9ed5b7e-75c5-4651-af16-d2c27e98cb94}h${attribute 'hide'}i0METHOD Initialise : BOOLjVARk8    sPrimaryHostID : STRING;l8    sGroupId       : STRING;m8    sNodeName      : STRING;n8    sClientID      : STRING;o6    ComposeError   : Error;p4    LastWillSet    : BOOL;qEND_VARÐÐÐE|ÐÐ	
+Gx_lö'!0…jüo¯˙`°P1´ā•ŚSystem.StringL{f8a58466-d7f6-439f-bbb8-d4600e41d099}ImplementationL{3b83b776-fb25-43b8-99f2-3c507c9143fc}TextDocumentL{f3878285-8e4f-490b-bb1b-9acbb7eb04db}TextLinesL{a5de0b0b-1cb5-4913-ac21-9d70293ec00d}	Id
+longTagText
(Initialise := FALSE;^// Only use the corrected names throughout EoN!Œ_cPrimaryHostID := ReplaceIllegalCharsWithUnderscore( PrimaryHostID );€_cGroupId       := ReplaceIllegalCharsWithUnderscore( GroupId );‚_cNodeName      := ReplaceIllegalCharsWithUnderscore( NodeName );// Set Topics‚_TopicProvider.SETSTATETopic( PrimaryHostID := _cPrimaryHostID );p_TopicProvider.SETLASTWILLTopic( NodeName := _cNodeName,p                                 GroupId := _cGroupId );l_TopicProvider.SETNBIRTHTopic( NodeName := _cNodeName,l                               GroupId := _cGroupId );h_TopicProvider.SETNCMDTopic( NodeName := _cNodeName,h                             GroupId := _cGroupId );j_TopicProvider.SETNDATATopic( NodeName := _cNodeName,j                              GroupId := _cGroupId );f// Convert corrected GroupId From WSTRING TO STRINGnsPrimaryHostID := WSTRING_TO_STRING( _cPrimaryHostID );bsGroupId       := WSTRING_TO_STRING( _cGroupId ); dsNodeName      := WSTRING_TO_STRING( _cNodeName );!&//  create clientid"<sClientID := Concat( sGroupId,#B                     sNodeName );$>MakeValidClientID( sClientID );%vWriteDeviceLog( UDINT_TO_DWORD( CmpLog.LogClass.LOG_INFO ),&F                'EoN ClientId: %s','8                sClientID );(D                'EoN GroupId: %s',)6                sGroupId );*F                'EoN NodeName: %s',+8                sNodeName );,n                'EoN Connecting with Primary Host: %s',-B                sPrimaryHostID );.P                'EoN Connecting to: %s',/8                ServerUrl );0Z                'EoN Connecting on port: %s',1^                UINT_TO_STRING( ServerPort ) );2`                'EoN Session KeepAlive: %s sec',3\                UINT_TO_STRING( KeepAlive ) );4F// Setup the MQTT client connection5F_MQTT.SetBroker( sUrl := ServerUrl,6L                 uiPort := ServerPort,7X                 uiKeepAlive := KeepAlive );8N                'EoN CleanSession: %s',9b                BOOL_TO_STRING( CleanSession ) );:>                'EoN User: %s',;`                WSTRING_TO_STRING( Username ) );<>                'EoN Pass: %s',=J                '****************' );>(// Setup Credentials?v_MQTT.SetSessionCredentials( xCleanSession := CleanSession,@h                             sClientID := sClientID,A`                             wsUser := Username,Bd                             wsPass := Password );C// Setup TLSDN_MQTT.SetSessionTLS( xUseTLS := UseTLS,EL                     hCert := hCert );Fb                'EoN TLS Certificate Handle: %s',G8                SEL( UseTLS,H8                     'None',IX                     TO_STRING( hCert ) ) );J>                'EoN TLS : %s',K@                     'Disabled',LF                     'Enabled' ) );Mx(* Create the AllMetricsList by adding all metrics which we N|   ever will send, after setting the lastWill we cannot alter OR   (add/remove metrics) AllMetricsList *)Pd _NodeControl( AllMetricsList := THIS^._Metrics );Qx// set Lastwill, the _AllMetricsList is now set in concrete R–LastWillSet := SetLastWillAndTestament( AllMetricsList := THIS^._Metrics );S@                'EoN LW&T: %s ',T`                BOOL_TO_STRING( LastWillSet ) );U4Initialise := LastWillSet;VInterfaceWL{a9ed5b7e-75c5-4651-af16-d2c27e98cb94}X${attribute 'hide'}Y0METHOD Initialise : BOOLZVAR[8    sPrimaryHostID : STRING;\8    sGroupId       : STRING;]8    sNodeName      : STRING;^8    sClientID      : STRING;_6    ComposeError   : Error;`4    LastWillSet    : BOOL;aEND_VARÐÐÐElÐÐ	
 ­d	ÚÐ-
ÐÐ	
 ­e	ÚÐ-ÐÐ	
 ­f	ÚÐ-ÐÐ	
@@ -98,40 +98,24 @@
 ­Ã	ÚÐ-MÐÐ	
 ­Ä	ÚÐ-NÐÐ	
 ­Å	ÚÐ-OÐÐ	
-­Æ	ÚÐ-PÐÐ	
-­Ç	ÚÐ-QÐÐ	
-­È	ÚÐ-RÐÐ	
-­É	ÚÐ-SÐÐ	
-­Ê	ÚÐ-TÐÐ	
-­Ë	ÚÐ-UÐÐ	
-­Ì	ÚÐ-VÐÐ	
-­Í	ÚÐ-WÐÐ	
-­Î	ÚÐ-XÐÐ	
-­Ï	ÚÐ-YÐÐ	
-­Ð	ÚÐ-ZÐÐ	
-­Ñ	ÚÐ-[ÐÐ	
-­Ò	ÚÐ-\ÐÐ	
-­Ó	ÚÐ-]ÐÐ	
-­Ô	ÚÐ-^ÐÐ	
-­Õ	ÚÐ-_ÐÐ	
 ­ì	ÚÐ-ÐÐ	
-­é	ÚÐ-`ÐÐ	
+­é	ÚÐ-PÐÐ	
 ­è	ÚÐ-ÐÐ	
-­×	ÚÐ-aÐÐ	
-­Ø	ÚÐ-bÐÐ	
+­×	ÚÐ-QÐÐ	
+­Ø	ÚÐ-RÐÐ	
 ­Ù	ÚÐ-%ÐÐ	
-­Ú	ÚÐ-cÐÐ	
-­Û	ÚÐ-dÐÐ	
+­Ú	ÚÐ-SÐÐ	
+­Û	ÚÐ-TÐÐ	
 ­Ü	ÚÐ-ÐÐ	
-­XÚÐ-eÐfgÐE
+­XÚÐ-UÐVWÐE
 ÐÐ	
-­[	ÚÐ-hÐÐ	
-­\	ÚÐ-iÐÐ	
-­]	ÚÐ-jÐÐ	
-­^	ÚÐ-kÐÐ	
-­_	ÚÐ-lÐÐ	
-­`	ÚÐ-mÐÐ	
-­a	ÚÐ-nÐÐ	
-­b	ÚÐ-oÐÐ	
-­c	ÚÐ-pÐÐ	
-­MÚÐ-q
\ No newline at end of file
+­[	ÚÐ-XÐÐ	
+­\	ÚÐ-YÐÐ	
+­]	ÚÐ-ZÐÐ	
+­^	ÚÐ-[ÐÐ	
+­_	ÚÐ-\ÐÐ	
+­`	ÚÐ-]ÐÐ	
+­a	ÚÐ-^ÐÐ	
+­b	ÚÐ-_ÐÐ	
+­c	ÚÐ-`ÐÐ	
+­MÚÐ-a
\ No newline at end of file