From 30cde5052b1ae8d6f559d12ba92312ef6ca8ec5c Mon Sep 17 00:00:00 2001 From: Gregory Salaun Date: Fri, 17 Oct 2025 16:57:02 +0530 Subject: [PATCH] up --- config default.yml | 5 ++--- config.go | 2 +- frontend/src/components/SpotsTable.svelte | 8 ++++---- httpserver.go | 2 +- log.go | 19 ------------------- 5 files changed, 8 insertions(+), 28 deletions(-) diff --git a/config default.yml b/config default.yml index 3934bc5..d56e9f2 100644 --- a/config default.yml +++ b/config default.yml @@ -1,12 +1,11 @@ general: delete_log_file_at_start: true callsign: XXXXX # Log4OM Callsign used to check if you get spotted by someone - QRALocator: JN36dg log_to_file: true log_level: INFO # INFO or DEBUG or WARN telnetserver: true # not in use for now - flexradiospot: true # not in use for now - sendFreqModeToLog4OM: false # if not using a Flex then turn this on to send Freq and Mode to Log4OM which should in turn change the freq on the radio + flexradiospot: true + send_freq_log: true # if not using a Flex then turn this on to send Freq and Mode to Log4OM which should in turn change the freq on the radio # Spot colors, if empty then default, colors in HEX AARRGGBB format spot_color_new_entity: background_color_new_entity: diff --git a/config.go b/config.go index 6a60939..f73dd66 100644 --- a/config.go +++ b/config.go @@ -18,8 +18,8 @@ type Config struct { LogLevel string `yaml:"log_level"` TelnetServer bool `yaml:"telnetserver"` FlexRadioSpot bool `yaml:"flexradiospot"` + SendFreqModeToLog bool `yaml:"send_freq_log"` SpotColorNewEntity string `yaml:"spot_color_new_entity"` - sendFreqModeToLog4OM bool `yaml:"sendFreqModeToLog4OM"` BackgroundColorNewEntity string `yaml:"background_color_new_entity"` SpotColorNewBand string `yaml:"spot_color_new_band"` BackgroundColorNewBand string `yaml:"background_color_new_band"` diff --git a/frontend/src/components/SpotsTable.svelte b/frontend/src/components/SpotsTable.svelte index 9f02de5..0ba2423 100644 --- a/frontend/src/components/SpotsTable.svelte +++ b/frontend/src/components/SpotsTable.svelte @@ -60,12 +60,12 @@
DX
+
Country
Freq
Band
Mode
Spotter
Time
-
Country
Status
@@ -82,6 +82,9 @@ {item.DX} +
+ {item.CountryName || 'N/A'} +
{item.FrequencyMhz}
{item.Band} @@ -93,9 +96,6 @@ {item.SpotterCallsign}
{item.UTCTime}
-
- {item.CountryName || 'N/A'} -
{#if getStatusLabel(item)} diff --git a/httpserver.go b/httpserver.go index d825914..b8894bb 100644 --- a/httpserver.go +++ b/httpserver.go @@ -791,7 +791,7 @@ func (s *HTTPServer) handleSendCallsign(w http.ResponseWriter, r *http.Request) SendUDPMessage([]byte("" + req.Callsign)) s.Log.Infof("Sent callsign %s to Log4OM via UDP (127.0.0.1:2241)", req.Callsign) - if Cfg.General.sendFreqModeToLog4OM { + if Cfg.General.SendFreqModeToLog { freqLog4OM := strings.Replace(req.Frequency, ".", "", 1) xmlRequestFreq := RemoteControlRequestFreq{ diff --git a/log.go b/log.go index 17a95ff..60e5b86 100644 --- a/log.go +++ b/log.go @@ -51,22 +51,3 @@ func NewLog() *log.Logger { return Log } - -// Info ... -// func Info(format string, v ...interface{}) { -// log.Infof(format, v...) -// } - -// // Warn ... -// func Warn(format string, v ...interface{}) { -// log.Warnf(format, v...) -// } - -// // Error ... -// func Error(format string, v ...interface{}) { -// log.Errorf(format, v...) -// } - -// func Debug(format string, v ...interface{}) { -// log.Debugf(format, v...) -// }