When reading from a file, don't try to recalibrate the actual hardware on

error.
This commit is contained in:
David Given
2019-02-12 20:43:15 +01:00
parent 2527ac2ce9
commit 10c838b4b7
2 changed files with 12 additions and 1 deletions

View File

@@ -68,6 +68,11 @@ std::unique_ptr<Fluxmap> CapturedReaderTrack::reallyRead()
return usbRead(side, revolutions);
}
void CapturedReaderTrack::recalibrate()
{
usbRecalibrate();
}
std::unique_ptr<Fluxmap> FileReaderTrack::reallyRead()
{
if (!indb)
@@ -78,6 +83,9 @@ std::unique_ptr<Fluxmap> FileReaderTrack::reallyRead()
return sqlReadFlux(indb, track, side);
}
void FileReaderTrack::recalibrate()
{}
std::vector<std::unique_ptr<ReaderTrack>> readTracks()
{
const DataSpec& dataSpec = source.value;
@@ -193,7 +201,7 @@ void readDiskCommand(
else
{
std::cout << retry << " retries remaining" << std::endl;
usbRecalibrate();
track->recalibrate();
}
}

View File

@@ -16,18 +16,21 @@ public:
std::unique_ptr<Fluxmap> read();
virtual std::unique_ptr<Fluxmap> reallyRead() = 0;
virtual void recalibrate() = 0;
};
class CapturedReaderTrack : public ReaderTrack
{
public:
std::unique_ptr<Fluxmap> reallyRead();
void recalibrate();
};
class FileReaderTrack : public ReaderTrack
{
public:
std::unique_ptr<Fluxmap> reallyRead();
void recalibrate();
};
extern void setReaderDefaultSource(const std::string& source);