Merge branch 'develop' into develop_update

Merge pull request 'Change TLE validity duration' (#159 ) from spg4-tle-too-old into develop
Reviewed-on: #159 Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
2023-09-01 12:14:08 +02:00 · 2023-08-14 10:09:00 +02:00 · 2023-08-09 11:42:11 +02:00 · 2023-07-17 10:37:39 +02:00 · 2023-07-17 10:35:35 +02:00 · 2023-07-17 10:34:19 +02:00
4 changed files with 13 additions and 3 deletions
--- a/.idea/cmake.xml
+++ b/.idea/cmake.xml
@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CMakeSharedSettings">
+    <configurations>
+      <configuration PROFILE_NAME="Debug Test" ENABLED="true" CONFIG_NAME="Debug" GENERATION_OPTIONS="-DFSFW_BUILD_TESTS=ON -DFSFW_OSAL=host" />
+    </configurations>
+  </component>
+</project>
--- a/src/fsfw/coordinates/Sgp4Propagator.cpp
+++ b/src/fsfw/coordinates/Sgp4Propagator.cpp
@ -166,9 +166,9 @@ ReturnValue_t Sgp4Propagator::propagate(double* position, double* velocity, time
  timeval timeSinceEpoch = time - epoch;
  double minutesSinceEpoch = timeSinceEpoch.tv_sec / 60. + timeSinceEpoch.tv_usec / 60000000.;

-  double yearsSinceEpoch = minutesSinceEpoch / 60 / 24 / 365;
+  double monthsSinceEpoch = minutesSinceEpoch / 60 / 24 / 30;

-  if ((yearsSinceEpoch > 1) || (yearsSinceEpoch < -1)) {
+  if ((monthsSinceEpoch > 1) || (monthsSinceEpoch < -1)) {
    return TLE_TOO_OLD;
  }

--- a/src/fsfw/housekeeping/PeriodicHousekeepingHelper.cpp
+++ b/src/fsfw/housekeeping/PeriodicHousekeepingHelper.cpp
@ -34,4 +34,6 @@ void PeriodicHousekeepingHelper::changeCollectionInterval(float newIntervalSecon
  }
  collectionInterval = newIntervalSeconds;
  hkGenerationCd.setTimeout(intervalMs);
+  // We want an immediate HK packet at the start, so time out the generation CD immediately.
+  hkGenerationCd.timeOut();
 }
--- a/unittests/CatchFactory.cpp
+++ b/unittests/CatchFactory.cpp
@ -32,7 +32,7 @@ void Factory::produceFrameworkObjects(void* args) {
  setStaticFrameworkObjectIds();
  new EventManager(objects::EVENT_MANAGER, 120);
  new HealthTable(objects::HEALTH_TABLE);
-  new InternalErrorReporter(objects::INTERNAL_ERROR_REPORTER);
+  new InternalErrorReporter(objects::INTERNAL_ERROR_REPORTER, 20, false, 1.0);

  {
    PoolManager::LocalPoolConfig poolCfg = {{100, 16}, {50, 32}, {25, 64}, {15, 128}, {5, 1024}};
Author	SHA1	Message	Date
Robin Mueller	a837a78bd4	Merge branch 'develop' into develop_update	2023-09-01 12:14:08 +02:00
Robin Müller	d246ce34d0	Merge pull request 'Change TLE validity duration' (#159 ) from spg4-tle-too-old into develop Reviewed-on: #159 Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>	2023-08-14 10:09:00 +02:00
meggert	796c7a9e37	tle is too old after 30 days now	2023-08-09 11:42:11 +02:00
Robin Müller	d575da8540	Merge pull request 'Small tweak to allow immediate HK generation' (#158 ) from small-hk-tweak into develop Reviewed-on: #158 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-07-17 10:37:39 +02:00
Robin Mueller	62ace649a7	fix unittest	2023-07-17 10:35:35 +02:00
Robin Mueller	aac74fae38	shared cmake file	2023-07-17 10:34:19 +02:00
Robin Mueller	a26b0c38ac	small tweak to allow immediate HK generation	2023-07-17 10:31:02 +02:00
Robin Mueller	54ef9ec3f6	Merge branch 'develop' into develop_update	2023-03-15 11:50:12 +01:00
Robin Mueller	4dc49c57d5	Merge branch 'develop' into develop_update	2023-02-07 12:31:41 +01:00
Robin Mueller	e9d629b9b3	Merge branch 'develop' into develop_update	2023-02-07 12:24:27 +01:00
Robin Mueller	48403c002d	Merge remote-tracking branch 'upstream/development' into develop_update	2022-12-19 15:02:07 +01:00
Robin Mueller	e86d8c64db	Merge branch 'develop' into develop_update	2022-11-28 08:36:13 +01:00
Robin Mueller	1de1b045cd	Merge remote-tracking branch 'upstream/development' into develop_update	2022-11-28 08:28:56 +01:00