From 12bfd1d018bd70b7fbbb9c23655af43950307991 Mon Sep 17 00:00:00 2001
From: xtophe <christophe.mcr@gmail.com>
Date: Mon, 4 May 2020 18:41:26 +0200
Subject: [PATCH 1/2] feat: add first version of Application Amicalsat HMI

Minimum functionality :
 - HMI frame
 - connection to sound modem
 - display data received
---
 .../org/josast/ApplicationAmicalsat/App.java  |  80 +++
 .../ApplicationAmicalsat/Configuration.java   | 235 ++++++++
 .../ApplicationAmicalsat/Controler.java       | 529 ++++++++++++++++++
 .../ModelReceivedData.java                    |  87 +++
 .../ApplicationAmicalsat/ReceivedData.java    |  32 ++
 .../josast/ApplicationAmicalsat/SendSIDS.java |  37 ++
 .../TaskSoundmodemTCP.java                    |  83 +++
 .../ApplicationAmicalsat/util/LogFile.java    |  65 +++
 .../java/org/josast/javafx/AlertHelper.java   |  28 +
 .../ApplicationAmicalsat/AmicalSatMessage.txt |   3 +
 .../ApplicationAmicalsat/Amicalsat.fxml       | 175 ++++++
 .../josast/ApplicationAmicalsat/Amicalsat.jpg | Bin 0 -> 9879 bytes
 .../josast/ApplicationAmicalsat/logoAmsat.png | Bin 0 -> 6356 bytes
 .../org/josast/amicalsat/FactoryConsumer.java |  39 ++
 .../org/josast/amicalsat/FrameFactory.java    | 271 ++++-----
 15 files changed, 1514 insertions(+), 150 deletions(-)
 create mode 100644 ApplicationAmicalsat/src/main/java/org/josast/ApplicationAmicalsat/App.java
 create mode 100644 ApplicationAmicalsat/src/main/java/org/josast/ApplicationAmicalsat/Configuration.java
 create mode 100644 ApplicationAmicalsat/src/main/java/org/josast/ApplicationAmicalsat/Controler.java
 create mode 100644 ApplicationAmicalsat/src/main/java/org/josast/ApplicationAmicalsat/ModelReceivedData.java
 create mode 100644 ApplicationAmicalsat/src/main/java/org/josast/ApplicationAmicalsat/ReceivedData.java
 create mode 100644 ApplicationAmicalsat/src/main/java/org/josast/ApplicationAmicalsat/SendSIDS.java
 create mode 100644 ApplicationAmicalsat/src/main/java/org/josast/ApplicationAmicalsat/TaskSoundmodemTCP.java
 create mode 100644 ApplicationAmicalsat/src/main/java/org/josast/ApplicationAmicalsat/util/LogFile.java
 create mode 100644 ApplicationAmicalsat/src/main/java/org/josast/javafx/AlertHelper.java
 create mode 100644 ApplicationAmicalsat/src/main/resources/org/josast/ApplicationAmicalsat/AmicalSatMessage.txt
 create mode 100644 ApplicationAmicalsat/src/main/resources/org/josast/ApplicationAmicalsat/Amicalsat.fxml
 create mode 100644 ApplicationAmicalsat/src/main/resources/org/josast/ApplicationAmicalsat/Amicalsat.jpg
 create mode 100644 ApplicationAmicalsat/src/main/resources/org/josast/ApplicationAmicalsat/logoAmsat.png
 create mode 100644 ModuleAmicalsat/src/main/java/org/josast/amicalsat/FactoryConsumer.java

