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

v1.12.0 #269

Merged
muellerr merged 493 commits from develop into main 2022-07-04 11:19:05 +02:00
Conversation 0 Commits 493 Files Changed 264 +3 -2
2 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 ba7ac6bab2 - Show all commits

3
mission/controller/controllerdefinitions/ThermalControllerDefinitions.h
View File

@ -77,6 +77,7 @@ enum PoolIds : lp_id_t {
static const uint8_t ENTRIES_SENSOR_TEMPERATURE_SET = 18; static const uint8_t ENTRIES_SENSOR_TEMPERATURE_SET = 18;
static const uint8_t ENTRIES_DEVICE_TEMPERATURE_SET = 25; static const uint8_t ENTRIES_DEVICE_TEMPERATURE_SET = 25;
static const uint8_t ENTRIES_SUS_TEMPERATURE_SET = 12;
/** /**
* @brief This dataset can be used to store the collected temperatures of all temperature sensors * @brief This dataset can be used to store the collected temperatures of all temperature sensors
@ -159,7 +160,7 @@ class DeviceTemperatures : public StaticLocalDataSet<ENTRIES_DEVICE_TEMPERATURE_
* @brief This dataset can be used to store the collected temperatures of all SUS temperature * @brief This dataset can be used to store the collected temperatures of all SUS temperature
* sensors * sensors
*/ */
class SusTemperatures : public StaticLocalDataSet<12> { class SusTemperatures : public StaticLocalDataSet<ENTRIES_SUS_TEMPERATURE_SET> {
public: public:
SusTemperatures(HasLocalDataPoolIF* owner) : StaticLocalDataSet(owner, SUS_TEMPERATURES) {} SusTemperatures(HasLocalDataPoolIF* owner) : StaticLocalDataSet(owner, SUS_TEMPERATURES) {}

2
tmtc

@ -1 +1 @@
Subproject commit 38b8f2a02f4bfe4909dfe97f37ed95c3d67648dc Subproject commit 8a23e8a96c5adda158f03c3924bd9c2746daad9b