From 59428b63feeb3bc5da1166c49eb030f9aaf70e27 Mon Sep 17 00:00:00 2001
From: chris <chris@XtofS8>
Date: Sun, 26 Jun 2022 13:13:48 +0200
Subject: [PATCH 1/7] refactor

---
 .../org/josast/ApplicationKissTool/Configuration.java    | 7 ++++---
 .../java/org/josast/ApplicationKissTool/Controler.java   | 2 +-
 .../src/main/java/org/josast/SIDS/HttpPostSIDS.java      | 2 +-
 .../src/main/java/org/josast/SIDS/app/TestSIDS.java      | 9 +++++----
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/Configuration.java b/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/Configuration.java
index 71c5501d..6e8ce3cc 100644
--- a/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/Configuration.java
+++ b/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/Configuration.java
@@ -89,8 +89,9 @@ public class Configuration {
       if (SilentMode.contentEquals("1")) {
         Silent_Mode = true;
 
-      } else {Silent_Mode = false;
-}
+      } else {
+        Silent_Mode = false;
+      }
 
     } else // si le fichier n'existe pas, il est créé par défaut
     {
@@ -132,7 +133,7 @@ public class Configuration {
 
   public void save() {
 
-	conf.setProperty("Norad", ""+Norad);
+    conf.setProperty("Norad", "" + Norad);
     conf.setProperty("Callsign", callsign);
     conf.setProperty("Latitude", latitude);
     conf.setProperty("Longitude", longitude);
diff --git a/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/Controler.java b/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/Controler.java
index eab64474..cb23247f 100644
--- a/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/Controler.java
+++ b/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/Controler.java
@@ -62,7 +62,7 @@ public class Controler {
 
   private ManageDataFile mdf = new ManageDataFile();
 
-  private String version = "1.8";
+  private String version = "1.9";
 
   @FXML private Button ButtonStart;
   @FXML private Button ButtonStop;
diff --git a/ModuleSIDS/src/main/java/org/josast/SIDS/HttpPostSIDS.java b/ModuleSIDS/src/main/java/org/josast/SIDS/HttpPostSIDS.java
index 5b49eeae..0a703b77 100644
--- a/ModuleSIDS/src/main/java/org/josast/SIDS/HttpPostSIDS.java
+++ b/ModuleSIDS/src/main/java/org/josast/SIDS/HttpPostSIDS.java
@@ -124,7 +124,7 @@ public class HttpPostSIDS {
       resultat = response.getStatusLine().getStatusCode();
       logger.info("URL Result " + resultat);
       logger.info("URL Result " + response.getAllHeaders());
-     
+
     } catch (IOException e) {
       logger.severe("Cient executon error" + e.toString());
     }
diff --git a/ModuleSIDS/src/main/java/org/josast/SIDS/app/TestSIDS.java b/ModuleSIDS/src/main/java/org/josast/SIDS/app/TestSIDS.java
index d833b1a1..02f0ed3e 100644
--- a/ModuleSIDS/src/main/java/org/josast/SIDS/app/TestSIDS.java
+++ b/ModuleSIDS/src/main/java/org/josast/SIDS/app/TestSIDS.java
@@ -42,14 +42,15 @@ public class TestSIDS {
     sids.setStation(st);
     sids.setNoradID(43132);
     sids.setTelemetryData(
-    GregorianCalendar.getInstance().getTime(),
+        GregorianCalendar.getInstance().getTime(),
         "a09286a682a8e0a09286a682a86503f00901e9ae006c2ae404c019380000000000000000000000000000000002b602b807d7066e04100e5a04100a5dfff7fff70420b4000000ffff78000000000012000000000000000000000000000000003ddee2da3d011cee3e71aa4d000000000001cb9a0004003089f00a0400010000000000");
     System.out.println(sids.toStringBasic());
     test.send(sids);
     //        sids.setNoradID(99749);
-//    sids.setTelemetryData(
-//        GregorianCalendar.getInstance().getTime(),
-//        "8c6c96a88240e09e9c60648ca46103f0000000000801ca5c0012100319240a0d4b5f0600ff2800002822443e6fb0870d0a24c0");
+    //    sids.setTelemetryData(
+    //        GregorianCalendar.getInstance().getTime(),
+    //
+    // "8c6c96a88240e09e9c60648ca46103f0000000000801ca5c0012100319240a0d4b5f0600ff2800002822443e6fb0870d0a24c0");
     //        System.out.println(sids.toStringBasic());
     //        test.send(sids);
   }
-- 
GitLab


From 83e401abf0107bb23fa2493b408e19aec395bf3c Mon Sep 17 00:00:00 2001
From: chris <chris@XtofS8>
Date: Tue, 12 Jul 2022 07:05:51 +0200
Subject: [PATCH 2/7] Refactoring : improve sids management

---
 ApplicationKissTool/KissToolMessage.txt       |  4 +-
 ApplicationKissTool/pom.xml                   |  6 +-
 .../ApplicationKissTool/Configuration.java    |  9 ++-
 .../josast/ApplicationKissTool/Controler.java | 65 +++++++++++++------
 .../ApplicationKissTool/SatelliteNorad.java   | 18 ++++-
 .../josast/ApplicationKissTool/SendSIDS.java  |  5 ++
 .../TaskManageReceivedData.java               | 12 ++--
 .../josast/ApplicationKissTool/KissTool.fxml  | 38 +++++++----
 8 files changed, 115 insertions(+), 42 deletions(-)

diff --git a/ApplicationKissTool/KissToolMessage.txt b/ApplicationKissTool/KissToolMessage.txt
index c18f2677..561c3ce7 100644
--- a/ApplicationKissTool/KissToolMessage.txt
+++ b/ApplicationKissTool/KissToolMessage.txt
@@ -1,4 +1,4 @@
-Kisstool=1.5
-Message= KissTool for UVSQsat - UVSQsat launch 23/01/21 14H24 UTC
+Kisstool=1.9
+Message= KissTool updated for UVSQsat & Picsat
 NoradID=99749
 Comment=0
\ No newline at end of file
diff --git a/ApplicationKissTool/pom.xml b/ApplicationKissTool/pom.xml
index 62c1bc2b..ed738f02 100644
--- a/ApplicationKissTool/pom.xml
+++ b/ApplicationKissTool/pom.xml
@@ -26,7 +26,11 @@
 	</properties>
 
     <dependencies>
-    
+    <dependency>
+  <groupId>com.google.code.gson</groupId>
+  <artifactId>gson</artifactId>
+  <version>2.8.6</version>
+</dependency>
     <dependency>
 			<groupId>org.openjfx</groupId>
 			<artifactId>javafx-controls</artifactId>
diff --git a/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/Configuration.java b/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/Configuration.java
index 6e8ce3cc..74b5270e 100644
--- a/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/Configuration.java
+++ b/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/Configuration.java
@@ -36,7 +36,7 @@ public class Configuration {
   private String OutputFileDirectory = ".";
 
   private int Norad = 99999;
-  private String Norads;
+  private String norads = null;
   private final CONFIG conf = CONFIG.getInstance();
   private boolean SIDS_Picsat = false;
   private String SIDSPicsatSource = "Anonymous";
@@ -55,7 +55,7 @@ public class Configuration {
       callsign = conf.getProperty("Callsign");
       latitude = conf.getProperty("Latitude");
       longitude = conf.getProperty("Longitude");
-      Norads = conf.getProperty("Norad");
+      norads = conf.getProperty("Norad");
       SIDSAMSATSource = conf.getProperty("SIDSAMSATSource");
       SIDSAMSATUrl = conf.getProperty("SIDSAMSATUrl");
       SIDSSatnogsSource = conf.getProperty("SIDSSatnogsSource");
@@ -70,7 +70,10 @@ public class Configuration {
       soundModemPort = conf.getProperty("soundModemPort");
       OutputFileDirectory = conf.getProperty("OutputFileDirectory");
       SilentMode = conf.getProperty("SilentMode");
-      Norad = Integer.getInteger(Norads);
+      if (norads != null) {
+        System.out.println(norads);
+        Norad = Integer.parseInt(norads);
+      }
       if (SIDSSatnogs.contentEquals("1")) {
         SISD_SatNogs = true;
       } else {
diff --git a/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/Controler.java b/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/Controler.java
index cb23247f..068f0b9f 100644
--- a/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/Controler.java
+++ b/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/Controler.java
@@ -62,7 +62,7 @@ public class Controler {
 
   private ManageDataFile mdf = new ManageDataFile();
 
-  private String version = "1.9";
+  private String version = "1.10";
 
   @FXML private Button ButtonStart;
   @FXML private Button ButtonStop;
@@ -117,6 +117,13 @@ public class Controler {
   @FXML private Circle CircleDatabaseAmsatF;
 
   @FXML private ComboBox<SatelliteNorad> ComboBoxSatellite;
+
+  @FXML private Label LabelAmsatSent;
+  @FXML private Label LabelPicsatSent;
+  @FXML private Label LabelSatnogsSent;
+
+  @FXML private Label LastDecoded;
+
   ScheduledExecutorService ses = Executors.newScheduledThreadPool(1);
   private ScheduledFuture<?> scheduledFuture = null;
 
@@ -142,6 +149,7 @@ public class Controler {
   private long nbAmsatDatabase = 0;
   private long nbSatnogsDatabase = 0;
   private long picsatDatabase = 0;
+  private SatelliteNoradFile satnorad;
 
   public void setReceivedFrame(BlockingQueue<ReceivedData> receivedFrame) {
     this.receivedFrame = receivedFrame;
@@ -214,10 +222,13 @@ public class Controler {
     Station StationPicsat =
         new Station(conf.getSIDSPicsatSource(), station.getLongitude(), station.getLatitude());
 
+    SendSIDSMVPAmsat = new SendSIDS(StationEntry, conf.getNorad(), conf.getSIDSAMSATUrl());
+    SendSIDSPicsat = new SendSIDS(StationPicsat, conf.getNorad(), conf.getSIDSPicsatsURL());
+    SendSIDSSatnogs = new SendSIDS(StationSatnogs, conf.getNorad(), conf.getSIDSSatnogsURL());
+
     if (CheckbBoxAmicalSat.isSelected() == true) {
       conf.setSIDSAMSAT("1");
 
-      SendSIDSMVPAmsat = new SendSIDS(StationEntry, conf.getNorad(), conf.getSIDSAMSATUrl());
     } else {
       conf.setSIDSAMSAT("0");
     }
@@ -225,7 +236,6 @@ public class Controler {
     if (CheckBoxSatPicsat.isSelected() == true) {
       conf.setSIDSPicsat("1");
 
-      SendSIDSPicsat = new SendSIDS(StationPicsat, conf.getNorad(), conf.getSIDSPicsatsURL());
     } else {
       conf.setSIDSPicsat("0");
     }
@@ -233,7 +243,6 @@ public class Controler {
     if (CheckBoxSatNogs.isSelected() == true) {
       conf.setSIDSSatnogs("1");
 
-      SendSIDSSatnogs = new SendSIDS(StationSatnogs, conf.getNorad(), conf.getSIDSSatnogsURL());
     } else {
       conf.setSIDSSatnogs("0");
     }
@@ -328,6 +337,8 @@ public class Controler {
     SatelliteNorad sat = ComboBoxSatellite.getSelectionModel().getSelectedItem();
     displayLog(sat.getName() + " " + sat.getNoradId());
     selectedNoradId = sat.getNoradId();
+    conf.setNorad(selectedNoradId);
+    conf.save();
   }
 
   @FXML
@@ -336,15 +347,20 @@ public class Controler {
   public void initMMI() {
 
     manageStatusinformation("Initialised", "KISS TOOL  - LOG \r\n Initialise application");
-    SatelliteNorad uvsqsat = new SatelliteNorad("UVSQsat", 47438);
-    SatelliteNorad Defaut = new SatelliteNorad("Defaut", conf.getNorad());
-    SatelliteNorad picsat = new SatelliteNorad("Picsat", 43132);
+    // SatelliteNorad uvsqsat = new SatelliteNorad("UVSQsat", 47438);
+    // SatelliteNorad Defaut = new SatelliteNorad("Defaut", conf.getNorad());
+    // SatelliteNorad picsat = new SatelliteNorad("Picsat", 43132);
+    satnorad = new SatelliteNoradFile();
+    satnorad.readFile("SatelliteNoradList.json");
     selectedNoradId = conf.getNorad();
     ObservableList<SatelliteNorad> list =
-        FXCollections.observableArrayList(Defaut, uvsqsat, picsat);
+        FXCollections.observableArrayList(satnorad.getSatelliteNoradList());
     ComboBoxSatellite.setItems(list);
     ComboBoxSatellite.getSelectionModel().select(0);
-
+    LabelAmsatSent.setText("0");
+    LabelPicsatSent.setText("0");
+    LabelSatnogsSent.setText("0");
+    ;
     Runnable task1 =
         () -> {
           Date date = new Date();
@@ -453,14 +469,12 @@ public class Controler {
         new Station(conf.getSIDSSatnogsSource(), station.getLongitude(), station.getLatitude());
     Station StationEntry =
         new Station(conf.getSIDSAMSATSource(), station.getLongitude(), station.getLatitude());
+    Station StationPicsat =
+        new Station(conf.getSIDSPicsatSource(), station.getLongitude(), station.getLatitude());
 
-    if (conf.isSISD_SatNogs() == true) {
-      SendSIDSSatnogs = new SendSIDS(StationSatnogs, conf.getNorad(), conf.getSIDSSatnogsURL());
-    }
-
-    if (conf.isSIDS_AMSAT() == true) {
-      SendSIDSMVPAmsat = new SendSIDS(StationEntry, conf.getNorad(), conf.getSIDSAMSATUrl());
-    }
+    SendSIDSSatnogs = new SendSIDS(StationSatnogs, conf.getNorad(), conf.getSIDSSatnogsURL());
+    SendSIDSMVPAmsat = new SendSIDS(StationEntry, conf.getNorad(), conf.getSIDSAMSATUrl());
+    SendSIDSPicsat = new SendSIDS(StationPicsat, conf.getNorad(), conf.getSIDSPicsatsURL());
 
     String erreurmsg = message;
 
@@ -483,6 +497,10 @@ public class Controler {
             + nbframeTraited
             + " Sent :  Amsat - "
             + this.nbAmsatDatabase);
+
+    LabelAmsatSent.setText("" + nbAmsatDatabase);
+    LabelPicsatSent.setText("" + picsatDatabase);
+    LabelSatnogsSent.setText("" + nbSatnogsDatabase);
   }
 
   public void IncrementNbFrame() {
@@ -536,10 +554,11 @@ public class Controler {
     displayLog(logMessage);
   }
 
-  public void SendSids(ReceivedData receivedData) {
+  public void SendSids(ReceivedData receivedData, int noradframe) {
 
+    LastDecoded.setText("" + noradframe);
     if (conf.isSIDS_AMSAT() == true) {
-      int results = SendSIDSMVPAmsat.Send(receivedData, selectedNoradId);
+      int results = SendSIDSMVPAmsat.Send(receivedData, noradframe);
       if (SendSIDSMVPAmsat.isCorrectSend(results)) {
         CircleDatabaseAmsatF.setFill(Color.GREEN);
         nbAmsatDatabase++;
@@ -550,7 +569,7 @@ public class Controler {
     }
 
     if (conf.isSISD_SatNogs() == true) {
-      int results = SendSIDSSatnogs.Send(receivedData, selectedNoradId);
+      int results = SendSIDSSatnogs.Send(receivedData, noradframe);
       if (SendSIDSSatnogs.isCorrectSend(results)) {
         CircleDatabaseSatnogs.setFill(Color.GREEN);
         nbSatnogsDatabase++;
@@ -560,12 +579,13 @@ public class Controler {
       }
     }
     if (conf.isSIDS_Picsat() == true) {
-      int results = SendSIDSPicsat.Send(receivedData, selectedNoradId);
+      int results = SendSIDSPicsat.Send(receivedData, noradframe);
       if (SendSIDSPicsat.isCorrectSend(results)) {
         CircleDatabasePicsat.setFill(Color.GREEN);
         picsatDatabase++;
       } else {
         displayLog("Send SIDS Picsat Database : " + results);
+        displayLog(SendSIDSPicsat.getMessageAnswer());
         CircleDatabasePicsat.setFill(Color.RED);
       }
     }
@@ -578,4 +598,9 @@ public class Controler {
   public void SetDecodedData(String data) {
     DecodedData.appendText(data);
   }
+
+  public int getNorad(String rcvCallsign) {
+    int norad = satnorad.getNorad(rcvCallsign);
+    return norad;
+  }
 }
diff --git a/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/SatelliteNorad.java b/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/SatelliteNorad.java
index f8b80818..4b2c9f6e 100644
--- a/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/SatelliteNorad.java
+++ b/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/SatelliteNorad.java
@@ -4,6 +4,7 @@ public class SatelliteNorad {
 
   int noradId;
   String name;
+  String indicatif = null;
 
   public SatelliteNorad(String name, int noradId) {
     super();
@@ -11,10 +12,21 @@ public class SatelliteNorad {
     this.name = name;
   }
 
+  public SatelliteNorad(String name, int noradId, String indicatif) {
+    super();
+    this.noradId = noradId;
+    this.name = name;
+    this.indicatif = indicatif;
+  }
+
   public int getNoradId() {
     return noradId;
   }
 
+  public String getCallsign() {
+    return this.indicatif;
+  }
+
   public void setNoradId(int noradId) {
     this.noradId = noradId;
   }
@@ -29,6 +41,10 @@ public class SatelliteNorad {
 
   @Override
   public String toString() {
-    return name;
+    return name + " " + noradId;
+  }
+
+  public String toStringFull() {
+    return name + " " + noradId + " " + this.indicatif;
   }
 }
diff --git a/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/SendSIDS.java b/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/SendSIDS.java
index 61360fb4..0e6f16b2 100644
--- a/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/SendSIDS.java
+++ b/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/SendSIDS.java
@@ -43,4 +43,9 @@ public class SendSIDS {
 
     return result;
   }
+
+  public String getMessageAnswer() {
+    // TODO Auto-generated method stub
+    return client.getMessageAnswer();
+  }
 }
diff --git a/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/TaskManageReceivedData.java b/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/TaskManageReceivedData.java
index 6c72d92e..f81fff29 100644
--- a/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/TaskManageReceivedData.java
+++ b/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/TaskManageReceivedData.java
@@ -58,6 +58,8 @@ public class TaskManageReceivedData extends Task<String> {
           @Override
           public void run() {
 
+            String rcvCallsign = ax25display.GetCallsignFrom();
+
             try {
               //   ctrl.displayLog("Display Data");
 
@@ -72,8 +74,9 @@ public class TaskManageReceivedData extends Task<String> {
                   ctrl.SetDecodedData(displayUVSQsat.getData());
                 }
               }
-
-              ctrl.SendSids(decodedData);
+              int noradframe = ctrl.getNorad(rcvCallsign);
+              if (noradframe == 0) noradframe = conf.getNorad();
+              ctrl.SendSids(decodedData, noradframe);
               ctrl.IncrementNbFrameTraited();
 
             } catch (Exception e) {
@@ -88,14 +91,14 @@ public class TaskManageReceivedData extends Task<String> {
   @Override
   protected String call() throws Exception {
 
-    System.out.println("tache message lancéee");
+    displayLog("Message Treatment Lanched");
 
     Date lastFrameTime;
     displayLog("Waiting Data !!!");
     while (true) {
 
       ReceivedData decodedData = blockingQueue.take();
-      displayLog(" Data !!!");
+      //  displayLog(" Data !!!");
 
       ax25display.setdata(decodedData);
       String calsignr = ax25display.GetCallsignFrom();
@@ -120,6 +123,7 @@ public class TaskManageReceivedData extends Task<String> {
               conf.getLongitude(),
               conf.getLatitude(),
               creationdate);
+      mdf.setRepositoryPath(conf.getOutputFileDirectory());
       if (mdf.saveTlmData(tlmData) != 0) {
         displayLog("Error creation JSON file");
       }
diff --git a/ApplicationKissTool/src/main/resources/org/josast/ApplicationKissTool/KissTool.fxml b/ApplicationKissTool/src/main/resources/org/josast/ApplicationKissTool/KissTool.fxml
index a0bc52a9..373986ee 100644
--- a/ApplicationKissTool/src/main/resources/org/josast/ApplicationKissTool/KissTool.fxml
+++ b/ApplicationKissTool/src/main/resources/org/josast/ApplicationKissTool/KissTool.fxml
@@ -12,13 +12,13 @@
 <?import javafx.scene.image.ImageView?>
 <?import javafx.scene.layout.BorderPane?>
 <?import javafx.scene.layout.ColumnConstraints?>
-<?import javafx.scene.layout.FlowPane?>
 <?import javafx.scene.layout.GridPane?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.RowConstraints?>
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.shape.Circle?>
 <?import javafx.scene.text.Font?>
+<?import javafx.scene.text.TextFlow?>
 
 <BorderPane minHeight="-Infinity" minWidth="-Infinity" xmlns="http://javafx.com/javafx/18" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.josast.ApplicationKissTool.Controler">
    <top>
@@ -26,13 +26,14 @@
          <children>
             <ImageView fx:id="ImageViewAMSAT" fitHeight="100.0" fitWidth="100.0" pickOnBounds="true" preserveRatio="true">
               </ImageView>
+            <Label />
             <VBox>
                <children>
                   <HBox>
                      <children>
                         <VBox>
                            <children>
-                              <HBox alignment="CENTER" prefHeight="45.0" prefWidth="407.0" spacing="20.0">
+                              <HBox alignment="CENTER" spacing="20.0">
                                  <children>
                                     <Button fx:id="ButtonStart" mnemonicParsing="false" onAction="#handleStart" text="Start" />
                                     <Button fx:id="ButtonStop" mnemonicParsing="false" onAction="#handleStop" text="Stop" />
@@ -48,16 +49,28 @@
                               </HBox>
                               <HBox alignment="TOP_CENTER">
                                  <children>
-                                    <Label fx:id="labelModem2" text="Satellite :" textAlignment="CENTER" />
+                                    <Label fx:id="labelModem2" alignment="CENTER" text="Default Satellite :" />
                                     <ComboBox fx:id="ComboBoxSatellite" onAction="#HandleSelectSatellite" prefWidth="150.0" />
                                  </children>
                               </HBox>
+                              <HBox alignment="TOP_CENTER">
+                                 <children>
+                                    <Label text="Last Decoded: ">
+                                       <font>
+                                          <Font name="System Bold" size="12.0" />
+                                       </font>
+                                    </Label>
+                                    <Label fx:id="LastDecoded" text="None" />
+                                 </children>
+                              </HBox>
                            </children>
                         </VBox>
                         <GridPane>
                           <columnConstraints>
                             <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
                             <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                              <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                              <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
                           </columnConstraints>
                           <rowConstraints>
                             <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
@@ -76,29 +89,32 @@
                                     <Circle fx:id="CircleModem" fill="#d5d5d5" radius="8.0" stroke="BLACK" strokeType="INSIDE" />
                                  </children>
                               </HBox>
-                              <HBox GridPane.columnIndex="1" GridPane.rowIndex="2">
+                              <HBox alignment="CENTER_RIGHT" GridPane.columnIndex="2" GridPane.halignment="CENTER" GridPane.rowIndex="2">
                                  <children>
-                                    <Label fx:id="labelModem1" text="Satnogs : " />
+                                    <Label fx:id="labelModem1" contentDisplay="CENTER" text="Satnogs : " />
                                     <Circle fx:id="CircleDatabaseSatnogs" fill="#d5d5d5" radius="8.0" stroke="BLACK" strokeType="INSIDE" />
                                  </children>
                               </HBox>
-                              <HBox GridPane.columnIndex="1" GridPane.rowIndex="3">
+                              <HBox alignment="CENTER_RIGHT" GridPane.columnIndex="2" GridPane.halignment="CENTER" GridPane.rowIndex="1">
                                  <children>
-                                    <Label fx:id="labelModem11" contentDisplay="CENTER" text=" Picsat : " />
+                                    <Label fx:id="labelModem11" alignment="CENTER" contentDisplay="CENTER" text=" Picsat : " />
                                     <Circle fx:id="CircleDatabasePicsat" fill="#d5d5d5" radius="8.0" stroke="BLACK" strokeType="INSIDE" />
                                  </children>
                               </HBox>
-                              <HBox GridPane.rowIndex="3">
+                              <HBox alignment="CENTER_RIGHT" GridPane.columnIndex="2" GridPane.valignment="CENTER">
                                  <children>
-                                    <Label fx:id="labelModem111" text="Amsat-F : " />
+                                    <Label fx:id="labelModem111" alignment="CENTER" text="Amsat-F : " />
                                     <Circle fx:id="CircleDatabaseAmsatF" fill="#d5d5d5" radius="8.0" stroke="BLACK" strokeType="INSIDE" />
                                  </children>
                               </HBox>
+                              <Label fx:id="LabelAmsatSent" alignment="CENTER" text="0" textAlignment="CENTER" GridPane.columnIndex="3" GridPane.halignment="CENTER" GridPane.valignment="CENTER" />
+                              <Label fx:id="LabelPicsatSent" text="0" GridPane.columnIndex="3" GridPane.halignment="CENTER" GridPane.rowIndex="1" />
+                              <Label fx:id="LabelSatnogsSent" text="0" GridPane.columnIndex="3" GridPane.halignment="CENTER" GridPane.rowIndex="2" />
                            </children>
                         </GridPane>
                      </children>
                   </HBox>
-                  <FlowPane alignment="CENTER">
+                  <TextFlow textAlignment="CENTER">
                      <children>
                         <Label fx:id="LabelInformation" text=" 2" textAlignment="CENTER">
                            <font>
@@ -106,7 +122,7 @@
                            </font>
                         </Label>
                      </children>
-                  </FlowPane>
+                  </TextFlow>
                </children>
             </VBox>
             <ImageView fx:id="imageViewEntrysat" fitHeight="67.0" fitWidth="200.0" pickOnBounds="true" preserveRatio="true">
-- 
GitLab


From 6490761619ab3a8ad2ae66f30d6359d013c125b6 Mon Sep 17 00:00:00 2001
From: xtophe <christophe.mcr@gmail.com>
Date: Thu, 14 Jul 2022 10:22:15 +0200
Subject: [PATCH 3/7] update

---
 ApplicationKissTool/pom.xml | 2 +-
 pom.xml                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ApplicationKissTool/pom.xml b/ApplicationKissTool/pom.xml
index ed738f02..67228243 100644
--- a/ApplicationKissTool/pom.xml
+++ b/ApplicationKissTool/pom.xml
@@ -70,7 +70,7 @@
 <dependency>
     <groupId>org.json</groupId>
     <artifactId>json</artifactId>
-    <version>20210307</version>
+    <version>20220320</version>
 </dependency>
     
  
diff --git a/pom.xml b/pom.xml
index 161a43d2..f43b9528 100644
--- a/pom.xml
+++ b/pom.xml
@@ -734,7 +734,7 @@
             
     <groupId>com.coveo</groupId>
     <artifactId>fmt-maven-plugin</artifactId>
-    <version>2.9.1</version>
+    <version>2.13 </version>
     <configuration>
         <sourceDirectory>src/main/java</sourceDirectory>
         <testSourceDirectory>src/test/java</testSourceDirectory>
-- 
GitLab


From aeabc262bc84c29fde2f4c4e48a7ebe6b104fe5f Mon Sep 17 00:00:00 2001
From: xtophe <christophe.mcr@gmail.com>
Date: Sun, 30 Oct 2022 18:32:57 +0100
Subject: [PATCH 4/7] refactor - minor change update some verson on pom.xml

---
 .../josast/ApplicationAmicalsat/SendSIDS.java |  4 +-
 .../ApplicationAmicalsat/util/LogFile.java    |  4 +-
 .../app/amicalsat/cli/AmicalsatCli.java       |  8 +-
 .../cubesatsim/SoundmodemToInfluxDbCli.java   |  8 +-
 .../cmd/OptionsAnalysis.java                  | 12 +--
 .../cmd/ParameterSingleton.java               | 52 +++--------
 .../java/org/josast/serialtoTNC/ASCII.java    |  4 +-
 .../serialtoTNC/ParameterSingleton.java       | 76 ++++------------
 .../serialtoTNC/options/OptionAnalysis.java   |  8 +-
 .../josast/serialtoTNC/options/SendToTnc.java |  4 +-
 .../serialtoTNC/serial/SerialPortDriver.java  |  8 +-
 .../serialtoTNC/type/TncCommandeType.java     |  4 +-
 .../josast/UVSQsatDecoder/Ax25Display.java    | 12 +--
 .../josast/UVSQsatDecoder/DisplayUVSQsat.java |  4 +-
 .../org/josast/UVSQsatDecoder/SendSIDS.java   |  4 +-
 .../josast/UVSQsatDecoder/util/LogFile.java   |  4 +-
 ModuleAPRSIS/pom.xml                          |  2 +-
 .../josast/aprsis/AThreadInputStream.java     |  8 +-
 .../josast/aprsis/AprsIsConfiguration.java    | 12 +--
 .../avmdti/josast/aprsis/demo/DemoAPRSIS.java |  4 +-
 .../generated/FrameTlmAmicalsat.java          |  4 +-
 .../josast/amicalsat/FrameFactoryTest.java    | 20 ++---
 .../databinding/AbstractDataBinding.java      |  4 +-
 .../ConfigurationdataBindingDemo.java         | 15 ++--
 .../main/java/org/josast/property/CONFIG.java |  2 +-
 .../org/josast/property/ConfigObject.java     | 12 +--
 .../org/josast/propertyHttp/ConfigHttp.java   |  8 +-
 .../josast/config/databinding/test.java       | 16 +---
 ModuleCubesatSim/pom.xml                      |  4 +-
 .../org/josast/CubesatSim/TLM/Telemetry.java  |  4 +-
 .../CubesatSim/influxDB/DataCubesatSim.java   | 80 +++++------------
 .../CubesatSim/influxDB/InfluxDBInstance.java |  8 +-
 .../influxDB/InfluxDatabaseConfig.java        | 24 ++---
 .../kaitai/generated/Cubesatsim.java          |  4 +-
 .../main/java/org/josast/TLM/ICalculData.java |  4 +-
 .../src/main/java/org/josast/TLM/TlmData.java |  4 +-
 .../java/org/josast/EntrySat/Telemetry.java   |  4 +-
 .../main/java/org/josast/TLM/ICalculData.java |  4 +-
 .../src/main/java/org/josast/TLM/TlmData.java |  4 +-
 .../kaikai/generated/FrameTlmEntrySat.java    |  4 +-
 .../equationKepler/KeplerFixPpoint.java       | 16 ++--
 .../josast/equationKepler/KeplerNewton.java   | 14 +--
 .../org/josast/equationKepler/KeplerTest.java |  8 +-
 ModuleJourJulien/pom.xml                      |  2 +-
 .../org/josast/util/date/GenericDate.java     | 48 +++-------
 ModuleSIDS/pom.xml                            |  4 +-
 .../java/org/josast/SIDS/HttpPostSIDS.java    | 10 ++-
 .../main/java/org/josast/SIDS/SIDSData.java   |  4 +-
 .../josast/AmsatList/source/ReadCsvFile.java  | 12 +--
 .../AmsatList/source/SimplifiedDK3WM.java     |  8 +-
 .../AmsatList/source/SimplifiedJ9PL.java      |  8 +-
 .../AmsatList/source/SimplifiedN2YO.java      |  8 +-
 .../source/SimplifiedSatnogsTable.java        |  8 +-
 .../AmsatList/source/gcat/LaunchCat.java      | 56 +++---------
 .../source/gcat/LaunchCatTsvFile.java         |  8 +-
 .../josast/AmsatList/source/gcat/OrgsCat.java | 44 +++-------
 .../AmsatList/source/gcat/OrgsCatTsvFile.java | 12 +--
 .../josast/AmsatList/source/gcat/SatCat.java  | 88 +++++--------------
 .../AmsatList/source/gcat/SatcCatTsvFile.java |  8 +-
 .../josast/AmsatList/source/gcat/SiteCat.java | 36 ++------
 .../AmsatList/source/gcat/SiteCatTsvFile.java | 12 +--
 .../gcat/UpdateAmsatListFileWithGsatData.java |  8 +-
 .../AmsatListFile.java                        |  8 +-
 .../CheckAmsatListFile.java                   | 16 +---
 .../ModuleSatelliteDatabase/CheckStatus.java  |  4 +-
 .../FlatSatellite.java                        | 16 +---
 .../FlatSatelliteImp.java                     |  4 +-
 .../UpdateAmsatListFile.java                  |  8 +-
 .../org/josast/util/files/ManageFolder.java   |  8 +-
 .../AmsatList/api/AmsatListRequestTest.java   | 20 ++---
 .../org/avmdti/sound/AudioFormatFactory.java  |  2 +-
 .../java/org/avmdti/sound/SoundRecorder.java  |  4 +-
 .../sound/example/GUIDemoSoundRecorder.java   | 22 ++---
 .../avmdti/sound/example/MyFileFilter.java    |  2 -
 ModuleSoundModem/pom.xml                      |  2 +-
 .../SoundModemConfiguration.java              |  3 +-
 .../org/josast/ModuleSoundModem/kiss.java     |  2 +-
 .../main/java/org/josast/uvsqsat/Frame.java   | 20 ++---
 .../org/josast/uvsqsat/PPrimaryHeader.java    | 56 +++---------
 .../org/josast/uvsqsat/PSecondaryHeader.java  |  4 +-
 .../org/josast/uvsqsat/generated/Uvsqsat.java |  4 +-
 .../josast/uvsqsat/pojogenerated/AFrame.java  |  4 +-
 ModuleUtil/pom.xml                            |  1 -
 .../org/avmdti/josast/util/StringtoByte.java  |  6 +-
 .../josast/util/mathematique/CoordGeo.java    | 24 ++---
 .../josast/util/mathematique/CoordTopo.java   | 16 +---
 ToolsXSDtojava/pom.xml                        | 10 +--
 87 files changed, 314 insertions(+), 845 deletions(-)

diff --git a/ApplicationAmicalsat/src/main/java/org/josast/ApplicationAmicalsat/SendSIDS.java b/ApplicationAmicalsat/src/main/java/org/josast/ApplicationAmicalsat/SendSIDS.java
index 086a8b94..582d76bc 100644
--- a/ApplicationAmicalsat/src/main/java/org/josast/ApplicationAmicalsat/SendSIDS.java
+++ b/ApplicationAmicalsat/src/main/java/org/josast/ApplicationAmicalsat/SendSIDS.java
@@ -6,9 +6,7 @@ import org.josast.SIDS.HttpPostSIDS;
 import org.josast.SIDS.SIDSData;
 import org.josast.SIDS.Station;
 
-/**
- * @author christophe
- */
+/** @author christophe */
 public class SendSIDS {
 
   private static Logger appLogger = Logger.getLogger("AmsatLogger");
diff --git a/ApplicationAmicalsat/src/main/java/org/josast/ApplicationAmicalsat/util/LogFile.java b/ApplicationAmicalsat/src/main/java/org/josast/ApplicationAmicalsat/util/LogFile.java
index d76bed0e..3fa1a3aa 100644
--- a/ApplicationAmicalsat/src/main/java/org/josast/ApplicationAmicalsat/util/LogFile.java
+++ b/ApplicationAmicalsat/src/main/java/org/josast/ApplicationAmicalsat/util/LogFile.java
@@ -9,9 +9,7 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.logging.Logger;
 
-/**
- * @author christophe
- */
+/** @author christophe */
 public class LogFile {
 
   private static Logger appLogger = Logger.getLogger("AmsatLogger");
diff --git a/ApplicationAmicalsatCli/src/main/java/org/josast/app/amicalsat/cli/AmicalsatCli.java b/ApplicationAmicalsatCli/src/main/java/org/josast/app/amicalsat/cli/AmicalsatCli.java
index 3247e786..2bfa3f38 100644
--- a/ApplicationAmicalsatCli/src/main/java/org/josast/app/amicalsat/cli/AmicalsatCli.java
+++ b/ApplicationAmicalsatCli/src/main/java/org/josast/app/amicalsat/cli/AmicalsatCli.java
@@ -6,9 +6,7 @@ import org.josast.app.amicalsat.cli.option.OptionsAnalysis;
 
 public class AmicalsatCli {
 
-  /**
-   * @param args
-   */
+  /** @param args */
   public AmicalsatCli(String[] args) {
     OptionsAnalysis opt = new OptionsAnalysis(args);
     Vector<Cmd> vec = opt.getCommandes();
@@ -17,9 +15,7 @@ public class AmicalsatCli {
     }
   }
 
-  /**
-   * @param args
-   */
+  /** @param args */
   public static void main(String[] args) {
 
     @SuppressWarnings("unused")
diff --git a/ApplicationCubesatSim/src/main/java/org/josast/application/cubesatsim/SoundmodemToInfluxDbCli.java b/ApplicationCubesatSim/src/main/java/org/josast/application/cubesatsim/SoundmodemToInfluxDbCli.java
index e772290c..e34c10ea 100644
--- a/ApplicationCubesatSim/src/main/java/org/josast/application/cubesatsim/SoundmodemToInfluxDbCli.java
+++ b/ApplicationCubesatSim/src/main/java/org/josast/application/cubesatsim/SoundmodemToInfluxDbCli.java
@@ -15,9 +15,7 @@ import org.josast.CubesatSim.influxDB.InfluxDatabaseConfig;
 import org.josast.CubesatSim.kaitai.generated.Cubesatsim.CubesatsimAo7;
 import org.josast.ModuleSoundModem.SoundModemClient;
 
-/**
- * @author christophe
- */
+/** @author christophe */
 public class SoundmodemToInfluxDbCli {
 
   /** Application version. */
@@ -70,9 +68,7 @@ public class SoundmodemToInfluxDbCli {
     return options;
   }
 
-  /**
-   * @param conffile
-   */
+  /** @param conffile */
   public void execute(final String conffile) {
 
     // connection to Sound Modem
diff --git a/ApplicationSatelliteDatabaseCli/src/main/java/org/josast/ApplicationSatelliteDatabaseCli/cmd/OptionsAnalysis.java b/ApplicationSatelliteDatabaseCli/src/main/java/org/josast/ApplicationSatelliteDatabaseCli/cmd/OptionsAnalysis.java
index 8c63b00e..8b544762 100644
--- a/ApplicationSatelliteDatabaseCli/src/main/java/org/josast/ApplicationSatelliteDatabaseCli/cmd/OptionsAnalysis.java
+++ b/ApplicationSatelliteDatabaseCli/src/main/java/org/josast/ApplicationSatelliteDatabaseCli/cmd/OptionsAnalysis.java
@@ -19,9 +19,7 @@ public class OptionsAnalysis {
   /** line. */
   private CommandLine line = null;
 
-  /**
-   * @param args
-   */
+  /** @param args */
   public OptionsAnalysis(final String[] args) {
     options = configParameters();
     CommandLineParser parser = new DefaultParser();
@@ -34,16 +32,12 @@ public class OptionsAnalysis {
     }
   }
 
-  /**
-   * @return list of command.
-   */
+  /** @return list of command. */
   public Vector<Cmd> getCommandes() {
     return listeCmd;
   }
 
-  /**
-   * @param listeCmds
-   */
+  /** @param listeCmds */
   public void setListeCmd(final Vector<Cmd> listeCmds) {
     this.listeCmd = listeCmds;
   }
diff --git a/ApplicationSatelliteDatabaseCli/src/main/java/org/josast/ApplicationSatelliteDatabaseCli/cmd/ParameterSingleton.java b/ApplicationSatelliteDatabaseCli/src/main/java/org/josast/ApplicationSatelliteDatabaseCli/cmd/ParameterSingleton.java
index a860e13b..d717d4f1 100644
--- a/ApplicationSatelliteDatabaseCli/src/main/java/org/josast/ApplicationSatelliteDatabaseCli/cmd/ParameterSingleton.java
+++ b/ApplicationSatelliteDatabaseCli/src/main/java/org/josast/ApplicationSatelliteDatabaseCli/cmd/ParameterSingleton.java
@@ -22,9 +22,7 @@ public final class ParameterSingleton {
 
   private ParameterSingleton() {}
 
-  /**
-   * @return singleton.
-   */
+  /** @return singleton. */
   public static ParameterSingleton getInstance() {
     if (instance == null) {
       instance = new ParameterSingleton();
@@ -35,86 +33,62 @@ public final class ParameterSingleton {
 
   // getters and setters
 
-  /**
-   * @return outputFile.
-   */
+  /** @return outputFile. */
   public String getOutputFile() {
     return outputFile;
   }
 
-  /**
-   * @return inputDirectory.
-   */
+  /** @return inputDirectory. */
   public String getInputDirectory() {
     return inputDirectory;
   }
 
-  /**
-   * @param inputdirectory
-   */
+  /** @param inputdirectory */
   public void setInputDirectory(final String inputdirectory) {
     this.inputDirectory = inputdirectory;
   }
 
-  /**
-   * @return outputDirectory.
-   */
+  /** @return outputDirectory. */
   public String getOutputDirectory() {
     return outputDirectory;
   }
 
-  /**
-   * @param outputdirectory
-   */
+  /** @param outputdirectory */
   public void setOutputDirectory(final String outputdirectory) {
     this.outputDirectory = outputdirectory;
   }
 
-  /**
-   * @param outputfile
-   */
+  /** @param outputfile */
   public void setOutputFile(final String outputfile) {
     outputFile = outputfile;
   }
 
-  /**
-   * @return arg0.
-   */
+  /** @return arg0. */
   public String getArg0() {
     return arg0;
   }
 
-  /**
-   * @param arg
-   */
+  /** @param arg */
   public void setArg0(final String arg) {
     this.arg0 = arg;
   }
 
-  /**
-   * @return option.
-   */
+  /** @return option. */
   public Options getOption() {
     return option;
   }
 
-  /**
-   * @param options
-   */
+  /** @param options */
   public void setOption(final Options options) {
     this.option = options;
   }
 
-  /**
-   * @param optionValue options
-   */
+  /** @param optionValue options */
   public void setInputFile(final String optionValue) {
     inputFile = optionValue;
   }
 
-  /**
-   * @return inputFile.
-   */
+  /** @return inputFile. */
   public String getInputFile() {
     return inputFile;
   }
diff --git a/ApplicationSerial/src/main/java/org/josast/serialtoTNC/ASCII.java b/ApplicationSerial/src/main/java/org/josast/serialtoTNC/ASCII.java
index 8e2f1ac0..62342089 100644
--- a/ApplicationSerial/src/main/java/org/josast/serialtoTNC/ASCII.java
+++ b/ApplicationSerial/src/main/java/org/josast/serialtoTNC/ASCII.java
@@ -1,9 +1,7 @@
 /** */
 package org.josast.serialtoTNC;
 
-/**
- * @author chris
- */
+/** @author chris */
 public class ASCII {
 
   public static final byte ESC = 27;
diff --git a/ApplicationSerial/src/main/java/org/josast/serialtoTNC/ParameterSingleton.java b/ApplicationSerial/src/main/java/org/josast/serialtoTNC/ParameterSingleton.java
index e6df9faa..868c4e0a 100644
--- a/ApplicationSerial/src/main/java/org/josast/serialtoTNC/ParameterSingleton.java
+++ b/ApplicationSerial/src/main/java/org/josast/serialtoTNC/ParameterSingleton.java
@@ -14,30 +14,22 @@ public class ParameterSingleton {
   private int delayCmd = 1000;
   private int delayData = 2000;
 
-  /**
-   * @return the delayCmd
-   */
+  /** @return the delayCmd */
   public int getDelayCmd() {
     return delayCmd;
   }
 
-  /**
-   * @param delayCmd the delayCmd to set
-   */
+  /** @param delayCmd the delayCmd to set */
   public void setDelayCmd(int delayCmd) {
     this.delayCmd = delayCmd;
   }
 
-  /**
-   * @return the delayData
-   */
+  /** @return the delayData */
   public int getDelayData() {
     return delayData;
   }
 
-  /**
-   * @param delayData the delayData to set
-   */
+  /** @param delayData the delayData to set */
   public void setDelayData(int delayData) {
     this.delayData = delayData;
   }
@@ -68,9 +60,7 @@ public class ParameterSingleton {
     }
   }
 
-  /**
-   * @return singleton.
-   */
+  /** @return singleton. */
   public static ParameterSingleton getInstance() {
     if (INSTANCE == null) {
       INSTANCE = new ParameterSingleton();
@@ -79,100 +69,72 @@ public class ParameterSingleton {
     return INSTANCE;
   }
 
-  /**
-   * @return arg0.
-   */
+  /** @return arg0. */
   public String getArg0() {
     return arg0;
   }
 
-  /**
-   * @param arg
-   */
+  /** @param arg */
   public void setArg0(final String arg) {
     this.arg0 = arg;
   }
 
-  /**
-   * @return option.
-   */
+  /** @return option. */
   public Options getOption() {
     return option;
   }
 
-  /**
-   * @param options
-   */
+  /** @param options */
   public void setOption(final Options options) {
     this.option = options;
   }
 
-  /**
-   * @return the callsignto
-   */
+  /** @return the callsignto */
   public String getCallsignto() {
     return callsignto;
   }
 
-  /**
-   * @param callsignto the callsignto to set
-   */
+  /** @param callsignto the callsignto to set */
   public void setCallsignto(String callsignto) {
     this.callsignto = callsignto;
   }
 
-  /**
-   * @return the ssidto
-   */
+  /** @return the ssidto */
   public byte getSsidto() {
     return ssidto;
   }
 
-  /**
-   * @param ssidto the ssidto to set
-   */
+  /** @param ssidto the ssidto to set */
   public void setSsidto(byte ssidto) {
     this.ssidto = ssidto;
   }
 
-  /**
-   * @return the callsignFrom
-   */
+  /** @return the callsignFrom */
   public String getCallsignFrom() {
     return callsignFrom;
   }
 
-  /**
-   * @param callsignFrom the callsignFrom to set
-   */
+  /** @param callsignFrom the callsignFrom to set */
   public void setCallsignFrom(String callsignFrom) {
     this.callsignFrom = callsignFrom;
   }
 
-  /**
-   * @return the ssidfrom
-   */
+  /** @return the ssidfrom */
   public byte getSsidfrom() {
     return ssidfrom;
   }
 
-  /**
-   * @param ssidfrom the ssidfrom to set
-   */
+  /** @param ssidfrom the ssidfrom to set */
   public void setSsidfrom(byte ssidfrom) {
     this.ssidfrom = ssidfrom;
   }
 
-  /**
-   * @return the serialport
-   */
+  /** @return the serialport */
   public String getSerialport() {
     return serialport;
   }
 
-  /**
-   * @param serialport the serialport to set
-   */
+  /** @param serialport the serialport to set */
   public void setSerialport(String serialport) {
     this.serialport = serialport;
   }
diff --git a/ApplicationSerial/src/main/java/org/josast/serialtoTNC/options/OptionAnalysis.java b/ApplicationSerial/src/main/java/org/josast/serialtoTNC/options/OptionAnalysis.java
index 0ce1a8dd..e0f9a484 100644
--- a/ApplicationSerial/src/main/java/org/josast/serialtoTNC/options/OptionAnalysis.java
+++ b/ApplicationSerial/src/main/java/org/josast/serialtoTNC/options/OptionAnalysis.java
@@ -43,16 +43,12 @@ public class OptionAnalysis {
     }
   }
 
-  /**
-   * @return list of command.
-   */
+  /** @return list of command. */
   public Vector<AppCmd> getCommandes() {
     return listeCmd;
   }
 
-  /**
-   * @param listeCmds
-   */
+  /** @param listeCmds */
   public void setListeCmd(final Vector<AppCmd> listeCmds) {
     this.listeCmd = listeCmds;
   }
diff --git a/ApplicationSerial/src/main/java/org/josast/serialtoTNC/options/SendToTnc.java b/ApplicationSerial/src/main/java/org/josast/serialtoTNC/options/SendToTnc.java
index 01fa0a69..133a426e 100644
--- a/ApplicationSerial/src/main/java/org/josast/serialtoTNC/options/SendToTnc.java
+++ b/ApplicationSerial/src/main/java/org/josast/serialtoTNC/options/SendToTnc.java
@@ -8,9 +8,7 @@ import org.josast.serialtoTNC.serial.SerialPortDriver;
 import org.josast.serialtoTNC.type.TncDataType;
 import org.josast.serialtoTNC.type.TncKissType;
 
-/**
- * @author chris
- */
+/** @author chris */
 public class SendToTnc implements AppCmd {
 
   SerialPortDriver sdp;
diff --git a/ApplicationSerial/src/main/java/org/josast/serialtoTNC/serial/SerialPortDriver.java b/ApplicationSerial/src/main/java/org/josast/serialtoTNC/serial/SerialPortDriver.java
index e30d271a..a7b5cab7 100644
--- a/ApplicationSerial/src/main/java/org/josast/serialtoTNC/serial/SerialPortDriver.java
+++ b/ApplicationSerial/src/main/java/org/josast/serialtoTNC/serial/SerialPortDriver.java
@@ -10,16 +10,12 @@ public class SerialPortDriver {
   private static Logger logger = Logger.getLogger("AmsatLogger");
   private SerialPort serialPort = null;
 
-  /**
-   * @return the serialPort
-   */
+  /** @return the serialPort */
   public SerialPort getSerialPort() {
     return serialPort;
   }
 
-  /**
-   * @param serialPort the serialPort to set
-   */
+  /** @param serialPort the serialPort to set */
   public void setSerialPort(SerialPort serialPort) {
     this.serialPort = serialPort;
   }
diff --git a/ApplicationSerial/src/main/java/org/josast/serialtoTNC/type/TncCommandeType.java b/ApplicationSerial/src/main/java/org/josast/serialtoTNC/type/TncCommandeType.java
index f2be1980..4a79348f 100644
--- a/ApplicationSerial/src/main/java/org/josast/serialtoTNC/type/TncCommandeType.java
+++ b/ApplicationSerial/src/main/java/org/josast/serialtoTNC/type/TncCommandeType.java
@@ -5,9 +5,7 @@ import com.fazecast.jSerialComm.SerialPort;
 import java.util.logging.Logger;
 import org.josast.serialtoTNC.ASCII;
 
-/**
- * @author chris
- */
+/** @author chris */
 public class TncCommandeType implements TncDataType {
 
   private static Logger logger = Logger.getLogger("AmsatLogger");
diff --git a/ApplicationUVSQsatDecoder/src/main/java/org/josast/UVSQsatDecoder/Ax25Display.java b/ApplicationUVSQsatDecoder/src/main/java/org/josast/UVSQsatDecoder/Ax25Display.java
index bfe12fe3..21d2699d 100644
--- a/ApplicationUVSQsatDecoder/src/main/java/org/josast/UVSQsatDecoder/Ax25Display.java
+++ b/ApplicationUVSQsatDecoder/src/main/java/org/josast/UVSQsatDecoder/Ax25Display.java
@@ -2,9 +2,7 @@ package org.josast.UVSQsatDecoder;
 
 import org.josast.AX25.AX25DecodedData;
 
-/**
- * @author chris
- */
+/** @author chris */
 
 // @TODO Refactor this class with AX25DecodedData
 
@@ -29,16 +27,12 @@ public class Ax25Display {
     ax25 = new AX25DecodedData(decodedData.getData());
   }
 
-  /**
-   * @return AX25 data
-   */
+  /** @return AX25 data */
   public String getAx25Data() {
     return ax25.toString();
   }
 
-  /**
-   * @return Callsign
-   */
+  /** @return Callsign */
   public String GetCallsignFrom() {
 
     return ax25.source;
diff --git a/ApplicationUVSQsatDecoder/src/main/java/org/josast/UVSQsatDecoder/DisplayUVSQsat.java b/ApplicationUVSQsatDecoder/src/main/java/org/josast/UVSQsatDecoder/DisplayUVSQsat.java
index 368f4832..3e28f4bf 100644
--- a/ApplicationUVSQsatDecoder/src/main/java/org/josast/UVSQsatDecoder/DisplayUVSQsat.java
+++ b/ApplicationUVSQsatDecoder/src/main/java/org/josast/UVSQsatDecoder/DisplayUVSQsat.java
@@ -35,9 +35,7 @@ public class DisplayUVSQsat {
     return sb.toString();
   }
 
-  /**
-   * @return the frame
-   */
+  /** @return the frame */
   public Frame getFrame() {
     return frame;
   }
diff --git a/ApplicationUVSQsatDecoder/src/main/java/org/josast/UVSQsatDecoder/SendSIDS.java b/ApplicationUVSQsatDecoder/src/main/java/org/josast/UVSQsatDecoder/SendSIDS.java
index 3d43b5d8..f92f2892 100644
--- a/ApplicationUVSQsatDecoder/src/main/java/org/josast/UVSQsatDecoder/SendSIDS.java
+++ b/ApplicationUVSQsatDecoder/src/main/java/org/josast/UVSQsatDecoder/SendSIDS.java
@@ -6,9 +6,7 @@ import org.josast.SIDS.HttpPostSIDS;
 import org.josast.SIDS.SIDSData;
 import org.josast.SIDS.Station;
 
-/**
- * @author christophe
- */
+/** @author christophe */
 public class SendSIDS {
 
   private static Logger appLogger = Logger.getLogger("AmsatLogger");
diff --git a/ApplicationUVSQsatDecoder/src/main/java/org/josast/UVSQsatDecoder/util/LogFile.java b/ApplicationUVSQsatDecoder/src/main/java/org/josast/UVSQsatDecoder/util/LogFile.java
index 90709fa4..165547dd 100644
--- a/ApplicationUVSQsatDecoder/src/main/java/org/josast/UVSQsatDecoder/util/LogFile.java
+++ b/ApplicationUVSQsatDecoder/src/main/java/org/josast/UVSQsatDecoder/util/LogFile.java
@@ -9,9 +9,7 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.logging.Logger;
 
-/**
- * @author christophe
- */
+/** @author christophe */
 public class LogFile {
 
   private static Logger appLogger = Logger.getLogger("AmsatLogger");
diff --git a/ModuleAPRSIS/pom.xml b/ModuleAPRSIS/pom.xml
index 5cd7ea12..d391803d 100644
--- a/ModuleAPRSIS/pom.xml
+++ b/ModuleAPRSIS/pom.xml
@@ -30,7 +30,7 @@
             
     <groupId>com.coveo</groupId>
     <artifactId>fmt-maven-plugin</artifactId>
-    <version>2.9</version>
+    <version>2.13</version>
     <configuration>
         <sourceDirectory>src/main/java</sourceDirectory>
         <testSourceDirectory>src/test/java</testSourceDirectory>
diff --git a/ModuleAPRSIS/src/main/java/org/avmdti/josast/aprsis/AThreadInputStream.java b/ModuleAPRSIS/src/main/java/org/avmdti/josast/aprsis/AThreadInputStream.java
index 110fa198..06f80bf1 100644
--- a/ModuleAPRSIS/src/main/java/org/avmdti/josast/aprsis/AThreadInputStream.java
+++ b/ModuleAPRSIS/src/main/java/org/avmdti/josast/aprsis/AThreadInputStream.java
@@ -16,17 +16,13 @@ public class AThreadInputStream extends Thread {
 
   private ICompute compute = null;
 
-  /**
-   * @param compute specific treatment
-   */
+  /** @param compute specific treatment */
   public AThreadInputStream(ICompute compute) {
     super();
     this.compute = compute;
   }
 
-  /**
-   * @see java.lang.Runnable#run()
-   */
+  /** @see java.lang.Runnable#run() */
   public void run() {
     // set the process to actif
     actif = true;
diff --git a/ModuleAPRSIS/src/main/java/org/avmdti/josast/aprsis/AprsIsConfiguration.java b/ModuleAPRSIS/src/main/java/org/avmdti/josast/aprsis/AprsIsConfiguration.java
index 98152f0b..8b8ed0da 100644
--- a/ModuleAPRSIS/src/main/java/org/avmdti/josast/aprsis/AprsIsConfiguration.java
+++ b/ModuleAPRSIS/src/main/java/org/avmdti/josast/aprsis/AprsIsConfiguration.java
@@ -10,9 +10,7 @@ public class AprsIsConfiguration {
   private String host = "rotate.aprs.net"; // "first.aprs.net";
 
   private int port = 14580;
-  /**
-   * @return the callSign used
-   */
+  /** @return the callSign used */
   public String getCall() {
     return call;
   }
@@ -36,9 +34,7 @@ public class AprsIsConfiguration {
   public void setFilter(String filter) {
     this.filter = filter;
   }
-  /**
-   * @return hostname of the server
-   */
+  /** @return hostname of the server */
   public String getHost() {
     return host;
   }
@@ -46,9 +42,7 @@ public class AprsIsConfiguration {
   public void setHost(String host) {
     this.host = host;
   }
-  /**
-   * @return the port number
-   */
+  /** @return the port number */
   public int getPort() {
     return port;
   }
diff --git a/ModuleAPRSIS/src/main/java/org/avmdti/josast/aprsis/demo/DemoAPRSIS.java b/ModuleAPRSIS/src/main/java/org/avmdti/josast/aprsis/demo/DemoAPRSIS.java
index 2683e54a..2e1259a1 100644
--- a/ModuleAPRSIS/src/main/java/org/avmdti/josast/aprsis/demo/DemoAPRSIS.java
+++ b/ModuleAPRSIS/src/main/java/org/avmdti/josast/aprsis/demo/DemoAPRSIS.java
@@ -18,9 +18,7 @@ public class DemoAPRSIS {
   /** Creates a new instance of Main * */
   public DemoAPRSIS() {}
 
-  /**
-   * @param args the command line arguments
-   */
+  /** @param args the command line arguments */
   public static void main(String[] args) {
 
     Logger logger = Logger.getLogger("AmsatLogger");
diff --git a/ModuleAmicalsat/src/main/java/org/josast/amicalsat/generated/FrameTlmAmicalsat.java b/ModuleAmicalsat/src/main/java/org/josast/amicalsat/generated/FrameTlmAmicalsat.java
index 708c4a75..372ff40d 100644
--- a/ModuleAmicalsat/src/main/java/org/josast/amicalsat/generated/FrameTlmAmicalsat.java
+++ b/ModuleAmicalsat/src/main/java/org/josast/amicalsat/generated/FrameTlmAmicalsat.java
@@ -2153,9 +2153,7 @@ public class FrameTlmAmicalsat extends KaitaiStruct {
   private FrameTlmAmicalsat _root;
   private KaitaiStruct _parent;
 
-  /**
-   * @see <a href="https://www.tapr.org/pub_ax25.html">Source</a>
-   */
+  /** @see <a href="https://www.tapr.org/pub_ax25.html">Source</a> */
   public Ax25Frame frameTlmEntrySat() {
     return frameTlmEntrySat;
   }
diff --git a/ModuleAmicalsat/src/test/java/org/josast/amicalsat/FrameFactoryTest.java b/ModuleAmicalsat/src/test/java/org/josast/amicalsat/FrameFactoryTest.java
index 68e5980a..f9c0cc32 100644
--- a/ModuleAmicalsat/src/test/java/org/josast/amicalsat/FrameFactoryTest.java
+++ b/ModuleAmicalsat/src/test/java/org/josast/amicalsat/FrameFactoryTest.java
@@ -17,9 +17,7 @@ import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-/**
- * @author christophe
- */
+/** @author christophe */
 class FrameFactoryTest {
 
   int cpt = 0;
@@ -27,27 +25,19 @@ class FrameFactoryTest {
   byte[] buff = null;
   FrameTlmAmicalsat cube = null;
 
-  /**
-   * @throws java.lang.Exception
-   */
+  /** @throws java.lang.Exception */
   @BeforeAll
   static void setUpBeforeClass() throws Exception {}
 
-  /**
-   * @throws java.lang.Exception
-   */
+  /** @throws java.lang.Exception */
   @AfterAll
   static void tearDownAfterClass() throws Exception {}
 
-  /**
-   * @throws java.lang.Exception
-   */
+  /** @throws java.lang.Exception */
   @BeforeEach
   void setUp() throws Exception {}
 
-  /**
-   * @throws java.lang.Exception
-   */
+  /** @throws java.lang.Exception */
   @AfterEach
   void tearDown() throws Exception {}
 
diff --git a/ModuleConfig/src/main/java/org/josast/config/databinding/AbstractDataBinding.java b/ModuleConfig/src/main/java/org/josast/config/databinding/AbstractDataBinding.java
index 32e5a7e0..b10e362d 100644
--- a/ModuleConfig/src/main/java/org/josast/config/databinding/AbstractDataBinding.java
+++ b/ModuleConfig/src/main/java/org/josast/config/databinding/AbstractDataBinding.java
@@ -71,7 +71,7 @@ public abstract class AbstractDataBinding implements Serializable {
         e1.printStackTrace();
       }
       try {
-        reader.close();
+        if (reader != null) reader.close();
       } catch (IOException e) {
         e.printStackTrace();
       }
@@ -99,7 +99,7 @@ public abstract class AbstractDataBinding implements Serializable {
       e.printStackTrace();
     }
     try {
-      writer.close();
+      if (writer != null) writer.close();
     } catch (IOException e) {
       e.printStackTrace();
     }
diff --git a/ModuleConfig/src/main/java/org/josast/config/databinding/ConfigurationdataBindingDemo.java b/ModuleConfig/src/main/java/org/josast/config/databinding/ConfigurationdataBindingDemo.java
index c90a9ca9..bb6d0e0d 100644
--- a/ModuleConfig/src/main/java/org/josast/config/databinding/ConfigurationdataBindingDemo.java
+++ b/ModuleConfig/src/main/java/org/josast/config/databinding/ConfigurationdataBindingDemo.java
@@ -92,23 +92,18 @@ public class ConfigurationdataBindingDemo extends AbstractDataBinding {
     return this.V.toString() + name + version;
   }
 
-  /**
-   * @return field name.
-   */
+  /** @return field name. */
   public String getName() {
     return name;
   }
 
-  /**
-   * @return field vector
-   */
+  /** @return field vector */
   public Vector<String> getV() {
-    return V;
+    Vector<String> clone = (Vector<String>) V.clone();
+    return clone;
   }
 
-  /**
-   * @return field version
-   */
+  /** @return field version */
   public double getVersion() {
     return version;
   }
diff --git a/ModuleConfig/src/main/java/org/josast/property/CONFIG.java b/ModuleConfig/src/main/java/org/josast/property/CONFIG.java
index a5f31132..e0188399 100644
--- a/ModuleConfig/src/main/java/org/josast/property/CONFIG.java
+++ b/ModuleConfig/src/main/java/org/josast/property/CONFIG.java
@@ -124,7 +124,7 @@ public class CONFIG {
       e1.printStackTrace();
     }
     try {
-      out.close();
+      if (out != null) out.close();
     } catch (IOException e3) {
       log.severe("erreur de fermeture");
       e3.printStackTrace();
diff --git a/ModuleConfig/src/main/java/org/josast/property/ConfigObject.java b/ModuleConfig/src/main/java/org/josast/property/ConfigObject.java
index 1455edbb..67e72e2c 100644
--- a/ModuleConfig/src/main/java/org/josast/property/ConfigObject.java
+++ b/ModuleConfig/src/main/java/org/josast/property/ConfigObject.java
@@ -4,9 +4,7 @@ package org.josast.property;
 import java.io.File;
 import java.util.logging.Logger;
 
-/**
- * @author Christophe
- */
+/** @author Christophe */
 public abstract class ConfigObject {
 
   private Logger log = Logger.getLogger("AmsatLogger");
@@ -29,18 +27,14 @@ public abstract class ConfigObject {
     return fullConfigFilename;
   }
 
-  /**
-   * @param configFilename Configuration file name
-   */
+  /** @param configFilename Configuration file name */
   public ConfigObject(final String configFilename) {
     super();
     ConfigFilename = configFilename;
     configFile.setFileName(configFilename);
   }
 
-  /**
-   * @return Configuration Filename
-   */
+  /** @return Configuration Filename */
   public String getConfigFilename() {
     return ConfigFilename;
   }
diff --git a/ModuleConfig/src/main/java/org/josast/propertyHttp/ConfigHttp.java b/ModuleConfig/src/main/java/org/josast/propertyHttp/ConfigHttp.java
index 19011358..244df29f 100644
--- a/ModuleConfig/src/main/java/org/josast/propertyHttp/ConfigHttp.java
+++ b/ModuleConfig/src/main/java/org/josast/propertyHttp/ConfigHttp.java
@@ -21,9 +21,7 @@ public class ConfigHttp {
   private Properties props = new Properties();
   private boolean connected = false;
 
-  /**
-   * @param url URL of the properties file to read
-   */
+  /** @param url URL of the properties file to read */
   public ConfigHttp(final String url) {
     super();
     this.url = url;
@@ -78,9 +76,7 @@ public class ConfigHttp {
     return null;
   }
 
-  /**
-   * @return true if the Property file has been read
-   */
+  /** @return true if the Property file has been read */
   public boolean isConnected() {
     return connected;
   }
diff --git a/ModuleConfig/src/test/java/org/avmdti/josast/config/databinding/test.java b/ModuleConfig/src/test/java/org/avmdti/josast/config/databinding/test.java
index 82c2cb3c..3283cef5 100644
--- a/ModuleConfig/src/test/java/org/avmdti/josast/config/databinding/test.java
+++ b/ModuleConfig/src/test/java/org/avmdti/josast/config/databinding/test.java
@@ -35,30 +35,22 @@ public class test extends AbstractDataBinding {
     V.add("test");
   }
 
-  /**
-   * @return
-   */
+  /** @return */
   public int getToto() {
     return toto;
   }
 
-  /**
-   * @param i
-   */
+  /** @param i */
   public void setToto(final int i) {
     toto = i;
   }
 
-  /**
-   * @return
-   */
+  /** @return */
   public Vector<String> getV() {
     return V;
   }
 
-  /**
-   * @param vector
-   */
+  /** @param vector */
   public void setV(final Vector<String> vector) {
     V = vector;
   }
diff --git a/ModuleCubesatSim/pom.xml b/ModuleCubesatSim/pom.xml
index 224b71a5..908840d7 100644
--- a/ModuleCubesatSim/pom.xml
+++ b/ModuleCubesatSim/pom.xml
@@ -42,12 +42,12 @@
 		<dependency>
 			<groupId>io.kaitai</groupId>
 			<artifactId>kaitai-struct-runtime</artifactId>
-			<version>0.9</version>
+			<version>0.10</version>
 		</dependency>
 		<dependency>
 			<groupId>org.influxdb</groupId>
 			<artifactId>influxdb-java</artifactId>
-			<version>2.22</version>
+			<version>2.23</version>
 		</dependency>
 		<dependency>
 			<groupId>org.josast</groupId>
diff --git a/ModuleCubesatSim/src/main/java/org/josast/CubesatSim/TLM/Telemetry.java b/ModuleCubesatSim/src/main/java/org/josast/CubesatSim/TLM/Telemetry.java
index 13be3c60..f762cf8c 100644
--- a/ModuleCubesatSim/src/main/java/org/josast/CubesatSim/TLM/Telemetry.java
+++ b/ModuleCubesatSim/src/main/java/org/josast/CubesatSim/TLM/Telemetry.java
@@ -7,9 +7,7 @@ import org.josast.CubesatSim.kaitai.generated.Cubesatsim.CubesatsimAo7;
 import org.josast.TLM.TlmData;
 import org.josast.TLM.xEqx;
 
-/**
- * @author chris
- */
+/** @author chris */
 public class Telemetry {
 
   public static final String PlusXCurent = "+X Current";
diff --git a/ModuleCubesatSim/src/main/java/org/josast/CubesatSim/influxDB/DataCubesatSim.java b/ModuleCubesatSim/src/main/java/org/josast/CubesatSim/influxDB/DataCubesatSim.java
index c1873b2e..af3de273 100644
--- a/ModuleCubesatSim/src/main/java/org/josast/CubesatSim/influxDB/DataCubesatSim.java
+++ b/ModuleCubesatSim/src/main/java/org/josast/CubesatSim/influxDB/DataCubesatSim.java
@@ -24,142 +24,102 @@ public class DataCubesatSim {
     // TODO Auto-generated constructor stub
   }
 
-  /**
-   * @return the batteryVoltage
-   */
+  /** @return the batteryVoltage */
   public double getBatteryVoltage() {
     return BatteryVoltage;
   }
 
-  /**
-   * @param batteryVoltage the batteryVoltage to set
-   */
+  /** @param batteryVoltage the batteryVoltage to set */
   public void setBatteryVoltage(double batteryVoltage) {
     BatteryVoltage = batteryVoltage;
   }
 
-  /**
-   * @return the totalCurrent
-   */
+  /** @return the totalCurrent */
   public double getTotalCurrent() {
     return TotalCurrent;
   }
 
-  /**
-   * @param totalCurrent the totalCurrent to set
-   */
+  /** @param totalCurrent the totalCurrent to set */
   public void setTotalCurrent(double totalCurrent) {
     TotalCurrent = totalCurrent;
   }
 
-  /**
-   * @return the pXCurent
-   */
+  /** @return the pXCurent */
   public double getpXCurent() {
     return pXcurrent;
   }
 
-  /**
-   * @param pXcurrent the pXcurrent to set.
-   */
+  /** @param pXcurrent the pXcurrent to set. */
   public void setpXCurent(final double pXcurrent) {
     this.pXcurrent = pXcurrent;
   }
 
-  /**
-   * @return the mXcurrent
-   */
+  /** @return the mXcurrent */
   public double getmXcurrent() {
     return mXcurrent;
   }
 
-  /**
-   * @param mXcurrent the mXcurrent to set
-   */
+  /** @param mXcurrent the mXcurrent to set */
   public void setmXcurrent(double mXcurrent) {
     this.mXcurrent = mXcurrent;
   }
 
-  /**
-   * @return the pYcurrent
-   */
+  /** @return the pYcurrent */
   public double getpYcurrent() {
     return pYcurrent;
   }
 
-  /**
-   * @param pYcurrent the pYcurrent to set
-   */
+  /** @param pYcurrent the pYcurrent to set */
   public void setpYcurrent(double pYcurrent) {
     this.pYcurrent = pYcurrent;
   }
 
-  /**
-   * @return the mYcurrent
-   */
+  /** @return the mYcurrent */
   public double getmYcurrent() {
     return mYcurrent;
   }
 
-  /**
-   * @param mYcurrent the mYcurrent to set
-   */
+  /** @param mYcurrent the mYcurrent to set */
   public void setmYcurrent(double mYcurrent) {
     this.mYcurrent = mYcurrent;
   }
 
-  /**
-   * @return the pZcurrent
-   */
+  /** @return the pZcurrent */
   public double getpZcurrent() {
     return pZcurrent;
   }
 
-  /**
-   * @param pZcurrent the pZcurrent to set
-   */
+  /** @param pZcurrent the pZcurrent to set */
   public void setpZcurrent(double pZcurrent) {
     this.pZcurrent = pZcurrent;
   }
 
-  /**
-   * @return the mZcurrent
-   */
+  /** @return the mZcurrent */
   public double getmZcurrent() {
     return mZcurrent;
   }
 
-  /**
-   * @param mZcurrent the mZcurrent to set
-   */
+  /** @param mZcurrent the mZcurrent to set */
   public void setmZcurrent(double mZcurrent) {
     this.mZcurrent = mZcurrent;
   }
 
-  /**
-   * @return the baseTemperature
-   */
+  /** @return the baseTemperature */
   public double getBaseTemperature() {
     return BaseTemperature;
   }
 
-  /**
-   * @param baseTemperature the baseTemperature to set
-   */
+  /** @param baseTemperature the baseTemperature to set */
   public void setBaseTemperature(double baseTemperature) {
     BaseTemperature = baseTemperature;
   }
 
-  /**
-   * @return the batteruCurrent
-   */
+  /** @return the batteruCurrent */
   public double getBatteruCurrent() {
     return BatteruCurrent;
   }
 
-  /**
-   * @param batteruCurrent the batteruCurrent to set
-   */
+  /** @param batteruCurrent the batteruCurrent to set */
   public void setBatteruCurrent(double batteruCurrent) {
     BatteruCurrent = batteruCurrent;
   }
diff --git a/ModuleCubesatSim/src/main/java/org/josast/CubesatSim/influxDB/InfluxDBInstance.java b/ModuleCubesatSim/src/main/java/org/josast/CubesatSim/influxDB/InfluxDBInstance.java
index ebcc5c7f..f5cdb2de 100644
--- a/ModuleCubesatSim/src/main/java/org/josast/CubesatSim/influxDB/InfluxDBInstance.java
+++ b/ModuleCubesatSim/src/main/java/org/josast/CubesatSim/influxDB/InfluxDBInstance.java
@@ -21,16 +21,12 @@ public final class InfluxDBInstance {
   private InfluxDB influxdatabase = null;
   private String databasename;
 
-  /**
-   * @return the databasename
-   */
+  /** @return the databasename */
   public String getDatabasename() {
     return databasename;
   }
 
-  /**
-   * @param databasename the databasename to set
-   */
+  /** @param databasename the databasename to set */
   public void setDatabasename(String databasename) {
     this.databasename = databasename;
   }
diff --git a/ModuleCubesatSim/src/main/java/org/josast/CubesatSim/influxDB/InfluxDatabaseConfig.java b/ModuleCubesatSim/src/main/java/org/josast/CubesatSim/influxDB/InfluxDatabaseConfig.java
index e4c509ee..1b57bdaf 100644
--- a/ModuleCubesatSim/src/main/java/org/josast/CubesatSim/influxDB/InfluxDatabaseConfig.java
+++ b/ModuleCubesatSim/src/main/java/org/josast/CubesatSim/influxDB/InfluxDatabaseConfig.java
@@ -11,9 +11,7 @@ public class InfluxDatabaseConfig extends ConfigObject {
   private String login = "replace by your login";
   private String password = "replace by your Password";
 
-  /**
-   * @param configFilename
-   */
+  /** @param configFilename */
   public InfluxDatabaseConfig(final String configFilename) {
     super(configFilename);
 
@@ -37,9 +35,7 @@ public class InfluxDatabaseConfig extends ConfigObject {
     }
   }
 
-  /**
-   * @return adresse
-   */
+  /** @return adresse */
   public String getAdresse() {
     return adresse;
   }
@@ -48,30 +44,22 @@ public class InfluxDatabaseConfig extends ConfigObject {
     this.adresse = adresse;
   }
 
-  /**
-   * @return login
-   */
+  /** @return login */
   public String getLogin() {
     return login;
   }
 
-  /**
-   * @param login
-   */
+  /** @param login */
   public void setLogin(String login) {
     this.login = login;
   }
 
-  /**
-   * @return password
-   */
+  /** @return password */
   public String getPassword() {
     return password;
   }
 
-  /**
-   * @param password
-   */
+  /** @param password */
   public void setPassword(String password) {
     this.password = password;
   }
diff --git a/ModuleCubesatSim/src/main/java/org/josast/CubesatSim/kaitai/generated/Cubesatsim.java b/ModuleCubesatSim/src/main/java/org/josast/CubesatSim/kaitai/generated/Cubesatsim.java
index 13d0288f..1b6d092e 100644
--- a/ModuleCubesatSim/src/main/java/org/josast/CubesatSim/kaitai/generated/Cubesatsim.java
+++ b/ModuleCubesatSim/src/main/java/org/josast/CubesatSim/kaitai/generated/Cubesatsim.java
@@ -1306,9 +1306,7 @@ public class Cubesatsim extends KaitaiStruct {
   private KaitaiStruct _parent;
   private byte[] _raw_ax25Header;
 
-  /**
-   * @see <a href="https://www.tapr.org/pub_ax25.html">Source</a>
-   */
+  /** @see <a href="https://www.tapr.org/pub_ax25.html">Source</a> */
   public Hdr ax25Header() {
     return ax25Header;
   }
diff --git a/ModuleCubesatSim/src/main/java/org/josast/TLM/ICalculData.java b/ModuleCubesatSim/src/main/java/org/josast/TLM/ICalculData.java
index bc168fe4..70135b75 100644
--- a/ModuleCubesatSim/src/main/java/org/josast/TLM/ICalculData.java
+++ b/ModuleCubesatSim/src/main/java/org/josast/TLM/ICalculData.java
@@ -1,8 +1,6 @@
 package org.josast.TLM;
 
-/**
- * @author Christophe
- */
+/** @author Christophe */
 public interface ICalculData {
   /**
    * compute the value of X.
diff --git a/ModuleCubesatSim/src/main/java/org/josast/TLM/TlmData.java b/ModuleCubesatSim/src/main/java/org/josast/TLM/TlmData.java
index c124058a..f7ffe7b6 100644
--- a/ModuleCubesatSim/src/main/java/org/josast/TLM/TlmData.java
+++ b/ModuleCubesatSim/src/main/java/org/josast/TLM/TlmData.java
@@ -1,8 +1,6 @@
 package org.josast.TLM;
 
-/**
- * @author Christophe
- */
+/** @author Christophe */
 public class TlmData {
 
   /** The name. */
diff --git a/ModuleEntrySatTelemetry/src/main/java/org/josast/EntrySat/Telemetry.java b/ModuleEntrySatTelemetry/src/main/java/org/josast/EntrySat/Telemetry.java
index 952621f1..cb4ebe73 100644
--- a/ModuleEntrySatTelemetry/src/main/java/org/josast/EntrySat/Telemetry.java
+++ b/ModuleEntrySatTelemetry/src/main/java/org/josast/EntrySat/Telemetry.java
@@ -106,9 +106,7 @@ public class Telemetry {
     dataValue.put(BATT_TEMP, Ui.telemetryData().battTemp());
   }
 
-  /**
-   * @return TIME - time interpreted
-   */
+  /** @return TIME - time interpreted */
   public String getTimetoSting() {
     return timeformat;
   }
diff --git a/ModuleEntrySatTelemetry/src/main/java/org/josast/TLM/ICalculData.java b/ModuleEntrySatTelemetry/src/main/java/org/josast/TLM/ICalculData.java
index 546c0661..e7cef704 100644
--- a/ModuleEntrySatTelemetry/src/main/java/org/josast/TLM/ICalculData.java
+++ b/ModuleEntrySatTelemetry/src/main/java/org/josast/TLM/ICalculData.java
@@ -1,8 +1,6 @@
 package org.josast.TLM;
 
-/**
- * @author Christophe
- */
+/** @author Christophe */
 public interface ICalculData {
   /**
    * compute the value of X
diff --git a/ModuleEntrySatTelemetry/src/main/java/org/josast/TLM/TlmData.java b/ModuleEntrySatTelemetry/src/main/java/org/josast/TLM/TlmData.java
index 6a226aa4..aa6d7983 100644
--- a/ModuleEntrySatTelemetry/src/main/java/org/josast/TLM/TlmData.java
+++ b/ModuleEntrySatTelemetry/src/main/java/org/josast/TLM/TlmData.java
@@ -1,8 +1,6 @@
 package org.josast.TLM;
 
-/**
- * @author Christophe
- */
+/** @author Christophe */
 public class TlmData {
 
   /** The name. */
diff --git a/ModuleEntrySatTelemetry/src/main/java/org/josast/kaikai/generated/FrameTlmEntrySat.java b/ModuleEntrySatTelemetry/src/main/java/org/josast/kaikai/generated/FrameTlmEntrySat.java
index e822ff7b..6e6b7326 100644
--- a/ModuleEntrySatTelemetry/src/main/java/org/josast/kaikai/generated/FrameTlmEntrySat.java
+++ b/ModuleEntrySatTelemetry/src/main/java/org/josast/kaikai/generated/FrameTlmEntrySat.java
@@ -758,9 +758,7 @@ public class FrameTlmEntrySat extends KaitaiStruct {
   private FrameTlmEntrySat _root;
   private KaitaiStruct _parent;
 
-  /**
-   * @see <a href="https://www.tapr.org/pub_ax25.html">Source</a>
-   */
+  /** @see <a href="https://www.tapr.org/pub_ax25.html">Source</a> */
   public Ax25Frame frameTlmEntrySat() {
     return frameTlmEntrySat;
   }
diff --git a/ModuleEquationKepler/src/main/java/org/josast/equationKepler/KeplerFixPpoint.java b/ModuleEquationKepler/src/main/java/org/josast/equationKepler/KeplerFixPpoint.java
index ae93ee5e..75d97e5f 100644
--- a/ModuleEquationKepler/src/main/java/org/josast/equationKepler/KeplerFixPpoint.java
+++ b/ModuleEquationKepler/src/main/java/org/josast/equationKepler/KeplerFixPpoint.java
@@ -28,13 +28,11 @@ public class KeplerFixPpoint implements Kepler {
   private static final double DEFAULTPRECISION = 1.0e-14;
 
   /** DOCUMENT ME! */
-  private static double epsilon = DEFAULTPRECISION;
+  private double epsilon = DEFAULTPRECISION;
 
   // ~ Methods -----------------------------------------------------------
 
-  /**
-   * @see org.josast.equationKepler.Kepler#calcul()
-   */
+  /** @see org.josast.equationKepler.Kepler#calcul() */
   public final double calcul(final double meanAnomaly, final double eccentricity) {
     double eccentricanomalie1; // Eccentric Anomaly utilisé pour
 
@@ -48,7 +46,7 @@ public class KeplerFixPpoint implements Kepler {
     eccentricanomalie1 = meanAnomaly; // Initial guess
 
     do {
-      eccentricanomaliei1 = (eccentricity * Math.sin(eccentricanomalie1)) + meanAnomaly;
+      eccentricanomaliei1 = eccentricity * Math.sin(eccentricanomalie1) + meanAnomaly;
       error = eccentricanomaliei1 - eccentricanomalie1;
       eccentricanomalie1 = eccentricanomaliei1;
     } while (MathTools.abs(error) >= epsilon);
@@ -59,16 +57,12 @@ public class KeplerFixPpoint implements Kepler {
     return res;
   }
 
-  /**
-   * @see org.josast.equationKepler.Kepler#getEpsilon()
-   */
+  /** @see org.josast.equationKepler.Kepler#getEpsilon() */
   public final double getEpsilon() {
     return epsilon;
   }
 
-  /**
-   * @see org.josast.equationKepler.Kepler#setEpsilon(double)
-   */
+  /** @see org.josast.equationKepler.Kepler#setEpsilon(double) */
   public final void setEpsilon(final double epsilonl) {
     epsilon = epsilonl;
   }
diff --git a/ModuleEquationKepler/src/main/java/org/josast/equationKepler/KeplerNewton.java b/ModuleEquationKepler/src/main/java/org/josast/equationKepler/KeplerNewton.java
index 1627b2ee..e3a35b1f 100644
--- a/ModuleEquationKepler/src/main/java/org/josast/equationKepler/KeplerNewton.java
+++ b/ModuleEquationKepler/src/main/java/org/josast/equationKepler/KeplerNewton.java
@@ -28,15 +28,13 @@ public class KeplerNewton implements Kepler {
   private static final double DEFAULTPRECISION = 1.0e-14;
 
   /** DOCUMENT ME! */
-  private static double epsilon = DEFAULTPRECISION;
+  private double epsilon = DEFAULTPRECISION;
 
   // ~ Methods -----------------------------------------------------------
 
   // (Mathematique.RadiansPerDegree / 360000.0);
 
-  /**
-   * @see org.josast.equationKepler.Kepler#Calcul(double, double)
-   */
+  /** @see org.josast.equationKepler.Kepler#Calcul(double, double) */
   public final double calcul(final double meanAnomaly, final double eccentricity) {
     double exentrici; // Eccentric Anomaly utilisé pour les calculs
     double exentrici1; // Eccentric Anomaly utilisé pour les calculs
@@ -60,16 +58,12 @@ public class KeplerNewton implements Kepler {
     return res;
   }
 
-  /**
-   * @see org.josast.equationKepler.Kepler#getEpsilon()
-   */
+  /** @see org.josast.equationKepler.Kepler#getEpsilon() */
   public final double getEpsilon() {
     return epsilon;
   }
 
-  /**
-   * @see org.josast.equationKepler.Kepler#setEpsilon(double)
-   */
+  /** @see org.josast.equationKepler.Kepler#setEpsilon(double) */
   public final void setEpsilon(final double epsilon1) {
     epsilon = epsilon1;
   }
diff --git a/ModuleEquationKepler/src/test/java/org/josast/equationKepler/KeplerTest.java b/ModuleEquationKepler/src/test/java/org/josast/equationKepler/KeplerTest.java
index 73772b5d..ffc60407 100644
--- a/ModuleEquationKepler/src/test/java/org/josast/equationKepler/KeplerTest.java
+++ b/ModuleEquationKepler/src/test/java/org/josast/equationKepler/KeplerTest.java
@@ -4,14 +4,10 @@ package org.josast.equationKepler;
 import junit.framework.Assert;
 import junit.framework.TestCase;
 
-/**
- * @author cmercier
- */
+/** @author cmercier */
 public class KeplerTest extends TestCase {
 
-  /**
-   * @param name
-   */
+  /** @param name */
   public KeplerTest(String name) {
     super(name);
   }
diff --git a/ModuleJourJulien/pom.xml b/ModuleJourJulien/pom.xml
index 2db1fc64..4f421c52 100644
--- a/ModuleJourJulien/pom.xml
+++ b/ModuleJourJulien/pom.xml
@@ -21,7 +21,7 @@
 		<maven.compiler.source>1.8</maven.compiler.source>
 		<maven.compiler.target>1.8</maven.compiler.target>
 		<java.16.home>${env.JAVA_HOME}</java.16.home>
-		<kaitai-maven-plugin-version>0.1.5</kaitai-maven-plugin-version>
+	
 	</properties>
 
 
diff --git a/ModuleJourJulien/src/main/java/org/josast/util/date/GenericDate.java b/ModuleJourJulien/src/main/java/org/josast/util/date/GenericDate.java
index 96f7ecff..fe4464ca 100644
--- a/ModuleJourJulien/src/main/java/org/josast/util/date/GenericDate.java
+++ b/ModuleJourJulien/src/main/java/org/josast/util/date/GenericDate.java
@@ -82,86 +82,62 @@ public class GenericDate {
     return JulianDay.convertToJulianDay(_year, _month, _day, _hour, _minute, _seconde);
   }
 
-  /**
-   * @return day
-   */
+  /** @return day */
   public int get_day() {
     return _day;
   }
 
-  /**
-   * @return hours
-   */
+  /** @return hours */
   public int get_hour() {
     return _hour;
   }
 
-  /**
-   * @return minute
-   */
+  /** @return minute */
   public int get_minute() {
     return _minute;
   }
 
-  /**
-   * @return month
-   */
+  /** @return month */
   public int get_month() {
     return _month;
   }
 
-  /**
-   * @return seconde
-   */
+  /** @return seconde */
   public int get_seconde() {
     return _seconde;
   }
 
-  /**
-   * @return year
-   */
+  /** @return year */
   public int get_year() {
     return _year;
   }
 
-  /**
-   * @param _day day
-   */
+  /** @param _day day */
   public void set_day(int _day) {
     this._day = _day;
   }
 
-  /**
-   * @param _hour hour
-   */
+  /** @param _hour hour */
   public void set_hour(int _hour) {
     this._hour = _hour;
   }
 
-  /**
-   * @param _minute minute
-   */
+  /** @param _minute minute */
   public void set_minute(int _minute) {
     this._minute = _minute;
   }
 
-  /**
-   * @param _month month
-   */
+  /** @param _month month */
   public void set_month(int _month) {
     this._month = _month;
   }
 
-  /**
-   * @param _seconde seconde
-   */
+  /** @param _seconde seconde */
   public void set_seconde(int _seconde) {
     this._seconde = _seconde;
   }
 
-  /**
-   * @param _year year
-   */
+  /** @param _year year */
   public void set_year(int _year) {
     this._year = _year;
   }
diff --git a/ModuleSIDS/pom.xml b/ModuleSIDS/pom.xml
index 7d400fde..aac4ca92 100644
--- a/ModuleSIDS/pom.xml
+++ b/ModuleSIDS/pom.xml
@@ -78,13 +78,13 @@
 		<dependency>
 			<groupId>net.java.dev.jna</groupId>
 			<artifactId>jna</artifactId>
-			<version>5.11.0</version>
+			<version>5.12.1</version>
 		</dependency>
 		<!-- https://mvnrepository.com/artifact/net.java.dev.jna/jna-platform -->
 		<dependency>
 			<groupId>net.java.dev.jna</groupId>
 			<artifactId>jna-platform</artifactId>
-			<version>5.11.0</version>
+			<version>5.12.1</version>
 		</dependency>
 	</dependencies>
 
diff --git a/ModuleSIDS/src/main/java/org/josast/SIDS/HttpPostSIDS.java b/ModuleSIDS/src/main/java/org/josast/SIDS/HttpPostSIDS.java
index 0a703b77..c4295402 100644
--- a/ModuleSIDS/src/main/java/org/josast/SIDS/HttpPostSIDS.java
+++ b/ModuleSIDS/src/main/java/org/josast/SIDS/HttpPostSIDS.java
@@ -140,8 +140,14 @@ public class HttpPostSIDS {
       result = new StringBuffer();
       String line = "";
       try {
-        while ((line = rd.readLine()) != null) {
-          result.append(line);
+        if (rd != null) {
+          while ((line = rd.readLine()) != null) {
+            result.append(line);
+          }
+
+          rd.close();
+        } else {
+          logger.severe("Error buffer readeris null  ");
         }
       } catch (IOException e) {
         logger.severe("Error reading line from server  " + e.toString());
diff --git a/ModuleSIDS/src/main/java/org/josast/SIDS/SIDSData.java b/ModuleSIDS/src/main/java/org/josast/SIDS/SIDSData.java
index acdd1d34..cc831622 100644
--- a/ModuleSIDS/src/main/java/org/josast/SIDS/SIDSData.java
+++ b/ModuleSIDS/src/main/java/org/josast/SIDS/SIDSData.java
@@ -25,7 +25,7 @@ public class SIDSData {
   // packet with or without KISS 'C0 00 .. C0'.
   // Whitespaces optional. C0 00 A9 05 DE ...
 
-  private final String locator = "longLat"; // Type of the given receiver's
+  private static final String locator = "longLat"; // Type of the given receiver's
   // location. Currently, only
   // 'longLat' is supported. longLat
 
@@ -47,7 +47,7 @@ public class SIDSData {
   private long fDown = 0; // Frequency of the receiver's downlink channel
   // during reception (with Doppler), in Hz 435525000
 
-  private final String version = "2.0.1";
+  private static final String version = "2.0.1";
 
   public SIDSData() {}
 
diff --git a/ModuleSatelliteDatabase/src/main/java/org/josast/AmsatList/source/ReadCsvFile.java b/ModuleSatelliteDatabase/src/main/java/org/josast/AmsatList/source/ReadCsvFile.java
index 2847852d..78f4f593 100644
--- a/ModuleSatelliteDatabase/src/main/java/org/josast/AmsatList/source/ReadCsvFile.java
+++ b/ModuleSatelliteDatabase/src/main/java/org/josast/AmsatList/source/ReadCsvFile.java
@@ -12,9 +12,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.logging.Logger;
 
-/**
- * @author chris
- */
+/** @author chris */
 public class ReadCsvFile {
 
   private Logger log = Logger.getLogger(getClass().getName());
@@ -67,16 +65,12 @@ public class ReadCsvFile {
     return list;
   }
 
-  /**
-   * @return the separator
-   */
+  /** @return the separator */
   public char getSeparator() {
     return separator;
   }
 
-  /**
-   * @param separator the separator to set
-   */
+  /** @param separator the separator to set */
   public void setSeparator(char separator) {
     this.separator = separator;
   }
diff --git a/ModuleSatelliteDatabase/src/main/java/org/josast/AmsatList/source/SimplifiedDK3WM.java b/ModuleSatelliteDatabase/src/main/java/org/josast/AmsatList/source/SimplifiedDK3WM.java
index 08831f38..4e9fd211 100644
--- a/ModuleSatelliteDatabase/src/main/java/org/josast/AmsatList/source/SimplifiedDK3WM.java
+++ b/ModuleSatelliteDatabase/src/main/java/org/josast/AmsatList/source/SimplifiedDK3WM.java
@@ -45,16 +45,12 @@ public class SimplifiedDK3WM {
     }
   }
 
-  /**
-   * @return the fsatLits
-   */
+  /** @return the fsatLits */
   public FlatSatList getFsatLits() {
     return fsatLits;
   }
 
-  /**
-   * @param fsatLits the fsatLits to set
-   */
+  /** @param fsatLits the fsatLits to set */
   public void setFsatLits(FlatSatList fsatLits) {
     this.fsatLits = fsatLits;
   }
diff --git a/ModuleSatelliteDatabase/src/main/java/org/josast/AmsatList/source/SimplifiedJ9PL.java b/ModuleSatelliteDatabase/src/main/java/org/josast/AmsatList/source/SimplifiedJ9PL.java
index 085a37f3..a1ef4dbf 100644
--- a/ModuleSatelliteDatabase/src/main/java/org/josast/AmsatList/source/SimplifiedJ9PL.java
+++ b/ModuleSatelliteDatabase/src/main/java/org/josast/AmsatList/source/SimplifiedJ9PL.java
@@ -52,16 +52,12 @@ public class SimplifiedJ9PL {
     }
   }
 
-  /**
-   * @return the fsatLits
-   */
+  /** @return the fsatLits */
   public FlatSatList getFsatLits() {
     return fsatLits;
   }
 
-  /**
-   * @param fsatLits the fsatLits to set
-   */
+  /** @param fsatLits the fsatLits to set */
   public void setFsatLits(FlatSatList fsatLits) {
     this.fsatLits = fsatLits;
   }
diff --git a/ModuleSatelliteDatabase/src/main/java/org/josast/AmsatList/source/SimplifiedN2YO.java b/ModuleSatelliteDatabase/src/main/java/org/josast/AmsatList/source/SimplifiedN2YO.java
index 77857757..44b4fdb9 100644
--- a/ModuleSatelliteDatabase/src/main/java/org/josast/AmsatList/source/SimplifiedN2YO.java
+++ b/ModuleSatelliteDatabase/src/main/java/org/josast/AmsatList/source/SimplifiedN2YO.java
@@ -48,16 +48,12 @@ public class SimplifiedN2YO {
     return " ";
   }
 
-  /**
-   * @return the fsatLits
-   */
+  /** @return the fsatLits */
   public FlatSatList getFsatLits() {
     return fsatLits;
   }
 
-  /**
-   * @param fsatLits the fsatLits to set
-   */
+  /** @param fsatLits the fsatLits to set */
   public void setFsatLits(FlatSatList fsatLits) {
     this.fsatLits = fsatLits;
   }
diff --git a/ModuleSatelliteDatabase/src/main/java/org/josast/AmsatList/source/SimplifiedSatnogsTable.java b/ModuleSatelliteDatabase/src/main/java/org/josast/AmsatList/source/SimplifiedSatnogsTable.java
index c3fd6b9a..fcbd062e 100644
--- a/ModuleSatelliteDatabase/src/main/java/org/josast/AmsatList/source/SimplifiedSatnogsTable.java
+++ b/ModuleSatelliteDatabase/src/main/java/org/josast/AmsatList/source/SimplifiedSatnogsTable.java
@@ -46,16 +46,12 @@ public class SimplifiedSatnogsTable {
     }
   }
 
-  /**
-   * @return the fsatLits
-   */
+  /** @return the fsatLits */
   public FlatSatList getFsatLits() {
     return fsatLits;
   }
 
-  /**
-   * @param fsatLits the fsatLits to set
-   */
+  /** @param fsatLits the fsatLits to set */
   public void setFsatLits(FlatSatList fsatLits) {
     this.fsatLits = fsatLits;
   }
diff --git a/ModuleSatelliteDatabase/src/main/java/org/josast/AmsatList/source/gcat/LaunchCat.java b/ModuleSatelliteDatabase/src/main/java/org/josast/AmsatList/source/gcat/LaunchCat.java
index 84eeaad7..2dda4d52 100644
--- a/ModuleSatelliteDatabase/src/main/java/org/josast/AmsatList/source/gcat/LaunchCat.java
+++ b/ModuleSatelliteDatabase/src/main/java/org/josast/AmsatList/source/gcat/LaunchCat.java
@@ -9,87 +9,59 @@ public class LaunchCat {
   private String launchSite;
   private String launchPad;
   private String agency;
-  /**
-   * @return the launchTag
-   */
+  /** @return the launchTag */
   public String getLaunchTag() {
     return launchTag;
   }
-  /**
-   * @param launchTag the launchTag to set
-   */
+  /** @param launchTag the launchTag to set */
   public void setLaunchTag(String launchTag) {
     this.launchTag = launchTag;
   }
-  /**
-   * @return the launch_Date
-   */
+  /** @return the launch_Date */
   public String getLaunch_Date() {
     return launch_Date;
   }
-  /**
-   * @param launch_Date the launch_Date to set
-   */
+  /** @param launch_Date the launch_Date to set */
   public void setLaunch_Date(String launch_Date) {
     this.launch_Date = launch_Date;
   }
-  /**
-   * @return the lVType
-   */
+  /** @return the lVType */
   public String getLVType() {
     return LVType;
   }
-  /**
-   * @param lVType the lVType to set
-   */
+  /** @param lVType the lVType to set */
   public void setLVType(String lVType) {
     LVType = lVType;
   }
-  /**
-   * @return the mission
-   */
+  /** @return the mission */
   public String getMission() {
     return Mission;
   }
-  /**
-   * @param mission the mission to set
-   */
+  /** @param mission the mission to set */
   public void setMission(String mission) {
     Mission = mission;
   }
-  /**
-   * @return the launchSite
-   */
+  /** @return the launchSite */
   public String getLaunchSite() {
     return launchSite;
   }
-  /**
-   * @param launchSite the launchSite to set
-   */
+  /** @param launchSite the launchSite to set */
   public void setLaunchSite(String launchSite) {
     this.launchSite = launchSite;
   }
-  /**
-   * @return the launchPad
-   */
+  /** @return the launchPad */
   public String getLaunchPad() {
     return launchPad;
   }
-  /**
-   * @param launchPad the launchPad to set
-   */
+  /** @param launchPad the launchPad to set */
   public void setLaunchPad(String launchPad) {
     this.launchPad = launchPad;
   }
-  /**
-   * @return the agency
-   */
+  /** @return the agency */
   public String getAgency() {
     return agency;
   }
-  /**
-   * @param agency the agency to set
-   */
+  /** @param agency the agency to set */
   public void setAgency(String agency) {
     this.agency = agency;
   }
diff --git a/ModuleSatelliteDatabase/src/main/java/org/josast/AmsatList/source/gcat/LaunchCatTsvFile.java b/ModuleSatelliteDatabase/src/main/java/org/josast/AmsatList/source/gcat/LaunchCatTsvFile.java
index 4f9a892c..96ccac61 100644
--- a/ModuleSatelliteDatabase/src/main/java/org/josast/AmsatList/source/gcat/LaunchCatTsvFile.java
+++ b/ModuleSatelliteDatabase/src/main/java/org/josast/AmsatList/source/gcat/LaunchCatTsvFile.java
@@ -68,16 +68,12 @@ public class LaunchCatTsvFile {
     }
   }
 
-  /**
-   * @return the launchList
-   */
+  /** @return the launchList */
   public Hashtable<String, LaunchCat> getLaunchList() {
     return launchList;
   }
 
-  /**
-   * @param launchList the launchList to set
-   */
+  /** @param launchList the launchList to set */
   public void setLaunchList(Hashtable<String, LaunchCat> launchList) {
     this.launchList = launchList;
   }
diff --git a/ModuleSatelliteDatabase/src/main/java/org/josast/AmsatList/source/gcat/OrgsCat.java b/ModuleSatelliteDatabase/src/main/java/org/josast/AmsatList/source/gcat/OrgsCat.java
index 26036093..f0181612 100644
--- a/ModuleSatelliteDatabase/src/main/java/org/josast/AmsatList/source/gcat/OrgsCat.java
+++ b/ModuleSatelliteDatabase/src/main/java/org/josast/AmsatList/source/gcat/OrgsCat.java
@@ -1,9 +1,7 @@
 /** */
 package org.josast.AmsatList.source.gcat;
 
-/**
- * @author chris
- */
+/** @author chris */
 public class OrgsCat {
 
   private String code;
@@ -17,72 +15,52 @@ public class OrgsCat {
     // TODO Auto-generated constructor stub
   }
 
-  /**
-   * @return the shortName
-   */
+  /** @return the shortName */
   public String getShortName() {
     return ShortName;
   }
 
-  /**
-   * @param shortName the shortName to set
-   */
+  /** @param shortName the shortName to set */
   public void setShortName(String shortName) {
     ShortName = shortName;
   }
 
-  /**
-   * @return the code
-   */
+  /** @return the code */
   public String getCode() {
     return code;
   }
 
-  /**
-   * @param code the code to set
-   */
+  /** @param code the code to set */
   public void setCode(String code) {
     this.code = code;
   }
 
-  /**
-   * @return the stateCode
-   */
+  /** @return the stateCode */
   public String getStateCode() {
     return stateCode;
   }
 
-  /**
-   * @param stateCode the stateCode to set
-   */
+  /** @param stateCode the stateCode to set */
   public void setStateCode(String stateCode) {
     this.stateCode = stateCode;
   }
 
-  /**
-   * @return the name
-   */
+  /** @return the name */
   public String getName() {
     return name;
   }
 
-  /**
-   * @param name the name to set
-   */
+  /** @param name the name to set */
   public void setName(String name) {
     this.name = name;
   }
 
-  /**
-   * @return the location
-   */
+  /** @return the location */
   public String getLocation() {
     return location;
   }
 
-  /**
-   * @param location the location to set
-   */
+  /** @param location the location to set */
   public void setLocation(String location) {
     this.location = location;
   }
diff --git a/ModuleSatelliteDatabase/src/main/java/org/josast/AmsatList/source/gcat/OrgsCatTsvFile.java b/ModuleSatelliteDatabase/src/main/java/org/josast/AmsatList/source/gcat/OrgsCatTsvFile.java
index dca98431..24cfa521 100644
--- a/ModuleSatelliteDatabase/src/main/java/org/josast/AmsatList/source/gcat/OrgsCatTsvFile.java
+++ b/ModuleSatelliteDatabase/src/main/java/org/josast/AmsatList/source/gcat/OrgsCatTsvFile.java
@@ -7,9 +7,7 @@ import java.util.ListIterator;
 import java.util.logging.Logger;
 import org.josast.AmsatList.source.ReadCsvFile;
 
-/**
- * @author chris
- */
+/** @author chris */
 public class OrgsCatTsvFile {
 
   private Logger log = Logger.getLogger(getClass().getName());
@@ -65,16 +63,12 @@ public class OrgsCatTsvFile {
     System.out.println(orgsCatList.size());
   }
 
-  /**
-   * @return the orgsCatList
-   */
+  /** @return the orgsCatList */
   public Hashtable<String, OrgsCat> getOrgsCatList() {
     return orgsCatList;
   }
 
-  /**
-   * @param orgsCatList the orgsCatList to set
-   */
+  /** @param orgsCatList the orgsCatList to set */
   public void setOrgsCatList(Hashtable<String, OrgsCat> orgsCatList) {
     this.orgsCatList = orgsCatList;
   }
diff --git a/ModuleSatelliteDatabase/src/main/java/org/josast/AmsatList/source/gcat/SatCat.java b/ModuleSatelliteDatabase/src/main/java/org/josast/AmsatList/source/gcat/SatCat.java
index a92c8945..7060f0a3 100644
--- a/ModuleSatelliteDatabase/src/main/java/org/josast/AmsatList/source/gcat/SatCat.java
+++ b/ModuleSatelliteDatabase/src/main/java/org/josast/AmsatList/source/gcat/SatCat.java
@@ -13,136 +13,92 @@ public class SatCat {
   private String plName;
   private String altNames;
   private String piece;
-  /**
-   * @return the satelliteName
-   */
+  /** @return the satelliteName */
   public String getSatelliteName() {
     return satelliteName;
   }
-  /**
-   * @param satelliteName the satelliteName to set
-   */
+  /** @param satelliteName the satelliteName to set */
   public void setSatelliteName(String satelliteName) {
     this.satelliteName = satelliteName;
   }
-  /**
-   * @return the launchDate
-   */
+  /** @return the launchDate */
   public String getLaunchDate() {
     return launchDate;
   }
-  /**
-   * @param launchDate the launchDate to set
-   */
+  /** @param launchDate the launchDate to set */
   public void setLaunchDate(String launchDate) {
     this.launchDate = launchDate;
   }
-  /**
-   * @return the owner
-   */
+  /** @return the owner */
   public String getOwner() {
     return owner;
   }
-  /**
-   * @param owner the owner to set
-   */
+  /** @param owner the owner to set */
   public void setOwner(String owner) {
     this.owner = owner;
   }
-  /**
-   * @return the state
-   */
+  /** @return the state */
   public String getState() {
     return state;
   }
-  /**
-   * @param state the state to set
-   */
+  /** @param state the state to set */
   public void setState(String state) {
     this.state = state;
   }
-  /**
-   * @return the manufacturer
-   */
+  /** @return the manufacturer */
   public String getManufacturer() {
     return manufacturer;
   }
-  /**
-   * @param manufacturer the manufacturer to set
-   */
+  /** @param manufacturer the manufacturer to set */
   public void setManufacturer(String manufacturer) {
     this.manufacturer = manufacturer;
   }
-  /**
-   * @return the bus
-   */
+  /** @return the bus */
   public String getBus() {
     return bus;
   }
-  /**
-   * @param bus the bus to set
-   */
+  /** @param bus the bus to set */
   public void setBus(String bus) {
     this.bus = bus;
   }
-  /**
-   * @return the mass
-   */
+  /** @return the mass */
   public String getMass() {
     return Mass;
   }
-  /**
-   * @param mass the mass to set
-   */
+  /** @param mass the mass to set */
   public void setMass(String mass) {
     Mass = mass;
   }
-  /**
-   * @return the shape
-   */
+  /** @return the shape */
   public String getShape() {
     return Shape;
   }
-  /**
-   * @param shape the shape to set
-   */
+  /** @param shape the shape to set */
   public void setShape(String shape) {
     Shape = shape;
   }
-  /**
-   * @return the plName
-   */
+  /** @return the plName */
   public String getPlName() {
     return plName;
   }
-  /**
-   * @param plName the plName to set
-   */
+  /** @param plName the plName to set */
   public void setPlName(String plName) {
     this.plName = plName;
   }
-  /**
-   * @return the altNames
-   */
+  /** @return the altNames */
   public String getAltNames() {
     return altNames;
   }
-  /**
-   * @param altNames the altNames to set
-   */
+  /** @param altNames the altNames to set */
   public void setAltNames(String altNames) {
     this.altNames = altNames;
   }
 
-  /**
-   * @return the piece
-   */
+  /** @return the piece */
   public String getPiece() {
     return piece;
   }
-  /**
-   * @param piece the piece to set
-   */
+  /** @param piece the piece to set */
   public void setPiece(String piece) {
     this.piece = piece;
   }
diff --git a/ModuleSatelliteDatabase/src/main/java/org/josast/AmsatList/source/gcat/SatcCatTsvFile.java b/ModuleSatelliteDatabase/src/main/java/org/josast/AmsatList/source/gcat/SatcCatTsvFile.java
index 06cd459f..825897f6 100644
--- a/ModuleSatelliteDatabase/src/main/java/org/josast/AmsatList/source/gcat/SatcCatTsvFile.java
+++ b/ModuleSatelliteDatabase/src/main/java/org/josast/AmsatList/source/gcat/SatcCatTsvFile.java
@@ -93,16 +93,12 @@ public class SatcCatTsvFile {
     }
   }
 
-  /**
-   * @return the satcatList
-   */
+  /** @return the satcatList */
   public Hashtable<BigInteger, SatCat> getSatcatList() {
     return satcatList;
   }
 
-  /**
-   * @param satcatList the satcatList to set
-   */
+  /** @param satcatList the satcatList to set */
   public void setSatcatList(Hashtable<BigInteger, SatCat> satcatList) {
     this.satcatList = satcatList;
   }
diff --git a/ModuleSatelliteDatabase/src/main/java/org/josast/AmsatList/source/gcat/SiteCat.java b/ModuleSatelliteDatabase/src/main/java/org/josast/AmsatList/source/gcat/SiteCat.java
index d12c82c2..6809fd4d 100644
--- a/ModuleSatelliteDatabase/src/main/java/org/josast/AmsatList/source/gcat/SiteCat.java
+++ b/ModuleSatelliteDatabase/src/main/java/org/josast/AmsatList/source/gcat/SiteCat.java
@@ -1,9 +1,7 @@
 /** */
 package org.josast.AmsatList.source.gcat;
 
-/**
- * @author chris
- */
+/** @author chris */
 public class SiteCat {
 
   private String site;
@@ -16,58 +14,42 @@ public class SiteCat {
     // TODO Auto-generated constructor stub
   }
 
-  /**
-   * @return the shortName
-   */
+  /** @return the shortName */
   public String getShortName() {
     return ShortName;
   }
 
-  /**
-   * @param shortName the shortName to set
-   */
+  /** @param shortName the shortName to set */
   public void setShortName(String shortName) {
     ShortName = shortName;
   }
 
-  /**
-   * @return the site
-   */
+  /** @return the site */
   public String getSite() {
     return site;
   }
 
-  /**
-   * @param site the site to set
-   */
+  /** @param site the site to set */
   public void setSite(String site) {
     this.site = site;
   }
 
-  /**
-   * @return the name
-   */
+  /** @return the name */
   public String getName() {
     return name;
   }
 
-  /**
-   * @param name the name to set
-   */
+  /** @param name the name to set */
   public void setName(String name) {
     this.name = name;
   }
 
-  /**
-   * @return the stateCode
-   */
+  /** @return the stateCode */
   public String getStateCode() {
     return stateCode;
   }
 
-  /**
-   * @param stateCode the stateCode to set
-   */
+  /** @param stateCode the stateCode to set */
   public void setStateCode(String stateCode) {
     this.stateCode = stateCode;
   }
diff --git a/ModuleSatelliteDatabase/src/main/java/org/josast/AmsatList/source/gcat/SiteCatTsvFile.java b/ModuleSatelliteDatabase/src/main/java/org/josast/AmsatList/source/gcat/SiteCatTsvFile.java
index 6aa1c9f4..a716b5c1 100644
--- a/ModuleSatelliteDatabase/src/main/java/org/josast/AmsatList/source/gcat/SiteCatTsvFile.java
+++ b/ModuleSatelliteDatabase/src/main/java/org/josast/AmsatList/source/gcat/SiteCatTsvFile.java
@@ -7,9 +7,7 @@ import java.util.ListIterator;
 import java.util.logging.Logger;
 import org.josast.AmsatList.source.ReadCsvFile;
 
-/**
- * @author chris
- */
+/** @author chris */
 public class SiteCatTsvFile {
 
   private Logger log = Logger.getLogger(getClass().getName());
@@ -86,16 +84,12 @@ public class SiteCatTsvFile {
     }
   }
 
-  /**
-   * @return the sitecatList
-   */
+  /** @return the sitecatList */
   public Hashtable<String, SiteCat> getSitecatList() {
     return sitecatList;
   }
 
-  /**
-   * @param sitecatList the sitecatList to set
-   */
+  /** @param sitecatList the sitecatList to set */
   public void setSitecatList(Hashtable<String, SiteCat> sitecatList) {
     this.sitecatList = sitecatList;
   }
diff --git a/ModuleSatelliteDatabase/src/main/java/org/josast/AmsatList/source/gcat/UpdateAmsatListFileWithGsatData.java b/ModuleSatelliteDatabase/src/main/java/org/josast/AmsatList/source/gcat/UpdateAmsatListFileWithGsatData.java
index 051ebce3..74820bfc 100644
--- a/ModuleSatelliteDatabase/src/main/java/org/josast/AmsatList/source/gcat/UpdateAmsatListFileWithGsatData.java
+++ b/ModuleSatelliteDatabase/src/main/java/org/josast/AmsatList/source/gcat/UpdateAmsatListFileWithGsatData.java
@@ -25,9 +25,7 @@ import org.josast.AmsatList.generated.Satellites;
 import org.josast.ModuleSatelliteDatabase.AmsatListFile;
 import org.josast.util.files.ManageFolder;
 
-/**
- * @author chris
- */
+/** @author chris */
 public class UpdateAmsatListFileWithGsatData {
 
   private static Logger appLogger = Logger.getLogger("AmsatLogger");
@@ -226,9 +224,7 @@ public class UpdateAmsatListFileWithGsatData {
     }
   }
 
-  /**
-   * @param args
-   */
+  /** @param args */
   public static void main(String[] args) {
     // TODO Auto-generated method stub
 
diff --git a/ModuleSatelliteDatabase/src/main/java/org/josast/ModuleSatelliteDatabase/AmsatListFile.java b/ModuleSatelliteDatabase/src/main/java/org/josast/ModuleSatelliteDatabase/AmsatListFile.java
index 5b16d65a..5d935d64 100644
--- a/ModuleSatelliteDatabase/src/main/java/org/josast/ModuleSatelliteDatabase/AmsatListFile.java
+++ b/ModuleSatelliteDatabase/src/main/java/org/josast/ModuleSatelliteDatabase/AmsatListFile.java
@@ -142,16 +142,12 @@ public class AmsatListFile {
     this.amsatList = amsatList;
   }
 
-  /**
-   * @return the amsatListByName
-   */
+  /** @return the amsatListByName */
   public Hashtable<String, Satellites> getAmsatListByName() {
     return amsatListByName;
   }
 
-  /**
-   * @return the amsatListNasaId
-   */
+  /** @return the amsatListNasaId */
   public Hashtable<BigInteger, Satellites> getAmsatListNasaId() {
     return amsatListNasaId;
   }
diff --git a/ModuleSatelliteDatabase/src/main/java/org/josast/ModuleSatelliteDatabase/CheckAmsatListFile.java b/ModuleSatelliteDatabase/src/main/java/org/josast/ModuleSatelliteDatabase/CheckAmsatListFile.java
index f9c49936..846275a7 100644
--- a/ModuleSatelliteDatabase/src/main/java/org/josast/ModuleSatelliteDatabase/CheckAmsatListFile.java
+++ b/ModuleSatelliteDatabase/src/main/java/org/josast/ModuleSatelliteDatabase/CheckAmsatListFile.java
@@ -13,9 +13,7 @@ public class CheckAmsatListFile {
   /** Amsat list structure. */
   private AmsatList al = null;
 
-  /**
-   * @param file file name.
-   */
+  /** @param file file name. */
   public CheckAmsatListFile(final String file) {
     AmsatListFile alf = new AmsatListFile();
     al = alf.openAmsatList(file);
@@ -48,9 +46,7 @@ public class CheckAmsatListFile {
     return satNameVec;
   }
 
-  /**
-   * @return list of satellite name
-   */
+  /** @return list of satellite name */
   public Vector<String> checkUniqueSatelliteNasaID() {
 
     Hashtable<BigInteger, Satellites> amsatListSatellite = new Hashtable<>();
@@ -77,9 +73,7 @@ public class CheckAmsatListFile {
     return satNameVec;
   }
 
-  /**
-   * @return amsat List Satellite.
-   */
+  /** @return amsat List Satellite. */
   public Vector<String> getListSatelliteStatus() {
     Hashtable<String, Vector<Satellites>> amsatListSatellite = new Hashtable<>();
 
@@ -110,9 +104,7 @@ public class CheckAmsatListFile {
     return satelliteStatus;
   }
 
-  /**
-   * @return amsat List Satellite.
-   */
+  /** @return amsat List Satellite. */
   public Vector<Commande> checkSatelliteStatus() {
     CheckStatus checkStatus = new CheckStatus();
 
diff --git a/ModuleSatelliteDatabase/src/main/java/org/josast/ModuleSatelliteDatabase/CheckStatus.java b/ModuleSatelliteDatabase/src/main/java/org/josast/ModuleSatelliteDatabase/CheckStatus.java
index b3c1c892..a8ec9658 100644
--- a/ModuleSatelliteDatabase/src/main/java/org/josast/ModuleSatelliteDatabase/CheckStatus.java
+++ b/ModuleSatelliteDatabase/src/main/java/org/josast/ModuleSatelliteDatabase/CheckStatus.java
@@ -3,9 +3,7 @@ package org.josast.ModuleSatelliteDatabase;
 
 import java.util.Hashtable;
 
-/**
- * @author chris
- */
+/** @author chris */
 public class CheckStatus {
 
   Hashtable<String, String> status = new Hashtable<>();
diff --git a/ModuleSatelliteDatabase/src/main/java/org/josast/ModuleSatelliteDatabase/FlatSatellite.java b/ModuleSatelliteDatabase/src/main/java/org/josast/ModuleSatelliteDatabase/FlatSatellite.java
index 6dcafe01..4bdb5ef0 100644
--- a/ModuleSatelliteDatabase/src/main/java/org/josast/ModuleSatelliteDatabase/FlatSatellite.java
+++ b/ModuleSatelliteDatabase/src/main/java/org/josast/ModuleSatelliteDatabase/FlatSatellite.java
@@ -19,30 +19,22 @@ public abstract class FlatSatellite {
   protected String IARUCoordinationLink;
   protected String InternationalID;
 
-  /**
-   * @return the internationalID
-   */
+  /** @return the internationalID */
   public String getInternationalID() {
     return InternationalID;
   }
 
-  /**
-   * @param internationalID the internationalID to set
-   */
+  /** @param internationalID the internationalID to set */
   public void setInternationalID(String internationalID) {
     InternationalID = internationalID;
   }
 
-  /**
-   * @return the iARUCoordinationLink
-   */
+  /** @return the iARUCoordinationLink */
   public String getIARUCoordinationLink() {
     return IARUCoordinationLink;
   }
 
-  /**
-   * @param iARUCoordinationLink the iARUCoordinationLink to set
-   */
+  /** @param iARUCoordinationLink the iARUCoordinationLink to set */
   public void setIARUCoordinationLink(String iARUCoordinationLink) {
     IARUCoordinationLink = iARUCoordinationLink;
   }
diff --git a/ModuleSatelliteDatabase/src/main/java/org/josast/ModuleSatelliteDatabase/FlatSatelliteImp.java b/ModuleSatelliteDatabase/src/main/java/org/josast/ModuleSatelliteDatabase/FlatSatelliteImp.java
index 1eb86491..ebc1cc04 100644
--- a/ModuleSatelliteDatabase/src/main/java/org/josast/ModuleSatelliteDatabase/FlatSatelliteImp.java
+++ b/ModuleSatelliteDatabase/src/main/java/org/josast/ModuleSatelliteDatabase/FlatSatelliteImp.java
@@ -1,9 +1,7 @@
 /** */
 package org.josast.ModuleSatelliteDatabase;
 
-/**
- * @author chris
- */
+/** @author chris */
 public class FlatSatelliteImp extends FlatSatellite {
 
   /** */
diff --git a/ModuleSatelliteDatabase/src/main/java/org/josast/ModuleSatelliteDatabase/UpdateAmsatListFile.java b/ModuleSatelliteDatabase/src/main/java/org/josast/ModuleSatelliteDatabase/UpdateAmsatListFile.java
index 46d432c8..3433149b 100644
--- a/ModuleSatelliteDatabase/src/main/java/org/josast/ModuleSatelliteDatabase/UpdateAmsatListFile.java
+++ b/ModuleSatelliteDatabase/src/main/java/org/josast/ModuleSatelliteDatabase/UpdateAmsatListFile.java
@@ -18,9 +18,7 @@ public class UpdateAmsatListFile {
   /** */
   private AmsatListFile alf = null;
 
-  /**
-   * @param filein
-   */
+  /** @param filein */
   @Deprecated
   public UpdateAmsatListFile(final String filein) {
     alf = new AmsatListFile();
@@ -61,9 +59,7 @@ public class UpdateAmsatListFile {
     amsatListStatus.put("Unknown", "Unknown");
   }
 
-  /**
-   * @param filename
-   */
+  /** @param filename */
   @Deprecated
   public void saveUpdateFile(final String filename) {
     alf.save(filename, al);
diff --git a/ModuleSatelliteDatabase/src/main/java/org/josast/util/files/ManageFolder.java b/ModuleSatelliteDatabase/src/main/java/org/josast/util/files/ManageFolder.java
index f30b34f8..b6aee3b7 100644
--- a/ModuleSatelliteDatabase/src/main/java/org/josast/util/files/ManageFolder.java
+++ b/ModuleSatelliteDatabase/src/main/java/org/josast/util/files/ManageFolder.java
@@ -33,16 +33,12 @@ public class ManageFolder {
     createdDirectories();
   }
 
-  /**
-   * @return the repositoryPath
-   */
+  /** @return the repositoryPath */
   public String getRepositoryPath() {
     return RepositoryPath;
   }
 
-  /**
-   * @param repositoryPath the repositoryPath to set
-   */
+  /** @param repositoryPath the repositoryPath to set */
   public void setRepositoryPath(String repositoryPath) {
     RepositoryPath = repositoryPath;
   }
diff --git a/ModuleSatelliteDatabase/src/test/java/org/josast/AmsatList/api/AmsatListRequestTest.java b/ModuleSatelliteDatabase/src/test/java/org/josast/AmsatList/api/AmsatListRequestTest.java
index 3586a321..4b91f660 100644
--- a/ModuleSatelliteDatabase/src/test/java/org/josast/AmsatList/api/AmsatListRequestTest.java
+++ b/ModuleSatelliteDatabase/src/test/java/org/josast/AmsatList/api/AmsatListRequestTest.java
@@ -11,28 +11,20 @@ import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-/**
- * @author chris
- */
+/** @author chris */
 public class AmsatListRequestTest {
 
-  /**
-   * @throws java.lang.Exception
-   */
+  /** @throws java.lang.Exception */
   @BeforeClass
   public static void setUpBeforeClass() throws Exception {}
 
-  /**
-   * @throws java.lang.Exception
-   */
+  /** @throws java.lang.Exception */
   @AfterClass
   public static void tearDownAfterClass() throws Exception {}
 
   private AmsatListRequest amr = null;
 
-  /**
-   * @throws java.lang.Exception
-   */
+  /** @throws java.lang.Exception */
   @Before
   public void setUp() throws Exception {
     // charge le fichier
@@ -40,9 +32,7 @@ public class AmsatListRequestTest {
     amr = new AmsatListRequest("src\\test\\data\\FileIn\\AmsatList.xml");
   }
 
-  /**
-   * @throws java.lang.Exception
-   */
+  /** @throws java.lang.Exception */
   @After
   public void tearDown() throws Exception {}
 
diff --git a/ModuleSound/src/main/java/org/avmdti/sound/AudioFormatFactory.java b/ModuleSound/src/main/java/org/avmdti/sound/AudioFormatFactory.java
index 9b81ea6c..19b0201e 100644
--- a/ModuleSound/src/main/java/org/avmdti/sound/AudioFormatFactory.java
+++ b/ModuleSound/src/main/java/org/avmdti/sound/AudioFormatFactory.java
@@ -31,7 +31,7 @@ public class AudioFormatFactory {
   public static AudioFormat getAudioFormat(int id) {
     switch (id) {
       case MONO8BITPCM:
-        return (new AudioFormat(8000, 8, 1, true, true));
+        return new AudioFormat(8000, 8, 1, true, true);
 
       default:
         return null;
diff --git a/ModuleSound/src/main/java/org/avmdti/sound/SoundRecorder.java b/ModuleSound/src/main/java/org/avmdti/sound/SoundRecorder.java
index 16e9939e..14ea00dd 100644
--- a/ModuleSound/src/main/java/org/avmdti/sound/SoundRecorder.java
+++ b/ModuleSound/src/main/java/org/avmdti/sound/SoundRecorder.java
@@ -121,9 +121,7 @@ public class SoundRecorder extends Thread {
     this.start();
   }
 
-  /**
-   * @see java.lang.Runnable#run()
-   */
+  /** @see java.lang.Runnable#run() */
   public void run() {
     try {
       AudioSystem.write(AIS, AudioFileFormat.Type.WAVE, fichier);
diff --git a/ModuleSound/src/main/java/org/avmdti/sound/example/GUIDemoSoundRecorder.java b/ModuleSound/src/main/java/org/avmdti/sound/example/GUIDemoSoundRecorder.java
index 84122d95..b4618a42 100644
--- a/ModuleSound/src/main/java/org/avmdti/sound/example/GUIDemoSoundRecorder.java
+++ b/ModuleSound/src/main/java/org/avmdti/sound/example/GUIDemoSoundRecorder.java
@@ -12,9 +12,7 @@ import org.avmdti.sound.SoundRecorder;
  * Created on 27 janvier 2004, 09:04
  */
 
-/**
- * @author mercier
- */
+/** @author mercier */
 public class GUIDemoSoundRecorder extends javax.swing.JFrame {
   /** */
   private static final long serialVersionUID = 3175588711372297398L;
@@ -72,7 +70,7 @@ public class GUIDemoSoundRecorder extends javax.swing.JFrame {
 
     jButtonFileSelect.addActionListener(
         new java.awt.event.ActionListener() {
-          public void actionPerformed(java.awt.event.ActionEvent evt) {
+          public void actionPerformed(ActionEvent evt) {
             jButtonFileSelectActionPerformed(evt);
           }
         });
@@ -86,7 +84,7 @@ public class GUIDemoSoundRecorder extends javax.swing.JFrame {
     jButtonStart.setToolTipText("Begin to record sound");
     jButtonStart.addActionListener(
         new java.awt.event.ActionListener() {
-          public void actionPerformed(java.awt.event.ActionEvent evt) {
+          public void actionPerformed(ActionEvent evt) {
             jButtonStartActionPerformed(evt);
           }
         });
@@ -97,7 +95,7 @@ public class GUIDemoSoundRecorder extends javax.swing.JFrame {
     jButtonStop.setToolTipText("Stop record sound");
     jButtonStop.addActionListener(
         new java.awt.event.ActionListener() {
-          public void actionPerformed(java.awt.event.ActionEvent evt) {
+          public void actionPerformed(ActionEvent evt) {
             jButtonStopActionPerformed(evt);
           }
         });
@@ -108,7 +106,7 @@ public class GUIDemoSoundRecorder extends javax.swing.JFrame {
     jButtonExit.setToolTipText("exit demo");
     jButtonExit.addActionListener(
         new java.awt.event.ActionListener() {
-          public void actionPerformed(java.awt.event.ActionEvent evt) {
+          public void actionPerformed(ActionEvent evt) {
             jButtonExitActionPerformed(evt);
           }
         });
@@ -158,14 +156,14 @@ public class GUIDemoSoundRecorder extends javax.swing.JFrame {
   }
 
   private void jButtonExitActionPerformed(
-      java.awt.event.ActionEvent evt) { // GEN-FIRST:event_jButtonExitActionPerformed
+      ActionEvent evt) { // GEN-FIRST:event_jButtonExitActionPerformed
     // Add your handling code here:
     if (SR != null) SR.close();
     System.exit(0);
   } // GEN-LAST:event_jButtonExitActionPerformed
 
   private void jButtonStopActionPerformed(
-      java.awt.event.ActionEvent evt) { // GEN-FIRST:event_jButtonStopActionPerformed
+      ActionEvent evt) { // GEN-FIRST:event_jButtonStopActionPerformed
     // Add your handling code here:
     jButtonStop.setEnabled(false);
     jButtonStart.setEnabled(true);
@@ -173,7 +171,7 @@ public class GUIDemoSoundRecorder extends javax.swing.JFrame {
   } // GEN-LAST:event_jButtonStopActionPerformed
 
   private void jButtonStartActionPerformed(
-      java.awt.event.ActionEvent evt) { // GEN-FIRST:event_jButtonStartActionPerformed
+      ActionEvent evt) { // GEN-FIRST:event_jButtonStartActionPerformed
     // Add your handling code here:
     jButtonStop.setEnabled(true);
     jButtonStart.setEnabled(false);
@@ -190,9 +188,7 @@ public class GUIDemoSoundRecorder extends javax.swing.JFrame {
     System.exit(0);
   } // GEN-LAST:event_exitForm
 
-  /**
-   * @param args the command line arguments
-   */
+  /** @param args the command line arguments */
   @SuppressWarnings("deprecation")
   public static void main(String args[]) {
     new GUIDemoSoundRecorder().show();
diff --git a/ModuleSound/src/main/java/org/avmdti/sound/example/MyFileFilter.java b/ModuleSound/src/main/java/org/avmdti/sound/example/MyFileFilter.java
index 570fe164..dbf5362f 100644
--- a/ModuleSound/src/main/java/org/avmdti/sound/example/MyFileFilter.java
+++ b/ModuleSound/src/main/java/org/avmdti/sound/example/MyFileFilter.java
@@ -127,7 +127,6 @@ public class MyFileFilter extends FileFilter {
       if (extension != null && filters.get(getExtension(f)) != null) {
         return true;
       }
-      ;
     }
     return false;
   }
@@ -145,7 +144,6 @@ public class MyFileFilter extends FileFilter {
       if (i > 0 && i < filename.length() - 1) {
         return filename.substring(i + 1).toLowerCase();
       }
-      ;
     }
     return null;
   }
diff --git a/ModuleSoundModem/pom.xml b/ModuleSoundModem/pom.xml
index 1b8e61a1..6aa4ee48 100644
--- a/ModuleSoundModem/pom.xml
+++ b/ModuleSoundModem/pom.xml
@@ -21,7 +21,7 @@
 		<maven.compiler.target>1.8</maven.compiler.target>
 		
 		<commons-cli.version>1.5.0 </commons-cli.version>
-		<kaitai-struct-runtime.version>0.9</kaitai-struct-runtime.version>
+		<kaitai-struct-runtime.version>0.10</kaitai-struct-runtime.version>
 	</properties>
 
 
diff --git a/ModuleSoundModem/src/main/java/org/josast/ModuleSoundModem/SoundModemConfiguration.java b/ModuleSoundModem/src/main/java/org/josast/ModuleSoundModem/SoundModemConfiguration.java
index b441af31..0f6efdb2 100644
--- a/ModuleSoundModem/src/main/java/org/josast/ModuleSoundModem/SoundModemConfiguration.java
+++ b/ModuleSoundModem/src/main/java/org/josast/ModuleSoundModem/SoundModemConfiguration.java
@@ -1,7 +1,6 @@
 package org.josast.ModuleSoundModem;
 
 import java.util.logging.Logger;
-import org.josast.property.CONFIG;
 import org.josast.property.ConfigObject;
 
 /** @author christophe */
@@ -20,7 +19,7 @@ public class SoundModemConfiguration extends ConfigObject {
 
   private boolean smBinarieFilePrefixDate = false;
 
-  protected CONFIG configFile = CONFIG.getInstance();
+ // protected CONFIG configFile = CONFIG.getInstance();
 
   /** @param configFilename */
   public SoundModemConfiguration(final String configFilename) {
diff --git a/ModuleSoundModem/src/main/java/org/josast/ModuleSoundModem/kiss.java b/ModuleSoundModem/src/main/java/org/josast/ModuleSoundModem/kiss.java
index 595efa65..0587cbbb 100644
--- a/ModuleSoundModem/src/main/java/org/josast/ModuleSoundModem/kiss.java
+++ b/ModuleSoundModem/src/main/java/org/josast/ModuleSoundModem/kiss.java
@@ -42,7 +42,7 @@ public class kiss {
   byte type = 0;
 
   public kiss(final byte[] data) {
-    kissdata = data;
+    kissdata = data.clone();
   }
 
   public byte getType() {
diff --git a/ModuleUVSQsatTelemetry/src/main/java/org/josast/uvsqsat/Frame.java b/ModuleUVSQsatTelemetry/src/main/java/org/josast/uvsqsat/Frame.java
index 6d1cf6ef..1941e042 100644
--- a/ModuleUVSQsatTelemetry/src/main/java/org/josast/uvsqsat/Frame.java
+++ b/ModuleUVSQsatTelemetry/src/main/java/org/josast/uvsqsat/Frame.java
@@ -167,37 +167,27 @@ public class Frame {
         + separator;
   }
 
-  /**
-   * @return the sid
-   */
+  /** @return the sid */
   public int getSid() {
     return sid;
   }
 
-  /**
-   * @param sid the sid to set
-   */
+  /** @param sid the sid to set */
   public void setSid(int sid) {
     this.sid = sid;
   }
 
-  /**
-   * @return the packetPrimaryHeader
-   */
+  /** @return the packetPrimaryHeader */
   public PPrimaryHeader getPacketPrimaryHeader() {
     return packetPrimaryHeader;
   }
 
-  /**
-   * @return the packetSecondaryHeader
-   */
+  /** @return the packetSecondaryHeader */
   public PSecondaryHeader getPacketSecondaryHeader() {
     return packetSecondaryHeader;
   }
 
-  /**
-   * @return the uiFrame
-   */
+  /** @return the uiFrame */
   public UiFrame getUiFrame() {
     return uiFrame;
   }
diff --git a/ModuleUVSQsatTelemetry/src/main/java/org/josast/uvsqsat/PPrimaryHeader.java b/ModuleUVSQsatTelemetry/src/main/java/org/josast/uvsqsat/PPrimaryHeader.java
index e09e7e84..263f98d5 100644
--- a/ModuleUVSQsatTelemetry/src/main/java/org/josast/uvsqsat/PPrimaryHeader.java
+++ b/ModuleUVSQsatTelemetry/src/main/java/org/josast/uvsqsat/PPrimaryHeader.java
@@ -62,100 +62,72 @@ public class PPrimaryHeader {
         + separator;
   }
 
-  /**
-   * @return the packetVersionNumber
-   */
+  /** @return the packetVersionNumber */
   public long getPacketVersionNumber() {
     return packetVersionNumber;
   }
 
-  /**
-   * @param packetVersionNumber the packetVersionNumber to set
-   */
+  /** @param packetVersionNumber the packetVersionNumber to set */
   public void setPacketVersionNumber(long packetVersionNumber) {
     this.packetVersionNumber = packetVersionNumber;
   }
 
-  /**
-   * @return the packetIdPacketType
-   */
+  /** @return the packetIdPacketType */
   public boolean isPacketIdPacketType() {
     return packetIdPacketType;
   }
 
-  /**
-   * @param packetIdPacketType the packetIdPacketType to set
-   */
+  /** @param packetIdPacketType the packetIdPacketType to set */
   public void setPacketIdPacketType(boolean packetIdPacketType) {
     this.packetIdPacketType = packetIdPacketType;
   }
 
-  /**
-   * @return the packetIdSecondaryHeaderFlag
-   */
+  /** @return the packetIdSecondaryHeaderFlag */
   public boolean isPacketIdSecondaryHeaderFlag() {
     return packetIdSecondaryHeaderFlag;
   }
 
-  /**
-   * @param packetIdSecondaryHeaderFlag the packetIdSecondaryHeaderFlag to set
-   */
+  /** @param packetIdSecondaryHeaderFlag the packetIdSecondaryHeaderFlag to set */
   public void setPacketIdSecondaryHeaderFlag(boolean packetIdSecondaryHeaderFlag) {
     this.packetIdSecondaryHeaderFlag = packetIdSecondaryHeaderFlag;
   }
 
-  /**
-   * @return the packetIdApplicationProcessId
-   */
+  /** @return the packetIdApplicationProcessId */
   public long getPacketIdApplicationProcessId() {
     return packetIdApplicationProcessId;
   }
 
-  /**
-   * @param packetIdApplicationProcessId the packetIdApplicationProcessId to set
-   */
+  /** @param packetIdApplicationProcessId the packetIdApplicationProcessId to set */
   public void setPacketIdApplicationProcessId(long packetIdApplicationProcessId) {
     this.packetIdApplicationProcessId = packetIdApplicationProcessId;
   }
 
-  /**
-   * @return the packetSequenceControlSecquenceFlag
-   */
+  /** @return the packetSequenceControlSecquenceFlag */
   public long getPacketSequenceControlSecquenceFlag() {
     return packetSequenceControlSecquenceFlag;
   }
 
-  /**
-   * @param packetSequenceControlSecquenceFlag the packetSequenceControlSecquenceFlag to set
-   */
+  /** @param packetSequenceControlSecquenceFlag the packetSequenceControlSecquenceFlag to set */
   public void setPacketSequenceControlSecquenceFlag(long packetSequenceControlSecquenceFlag) {
     this.packetSequenceControlSecquenceFlag = packetSequenceControlSecquenceFlag;
   }
 
-  /**
-   * @return the packetSequenceControlCountOrName
-   */
+  /** @return the packetSequenceControlCountOrName */
   public long getPacketSequenceControlCountOrName() {
     return packetSequenceControlCountOrName;
   }
 
-  /**
-   * @param packetSequenceControlCountOrName the packetSequenceControlCountOrName to set
-   */
+  /** @param packetSequenceControlCountOrName the packetSequenceControlCountOrName to set */
   public void setPacketSequenceControlCountOrName(long packetSequenceControlCountOrName) {
     this.packetSequenceControlCountOrName = packetSequenceControlCountOrName;
   }
 
-  /**
-   * @return the packetDataLength
-   */
+  /** @return the packetDataLength */
   public int getPacketDataLength() {
     return packetDataLength;
   }
 
-  /**
-   * @param packetDataLength the packetDataLength to set
-   */
+  /** @param packetDataLength the packetDataLength to set */
   public void setPacketDataLength(int packetDataLength) {
     this.packetDataLength = packetDataLength;
   }
diff --git a/ModuleUVSQsatTelemetry/src/main/java/org/josast/uvsqsat/PSecondaryHeader.java b/ModuleUVSQsatTelemetry/src/main/java/org/josast/uvsqsat/PSecondaryHeader.java
index 5ac84d70..83c1482e 100644
--- a/ModuleUVSQsatTelemetry/src/main/java/org/josast/uvsqsat/PSecondaryHeader.java
+++ b/ModuleUVSQsatTelemetry/src/main/java/org/josast/uvsqsat/PSecondaryHeader.java
@@ -73,9 +73,7 @@ public class PSecondaryHeader {
         + separator;
   }
 
-  /**
-   * @return the sid
-   */
+  /** @return the sid */
   public int getSid() {
     return sid;
   }
diff --git a/ModuleUVSQsatTelemetry/src/main/java/org/josast/uvsqsat/generated/Uvsqsat.java b/ModuleUVSQsatTelemetry/src/main/java/org/josast/uvsqsat/generated/Uvsqsat.java
index 5561f364..612fff4b 100644
--- a/ModuleUVSQsatTelemetry/src/main/java/org/josast/uvsqsat/generated/Uvsqsat.java
+++ b/ModuleUVSQsatTelemetry/src/main/java/org/josast/uvsqsat/generated/Uvsqsat.java
@@ -6342,9 +6342,7 @@ public class Uvsqsat extends KaitaiStruct {
   private Uvsqsat _root;
   private KaitaiStruct _parent;
 
-  /**
-   * @see <a href="https://www.tapr.org/pub_ax25.html">Source</a>
-   */
+  /** @see <a href="https://www.tapr.org/pub_ax25.html">Source</a> */
   public Ax25Frame ax25Frame() {
     return ax25Frame;
   }
diff --git a/ModuleUVSQsatTelemetry/src/main/java/org/josast/uvsqsat/pojogenerated/AFrame.java b/ModuleUVSQsatTelemetry/src/main/java/org/josast/uvsqsat/pojogenerated/AFrame.java
index 536ee89c..15adf40c 100644
--- a/ModuleUVSQsatTelemetry/src/main/java/org/josast/uvsqsat/pojogenerated/AFrame.java
+++ b/ModuleUVSQsatTelemetry/src/main/java/org/josast/uvsqsat/pojogenerated/AFrame.java
@@ -1,9 +1,7 @@
 /** */
 package org.josast.uvsqsat.pojogenerated;
 
-/**
- * @author chris
- */
+/** @author chris */
 public abstract class AFrame {
 
   public String toStringCompute() {
diff --git a/ModuleUtil/pom.xml b/ModuleUtil/pom.xml
index d66c4d01..5a43bc2d 100644
--- a/ModuleUtil/pom.xml
+++ b/ModuleUtil/pom.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
diff --git a/ModuleUtil/src/main/java/org/avmdti/josast/util/StringtoByte.java b/ModuleUtil/src/main/java/org/avmdti/josast/util/StringtoByte.java
index 56723f91..fd44eccb 100644
--- a/ModuleUtil/src/main/java/org/avmdti/josast/util/StringtoByte.java
+++ b/ModuleUtil/src/main/java/org/avmdti/josast/util/StringtoByte.java
@@ -7,7 +7,11 @@ package org.avmdti.josast.util;
 
 public class StringtoByte {
 
-  static final byte ZERO = new String("0").getBytes()[0];
+  static final byte ZERO = "0".getBytes()[0];
+
+  /*
+   *
+   */
 
   public static byte convert(String S) {
 
diff --git a/ModuleUtil/src/main/java/org/avmdti/josast/util/mathematique/CoordGeo.java b/ModuleUtil/src/main/java/org/avmdti/josast/util/mathematique/CoordGeo.java
index e2dbe9f8..fc3d1424 100644
--- a/ModuleUtil/src/main/java/org/avmdti/josast/util/mathematique/CoordGeo.java
+++ b/ModuleUtil/src/main/java/org/avmdti/josast/util/mathematique/CoordGeo.java
@@ -47,44 +47,32 @@ public class CoordGeo {
         + altitude);
   }
 
-  /**
-   * @return latitude
-   */
+  /** @return latitude */
   public double getLatitude() {
     return latitude;
   }
 
-  /**
-   * @param latitude
-   */
+  /** @param latitude */
   public void setLatitude(double latitude) {
     this.latitude = latitude;
   }
 
-  /**
-   * @return longitude
-   */
+  /** @return longitude */
   public double getLongitude() {
     return longitude;
   }
 
-  /**
-   * @param longitude
-   */
+  /** @param longitude */
   public void setLongitude(double longitude) {
     this.longitude = longitude;
   }
 
-  /**
-   * @return altitude
-   */
+  /** @return altitude */
   public double getAltitude() {
     return altitude;
   }
 
-  /**
-   * @param altitude
-   */
+  /** @param altitude */
   public void setAltitude(double altitude) {
     this.altitude = altitude;
   }
diff --git a/ModuleUtil/src/main/java/org/avmdti/josast/util/mathematique/CoordTopo.java b/ModuleUtil/src/main/java/org/avmdti/josast/util/mathematique/CoordTopo.java
index 70169bbb..569affba 100644
--- a/ModuleUtil/src/main/java/org/avmdti/josast/util/mathematique/CoordTopo.java
+++ b/ModuleUtil/src/main/java/org/avmdti/josast/util/mathematique/CoordTopo.java
@@ -51,30 +51,22 @@ public class CoordTopo {
     this.elevation = elevation;
   }
 
-  /**
-   * @return Returns the range.
-   */
+  /** @return Returns the range. */
   public double getRange() {
     return Range;
   }
 
-  /**
-   * @param range The range to set.
-   */
+  /** @param range The range to set. */
   public void setRange(double range) {
     Range = range;
   }
 
-  /**
-   * @return Returns the rangeRate.
-   */
+  /** @return Returns the rangeRate. */
   public double getRangeRate() {
     return RangeRate;
   }
 
-  /**
-   * @param rangeRate The rangeRate to set.
-   */
+  /** @param rangeRate The rangeRate to set. */
   public void setRangeRate(double rangeRate) {
     RangeRate = rangeRate;
   }
diff --git a/ToolsXSDtojava/pom.xml b/ToolsXSDtojava/pom.xml
index 9550ccf9..e56ddc5d 100644
--- a/ToolsXSDtojava/pom.xml
+++ b/ToolsXSDtojava/pom.xml
@@ -23,17 +23,17 @@
 		<dependency>
 			<groupId>jakarta.xml.bind</groupId>
 			<artifactId>jakarta.xml.bind-api</artifactId>
-			<version>4.0.0-RC1</version>
+			<version>4.0.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.glassfish.jaxb</groupId>
 			<artifactId>jaxb-runtime</artifactId>
-			<version>3.0.2</version>
+			<version>4.0.1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.glassfish.jaxb</groupId>
 			<artifactId>jaxb-xjc</artifactId>
-			<version>3.0.2</version>
+			<version>4.0.1</version>
 		</dependency>
 	</dependencies>
 	
@@ -42,7 +42,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.8.0</version>
+				
 				<configuration>
 					<release>11</release>
 				</configuration>
@@ -50,7 +50,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
-				<version>2.22.0</version>
+				
 				<configuration>
 					<argLine>--illegal-access=permit</argLine>
 				</configuration>
-- 
GitLab


From 5d60c528fee68614833fc0c4cb6bf179b964dec4 Mon Sep 17 00:00:00 2001
From: chris <chris@XtofS8>
Date: Fri, 4 Nov 2022 20:51:38 +0100
Subject: [PATCH 5/7] Feat Add Satellite management to kiss tool

---
 ApplicationKissTool/pom.xml                   |   4 +-
 .../src/main/java/module-info.java            |   1 +
 .../org/josast/ApplicationKissTool/App.java   |   6 +-
 .../ApplicationKissTool/Ax25Display.java      |  21 +++-
 .../josast/ApplicationKissTool/Controler.java |  51 +++++----
 .../josast/ApplicationKissTool/LogFile.java   |   3 +-
 .../ApplicationKissTool/ManageDataFile.java   |   1 +
 .../ModelReceivedData.java                    |   8 +-
 .../ApplicationKissTool/ReceivedData.java     |  17 +--
 .../SatelliteNoradFile.java                   | 101 ++++++++++++++++++
 .../josast/ApplicationKissTool/SendSIDS.java  |   6 +-
 .../TaskManageReceivedData.java               |  78 ++++++++------
 .../TaskSoundmodemTCP.java                    |   7 +-
 .../java/org/josast/SIDS/HttpPostSIDS.java    |  19 ++--
 .../main/java/org/josast/SIDS/SIDSData.java   |   4 +-
 .../java/org/josast/SIDS/app/TestSIDS.java    |  10 +-
 pom.xml                                       |   4 +-
 17 files changed, 245 insertions(+), 96 deletions(-)
 create mode 100644 ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/SatelliteNoradFile.java

diff --git a/ApplicationKissTool/pom.xml b/ApplicationKissTool/pom.xml
index 67228243..778d2ce8 100644
--- a/ApplicationKissTool/pom.xml
+++ b/ApplicationKissTool/pom.xml
@@ -29,7 +29,7 @@
     <dependency>
   <groupId>com.google.code.gson</groupId>
   <artifactId>gson</artifactId>
-  <version>2.8.6</version>
+  <version>2.10</version>
 </dependency>
     <dependency>
 			<groupId>org.openjfx</groupId>
@@ -70,7 +70,7 @@
 <dependency>
     <groupId>org.json</groupId>
     <artifactId>json</artifactId>
-    <version>20220320</version>
+    <version>20220924</version>
 </dependency>
     
  
diff --git a/ApplicationKissTool/src/main/java/module-info.java b/ApplicationKissTool/src/main/java/module-info.java
index 228d443c..3f0eba0c 100644
--- a/ApplicationKissTool/src/main/java/module-info.java
+++ b/ApplicationKissTool/src/main/java/module-info.java
@@ -12,6 +12,7 @@ module org.josast.ApplicationKissTool {
   requires kaitai.struct.runtime;
   requires org.json;
   requires javafx.base;
+  requires com.google.gson;
 
   opens org.josast.ApplicationKissTool to
       javafx.fxml;
diff --git a/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/App.java b/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/App.java
index e0ff4ae4..44a7d0ad 100644
--- a/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/App.java
+++ b/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/App.java
@@ -17,6 +17,7 @@ public class App extends Application {
   private static Scene scene;
   private static FXMLLoader fxmlLoader;
   private static Logger logger = Logger.getLogger("AmsatLogger");
+  private static String FxmlFile =  "KissTool";
 
   //  TaskManageReceivedData taskMngtData = null;
 
@@ -24,13 +25,14 @@ public class App extends Application {
   public void start(Stage stage) throws IOException {
 
     System.setProperty("glass.accessible.force", "false");
-    scene = new Scene(loadFXML("KissTool"), 800, 600);
+    
+    scene = new Scene(loadFXML(FxmlFile), 800, 600);
     stage.setScene(scene);
 
     Controler ctrl = fxmlLoader.getController();
     ctrl.setPrimaryStage(stage);
     scene.getStylesheets().add(this.getClass().getResource("boot.css").toExternalForm());
-    stage.setTitle("KISS tool -UVSQSAT Dedicated " + ctrl.getVersion());
+    stage.setTitle("KISS tool  " + ctrl.getVersion());
 
     stage.setOnCloseRequest(e -> System.exit(0));
     ctrl.initMMI();
diff --git a/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/Ax25Display.java b/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/Ax25Display.java
index 7c858171..f01e3202 100644
--- a/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/Ax25Display.java
+++ b/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/Ax25Display.java
@@ -1,9 +1,12 @@
 package org.josast.ApplicationKissTool;
 
+import java.util.logging.Logger;
+
 import org.josast.AX25.AX25DecodedData;
 
 public class Ax25Display {
 
+	 private static Logger logger = Logger.getLogger("AmsatLogger");
   ReceivedData decodedData = null;
   AX25DecodedData ax25 = null;
 
@@ -18,16 +21,28 @@ public class Ax25Display {
     return sb.toString();
   }
 
-  public void setdata(ReceivedData decodedData2) {
+  public int setdata( ReceivedData decodedData2) {
+	int error = 0;
+	
     this.decodedData = decodedData2;
-    ax25 = new AX25DecodedData(decodedData.getData());
+    try
+    {
+    	 ax25 = new AX25DecodedData(decodedData.getData());
+    }
+    catch (Exception e )
+    {
+    	logger.severe("Error decoding AX25 : "+e.getMessage());
+    	error = -1;
+    }
+   
+	return error;
   }
 
   public String getAx25Data() {
     return ax25.toString();
   }
 
-  public String GetCallsignFrom() {
+  public String getCallsignFrom() {
 
     return ax25.source;
   }
diff --git a/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/Controler.java b/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/Controler.java
index 068f0b9f..9d9c9f7a 100644
--- a/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/Controler.java
+++ b/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/Controler.java
@@ -53,7 +53,8 @@ public class Controler {
   protected static final int STATE_STOP = 2;
   private static final int STATE_SAVE = 3;
   private int delayRefresh = 15; // toute les 10 mn
-  private Date lastFrameTime;
+  // @todo : vérifier la mise à jour de la variable
+  private Date lastFrameTime = new Date();
 
   private static Logger appLogger = Logger.getLogger("AmsatLogger");
   ConfigHttp c = new ConfigHttp("http://site.amsat-f.org/download/117487/");
@@ -62,7 +63,7 @@ public class Controler {
 
   private ManageDataFile mdf = new ManageDataFile();
 
-  private String version = "1.10";
+  private String version = "1.11";
 
   @FXML private Button ButtonStart;
   @FXML private Button ButtonStop;
@@ -127,7 +128,7 @@ public class Controler {
   ScheduledExecutorService ses = Executors.newScheduledThreadPool(1);
   private ScheduledFuture<?> scheduledFuture = null;
 
-  BlockingQueue<ReceivedData> receivedFrame = new LinkedBlockingDeque<ReceivedData>();
+  private volatile BlockingQueue<ReceivedData> receivedFrame = new LinkedBlockingDeque<ReceivedData>();
   Stage primaryStage = null;
 
   private String imgAmsat = "logoAmsat.png";
@@ -347,9 +348,6 @@ public class Controler {
   public void initMMI() {
 
     manageStatusinformation("Initialised", "KISS TOOL  - LOG \r\n Initialise application");
-    // SatelliteNorad uvsqsat = new SatelliteNorad("UVSQsat", 47438);
-    // SatelliteNorad Defaut = new SatelliteNorad("Defaut", conf.getNorad());
-    // SatelliteNorad picsat = new SatelliteNorad("Picsat", 43132);
     satnorad = new SatelliteNoradFile();
     satnorad.readFile("SatelliteNoradList.json");
     selectedNoradId = conf.getNorad();
@@ -360,24 +358,39 @@ public class Controler {
     LabelAmsatSent.setText("0");
     LabelPicsatSent.setText("0");
     LabelSatnogsSent.setText("0");
-    ;
+    
+
+    taskMngtData = new TaskManageReceivedData(receivedFrame, this);
+
+    Thread backgroundThread = new Thread(taskMngtData);
+    backgroundThread.setDaemon(true);
+    backgroundThread.start();
+    
+    
+    
+    
+    
+    
+    // init Delay = , repeat the task every X Minute
+    /*
+     * active le garbage collector 
+     * @todo :  verifier si vraiment utile 
+     */
+    
     Runnable task1 =
         () -> {
           Date date = new Date();
           if (date.getTime() - lastFrameTime.getTime() > 900000) {
             System.gc();
             appLogger.info("System.gc();");
+          
+            
           }
-
-          // appLogger.info("Distant Information update");
-          // updateDistantconfiguration();
+          System.out.println("Queu Size "+ receivedFrame.size());
+          System.out.println("State task"+ backgroundThread.getState().name());
+          
+          
         };
-    taskMngtData = new TaskManageReceivedData(receivedFrame, this);
-
-    Thread backgroundThread = new Thread(taskMngtData);
-    backgroundThread.setDaemon(true);
-    backgroundThread.start();
-    // init Delay = , repeat the task every X Minute
     scheduledFuture = ses.scheduleAtFixedRate(task1, delayRefresh, delayRefresh, TimeUnit.MINUTES);
 
     appLogger.warning("Initialise ");
@@ -558,7 +571,7 @@ public class Controler {
 
     LastDecoded.setText("" + noradframe);
     if (conf.isSIDS_AMSAT() == true) {
-      int results = SendSIDSMVPAmsat.Send(receivedData, noradframe);
+      int results = SendSIDSMVPAmsat.send(receivedData, noradframe);
       if (SendSIDSMVPAmsat.isCorrectSend(results)) {
         CircleDatabaseAmsatF.setFill(Color.GREEN);
         nbAmsatDatabase++;
@@ -569,7 +582,7 @@ public class Controler {
     }
 
     if (conf.isSISD_SatNogs() == true) {
-      int results = SendSIDSSatnogs.Send(receivedData, noradframe);
+      int results = SendSIDSSatnogs.send(receivedData, noradframe);
       if (SendSIDSSatnogs.isCorrectSend(results)) {
         CircleDatabaseSatnogs.setFill(Color.GREEN);
         nbSatnogsDatabase++;
@@ -579,7 +592,7 @@ public class Controler {
       }
     }
     if (conf.isSIDS_Picsat() == true) {
-      int results = SendSIDSPicsat.Send(receivedData, noradframe);
+      int results = SendSIDSPicsat.send(receivedData, noradframe);
       if (SendSIDSPicsat.isCorrectSend(results)) {
         CircleDatabasePicsat.setFill(Color.GREEN);
         picsatDatabase++;
diff --git a/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/LogFile.java b/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/LogFile.java
index 7075d188..06b85af9 100644
--- a/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/LogFile.java
+++ b/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/LogFile.java
@@ -5,6 +5,7 @@ import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.io.PrintWriter;
+import java.nio.charset.Charset;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.logging.Logger;
@@ -34,7 +35,7 @@ public class LogFile {
       }
     }
     try {
-      pw = new PrintWriter(new FileWriter(path + "/" + formater.format(aujourdhui) + "-" + ".log"));
+      pw = new PrintWriter(new FileWriter(path + "/" + formater.format(aujourdhui) + "-" + ".log",Charset.forName("utf-8")));
     } catch (IOException e) {
       appLogger.severe("erreur creating log file");
       appLogger.severe(e.toString());
diff --git a/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/ManageDataFile.java b/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/ManageDataFile.java
index 9d216e7c..e03461cb 100644
--- a/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/ManageDataFile.java
+++ b/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/ManageDataFile.java
@@ -4,6 +4,7 @@ import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.io.PrintWriter;
+import java.nio.charset.Charset;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
diff --git a/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/ModelReceivedData.java b/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/ModelReceivedData.java
index 49d306a0..1b613524 100644
--- a/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/ModelReceivedData.java
+++ b/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/ModelReceivedData.java
@@ -38,7 +38,7 @@ public class ModelReceivedData {
     listenerList.firePropertyChange("ReceivedFrame", receivedFrame, receivedFrame);
   }
 
-  public void IncrementReceivedFrame() {
+  public void incrementReceivedFrame() {
     this.receivedFrame++;
     listenerList.firePropertyChange("ReceivedFrame", receivedFrame, receivedFrame);
   }
@@ -52,7 +52,7 @@ public class ModelReceivedData {
     listenerList.firePropertyChange("TraitedFrame", traitedFrame, traitedFrame);
   }
 
-  public void IncTraitedFrame() {
+  public void incTraitedFrame() {
     this.traitedFrame++;
     listenerList.firePropertyChange("TraitedFrame", traitedFrame, traitedFrame);
   }
@@ -66,7 +66,7 @@ public class ModelReceivedData {
     listenerList.firePropertyChange("SendSidsFrameAmsat", sendSidsFrameAmsat, sendSidsFrameAmsat);
   }
 
-  public void IncSendSidsFrameAmsat() {
+  public void incSendSidsFrameAmsat() {
     this.sendSidsFrameAmsat++;
     listenerList.firePropertyChange("SendSidsFrameAmsat", sendSidsFrameAmsat, sendSidsFrameAmsat);
   }
@@ -81,7 +81,7 @@ public class ModelReceivedData {
         "SendSidsFrameSatnogs", sendSidsFrameSatnogs, sendSidsFrameSatnogs);
   }
 
-  public void IncSendSidsFrameSatnogs(long sendSidsFrameSatnogs) {
+  public void incSendSidsFrameSatnogs(long sendSidsFrameSatnogs) {
     this.sendSidsFrameSatnogs = sendSidsFrameSatnogs;
     listenerList.firePropertyChange(
         "SendSidsFrameSatnogs", sendSidsFrameSatnogs, sendSidsFrameSatnogs);
diff --git a/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/ReceivedData.java b/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/ReceivedData.java
index 258679d4..85a1bdb7 100644
--- a/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/ReceivedData.java
+++ b/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/ReceivedData.java
@@ -1,5 +1,6 @@
 package org.josast.ApplicationKissTool;
 
+import java.nio.charset.StandardCharsets;
 import java.util.Date;
 
 public class ReceivedData {
@@ -8,29 +9,29 @@ public class ReceivedData {
   private byte[] data;
 
   public ReceivedData(Date receivedTime, byte[] receivedData) {
-    super();
-    time = receivedTime;
-    data = receivedData;
+
+    time = (Date) receivedTime.clone();
+    data = receivedData.clone();
   }
 
   public Date getTime() {
-    return time;
+    return (Date) time.clone();
   }
 
   public void setTime(Date time) {
-    this.time = time;
+    this.time = (Date) time.clone();
   }
 
   public byte[] getData() {
-    return data;
+    return data.clone();
   }
 
   public void setData(byte[] data) {
-    this.data = data;
+    this.data = data.clone();
   }
 
   @Override
   public String toString() {
-    return "Frame [time=" + time + "][ Frame=" + new String(data) + "]";
+    return "Frame [time=" + time + "][ Frame=" + new String(data,StandardCharsets.UTF_8) + "]";
   }
 }
diff --git a/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/SatelliteNoradFile.java b/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/SatelliteNoradFile.java
new file mode 100644
index 00000000..3d2063e4
--- /dev/null
+++ b/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/SatelliteNoradFile.java
@@ -0,0 +1,101 @@
+/** */
+package org.josast.ApplicationKissTool;
+
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
+import java.io.FileWriter;
+import java.io.Reader;
+import java.io.Writer;
+import java.nio.charset.Charset;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.List;
+
+/** @author chris */
+public class SatelliteNoradFile {
+
+  private List<SatelliteNorad> SatelliteNoradList;
+  private Hashtable<String, SatelliteNorad> htsat = new Hashtable<>();
+
+  public List<SatelliteNorad> getSatelliteNoradList() {
+    return new ArrayList<SatelliteNorad>(SatelliteNoradList);
+  }
+
+  public void writeFile(String file) {
+    try {
+      // create a list of users
+
+      // create writer
+      Writer writer = new FileWriter(file,Charset.forName("utf-8"));
+
+      // convert users list to JSON file
+      new Gson().toJson(SatelliteNoradList, writer);
+
+      // close writer
+      writer.close();
+
+    } catch (Exception ex) {
+      ex.printStackTrace();
+    }
+  }
+
+  public void readFile(String file) {
+
+    try {
+      // create Gson instance
+      //	    Gson gson = new Gson();
+
+      // create a reader
+      Reader reader = Files.newBufferedReader(Paths.get(file));
+
+      // convert JSON array to list of users
+      SatelliteNoradList =
+          new Gson().fromJson(reader, new TypeToken<List<SatelliteNorad>>() {}.getType());
+
+      Iterator<SatelliteNorad> it = SatelliteNoradList.iterator();
+      System.out.println("nb sat" + SatelliteNoradList.size());
+      while (it.hasNext()) {
+        SatelliteNorad sat = it.next();
+        htsat.put(sat.getCallsign(), sat);
+      }
+
+      // print users
+      SatelliteNoradList.forEach(System.out::println);
+
+      // close reader
+      reader.close();
+
+    } catch (Exception ex) {
+      ex.printStackTrace();
+    }
+  }
+
+  public int getNorad(String callsign) {
+    int norad = 0;
+    SatelliteNorad sat = htsat.get(callsign);
+    if (sat != null) norad = sat.getNoradId();
+    return norad;
+  }
+
+  public void initialise() {
+
+    SatelliteNoradList =
+        Arrays.asList(
+            new SatelliteNorad("UVSQsat", 47438, "LATMOS"),
+            new SatelliteNorad("Defaut", 99999, null),
+            new SatelliteNorad("Picsat", 43132, "PICSAT"));
+  }
+
+  /** @param args */
+  public static void main(String[] args) {
+    // TODO Auto-generated method stub
+    SatelliteNoradFile s = new SatelliteNoradFile();
+    // s.initialise();
+    // s.writeFile("SatelliteNoradList.json");
+    s.readFile("SatelliteNoradList.json");
+  }
+}
diff --git a/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/SendSIDS.java b/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/SendSIDS.java
index 0e6f16b2..1ef365f7 100644
--- a/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/SendSIDS.java
+++ b/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/SendSIDS.java
@@ -19,7 +19,7 @@ public class SendSIDS {
     client = new HttpPostSIDS(url);
   }
 
-  public int Send(ReceivedData data) {
+  public int send(ReceivedData data) {
     // BasicConfigurator.configure();
 
     // transforme en hexa String
@@ -30,9 +30,9 @@ public class SendSIDS {
     return result;
   }
 
-  public int Send(ReceivedData data, int norad) {
+  public int send(ReceivedData data, int norad) {
     sids.setNoradID(norad);
-    return Send(data);
+    return send(data);
   }
 
   public boolean isCorrectSend(int value) {
diff --git a/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/TaskManageReceivedData.java b/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/TaskManageReceivedData.java
index f81fff29..affe3dba 100644
--- a/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/TaskManageReceivedData.java
+++ b/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/TaskManageReceivedData.java
@@ -17,7 +17,7 @@ public class TaskManageReceivedData extends Task<String> {
   private DisplayUVSQsat displayUVSQsat = new DisplayUVSQsat();
 
   private BlockingQueue<ReceivedData> blockingQueue = null;
-  private ModelReceivedData datamodel = null;
+ // private ModelReceivedData datamodel = null;
 
   Controler ctrl = null;
 
@@ -26,11 +26,11 @@ public class TaskManageReceivedData extends Task<String> {
     ctrl = ctrlIn;
   }
 
-  public TaskManageReceivedData(
-      BlockingQueue<ReceivedData> blockingQueueIn, ModelReceivedData datamodel) {
-    blockingQueue = blockingQueueIn;
-    this.datamodel = datamodel;
-  }
+//  public TaskManageReceivedData(
+//      BlockingQueue<ReceivedData> blockingQueueIn, ModelReceivedData datamodel) {
+//    blockingQueue = blockingQueueIn;
+//    this.datamodel = datamodel;
+//  }
 
   private void displayLog(String string) {
     Platform.runLater(
@@ -58,7 +58,7 @@ public class TaskManageReceivedData extends Task<String> {
           @Override
           public void run() {
 
-            String rcvCallsign = ax25display.GetCallsignFrom();
+            String rcvCallsign = ax25display.getCallsignFrom();
 
             try {
               //   ctrl.displayLog("Display Data");
@@ -68,7 +68,7 @@ public class TaskManageReceivedData extends Task<String> {
                 ctrl.displayLog(decodedData.toString());
                 ctrl.SetDecodedData(ax25display.getDisplay());
 
-                if (ax25display.GetCallsignFrom().contains("LATMOS")) {
+                if (ax25display.getCallsignFrom().contains("LATMOS")) {
 
                   displayUVSQsat.setData(decodedData);
                   ctrl.SetDecodedData(displayUVSQsat.getData());
@@ -94,42 +94,54 @@ public class TaskManageReceivedData extends Task<String> {
     displayLog("Message Treatment Lanched");
 
     Date lastFrameTime;
+    ReceivedData decodedData;
     displayLog("Waiting Data !!!");
     while (true) {
 
-      ReceivedData decodedData = blockingQueue.take();
+      decodedData = blockingQueue.take();
       //  displayLog(" Data !!!");
 
-      ax25display.setdata(decodedData);
-      String calsignr = ax25display.GetCallsignFrom();
-      if (calsignr != null) {
-        displayLog(" calsign" + calsignr);
-      } else displayLog(" calsign not decoded");
+      /* check frame validity */
+      
+      int valid =  ax25display.setdata(decodedData);
+      
+      if ( valid == 0)
+      {
+          String calsignr = ax25display.getCallsignFrom();
+          if (calsignr != null) {
+            displayLog(" calsign" + calsignr);
+          } else displayLog(" calsign not decoded");
+
+          lastFrameTime = new Date();
+          String creationdate = ISO8601DATEFORMAT.format(lastFrameTime);
+
+          String hexaString = new BigInteger(1, decodedData.getData()).toString(16);
+
+          TlmData tlmData =
+              new TlmData(
+                  hexaString,
+                  ax25display.getCallsignFrom(),
+                  conf.getLongitude(),
+                  conf.getLatitude(),
+                  creationdate);
+          mdf.setRepositoryPath(conf.getOutputFileDirectory());
+          if (mdf.saveTlmData(tlmData) != 0) {
+              displayLog("Error creation JSON file");
+            }
+
+          displayData(decodedData);
+          //   datamodel.IncrementReceivedFrame();
+      } else
+      {
+    	  displayLog(" Frame  not decoded");
+      }
 
-      lastFrameTime = new Date();
 
       // @todo : extrait le calsign
 
       // en fonction du calssign envois SIDS (ajuster le Noarad)
 
-      String creationdate = ISO8601DATEFORMAT.format(lastFrameTime);
-
-      String hexaString = new BigInteger(1, decodedData.getData()).toString(16);
-
-      TlmData tlmData =
-          new TlmData(
-              hexaString,
-              ax25display.GetCallsignFrom(),
-              conf.getLongitude(),
-              conf.getLatitude(),
-              creationdate);
-      mdf.setRepositoryPath(conf.getOutputFileDirectory());
-      if (mdf.saveTlmData(tlmData) != 0) {
-        displayLog("Error creation JSON file");
-      }
-
-      displayData(decodedData);
-      //   datamodel.IncrementReceivedFrame();
+ 
     }
   }
 }
diff --git a/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/TaskSoundmodemTCP.java b/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/TaskSoundmodemTCP.java
index 2d51b150..37a2835d 100644
--- a/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/TaskSoundmodemTCP.java
+++ b/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/TaskSoundmodemTCP.java
@@ -19,7 +19,7 @@ public class TaskSoundmodemTCP extends Task<String> {
   Controler ctrl = null;
   //  ModelReceivedData receivedFrame = null;
   BlockingQueue<ReceivedData> blockingQueue = null;
-  private ModelReceivedData datamodel = null;
+  //private ModelReceivedData datamodel = null;
 
   /**
    * @param smConfiguration fichier de configuration
@@ -46,12 +46,11 @@ public class TaskSoundmodemTCP extends Task<String> {
    */
   public TaskSoundmodemTCP(
       SoundModemConfiguration smConfiguration2,
-      BlockingQueue<ReceivedData> blockingQueueIn,
-      ModelReceivedData datamodel) {
+      BlockingQueue<ReceivedData> blockingQueueIn) {
 
     this.smConfiguration = smConfiguration2;
     this.blockingQueue = blockingQueueIn;
-    this.datamodel = datamodel;
+ //   this.datamodel = datamodel;
 
     smc = new SoundModemClient(smConfiguration2);
     // ctrl = ctrlIn;
diff --git a/ModuleSIDS/src/main/java/org/josast/SIDS/HttpPostSIDS.java b/ModuleSIDS/src/main/java/org/josast/SIDS/HttpPostSIDS.java
index c4295402..6dd41e98 100644
--- a/ModuleSIDS/src/main/java/org/josast/SIDS/HttpPostSIDS.java
+++ b/ModuleSIDS/src/main/java/org/josast/SIDS/HttpPostSIDS.java
@@ -30,6 +30,7 @@ public class HttpPostSIDS {
   private CloseableHttpClient client = null;
   private HttpPost post = null;
   private StringBuffer result = null;
+  HttpResponse response = null;
 
   /**
    * Create a Http client for sending SIDS data. <br>
@@ -100,7 +101,7 @@ public class HttpPostSIDS {
   public int SendSIDSBasic(final SIDSData sids) {
     // Data preparation
     int resultat = 0;
-    HttpResponse response = null;
+    response = null;
     BufferedReader rd = null;
 
     List<NameValuePair> urlParameters = new ArrayList<NameValuePair>();
@@ -140,14 +141,9 @@ public class HttpPostSIDS {
       result = new StringBuffer();
       String line = "";
       try {
-        if (rd != null) {
-          while ((line = rd.readLine()) != null) {
-            result.append(line);
-          }
-
-          rd.close();
-        } else {
-          logger.severe("Error buffer readeris null  ");
+        while ((line = rd.readLine()) != null) {
+          System.out.println(line);
+          result.append(line);
         }
       } catch (IOException e) {
         logger.severe("Error reading line from server  " + e.toString());
@@ -159,4 +155,9 @@ public class HttpPostSIDS {
   public StringBuffer getResult() {
     return result;
   }
+
+  public String getMessageAnswer() {
+
+    return result.toString();
+  }
 }
diff --git a/ModuleSIDS/src/main/java/org/josast/SIDS/SIDSData.java b/ModuleSIDS/src/main/java/org/josast/SIDS/SIDSData.java
index cc831622..acdd1d34 100644
--- a/ModuleSIDS/src/main/java/org/josast/SIDS/SIDSData.java
+++ b/ModuleSIDS/src/main/java/org/josast/SIDS/SIDSData.java
@@ -25,7 +25,7 @@ public class SIDSData {
   // packet with or without KISS 'C0 00 .. C0'.
   // Whitespaces optional. C0 00 A9 05 DE ...
 
-  private static final String locator = "longLat"; // Type of the given receiver's
+  private final String locator = "longLat"; // Type of the given receiver's
   // location. Currently, only
   // 'longLat' is supported. longLat
 
@@ -47,7 +47,7 @@ public class SIDSData {
   private long fDown = 0; // Frequency of the receiver's downlink channel
   // during reception (with Doppler), in Hz 435525000
 
-  private static final String version = "2.0.1";
+  private final String version = "2.0.1";
 
   public SIDSData() {}
 
diff --git a/ModuleSIDS/src/main/java/org/josast/SIDS/app/TestSIDS.java b/ModuleSIDS/src/main/java/org/josast/SIDS/app/TestSIDS.java
index 02f0ed3e..10c20101 100644
--- a/ModuleSIDS/src/main/java/org/josast/SIDS/app/TestSIDS.java
+++ b/ModuleSIDS/src/main/java/org/josast/SIDS/app/TestSIDS.java
@@ -21,7 +21,7 @@ public class TestSIDS {
     int result = client.SendSIDSBasic(sids);
 
     System.out.println("resutats =  " + result);
-    System.out.println("resutats =  " + client.getResult());
+    System.out.println("retour hhtp =  " + client.getMessageAnswer());
   }
 
   /** @param args */
@@ -31,7 +31,8 @@ public class TestSIDS {
     // String url = "https://db-dev.satnogs.org/api/telemetry/";
     // String url = "http://127.0.0.1:9000/echoPost";
     // String url = "https://amsat.electrolab.fr/SIDS";
-    String url = "https://picsat.obspm.fr/sids/reportframe?";
+    //  String url = "https://picsat.obspm.fr/sids/reportframe?";
+    String url = "https://ddp.csum.umontpellier.fr/store_beacon";
     // String url = "http://127.0.0.1:8080/api/V2/SIDS";
     TestSIDS test = new TestSIDS(url);
     // initialise SIDS data
@@ -40,12 +41,13 @@ public class TestSIDS {
     Station st = new Station();
     st.setCallsign("SWLXT");
     sids.setStation(st);
-    sids.setNoradID(43132);
+    sids.setNoradID(99383);
     sids.setTelemetryData(
         GregorianCalendar.getInstance().getTime(),
-        "a09286a682a8e0a09286a682a86503f00901e9ae006c2ae404c019380000000000000000000000000000000002b602b807d7066e04100e5a04100a5dfff7fff70420b4000000ffff78000000000012000000000000000000000000000000003ddee2da3d011cee3e71aa4d000000000001cb9a0004003089f00a0400010000000000");
+        "8c689694b040e08cb06c8ca484e103f0ea10b704d762ab04d7622f010455a8db06000100580155ca0dacccc93044080e08370f00243011c9002200003000290f00641b000026cafe03de2222ffffcafe62d704abffffcafe024f16005772cafe000001000001cafe000000000000cafe00000000000000524f42555354412d3155204658364652420000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000");
     System.out.println(sids.toStringBasic());
     test.send(sids);
+
     //        sids.setNoradID(99749);
     //    sids.setTelemetryData(
     //        GregorianCalendar.getInstance().getTime(),
diff --git a/pom.xml b/pom.xml
index f43b9528..db9ec673 100644
--- a/pom.xml
+++ b/pom.xml
@@ -729,7 +729,7 @@
 					</execution>
 				</executions>
 			</plugin>
-			
+<!--			
 			            <plugin>
             
     <groupId>com.coveo</groupId>
@@ -753,7 +753,7 @@
     </executions>
 
             </plugin>
-
+-->
 		</plugins>
 
 
-- 
GitLab


From da54121bd3517be60ce391e75282870beb8cbb36 Mon Sep 17 00:00:00 2001
From: chris <chris@XtofS8>
Date: Sat, 5 Nov 2022 23:20:40 +0100
Subject: [PATCH 6/7] refactor : minor change - update some library version

---
 .../org/josast/ApplicationAmicalsat/App.java  |  3 +-
 .../josast/ApplicationAmicalsat/SendSIDS.java |  2 +-
 ApplicationCubesatSim/pom.xml                 |  4 +--
 ApplicationKissTool/pom.xml                   |  4 +--
 .../org/josast/ApplicationKissTool/App.java   |  2 +-
 .../josast/ApplicationKissTool/Controler.java |  4 +--
 .../ApplicationKissTool/ManageDataFile.java   |  5 +--
 .../josast/ApplicationKissTool/SendSIDS.java  |  2 +-
 ApplicationSerial/pom.xml                     |  2 +-
 .../org/josast/UVSQsatDecoder/SendSIDS.java   |  2 +-
 ModuleAPRSIS/pom.xml                          |  4 +++
 .../java/org/avmdti/josast/aprsis/Client.java |  5 +--
 .../avmdti/josast/aprsis/demo/DemoAPRSIS.java |  1 +
 .../josast/aprsis/demo/DemoTreatment.java     | 16 ++++++---
 ModuleAmicalsat/pom.xml                       |  2 +-
 .../josast/amicalsat/FrameFactoryTest.java    |  4 +--
 .../databinding/AbstractDataBinding.java      |  7 ++--
 .../ConfigurationdataBindingDemo.java         |  2 +-
 .../main/java/org/josast/property/CONFIG.java | 22 ++++++++----
 .../org/josast/propertyHttp/ConfigHttp.java   |  3 +-
 .../CubesatSim/CubesatSimeFrameTest.java      |  4 +--
 ModuleEntrySatTelemetry/pom.xml               |  4 +--
 .../EntrySat/app/DecodeEntrySatFile.java      |  5 +--
 .../java/org/josast/util/date/JulianDay.java  |  4 +--
 .../org/josast/util/date/JulianDay2000.java   |  2 +-
 .../java/org/josast/SIDS/HttpPostSIDS.java    | 12 +++++--
 .../main/java/org/josast/SIDS/SIDSData.java   |  4 +--
 .../java/org/josast/SIDS/app/SendFile.java    |  5 +--
 .../java/org/josast/SIDS/app/TestSIDS.java    |  2 +-
 ModuleSatelliteDatabase/pom.xml               | 12 +++----
 .../AmsatList/Commande/CommandeList.java      | 34 +++++++++++++------
 .../AmsatList/api/AmsatListRequest.java       |  9 ++---
 .../main/java/org/josast/AX25/Callsign.java   |  2 +-
 .../ModuleSoundModem/{kiss.java => Kiss.java} |  4 +--
 .../ModuleSoundModem/SoundModemClient.java    |  2 +-
 .../org/josast/ModuleSoundModem/kissTest.java |  6 ++--
 ModuleUVSQsatTelemetry/pom.xml                |  2 +-
 .../org/josast/uvsqsat/AX25decodedData.java   |  4 +--
 .../main/java/org/josast/uvsqsat/Frame.java   |  6 ++--
 .../org/avmdti/josast/util/StringtoByte.java  |  9 +++--
 40 files changed, 139 insertions(+), 89 deletions(-)
 rename ModuleSoundModem/src/main/java/org/josast/ModuleSoundModem/{kiss.java => Kiss.java} (97%)

diff --git a/ApplicationAmicalsat/src/main/java/org/josast/ApplicationAmicalsat/App.java b/ApplicationAmicalsat/src/main/java/org/josast/ApplicationAmicalsat/App.java
index eb1bd6db..4c17a16f 100644
--- a/ApplicationAmicalsat/src/main/java/org/josast/ApplicationAmicalsat/App.java
+++ b/ApplicationAmicalsat/src/main/java/org/josast/ApplicationAmicalsat/App.java
@@ -17,12 +17,13 @@ public class App extends Application {
   private static Scene scene;
   private static FXMLLoader fxmlLoader;
   private static Logger logger = Logger.getLogger("AmsatLogger");
+  private static final  String fxmlFile = "Amicalsat";
 
   @Override
   public void start(Stage stage) throws IOException {
 
     System.setProperty("glass.accessible.force", "false");
-    scene = new Scene(loadFXML("Amicalsat"), 800, 600);
+    scene = new Scene(loadFXML(fxmlFile), 800, 600);
     stage.setScene(scene);
 
     Controler ctrl = fxmlLoader.getController();
diff --git a/ApplicationAmicalsat/src/main/java/org/josast/ApplicationAmicalsat/SendSIDS.java b/ApplicationAmicalsat/src/main/java/org/josast/ApplicationAmicalsat/SendSIDS.java
index 582d76bc..f4c1eef4 100644
--- a/ApplicationAmicalsat/src/main/java/org/josast/ApplicationAmicalsat/SendSIDS.java
+++ b/ApplicationAmicalsat/src/main/java/org/josast/ApplicationAmicalsat/SendSIDS.java
@@ -26,7 +26,7 @@ public class SendSIDS {
     String hexaString = new BigInteger(1, data.getData()).toString(16);
     sids.setTelemetryData(data.getTime(), hexaString);
     appLogger.info(sids.toStringBasic());
-    int result = client.SendSIDSBasic(sids);
+    int result = client.sendSIDSBasic(sids);
     return result;
   }
 }
diff --git a/ApplicationCubesatSim/pom.xml b/ApplicationCubesatSim/pom.xml
index 1c0fe64d..c32e554d 100644
--- a/ApplicationCubesatSim/pom.xml
+++ b/ApplicationCubesatSim/pom.xml
@@ -40,13 +40,13 @@
 		<dependency>
 			<groupId>commons-cli</groupId>
 			<artifactId>commons-cli</artifactId>
-			<version>1.4</version>
+			<version>1.5.0</version>
 		</dependency>
 		
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.11</version>
+      <version>4.13.2</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/ApplicationKissTool/pom.xml b/ApplicationKissTool/pom.xml
index 778d2ce8..279ea292 100644
--- a/ApplicationKissTool/pom.xml
+++ b/ApplicationKissTool/pom.xml
@@ -82,7 +82,7 @@
 				<dependency>
 			<groupId>io.kaitai</groupId>
 			<artifactId>kaitai-struct-runtime</artifactId>
-			<version>0.9</version>
+			<version>0.10</version>
 		</dependency>
 		<dependency>
 			<groupId>name.valery1707.kaitai</groupId>
@@ -118,7 +118,7 @@
             <plugin>
                 <groupId>org.openjfx</groupId>
                 <artifactId>javafx-maven-plugin</artifactId>
-                <version>0.0.6</version>
+                <version>0.0.8</version>
                 <configuration>
                     <mainClass>org.josast.ApplicationKissTool.App</mainClass>
                 </configuration>
diff --git a/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/App.java b/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/App.java
index 44a7d0ad..24dbec52 100644
--- a/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/App.java
+++ b/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/App.java
@@ -17,7 +17,7 @@ public class App extends Application {
   private static Scene scene;
   private static FXMLLoader fxmlLoader;
   private static Logger logger = Logger.getLogger("AmsatLogger");
-  private static String FxmlFile =  "KissTool";
+  private  String FxmlFile =  "KissTool";
 
   //  TaskManageReceivedData taskMngtData = null;
 
diff --git a/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/Controler.java b/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/Controler.java
index 9d9c9f7a..798d9489 100644
--- a/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/Controler.java
+++ b/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/Controler.java
@@ -436,8 +436,8 @@ public class Controler {
 
     try {
 
-      bufferedImage1 = ImageIO.read(getClass().getResource((imgAmsat)));
-      bufferedImage2 = ImageIO.read(getClass().getResource((imgAmicalsat)));
+      bufferedImage1 = ImageIO.read(getClass().getResource(imgAmsat));
+      bufferedImage2 = ImageIO.read(getClass().getResource(imgAmicalsat));
     } catch (IOException e) {
 
       appLogger.severe("Error loading Image resources");
diff --git a/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/ManageDataFile.java b/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/ManageDataFile.java
index e03461cb..8a446dbc 100644
--- a/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/ManageDataFile.java
+++ b/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/ManageDataFile.java
@@ -5,6 +5,7 @@ import java.io.FileWriter;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -56,11 +57,11 @@ public class ManageDataFile {
         pw =
             new PrintWriter(
                 new FileWriter(
-                    RepositoryPath + "/" + formater.format(aujourdhui) + "-tlm-Hexa.txt"));
+                    RepositoryPath + "/" + formater.format(aujourdhui) + "-tlm-Hexa.txt",StandardCharsets.UTF_8));
         pw.write("Start file");
         pw.write(LINE_SEPARATOR);
       } else {
-        pw = new PrintWriter(RepositoryPath + "/" + formater.format(aujourdhui) + "-tlm-Hexa.txt");
+        pw = new PrintWriter(RepositoryPath + "/" + formater.format(aujourdhui) + "-tlm-Hexa.txt",StandardCharsets.UTF_8);
       }
       pw.append(stringData);
       pw.append(LINE_SEPARATOR);
diff --git a/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/SendSIDS.java b/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/SendSIDS.java
index 1ef365f7..a3d7e83b 100644
--- a/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/SendSIDS.java
+++ b/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/SendSIDS.java
@@ -26,7 +26,7 @@ public class SendSIDS {
     String hexaString = new BigInteger(1, data.getData()).toString(16);
     sids.setTelemetryData(data.getTime(), hexaString);
 
-    int result = client.SendSIDSBasic(sids);
+    int result = client.sendSIDSBasic(sids);
     return result;
   }
 
diff --git a/ApplicationSerial/pom.xml b/ApplicationSerial/pom.xml
index 5d6811e3..fe2fa0ef 100644
--- a/ApplicationSerial/pom.xml
+++ b/ApplicationSerial/pom.xml
@@ -29,7 +29,7 @@
     		<dependency>
   <groupId>commons-cli</groupId>
   <artifactId>commons-cli</artifactId>
-  <version>1.4</version>
+  <version>1.5.0</version>
 </dependency>
 <dependency>
 			<groupId>org.josast</groupId>
diff --git a/ApplicationUVSQsatDecoder/src/main/java/org/josast/UVSQsatDecoder/SendSIDS.java b/ApplicationUVSQsatDecoder/src/main/java/org/josast/UVSQsatDecoder/SendSIDS.java
index f92f2892..a64c7685 100644
--- a/ApplicationUVSQsatDecoder/src/main/java/org/josast/UVSQsatDecoder/SendSIDS.java
+++ b/ApplicationUVSQsatDecoder/src/main/java/org/josast/UVSQsatDecoder/SendSIDS.java
@@ -30,7 +30,7 @@ public class SendSIDS {
     String hexaString = new BigInteger(1, data.getData()).toString(16);
     sids.setTelemetryData(data.getTime(), hexaString);
     appLogger.info(sids.toStringBasic());
-    int result = client.SendSIDSBasic(sids);
+    int result = client.sendSIDSBasic(sids);
     // realease memory
     hexaString = null;
     return result;
diff --git a/ModuleAPRSIS/pom.xml b/ModuleAPRSIS/pom.xml
index d391803d..87c009ed 100644
--- a/ModuleAPRSIS/pom.xml
+++ b/ModuleAPRSIS/pom.xml
@@ -26,6 +26,8 @@
 
     <build>
         <plugins>
+        
+<!--        
             <plugin>
             
     <groupId>com.coveo</groupId>
@@ -49,6 +51,8 @@
     </executions>
 
             </plugin>
+-->
+
         </plugins>
     </build>
 
diff --git a/ModuleAPRSIS/src/main/java/org/avmdti/josast/aprsis/Client.java b/ModuleAPRSIS/src/main/java/org/avmdti/josast/aprsis/Client.java
index d03bf130..df379132 100644
--- a/ModuleAPRSIS/src/main/java/org/avmdti/josast/aprsis/Client.java
+++ b/ModuleAPRSIS/src/main/java/org/avmdti/josast/aprsis/Client.java
@@ -11,6 +11,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.net.Socket;
 import java.net.UnknownHostException;
+import java.nio.charset.StandardCharsets;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -62,10 +63,10 @@ public class Client {
                         + " pass "
                         + configPrivate.getPass()
                         + " vers josastaprssrvr 0.1\r\n")
-                    .getBytes());
+                    .getBytes(StandardCharsets.UTF_8));
         socket
             .getOutputStream()
-            .write(("# filter " + configPrivate.getFilter() + "\r\n").getBytes());
+            .write(("# filter " + configPrivate.getFilter() + "\r\n").getBytes(StandardCharsets.UTF_8));
         socket.getOutputStream().flush();
 
       } catch (UnknownHostException ex) {
diff --git a/ModuleAPRSIS/src/main/java/org/avmdti/josast/aprsis/demo/DemoAPRSIS.java b/ModuleAPRSIS/src/main/java/org/avmdti/josast/aprsis/demo/DemoAPRSIS.java
index 2e1259a1..38fc6a28 100644
--- a/ModuleAPRSIS/src/main/java/org/avmdti/josast/aprsis/demo/DemoAPRSIS.java
+++ b/ModuleAPRSIS/src/main/java/org/avmdti/josast/aprsis/demo/DemoAPRSIS.java
@@ -22,6 +22,7 @@ public class DemoAPRSIS {
   public static void main(String[] args) {
 
     Logger logger = Logger.getLogger("AmsatLogger");
+    System.out.println("Demp APRSIS");
     /* set the configuration */
     //	   AprsIsConfiguration config = new
     // AprsIsConfiguration("F6ZZZ","PASS","b/W3ADO*/PCSAT/ANDE-1/ANDE-2/RAFT/POLLUX-1/KD4HBO-1/NMARS/PCSAT* p/PCSAT2/POLLUX-1/PC2PSK/PC2TLM/PC2XXA/ISSTLM/PC2ISS/PC2RPT/PC2XXB/PCSAT*/ANDE-1/ANDE-2/RAFT/NMARS/W3ADO*  d/PCSAT2/PC2PSK/KD4HBO-1/PC2TLM/PC2XXA/ISSTLM/PC2ISS/PC2RPT/PC2XXB/PCSAT*/ANDE-1/ANDE-2/RAFT/NMARS/W3ADO*","rotate.aprs.net",14580);
diff --git a/ModuleAPRSIS/src/main/java/org/avmdti/josast/aprsis/demo/DemoTreatment.java b/ModuleAPRSIS/src/main/java/org/avmdti/josast/aprsis/demo/DemoTreatment.java
index 6027fc9b..af884eb8 100644
--- a/ModuleAPRSIS/src/main/java/org/avmdti/josast/aprsis/demo/DemoTreatment.java
+++ b/ModuleAPRSIS/src/main/java/org/avmdti/josast/aprsis/demo/DemoTreatment.java
@@ -2,6 +2,7 @@ package org.avmdti.josast.aprsis.demo;
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
 import java.util.logging.Logger;
 import org.avmdti.josast.aprsis.ICompute;
 
@@ -25,12 +26,19 @@ public class DemoTreatment implements ICompute {
 
       bytes = new byte[1000];
       nbBytes = input.read(bytes);
-
-      String buff = new String(bytes).trim();
-      if (!buff.startsWith("#")) {
-        System.out.print("+" + buff + "\n");
+      if(nbBytes >0 )
+      {
+          String buff = new String(bytes,StandardCharsets.UTF_8).trim();
+          if (!buff.startsWith("#")) {
+            System.out.println("+" + buff);
+          } 
+      }
+      else
+      {
+    	  System.out.println("Error read byte"+nbBytes);
       }
 
+
     } catch (IOException e) {
       logger.severe(e.getMessage());
     }
diff --git a/ModuleAmicalsat/pom.xml b/ModuleAmicalsat/pom.xml
index 3d7531d9..3f34e152 100644
--- a/ModuleAmicalsat/pom.xml
+++ b/ModuleAmicalsat/pom.xml
@@ -49,7 +49,7 @@
 		<dependency>
 			<groupId>commons-cli</groupId>
 			<artifactId>commons-cli</artifactId>
-			<version>1.4</version>
+			<version>1.5.0</version>
 		</dependency>
 		
     <dependency>
diff --git a/ModuleAmicalsat/src/test/java/org/josast/amicalsat/FrameFactoryTest.java b/ModuleAmicalsat/src/test/java/org/josast/amicalsat/FrameFactoryTest.java
index f9c0cc32..67ca918a 100644
--- a/ModuleAmicalsat/src/test/java/org/josast/amicalsat/FrameFactoryTest.java
+++ b/ModuleAmicalsat/src/test/java/org/josast/amicalsat/FrameFactoryTest.java
@@ -9,7 +9,7 @@ import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Iterator;
 import org.josast.ModuleSoundModem.KissException;
-import org.josast.ModuleSoundModem.kiss;
+import org.josast.ModuleSoundModem.Kiss;
 import org.josast.amicalsat.generated.FrameTlmAmicalsat;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.AfterEach;
@@ -62,7 +62,7 @@ class FrameFactoryTest {
           Path p = iterator.next();
           System.out.println(p);
           byte[] kissbuff = Files.readAllBytes(p);
-          kiss k = new kiss(kissbuff);
+          Kiss k = new Kiss(kissbuff);
           buff = k.toRaw();
           cube = new FrameTlmAmicalsat(new ByteBufferKaitaiStream(buff));
           String tlmArea = cube.frameTlmEntrySat().payload().tlmArea();
diff --git a/ModuleConfig/src/main/java/org/josast/config/databinding/AbstractDataBinding.java b/ModuleConfig/src/main/java/org/josast/config/databinding/AbstractDataBinding.java
index b10e362d..46201d9f 100644
--- a/ModuleConfig/src/main/java/org/josast/config/databinding/AbstractDataBinding.java
+++ b/ModuleConfig/src/main/java/org/josast/config/databinding/AbstractDataBinding.java
@@ -8,6 +8,7 @@ import java.io.IOException;
 import java.io.Reader;
 import java.io.Serializable;
 import java.io.Writer;
+import java.nio.charset.StandardCharsets;
 import java.util.logging.Logger;
 import org.exolab.castor.xml.MarshalException;
 import org.exolab.castor.xml.Marshaller;
@@ -59,8 +60,8 @@ public abstract class AbstractDataBinding implements Serializable {
     File f = new File(fileName);
     if (f.exists()) {
       try {
-        reader = new FileReader(fileName);
-      } catch (FileNotFoundException e) {
+        reader = new FileReader(fileName,StandardCharsets.UTF_8);
+      } catch (IOException e) {
         e.printStackTrace();
       }
       try {
@@ -88,7 +89,7 @@ public abstract class AbstractDataBinding implements Serializable {
     File file = new File(fileName);
     Writer writer = null;
     try {
-      writer = new FileWriter(file);
+      writer = new FileWriter(file,StandardCharsets.UTF_8);
     } catch (IOException e) {
       e.printStackTrace();
     }
diff --git a/ModuleConfig/src/main/java/org/josast/config/databinding/ConfigurationdataBindingDemo.java b/ModuleConfig/src/main/java/org/josast/config/databinding/ConfigurationdataBindingDemo.java
index bb6d0e0d..863133fa 100644
--- a/ModuleConfig/src/main/java/org/josast/config/databinding/ConfigurationdataBindingDemo.java
+++ b/ModuleConfig/src/main/java/org/josast/config/databinding/ConfigurationdataBindingDemo.java
@@ -123,7 +123,7 @@ public class ConfigurationdataBindingDemo extends AbstractDataBinding {
    * @param vector
    */
   public void setV(final Vector<String> vector) {
-    V = vector;
+    V = (Vector<String>) vector.clone();
   }
 
   /**
diff --git a/ModuleConfig/src/main/java/org/josast/property/CONFIG.java b/ModuleConfig/src/main/java/org/josast/property/CONFIG.java
index e0188399..4c0b5575 100644
--- a/ModuleConfig/src/main/java/org/josast/property/CONFIG.java
+++ b/ModuleConfig/src/main/java/org/josast/property/CONFIG.java
@@ -72,17 +72,18 @@ public class CONFIG {
         P = new Properties();
         FileInputStream in = new FileInputStream(getName());
         P.load(in);
-        in.close();
-      } catch (Exception e) {
-        log.severe("erreur ouverture fichier de configuration"); // $NON-NLS-1$
-        return null;
-      }
+			in.close();
+		} catch (IOException e) {
+			log.severe("erreur ouverture fichier de configuration");
+			e.printStackTrace();
+			return null;
+		}
     }
     String S = P.getProperty(Item);
     if (S == null) {
       return null;
     } else {
-      return S.trim(); // $NON-NLS-1$
+      return S.trim(); 
     }
   }
 
@@ -118,7 +119,14 @@ public class CONFIG {
       e.printStackTrace();
     }
     try {
-      P.store(out, null);
+    	if (P!=null)
+    	{
+    		P.store(out, null);
+    	} else
+    	{
+    		log.severe("erreur propoerties file is null");
+    	}
+      
     } catch (IOException e1) {
       log.severe("erreur sauvegarde");
       e1.printStackTrace();
diff --git a/ModuleConfig/src/main/java/org/josast/propertyHttp/ConfigHttp.java b/ModuleConfig/src/main/java/org/josast/propertyHttp/ConfigHttp.java
index 244df29f..2efcb277 100644
--- a/ModuleConfig/src/main/java/org/josast/propertyHttp/ConfigHttp.java
+++ b/ModuleConfig/src/main/java/org/josast/propertyHttp/ConfigHttp.java
@@ -3,6 +3,7 @@ package org.josast.propertyHttp;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
 import java.util.Properties;
 import java.util.logging.Logger;
 import org.apache.http.HttpResponse;
@@ -45,7 +46,7 @@ public class ConfigHttp {
       response = client.execute(request);
 
       BufferedReader rd =
-          new BufferedReader(new InputStreamReader(response.getEntity().getContent()));
+          new BufferedReader(new InputStreamReader(response.getEntity().getContent(),StandardCharsets.UTF_8));
 
       props.load(rd);
       connected = true;
diff --git a/ModuleCubesatSim/src/test/java/org/josast/CubesatSim/CubesatSimeFrameTest.java b/ModuleCubesatSim/src/test/java/org/josast/CubesatSim/CubesatSimeFrameTest.java
index 55294028..fe6c57eb 100644
--- a/ModuleCubesatSim/src/test/java/org/josast/CubesatSim/CubesatSimeFrameTest.java
+++ b/ModuleCubesatSim/src/test/java/org/josast/CubesatSim/CubesatSimeFrameTest.java
@@ -9,7 +9,7 @@ import java.nio.file.Path;
 import java.nio.file.Paths;
 import org.josast.CubesatSim.kaitai.generated.Cubesatsim;
 import org.josast.ModuleSoundModem.KissException;
-import org.josast.ModuleSoundModem.kiss;
+import org.josast.ModuleSoundModem.Kiss;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
@@ -44,7 +44,7 @@ class CubesatSimeFrameTest {
     try {
       kissbuff = Files.readAllBytes(p);
 
-      kiss k = new kiss(kissbuff);
+      Kiss k = new Kiss(kissbuff);
       try {
         buff = k.toRaw();
       } catch (KissException e) {
diff --git a/ModuleEntrySatTelemetry/pom.xml b/ModuleEntrySatTelemetry/pom.xml
index 535dc46c..67542ba2 100644
--- a/ModuleEntrySatTelemetry/pom.xml
+++ b/ModuleEntrySatTelemetry/pom.xml
@@ -22,9 +22,9 @@
 		<!-- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> -->
 		<maven.compiler.source>1.8</maven.compiler.source>
 		<maven.compiler.target>1.8</maven.compiler.target>
-		<commons-cli.version>1.4</commons-cli.version>
+		<commons-cli.version>1.5.0</commons-cli.version>
  		<kaitai-maven-plugin.version> 0.1.6</kaitai-maven-plugin.version>
- 		<kaitai-struct-runtime.version>0.9</kaitai-struct-runtime.version>
+ 		<kaitai-struct-runtime.version>0.10</kaitai-struct-runtime.version>
  		<log4j.version>1.2.17</log4j.version>
 	</properties>
 
diff --git a/ModuleEntrySatTelemetry/src/main/java/org/josast/EntrySat/app/DecodeEntrySatFile.java b/ModuleEntrySatTelemetry/src/main/java/org/josast/EntrySat/app/DecodeEntrySatFile.java
index 5a5adb66..d1082b0d 100644
--- a/ModuleEntrySatTelemetry/src/main/java/org/josast/EntrySat/app/DecodeEntrySatFile.java
+++ b/ModuleEntrySatTelemetry/src/main/java/org/josast/EntrySat/app/DecodeEntrySatFile.java
@@ -5,6 +5,7 @@ import java.io.BufferedReader;
 import java.io.FileNotFoundException;
 import java.io.FileReader;
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Locale;
@@ -78,8 +79,8 @@ public class DecodeEntrySatFile {
 
   public void openFile(String file) {
     try {
-      lecteurAvecBuffer = new BufferedReader(new FileReader(file));
-    } catch (FileNotFoundException exc) {
+      lecteurAvecBuffer = new BufferedReader(new FileReader(file,StandardCharsets.UTF_8));
+    } catch (IOException exc) {
       System.out.println("Erreur d'ouverture");
     }
   }
diff --git a/ModuleJourJulien/src/main/java/org/josast/util/date/JulianDay.java b/ModuleJourJulien/src/main/java/org/josast/util/date/JulianDay.java
index ddd058dc..84253535 100644
--- a/ModuleJourJulien/src/main/java/org/josast/util/date/JulianDay.java
+++ b/ModuleJourJulien/src/main/java/org/josast/util/date/JulianDay.java
@@ -183,7 +183,7 @@ public class JulianDay {
 
     double y = annee;
     double m = mois;
-    double j = heure / 24.0 + ((minute / (24 * 60.0))) + ((seconde / (3600.0 * 24.0)));
+    double j = heure / 24.0 + (minute / (24 * 60.0)) + (seconde / (3600.0 * 24.0));
     // MCR 15-2-2004 correction suite a un d�faut d�tect� sur le mois de f�vier
     // remplacement du < par <= puisque les mois de janvier et f�vier sont consid�r� comme
     // les 13eme et 14eme mois.
@@ -312,7 +312,7 @@ public class JulianDay {
     double C = ENT((B - 122.1) / 365.25);
     double D = ENT(365.25 * C);
     double E = ENT((B - D) / 30.6001);
-    double tempjour = (B - D - ENT(30.6001 * E) + F);
+    double tempjour = B - D - ENT(30.6001 * E) + F;
 
     int jour = (int) ENT(tempjour);
     double temp = tempjour - jour;
diff --git a/ModuleJourJulien/src/main/java/org/josast/util/date/JulianDay2000.java b/ModuleJourJulien/src/main/java/org/josast/util/date/JulianDay2000.java
index f2603a7a..4d372a7b 100644
--- a/ModuleJourJulien/src/main/java/org/josast/util/date/JulianDay2000.java
+++ b/ModuleJourJulien/src/main/java/org/josast/util/date/JulianDay2000.java
@@ -28,7 +28,7 @@ public class JulianDay2000 {
    */
   public static double getTime(int year, int month, int day, int hours, int minutes, int secondes) {
     int d =
-        ((367 * year) - ((7 * (year + ((month + 9) / 12))) / 4) + ((275 * month) / 9) + day)
+        (367 * year) - ((7 * (year + ((month + 9) / 12))) / 4) + ((275 * month) / 9) + day
             - 730530;
 
     return d + ((hours + (minutes / 60.0) + (secondes / 3600.0)) / 24.0);
diff --git a/ModuleSIDS/src/main/java/org/josast/SIDS/HttpPostSIDS.java b/ModuleSIDS/src/main/java/org/josast/SIDS/HttpPostSIDS.java
index 6dd41e98..a1c5eb8b 100644
--- a/ModuleSIDS/src/main/java/org/josast/SIDS/HttpPostSIDS.java
+++ b/ModuleSIDS/src/main/java/org/josast/SIDS/HttpPostSIDS.java
@@ -4,6 +4,7 @@ import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
 import java.security.KeyManagementException;
 import java.security.KeyStoreException;
 import java.security.NoSuchAlgorithmException;
@@ -98,7 +99,7 @@ public class HttpPostSIDS {
    * @param sids
    * @return
    */
-  public int SendSIDSBasic(final SIDSData sids) {
+  public int sendSIDSBasic(final SIDSData sids) {
     // Data preparation
     int resultat = 0;
     response = null;
@@ -133,7 +134,7 @@ public class HttpPostSIDS {
     if (response != null) {
 
       try {
-        rd = new BufferedReader(new InputStreamReader(response.getEntity().getContent()));
+        rd = new BufferedReader(new InputStreamReader(response.getEntity().getContent(),StandardCharsets.UTF_8));
       } catch (UnsupportedOperationException | IOException e) {
         logger.severe("Buffer reader Exception " + e.toString());
       }
@@ -148,12 +149,17 @@ public class HttpPostSIDS {
       } catch (IOException e) {
         logger.severe("Error reading line from server  " + e.toString());
       }
+      try {
+		rd.close();
+	} catch (IOException e) {
+		logger.severe("cant close response stream" + e.toString());
+	}
     }
     return resultat;
   }
 
   public StringBuffer getResult() {
-    return result;
+    return new StringBuffer(result);
   }
 
   public String getMessageAnswer() {
diff --git a/ModuleSIDS/src/main/java/org/josast/SIDS/SIDSData.java b/ModuleSIDS/src/main/java/org/josast/SIDS/SIDSData.java
index acdd1d34..cc831622 100644
--- a/ModuleSIDS/src/main/java/org/josast/SIDS/SIDSData.java
+++ b/ModuleSIDS/src/main/java/org/josast/SIDS/SIDSData.java
@@ -25,7 +25,7 @@ public class SIDSData {
   // packet with or without KISS 'C0 00 .. C0'.
   // Whitespaces optional. C0 00 A9 05 DE ...
 
-  private final String locator = "longLat"; // Type of the given receiver's
+  private static final String locator = "longLat"; // Type of the given receiver's
   // location. Currently, only
   // 'longLat' is supported. longLat
 
@@ -47,7 +47,7 @@ public class SIDSData {
   private long fDown = 0; // Frequency of the receiver's downlink channel
   // during reception (with Doppler), in Hz 435525000
 
-  private final String version = "2.0.1";
+  private static final String version = "2.0.1";
 
   public SIDSData() {}
 
diff --git a/ModuleSIDS/src/main/java/org/josast/SIDS/app/SendFile.java b/ModuleSIDS/src/main/java/org/josast/SIDS/app/SendFile.java
index 2acefe7a..458aa1d1 100644
--- a/ModuleSIDS/src/main/java/org/josast/SIDS/app/SendFile.java
+++ b/ModuleSIDS/src/main/java/org/josast/SIDS/app/SendFile.java
@@ -4,6 +4,7 @@ import java.io.BufferedReader;
 import java.io.FileNotFoundException;
 import java.io.FileReader;
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -25,9 +26,9 @@ public class SendFile {
 
   public void openFile(final String file) {
     try {
-      lecteurAvecBuffer = new BufferedReader(new FileReader(file));
+      lecteurAvecBuffer = new BufferedReader(new FileReader(file,StandardCharsets.UTF_8));
 
-    } catch (FileNotFoundException exc) {
+    } catch (IOException exc) {
       System.out.println("Erreur d'ouverture");
     }
   }
diff --git a/ModuleSIDS/src/main/java/org/josast/SIDS/app/TestSIDS.java b/ModuleSIDS/src/main/java/org/josast/SIDS/app/TestSIDS.java
index 10c20101..5d6c84dc 100644
--- a/ModuleSIDS/src/main/java/org/josast/SIDS/app/TestSIDS.java
+++ b/ModuleSIDS/src/main/java/org/josast/SIDS/app/TestSIDS.java
@@ -18,7 +18,7 @@ public class TestSIDS {
   }
 
   public void send(final SIDSData sids) {
-    int result = client.SendSIDSBasic(sids);
+    int result = client.sendSIDSBasic(sids);
 
     System.out.println("resutats =  " + result);
     System.out.println("retour hhtp =  " + client.getMessageAnswer());
diff --git a/ModuleSatelliteDatabase/pom.xml b/ModuleSatelliteDatabase/pom.xml
index 6c3c800e..3fba8d89 100644
--- a/ModuleSatelliteDatabase/pom.xml
+++ b/ModuleSatelliteDatabase/pom.xml
@@ -30,13 +30,13 @@
 
 <!-- 		<junit.version>4.13.2</junit.version> -->
 
-		<log4j-core.version>2.17.1</log4j-core.version>
-		<json.version>20211205</json.version>
+		<log4j-core.version>2.19.0</log4j-core.version>
+		<json.version>20220924</json.version>
 		<commons-cli.version>1.5.0</commons-cli.version>
 
-		<jaxb-runtime.version>3.0.2</jaxb-runtime.version>
-		<jackson-databind>2.13.1 </jackson-databind>
-		<opencsv.version>5.5.2</opencsv.version>
+		<jaxb-runtime.version>4.0.1</jaxb-runtime.version>
+		<jackson-databind>2.14.0</jackson-databind>
+		<opencsv.version>5.7.1</opencsv.version>
 	</properties>
 
 	<dependencies>
@@ -51,7 +51,7 @@
 		  <dependency>
       <groupId>jakarta.xml.bind</groupId>
       <artifactId>jakarta.xml.bind-api</artifactId>
-      <version>4.0.0-RC2</version>
+      <version>4.0.0</version>
   </dependency>
 
 		<dependency>
diff --git a/ModuleSatelliteDatabase/src/main/java/org/josast/AmsatList/Commande/CommandeList.java b/ModuleSatelliteDatabase/src/main/java/org/josast/AmsatList/Commande/CommandeList.java
index 24181574..18558e26 100644
--- a/ModuleSatelliteDatabase/src/main/java/org/josast/AmsatList/Commande/CommandeList.java
+++ b/ModuleSatelliteDatabase/src/main/java/org/josast/AmsatList/Commande/CommandeList.java
@@ -32,12 +32,20 @@ public class CommandeList {
     }
   }
 
-  public CommandeList(Vector<Commande> listeCommande) {
-    this.listeCommande = listeCommande;
+  @SuppressWarnings("unchecked")
+public CommandeList(Vector<Commande> listeCommande) {
+    this.listeCommande = (Vector<Commande>) listeCommande.clone();
     Iterator<Commande> itr = listeCommande.iterator();
     while (itr.hasNext()) {
       Commande cmd = itr.next();
-      HashtableCommande.put(cmd.getNasaId(), cmd);
+      if (cmd.getNasaId() !=null)
+      {
+    	  HashtableCommande.put(cmd.getNasaId(), cmd); 
+      } else
+      {
+    	  log.severe(" NasaID Null " + cmd.getSatName()  );
+      }
+      
     }
   }
 
@@ -56,20 +64,24 @@ public class CommandeList {
     if (writer != null) writer.close();
   }
 
-  public Hashtable<BigInteger, Commande> getHashtableCommande() {
-    return HashtableCommande;
+  @SuppressWarnings("unchecked")
+public Hashtable<BigInteger, Commande> getHashtableCommande() {
+    return (Hashtable<BigInteger, Commande>) HashtableCommande.clone();
   }
 
-  public void setHashtableCommande(Hashtable<BigInteger, Commande> hashtableCommande) {
-    HashtableCommande = hashtableCommande;
+  @SuppressWarnings("unchecked")
+public void setHashtableCommande(Hashtable<BigInteger, Commande> hashtableCommande) {
+    HashtableCommande = (Hashtable<BigInteger, Commande>) hashtableCommande.clone();
   }
 
-  public Vector<Commande> getListeCommande() {
-    return listeCommande;
+  @SuppressWarnings("unchecked")
+public Vector<Commande> getListeCommande() {
+    return (Vector<Commande>) listeCommande.clone();
   }
 
-  public void setListeCommande(Vector<Commande> listeCommande) {
-    this.listeCommande = listeCommande;
+  @SuppressWarnings("unchecked")
+public void setListeCommande(Vector<Commande> listeCommande) {
+    this.listeCommande = (Vector<Commande>) listeCommande.clone();
   }
 
   public void print() {
diff --git a/ModuleSatelliteDatabase/src/main/java/org/josast/AmsatList/api/AmsatListRequest.java b/ModuleSatelliteDatabase/src/main/java/org/josast/AmsatList/api/AmsatListRequest.java
index 935a7cae..5e4cdc20 100644
--- a/ModuleSatelliteDatabase/src/main/java/org/josast/AmsatList/api/AmsatListRequest.java
+++ b/ModuleSatelliteDatabase/src/main/java/org/josast/AmsatList/api/AmsatListRequest.java
@@ -86,7 +86,7 @@ public class AmsatListRequest {
           } catch (NumberFormatException e) {
             log.severe(e.toString());
           }
-          Long freq = new Long(frequency);
+          Long freq = Long.valueOf(frequency);
           if (AMSATFreqBeacon.containsKey(freq)) {
             vsat = AMSATFreqBeacon.get(freq);
           } else {
@@ -185,7 +185,8 @@ public class AmsatListRequest {
    *
    * @return an hastable with frequency in Hz as key
    */
-  public Hashtable<Long, Vector<Satellites>> getBeaconFrequencies() {
+  @SuppressWarnings("unchecked")
+public Hashtable<Long, Vector<Satellites>> getBeaconFrequencies() {
 
     if (AMSATFreqBeacon == null) {
       AMSATFreqBeacon = new Hashtable<>();
@@ -210,7 +211,7 @@ public class AmsatListRequest {
           } catch (NumberFormatException e) {
             log.severe(e.toString());
           }
-          Long freq = new Long(frequency);
+          Long freq =   Long.valueOf(frequency); 
           if (AMSATFreqBeacon.containsKey(freq)) {
             vsat = AMSATFreqBeacon.get(freq);
           } else {
@@ -223,7 +224,7 @@ public class AmsatListRequest {
       }
     }
 
-    return AMSATFreqBeacon;
+    return (Hashtable<Long, Vector<Satellites>>) AMSATFreqBeacon.clone();
   }
 
   public void getSatellitesWithFrequency(long freq) {
diff --git a/ModuleSoundModem/src/main/java/org/josast/AX25/Callsign.java b/ModuleSoundModem/src/main/java/org/josast/AX25/Callsign.java
index 8a5735d0..ecc36e97 100644
--- a/ModuleSoundModem/src/main/java/org/josast/AX25/Callsign.java
+++ b/ModuleSoundModem/src/main/java/org/josast/AX25/Callsign.java
@@ -15,7 +15,7 @@ public class Callsign {
 
   @Deprecated
   public void setCallsign(char[] callsign) {
-    this.callsign = callsign;
+    this.callsign = callsign.clone();
   }
 
   @Deprecated
diff --git a/ModuleSoundModem/src/main/java/org/josast/ModuleSoundModem/kiss.java b/ModuleSoundModem/src/main/java/org/josast/ModuleSoundModem/Kiss.java
similarity index 97%
rename from ModuleSoundModem/src/main/java/org/josast/ModuleSoundModem/kiss.java
rename to ModuleSoundModem/src/main/java/org/josast/ModuleSoundModem/Kiss.java
index 0587cbbb..afa62916 100644
--- a/ModuleSoundModem/src/main/java/org/josast/ModuleSoundModem/kiss.java
+++ b/ModuleSoundModem/src/main/java/org/josast/ModuleSoundModem/Kiss.java
@@ -8,7 +8,7 @@ import java.util.Arrays;
  * @see http://www.ka9q.net/papers/kiss.html
  * @author christophe
  */
-public class kiss {
+public class Kiss {
 
   private static final byte DATA = 0;
 
@@ -41,7 +41,7 @@ public class kiss {
   byte[] kissdata = null;
   byte type = 0;
 
-  public kiss(final byte[] data) {
+  public Kiss(final byte[] data) {
     kissdata = data.clone();
   }
 
diff --git a/ModuleSoundModem/src/main/java/org/josast/ModuleSoundModem/SoundModemClient.java b/ModuleSoundModem/src/main/java/org/josast/ModuleSoundModem/SoundModemClient.java
index e740b5c2..211e5c3b 100644
--- a/ModuleSoundModem/src/main/java/org/josast/ModuleSoundModem/SoundModemClient.java
+++ b/ModuleSoundModem/src/main/java/org/josast/ModuleSoundModem/SoundModemClient.java
@@ -189,7 +189,7 @@ public class SoundModemClient {
       log.severe("Buffer read null, return null");
       return null;
     }
-    kiss k = new kiss(temp);
+    Kiss k = new Kiss(temp);
     try {
       temp = k.toRaw();
     } catch (KissException e) {
diff --git a/ModuleSoundModem/src/test/java/org/josast/ModuleSoundModem/kissTest.java b/ModuleSoundModem/src/test/java/org/josast/ModuleSoundModem/kissTest.java
index 566826f9..5e198eba 100644
--- a/ModuleSoundModem/src/test/java/org/josast/ModuleSoundModem/kissTest.java
+++ b/ModuleSoundModem/src/test/java/org/josast/ModuleSoundModem/kissTest.java
@@ -59,7 +59,7 @@ class kissTest {
           0x30,
           0x30,
         };
-    kiss k = new kiss(temp);
+    Kiss k = new Kiss(temp);
     try {
       byte[] res = k.toRaw();
       assertArrayEquals(res, out);
@@ -106,7 +106,7 @@ class kissTest {
           0x30,
           0x30,
         };
-    kiss k = new kiss(temp);
+    Kiss k = new Kiss(temp);
     try {
       byte[] res = k.toRaw();
       assertArrayEquals(res, out);
@@ -152,7 +152,7 @@ class kissTest {
           0x2b,
           (byte) 0xDB,
         };
-    kiss k = new kiss(temp);
+    Kiss k = new Kiss(temp);
     try {
       byte[] res = k.toRaw();
       assertArrayEquals(res, out);
diff --git a/ModuleUVSQsatTelemetry/pom.xml b/ModuleUVSQsatTelemetry/pom.xml
index 2106b41d..541aee77 100644
--- a/ModuleUVSQsatTelemetry/pom.xml
+++ b/ModuleUVSQsatTelemetry/pom.xml
@@ -18,7 +18,7 @@
     <maven.compiler.source>11</maven.compiler.source>
     <maven.compiler.target>11</maven.compiler.target>
     <kaitai-maven-plugin-version>0.1.6</kaitai-maven-plugin-version>
-    <kaitai-struct-runtime-version>0.9</kaitai-struct-runtime-version>
+    <kaitai-struct-runtime-version>0.10</kaitai-struct-runtime-version>
   </properties>
 
   <dependencies>
diff --git a/ModuleUVSQsatTelemetry/src/main/java/org/josast/uvsqsat/AX25decodedData.java b/ModuleUVSQsatTelemetry/src/main/java/org/josast/uvsqsat/AX25decodedData.java
index 5a1f8166..ec97a24c 100644
--- a/ModuleUVSQsatTelemetry/src/main/java/org/josast/uvsqsat/AX25decodedData.java
+++ b/ModuleUVSQsatTelemetry/src/main/java/org/josast/uvsqsat/AX25decodedData.java
@@ -23,7 +23,7 @@ public class AX25decodedData {
   public String toStringHeader() {
 
     String sep = "\r\n";
-    return ("Source : "
+    return "Source : "
         + source
         + " - SSID : "
         + srcSSID
@@ -35,6 +35,6 @@ public class AX25decodedData {
         + sep
         + " ctl : "
         + ctl
-        + sep);
+        + sep;
   }
 }
diff --git a/ModuleUVSQsatTelemetry/src/main/java/org/josast/uvsqsat/Frame.java b/ModuleUVSQsatTelemetry/src/main/java/org/josast/uvsqsat/Frame.java
index 1941e042..882973bc 100644
--- a/ModuleUVSQsatTelemetry/src/main/java/org/josast/uvsqsat/Frame.java
+++ b/ModuleUVSQsatTelemetry/src/main/java/org/josast/uvsqsat/Frame.java
@@ -30,7 +30,7 @@ import org.josast.uvsqsat.pojogenerated.trxvutxHk;
 public class Frame {
   private static Logger appLogger = Logger.getLogger("AmsatLogger");
 
-  protected Uvsqsat UvsqsatData = null;
+ 
   protected PPrimaryHeader packetPrimaryHeader = null;
   protected PSecondaryHeader packetSecondaryHeader = null;
   protected String separator = "\r\n";
@@ -42,7 +42,7 @@ public class Frame {
 
   public void setUp(Uvsqsat data) {
 
-    UvsqsatData = data;
+   
 
     try {
 
@@ -53,7 +53,7 @@ public class Frame {
       sid = packetSecondaryHeader.getSid();
       extractTlm();
     } catch (Exception e) {
-      appLogger.severe("Error decoding packet " + e.getStackTrace().toString());
+      appLogger.severe("Error decoding packet " + e.getStackTrace());
     }
   }
 
diff --git a/ModuleUtil/src/main/java/org/avmdti/josast/util/StringtoByte.java b/ModuleUtil/src/main/java/org/avmdti/josast/util/StringtoByte.java
index fd44eccb..ef598d4f 100644
--- a/ModuleUtil/src/main/java/org/avmdti/josast/util/StringtoByte.java
+++ b/ModuleUtil/src/main/java/org/avmdti/josast/util/StringtoByte.java
@@ -5,9 +5,12 @@
  */
 package org.avmdti.josast.util;
 
+import java.nio.charset.StandardCharsets;
+
 public class StringtoByte {
+	
 
-  static final byte ZERO = "0".getBytes()[0];
+  static final byte ZERO = "0".getBytes(StandardCharsets.UTF_8)[0];
 
   /*
    *
@@ -15,11 +18,11 @@ public class StringtoByte {
 
   public static byte convert(String S) {
 
-    byte[] tmp = S.getBytes();
+    byte[] tmp = S.getBytes(StandardCharsets.UTF_8);
     byte v1 = (byte) (tmp[0] - ZERO);
     byte v2 = (byte) (tmp[1] - ZERO);
     byte res = (byte) (v1 * 16 + v2);
-    return (res);
+    return res;
   }
 
   public static byte[] hexStringToByteArray(String s) {
-- 
GitLab


From f1c0d21b351bd548a4ac0ee0c3edb0154c5143bb Mon Sep 17 00:00:00 2001
From: chris <chris@XtofS8>
Date: Thu, 10 Nov 2022 16:46:18 +0100
Subject: [PATCH 7/7] refacctor : log instead of println

---
 ApplicationKissTool/KissToolMessage.txt         |  4 ++--
 ApplicationKissTool/SatelliteNoradList.json     | 17 +++++++++++++++++
 .../ApplicationKissTool/Configuration.java      |  1 -
 .../josast/ApplicationKissTool/Controler.java   | 16 +++++++++-------
 .../ApplicationKissTool/SatelliteNoradFile.java |  5 ++++-
 5 files changed, 32 insertions(+), 11 deletions(-)
 create mode 100644 ApplicationKissTool/SatelliteNoradList.json

diff --git a/ApplicationKissTool/KissToolMessage.txt b/ApplicationKissTool/KissToolMessage.txt
index 561c3ce7..623dc3f5 100644
--- a/ApplicationKissTool/KissToolMessage.txt
+++ b/ApplicationKissTool/KissToolMessage.txt
@@ -1,4 +1,4 @@
-Kisstool=1.9
+Kisstool=1.11
 Message= KissTool updated for UVSQsat & Picsat
-NoradID=99749
+NoradID=47438
 Comment=0
\ No newline at end of file
diff --git a/ApplicationKissTool/SatelliteNoradList.json b/ApplicationKissTool/SatelliteNoradList.json
new file mode 100644
index 00000000..f3555c04
--- /dev/null
+++ b/ApplicationKissTool/SatelliteNoradList.json
@@ -0,0 +1,17 @@
+[
+    {
+      "noradId": 47438,
+      "name": "UVSQsat",
+      "indicatif": "LATMOS"
+    },
+    {
+      "noradId": 99999,
+      "name": "Defaut",
+      "indicatif": ""
+    },
+    {
+      "noradId": 43132,
+      "name": "Picsat",
+      "indicatif": "PICSAT"
+    }
+  ]
\ No newline at end of file
diff --git a/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/Configuration.java b/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/Configuration.java
index 74b5270e..d9a07f5d 100644
--- a/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/Configuration.java
+++ b/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/Configuration.java
@@ -71,7 +71,6 @@ public class Configuration {
       OutputFileDirectory = conf.getProperty("OutputFileDirectory");
       SilentMode = conf.getProperty("SilentMode");
       if (norads != null) {
-        System.out.println(norads);
         Norad = Integer.parseInt(norads);
       }
       if (SIDSSatnogs.contentEquals("1")) {
diff --git a/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/Controler.java b/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/Controler.java
index 798d9489..78e1a21b 100644
--- a/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/Controler.java
+++ b/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/Controler.java
@@ -380,14 +380,16 @@ public class Controler {
     Runnable task1 =
         () -> {
           Date date = new Date();
-          if (date.getTime() - lastFrameTime.getTime() > 900000) {
-            System.gc();
-            appLogger.info("System.gc();");
-          
-            
+//          if (date.getTime() - lastFrameTime.getTime() > 900000) {
+//            System.gc();
+          //  appLogger.info("System.gc();");
+        //  }
+          // check if task are actives 
+          if(receivedFrame.size()!=0)
+          {
+        	  appLogger.severe("queue size greater than 0 : "+receivedFrame.size());  
+        	  appLogger.severe("State task"+ backgroundThread.getState().name());  
           }
-          System.out.println("Queu Size "+ receivedFrame.size());
-          System.out.println("State task"+ backgroundThread.getState().name());
           
           
         };
diff --git a/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/SatelliteNoradFile.java b/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/SatelliteNoradFile.java
index 3d2063e4..3d44cd4f 100644
--- a/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/SatelliteNoradFile.java
+++ b/ApplicationKissTool/src/main/java/org/josast/ApplicationKissTool/SatelliteNoradFile.java
@@ -14,10 +14,12 @@ import java.util.Arrays;
 import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.List;
+import java.util.logging.Logger;
 
 /** @author chris */
 public class SatelliteNoradFile {
 
+  private static Logger appLogger = Logger.getLogger("AmsatLogger");
   private List<SatelliteNorad> SatelliteNoradList;
   private Hashtable<String, SatelliteNorad> htsat = new Hashtable<>();
 
@@ -57,7 +59,8 @@ public class SatelliteNoradFile {
           new Gson().fromJson(reader, new TypeToken<List<SatelliteNorad>>() {}.getType());
 
       Iterator<SatelliteNorad> it = SatelliteNoradList.iterator();
-      System.out.println("nb sat" + SatelliteNoradList.size());
+      appLogger.info("nb sat" + SatelliteNoradList.size());
+   
       while (it.hasNext()) {
         SatelliteNorad sat = it.next();
         htsat.put(sat.getCallsign(), sat);
-- 
GitLab