diff --git a/ApplicationAmicalsat/src/main/java/org/josast/ApplicationAmicalsat/App.java b/ApplicationAmicalsat/src/main/java/org/josast/ApplicationAmicalsat/App.java
new file mode 100644
index 0000000..7ddecd2
--- /dev/null
+++ b/ApplicationAmicalsat/src/main/java/org/josast/ApplicationAmicalsat/App.java
@@ -0,0 +1,80 @@
+package org.josast.ApplicationAmicalsat;
+
+import javafx.application.Application;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.Parent;
+import javafx.scene.Scene;
+import javafx.stage.Stage;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.logging.FileHandler;
+import java.util.logging.Logger;
+
+
+
+/**
+ * JavaFX App
+ */
+public class App extends Application {
+
+    private static Scene scene;
+    private static FXMLLoader fxmlLoader;
+    Logger logger = Logger.getLogger("EntrySatLogger");
+
+    @Override
+    public void start(Stage stage) throws IOException {
+        try {
+            String path = System.getProperty("user.dir")+"/log";
+            File apath = new File(path);
+            
+            if (!apath.exists())
+            {
+                if (apath.mkdir() == false)
+                {
+                    System.err.println("fail to create "+ path);
+                }
+            }
+            FileHandler fh=new FileHandler(path+"/"+"EntrySatLog.txt");
+
+            logger.addHandler(fh);
+
+            } catch (SecurityException e) {
+
+            e.printStackTrace();
+
+            } catch (IOException e) {
+
+            e.printStackTrace();
+
+            }
+        System.setProperty("glass.accessible.force", "false");
+        scene = new Scene(loadFXML("Amicalsat"), 640, 480);
+        stage.setScene(scene);
+        
+        Controler ctrl = fxmlLoader.getController();
+        ctrl.setPrimaryStage(stage);
+        scene.getStylesheets().add("/BasicApplication.css");
+    //    stage.setScene(scene);
+        stage.setTitle("Amicalsat Decoder");
+        ctrl.initMMI();
+        stage.show();
+    }
+
+    static void setRoot(String fxml) throws IOException {
+        scene.setRoot(loadFXML(fxml));
+    }
+
+    private static Parent loadFXML(String fxml) throws IOException {
+         fxmlLoader = new FXMLLoader(App.class.getResource(fxml + ".fxml"));
+        
+        
+        
+        return fxmlLoader.load();
+    }
+
+    public static void main(String[] args) {
+        launch();
+    }
+
+}
\ No newline at end of file
diff --git a/ApplicationAmicalsat/src/main/java/org/josast/ApplicationAmicalsat/Configuration.java b/ApplicationAmicalsat/src/main/java/org/josast/ApplicationAmicalsat/Configuration.java
new file mode 100644
index 0000000..bf4dd25
--- /dev/null
+++ b/ApplicationAmicalsat/src/main/java/org/josast/ApplicationAmicalsat/Configuration.java
@@ -0,0 +1,235 @@
+/**
+ * 
+ */
+package org.josast.ApplicationAmicalsat;
+
+import org.josast.property.CONFIG;
+
+/**
+ * Singleton to manage all application parameter 
+ * The default configuration is automaticaly saved in a properties file.
+ * @author christophe
+ * 
+ * 
+ */
+public class Configuration {
+    
+    
+    /*
+     * parameter with default value
+     */
+    private String callsign="Anonymous";
+    private String longitude="0.0W";
+    private String latitude="0.0N";
+    
+    private String soundModemIP="127.0.0.1";
+    private String soundModemPort="8100";
+    
+    private String SIDSEntrySatSource="Anonymous";
+    private String SIDSEntryUrl="https://amsat.electrolab.fr/SIDS";
+    private String SIDSSatnogsSource="Anonymous";
+    private String SIDSSatnogsURL="https://db.satnogs.org/api/telemetry/";
+    private String SIDSSatnogs="0";
+    private String SIDSEntrySat="1";
+    private int Norad=99990; // default value - equivalent to satnogs
+    private boolean SISD_SatNogs = false;
+    private boolean SIDS_EntrySat = true;
+
+    
+    private CONFIG conf = CONFIG.getInstance();
+    
+    public static Configuration getInstance()
+    {
+        return SingletonHolder.instance;
+    }
+    
+    public boolean isSISD_SatNogs() {
+  
+        return SISD_SatNogs;
+    }
+
+    public boolean isSIDS_EntrySat() {
+        return SIDS_EntrySat;
+    }
+
+    private Configuration()
+    {
+        if ( conf.GetProperty("Callsign")!=null)
+        {
+             callsign = conf.GetProperty("Callsign");
+             latitude = conf.GetProperty("Latitude");
+             longitude = conf.GetProperty("Longitude");
+            
+             SIDSEntrySatSource=conf.GetProperty("SIDSEntrySatSource");
+             SIDSEntryUrl=conf.GetProperty("SIDSEntryUrl");
+             SIDSSatnogsSource=conf.GetProperty("SIDSSatnogsSource");
+             SIDSSatnogsURL=conf.GetProperty("SIDSSatnogsURL");
+             SIDSSatnogs=conf.GetProperty("SIDSSatnogs");
+             SIDSEntrySat=conf.GetProperty("SIDSEntrySat");
+             soundModemIP =  conf.GetProperty("soundModemIP");
+             soundModemPort =  conf.GetProperty("soundModemPort");
+             Norad = Integer.parseUnsignedInt(conf.GetProperty("NoradID").trim());
+             if (SIDSSatnogs.contentEquals("1") )
+             {
+                 SISD_SatNogs=true;
+             } else
+             {
+                 SISD_SatNogs=false;
+             }
+             if (SIDSEntrySat.contentEquals("1") )
+             {
+                 SIDS_EntrySat=true;
+             } else
+             {
+                 SIDS_EntrySat=false;
+             }
+        
+        }
+        else // si le fichier n'existe pas, il est créé par défaut
+        {
+             save();
+        }
+        
+    
+        
+    }
+     
+   
+    private static class SingletonHolder
+    {       
+       
+        private final static Configuration instance = new Configuration();
+    }
+ 
+
+
+    public String getCallsign() {
+        return callsign;
+    }
+
+    public void setCallsign(String callsign) {
+        this.callsign = callsign;
+    }
+
+    public String getLongitude() {
+        return longitude;
+    }
+
+    public void setLongitude(String longitude) {
+        this.longitude = longitude;
+    }
+
+    public String getLatitude() {
+        return latitude;
+    }
+
+    public void setLatitude(String latitude) {
+        this.latitude = latitude;
+    }
+
+    public String getSIDSEntrySatSource() {
+        return SIDSEntrySatSource;
+    }
+
+    public void setSIDSEntrySatSource(String sIDSEntrySatSource) {
+        SIDSEntrySatSource = sIDSEntrySatSource;
+    }
+
+    public String getSIDSEntryUrl() {
+        return SIDSEntryUrl;
+    }
+
+    public void setSIDSEntryUrl(String sIDSEntryUrl) {
+        SIDSEntryUrl = sIDSEntryUrl;
+    }
+
+    public String getSIDSSatnogsSource() {
+        return SIDSSatnogsSource;
+    }
+
+    public void setSIDSSatnogsSource(String sIDSSatnogsSource) {
+        SIDSSatnogsSource = sIDSSatnogsSource;
+    }
+
+    public String getSIDSSatnogsURL() {
+        return SIDSSatnogsURL;
+    }
+
+    public void setSIDSSatnogsURL(String sIDSSatnogsURL) {
+        SIDSSatnogsURL = sIDSSatnogsURL;
+    }
+
+    public String getSIDSSatnogs() {
+        return SIDSSatnogs;
+    }
+
+    public void setSIDSSatnogs(String sIDSSatnogs) {
+        SIDSSatnogs = sIDSSatnogs;
+         if (SIDSSatnogs.contentEquals("1") )
+         {
+             SISD_SatNogs=true;
+         } else
+         {
+             SISD_SatNogs=false;
+         }
+    }
+
+    public String getSIDSEntrySat() {
+        return SIDSEntrySat;
+    }
+
+    public void setSIDSEntrySat(String sIDSEntrySat) {
+        SIDSEntrySat = sIDSEntrySat;
+         if (SIDSEntrySat.contentEquals("1") )
+         {
+             SIDS_EntrySat=true;
+         } else
+         {
+             SIDS_EntrySat=false;
+         }
+    }
+
+    public String getSoundModemIP() {
+        return soundModemIP;
+    }
+
+    public void setSoundModemIP(String soundModemIP) {
+        this.soundModemIP = soundModemIP;
+    }
+
+    public String getSoundModemPort() {
+        return soundModemPort;
+    }
+
+    public void setSoundModemPort(String soundModemPort) {
+        this.soundModemPort = soundModemPort;
+    }
+
+    public void save() {
+        
+        conf.SetProperty("Callsign",callsign);
+        conf.SetProperty("Latitude",latitude);
+        conf.SetProperty("Longitude",longitude);
+        
+        conf.SetProperty("SIDSEntrySatSource",this.SIDSEntrySatSource);
+        conf.SetProperty("SIDSEntryUrl",this.SIDSEntryUrl);
+        conf.SetProperty("SIDSSatnogsSource",this.SIDSSatnogsSource);
+        conf.SetProperty("SIDSSatnogsURL",this.SIDSSatnogsURL);
+        conf.SetProperty("SIDSSatnogs",this.SIDSSatnogs);
+        conf.SetProperty("SIDSEntrySat",this.SIDSEntrySat);
+        conf.SetProperty("soundModemPort",this.soundModemPort);
+        conf.SetProperty("soundModemIP",this.soundModemIP);
+        conf.SetProperty("NoradID",""+this.Norad);
+    }
+
+    public int getNorad() {
+ 
+        return Norad;
+    }
+
+    public void setNorad(int norad) {
+         
+         Norad=norad;
+    }
+
+}
diff --git a/ApplicationAmicalsat/src/main/java/org/josast/ApplicationAmicalsat/Controler.java b/ApplicationAmicalsat/src/main/java/org/josast/ApplicationAmicalsat/Controler.java
new file mode 100644
index 0000000..8a9450c
--- /dev/null
+++ b/ApplicationAmicalsat/src/main/java/org/josast/ApplicationAmicalsat/Controler.java
@@ -0,0 +1,529 @@
+package org.josast.ApplicationAmicalsat;
+
+import java.awt.image.BufferedImage;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.logging.Logger;
+
+import javax.imageio.ImageIO;
+
+import org.josast.ApplicationAmicalsat.util.LogFile;
+import org.josast.ModuleSoundModem.SoundModemConfiguration;
+import org.josast.SIDS.Station;
+import org.josast.amicalsat.Frame;
+import org.josast.javafx.AlertHelper;
+import org.josast.propertyHttp.ConfigHttp;
+
+import javafx.application.Platform;
+import javafx.concurrent.WorkerStateEvent;
+
+import javafx.event.ActionEvent;
+import javafx.event.EventHandler;
+
+//import java.util.logging.Logger;
+
+import javafx.fxml.FXML;
+import javafx.scene.control.Alert;
+import javafx.scene.control.Button;
+import javafx.scene.control.CheckBox;
+import javafx.scene.control.Label;
+import javafx.scene.control.TextArea;
+import javafx.scene.control.TextField;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
+import javafx.stage.Stage;
+import javafx.stage.Window;
+import javafx.embed.swing.SwingFXUtils;
+
+public class Controler {
+    
+    private static final String LINE_SEPARATOR = "\r\n";
+    private static final int STATE_INIT = 0;
+    private static final int STATE_START = 1;
+    protected static final int STATE_STOP = 2;
+    private static final int STATE_SAVE = 3;
+    
+    private Logger appLogger = Logger.getLogger("AmicalSatLogger");
+    private String version = "0.1";
+
+    @FXML
+    private Button ButtonStart;
+    @FXML
+    private Button ButtonStop;
+    @FXML
+    private Button ButtonSave;
+    @FXML
+    private Label LabelIP;
+
+    @FXML
+    private Button ButtonFile;
+    @FXML
+    private Button ButtonSerial;
+    @FXML
+    private Button ButtonKiss;
+
+    @FXML
+    private TextField FieldIP;
+    @FXML
+    private TextField FieldPort;
+
+    @FXML
+    private Label labelStatus;
+    @FXML
+    private Label LabelFrame;
+
+    @FXML
+    private TextArea DecodedData;
+
+    @FXML
+    private TextArea TexAreaLog;
+
+    @FXML
+    private TextField textFieldMode;
+
+    @FXML
+    private TextField textFieldDate;
+
+    @FXML
+    private Label LabelInformation;
+    @FXML
+    private TextField textFieldbEps33VCurrent;
+    @FXML
+    private TextField TextFieldEps5VCurrent;
+    @FXML
+    private TextField TextFieldepsBattVcurrent;
+    @FXML
+    private TextField TextFieldEpsTemp;
+    @FXML
+    private TextField TextFieldTrxTemp;
+    @FXML
+    private TextField TextFieldEPSVBAT;
+
+    @FXML
+    private TextField TFBattTemp;
+
+    @FXML
+    private ImageView ImageViewAMSAT;
+
+    @FXML
+    private ImageView imageViewEntrysat;
+
+    @FXML
+    private TextField TextFieldCallsign;
+    @FXML
+    private TextField TextFieldLatitude;
+    @FXML
+    private TextField TextFieldLongitude;
+
+    @FXML
+    private CheckBox CheckbBoxAmicalSat;
+    @FXML
+    private CheckBox CheckBoxSatNogs;
+
+    @FXML
+    private Button ButtonSaveConfiguration;
+
+    @FXML
+    TextField TextFieldSIDSEntrysat;
+    @FXML
+    TextField TextFieldSIDSSatnogs;
+
+    Stage primaryStage = null;
+
+    private String imgAmsat = "logoAmsat.png";
+    private String imgAmicalsat = "Amicalsat.jpg";
+
+    Station station = new Station();
+
+    ModelReceivedData receivedFrame = new ModelReceivedData();
+    Configuration conf = Configuration.getInstance();
+
+    private TaskSoundmodemTCP task;
+    private SendSIDS SendSIDSSatnogs;
+    private SendSIDS SendSIDSEntrysat;
+    private PrintWriter pw;
+    private LogFile logfile=null;
+    
+
+    @FXML
+    private void HandleSaveConfiguration(ActionEvent event) {
+       
+        String erreurmsg = null;
+        String Callsign = null;
+        
+        
+        if (TextFieldCallsign.getText().isEmpty()) {
+            erreurmsg += "please enter a CallSign \r\n";
+        } else {
+            Callsign = TextFieldCallsign.getText();
+        }
+
+        String Latitude = TextFieldLatitude.getText();
+        String Longitude = TextFieldLongitude.getText();
+
+        if (station.checkLatitude(Latitude) == false) {
+            erreurmsg += "Wrong format for Latitude : XX.XXE/W \r\n";
+        }
+
+        if (station.checkLongitude(Longitude) == false) {
+            erreurmsg += "Wrong format for Longitude : XX.XXS/N \r\n";
+        }
+        if (erreurmsg != null) {
+            Window owner = ButtonSaveConfiguration.getScene().getWindow();
+            AlertHelper.showAlert(Alert.AlertType.ERROR, owner, "Form Error!", erreurmsg);
+            return;
+        }
+
+        station.setCallsign(Callsign);
+        station.setLatitude(Latitude);
+        station.setLongitude(Longitude);
+
+        conf.setCallsign(Callsign);
+        conf.setLatitude(Latitude);
+        conf.setLongitude(Longitude);
+
+        conf.setSIDSEntrySatSource(TextFieldSIDSEntrysat.getText());
+        conf.setSIDSSatnogsSource(TextFieldSIDSSatnogs.getText());
+        conf.setSoundModemIP(FieldIP.getText());
+        conf.setSoundModemPort(FieldPort.getText());
+
+        Station StationSatnogs = new Station(conf.getSIDSSatnogsSource(), station.getLongitude(),
+                station.getLatitude());
+        Station StationEntry = new Station(conf.getSIDSEntrySatSource(), station.getLongitude(), station.getLatitude());
+
+        if (CheckbBoxAmicalSat.isSelected() == true) {
+            conf.setSIDSEntrySat("1");
+            SendSIDSEntrysat = new SendSIDS(StationEntry, conf.getNorad(), conf.getSIDSEntryUrl());
+        } else {
+            conf.setSIDSEntrySat("0");
+
+        }
+
+        if (CheckBoxSatNogs.isSelected() == true) {
+            conf.setSIDSSatnogs("1");
+            SendSIDSSatnogs = new SendSIDS(StationSatnogs, conf.getNorad(), conf.getSIDSSatnogsURL());
+        } else {
+            conf.setSIDSSatnogs("0");
+        }
+
+        conf.save();
+        manageStatusinformation("Configuration Saved","Configuration Saved");
+        
+    }
+
+    @FXML
+    private void handleStart(ActionEvent event) {
+
+
+        manageStatusinformation("Connected to modem","Connection to modem");
+        manageStateMMI(STATE_START);
+         
+        // TODO :  to improve
+        SoundModemConfiguration smc = new SoundModemConfiguration("default");
+        smc.setSmIPadress(FieldIP.getText());
+        smc.setSmPort(Integer.parseInt(FieldPort.getText()));
+        
+        
+        if (task == null) {
+            receivedFrame.addPropertyChangeListener(new PropertyChangeListener() {
+                @Override
+                public void propertyChange(PropertyChangeEvent evt) {
+                    final Frame decodedData = receivedFrame.getLastDecodedData();
+                    if (conf.isSIDS_EntrySat()) {
+                        // Generation SIDS
+                    }
+                    Platform.runLater(new Runnable() {
+                        @Override
+                        public void run() {
+                            try {
+                        
+                                if (decodedData != null) {
+                                    displayLog(decodedData.toStringHeader());
+                                    displayLog(decodedData.toString());    
+                                    updateFrame(receivedFrame.getNumberFrame());
+
+                                } else {
+                                    displayLog("received frame  : null");
+                                }
+
+                            } catch (Exception e) {
+                                displayLog("Run - error");
+                                displayLog(e.toString());
+                                e.printStackTrace();
+                            }
+
+                        }
+
+                    });
+                }
+
+            }
+
+            );
+
+        }
+        task = new TaskSoundmodemTCP(smc, receivedFrame);
+
+        task.setOnSucceeded(new EventHandler<WorkerStateEvent>() {
+
+            @Override
+            public void handle(WorkerStateEvent event) {
+                // La tache s'est correctement terminee.
+                manageStatusinformation("KISS TCP CONNECTION FAILED","KISS TCP DISCONNECTED");
+                manageStateMMI(STATE_STOP);
+
+                }
+
+        });
+
+        task.setOnFailed(new EventHandler<WorkerStateEvent>() {
+
+            @Override
+            public void handle(WorkerStateEvent event) {
+                // La tache s'est correctement terminee.
+                manageStatusinformation("KISS TCP CONNECTION FAILED","KISS TCP DISCONNECTED - Connection failed");
+                displayLog(event.toString());
+                displayLog(event.getSource().toString());
+                manageStateMMI(STATE_STOP);
+            }
+
+        });
+
+        Thread backgroundThread = new Thread(task);
+        backgroundThread.setDaemon(true);
+        backgroundThread.start();
+
+    }
+
+    @FXML
+    private void handleStop(ActionEvent event) {
+
+        manageStateMMI(STATE_STOP);
+        task.arreter();
+        manageStatusinformation("Stop received data","Stop task to receive telemetrie");
+    }
+
+    @FXML
+    private void handleSave(ActionEvent event) {
+
+        
+        manageStateMMI(STATE_SAVE);
+        manageStatusinformation("save data","save Telemetry in file");
+        saveDataFile();
+        manageStatusinformation("Data Saved","Telemetry Data saved in file");
+    }
+
+
+
+    @FXML
+    private void HandleIP(ActionEvent event) {
+    }
+
+    @FXML
+    private void HandlePort(ActionEvent event) {
+    }
+
+
+
+    public void initMMI() {
+
+        
+        logfile = new LogFile();
+        // initialise le log
+ //       initdisplayLogFile();
+
+        manageStatusinformation("Initialised","ENTRY SAT - LOG \r\n Initialise application") ;   
+        appLogger.warning("Initialise ");
+        primaryStage.setTitle("AmicalSat Decoder - " + version);
+
+        station.setCallsign(conf.getCallsign());
+        station.setLatitude(conf.getLatitude());
+        station.setLongitude(conf.getLongitude());
+
+        TextFieldCallsign.setText(station.getCallsign());
+        TextFieldLatitude.setText(station.getLatitude());
+        TextFieldLongitude.setText(station.getLongitude());
+
+        TextFieldSIDSEntrysat.setText(conf.getSIDSEntrySatSource());
+        TextFieldSIDSSatnogs.setText(conf.getSIDSSatnogsSource());
+
+         
+        if (conf.isSIDS_EntrySat()) {
+            CheckbBoxAmicalSat.setSelected(true);
+        }
+        if (conf.isSISD_SatNogs()) {
+            CheckBoxSatNogs.setSelected(true);
+        }
+
+        displayLog(conf.getSIDSSatnogsURL());
+        displayLog(conf.getSIDSEntryUrl());
+        displayLog("Initialisation with Properties File Done ");
+
+        BufferedImage bufferedImage1 = null;
+        BufferedImage bufferedImage2 = null;
+
+        try {
+            
+ 
+            bufferedImage1 = ImageIO.read(getClass().getResource((imgAmsat)));
+               bufferedImage2 = ImageIO.read(getClass().getResource((imgAmicalsat)));
+        } catch (IOException e) {
+
+            appLogger.severe("Error loading Image resources");
+            appLogger.severe(e.toString());
+        }
+        Image imageamsat = SwingFXUtils.toFXImage(bufferedImage1, null);
+        ImageViewAMSAT.setImage(imageamsat);
+        Image imgQB = SwingFXUtils.toFXImage(bufferedImage2, null);
+           imageViewEntrysat.setImage(imgQB);
+
+ 
+        ConfigHttp c = new ConfigHttp("http://site.amsat-f.org/download/117168/");
+        String ver;
+        String message;
+        int NoradIdConf=conf.getNorad();
+        if(c.isConnected())
+        {
+        ver = c.GetProperty("AmicalsatVersion");
+        message = c.GetProperty("Message");
+        NoradIdConf= Integer.parseUnsignedInt(c.GetProperty("NoradID").trim());
+        }
+        else
+        {
+            ver = version;
+            message = "not connected to internet";
+        }
+        if (NoradIdConf!=conf.getNorad())
+        {
+            conf.setNorad(NoradIdConf);
+            conf.save();
+            displayLog("Norad ID updated  ");
+        }
+        
+        manageStateMMI(STATE_INIT);
+        manageStatusinformation("Application Ready","Application initialised") ;   
+        this.LabelInformation.setText("");
+
+        // initialise SIDS
+
+        Station StationSatnogs = new Station(conf.getSIDSSatnogsSource(), station.getLongitude(),
+                station.getLatitude());
+        Station StationEntry = new Station(conf.getSIDSEntrySatSource(), station.getLongitude(), station.getLatitude());
+
+        if (conf.isSISD_SatNogs() == true) {
+            SendSIDSSatnogs = new SendSIDS(StationSatnogs, conf.getNorad(), conf.getSIDSSatnogsURL());
+        }
+
+        if (conf.isSIDS_EntrySat() == true) {
+            SendSIDSEntrysat = new SendSIDS(StationEntry, conf.getNorad(), conf.getSIDSEntryUrl());
+        }
+
+        String erreurmsg = message;
+
+        if (ver.equals(version) == false) {
+            erreurmsg += " New version " + ver + " available ! ";
+
+        }
+        this.LabelInformation.setText(erreurmsg);
+
+    }
+
+    public void setPrimaryStage(Stage primaryStage) {
+        this.primaryStage = primaryStage;
+
+    }
+    
+    
+    /**
+     * Save telemetry data received in text file. The file is stored in data folder.
+     */
+    public void saveDataFile() {
+        SimpleDateFormat formater = new SimpleDateFormat("yyyy-MM-dd-HHmmss");
+        Date aujourdhui = new Date();
+
+        // 
+
+        String path = System.getProperty("user.dir") + "/data";
+        File apath = new File(path);
+
+        if (!apath.exists()) {
+            if (apath.mkdir() == false) {
+                appLogger.severe("fail to create " + path);
+            }
+        }
+
+        PrintWriter pw = null;
+
+        long NbFrame = receivedFrame.getNumberFrame();
+
+        try {
+            pw = new PrintWriter(new FileWriter(path + "/" + formater.format(aujourdhui) + "-tlm-Hexa.txt"));
+            for (int i = 0; i < NbFrame; i++) {
+  //              pw.write(receivedFrame.getFrame(i));
+                pw.write(LINE_SEPARATOR);
+            }
+
+            pw.flush();
+            pw.close();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+    }
+
+    private void updateFrame(long nbframe) {
+        LabelFrame.setText("frame : " + nbframe);
+
+    }
+
+    
+    private void displayLog(String log) {
+
+        logfile.displayLog(log);
+        TexAreaLog.appendText(log);
+        TexAreaLog.appendText("\r\n");
+    }
+
+
+    
+    private void manageStateMMI(int state)
+    {
+        switch (state) {
+            case STATE_INIT : 
+                ButtonStop.setDisable(true);
+                ButtonStart.setDisable(false);
+                ButtonSave.setDisable(true);
+                break;
+            case STATE_START : 
+                ButtonStop.setDisable(false);
+                ButtonStart.setDisable(true);
+                ButtonSave.setDisable(false);
+                break;
+            case STATE_STOP : 
+                ButtonStop.setDisable(true);
+                ButtonStart.setDisable(false);
+                ButtonSave.setDisable(false);
+                break;
+            case  STATE_SAVE :
+                ButtonStop.setDisable(true);
+                ButtonStart.setDisable(false);
+                ButtonSave.setDisable(true);
+                break;
+            
+            
+        }
+    }
+    
+    private void manageStatusinformation(String statusMessage, String logMessage) {
+        labelStatus.setText(statusMessage);
+        displayLog(logMessage);
+        
+    }
+
+}
diff --git a/ApplicationAmicalsat/src/main/java/org/josast/ApplicationAmicalsat/ModelReceivedData.java b/ApplicationAmicalsat/src/main/java/org/josast/ApplicationAmicalsat/ModelReceivedData.java
new file mode 100644
index 0000000..79ee371
--- /dev/null
+++ b/ApplicationAmicalsat/src/main/java/org/josast/ApplicationAmicalsat/ModelReceivedData.java
@@ -0,0 +1,87 @@
+package org.josast.ApplicationAmicalsat;
+
+import java.beans.PropertyChangeListener;
+import java.beans.PropertyChangeSupport;
+import java.util.Date;
+import java.util.Vector;
+
+import org.josast.amicalsat.FactoryConsumer;
+import org.josast.amicalsat.Frame;
+
+ 
+
+
+public class ModelReceivedData {
+    
+    long numberFrame = 0;
+    Vector<ReceivedData> vecRawData =  new Vector<ReceivedData>();
+    Vector<Frame> vecDecodedData=  new Vector<Frame>();
+    FactoryConsumer ff = new  FactoryConsumer();
+    
+    
+    private PropertyChangeSupport listenerList = new PropertyChangeSupport(this);
+    
+    public void addPropertyChangeListener(PropertyChangeListener listener) {
+        listenerList.addPropertyChangeListener(listener);
+    }
+    
+    public void removePropertyChangeListener(PropertyChangeListener listener) {
+        listenerList.removePropertyChangeListener(listener);
+    }
+    
+    public void addPropertyChangeListener(String propertyName, PropertyChangeListener listener) {
+        listenerList.addPropertyChangeListener(propertyName, listener);
+    }
+    
+    public void removePropertyChangeListener(String propertyName, PropertyChangeListener listener) {
+        listenerList.removePropertyChangeListener(propertyName, listener);
+    }
+
+    public long getNumberFrame() {
+        return numberFrame;
+    }
+
+    public ReceivedData getLastReceivedData() {
+        return vecRawData.lastElement();
+    }
+    
+    public Frame getLastDecodedData() {
+        return vecDecodedData.lastElement();
+    }
+
+
+
+    @Deprecated
+    public void addFrame(int size, byte[] data) {
+//        long oldNumberFrame = numberFrame;
+//        numberFrame++;
+//        try {
+//            // try to decode 
+//            FrameTlmEntrySat frame = new FrameTlmEntrySat(new ByteBufferKaitaiStream (cbuf) );
+//            Ax25Frame ax = frame.frameTlmEntrySat();
+//         //   System.out.println(ax.ax25Header().srcCallsignRaw().srcCallsignRor().srcCallsign());
+//            vect.addElement(frame);
+//            EntryFrame EntryFrame = new EntryFrame(new Date(), new KissData(cbuf, nb));
+//            vecKiss.addElement(EntryFrame);
+//
+//            
+//        } catch (Exception e)
+//        {
+//            e.printStackTrace();
+//        }
+        
+    }
+
+    public void addFrame(byte[] received) {
+        long oldNumberFrame = numberFrame;
+        numberFrame++;
+        vecRawData.add(new ReceivedData(new Date(),received));
+        Frame framereceived =  ff.getFrame(received);
+        vecDecodedData.add(framereceived);
+        listenerList.firePropertyChange("numberFrame", oldNumberFrame, numberFrame);
+        
+    }
+
+
+
+}
diff --git a/ApplicationAmicalsat/src/main/java/org/josast/ApplicationAmicalsat/ReceivedData.java b/ApplicationAmicalsat/src/main/java/org/josast/ApplicationAmicalsat/ReceivedData.java
new file mode 100644
index 0000000..c7b81fc
--- /dev/null
+++ b/ApplicationAmicalsat/src/main/java/org/josast/ApplicationAmicalsat/ReceivedData.java
@@ -0,0 +1,32 @@
+package org.josast.ApplicationAmicalsat;
+
+import java.util.Date;
+
+
+public class ReceivedData {
+    
+    private Date time;
+    private byte [] data;
+    
+    public ReceivedData(Date receivedTime, byte [] receivedData) {
+        super();
+         time = receivedTime;
+         data = receivedData ;
+    }
+    
+    public Date getTime() {
+        return time;
+    }
+
+    public void setTime(Date time) {
+        this.time = time;
+    }
+   
+    
+    @Override
+    public String toString() {
+        return "Frame [time=" + time + "][ Frame=" + new String(data) + "]";
+    }
+
+
+}
diff --git a/ApplicationAmicalsat/src/main/java/org/josast/ApplicationAmicalsat/SendSIDS.java b/ApplicationAmicalsat/src/main/java/org/josast/ApplicationAmicalsat/SendSIDS.java
new file mode 100644
index 0000000..e172640
--- /dev/null
+++ b/ApplicationAmicalsat/src/main/java/org/josast/ApplicationAmicalsat/SendSIDS.java
@@ -0,0 +1,37 @@
+package org.josast.ApplicationAmicalsat;
+
+import org.josast.SIDS.HttpPostSIDS;
+import org.josast.SIDS.SIDSData;
+import org.josast.SIDS.Station;
+
+/**
+ * 
+ * @author christophe
+ *
+ */
+public class SendSIDS {
+    
+    SIDSData sids = new SIDSData();
+    HttpPostSIDS client;
+    
+    public  SendSIDS ( Station station, int norad, String url)
+    {
+        sids.setStation(station);
+        sids.setNoradID(norad);
+        client = new HttpPostSIDS(url);
+        
+        
+    }
+    
+    public int Send(ReceivedData data)
+    {
+        //BasicConfigurator.configure();
+
+//        sids.setTelemetryData(data.getTime(),data.getFrame().toString());
+        System.out.println(sids.toStringBasic());
+        int result = client.SendSIDSBasic(sids);
+        return result;
+
+    }
+
+}
diff --git a/ApplicationAmicalsat/src/main/java/org/josast/ApplicationAmicalsat/TaskSoundmodemTCP.java b/ApplicationAmicalsat/src/main/java/org/josast/ApplicationAmicalsat/TaskSoundmodemTCP.java
new file mode 100644
index 0000000..66af40f
--- /dev/null
+++ b/ApplicationAmicalsat/src/main/java/org/josast/ApplicationAmicalsat/TaskSoundmodemTCP.java
@@ -0,0 +1,83 @@
+package org.josast.ApplicationAmicalsat;
+
+import java.util.logging.Logger;
+
+
+import org.josast.ModuleSoundModem.SoundModemClient;
+import org.josast.ModuleSoundModem.SoundModemConfiguration;
+
+import javafx.concurrent.Task;
+
+public class TaskSoundmodemTCP extends Task<String> {
+	
+	private Logger log = Logger.getLogger("AmicalSatLogger");
+
+	private volatile boolean running = true;
+	
+	SoundModemConfiguration smConfiguration = null;
+	SoundModemClient smc = null;
+	ModelReceivedData receivedFrame = null;
+
+	/**
+	 * @param smConfiguration fichier de configuration
+	 * @param receivedFrame Frame Data model
+	 */
+	public TaskSoundmodemTCP(SoundModemConfiguration smConfiguration, ModelReceivedData receivedFrame) {
+		this.smConfiguration = smConfiguration;
+		smc = new SoundModemClient(smConfiguration);
+		if (smc.isOpen() == false) {
+			this.failed();
+		}
+		this.receivedFrame = receivedFrame;
+
+	}
+
+	public TaskSoundmodemTCP(ModelReceivedData receivedFrame) {
+   
+		smConfiguration = new SoundModemConfiguration("default");
+		smc = new SoundModemClient(smConfiguration);
+		if (smc.isOpen() == false) {
+			this.failed();
+		}
+		this.receivedFrame = receivedFrame;
+	}
+
+	/**
+	 *  while the connection is open, the modem is listening. When a frame is received, 
+	 *  this frame is added to the model
+	 */
+	@Override
+	protected String call() {
+		try {
+
+			while (running == true) {
+			    byte[] temp = smc.receivedRawData();
+			    receivedFrame.addFrame(temp);
+				this.updateValue(receivedFrame.toString());
+
+			}
+		} catch (Exception e) {
+			log.severe("Erreur SoundModem not available");
+			log.severe(e.toString());
+			this.failed();
+
+		}
+		return receivedFrame.toString();
+	}
+
+	
+	
+	public void arreter() {
+	 
+		this.running = false;
+	 
+		}
+	
+	public void redemarrer()
+	{
+		 
+		this.running = true;
+	 
+		}
+	
+}
diff --git a/ApplicationAmicalsat/src/main/java/org/josast/ApplicationAmicalsat/util/LogFile.java b/ApplicationAmicalsat/src/main/java/org/josast/ApplicationAmicalsat/util/LogFile.java
new file mode 100644
index 0000000..d3ae5b5
--- /dev/null
+++ b/ApplicationAmicalsat/src/main/java/org/josast/ApplicationAmicalsat/util/LogFile.java
@@ -0,0 +1,65 @@
+/**
+ * 
+ */
+package org.josast.ApplicationAmicalsat.util;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.logging.Logger;
+
+/**
+ * @author christophe
+ *
+ */
+public class LogFile {
+
+    private Logger appLogger = Logger.getLogger("AmicalSatLogger");
+    private PrintWriter pw;
+    
+    /**
+     * 
+     */
+    public LogFile() {
+        // TODO Auto-generated constructor stub
+        initdisplayLogFile();
+    }
+
+    
+    private void initdisplayLogFile()
+    {
+
+        
+        SimpleDateFormat formater = new SimpleDateFormat("yyyy-MM-dd-HHmmss");
+        Date aujourdhui = new Date();
+        String path = System.getProperty("user.dir") + "/log";
+        File apath = new File(path);
+
+        if (!apath.exists()) {
+            if (apath.mkdir() == false) {
+                appLogger.severe("fail to create " + path);
+            }
+        }
+        try {
+             pw = new PrintWriter (new FileWriter(path+"/"+formater.format(aujourdhui)+"-"+".log"));
+        } catch (IOException e) {
+            appLogger.severe("erreur creating log file");
+            appLogger.severe (e.toString());
+        }
+    }
+    
+    public  void displayLog(String log) {
+        if(pw!=null)
+        {
+          pw.println(log);
+          pw.flush();
+        }
+        appLogger.info(log);
+
+    }
+    
+    
+}
diff --git a/ApplicationAmicalsat/src/main/java/org/josast/javafx/AlertHelper.java b/ApplicationAmicalsat/src/main/java/org/josast/javafx/AlertHelper.java
new file mode 100644
index 0000000..7f3d20e
--- /dev/null
+++ b/ApplicationAmicalsat/src/main/java/org/josast/javafx/AlertHelper.java
@@ -0,0 +1,28 @@
+package org.josast.javafx;
+
+import javafx.scene.control.Alert;
+import javafx.stage.Window;
+
+public class AlertHelper {
+
+    private AlertHelper()
+    {
+        
+    }
+    /**
+     * Display a window in order to display a message 
+     * @param alertType Type of alert
+     * @param owner
+     * @param title title of the windows
+     * @param message message to display
+     */
+    public static void showAlert(Alert.AlertType alertType, Window owner, String title, String message) {
+        Alert alert = new Alert(alertType);
+        alert.setTitle(title);
+        alert.setHeaderText(null);
+        alert.setContentText(message);
+        alert.initOwner(owner);
+        alert.show();
+    }
+
+}
diff --git a/ApplicationAmicalsat/src/main/resources/org/josast/ApplicationAmicalsat/AmicalSatMessage.txt b/ApplicationAmicalsat/src/main/resources/org/josast/ApplicationAmicalsat/AmicalSatMessage.txt
new file mode 100644
index 0000000..536b6e2
--- /dev/null
+++ b/ApplicationAmicalsat/src/main/resources/org/josast/ApplicationAmicalsat/AmicalSatMessage.txt
@@ -0,0 +1,3 @@
+AmicalsatVersion=0.1
+Message= version de test
+NoradID=0
\ No newline at end of file
diff --git a/ApplicationAmicalsat/src/main/resources/org/josast/ApplicationAmicalsat/Amicalsat.fxml b/ApplicationAmicalsat/src/main/resources/org/josast/ApplicationAmicalsat/Amicalsat.fxml
new file mode 100644
index 0000000..2d24f26
--- /dev/null
+++ b/ApplicationAmicalsat/src/main/resources/org/josast/ApplicationAmicalsat/Amicalsat.fxml
@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.CheckBox?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.Tab?>
+<?import javafx.scene.control.TabPane?>
+<?import javafx.scene.control.TextArea?>
+<?import javafx.scene.control.TextField?>
+<?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.text.Font?>
+
+<BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.josast.ApplicationAmicalsat.Controler">
+   <top>
+      <HBox alignment="CENTER" BorderPane.alignment="CENTER">
+         <children>
+            <ImageView fx:id="ImageViewAMSAT" fitHeight="100.0" fitWidth="100.0" pickOnBounds="true" preserveRatio="true">
+              </ImageView>
+            <VBox>
+               <children>
+                  <HBox alignment="CENTER" spacing="20.0">
+                     <children>
+                        <Label fx:id="LabelIP" prefHeight="17.0" prefWidth="26.0" text="IP" />
+                        <TextField fx:id="FieldIP" onAction="#HandleIP" prefHeight="25.0" prefWidth="88.0" text="localhost" />
+                        <Label prefHeight="17.0" prefWidth="32.0" text="Port" />
+                        <TextField fx:id="FieldPort" onAction="#HandlePort" prefHeight="25.0" prefWidth="100.0" text="8100" />
+                     </children>
+                     <padding>
+                        <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+                     </padding>
+                  </HBox>
+                  <HBox alignment="CENTER" prefHeight="45.0" prefWidth="407.0" spacing="20.0">
+                     <children>
+                        <Button fx:id="ButtonStart" mnemonicParsing="false" onAction="#handleStart" text="Start" />
+                        <Button fx:id="ButtonStop" mnemonicParsing="false" onAction="#handleStop" text="Stop" />
+                        <Button fx:id="ButtonSave" mnemonicParsing="false" onAction="#handleSave" text="Save" />
+                     </children>
+                     <padding>
+                        <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+                     </padding>
+                  </HBox>
+                  <FlowPane alignment="CENTER">
+                     <children>
+                        <Label fx:id="LabelInformation" text="Message d'informations" textAlignment="CENTER">
+                           <font>
+                              <Font name="System Bold Italic" size="12.0" />
+                           </font>
+                        </Label>
+                     </children>
+                  </FlowPane>
+               </children>
+            </VBox>
+            <ImageView fx:id="imageViewEntrysat" fitHeight="67.0" fitWidth="200.0" pickOnBounds="true" preserveRatio="true">
+              </ImageView>
+         </children>
+      </HBox>
+   </top>
+   <bottom>
+      <HBox alignment="CENTER" spacing="20.0" BorderPane.alignment="CENTER">
+         <children>
+            <Label fx:id="labelStatus" text="Status" />
+            <Label fx:id="LabelFrame" alignment="CENTER_RIGHT" text="Frame :  0" />
+         </children>
+         <BorderPane.margin>
+            <Insets />
+         </BorderPane.margin>
+         <padding>
+            <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+         </padding>
+         <opaqueInsets>
+            <Insets />
+         </opaqueInsets>
+      </HBox>
+   </bottom>
+   <center>
+      <TabPane prefHeight="200.0" prefWidth="200.0" tabClosingPolicy="UNAVAILABLE" BorderPane.alignment="CENTER">
+        <tabs>
+          <Tab text="Data Stream">
+               <content>
+                  <TextArea fx:id="DecodedData" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" />
+               </content>
+            </Tab>
+            <Tab fx:id="Log" text="Log">
+               <content>
+                  <TextArea fx:id="TexAreaLog" prefHeight="200.0" prefWidth="200.0" />
+               </content>
+            </Tab>
+            <Tab text="Configuration">
+              <content>
+                  <BorderPane>
+                     <center>
+                        <HBox alignment="CENTER">
+                           <children>
+                              <VBox alignment="CENTER">
+                                 <children>
+                                    <Label alignment="CENTER" contentDisplay="CENTER" text="Station" textAlignment="CENTER">
+                                       <font>
+                                          <Font name="System Bold" size="17.0" />
+                                       </font>
+                                    </Label>
+                                    <GridPane alignment="CENTER_RIGHT">
+                                      <columnConstraints>
+                                        <ColumnConstraints hgrow="SOMETIMES" />
+                                        <ColumnConstraints hgrow="SOMETIMES" />
+                                          <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                                      </columnConstraints>
+                                      <rowConstraints>
+                                        <RowConstraints vgrow="SOMETIMES" />
+                                        <RowConstraints vgrow="SOMETIMES" />
+                                        <RowConstraints vgrow="SOMETIMES" />
+                                      </rowConstraints>
+                                       <children>
+                                          <TextField fx:id="TextFieldCallsign" GridPane.columnIndex="1" />
+                                          <Label alignment="CENTER_RIGHT" contentDisplay="RIGHT" text="CalLsign : " textAlignment="RIGHT" />
+                                          <Label text="Latitude :" GridPane.rowIndex="1" />
+                                          <Label text="Longitude : " GridPane.rowIndex="2" />
+                                          <TextField fx:id="TextFieldLatitude" GridPane.columnIndex="1" GridPane.rowIndex="1" />
+                                          <TextField fx:id="TextFieldLongitude" GridPane.columnIndex="1" GridPane.rowIndex="2" />
+                                          <Label text="XX.XXS/N" GridPane.columnIndex="2" GridPane.rowIndex="1" />
+                                          <Label text="XX.XXE/W" GridPane.columnIndex="2" GridPane.rowIndex="2" />
+                                       </children>
+                                    </GridPane>
+                                    <Label text="Data WhareHouse">
+                                       <font>
+                                          <Font name="System Bold" size="18.0" />
+                                       </font>
+                                    </Label>
+                                    <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>
+                                      <rowConstraints>
+                                        <RowConstraints vgrow="SOMETIMES" />
+                                        <RowConstraints vgrow="SOMETIMES" />
+                                      </rowConstraints>
+                                       <children>
+                                          <CheckBox fx:id="CheckbBoxAmicalSat" mnemonicParsing="false" text="AmicalSat " />
+                                          <CheckBox fx:id="CheckBoxSatNogs" mnemonicParsing="false" text="SatNogs" GridPane.rowIndex="1" />
+                                          <Label text="Source" GridPane.columnIndex="1" />
+                                          <Label text="Source" GridPane.columnIndex="1" GridPane.rowIndex="1" />
+                                          <TextField fx:id="TextFieldSIDSEntrysat" GridPane.columnIndex="2">
+                                             <GridPane.margin>
+                                                <Insets />
+                                             </GridPane.margin>
+                                          </TextField>
+                                          <TextField fx:id="TextFieldSIDSSatnogs" GridPane.columnIndex="2" GridPane.rowIndex="1" />
+                                       </children>
+                                    </GridPane>
+                                    <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0">
+                                       <children>
+                                          <Button fx:id="ButtonSaveConfiguration" contentDisplay="RIGHT" mnemonicParsing="false" onAction="#HandleSaveConfiguration" text="Save Configuration" />
+                                       </children>
+                                    </HBox>
+                                 </children>
+                              </VBox>
+                           </children>
+                        </HBox>
+                     </center>
+                  </BorderPane>
+              </content>
+            </Tab>
+        </tabs>
+      </TabPane>
+   </center>
+</BorderPane>
diff --git a/ApplicationAmicalsat/src/main/resources/org/josast/ApplicationAmicalsat/Amicalsat.jpg b/ApplicationAmicalsat/src/main/resources/org/josast/ApplicationAmicalsat/Amicalsat.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..4b628ab7ded842b209fa87b7841c933c882c9c71
GIT binary patch
literal 9879
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
Ud^}|(;eS`W{C5Ei`SaZW0Mb^r>Hq)$

