that's it for today

include/comms.h

@@ -3,7 +3,7 @@
 #include "globals.h"
 #include "nonvolatile.h"
 #include <Hash.h>
-#include "main.h"
+#include "core.h"
 
 void Communication();
 void XDRGTKRoutine();

include/core.h

@@ -0,0 +1,34 @@
+#pragma once
+#include <stdint.h>
+#include <Arduino.h>
+
+void tftPrint(int8_t offset, const String & text, int16_t x, int16_t y, int color, int smoothcolor, uint8_t fontsize);
+void tftPrint16(int8_t offset, const String & text, int16_t x, int16_t y, int color, int smoothcolor, bool force_font = true, bool font = false);
+void tftReplace(int8_t offset, const String & textold, const String & text, int16_t x, int16_t y, int color, int smoothcolor, int background, uint8_t fontsize);
+void tftReplace16(int8_t offset, const String & textold, const String & text, int16_t x, int16_t y, int color, int smoothcolor, int background, bool force_font = true, bool font = false);
+const char* textUI(uint16_t number);
+uint8_t doAutoMemory(uint16_t startfreq, uint16_t stopfreq, uint8_t startmem, uint8_t stopmem, bool rdsonly, uint8_t doublepi);
+void showAutoSquelch(bool mode);
+void UpdateFonts();
+void setAutoSpeedSPI();
+void DoMemoryPosTune();
+void startFMDXScan();
+void endMenu();
+void TuneUp();
+void ShowStepSize();
+void ShowFreq(int mode);
+void ShowMemoryPos();
+void TuneDown();
+void ShowTuneMode();
+void SelectBand();
+void doBW();
+void ModeButtonPress();
+void updateEQ();
+void updateiMS();
+void Seek(bool mode);
+void MuteScreen(bool setting);
+void cancelDXScan();
+void doStereoToggle();
+void updateBW();
+void ShowRDSLogo(bool RDSstatus);
+void DataPrint(String string);

include/gui.h

@@ -3,13 +3,13 @@
 #include "globals.h"
 #include "utils.h"
 #include "menugraphics.h"
-#include "main.h"
+#include "core.h"
 
 static const char* const unitString[] = {"dBμV", "dBf", "dBm"};
 static const char* const FreqFont[] = {"Classic", "Roubenstil", "Motoya", "Aura2", "Comic", "Modern"};
 static const char* const Theme[] = {"Essence", "Cyan", "Crimson", "Monochrome", "Volcano", "Dendro", "Sakura", "Whiteout", "Tangerine", "Ocean", "Indigo", "Queer", "GoldBrite", "Bubblegum"};
-static const char* BWButtonLabelsFM[] = {"56 kHz", "64 kHz", "72 kHz", "84 kHz", "97 kHz", "114 kHz", "133 kHz", "151 kHz", "168 kHz", "184 kHz", "200 kHz", "217 kHz", "236 kHz", "254 kHz", "287 kHz", "311 kHz", "Auto", "iMS", "EQ"};
-static const char* BWButtonLabelsAM[] = {"3 kHz", "4 kHz", "6 kHz", "8 kHz"};
+extern const char* BWButtonLabelsFM[];
+extern const char* BWButtonLabelsAM[];
 
 void BuildAFScreen();
 void BuildRDSStatScreen();

include/logbook.h

@@ -6,7 +6,7 @@ using fs::FS;
 #include <SPIFFS.h>
 #include "globals.h"
 #include "rtc.hpp"
-#include "main.h"
+#include "core.h"
 
 void handleRoot();
 void handleDownloadCSV();

include/main.h

@@ -1,33 +1,16 @@
 #pragma once
-#include <stdint.h>
-#include <Arduino.h>
 
-void tftPrint(int8_t offset, const String & text, int16_t x, int16_t y, int color, int smoothcolor, uint8_t fontsize);
-void tftPrint16(int8_t offset, const String & text, int16_t x, int16_t y, int color, int smoothcolor, bool force_font = true, bool font = false);
-void tftReplace(int8_t offset, const String & textold, const String & text, int16_t x, int16_t y, int color, int smoothcolor, int background, uint8_t fontsize);
-const char* textUI(uint16_t number);
-uint8_t doAutoMemory(uint16_t startfreq, uint16_t stopfreq, uint8_t startmem, uint8_t stopmem, bool rdsonly, uint8_t doublepi);
-void showAutoSquelch(bool mode);
-void UpdateFonts();
-void setAutoSpeedSPI();
-void DoMemoryPosTune();
-void startFMDXScan();
-void endMenu();
-void TuneUp();
-void ShowStepSize();
-void ShowFreq(int mode);
-void ShowMemoryPos();
-void TuneDown();
-void ShowTuneMode();
-void SelectBand();
-void doBW();
-void ModeButtonPress();
-void updateEQ();
-void updateiMS();
-void Seek(bool mode);
-void MuteScreen(bool setting);
-void cancelDXScan();
-void doStereoToggle();
-void updateBW();
-void ShowRDSLogo(bool RDSstatus);
-void DataPrint(String string);
+#include "system_console.h"
+#include "globals.h"
+
+extern Console console;
+extern RTC_DATA_ATTR bool gpio_chip;
+extern RTC_DATA_ATTR bool tef_found;
+
+template<typename... Args>
+void panic(Args... args);
+
+void Round30K(unsigned int freq);
+void Round50K(unsigned int freq);
+void Round100K(unsigned int freq);
+void Round200K(unsigned int freq);

include/rds.h

@@ -8,7 +8,7 @@
 #include "globals.h"
 #include "NTPupdate.h"
 #include "rtc.hpp"
-#include "main.h"
+#include "core.h"
 
 void ShowAdvancedRDS();
 void readRds();