Compare commits
12 Commits
7f6ba5f40b
...
move_seman
Author | SHA1 | Date | |
---|---|---|---|
6fa453940f | |||
9a8d775eb1 | |||
4d6f6e6b23 | |||
55f6825a03 | |||
c162acb7df | |||
87462afe6d | |||
a8de395ea0 | |||
f0bddfcb21 | |||
23d9b44b3e | |||
26e4445189 | |||
9ee3cdf729 | |||
1b7493f945 |
@@ -565,6 +565,9 @@ void DeviceHandlerBase::setMode(Mode_t newMode, uint8_t newSubmode) {
|
|||||||
*/
|
*/
|
||||||
if (newMode == MODE_ON and continueToNormal) {
|
if (newMode == MODE_ON and continueToNormal) {
|
||||||
continueToNormal = false;
|
continueToNormal = false;
|
||||||
|
// TODO: Check whether the following two lines are okay to do so.
|
||||||
|
transitionSourceMode = MODE_ON;
|
||||||
|
transitionSourceSubMode = submode;
|
||||||
mode = _MODE_TO_NORMAL;
|
mode = _MODE_TO_NORMAL;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@@ -15,12 +15,12 @@ const LocalPool::LocalPoolConfig EventManager::poolConfig = {
|
|||||||
{fsfwconfig::FSFW_EVENTMGMT_EVENTIDMATCHERS, sizeof(EventIdRangeMatcher)},
|
{fsfwconfig::FSFW_EVENTMGMT_EVENTIDMATCHERS, sizeof(EventIdRangeMatcher)},
|
||||||
{fsfwconfig::FSFW_EVENTMGMR_RANGEMATCHERS, sizeof(ReporterRangeMatcher)}};
|
{fsfwconfig::FSFW_EVENTMGMR_RANGEMATCHERS, sizeof(ReporterRangeMatcher)}};
|
||||||
|
|
||||||
EventManager::EventManager(object_id_t setObjectId)
|
EventManager::EventManager(object_id_t setObjectId, uint32_t eventQueueDepth)
|
||||||
: SystemObject(setObjectId), factoryBackend(0, poolConfig, false, true) {
|
: SystemObject(setObjectId), factoryBackend(0, poolConfig, false, true) {
|
||||||
mutex = MutexFactory::instance()->createMutex();
|
mutex = MutexFactory::instance()->createMutex();
|
||||||
auto mqArgs = MqArgs(setObjectId, static_cast<void*>(this));
|
auto mqArgs = MqArgs(setObjectId, static_cast<void*>(this));
|
||||||
eventReportQueue = QueueFactory::instance()->createMessageQueue(
|
eventReportQueue = QueueFactory::instance()->createMessageQueue(
|
||||||
MAX_EVENTS_PER_CYCLE, EventMessage::EVENT_MESSAGE_SIZE, &mqArgs);
|
eventQueueDepth, EventMessage::EVENT_MESSAGE_SIZE, &mqArgs);
|
||||||
}
|
}
|
||||||
|
|
||||||
EventManager::~EventManager() {
|
EventManager::~EventManager() {
|
||||||
|
@@ -21,9 +21,9 @@ extern const char* translateEvents(Event event);
|
|||||||
|
|
||||||
class EventManager : public EventManagerIF, public ExecutableObjectIF, public SystemObject {
|
class EventManager : public EventManagerIF, public ExecutableObjectIF, public SystemObject {
|
||||||
public:
|
public:
|
||||||
static const uint16_t MAX_EVENTS_PER_CYCLE = 80;
|
static const uint16_t DEFAULT_MAX_EVENTS_PER_CYCLE = 80;
|
||||||
|
|
||||||
EventManager(object_id_t setObjectId);
|
EventManager(object_id_t setObjectId, uint32_t eventQueueDepth);
|
||||||
virtual ~EventManager();
|
virtual ~EventManager();
|
||||||
|
|
||||||
void setMutexTimeout(MutexIF::TimeoutType timeoutType, uint32_t timeoutMs);
|
void setMutexTimeout(MutexIF::TimeoutType timeoutType, uint32_t timeoutMs);
|
||||||
|
@@ -1,5 +1,7 @@
|
|||||||
#include "DummyPowerSwitcher.h"
|
#include "DummyPowerSwitcher.h"
|
||||||
|
|
||||||
|
#include <utility>
|
||||||
|
|
||||||
DummyPowerSwitcher::DummyPowerSwitcher(object_id_t objectId, size_t numberOfSwitches,
|
DummyPowerSwitcher::DummyPowerSwitcher(object_id_t objectId, size_t numberOfSwitches,
|
||||||
size_t numberOfFuses, bool registerGlobally,
|
size_t numberOfFuses, bool registerGlobally,
|
||||||
uint32_t switchDelayMs)
|
uint32_t switchDelayMs)
|
||||||
@@ -9,11 +11,11 @@ DummyPowerSwitcher::DummyPowerSwitcher(object_id_t objectId, size_t numberOfSwit
|
|||||||
switchDelayMs(switchDelayMs) {}
|
switchDelayMs(switchDelayMs) {}
|
||||||
|
|
||||||
void DummyPowerSwitcher::setInitialSwitcherList(std::vector<ReturnValue_t> switcherList) {
|
void DummyPowerSwitcher::setInitialSwitcherList(std::vector<ReturnValue_t> switcherList) {
|
||||||
this->switcherList = switcherList;
|
this->switcherList = std::move(switcherList);
|
||||||
}
|
}
|
||||||
|
|
||||||
void DummyPowerSwitcher::setInitialFusesList(std::vector<ReturnValue_t> fuseList) {
|
void DummyPowerSwitcher::setInitialFusesList(std::vector<ReturnValue_t> fuseList) {
|
||||||
this->fuseList = fuseList;
|
this->fuseList = std::move(fuseList);
|
||||||
}
|
}
|
||||||
|
|
||||||
ReturnValue_t DummyPowerSwitcher::sendSwitchCommand(power::Switch_t switchNr, ReturnValue_t onOff) {
|
ReturnValue_t DummyPowerSwitcher::sendSwitchCommand(power::Switch_t switchNr, ReturnValue_t onOff) {
|
||||||
|
@@ -15,7 +15,8 @@ ReturnValue_t HostFilesystem::writeToFile(FileOpParams params, const uint8_t *da
|
|||||||
return returnvalue::FAILED;
|
return returnvalue::FAILED;
|
||||||
}
|
}
|
||||||
path path(params.path());
|
path path(params.path());
|
||||||
if (not exists(path)) {
|
std::error_code e;
|
||||||
|
if (not exists(path, e)) {
|
||||||
return HasFileSystemIF::FILE_DOES_NOT_EXIST;
|
return HasFileSystemIF::FILE_DOES_NOT_EXIST;
|
||||||
}
|
}
|
||||||
// This is equivalent to "r+" mode, which is what we need here. Only using ::out would truncate
|
// This is equivalent to "r+" mode, which is what we need here. Only using ::out would truncate
|
||||||
@@ -35,7 +36,8 @@ ReturnValue_t HostFilesystem::readFromFile(FileOpParams params, uint8_t **buffer
|
|||||||
return returnvalue::FAILED;
|
return returnvalue::FAILED;
|
||||||
}
|
}
|
||||||
path path(params.path());
|
path path(params.path());
|
||||||
if (not exists(path)) {
|
std::error_code e;
|
||||||
|
if (not exists(path, e)) {
|
||||||
return HasFileSystemIF::FILE_DOES_NOT_EXIST;
|
return HasFileSystemIF::FILE_DOES_NOT_EXIST;
|
||||||
}
|
}
|
||||||
ifstream file(path);
|
ifstream file(path);
|
||||||
@@ -59,7 +61,8 @@ ReturnValue_t HostFilesystem::createFile(FilesystemParams params, const uint8_t
|
|||||||
return returnvalue::FAILED;
|
return returnvalue::FAILED;
|
||||||
}
|
}
|
||||||
path path(params.path);
|
path path(params.path);
|
||||||
if (exists(path)) {
|
std::error_code e;
|
||||||
|
if (exists(path, e)) {
|
||||||
return HasFileSystemIF::FILE_ALREADY_EXISTS;
|
return HasFileSystemIF::FILE_ALREADY_EXISTS;
|
||||||
}
|
}
|
||||||
ofstream file(path);
|
ofstream file(path);
|
||||||
@@ -74,7 +77,8 @@ ReturnValue_t HostFilesystem::removeFile(const char *path_, FileSystemArgsIF *ar
|
|||||||
return returnvalue::FAILED;
|
return returnvalue::FAILED;
|
||||||
}
|
}
|
||||||
path path(path_);
|
path path(path_);
|
||||||
if (not exists(path)) {
|
std::error_code e;
|
||||||
|
if (not exists(path, e)) {
|
||||||
return HasFileSystemIF::FILE_DOES_NOT_EXIST;
|
return HasFileSystemIF::FILE_DOES_NOT_EXIST;
|
||||||
}
|
}
|
||||||
if (remove(path, errorCode)) {
|
if (remove(path, errorCode)) {
|
||||||
@@ -89,7 +93,8 @@ ReturnValue_t HostFilesystem::createDirectory(FilesystemParams params, bool crea
|
|||||||
}
|
}
|
||||||
path dirPath(params.path);
|
path dirPath(params.path);
|
||||||
|
|
||||||
if (exists(dirPath)) {
|
std::error_code e;
|
||||||
|
if (exists(dirPath, e)) {
|
||||||
return HasFileSystemIF::DIRECTORY_ALREADY_EXISTS;
|
return HasFileSystemIF::DIRECTORY_ALREADY_EXISTS;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -110,7 +115,8 @@ ReturnValue_t HostFilesystem::removeDirectory(FilesystemParams params, bool dele
|
|||||||
return returnvalue::FAILED;
|
return returnvalue::FAILED;
|
||||||
}
|
}
|
||||||
path dirPath(params.path);
|
path dirPath(params.path);
|
||||||
if (not exists(dirPath)) {
|
std::error_code e;
|
||||||
|
if (not exists(dirPath, e)) {
|
||||||
return HasFileSystemIF::DIRECTORY_DOES_NOT_EXIST;
|
return HasFileSystemIF::DIRECTORY_DOES_NOT_EXIST;
|
||||||
}
|
}
|
||||||
if (is_regular_file(dirPath)) {
|
if (is_regular_file(dirPath)) {
|
||||||
@@ -149,12 +155,14 @@ ReturnValue_t HostFilesystem::rename(const char *oldPath_, const char *newPath_,
|
|||||||
|
|
||||||
bool HostFilesystem::fileExists(FilesystemParams params) {
|
bool HostFilesystem::fileExists(FilesystemParams params) {
|
||||||
path path(params.path);
|
path path(params.path);
|
||||||
return filesystem::exists(path);
|
std::error_code e;
|
||||||
|
return filesystem::exists(path, e);
|
||||||
}
|
}
|
||||||
|
|
||||||
ReturnValue_t HostFilesystem::truncateFile(FilesystemParams params) {
|
ReturnValue_t HostFilesystem::truncateFile(FilesystemParams params) {
|
||||||
path path(params.path);
|
path path(params.path);
|
||||||
if (not filesystem::exists(path)) {
|
std::error_code e;
|
||||||
|
if (not filesystem::exists(path, e)) {
|
||||||
return FILE_DOES_NOT_EXIST;
|
return FILE_DOES_NOT_EXIST;
|
||||||
}
|
}
|
||||||
ofstream of(path);
|
ofstream of(path);
|
||||||
|
@@ -17,7 +17,7 @@ ReturnValue_t CommandExecutor::load(std::string command, bool blocking, bool pri
|
|||||||
return COMMAND_PENDING;
|
return COMMAND_PENDING;
|
||||||
}
|
}
|
||||||
|
|
||||||
currentCmd = command;
|
currentCmd = std::move(command);
|
||||||
this->blocking = blocking;
|
this->blocking = blocking;
|
||||||
this->printOutput = printOutput;
|
this->printOutput = printOutput;
|
||||||
if (state == States::IDLE) {
|
if (state == States::IDLE) {
|
||||||
|
@@ -112,7 +112,7 @@ ReturnValue_t I2cComIF::sendMessage(CookieIF* cookie, const uint8_t* sendData, s
|
|||||||
if (i2cCookie->errorCounter < 3) {
|
if (i2cCookie->errorCounter < 3) {
|
||||||
#if FSFW_CPP_OSTREAM_ENABLED == 1
|
#if FSFW_CPP_OSTREAM_ENABLED == 1
|
||||||
sif::error << "I2cComIF::sendMessage: Failed to send data to I2C "
|
sif::error << "I2cComIF::sendMessage: Failed to send data to I2C "
|
||||||
"device with error code "
|
"device from " << deviceFile << " with error code "
|
||||||
<< errno << ". Error description: " << strerror(errno) << std::endl;
|
<< errno << ". Error description: " << strerror(errno) << std::endl;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user