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 +3 -2
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c3e20d6a11 - Show all commits

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

@ -1,6 +1,7 @@
#ifndef MISSION_DEVICES_STARTRACKERHANDLER_H_ #ifndef MISSION_DEVICES_STARTRACKERHANDLER_H_
#define MISSION_DEVICES_STARTRACKERHANDLER_H_ #define MISSION_DEVICES_STARTRACKERHANDLER_H_
#include "OBSWConfig.h"
#include <fsfw/datapool/PoolReadGuard.h> #include <fsfw/datapool/PoolReadGuard.h>
#include "ArcsecDatalinkLayer.h" #include "ArcsecDatalinkLayer.h"
@ -268,10 +269,10 @@ class StarTrackerHandler : public DeviceHandlerBase {
// Countdown to insert delay for star tracker to switch from bootloader to firmware program // Countdown to insert delay for star tracker to switch from bootloader to firmware program
Countdown bootCountdown; Countdown bootCountdown;
#ifdef EGSE #ifndef EGSE
std::string paramJsonFile = "/mnt/sd0/startracker/full.json"; std::string paramJsonFile = "/mnt/sd0/startracker/full.json";
#else #else
std::string paramJsonFile = "/home/pi/arcsec/flight-config.json"; std::string paramJsonFile = "/home/pi/arcsec/ground-config.json";
#endif #endif
enum class InternalState { TEMPERATURE_REQUEST }; enum class InternalState { TEMPERATURE_REQUEST };