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

Merge pull request 'Development fixes' (#207) from mueller/develop-fixes into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Details

Browse Source 
Reviewed-on: #207
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
This commit is contained in:
Jakob Meier 2022-04-12 19:30:33 +02:00
commit b618302db0
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
common/config/devConf.h
View File

@ -3,6 +3,7 @@
#include <cstdint> #include <cstdint>
#include <fsfw_hal/linux/spi/spiDefinitions.h> #include <fsfw_hal/linux/spi/spiDefinitions.h>
#include <fsfw_hal/linux/uart/UartCookie.h>
/** /**
* SPI configuration will be contained here to let the device handlers remain independent * SPI configuration will be contained here to let the device handlers remain independent
@ -49,11 +50,11 @@ static constexpr spi::SpiModes RTD_MODE = spi::SpiModes::MODE_3;
namespace uart { namespace uart {
static constexpr size_t HYPERION_GPS_REPLY_MAX_BUFFER = 1024; static constexpr size_t HYPERION_GPS_REPLY_MAX_BUFFER = 1024;
static constexpr uint32_t SYRLINKS_BAUD = 38400; static constexpr UartBaudRate SYRLINKS_BAUD = UartBaudRate::RATE_38400;
static constexpr uint32_t GNSS_BAUD = 9600; static constexpr UartBaudRate GNSS_BAUD = UartBaudRate::RATE_9600;
static constexpr uint32_t PLOC_MPSOC_BAUD = 115200; static constexpr UartBaudRate PLOC_MPSOC_BAUD = UartBaudRate::RATE_115200;
static constexpr uint32_t PLOC_SUPERVISOR_BAUD = 115200; static constexpr UartBaudRate PLOC_SUPERVISOR_BAUD = UartBaudRate::RATE_115200;
static constexpr uint32_t STAR_TRACKER_BAUD = 921600; static constexpr UartBaudRate STAR_TRACKER_BAUD = UartBaudRate::RATE_921600;
} }

2
fsfw

@ -1 +1 @@
Subproject commit 85a6e4b12977f24247ed3ca3011c6f8b611a144e Subproject commit 28e93696dfe95fdeb8465a2f59a3e578fdf0f1cb

1
linux/devices/GPSHyperionLinuxController.cpp
View File

@ -3,7 +3,6 @@
#include "OBSWConfig.h" #include "OBSWConfig.h"
#include "fsfw/datapool/PoolReadGuard.h" #include "fsfw/datapool/PoolReadGuard.h"
#include "fsfw/timemanager/Clock.h" #include "fsfw/timemanager/Clock.h"
#include "linux/utility/utility.h" #include "linux/utility/utility.h"
#include "mission/utility/compileTime.h" #include "mission/utility/compileTime.h"

2
mission/devices/P60DockHandler.cpp
View File

@ -111,7 +111,7 @@ void P60DockHandler::parseHkTableReply(const uint8_t *packet) {
dataOffset += 6; dataOffset += 6;
coreHk.bootCount = *(packet + dataOffset) << 24 | *(packet + dataOffset + 1) << 16 | coreHk.bootCount = *(packet + dataOffset) << 24 | *(packet + dataOffset + 1) << 16 |
*(packet + dataOffset + 2) << 8 | *(packet + dataOffset + 3); *(packet + dataOffset + 2) << 8 | *(packet + dataOffset + 3);
if(firstHk) { if (firstHk) {
triggerEvent(P60_BOOT_COUNT, coreHk.bootCount.value); triggerEvent(P60_BOOT_COUNT, coreHk.bootCount.value);
} }
dataOffset += 6; dataOffset += 6;

2
tmtc

@ -1 +1 @@
Subproject commit 3a1c7c62887eb377c498bd9cdac47b93f40c85ba Subproject commit 98783a0981b2a23d8f4dbfa8706b8826b8194231