From 22e711342a1ebb50cf8c742d8439fbae458eb4d7 Mon Sep 17 00:00:00 2001
From: Jon Beniston <jon@beniston.com>
Date: Sun, 31 Jan 2021 15:31:26 +0000
Subject: [PATCH 1/2] Separate Star Tracker resources in to separate files, to
 reduce RAM required by compiler

---
 plugins/feature/startracker/CMakeLists.txt         |  3 +++
 plugins/feature/startracker/startracker.qrc        | 10 ----------
 plugins/feature/startracker/startracker1420mhz.qrc |  7 +++++++
 plugins/feature/startracker/startracker150mhz.qrc  |  7 +++++++
 plugins/feature/startracker/startracker408mhz.qrc  |  8 ++++++++
 5 files changed, 25 insertions(+), 10 deletions(-)
 create mode 100644 plugins/feature/startracker/startracker1420mhz.qrc
 create mode 100644 plugins/feature/startracker/startracker150mhz.qrc
 create mode 100644 plugins/feature/startracker/startracker408mhz.qrc

diff --git a/plugins/feature/startracker/CMakeLists.txt b/plugins/feature/startracker/CMakeLists.txt
index 8455f0819..9ab287a54 100644
--- a/plugins/feature/startracker/CMakeLists.txt
+++ b/plugins/feature/startracker/CMakeLists.txt
@@ -29,6 +29,9 @@ if(NOT SERVER_MODE)
         startrackersettingsdialog.cpp
         startrackersettingsdialog.ui
         startracker.qrc
+        startracker150mhz.qrc
+        startracker408mhz.qrc
+        startracker1420mhz.qrc
     )
     set(startracker_HEADERS
         ${startracker_HEADERS}
diff --git a/plugins/feature/startracker/startracker.qrc b/plugins/feature/startracker/startracker.qrc
index f88e4f4e1..98614379b 100644
--- a/plugins/feature/startracker/startracker.qrc
+++ b/plugins/feature/startracker/startracker.qrc
@@ -14,15 +14,5 @@
     <file>startracker/pulsar-32.png</file>
     <file>startracker/sun-40.png</file>
     <file>startracker/sun-button-24.png</file>
-    <file>startracker/150mhz_ra_dec.png</file>
-    <file>startracker/408mhz_ra_dec.png</file>
-    <file>startracker/1420mhz_ra_dec.png</file>
-    <file>startracker/150mhz_galactic.png</file>
-    <file>startracker/408mhz_galactic.png</file>
-    <file>startracker/1420mhz_galactic.png</file>
-    <file>startracker/150mhz_ra_dec.fits</file>
-    <file>startracker/408mhz_ra_dec.fits</file>
-    <file>startracker/1420mhz_ra_dec.fits</file>
-    <file>startracker/408mhz_ra_dec_spectral_index.fits</file>
   </qresource>
 </RCC>
diff --git a/plugins/feature/startracker/startracker1420mhz.qrc b/plugins/feature/startracker/startracker1420mhz.qrc
new file mode 100644
index 000000000..4f1c93b8b
--- /dev/null
+++ b/plugins/feature/startracker/startracker1420mhz.qrc
@@ -0,0 +1,7 @@
+<RCC>
+  <qresource prefix="/startracker/">
+    <file>startracker/1420mhz_ra_dec.png</file>
+    <file>startracker/1420mhz_galactic.png</file>
+    <file>startracker/1420mhz_ra_dec.fits</file>
+  </qresource>
+</RCC>
diff --git a/plugins/feature/startracker/startracker150mhz.qrc b/plugins/feature/startracker/startracker150mhz.qrc
new file mode 100644
index 000000000..8328cab50
--- /dev/null
+++ b/plugins/feature/startracker/startracker150mhz.qrc
@@ -0,0 +1,7 @@
+<RCC>
+  <qresource prefix="/startracker/">
+    <file>startracker/150mhz_ra_dec.png</file>
+    <file>startracker/150mhz_galactic.png</file>
+    <file>startracker/150mhz_ra_dec.fits</file>
+  </qresource>
+</RCC>
diff --git a/plugins/feature/startracker/startracker408mhz.qrc b/plugins/feature/startracker/startracker408mhz.qrc
new file mode 100644
index 000000000..5fed8a75d
--- /dev/null
+++ b/plugins/feature/startracker/startracker408mhz.qrc
@@ -0,0 +1,8 @@
+<RCC>
+  <qresource prefix="/startracker/">
+    <file>startracker/408mhz_ra_dec.png</file>
+    <file>startracker/408mhz_galactic.png</file>
+    <file>startracker/408mhz_ra_dec.fits</file>
+    <file>startracker/408mhz_ra_dec_spectral_index.fits</file>
+  </qresource>
+</RCC>

From d1c728b030c9369491daff37135404d3f85921d3 Mon Sep 17 00:00:00 2001
From: Jon Beniston <jon@beniston.com>
Date: Sun, 31 Jan 2021 15:44:16 +0000
Subject: [PATCH 2/2] Only confirm redownload of solar flux data if less than 1
 day old

---
 plugins/feature/startracker/startrackergui.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/feature/startracker/startrackergui.cpp b/plugins/feature/startracker/startrackergui.cpp
index 6abcd1ad4..e707a07c6 100644
--- a/plugins/feature/startracker/startrackergui.cpp
+++ b/plugins/feature/startracker/startrackergui.cpp
@@ -1206,7 +1206,7 @@ void StarTrackerGUI::updateSolarFlux(bool all)
     {
         QDate today = QDateTime::currentDateTimeUtc().date();
         QString solarFluxFile = getSolarFluxFilename();
-        if (m_dlm.confirmDownload(solarFluxFile))
+        if (m_dlm.confirmDownload(solarFluxFile, nullptr, 1))
         {
             QString urlString = QString("http://www.sws.bom.gov.au/Category/World Data Centre/Data Display and Download/Solar Radio/station/learmonth/SRD/%1/L%2.SRD")
                                     .arg(today.year()).arg(today.toString("yyMMdd"));