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

Enable ACS Controller to command RWs #375

Merged
muellerr merged 30 commits from eggert/rw-cmd-acs-ctrl into develop 2023-02-14 18:53:02 +01:00
Conversation 1 Commits 30 Files Changed 15 +6 -5
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 51629da4a0 - Show all commits

11
mission/devices/devicedefinitions/RwDefinitions.h
View File

@ -82,7 +82,7 @@ enum SetIds : uint32_t {
STATUS_SET_ID = GET_RW_STATUS,
LAST_RESET_ID = GET_LAST_RESET_STATUS,
TM_SET_ID = GET_TM,
RW_SPEED = 10,
SPEED_CMD_SET = 10,
};
static const size_t SIZE_GET_RESET_STATUS = 5;
@ -204,13 +204,13 @@ class TmDataset : public StaticLocalDataSet<TM_SET_ENTRIES> {
};
class RwSpeedActuationSet : StaticLocalDataSet<4> {
friend class ::RwHandler;
friend class RwHandler;
public:
RwSpeedActuationSet(HasLocalDataPoolIF& owner)
: StaticLocalDataSet(&owner, RwDefinitions::SetIds::RW_SPEED) {}
: StaticLocalDataSet(&owner, RwDefinitions::SetIds::SPEED_CMD_SET) {}
RwSpeedActuationSet(object_id_t objectId)
: StaticLocalDataSet(sid_t(objectId, RwDefinitions::SetIds::RW_SPEED)) {}
: StaticLocalDataSet(sid_t(objectId, RwDefinitions::SetIds::SPEED_CMD_SET)) {}
void setRwSpeed(int32_t rwSpeed_) {
if (rwSpeed.value != rwSpeed_) {
@ -221,7 +221,8 @@ class RwSpeedActuationSet : StaticLocalDataSet<4> {
void getRwSpeed(int32_t& rwSpeed_) { rwSpeed_ = rwSpeed.value; }
private:
lp_var_t<int32_t> rwSpeed = lp_var_t<int32_t>(sid.objectId, RW_SPEED, this);
lp_var_t<int32_t> rwSpeed =
lp_var_t<int32_t>(sid.objectId, RwDefinitions::PoolIds::RW_SPEED, this);
};
} // namespace RwDefinitions