Merge branch 'FPGA_DSP_PIPE_HOOKUP' of https://github.com/EEVengers/DSO into FPGA_DSP_PIPE_HOOKUP

Software/waveview/scope_link/src/PCIe.cpp

@@ -167,8 +167,8 @@ void PCIeLink::Read(uint8_t* buff) {
     }
     last_chunk_read = current_chunk;
     int64_t reading_offset = current_chunk * (1 << 23);
-    INFO << "Reading from current current chunk: " << current_chunk;
-    INFO << "Offset: " << reading_offset;
+    //INFO << "Reading from current current chunk: " << current_chunk;
+    //INFO << "Offset: " << reading_offset;
     //Read the data from ddr3 memory
     _Read(c2h_0_handle,reading_offset,buff,1 << 23);
 }

Software/waveview/scope_link/src/bridge.cpp

@@ -208,7 +208,7 @@ void Bridge::TxJob() {
                 send(client_tx_sock,tx_buff,packet_size,0);
 #endif
                 //free the packet
-                free(currentPacket);
+                FreePacket(currentPacket);
         }
         // No more packets, sleep.
         std::this_thread::sleep_for(std::chrono::microseconds(500));

Software/waveview/scope_link/src/controller.cpp

@@ -1,7 +1,7 @@
 #include "controller.hpp"
 #include "logger.hpp"
 
-#define NOHARDWARE
+//#define NOHARDWARE
 
 //RampDemo Related
 int8_t RD_PACKET_ORIGINAL[RD_PACKET_SIZE];

Software/waveview/scope_link/src/logger.cpp

@@ -40,7 +40,7 @@ BOOST_LOG_GLOBAL_LOGGER_INIT(my_logger, logger_t)
 
     logging::core::get()->set_filter
     (
-        logging::trivial::severity >= logging::trivial::info
+        logging::trivial::severity >= logging::trivial::debug
     );
 
     return lg;

Software/waveview/src/components/graph/graph.tsx

@@ -16,7 +16,7 @@ import TestPoints from '../../util/testpoints';
 class Graph extends React.Component<any, any> {
   static instanceList: Graph[] = [];
   timerID: number = 0;
-  generator: TestPoints = new TestPoints(50, 50);
+  generator: TestPoints = new TestPoints(1000, 128);
 
   componentDidMount() {
     Graph.instanceList.push(this);