Просмотр исходного кода

make server compilable without RPI flag

Julius Pfrommer лет назад: 10
Родитель
Сommit
e0ccedcfc7
1 измененных файлов с 15 добавлено и 16 удалено
  1. 15 16
      examples/src/opcuaServer.c

+ 15 - 16
examples/src/opcuaServer.c

@@ -42,18 +42,23 @@ UA_Int32 serverCallback(void * arg) {
 	}
 
 	const UA_Node *foundNode1 = UA_NULL;
+	UA_NodeId tmpNodeId1;
+	tmpNodeId1.encodingByte = UA_NODEIDTYPE_TWOBYTE;
+	tmpNodeId1.identifier.numeric = 110;
+	tmpNodeId1.namespace =  0;
+	
+	Namespace_Entry_Lock *lock;
+	if(Namespace_get(ns0,&tmpNodeId1, &foundNode1,&lock) != UA_SUCCESS){
+		return UA_ERROR;
+	}
+
+	#ifdef RASPI
 	const UA_Node *foundNode2 = UA_NULL;
 	const UA_Node *foundNode3 = UA_NULL;
-	Namespace_Entry_Lock *lock;
 	//node which should be filled with data (float value)
-	UA_NodeId tmpNodeId1;
 	UA_NodeId tmpNodeId2;
 	UA_NodeId tmpNodeId3;
 
-	tmpNodeId1.encodingByte = UA_NODEIDTYPE_TWOBYTE;
-	tmpNodeId1.identifier.numeric = 110;
-	tmpNodeId1.namespace =  0;
-
 	tmpNodeId2.encodingByte = UA_NODEIDTYPE_TWOBYTE;
 	tmpNodeId2.identifier.numeric = 111;
 	tmpNodeId2.namespace =  0;
@@ -62,10 +67,6 @@ UA_Int32 serverCallback(void * arg) {
 	tmpNodeId3.identifier.numeric = 112;
 	tmpNodeId3.namespace =  0;
 
-	if(Namespace_get(ns0,&tmpNodeId1, &foundNode1,&lock) != UA_SUCCESS){
-		return UA_ERROR;
-	}
-
 	if(Namespace_get(ns0,&tmpNodeId2, &foundNode2,&lock) != UA_SUCCESS){
 		return UA_ERROR;
 	}
@@ -73,13 +74,11 @@ UA_Int32 serverCallback(void * arg) {
 	if(Namespace_get(ns0,&tmpNodeId2, &foundNode3,&lock) != UA_SUCCESS){
 		return UA_ERROR;
 	}
-
-	#ifdef RASPI
-		readTemp((float*)((UA_VariableNode *)foundNode1)->value.data);
-		writePin(*((UA_Boolean*)((UA_VariableNode *)foundNode2)->value.data),0);
-		writePin(*((UA_Boolean*)((UA_VariableNode *)foundNode3)->value.data),2);
+	readTemp((float*)((UA_VariableNode *)foundNode1)->value.data);
+	writePin(*((UA_Boolean*)((UA_VariableNode *)foundNode2)->value.data),0);
+	writePin(*((UA_Boolean*)((UA_VariableNode *)foundNode3)->value.data),2);
 	#else
-		*((float*)((UA_VariableNode *)foundNode1)->value.data) = *((float*)((UA_VariableNode *)foundNode1)->value.data) + 0.2f;
+	*((float*)((UA_VariableNode *)foundNode1)->value.data) = *((float*)((UA_VariableNode *)foundNode1)->value.data) + 0.2f;
 	#endif