KSat/fsfw
15
4
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests 1 Releases Wiki Activity

fixed some shadowing issues

Browse Source
This commit is contained in:
Robin Müller 2020-08-28 17:00:16 +02:00
parent 42dd665e26
commit 5ca26a72ea
4 changed files with 662 additions and 667 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
objectmanager/ObjectManager.cpp
View File

@ -100,7 +100,6 @@ void ObjectManager::initialize() {
} }
void ObjectManager::printList() { void ObjectManager::printList() {
std::map<object_id_t, SystemObjectIF*>::iterator it;
sif::debug << "ObjectManager: Object List contains:" << std::endl; sif::debug << "ObjectManager: Object List contains:" << std::endl;
for (auto const& it : objectList) { for (auto const& it : objectList) {
sif::debug << std::hex << it.first << " | " << it.second << std::endl; sif::debug << std::hex << it.first << " | " << it.second << std::endl;

1320
subsystem/Subsystem.cpp
View File

File diff suppressed because it is too large Load Diff

6
subsystem/Subsystem.h
View File

@ -92,7 +92,7 @@ protected:
bool childrenChangedHealth; bool childrenChangedHealth;
uint32_t uptimeStartTable; uint32_t uptimeStartTable = 0;
HybridIterator<ModeListEntry> currentTargetTable; HybridIterator<ModeListEntry> currentTargetTable;
@ -108,10 +108,10 @@ protected:
FixedMap<Mode_t, SequenceInfo> modeSequences; FixedMap<Mode_t, SequenceInfo> modeSequences;
StorageManagerIF *IPCStore; StorageManagerIF *IPCStore = nullptr;
#ifdef USE_MODESTORE #ifdef USE_MODESTORE
ModeStoreIF *modeStore; ModeStoreIF *modeStore = nullptr;
#endif #endif
bool existsModeSequence(Mode_t id); bool existsModeSequence(Mode_t id);

2
timemanager/CCSDSTime.cpp
View File

@ -119,7 +119,7 @@ ReturnValue_t CCSDSTime::convertFromCCS(Clock::TimeOfDay_t* to, const uint8_t* f
if (temp->pField & (1 << 3)) { //day of year variation if (temp->pField & (1 << 3)) { //day of year variation
uint16_t tempDay = (temp->month << 8) + temp->day; uint16_t tempDay = (temp->month << 8) + temp->day;
ReturnValue_t result = convertDaysOfYear(tempDay, to->year, result = convertDaysOfYear(tempDay, to->year,
&(temp->month), &(temp->day)); &(temp->month), &(temp->day));
if (result != RETURN_OK) { if (result != RETURN_OK) {
return result; return result;