diff --git a/.vscode/launch.json b/.vscode/launch.json
new file mode 100644
index 0000000..e69de29
diff --git a/TCPClient.go b/TCPClient.go
index fbb2aa6..624b660 100644
--- a/TCPClient.go
+++ b/TCPClient.go
@@ -22,6 +22,7 @@ type TCPClient struct {
LogWriter *bufio.Writer
Reader *bufio.Reader
Writer *bufio.Writer
+ Scanner *bufio.Scanner
Conn *net.TCPConn
TCPServer TCPServer
MsgChan chan string
@@ -130,9 +131,11 @@ func (c *TCPClient) SetFilters() {
func (c *TCPClient) ReadLine() {
for {
+
message, err := c.Reader.ReadString('\n')
message, _ = strings.CutSuffix(message, "\n")
message, _ = strings.CutSuffix(message, "\r")
+
if err != nil {
Log.Errorf("Error reading message: %s", err)
c.Conn.Close()
diff --git a/config.yml b/config.yml
index 5a2aaaf..b396762 100644
--- a/config.yml
+++ b/config.yml
@@ -8,14 +8,14 @@ sqlite:
sqlite_path: 'C:\Perso\Seafile\Radio\Logs\Log4OM\F4BPO.SQLite' # SQLite Db oath of Log4OM
callsign: F4BPO # Log4OM Callsign used to check if you get spotted by someone
cluster:
- server: dxc.k0xm.net # dxc.k0xm.net
- port: 7300
+ server: www.db0erf.de # dxc.k0xm.net
+ port: 41113
login: f4bpo
skimmer: true
ft8: false
ft4: false
command: SET/NOFILTER
- login_prompt: "Please enter your call:"
+ login_prompt: "login: "
flex:
discovery: true # Radio must be on same LAN than the program
ip: 10.10.10.120 # if discovery is true no need to put an IP
@@ -30,4 +30,4 @@ gotify:
NewDXCC: true
NewBand: false
NewMode: false
- NewBandAndMode: true
\ No newline at end of file
+ NewBandAndMode: false
\ No newline at end of file
diff --git a/country.xml b/country.xml
index 2848896..971bab6 100644
--- a/country.xml
+++ b/country.xml
@@ -6713,7 +6713,7 @@
- ^FO.*
+ ^FO.*|TX5U
1979-07-18T00:00:00Z
@@ -6723,7 +6723,7 @@
1979-07-22T23:59:59Z
- ^FO.*
+ ^FO.*|TX5U
1979-07-22T23:59:59Z
@@ -12832,7 +12832,7 @@
1979-12-31T23:59:59Z
- ^FR.*
+ ^FR.*|^TO974REF
1979-12-31T23:59:59Z
diff --git a/gotify.go b/gotify.go
index 8e6c7f7..24cda94 100644
--- a/gotify.go
+++ b/gotify.go
@@ -81,6 +81,6 @@ func sendToGotify(mess GotifyMessage) {
if resp.StatusCode != http.StatusOK {
Log.Errorln("Gotify server returned non-OK status:", resp.Status)
} else {
- Log.Println("Push successfully sent to Gotify")
+ Log.Debugln("Push successfully sent to Gotify")
}
}
diff --git a/main.go b/main.go
index a4235c8..cc19f5f 100644
--- a/main.go
+++ b/main.go
@@ -49,7 +49,7 @@ func main() {
log.Infof("Gotify Push Enabled: %v", cfg.Gotify.Enable)
if cfg.Gotify.Enable {
- log.Infof("Gotify Push NewDXCC %v - NewBand %v - NewMode %v - NewBandAndMode %v", cfg.Gotify.NewDXCC, cfg.Gotify.NewBand, cfg.Gotify.NewMode, cfg.Gotify.NewBandAndMode)
+ log.Infof("Gotify Push NewDXCC: %v - NewBand: %v - NewMode: %v - NewBandAndMode: %v", cfg.Gotify.NewDXCC, cfg.Gotify.NewBand, cfg.Gotify.NewMode, cfg.Gotify.NewBandAndMode)
}
// Load country.xml to get all the DXCC number