literal 0
HcmV?d00001

diff --git a/ApplicationAmicalsat/src/main/resources/org/josast/ApplicationAmicalsat/logoAmsat.png b/ApplicationAmicalsat/src/main/resources/org/josast/ApplicationAmicalsat/logoAmsat.png
new file mode 100644
index 0000000000000000000000000000000000000000..0d040fba4b8e99ac74424b8e65bf4a9b05995fde
GIT binary patch
literal 6356
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
W!xA$0cY2fn0000<MNUMnLSTYBad|xe

literal 0
HcmV?d00001

diff --git a/ModuleAmicalsat/src/main/java/org/josast/amicalsat/FactoryConsumer.java b/ModuleAmicalsat/src/main/java/org/josast/amicalsat/FactoryConsumer.java
new file mode 100644
index 0000000..373d01b
--- /dev/null
+++ b/ModuleAmicalsat/src/main/java/org/josast/amicalsat/FactoryConsumer.java
@@ -0,0 +1,39 @@
+package org.josast.amicalsat;
+
+import java.util.logging.Logger;
+
+import io.kaitai.struct.ByteBufferKaitaiStream;
+
+public class FactoryConsumer {
+    private Logger log = Logger.getLogger(getClass().getName());
+    FrameFactory ff = new FrameFactory();
+    public FactoryConsumer() {
+        
+        
+
+    }
+    
+    public Frame getFrame (byte [] data)
+    {
+        Frame fm  = null;
+        
+        try { 
+            
+ 
+        FrameTlmAmicalsat cube = new FrameTlmAmicalsat(new ByteBufferKaitaiStream(data));
+        String tlmArea = cube.frameTlmEntrySat().payload().tlmArea();
+        String typeFrame = cube.frameTlmEntrySat().payload().tlmType();
+        fm = ff.creerFrame(tlmArea, typeFrame);
+        fm.setUp(cube);
+        }
+        catch (Exception e)
+        {
+            log.severe("Data input received not decoded " + e.toString());
+        }
+        
+        return fm;
+    }
+    
+    
+
+}
diff --git a/ModuleAmicalsat/src/main/java/org/josast/amicalsat/FrameFactory.java b/ModuleAmicalsat/src/main/java/org/josast/amicalsat/FrameFactory.java
index 4227d61..804c295 100644
--- a/ModuleAmicalsat/src/main/java/org/josast/amicalsat/FrameFactory.java
+++ b/ModuleAmicalsat/src/main/java/org/josast/amicalsat/FrameFactory.java
@@ -1,155 +1,126 @@
 package org.josast.amicalsat;
 
