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 +500 -366
42 changed files with 500 additions and 366 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1de832509a - Show all commits

4
mission/devices/ImtqHandler.cpp
View File

@@ -192,6 +192,10 @@ ReturnValue_t ImtqHandler::buildCommandFromCommand(DeviceCommandId_t deviceComma
if (result != returnvalue::OK) { if (result != returnvalue::OK) {
return result; return result;
} }
result = dipoleSet.commit();
if (result != returnvalue::OK) {
sif::error << "ImtqHandler::buildCommandFromCommand: commit failed" << std::endl;
}
} else { } else {
// Read set dipole values from local pool // Read set dipole values from local pool
PoolReadGuard pg(&dipoleSet); PoolReadGuard pg(&dipoleSet);

5
mission/devices/RwHandler.cpp
View File

@@ -102,7 +102,6 @@ ReturnValue_t RwHandler::buildCommandFromCommand(DeviceCommandId_t deviceCommand
return returnvalue::OK; return returnvalue::OK;
} }
case (RwDefinitions::SET_SPEED): { case (RwDefinitions::SET_SPEED): {
sif::debug << "hello" << std::endl;
if (commandData != nullptr && commandDataLen != 6) { if (commandData != nullptr && commandDataLen != 6) {
sif::error << "RwHandler::buildCommandFromCommand: Received set speed command with" sif::error << "RwHandler::buildCommandFromCommand: Received set speed command with"
<< " invalid length" << std::endl; << " invalid length" << std::endl;
@@ -117,6 +116,10 @@ ReturnValue_t RwHandler::buildCommandFromCommand(DeviceCommandId_t deviceCommand
if (result != returnvalue::OK) { if (result != returnvalue::OK) {
return result; return result;
} }
result = rwSpeedActuationSet.commit();
if (result != returnvalue::OK) {
sif::error << "RwHandler::buildCommandFromCommand: commit failed" << std::endl;
}
} else { } else {
// Read set rw speed value from local pool // Read set rw speed value from local pool
PoolReadGuard pg(&rwSpeedActuationSet); PoolReadGuard pg(&rwSpeedActuationSet);