fixed bug

src/opcua/ua_server.cpp

@@ -310,8 +310,6 @@ static UA_StatusCode ua_write_DataSource(UA_Server *server,
         UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,"ua_write_DataSource: for translator class");
     }
 
-
-
     if (regname_is_for_translator) {
         // tr_* has only scalars
         if (data->hasValue) {
@@ -920,7 +918,7 @@ int ua_server_init(bool warm_start)
         UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "UA Server ns=%d for %s\n",
                     mUaLofarNameSpace,UA_LOFAR_NAMESPACE);
 
-        TermOutput termout;
+        // TermOutput termout;
         //vector<int> nodes = SD.unb->get_nodes(); // all nodes
 
         // UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "UA Server add nodes");

src/periph/fpga.cpp

@@ -97,7 +97,7 @@ Periph_fpga::Periph_fpga(UCP *ucp,
     registerMap->add_register("fpga/scrap_R",                                "-", scrap_span, "RO", REG_FORMAT_UINT32, 1);
     registerMap->add_register("fpga/scrap_W",                                "-", scrap_span, "RW", REG_FORMAT_UINT32, 1);
     
-    uint32_t weights_span = 187392/16;
+    uint32_t weights_span = 187392 / 16;  // = 11712
     registerMap->add_register("fpga/weights_R",                              "-", weights_span, "RO", REG_FORMAT_INT16, 1);
     registerMap->add_register("fpga/weights_W",                              "-", weights_span, "RW", REG_FORMAT_INT16, 1);
 
@@ -619,11 +619,19 @@ string Periph_fpga::read_design_name(UCP *ucp)
 {
     uint32_t data[20];
     memset((void *)data, 0, sizeof(data));
-    bool retval = Read(ucp, "mm/0/PIO_SYSTEM_INFO/design_name", data);
+    if (Read(ucp, "mm/0/PIO_SYSTEM_INFO/design_name", data)) {
         char *str_ptr = (char *)data;
         string name = string(str_ptr);
         //if (data != NULL) delete[] data;
-    return (retval ? name : "? (error)");
+        return name;
+    }
+    return "? (error)";
+
+    // bool retval = Read(ucp, "mm/0/PIO_SYSTEM_INFO/design_name", data);
+    // char *str_ptr = (char *)data;
+    // string name = string(str_ptr);
+    // //if (data != NULL) delete[] data;
+    // return (retval ? name : "? (error)");
 }
 
 string Periph_fpga::read_design_note(UCP *ucp)
@@ -747,7 +755,7 @@ bool Periph_fpga::read_fpga_scrap_R(UCP *ucp, TermOutput& termout, int format)
 {
     bool retval = true;
 
-    uint32_t nvalues = registerMap->getSpan("mm/0/RAM_SCRAP/data");
+    uint32_t nvalues = mmap->getSpan("mm/0/RAM_SCRAP/data");
     uint32_t *ptr = (uint32_t *)termout.val;
     retval = Read(ucp, "mm/0/RAM_SCRAP/data", ptr);
 
@@ -765,7 +773,7 @@ bool Periph_fpga::read_fpga_scrap_R(UCP *ucp, TermOutput& termout, int format)
 bool Periph_fpga::write_fpga_scrap_RW(UCP *ucp, uint32_t *data, uint nvalues)
 {
     cout << "Periph_fpga::write_fpga_scrap " << nvalues << " values" << endl;
-    uint32_t nvalues_chk = registerMap->getSpan("mm/0/RAM_SCRAP/data");
+    uint32_t nvalues_chk = mmap->getSpan("mm/0/RAM_SCRAP/data");
     if (nvalues > nvalues_chk) {
         nvalues = nvalues_chk;
     }
@@ -799,7 +807,7 @@ bool Periph_fpga::read_fpga_scrap_RW(TermOutput& termout, int format)
 bool Periph_fpga::read_fpga_weights_R(UCP *ucp, TermOutput& termout, int format)
 {
     bool retval = true;
-    uint32_t nvalues_scrap = registerMap->getSpan("mm/0/RAM_SCRAP/data");
+    uint32_t nvalues_scrap = mmap->getSpan("mm/0/RAM_SCRAP/data");
     uint nblocks = 48; // 11712/244=48
 
     uint32_t *data_scrap = new uint32_t[nvalues_scrap];
@@ -824,7 +832,7 @@ bool Periph_fpga::read_fpga_weights_R(UCP *ucp, TermOutput& termout, int format)
 bool Periph_fpga::write_fpga_weights_RW(UCP *ucp, const uint32_t *data, uint nvalues)
 {
     bool retval = false;
-    uint32_t nvalues_scrap = registerMap->getSpan("mm/0/RAM_SCRAP/data");
+    uint32_t nvalues_scrap = mmap->getSpan("mm/0/RAM_SCRAP/data");
     uint32_t nvalues_weights = registerMap->getSpan("fpga/weights_R");
     uint nblocks = 48; // 11712/244=48
     if (nvalues > nvalues_weights) {