This commit is contained in:
parent
409631fb0a
commit
2386944ed8
@ -314,35 +314,6 @@ ReturnValue_t ScexDeviceHandler::initializeLocalDataPool(localpool::DataPool& lo
|
|||||||
return OK;
|
return OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string ScexDeviceHandler::date_time_string() {
|
|
||||||
using namespace std;
|
|
||||||
string date_time;
|
|
||||||
Clock::TimeOfDay_t tod;
|
|
||||||
Clock::getDateAndTime(&tod);
|
|
||||||
ostringstream oss(std::ostringstream::ate);
|
|
||||||
|
|
||||||
if (tod.hour < 10) {
|
|
||||||
oss << tod.year << tod.month << tod.day << "T0" << tod.hour;
|
|
||||||
} else {
|
|
||||||
oss << tod.year << tod.month << tod.day << "T" << tod.hour;
|
|
||||||
}
|
|
||||||
if (tod.minute < 10) {
|
|
||||||
oss << 0 << tod.minute;
|
|
||||||
|
|
||||||
} else {
|
|
||||||
oss << tod.minute;
|
|
||||||
}
|
|
||||||
if (tod.second < 10) {
|
|
||||||
oss << 0 << tod.second;
|
|
||||||
} else {
|
|
||||||
oss << tod.second;
|
|
||||||
}
|
|
||||||
|
|
||||||
date_time = oss.str();
|
|
||||||
|
|
||||||
return date_time;
|
|
||||||
}
|
|
||||||
|
|
||||||
ReturnValue_t ScexDeviceHandler::generateNewScexFile(const char* cmdName) {
|
ReturnValue_t ScexDeviceHandler::generateNewScexFile(const char* cmdName) {
|
||||||
char timeString[64]{};
|
char timeString[64]{};
|
||||||
auto activeSd = sdcMan.getActiveSdCard();
|
auto activeSd = sdcMan.getActiveSdCard();
|
||||||
@ -378,8 +349,6 @@ ReturnValue_t ScexDeviceHandler::generateNewScexFile(const char* cmdName) {
|
|||||||
return OK;
|
return OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
void ScexDeviceHandler::modeChanged() {}
|
|
||||||
|
|
||||||
void ScexDeviceHandler::setPowerSwitcher(PowerSwitchIF& powerSwitcher, power::Switch_t switchId) {
|
void ScexDeviceHandler::setPowerSwitcher(PowerSwitchIF& powerSwitcher, power::Switch_t switchId) {
|
||||||
DeviceHandlerBase::setPowerSwitcher(&powerSwitcher);
|
DeviceHandlerBase::setPowerSwitcher(&powerSwitcher);
|
||||||
this->switchId = switchId;
|
this->switchId = switchId;
|
||||||
|
@ -43,8 +43,6 @@ class ScexDeviceHandler : public DeviceHandlerBase {
|
|||||||
SdCardMountedIF &sdcMan;
|
SdCardMountedIF &sdcMan;
|
||||||
Countdown finishCountdown = Countdown(LONG_CD);
|
Countdown finishCountdown = Countdown(LONG_CD);
|
||||||
|
|
||||||
std::string date_time_string();
|
|
||||||
|
|
||||||
// DeviceHandlerBase private function implementation
|
// DeviceHandlerBase private function implementation
|
||||||
void doStartUp() override;
|
void doStartUp() override;
|
||||||
void doShutDown() override;
|
void doShutDown() override;
|
||||||
@ -67,8 +65,8 @@ class ScexDeviceHandler : public DeviceHandlerBase {
|
|||||||
ReturnValue_t initializeLocalDataPool(localpool::DataPool &localDataPoolMap,
|
ReturnValue_t initializeLocalDataPool(localpool::DataPool &localDataPoolMap,
|
||||||
LocalDataPoolManager &poolManager) override;
|
LocalDataPoolManager &poolManager) override;
|
||||||
ReturnValue_t initializeAfterTaskCreation() override;
|
ReturnValue_t initializeAfterTaskCreation() override;
|
||||||
|
|
||||||
ReturnValue_t generateNewScexFile(const char *cmdName);
|
ReturnValue_t generateNewScexFile(const char *cmdName);
|
||||||
void modeChanged() override;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif /* MISSION_PAYLOAD_SCEXDEVICEHANDLER_H_ */
|
#endif /* MISSION_PAYLOAD_SCEXDEVICEHANDLER_H_ */
|
||||||
|
Loading…
x
Reference in New Issue
Block a user