Skip to content
Snippets Groups Projects
Commit 7deab450 authored by jsiegle's avatar jsiegle
Browse files

Add saveState to saveConfiguration command

parent c0e8db85
Branches
Tags
No related merge requests found
......@@ -110,6 +110,7 @@ RHD2000Thread::~RHD2000Thread()
if (deviceFound)
{
evalBoard->resetBoard();
evalBoard->resetFpga();
}
......@@ -235,6 +236,7 @@ void RHD2000Thread::initializeBoard()
bitfilename += "rhd2000.bit";
evalBoard->resetFpga();
evalBoard->resetBoard();
if (!uploadBitfile(bitfilename))
{
......@@ -276,12 +278,18 @@ void RHD2000Thread::initializeBoard()
;
}
// THIS DOESN'T SEEM TO HELP WITH OCCASIONAL CRASHES:
///std::cout << "Flushing the buffer" << std::endl;
// flush out everything from the buffer
//evalBoard->setMaxTimeStep(0);
//evalBoard->run();
//evalBoard->flush();
// Read the resulting single data block from the USB interface. We don't
// need to do anything with this, since it was only used for ADC calibration
Rhd2000DataBlock* dataBlock = new Rhd2000DataBlock(evalBoard->getNumEnabledDataStreams());
//Rhd2000DataBlock* dataBlock = new Rhd2000DataBlock(evalBoard->getNumEnabledDataStreams());
// evalBoard->readDataBlock(dataBlock);
// Now that ADC calibration has been performed, we switch to the command sequence
// that does not execute ADC calibration.
......
......@@ -1222,8 +1222,12 @@ bool Rhd2000EvalBoard::readDataBlock(Rhd2000DataBlock* dataBlock)
return false;
}
//std::cout << "Reading from PipeOut" << std::endl;
dev->ReadFromPipeOut(PipeOutData, numBytesToRead, usbBuffer);
// std::cout << "Filling data block from USB buffer" << std::endl;
dataBlock->fillFromUsbBuffer(usbBuffer, 0, numDataStreams);
return true;
......
......@@ -497,7 +497,7 @@ bool UIComponent::perform(const InvocationInfo& info)
{
currentConfigFile = fc.getResult();
std::cout << currentConfigFile.getFileName() << std::endl;
sendActionMessage(getEditorViewport()->saveState(currentConfigFile));
}
else
{
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment