all parameter requests implemented

This commit is contained in:
Jakob Meier
2022-02-10 18:39:37 +01:00
parent ac49f3f72b
commit c9e5fbc361
6 changed files with 664 additions and 95 deletions

View File

@ -355,7 +355,7 @@ static const DeviceCommandId_t REQ_POWER = 11;
static const DeviceCommandId_t TAKE_IMAGE = 15;
static const DeviceCommandId_t DOWNLOAD_CENTROID = 16;
static const DeviceCommandId_t UPLOAD_CENTROID = 17;
static const DeviceCommandId_t SUBSCRIBE_TO_TM = 18;
static const DeviceCommandId_t SUBSCRIPTION = 18;
static const DeviceCommandId_t IMAGE_PROCESSOR = 19;
static const DeviceCommandId_t REQ_SOLUTION = 24;
static const DeviceCommandId_t REQ_TEMPERATURE = 25;
@ -400,6 +400,9 @@ static const DeviceCommandId_t REQ_ALGO = 77;
static const DeviceCommandId_t REQ_SUBSCRIPTION = 78;
static const DeviceCommandId_t REQ_LOG_SUBSCRIPTION = 79;
static const DeviceCommandId_t REQ_DEBUG_CAMERA = 80;
static const DeviceCommandId_t LOGLEVEL = 81;
static const DeviceCommandId_t LOGSUBSCRIPTION = 82;
static const DeviceCommandId_t DEBUG_CAMERA = 83;
static const DeviceCommandId_t NONE = 0xFFFFFFFF;
static const uint32_t VERSION_SET_ID = REQ_VERSION;
@ -428,6 +431,7 @@ static const uint32_t VALIDATION_SET_ID = REQ_VALIDATION;
static const uint32_t ALGO_SET_ID = REQ_ALGO;
static const uint32_t SUBSCRIPTION_SET_ID = REQ_SUBSCRIPTION;
static const uint32_t LOG_SUBSCRIPTION_SET_ID = REQ_LOG_SUBSCRIPTION;
static const uint32_t DEBUG_CAMERA_SET_ID = REQ_DEBUG_CAMERA;
/** Max size of unencoded frame */
static const size_t MAX_FRAME_SIZE = 1200;
@ -1369,14 +1373,14 @@ class LimitsSet : public StaticLocalDataSet<LIMITS_SET_ENTRIES> {
/**
* @brief Will store the requested log level parameters
*/
class LogLevelSet : public StaticLocalDataSet<LIMITS_SET_ENTRIES> {
class LogLevelSet : public StaticLocalDataSet<LOG_LEVEL_SET_ENTRIES> {
public:
// Size of dataset
static const size_t SIZE = 16;
LogLevelSet(HasLocalDataPoolIF* owner) : StaticLocalDataSet(owner, LOG_LEVEL_SET_ENTRIES) {}
LogLevelSet(HasLocalDataPoolIF* owner) : StaticLocalDataSet(owner, LOG_LEVEL_SET_ID) {}
LogLevelSet(object_id_t objectId) : StaticLocalDataSet(sid_t(objectId, LOG_LEVEL_SET_ENTRIES)) {}
LogLevelSet(object_id_t objectId) : StaticLocalDataSet(sid_t(objectId, LOG_LEVEL_SET_ID)) {}
lp_var_t<uint8_t> loglevel1 = lp_var_t<uint8_t>(sid.objectId, PoolIds::LOGLEVEL1, this);
lp_var_t<uint8_t> loglevel2 = lp_var_t<uint8_t>(sid.objectId, PoolIds::LOGLEVEL2, this);
@ -1481,14 +1485,16 @@ class ImageProcessorSet : public StaticLocalDataSet<IMAGE_PROCESSOR_SET_ENTRIES>
lp_var_t<uint8_t>(sid.objectId, PoolIds::IMAGE_PROCESSOR_BACKGROUNDCOMPENSATION, this);
void printSet() {
sif::info << "ImageProcessorSet::printSet: mode: " << this->mode << std::endl;
sif::info << "ImageProcessorSet::printSet: store: " << this->store << std::endl;
sif::info << "ImageProcessorSet::printSet: mode: "
<< static_cast<unsigned int>(this->mode.value) << std::endl;
sif::info << "ImageProcessorSet::printSet: store: "
<< static_cast<unsigned int>(this->store.value) << std::endl;
sif::info << "ImageProcessorSet::printSet: signal threshold: " << this->signalThreshold
<< std::endl;
sif::info << "ImageProcessorSet::printSet: dark threshold: " << this->darkThreshold
<< std::endl;
sif::info << "ImageProcessorSet::printSet: background compensation: "
<< this->backgroundCompensation << std::endl;
<< static_cast<unsigned int>(this->backgroundCompensation.value) << std::endl;
}
};
@ -1532,7 +1538,8 @@ class CentroidingSet : public StaticLocalDataSet<CENTROIDING_PARAMS_SET_ENTRIES>
lp_var_t<float>(sid.objectId, PoolIds::CENTROIDING_TRANSMATRIX11, this);
void printSet() {
sif::info << "CentroidingSet::printSet: enable filter: " << this->enableFilter << std::endl;
sif::info << "CentroidingSet::printSet: enable filter: "
<< static_cast<unsigned int>(this->enableFilter.value) << std::endl;
sif::info << "CentroidingSet::printSet: max quality: " << this->maxQuality << std::endl;
sif::info << "CentroidingSet::printSet: dark threshold: " << this->darkThreshold << std::endl;
sif::info << "CentroidingSet::printSet: min quality: " << this->minQuality << std::endl;
@ -1604,8 +1611,10 @@ class LisaSet : public StaticLocalDataSet<LISA_SET_ENTRIES> {
<< std::endl;
sif::info << "LisaSet::printSet: rating weight db star count: " << this->ratingWeightDbStarCount
<< std::endl;
sif::info << "LisaSet::printSet: max combinations: " << this->maxCombinations << std::endl;
sif::info << "LisaSet::printSet: nr stars stop: " << this->nrStarsStop << std::endl;
sif::info << "LisaSet::printSet: max combinations: "
<< static_cast<unsigned int>(this->maxCombinations.value) << std::endl;
sif::info << "LisaSet::printSet: nr stars stop: "
<< static_cast<unsigned int>(this->nrStarsStop.value) << std::endl;
sif::info << "LisaSet::printSet: fraction close stop: " << this->fractionCloseStop << std::endl;
}
};
@ -1639,7 +1648,7 @@ class MatchingSet : public StaticLocalDataSet<MATCHING_SET_ENTRIES> {
class TrackingSet : public StaticLocalDataSet<TRACKING_SET_ENTRIES> {
public:
// Size of dataset
static const size_t SIZE = 16;
static const size_t SIZE = 13;
TrackingSet(HasLocalDataPoolIF* owner) : StaticLocalDataSet(owner, TRACKING_SET_ID) {}
@ -1648,13 +1657,16 @@ class TrackingSet : public StaticLocalDataSet<TRACKING_SET_ENTRIES> {
lp_var_t<float> thinLimit = lp_var_t<float>(sid.objectId, PoolIds::TRACKING_THIN_LIMIT, this);
lp_var_t<float> outlierThreshold = lp_var_t<float>(sid.objectId, PoolIds::TRACKING_OUTLIER_THRESHOLD, this);
lp_var_t<float> outlierThresholdQuest = lp_var_t<float>(sid.objectId, PoolIds::TRACKING_OUTLIER_THRESHOLD_QUEST, this);
lp_var_t<float> trackerChoice = lp_var_t<float>(sid.objectId, PoolIds::TRACKING_TRACKER_CHOICE, this);
lp_var_t<uint8_t> trackerChoice = lp_var_t<uint8_t>(sid.objectId, PoolIds::TRACKING_TRACKER_CHOICE, this);
void printSet() {
sif::info << "MatchingSet::printSet: squared distance limit: " << this->squaredDistanceLimit
sif::info << "TrackingSet::printSet: thin limit: " << this->thinLimit << std::endl;
sif::info << "TrackingSet::printSet: outlier threshold: " << this->outlierThreshold
<< std::endl;
sif::info << "MatchingSet::printSet: squared distance limit: " << this->squaredShiftLimit
sif::info << "TrackingSet::printSet: outlier threshold quest: " << this->outlierThresholdQuest
<< std::endl;
sif::info << "TrackingSet::printSet: tracker choice: "
<< static_cast<unsigned int>(this->trackerChoice.value) << std::endl;
}
};
@ -1681,12 +1693,12 @@ class ValidationSet : public StaticLocalDataSet<VALIDATION_SET_ENTRIES> {
void printSet() {
sif::info << "ValidationSet::printSet: stable count: "
<< static_cast<unsigned int>(this->stableCount) << std::endl;
<< static_cast<unsigned int>(this->stableCount.value) << std::endl;
sif::info << "ValidationSet::printSet: max difference: " << this->maxDifference << std::endl;
sif::info << "ValidationSet::printSet: min tracker confidence: " << this->minTrackerConfidence
<< std::endl;
sif::info << "ValidationSet::printSet: min matched stars: " << this->minMatchedStars
<< std::endl;
sif::info << "ValidationSet::printSet: min matched stars: "
<< static_cast<unsigned int>(this->minMatchedStars.value) << std::endl;
}
};
@ -1714,13 +1726,13 @@ class AlgoSet : public StaticLocalDataSet<ALGO_SET_ENTRIES> {
lp_var_t<uint8_t>(sid.objectId, PoolIds::ALGO_I2L_MIN_MATCHED, this);
void printSet() {
sif::info << "AlgoSet::printSet: mode: " << static_cast<unsigned int>(this->mode) << std::endl;
sif::info << "AlgoSet::printSet: mode: " << static_cast<unsigned int>(this->mode.value) << std::endl;
sif::info << "AlgoSet::printSet: i2t min confidence: " << this->i2tMinConfidence << std::endl;
sif::info << "AlgoSet::printSet: i2t min matched: "
<< static_cast<unsigned int>(this->i2tMinMatched) << std::endl;
<< static_cast<unsigned int>(this->i2tMinMatched.value) << std::endl;
sif::info << "AlgoSet::printSet: i2l min confidence: " << this->i2lMinConfidence << std::endl;
sif::info << "AlgoSet::printSet: i2l min matched: "
<< static_cast<unsigned int>(this->i2lMinMatched) << std::endl;
<< static_cast<unsigned int>(this->i2lMinMatched.value) << std::endl;
}
};
@ -1755,38 +1767,38 @@ class SubscriptionSet : public StaticLocalDataSet<SUBSCRIPTION_SET_ENTRIES> {
lp_var_t<uint8_t> tm16 = lp_var_t<uint8_t>(sid.objectId, PoolIds::SUBSCRIPTION_TM16, this);
void printSet() {
sif::info << "SubscriptionSet::printSet: telemetry 1: " << static_cast<unsigned int>(this->tm1)
<< std::endl;
sif::info << "SubscriptionSet::printSet: telemetry 2: " << static_cast<unsigned int>(this->tm2)
<< std::endl;
sif::info << "SubscriptionSet::printSet: telemetry 3: " << static_cast<unsigned int>(this->tm3)
<< std::endl;
sif::info << "SubscriptionSet::printSet: telemetry 4: " << static_cast<unsigned int>(this->tm4)
<< std::endl;
sif::info << "SubscriptionSet::printSet: telemetry 5: " << static_cast<unsigned int>(this->tm5)
<< std::endl;
sif::info << "SubscriptionSet::printSet: telemetry 6: " << static_cast<unsigned int>(this->tm6)
<< std::endl;
sif::info << "SubscriptionSet::printSet: telemetry 7: " << static_cast<unsigned int>(this->tm7)
<< std::endl;
sif::info << "SubscriptionSet::printSet: telemetry 8: " << static_cast<unsigned int>(this->tm8)
<< std::endl;
sif::info << "SubscriptionSet::printSet: telemetry 9: " << static_cast<unsigned int>(this->tm9)
<< std::endl;
sif::info << "SubscriptionSet::printSet: telemetry 1: "
<< static_cast<unsigned int>(this->tm1.value) << std::endl;
sif::info << "SubscriptionSet::printSet: telemetry 2: "
<< static_cast<unsigned int>(this->tm2.value) << std::endl;
sif::info << "SubscriptionSet::printSet: telemetry 3: "
<< static_cast<unsigned int>(this->tm3.value) << std::endl;
sif::info << "SubscriptionSet::printSet: telemetry 4: "
<< static_cast<unsigned int>(this->tm4.value) << std::endl;
sif::info << "SubscriptionSet::printSet: telemetry 5: "
<< static_cast<unsigned int>(this->tm5.value) << std::endl;
sif::info << "SubscriptionSet::printSet: telemetry 6: "
<< static_cast<unsigned int>(this->tm6.value) << std::endl;
sif::info << "SubscriptionSet::printSet: telemetry 7: "
<< static_cast<unsigned int>(this->tm7.value) << std::endl;
sif::info << "SubscriptionSet::printSet: telemetry 8: "
<< static_cast<unsigned int>(this->tm8.value) << std::endl;
sif::info << "SubscriptionSet::printSet: telemetry 9: "
<< static_cast<unsigned int>(this->tm9.value) << std::endl;
sif::info << "SubscriptionSet::printSet: telemetry 10: "
<< static_cast<unsigned int>(this->tm10) << std::endl;
<< static_cast<unsigned int>(this->tm10.value) << std::endl;
sif::info << "SubscriptionSet::printSet: telemetry 11: "
<< static_cast<unsigned int>(this->tm11) << std::endl;
<< static_cast<unsigned int>(this->tm11.value) << std::endl;
sif::info << "SubscriptionSet::printSet: telemetry 12: "
<< static_cast<unsigned int>(this->tm12) << std::endl;
<< static_cast<unsigned int>(this->tm12.value) << std::endl;
sif::info << "SubscriptionSet::printSet: telemetry 13: "
<< static_cast<unsigned int>(this->tm13) << std::endl;
<< static_cast<unsigned int>(this->tm13.value) << std::endl;
sif::info << "SubscriptionSet::printSet: telemetry 14: "
<< static_cast<unsigned int>(this->tm14) << std::endl;
<< static_cast<unsigned int>(this->tm14.value) << std::endl;
sif::info << "SubscriptionSet::printSet: telemetry 15: "
<< static_cast<unsigned int>(this->tm15) << std::endl;
<< static_cast<unsigned int>(this->tm15.value) << std::endl;
sif::info << "SubscriptionSet::printSet: telemetry 16: "
<< static_cast<unsigned int>(this->tm16) << std::endl;
<< static_cast<unsigned int>(this->tm16.value) << std::endl;
}
};
@ -1815,13 +1827,13 @@ class LogSubscriptionSet : public StaticLocalDataSet<LOG_SUBSCRIPTION_SET_ENTRIE
void printSet() {
sif::info << "LogSubscriptionSet::printSet: level 1: "
<< static_cast<unsigned int>(this->level1) << std::endl;
<< static_cast<unsigned int>(this->level1.value) << std::endl;
sif::info << "LogSubscriptionSet::printSet: module 1: "
<< static_cast<unsigned int>(this->module1) << std::endl;
<< static_cast<unsigned int>(this->module1.value) << std::endl;
sif::info << "LogSubscriptionSet::printSet: level 2: "
<< static_cast<unsigned int>(this->level2) << std::endl;
<< static_cast<unsigned int>(this->level2.value) << std::endl;
sif::info << "LogSubscriptionSet::printSet: module 2: "
<< static_cast<unsigned int>(this->module2) << std::endl;
<< static_cast<unsigned int>(this->module2.value) << std::endl;
}
};
@ -1845,8 +1857,8 @@ class DebugCameraSet : public StaticLocalDataSet<DEBUG_CAMERA_SET_ENTRIES> {
: StaticLocalDataSet(sid_t(objectId, DEBUG_CAMERA_SET_ID)) {}
void printSet() {
sif::info << "DebugCameraSet::printSet: level 1: " << this->timing << std::endl;
sif::info << "DebugCameraSet::printSet: module 1: " << this->test << std::endl;
sif::info << "DebugCameraSet::printSet: timing: " << this->timing << std::endl;
sif::info << "DebugCameraSet::printSet: test: " << this->test << std::endl;
}
};
} // namespace StarTracker