eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 1 Releases 121 Wiki Activity

bug fixes in star tracker handler
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Jakob Meier
2022-01-17 08:40:56 +01:00
parent 470e834b80
commit 952dfde5b7
9 changed files with 160 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bsp_q7s/core/obsw.cpp
View File

@ -29,7 +29,7 @@ int obsw::obsw() {
// or systemd service!
if(std::filesystem::exists(watchdog::RUNNING_FILE_NAME)) {
sif::warning << "File " << watchdog::RUNNING_FILE_NAME << " exists so the software might "
"already be running. Aborting.." << std::endl;
"already be running. Check if obsw systemd service has been stopped." << std::endl;
return OBSW_ALREADY_RUNNING;
}
#endif

26
bsp_q7s/devices/startracker/StarTrackerDefinitions.h
View File

@ -396,7 +396,7 @@ public:
void printSet() {
PoolReadGuard rg(this);
sif::info << "VersionSet::printSet: Ticks: "
<< this->ticks << std::endl;
<< std::dec << this->ticks << std::endl;
sif::info << "VersionSet::printSet: Unix Time: "
<< this->time << " us" << std::endl;
sif::info << "VersionSet::printSet: Program: "
@ -1018,7 +1018,7 @@ class DownloadCentroidSet:
public:
// Size of dataset
static const size_t SIZE = 34;
static const size_t SIZE = 38;
DownloadCentroidSet(HasLocalDataPoolIF* owner):
StaticLocalDataSet(owner, DOWNLOADCENTROID_SET_ID) {
@ -1042,18 +1042,18 @@ public:
void printSet() {
PoolReadGuard rg(this);
sif::info << "ContrastSet::printSet: id: " << static_cast<unsigned int>(this->id.value)
sif::info << "DownloadCentroidSet::printSet: id: " << static_cast<unsigned int>(this->id.value)
<< std::endl;
sif::info << "ContrastSet::printSet: pixx: " << this->pixx << std::endl;
sif::info << "ContrastSet::printSet: pixy: " << this->pixy << std::endl;
sif::info << "ContrastSet::printSet: xUncorrected: " << this->xUncorrected << std::endl;
sif::info << "ContrastSet::printSet: yUncorrected: " << this->yUncorrected << std::endl;
sif::info << "ContrastSet::printSet: xCorrected: " << this->xCorrected << std::endl;
sif::info << "ContrastSet::printSet: yCorrected: " << this->yCorrected << std::endl;
sif::info << "ContrastSet::printSet: magnitude: " << this->magnitude << std::endl;
sif::info << "ContrastSet::printSet: cxa: " << this->cxa << std::endl;
sif::info << "ContrastSet::printSet: cya: " << this->cya << std::endl;
sif::info << "ContrastSet::printSet: quality: " << this->quality << std::endl;
sif::info << "DownloadCentroidSet::printSet: pixx: " << this->pixx << std::endl;
sif::info << "DownloadCentroidSet::printSet: pixy: " << this->pixy << std::endl;
sif::info << "DownloadCentroidSet::printSet: xUncorrected: " << this->xUncorrected << std::endl;
sif::info << "DownloadCentroidSet::printSet: yUncorrected: " << this->yUncorrected << std::endl;
sif::info << "DownloadCentroidSet::printSet: xCorrected: " << this->xCorrected << std::endl;
sif::info << "DownloadCentroidSet::printSet: yCorrected: " << this->yCorrected << std::endl;
sif::info << "DownloadCentroidSet::printSet: magnitude: " << this->magnitude << std::endl;
sif::info << "DownloadCentroidSet::printSet: cxa: " << this->cxa << std::endl;
sif::info << "DownloadCentroidSet::printSet: cya: " << this->cya << std::endl;
sif::info << "DownloadCentroidSet::printSet: quality: " << this->quality << std::endl;
}
};

2
bsp_q7s/devices/startracker/StrHelper.cpp
View File

@ -125,7 +125,7 @@ ReturnValue_t StrHelper::startImageUpload(std::string fullname) {
if(not std::filesystem::exists(fullname)) {
return FILE_NOT_EXISTS;
}
internalState = InternalState::UPLOAD_FPGA_IMAGE;
internalState = InternalState::UPLOAD_IMAGE;
semaphore.release();
terminate = false;
return RETURN_OK;