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

reply handling for sensor data implemented

Browse Source
This commit is contained in:
Robin Müller
2021-05-24 21:15:23 +02:00
committed by Robin Mueller
parent 853a22c55a
commit 9ca10f5a8e
2 changed files with 51 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mission/devices/devicedefinitions/GyroADIS16507Definitions.h
View File

@ -58,6 +58,7 @@ enum PrimaryPoolIds: lp_id_t {
};
enum ConfigPoolIds: lp_id_t {
DIAG_STAT_REGISTER,
FILTER_SETTINGS,
MSC_CTRL_REGISTER,
DEC_RATE_REGISTER,
@ -75,7 +76,7 @@ enum FilterSettings: uint8_t {
}
class AdisGyroPrimaryDataset: public StaticLocalDataSet<7 * sizeof(float)> {
class AdisGyroPrimaryDataset: public StaticLocalDataSet<8> {
public:
/** Constructor for data users like controllers */
@ -107,7 +108,7 @@ private:
StaticLocalDataSet(hkOwner, ADIS16507::ADIS_DATASET_ID) {}
};
class AdisGyroConfigDataset: public StaticLocalDataSet<32> {
class AdisGyroConfigDataset: public StaticLocalDataSet<5> {
public:
/** Constructor for data users like controllers */
@ -116,6 +117,7 @@ public:
setAllVariablesReadOnly();
}
lp_var_t<uint16_t> diagStatReg = lp_var_t<uint16_t>(sid.objectId, ADIS16507::DIAG_STAT_REG);
lp_var_t<uint8_t> filterSetting = lp_var_t<uint8_t>(sid.objectId, ADIS16507::FILTER_SETTINGS);
lp_var_t<uint16_t> mscCtrlReg = lp_var_t<uint16_t>(sid.objectId, ADIS16507::MSC_CTRL_REGISTER);
lp_var_t<uint16_t> decRateReg = lp_var_t<uint16_t>(sid.objectId, ADIS16507::DEC_RATE_REGISTER);