+public class FrameFactory {
 
+    public Frame creerFrame(String tlmArea, String typeFrame) {
 
-public  class FrameFactory {
-	
-
-	    public  Frame creerFrame(String tlmArea, String typeFrame) {
-	    	
-	    	Frame frame=null;
-  	
-	    	if (tlmArea.compareTo("M1") == 0) {
-	    		
-	    		if (typeFrame.compareTo("LOG") == 0) {
-	    			
-	    		
-	    		
-	    		frame = new M1TypeFrame();
-	    		
-				}
-	    
-
-				
-	    	if (typeFrame.compareTo("FLAGS") == 0) {
-					
-			frame = new FlagsTypeFrame();
-			
-				}
-	    	}		
-		
-		if (tlmArea.compareTo("A1") == 0) {
-			
-
-
-			if (typeFrame.compareTo("FLAGS") == 0) {
-				frame = new A1FlagTypeFrame();
-			}
-			
-			if (typeFrame.compareTo("MAG") == 0) {
-				frame = new A1MagTypeFrame();
-				 
-			}
-		
-			if (typeFrame.compareTo("GYRO") == 0) {
-				
-				frame = new A1GyroTypeFrame(); 
-				
-				
-
-			}
-			//# #A1;POSITION;[Current timestamp];[Latitude];[Longitude]
-			if (typeFrame.compareTo("POSITION") == 0) {
-			
-				frame = new A1PositionTypeFrame(); 
-			}
-		}
-		if (tlmArea.compareTo("EM") == 0) {
-
-
-			if (typeFrame.compareTo("MN") == 0) {
-				frame = new EmmnTypeFrame(); 
-				
-			
-			}
-
-			if (typeFrame.compareTo("LOG") == 0) {
-				frame = new EmLogTypeFrame(); 
-
-			
-
-			}
-
-		}
-		
-		if (tlmArea.compareTo("CU_R") == 0) {
-
-			
-			if (typeFrame.compareTo("LOG") == 0) {
-				frame = new CuLogTypeFrame(); 
-
-				
-
-			}
-		}
-		
-		if (tlmArea.compareTo("CU_L") == 0) {
-
-			if (typeFrame.compareTo("LOG") == 0) {
-
-				frame = new CuLogTypeFrame(); 
-
-			}
-		}
-		
-		if (tlmArea.compareTo("V1") == 0) {
-
-			//#[V1/U2];MS;[Timestamp];[Current rssi];[Latch rssi];[AFC offset ]
-			
-			if (typeFrame.compareTo("MS") == 0) {
-
-				frame = new V1MsTypeFrame(); 
-				
-			}
-			
-			if (typeFrame.compareTo("RL") == 0) {
-				frame = new V1RlTypeFrame(); 
-					
-				
-			}		
-		}
-		
-		
-		if (tlmArea.compareTo("U2") == 0) {
-
-			//#[V1/U2];MS;[Timestamp];[Current rssi];[Latch rssi];[AFC offset ]
-			if (typeFrame.compareTo("MS") == 0) {
-				frame = new U2MsTypeFrame(); 
- 
-			
-				
-			}
-			//#[U2];RL;[Timestamp],[CPU voltage];[Battery voltage];[CPU temperature];[Amplifier temperature];[Flags]
-			if (typeFrame.compareTo("RL") == 0) {
-				
-				frame = new U2RlTypeFrame(); 				
-
-			
-			}
-			
-		}
-		
-		if (tlmArea.compareTo("ER") == 0) {
-
-			//#[V1/U2];MS;[Timestamp];[Current rssi];[Latch rssi];[AFC offset ]
-			if (typeFrame.compareTo("LOG") == 0) {
-				frame = new EmLogTypeFrame(); 
-
-
-
-			}
-			if (typeFrame.compareTo("MN") == 0) {
-
-
-				frame = new EmmnTypeFrame(); 
-			}
-		}
-		
-		return frame;
-		}
-	    
-	    
-	    
-	    
-	}
+        Frame frame = null;
 
+        if (tlmArea.compareTo("M1") == 0) {
+
+            if (typeFrame.compareTo("LOG") == 0) {
+
+                frame = new M1TypeFrame();
+
+            }
+
+            if (typeFrame.compareTo("FLAGS") == 0) {
+
+                frame = new FlagsTypeFrame();
+
+            }
+        }
+
+        if (tlmArea.compareTo("A1") == 0) {
+
+            if (typeFrame.compareTo("FLAGS") == 0) {
+                frame = new A1FlagTypeFrame();
+            }
+
+            if (typeFrame.compareTo("MAG") == 0) {
+                frame = new A1MagTypeFrame();
+
+            }
+
+            if (typeFrame.compareTo("GYRO") == 0) {
+
+                frame = new A1GyroTypeFrame();
+
+            }
+            // # #A1;POSITION;[Current timestamp];[Latitude];[Longitude]
+            if (typeFrame.compareTo("POSITION") == 0) {
+
+                frame = new A1PositionTypeFrame();
+            }
+        }
+        if (tlmArea.compareTo("EM") == 0) {
+
+            if (typeFrame.compareTo("MN") == 0) {
+                frame = new EmmnTypeFrame();
+
+            }
+
+            if (typeFrame.compareTo("LOG") == 0) {
+                frame = new EmLogTypeFrame();
+
+            }
+
+        }
+
+        if (tlmArea.compareTo("CU_R") == 0) {
+
+            if (typeFrame.compareTo("LOG") == 0) {
+                frame = new CuLogTypeFrame();
+
+            }
+        }
+
+        if (tlmArea.compareTo("CU_L") == 0) {
+
+            if (typeFrame.compareTo("LOG") == 0) {
+
+                frame = new CuLogTypeFrame();
+
+            }
+        }
+
+        if (tlmArea.compareTo("V1") == 0) {
+
+            // #[V1/U2];MS;[Timestamp];[Current rssi];[Latch rssi];[AFC offset ]
+
+            if (typeFrame.compareTo("MS") == 0) {
+
+                frame = new V1MsTypeFrame();
+
+            }
+
+            if (typeFrame.compareTo("RL") == 0) {
+                frame = new V1RlTypeFrame();
+
+            }
+        }
+
+        if (tlmArea.compareTo("U2") == 0) {
+
+            // #[V1/U2];MS;[Timestamp];[Current rssi];[Latch rssi];[AFC offset ]
+            if (typeFrame.compareTo("MS") == 0) {
+                frame = new U2MsTypeFrame();
+
+            }
+            // #[U2];RL;[Timestamp],[CPU voltage];[Battery voltage];[CPU
+            // temperature];[Amplifier temperature];[Flags]
+            if (typeFrame.compareTo("RL") == 0) {
+
+                frame = new U2RlTypeFrame();
+
+            }
+
+        }
+
+        if (tlmArea.compareTo("ER") == 0) {
+
+            // #[V1/U2];MS;[Timestamp];[Current rssi];[Latch rssi];[AFC offset ]
+            if (typeFrame.compareTo("LOG") == 0) {
+                frame = new EmLogTypeFrame();
+
+            }
+            if (typeFrame.compareTo("MN") == 0) {
+
+                frame = new EmmnTypeFrame();
+            }
+        }
+
+        return frame;
+    }
+
+}
-- 
GitLab


