7
mirror of https://github.com/EEVengers/ThunderScope.git synced 2025-04-08 06:25:30 +00:00

Added defines around pcie stuff for NOHARDWARE

This commit is contained in:
Alex 2021-03-24 09:35:28 -07:00
parent 48c28edc28
commit b18a3afb6f
3 changed files with 10 additions and 3 deletions
Software/waveview

View File

@ -42,6 +42,8 @@ if(MSVC)
add_definitions(-DNOGDI)
endif()
add_definitions(-DNOHARDWARE)
add_executable(${PROJECT_NAME} ${SOURCES})
target_link_libraries(${PROJECT_NAME} ${LIBRARIES} ${Boost_LIBRARIES})

View File

@ -1,8 +1,6 @@
#include "controller.hpp"
#include "logger.hpp"
//#define NOHARDWARE
//RampDemo Related
int8_t RD_PACKET_ORIGINAL[RD_PACKET_SIZE];
@ -24,7 +22,10 @@ controller::controller(boost::lockfree::queue<buffer*, boost::lockfree::fixed_si
triggerThread = new Trigger(dataQueue, &triggerProcessorQueue, triggerLevel);
processorThread = new Processor(&triggerProcessorQueue, &processorPostProcessorQueue_1);
postProcessorThread = new postProcessor(&processorPostProcessorQueue_1, &controllerQueue_tx);
#ifndef NOHARDWARE
pcieLinkThread = new PCIeLink(dataQueue);
#endif
// set default values
setCh(1);
@ -428,7 +429,9 @@ void controller::controllerPause()
processorThread->processorPause();
triggerThread->triggerPause();
postProcessorThread->postProcessorPause();
#ifndef NOHARDWARE
pcieLinkThread->Pause();
#endif
}
/*******************************************************************************
@ -448,7 +451,9 @@ void controller::controllerUnPause()
processorThread->processorUnpause();
triggerThread->triggerUnpause();
postProcessorThread->postProcessorUnpause();
#ifndef NOHARDWARE
pcieLinkThread->UnPause();
#endif
}
/*******************************************************************************

View File

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