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

v1.9.0 #175

Merged
muellerr merged 623 commits from develop into main 2022-03-08 10:32:41 +01:00
Conversation 0 Commits 623 Files Changed 417 +10 -3
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f75e7b2002 - Show all commits

2
linux/obc/PdecHandler.cpp
View File

@ -435,9 +435,9 @@ uint8_t PdecHandler::getOddParity(uint8_t number) {
} }
void PdecHandler::getClcw() { void PdecHandler::getClcw() {
uint32_t clcw = *(registerBaseAddress + PDEC_CLCW_OFFSET);
#if OBSW_DEBUG_PDEC_HANDLER == 1 #if OBSW_DEBUG_PDEC_HANDLER == 1
uint32_t clcw = *(registerBaseAddress + PDEC_CLCW_OFFSET);
if (debugDivider == 5) { if (debugDivider == 5) {
printClcw(clcw); printClcw(clcw);
debugDivider = 0; debugDivider = 0;

7
linux/obc/PdecHandler.h
View File

@ -1,6 +1,7 @@
#ifndef LINUX_OBC_PDECHANDLER_H_ #ifndef LINUX_OBC_PDECHANDLER_H_
#define LINUX_OBC_PDECHANDLER_H_ #define LINUX_OBC_PDECHANDLER_H_
#include "OBSWConfig.h"
#include "PdecConfig.h" #include "PdecConfig.h"
#include "fsfw/returnvalues/HasReturnvaluesIF.h" #include "fsfw/returnvalues/HasReturnvaluesIF.h"
#include "fsfw_hal/common/gpio/gpioDefinitions.h" #include "fsfw_hal/common/gpio/gpioDefinitions.h"
@ -106,9 +107,15 @@ private:
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;
#if BOARD_TE0720 == 1
static const int CONFIG_MEMORY_MAP_SIZE = 0x400; static const int CONFIG_MEMORY_MAP_SIZE = 0x400;
static const int RAM_MAP_SIZE = 0x4000; static const int RAM_MAP_SIZE = 0x4000;
static const int REGISTER_MAP_SIZE = 0x10000; static const int REGISTER_MAP_SIZE = 0x10000;
#else
static const int CONFIG_MEMORY_MAP_SIZE = 0x400;
static const int RAM_MAP_SIZE = 0x4000;
static const int REGISTER_MAP_SIZE = 0x4000;
#endif /* BOARD_TE0720 == 1 */
// 0x200 / 4 = 0x80 // 0x200 / 4 = 0x80
static const uint32_t FRAME_HEADER_OFFSET = 0x80; static const uint32_t FRAME_HEADER_OFFSET = 0x80;

4
linux/obc/PtmeConfig.h
View File

@ -20,9 +20,9 @@ namespace PtmeConfig {
static const uint32_t VC2_OFFSETT = 0x8000; static const uint32_t VC2_OFFSETT = 0x8000;
static const uint32_t VC3_OFFSETT = 0xC000; static const uint32_t VC3_OFFSETT = 0xC000;
#if BOARD_TE0720 == 0 #if BOARD_TE0720 == 0
static const char UIO_DEVICE_FILE[] = "/dev/uio0";
#else
static const char UIO_DEVICE_FILE[] = "/dev/uio1"; static const char UIO_DEVICE_FILE[] = "/dev/uio1";
#else
static const char UIO_DEVICE_FILE[] = "/dev/uio0";
#endif #endif
}; };