Browse Source

tweaking blacklist, code generator and cmake for ns0 generation

Stasik0 9 years ago
parent
commit
282d947a2b

+ 1 - 1
CMakeLists.txt

@@ -142,7 +142,7 @@ add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/src_generated/ua_namespaceinit_g
                            ${PROJECT_SOURCE_DIR}/tools/pyUANamespace/ua_node_types.py)
 
 list(APPEND internal_headers ${PROJECT_BINARY_DIR}/src_generated/ua_namespaceinit_generated.h)
-list(APPEND lib_sources ${PROJECT_SOURCE_DIR}/src_generated/ua_namespaceinit_generated.c)
+list(APPEND lib_sources ${PROJECT_BINARY_DIR}/src_generated/ua_namespaceinit_generated.c)
 endif()
 
 ## logging

+ 19 - 1
tools/pyUANamespace/NodeID_AssumeExternal.txt

@@ -1,11 +1,29 @@
+i=2253
 i=2254
 i=2255
 i=2256
+i=2257
+i=2258
+i=2259
+i=2260
+i=2261
+i=2262
+i=2263
+i=2264
+i=2265
+i=2266
 i=2267
+i=2271
+i=2274
+i=2292
+i=2294
+i=2735
+i=2992
+i=2993
 i=2994
 i=2268
 i=274
 i=295
 i=296
 i=11715
-i=11492
+i=11492

+ 4 - 4
tools/pyUANamespace/ua_node_types.py

@@ -938,8 +938,8 @@ class opcua_node_variable_t(opcua_node_t):
 
     if self.historizing():
       code.append(self.getCodePrintableID() + "->historizing = UA_TRUE;")
-    else:
-      code.append(self.getCodePrintableID() + "->historizing = UA_FALSE;")
+    #else:
+      #code.append(self.getCodePrintableID() + "->historizing = UA_FALSE;")
 
     code.append(self.getCodePrintableID() + "->minimumSamplingInterval = (UA_Double) " + str(self.minimumSamplingInterval()) + ";")
     code.append(self.getCodePrintableID() + "->userAccessLevel = (UA_Int32) " + str(self.userAccessLevel()) + ";")
@@ -1044,8 +1044,8 @@ class opcua_node_objectType_t(opcua_node_t):
 
     if (self.isAbstract()):
       code.append(self.getCodePrintableID() + "->isAbstract = UA_TRUE;")
-    else:
-      code.append(self.getCodePrintableID() + "->isAbstract = UA_FALSE;")
+    #else:
+    #  code.append(self.getCodePrintableID() + "->isAbstract = UA_FALSE;")
 
     return code