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

meier/pdec #110

Merged
muellerr merged 10 commits from meier/pdec into develop 2021-11-19 12:49:37 +01:00
Conversation 0 Commits 10 Files Changed 20 +4 -3
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9e9a19ebb0 - Show all commits

2
linux/obc/PdecHandler.cpp
View File

@ -438,7 +438,7 @@ void PdecHandler::getClcw() {
#if OBSW_DEBUG_PDEC_HANDLER == 1 #if OBSW_DEBUG_PDEC_HANDLER == 1
uint32_t clcw = *(registerBaseAddress + PDEC_CLCW_OFFSET); uint32_t clcw = *(registerBaseAddress + PDEC_CLCW_OFFSET);
if (debugDivider == 5) { if (debugDivider == 10) {
printClcw(clcw); printClcw(clcw);
debugDivider = 0; debugDivider = 0;
return; return;

1
linux/obc/PdecHandler.h
View File

@ -106,6 +106,7 @@ private:
static const uint32_t PDEC_BFREE_OFFSET = 0xA24; static const uint32_t PDEC_BFREE_OFFSET = 0xA24;
static const uint32_t PDEC_BPTR_OFFSET = 0xA25; static const uint32_t PDEC_BPTR_OFFSET = 0xA25;
static const uint32_t PDEC_SLEN_OFFSET = 0xA26; static const uint32_t PDEC_SLEN_OFFSET = 0xA26;
static const uint32_t PDEC_MON = 0xA27;
#if BOARD_TE0720 == 1 #if BOARD_TE0720 == 1
static const int CONFIG_MEMORY_MAP_SIZE = 0x400; static const int CONFIG_MEMORY_MAP_SIZE = 0x400;

2
linux/obc/PtmeConfig.h
View File

@ -22,7 +22,7 @@ namespace PtmeConfig {
#if BOARD_TE0720 == 0 #if BOARD_TE0720 == 0
static const char UIO_DEVICE_FILE[] = "/dev/uio1"; static const char UIO_DEVICE_FILE[] = "/dev/uio1";
#else #else
static const char UIO_DEVICE_FILE[] = "/dev/uio0"; static const char UIO_DEVICE_FILE[] = "/dev/uio1";
#endif #endif
}; };

2
mission/devices/StarTrackerHandler.cpp
View File

@ -86,7 +86,7 @@ ReturnValue_t StarTrackerHandler::scanForReply(const uint8_t *start, size_t rema
continue; continue;
} }
case ARC_DEC_ASYNC: { case ARC_DEC_ASYNC: {
sif::debug << "StarTrackerHandler::scanForReply: Received asychronous tm" << std::endl; sif::debug << "StarTrackerHandler::scanForReply: Received asynchronous tm" << std::endl;
/** No asynchronous replies are expected as of now */ /** No asynchronous replies are expected as of now */
return RETURN_FAILED; return RETURN_FAILED;
} }