Merge branch 'master' into L2SDP-534

src/periph/fpga.cpp

@@ -61,7 +61,7 @@ extern int debug;
 Periph_fpga::Periph_fpga(uint global_nr, string ipaddr, uint n_beamsets):
     GlobalNr(global_nr),
     nBeamsets(n_beamsets),
-    Masked(false),
+    Masked(true),
     Online(false),
     my_current_design_name("-"),
     my_current_hw_version(0),
@@ -137,7 +137,7 @@ bool Periph_fpga::read(TermOutput& termout, const string addr,
         return false;
     }
     if (!Online) {  // Selected but not possible
-        cout << "read() error node " << GlobalNr << " not enabled or not online" << endl;
+        cout << "read() error node " << GlobalNr << " not online" << endl;
         return false;
     }
     if (mmap->empty()) {
@@ -377,7 +377,7 @@ bool Periph_fpga::write(TermOutput& termout, const string addr, const string typ
         return false;
     }
     if (!Online) {  // Selected but not possible
-        cout << "write() error node " << GlobalNr << " not enabled or not online" << endl;
+        cout << "write() error node " << GlobalNr << " not online" << endl;
         return false;
     }
     if (mmap->empty()) {
@@ -748,7 +748,6 @@ bool Periph_fpga::read_system_info(TermOutput& termout)
         }
         cout << "node " << GlobalNr << " no response" << endl;
         Online = false;
-        Masked = false;
         mmap->clear();
         return false;
     }
@@ -761,7 +760,6 @@ bool Periph_fpga::read_system_info(TermOutput& termout)
             cout << "new mmap for node " << GlobalNr << endl;
             mmap->print_screen();
             Online = true;
-            Masked = true;
             my_current_design_name = read_design_name();
             cout << "node " << GlobalNr << " now active design_name = " << my_current_design_name << endl;
         }