Browse Source

corrected definition errors for LED node. LED node is now available in ns0

FlorianPalm 10 years ago
parent
commit
d3c2cc86ef
2 changed files with 16 additions and 15 deletions
  1. 15 15
      src/ua_application.c
  2. 1 0
      src/ua_services_view.c

+ 15 - 15
src/ua_application.c

@@ -552,25 +552,25 @@ void appMockup_init() {
 	/* Namespace local */
 	/*******************/
 
-	//UA_ExpandedNodeId ObjId_led1 = (UA_ExpandedNodeId){.nodeId = (UA_NodeId){.encodingByte = UA_NODEIDTYPE_TWOBYTE, .namespace = 1, .identifier.numeric = 1}, .namespaceUri = {-1, ((void *)0)}, .serverIndex = 0};
+	UA_ExpandedNodeId ObjId_led1 = (UA_ExpandedNodeId){.nodeId = (UA_NodeId){.encodingByte = UA_NODEIDTYPE_TWOBYTE, .namespace = 0, .identifier.numeric = 1}, .namespaceUri = {-1, ((void *)0)}, .serverIndex = 0};
 
-	// ServerStatus
-	UA_VariableNode *led1;
-	UA_VariableNode_new(&led1);
-	serverstatus->nodeId = (UA_NodeId){.encodingByte = UA_NODEIDTYPE_TWOBYTE, .namespace = 1, .identifier.numeric = 1};
-	serverstatus->nodeClass = UA_NODECLASS_VARIABLE;
-	serverstatus->browseName = UA_QUALIFIEDNAME_STATIC("led1");
-	serverstatus->displayName = UA_LOCALIZEDTEXT_STATIC("led1");
-	serverstatus->description = UA_LOCALIZEDTEXT_STATIC("led1");
+// LED1
+UA_VariableNode *led1;
+UA_VariableNode_new(&led1);
+led1->nodeId = ObjId_led1.nodeId;
+led1->nodeClass = UA_NODECLASS_VARIABLE;
+led1->browseName = UA_QUALIFIEDNAME_STATIC("led1");
+led1->displayName = UA_LOCALIZEDTEXT_STATIC("led1");
+led1->description = UA_LOCALIZEDTEXT_STATIC("led1");
 
-	//FIXME: these two give - "Browse failed with error 'UncertainNotAllNodesAvailable'."
-	//AddReference((UA_Node*)led1, &(UA_ReferenceNode){RefTypeId_Organizes, UA_TRUE, NS0EXPANDEDNODEID(84)}, ns0);
-	//AddReference((UA_Node*)root, &(UA_ReferenceNode){RefTypeId_Organizes, UA_FALSE, ObjId_led1}, ns0);
+//FIXME: these two give - "Browse failed with error 'UncertainNotAllNodesAvailable'."
+//AddReference((UA_Node*)led1, &(UA_ReferenceNode){RefTypeId_Organizes, UA_TRUE, NS0EXPANDEDNODEID(84)}, ns0);
+AddReference((UA_Node*)root, &(UA_ReferenceNode){RefTypeId_Organizes, UA_FALSE, ObjId_led1}, ns0);
 
-	//FIXME: this give no error, but also also does not show the node
-	AddReference((UA_Node*)led1, &(UA_ReferenceNode){RefTypeId_Organizes, UA_TRUE, NS0EXPANDEDNODEID(84)}, local);
+//FIXME: this give no error, but also also does not show the node
+AddReference((UA_Node*)led1, &(UA_ReferenceNode){RefTypeId_Organizes, UA_TRUE, NS0EXPANDEDNODEID(84)}, ns0);
 
-	Namespace_insert(local,(UA_Node*)led1);
+Namespace_insert(ns0,(UA_Node*)led1);
 
 
 

+ 1 - 0
src/ua_services_view.c

@@ -5,6 +5,7 @@ UA_Int32 Service_Browse_getReferenceDescription(Namespace *ns, UA_ReferenceNode*
 												UA_UInt32 resultMask, UA_ReferenceDescription* referenceDescription) {
 	const UA_Node* foundNode;
 	Namespace_Entry_Lock *lock;
+
 	if(Namespace_get(ns,&reference->targetId.nodeId,&foundNode, &lock) != UA_SUCCESS)
 		return UA_ERROR;