From 2a15d0949177007cae05ccf2fb1b74836bf2152d Mon Sep 17 00:00:00 2001
From: xtophe <christophe.mcr@gmail.com>
Date: Mon, 4 May 2020 22:18:47 +0200
Subject: [PATCH 2/2] feat: add pom.xml

---
 ApplicationAmicalsat/pom.xml | 78 ++++++++++++++++++++++++++++++++++++
 1 file changed, 78 insertions(+)
 create mode 100644 ApplicationAmicalsat/pom.xml

diff --git a/ApplicationAmicalsat/pom.xml b/ApplicationAmicalsat/pom.xml
new file mode 100644
index 0000000..8cab056
--- /dev/null
+++ b/ApplicationAmicalsat/pom.xml
@@ -0,0 +1,78 @@
+<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">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.josast</groupId>
+	<artifactId>ApplicationAmicalsat</artifactId>
+	<version>0.0.1-SNAPSHOT</version>
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<maven.compiler.source>11</maven.compiler.source>
+		<maven.compiler.target>11</maven.compiler.target>
+		
+		
+		<ModuleSoundModem.version>0.0.2-SNAPSHOT</ModuleSoundModem.version>
+		<ModuleConfig.version> 0.2 </ModuleConfig.version>
+		<ModuleAmicalsat.version>1.0-SNAPSHOT</ModuleAmicalsat.version>
+	</properties>
+	<dependencies>
+		<dependency>
+			<groupId>org.openjfx</groupId>
+			<artifactId>javafx-controls</artifactId>
+			<version>13</version>
+		</dependency>
+		<dependency>
+			<groupId>org.openjfx</groupId>
+			<artifactId>javafx-fxml</artifactId>
+			<version>13</version>
+		</dependency>
+				<!-- https://mvnrepository.com/artifact/org.openjfx/javafx-swing -->
+		<dependency>
+			<groupId>org.openjfx</groupId>
+			<artifactId>javafx-swing</artifactId>
+			<version>11-ea+24</version>
+		</dependency>
+		
+
+		<dependency>
+			<groupId>org.josast</groupId>
+			<artifactId>ModuleSIDS</artifactId>
+			<version>0.0.1-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>org.josast</groupId>
+			<artifactId>ModuleSoundModem</artifactId>
+			<version>${ModuleSoundModem.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.josast</groupId>
+			<artifactId>ModuleConfig</artifactId>
+			<version>${ModuleConfig.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.josast</groupId>
+			<artifactId>ModuleAmicalsat</artifactId>
+			<version>${ModuleAmicalsat.version}</version>
+		</dependency>
+	</dependencies>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.8.0</version>
+				<configuration>
+					<release>11</release>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.openjfx</groupId>
+				<artifactId>javafx-maven-plugin</artifactId>
+				<version>0.0.4</version>
+				<configuration>
+					<mainClass>org.josast.ApplicationAmicalsat.App</mainClass>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+</project>
\ No newline at end of file
-- 
GitLab