From aeab5d92291e4b05ef03b1af09b7bf96e5bc4e36 Mon Sep 17 00:00:00 2001 From: Daniele Forsi Date: Tue, 4 Jun 2024 23:13:09 +0200 Subject: [PATCH] Move defines to the header so they can be reused elsewhere --- .../feature/satellitetracker/satellitetrackersettings.cpp | 6 ------ plugins/feature/satellitetracker/satellitetrackersettings.h | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/plugins/feature/satellitetracker/satellitetrackersettings.cpp b/plugins/feature/satellitetracker/satellitetrackersettings.cpp index 154beafe5..eae244d47 100644 --- a/plugins/feature/satellitetracker/satellitetrackersettings.cpp +++ b/plugins/feature/satellitetracker/satellitetrackersettings.cpp @@ -25,12 +25,6 @@ #include "satellitetrackersettings.h" -#define DEAFULT_TARGET "ISS" -#define DEFAULT_TLES {"https://db.satnogs.org/api/tle/", "https://www.amsat.org/tle/current/nasabare.txt", "https://celestrak.org/NORAD/elements/gp.php?GROUP=weather&FORMAT=tle", "https://celestrak.org/NORAD/elements/gp.php?GROUP=gps-ops&FORMAT=tle", "https://celestrak.org/NORAD/elements/gp.php?CATNR=36395&FORMAT=tle"} -#define DEFAULT_DATE_FORMAT "yyyy/MM/dd" -#define DEFAULT_AOS_SPEECH "${name} is visible for ${duration} minutes. Max elevation, ${elevation} degrees." -#define DEFAULT_LOS_SPEECH "${name} is no longer visible." - SatelliteTrackerSettings::SatelliteTrackerSettings() : m_rollupState(nullptr) { diff --git a/plugins/feature/satellitetracker/satellitetrackersettings.h b/plugins/feature/satellitetracker/satellitetrackersettings.h index cdf408e86..8bad64d72 100644 --- a/plugins/feature/satellitetracker/satellitetrackersettings.h +++ b/plugins/feature/satellitetracker/satellitetrackersettings.h @@ -28,6 +28,12 @@ class Serializable; +#define DEAFULT_TARGET "ISS" +#define DEFAULT_TLES {"https://db.satnogs.org/api/tle/", "https://www.amsat.org/tle/current/nasabare.txt", "https://celestrak.org/NORAD/elements/gp.php?GROUP=weather&FORMAT=tle", "https://celestrak.org/NORAD/elements/gp.php?GROUP=gps-ops&FORMAT=tle", "https://celestrak.org/NORAD/elements/gp.php?CATNR=36395&FORMAT=tle"} +#define DEFAULT_DATE_FORMAT "yyyy/MM/dd" +#define DEFAULT_AOS_SPEECH "${name} is visible for ${duration} minutes. Max elevation, ${elevation} degrees." +#define DEFAULT_LOS_SPEECH "${name} is no longer visible." + #define SAT_COL_COLUMNS 18 struct SatelliteTrackerSettings