From 49306843e8ad29d4a247bf84268f613f8fe62e09 Mon Sep 17 00:00:00 2001 From: xtophe Date: Sun, 23 Aug 2020 19:56:51 +0200 Subject: [PATCH 1/3] bug: load IP address and port from configuration file --- .../main/java/org/josast/ApplicationAmicalsat/Controler.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ApplicationAmicalsat/src/main/java/org/josast/ApplicationAmicalsat/Controler.java b/ApplicationAmicalsat/src/main/java/org/josast/ApplicationAmicalsat/Controler.java index 3caf7fb6..c2d90313 100644 --- a/ApplicationAmicalsat/src/main/java/org/josast/ApplicationAmicalsat/Controler.java +++ b/ApplicationAmicalsat/src/main/java/org/josast/ApplicationAmicalsat/Controler.java @@ -558,6 +558,9 @@ public class Controler { TextFieldSIDSEntrysat.setText(conf.getSIDSAMSATSource()); TextFieldSIDSSatnogs.setText(conf.getSIDSSatnogsSource()); + + FieldIP.setText(conf.getSoundModemIP()); + FieldPort.setText(conf.getSoundModemPort()); if (conf.isSIDS_AMSAT()) { CheckbBoxAmicalSat.setSelected(true); -- GitLab From 1a6d04459a23a4a0c04f8d5aeef65ccf368f3c02 Mon Sep 17 00:00:00 2001 From: xtophe Date: Sun, 23 Aug 2020 20:03:22 +0200 Subject: [PATCH 2/3] minor : update version to 1.1 and remove print --- .../java/org/josast/ApplicationAmicalsat/Configuration.java | 2 +- .../main/java/org/josast/ApplicationAmicalsat/Controler.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ApplicationAmicalsat/src/main/java/org/josast/ApplicationAmicalsat/Configuration.java b/ApplicationAmicalsat/src/main/java/org/josast/ApplicationAmicalsat/Configuration.java index e53a3d2a..79f842b0 100644 --- a/ApplicationAmicalsat/src/main/java/org/josast/ApplicationAmicalsat/Configuration.java +++ b/ApplicationAmicalsat/src/main/java/org/josast/ApplicationAmicalsat/Configuration.java @@ -139,7 +139,7 @@ public class Configuration { conf.SetProperty("soundModemPort",this.soundModemPort); conf.SetProperty("soundModemIP",this.soundModemIP); conf.SetProperty("NoradID",""+this.Norad); - System.out.println("conf Norad" + this.Norad); + } public String getCallsign() { diff --git a/ApplicationAmicalsat/src/main/java/org/josast/ApplicationAmicalsat/Controler.java b/ApplicationAmicalsat/src/main/java/org/josast/ApplicationAmicalsat/Controler.java index c2d90313..c04f2967 100644 --- a/ApplicationAmicalsat/src/main/java/org/josast/ApplicationAmicalsat/Controler.java +++ b/ApplicationAmicalsat/src/main/java/org/josast/ApplicationAmicalsat/Controler.java @@ -64,7 +64,7 @@ public class Controler { private static Logger appLogger = Logger.getLogger("AmsatLogger"); - private String version = "1.0"; + private String version = "1.1"; @FXML private Button ButtonStart; -- GitLab From 9b8d9bb8566bfc71647f97fb2cbdcf055a32cd13 Mon Sep 17 00:00:00 2001 From: xtophe Date: Sat, 29 Aug 2020 10:39:31 +0200 Subject: [PATCH 3/3] bug : Add Soundmodem configuration --- .../main/java/org/josast/ApplicationAmicalsat/Controler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ApplicationAmicalsat/src/main/java/org/josast/ApplicationAmicalsat/Controler.java b/ApplicationAmicalsat/src/main/java/org/josast/ApplicationAmicalsat/Controler.java index c04f2967..ad295895 100644 --- a/ApplicationAmicalsat/src/main/java/org/josast/ApplicationAmicalsat/Controler.java +++ b/ApplicationAmicalsat/src/main/java/org/josast/ApplicationAmicalsat/Controler.java @@ -600,7 +600,7 @@ public class Controler { ver = c.GetProperty("AmicalsatVersion"); message = c.GetProperty("Message"); String noradid = c.GetProperty("NoradID"); - System.err.println(noradid); + if(noradid!=null) { NoradIdConf = Integer -- GitLab