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

applied clang formatting

Browse Source
This commit is contained in:
Jakob Meier
2022-02-27 15:48:42 +01:00
parent dfd817d27b
commit f88674ed59
13 changed files with 595 additions and 630 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
linux/devices/GPSHyperionLinuxController.h
View File

@ -2,9 +2,9 @@
#define MISSION_DEVICES_GPSHYPERIONHANDLER_H_
#include "fsfw/FSFW.h"
#include "mission/devices/devicedefinitions/GPSDefinitions.h"
#include "fsfw/controller/ExtendedControllerBase.h"
#include "fsfw/devicehandlers/DeviceHandlerBase.h"
#include "mission/devices/devicedefinitions/GPSDefinitions.h"
#ifdef FSFW_OSAL_LINUX
#include <gps.h>

105
linux/devices/devicedefinitions/StarTrackerDefinitions.h
View File

@ -407,53 +407,37 @@ static const uint8_t FIRMWARE = 2;
} // namespace Program
namespace region_secrets {
static const uint32_t REGION_0_SECRET = 0xd1a220d3;
static const uint32_t REGION_1_SECRET = 0xdc770fa8;
static const uint32_t REGION_2_SECRET = 0xdf9066b0;
static const uint32_t REGION_3_SECRET = 0x5f6a0423;
static const uint32_t REGION_4_SECRET = 0xbbaad5d8;
static const uint32_t REGION_5_SECRET = 0xa81c3678;
static const uint32_t REGION_6_SECRET = 0xe10f76f8;
static const uint32_t REGION_7_SECRET = 0x83220919;
static const uint32_t REGION_8_SECRET = 0xec37289d;
static const uint32_t REGION_9_SECRET = 0x27ac0ef8;
static const uint32_t REGION_10_SECRET = 0xf017e43d;
static const uint32_t REGION_11_SECRET = 0xbc7f7f49;
static const uint32_t REGION_12_SECRET = 0x42fedef6;
static const uint32_t REGION_13_SECRET = 0xe53cf10d;
static const uint32_t REGION_14_SECRET = 0xe862b70b;
static const uint32_t REGION_15_SECRET = 0x79b537ca;
static const uint32_t secret[16] {
REGION_0_SECRET,
REGION_1_SECRET,
REGION_2_SECRET,
REGION_3_SECRET,
REGION_4_SECRET,
REGION_5_SECRET,
REGION_6_SECRET,
REGION_7_SECRET,
REGION_8_SECRET,
REGION_9_SECRET,
REGION_10_SECRET,
REGION_11_SECRET,
REGION_12_SECRET,
REGION_13_SECRET,
REGION_14_SECRET,
REGION_15_SECRET
};
}
static const uint32_t REGION_0_SECRET = 0xd1a220d3;
static const uint32_t REGION_1_SECRET = 0xdc770fa8;
static const uint32_t REGION_2_SECRET = 0xdf9066b0;
static const uint32_t REGION_3_SECRET = 0x5f6a0423;
static const uint32_t REGION_4_SECRET = 0xbbaad5d8;
static const uint32_t REGION_5_SECRET = 0xa81c3678;
static const uint32_t REGION_6_SECRET = 0xe10f76f8;
static const uint32_t REGION_7_SECRET = 0x83220919;
static const uint32_t REGION_8_SECRET = 0xec37289d;
static const uint32_t REGION_9_SECRET = 0x27ac0ef8;
static const uint32_t REGION_10_SECRET = 0xf017e43d;
static const uint32_t REGION_11_SECRET = 0xbc7f7f49;
static const uint32_t REGION_12_SECRET = 0x42fedef6;
static const uint32_t REGION_13_SECRET = 0xe53cf10d;
static const uint32_t REGION_14_SECRET = 0xe862b70b;
static const uint32_t REGION_15_SECRET = 0x79b537ca;
static const uint32_t secret[16]{
REGION_0_SECRET, REGION_1_SECRET, REGION_2_SECRET, REGION_3_SECRET,
REGION_4_SECRET, REGION_5_SECRET, REGION_6_SECRET, REGION_7_SECRET,
REGION_8_SECRET, REGION_9_SECRET, REGION_10_SECRET, REGION_11_SECRET,
REGION_12_SECRET, REGION_13_SECRET, REGION_14_SECRET, REGION_15_SECRET};
} // namespace region_secrets
enum class FlashSections: uint8_t {
BOOTLOADER_SECTION = 0,
MAIN_FIRMWARE_SECTION = 1,
ARC_CONFIG_SECTION = 2
enum class FlashSections : uint8_t {
BOOTLOADER_SECTION = 0,
MAIN_FIRMWARE_SECTION = 1,
ARC_CONFIG_SECTION = 2
};
// Flash region IDs of firmware partition
enum class FirmwareRegions: uint32_t {
FIRST = 1,
LAST = 8
};
enum class FirmwareRegions : uint32_t { FIRST = 1, LAST = 8 };
static const uint32_t FLASH_REGION_SIZE = 0x20000;
@ -1292,8 +1276,10 @@ class MatchingSet : public StaticLocalDataSet<MATCHING_SET_ENTRIES> {
MatchingSet(object_id_t objectId) : StaticLocalDataSet(sid_t(objectId, MATCHING_SET_ID)) {}
lp_var_t<float> squaredDistanceLimit = lp_var_t<float>(sid.objectId, PoolIds::MATCHING_SQUARED_DISTANCE_LIMIT, this);
lp_var_t<float> squaredShiftLimit = lp_var_t<float>(sid.objectId, PoolIds::MATCHING_SQUARED_SHIFT_LIMIT, this);
lp_var_t<float> squaredDistanceLimit =
lp_var_t<float>(sid.objectId, PoolIds::MATCHING_SQUARED_DISTANCE_LIMIT, this);
lp_var_t<float> squaredShiftLimit =
lp_var_t<float>(sid.objectId, PoolIds::MATCHING_SQUARED_SHIFT_LIMIT, this);
void printSet() {
sif::info << "MatchingSet::printSet: squared distance limit: " << this->squaredDistanceLimit
@ -1316,9 +1302,12 @@ class TrackingSet : public StaticLocalDataSet<TRACKING_SET_ENTRIES> {
TrackingSet(object_id_t objectId) : StaticLocalDataSet(sid_t(objectId, TRACKING_SET_ID)) {}
lp_var_t<float> thinLimit = lp_var_t<float>(sid.objectId, PoolIds::TRACKING_THIN_LIMIT, this);
lp_var_t<float> outlierThreshold = lp_var_t<float>(sid.objectId, PoolIds::TRACKING_OUTLIER_THRESHOLD, this);
lp_var_t<float> outlierThresholdQuest = lp_var_t<float>(sid.objectId, PoolIds::TRACKING_OUTLIER_THRESHOLD_QUEST, this);
lp_var_t<uint8_t> trackerChoice = lp_var_t<uint8_t>(sid.objectId, PoolIds::TRACKING_TRACKER_CHOICE, this);
lp_var_t<float> outlierThreshold =
lp_var_t<float>(sid.objectId, PoolIds::TRACKING_OUTLIER_THRESHOLD, this);
lp_var_t<float> outlierThresholdQuest =
lp_var_t<float>(sid.objectId, PoolIds::TRACKING_OUTLIER_THRESHOLD_QUEST, this);
lp_var_t<uint8_t> trackerChoice =
lp_var_t<uint8_t>(sid.objectId, PoolIds::TRACKING_TRACKER_CHOICE, this);
void printSet() {
sif::info << "TrackingSet::printSet: thin limit: " << this->thinLimit << std::endl;
@ -1375,8 +1364,7 @@ class AlgoSet : public StaticLocalDataSet<ALGO_SET_ENTRIES> {
AlgoSet(object_id_t objectId) : StaticLocalDataSet(sid_t(objectId, ALGO_SET_ID)) {}
lp_var_t<uint8_t> mode =
lp_var_t<uint8_t>(sid.objectId, PoolIds::ALGO_MODE, this);
lp_var_t<uint8_t> mode = lp_var_t<uint8_t>(sid.objectId, PoolIds::ALGO_MODE, this);
lp_var_t<float> i2tMinConfidence =
lp_var_t<float>(sid.objectId, PoolIds::ALGO_I2T_MIN_CONFIDENCE, this);
lp_var_t<uint8_t> i2tMinMatched =
@ -1384,10 +1372,11 @@ class AlgoSet : public StaticLocalDataSet<ALGO_SET_ENTRIES> {
lp_var_t<float> i2lMinConfidence =
lp_var_t<float>(sid.objectId, PoolIds::ALGO_I2L_MIN_CONFIDENCE, this);
lp_var_t<uint8_t> i2lMinMatched =
lp_var_t<uint8_t>(sid.objectId, PoolIds::ALGO_I2L_MIN_MATCHED, this);
lp_var_t<uint8_t>(sid.objectId, PoolIds::ALGO_I2L_MIN_MATCHED, this);
void printSet() {
sif::info << "AlgoSet::printSet: mode: " << static_cast<unsigned int>(this->mode.value) << std::endl;
sif::info << "AlgoSet::printSet: mode: " << static_cast<unsigned int>(this->mode.value)
<< std::endl;
sif::info << "AlgoSet::printSet: i2t min confidence: " << this->i2tMinConfidence << std::endl;
sif::info << "AlgoSet::printSet: i2t min matched: "
<< static_cast<unsigned int>(this->i2tMinMatched.value) << std::endl;
@ -1506,16 +1495,12 @@ class DebugCameraSet : public StaticLocalDataSet<DEBUG_CAMERA_SET_ENTRIES> {
// Size of dataset
static const size_t SIZE = 8;
DebugCameraSet(HasLocalDataPoolIF* owner)
: StaticLocalDataSet(owner, DEBUG_CAMERA_SET_ID) {}
DebugCameraSet(HasLocalDataPoolIF* owner) : StaticLocalDataSet(owner, DEBUG_CAMERA_SET_ID) {}
lp_var_t<uint32_t> timing =
lp_var_t<uint32_t>(sid.objectId, PoolIds::DEBUG_CAMERA_TIMING, this);
lp_var_t<uint32_t> test =
lp_var_t<uint32_t>(sid.objectId, PoolIds::DEBUG_CAMERA_TEST, this);
lp_var_t<uint32_t> timing = lp_var_t<uint32_t>(sid.objectId, PoolIds::DEBUG_CAMERA_TIMING, this);
lp_var_t<uint32_t> test = lp_var_t<uint32_t>(sid.objectId, PoolIds::DEBUG_CAMERA_TEST, this);
DebugCameraSet(object_id_t objectId)
: StaticLocalDataSet(sid_t(objectId, DEBUG_CAMERA_SET_ID)) {}
DebugCameraSet(object_id_t objectId) : StaticLocalDataSet(sid_t(objectId, DEBUG_CAMERA_SET_ID)) {}
void printSet() {
sif::info << "DebugCameraSet::printSet: timing: " << this->timing << std::endl;

11
linux/devices/startracker/StarTrackerHandler.cpp
View File

@ -10,6 +10,7 @@ extern "C" {
#include <thirdparty/arcsec_star_tracker/client/generated/actionreq.h>
#include <thirdparty/arcsec_star_tracker/client/generated/parameter.h>
#include <thirdparty/arcsec_star_tracker/client/generated/telemetry.h>
#include "common/misc.h"
}
@ -254,8 +255,8 @@ void StarTrackerHandler::doShutDown() {
}
void StarTrackerHandler::doOffActivity() {
startupState = StartupState::IDLE;
internalState = InternalState::IDLE;
startupState = StartupState::IDLE;
internalState = InternalState::IDLE;
}
ReturnValue_t StarTrackerHandler::buildNormalDeviceCommand(DeviceCommandId_t* id) {
@ -1459,7 +1460,7 @@ void StarTrackerHandler::handleEvent(EventMessage* eventMessage) {
}
ReturnValue_t StarTrackerHandler::executeFlashReadCommand(const uint8_t* commandData,
size_t commandDataLen) {
size_t commandDataLen) {
ReturnValue_t result = RETURN_OK;
if (commandDataLen < FlashReadCmd::MIN_LENGTH) {
sif::warning << "StarTrackerHandler::executeFlashReadCommand: Command too short" << std::endl;
@ -2056,13 +2057,13 @@ ReturnValue_t StarTrackerHandler::checkCommand(ActionId_t actionId) {
case startracker::REQ_SUBSCRIPTION:
case startracker::REQ_LOG_SUBSCRIPTION:
case startracker::REQ_DEBUG_CAMERA:
if (not (mode == MODE_ON && submode == startracker::Program::FIRMWARE)) {
if (not(mode == MODE_ON && submode == startracker::Program::FIRMWARE)) {
return STARTRACKER_RUNNING_BOOTLOADER;
}
break;
case startracker::FIRMWARE_UPDATE:
case startracker::FLASH_READ:
if (not (mode == MODE_ON && submode == startracker::Program::BOOTLOADER)) {
if (not(mode == MODE_ON && submode == startracker::Program::BOOTLOADER)) {
return STARTRACKER_RUNNING_FIRMWARE;
}
break;

21
linux/devices/startracker/StarTrackerHandler.h
View File

@ -1,11 +1,11 @@
#ifndef MISSION_DEVICES_STARTRACKERHANDLER_H_
#define MISSION_DEVICES_STARTRACKERHANDLER_H_
#include "OBSWConfig.h"
#include <fsfw/datapool/PoolReadGuard.h>
#include "ArcsecDatalinkLayer.h"
#include "ArcsecJsonParamBase.h"
#include "OBSWConfig.h"
#include "StrHelper.h"
#include "fsfw/devicehandlers/DeviceHandlerBase.h"
#include "fsfw/src/fsfw/serialize/SerializeAdapter.h"
@ -128,9 +128,11 @@ class StarTrackerHandler : public DeviceHandlerBase {
static const ReturnValue_t STR_HELPER_EXECUTING = MAKE_RETURN_CODE(0xB5);
//! [EXPORT] : [COMMENT] Star tracker is already in firmware mode
static const ReturnValue_t STARTRACKER_ALREADY_BOOTED = MAKE_RETURN_CODE(0xB6);
//! [EXPORT] : [COMMENT] Star tracker is in firmware mode but must be in bootloader mode to execute this command
//! [EXPORT] : [COMMENT] Star tracker is in firmware mode but must be in bootloader mode to
//! execute this command
static const ReturnValue_t STARTRACKER_RUNNING_FIRMWARE = MAKE_RETURN_CODE(0xB7);
//! [EXPORT] : [COMMENT] Star tracker is in bootloader mode but must be in firmware mode to execute this command
//! [EXPORT] : [COMMENT] Star tracker is in bootloader mode but must be in firmware mode to
//! execute this command
static const ReturnValue_t STARTRACKER_RUNNING_BOOTLOADER = MAKE_RETURN_CODE(0xB8);
static const uint8_t SUBSYSTEM_ID = SUBSYSTEM_ID::STR_HANDLER;
@ -224,10 +226,7 @@ class StarTrackerHandler : public DeviceHandlerBase {
#endif
#endif
enum class NormalState {
TEMPERATURE_REQUEST,
SOLUTION_REQUEST
};
enum class NormalState { TEMPERATURE_REQUEST, SOLUTION_REQUEST };
NormalState normalState = NormalState::TEMPERATURE_REQUEST;
@ -263,13 +262,7 @@ class StarTrackerHandler : public DeviceHandlerBase {
InternalState internalState = InternalState::IDLE;
enum class StartupState {
IDLE,
CHECK_PROGRAM,
WAIT_CHECK_PROGRAM,
BOOT_BOOTLOADER,
DONE
};
enum class StartupState { IDLE, CHECK_PROGRAM, WAIT_CHECK_PROGRAM, BOOT_BOOTLOADER, DONE };
StartupState startupState = StartupState::IDLE;

6
linux/devices/startracker/StarTrackerJsonCommands.h
View File

@ -195,7 +195,7 @@ class LogLevel : public ArcsecJsonParamBase {
*/
class Subscription : public ArcsecJsonParamBase {
public:
Subscription();
Subscription();
size_t getSize();
@ -211,7 +211,7 @@ class Subscription : public ArcsecJsonParamBase {
*/
class LogSubscription : public ArcsecJsonParamBase {
public:
LogSubscription();
LogSubscription();
size_t getSize();
@ -227,7 +227,7 @@ class LogSubscription : public ArcsecJsonParamBase {
*/
class DebugCamera : public ArcsecJsonParamBase {
public:
DebugCamera();
DebugCamera();
size_t getSize();

29
linux/devices/startracker/StrHelper.cpp
View File

@ -168,13 +168,9 @@ ReturnValue_t StrHelper::startFlashRead(std::string path, uint8_t startRegion, u
return RETURN_OK;
}
void StrHelper::disableTimestamping() {
timestamping = false;
}
void StrHelper::disableTimestamping() { timestamping = false; }
void StrHelper::enableTimestamping() {
timestamping = true;
}
void StrHelper::enableTimestamping() { timestamping = true; }
ReturnValue_t StrHelper::performImageDownload() {
ReturnValue_t result;
@ -426,8 +422,8 @@ ReturnValue_t StrHelper::performFlashRead() {
bytesRead += req.length;
req.address += req.length;
if (req.address >= FLASH_REGION_SIZE) {
req.address = 0;
req.region++;
req.address = 0;
req.region++;
}
retries = 0;
#if OBSW_DEBUG_STARTRACKER == 1
@ -580,13 +576,12 @@ ReturnValue_t StrHelper::unlockAndEraseRegions(uint32_t from, uint32_t to) {
}
std::string StrHelper::makeFullFilename(std::string path, std::string filename) {
std::string image;
Timestamp timestamp;
if (timestamping) {
image = path + "/" + timestamp.str() + filename;
}
else {
image = path + "/" + filename;
}
return image;
std::string image;
Timestamp timestamp;
if (timestamping) {
image = path + "/" + timestamp.str() + filename;
} else {
image = path + "/" + filename;
}
return image;
}

9
linux/devices/startracker/StrHelper.h
View File

@ -28,7 +28,6 @@ extern "C" {
* @author J. Meier
*/
class StrHelper : public SystemObject, public ExecutableObjectIF, public HasReturnvaluesIF {
public:
static const uint8_t SUBSYSTEM_ID = SUBSYSTEM_ID::STR_HELPER;
@ -193,13 +192,7 @@ class StrHelper : public SystemObject, public ExecutableObjectIF, public HasRetu
static const size_t CONFIG_MAX_DOWNLOAD_RETRIES = 3;
static const uint32_t FLASH_ERASE_DELAY = 500;
enum class InternalState {
IDLE,
UPLOAD_IMAGE,
DOWNLOAD_IMAGE,
FLASH_READ,
FIRMWARE_UPDATE
};
enum class InternalState { IDLE, UPLOAD_IMAGE, DOWNLOAD_IMAGE, FLASH_READ, FIRMWARE_UPDATE };
InternalState internalState = InternalState::IDLE;