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

v1.10.0 #220

Merged
meierj merged 592 commits from develop into main 2022-04-22 07:42:20 +02:00
Conversation 0 Commits 592 Files Changed 218 +12 -1
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 25c3f39c82 - Show all commits

7
linux/devices/startracker/StarTrackerHandler.cpp
View File

@ -1223,6 +1223,13 @@ ReturnValue_t StarTrackerHandler::doSendReadHook() {
return RETURN_OK; return RETURN_OK;
} }
ReturnValue_t StarTrackerHandler::getSwitches(const uint8_t** switches,
uint8_t* numberOfSwitches) {
*numberOfSwitches = 1;
*switches = &powerSwitch;
return RETURN_OK;
}
ReturnValue_t StarTrackerHandler::checkMode(ActionId_t actionId) { ReturnValue_t StarTrackerHandler::checkMode(ActionId_t actionId) {
switch (actionId) { switch (actionId) {
case startracker::UPLOAD_IMAGE: case startracker::UPLOAD_IMAGE:

4
linux/devices/startracker/StarTrackerHandler.h
View File

@ -12,6 +12,7 @@
#include "fsfw/timemanager/Countdown.h" #include "fsfw/timemanager/Countdown.h"
#include "linux/devices/devicedefinitions/StarTrackerDefinitions.h" #include "linux/devices/devicedefinitions/StarTrackerDefinitions.h"
#include "thirdparty/arcsec_star_tracker/common/SLIP.h" #include "thirdparty/arcsec_star_tracker/common/SLIP.h"
#include "devices/powerSwitcherList.h"
/** /**
* @brief This is the device handler for the star tracker from arcsec. * @brief This is the device handler for the star tracker from arcsec.
@ -75,6 +76,7 @@ class StarTrackerHandler : public DeviceHandlerBase {
*/ */
virtual size_t getNextReplyLength(DeviceCommandId_t deviceCommand) override; virtual size_t getNextReplyLength(DeviceCommandId_t deviceCommand) override;
virtual ReturnValue_t doSendReadHook() override; virtual ReturnValue_t doSendReadHook() override;
ReturnValue_t getSwitches(const uint8_t** switches, uint8_t* numberOfSwitches) override;
virtual void doTransition(Mode_t modeFrom, Submode_t subModeFrom) override; virtual void doTransition(Mode_t modeFrom, Submode_t subModeFrom) override;
private: private:
@ -268,6 +270,8 @@ class StarTrackerHandler : public DeviceHandlerBase {
bool strHelperExecuting = false; bool strHelperExecuting = false;
const power::Switch_t powerSwitch = pcduSwitches::PDU1_CH2_STAR_TRACKER_5V;
/** /**
* @brief Handles internal state * @brief Handles internal state
*/ */

2
tmtc

@ -1 +1 @@
Subproject commit 6db0a2cb791909a69506ed56df5518c277ece275 Subproject commit ed85e1706f818ec652285b57a31b113f60128f70