diff --git a/AplicationAmicalsat/src/main/java/org/josast/application/amicalsat/cli/AmicalsatCli.java b/AplicationAmicalsat/src/main/java/org/josast/application/amicalsat/cli/AmicalsatCli.java
index d376f39de96ba3fc1522fbda67ad384eadf16362..53fceea51722db08af904453582983c4f423c2dc 100644
--- a/AplicationAmicalsat/src/main/java/org/josast/application/amicalsat/cli/AmicalsatCli.java
+++ b/AplicationAmicalsat/src/main/java/org/josast/application/amicalsat/cli/AmicalsatCli.java
@@ -1,8 +1,5 @@
package org.josast.application.amicalsat.cli;
-import java.util.Arrays;
-import java.util.logging.Logger;
-
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.CommandLineParser;
import org.apache.commons.cli.DefaultParser;
@@ -10,11 +7,8 @@ import org.apache.commons.cli.HelpFormatter;
import org.apache.commons.cli.Option;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
-import org.josast.ModuleSoundModem.KissException;
import org.josast.ModuleSoundModem.SoundModemCli;
import org.josast.ModuleSoundModem.SoundModemClient;
-import org.josast.ModuleSoundModem.SoundModemConfiguration;
-import org.josast.ModuleSoundModem.kiss;
import org.josast.amicalsat.Frame;
import org.josast.amicalsat.FrameFactory;
import org.josast.amicalsat.FrameTlmAmicalsat;
@@ -22,16 +16,16 @@ import org.josast.amicalsat.FrameTlmAmicalsat;
import io.kaitai.struct.ByteBufferKaitaiStream;
public class AmicalsatCli {
- private Logger log = Logger.getLogger(getClass().getName());
+ // private Logger log = Logger.getLogger(getClass().getName());
+
private String version = "0.2";
private String configurationfile = "defaultConfigFile.ini";
/*
- * Utilisation d'un répertoire par défaut
+ * Utilisation d'un répertoire par défaut
*/
private String generateRepository = "DataReceived";
-
-
- byte[] cbuf = new byte[1000];
+
+
public String getVersion() {
return version;
@@ -56,7 +50,7 @@ public class AmicalsatCli {
public AmicalsatCli() {
// TODO Auto-generated constructor stub
}
-
+
private static Options configParameters() {
final Option versionOption = Option.builder("V")
@@ -121,24 +115,17 @@ public class AmicalsatCli {
}
-
public void execute() {
FrameFactory ff = new FrameFactory();
- SoundModemConfiguration smconf = new SoundModemConfiguration(configurationfile);
- SoundModemClient sm = new SoundModemClient(smconf);
+
+ SoundModemClient sm = new SoundModemClient(configurationfile);
while (true) {
- int nb = sm.receiveData(cbuf);
- sm.decode(cbuf, nb);
- kiss k = new kiss(Arrays.copyOf(cbuf, nb));
- FrameTlmAmicalsat cube = null;
- try {
- cube = new FrameTlmAmicalsat(new ByteBufferKaitaiStream(k.toRaw()));
- } catch (KissException e) {
- log.severe(e.toString());
+ byte[] temp = sm.receivedRawData();
+
+ FrameTlmAmicalsat cube = new FrameTlmAmicalsat(new ByteBufferKaitaiStream(temp));
- }
System.out.print(
"Source : " + cube.frameTlmEntrySat().ax25Header().srcCallsignRaw().srcCallsignRor().srcCallsign());
System.out.print("destination : "
@@ -158,17 +145,15 @@ public class AmicalsatCli {
}
public static void main(String[] args) throws ParseException {
-
+
final Options options = configParameters();
final CommandLineParser parser = new DefaultParser();
final CommandLine line = parser.parse(options, args);
-
AmicalsatCli cli = new AmicalsatCli();
-
boolean helpMode = line.hasOption("help");
if (helpMode) {
diff --git a/ApplicationEntrySatDecoder/pom.xml b/ApplicationEntrySatDecoder/pom.xml
index 5e96d247d3d805338a4f1112f7043fec68a359ef..2b0b45327fe12707d1d419d0d58122349b04fdc4 100644
--- a/ApplicationEntrySatDecoder/pom.xml
+++ b/ApplicationEntrySatDecoder/pom.xml
@@ -7,13 +7,12 @@
org.josast
- JOSAST-parent
- 0.0.1-SNAPSHOT
+ JOSAST-parent
+ 0.0.2-SNAPSHOT
- org.josast
+
ApplicationEntrySatDecoder
- 0.0.1-SNAPSHOT
ApplicationEntrySatDecoder
http://www.amsat-f.org
diff --git a/ModuleCubesatSim/src/main/java/org/josast/CubesatSim/TLM/SoundmodemToInfluxDB.java b/ModuleCubesatSim/src/main/java/org/josast/CubesatSim/TLM/SoundmodemToInfluxDB.java
index 1d5edc18bda2032f72de9e4166546380179683e8..59b0eba76c3df03a2c1a228eaaac7d1121b53d0e 100644
--- a/ModuleCubesatSim/src/main/java/org/josast/CubesatSim/TLM/SoundmodemToInfluxDB.java
+++ b/ModuleCubesatSim/src/main/java/org/josast/CubesatSim/TLM/SoundmodemToInfluxDB.java
@@ -10,13 +10,10 @@ import org.apache.commons.cli.HelpFormatter;
import org.apache.commons.cli.Option;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
-import org.josast.AX25.KissData;
-import org.josast.AX25.KissFrame;
import org.josast.CubesatSim.influxDB.DataCubesatSim;
import org.josast.CubesatSim.influxDB.InfluxDBInstance;
import org.josast.CubesatSim.influxDB.InfluxDatabaseConfig;
import org.josast.ModuleSoundModem.SoundModemClient;
-import org.josast.ModuleSoundModem.SoundModemConfiguration;
import org.josast.kaitai.generated.Cubesatsim;
import org.josast.kaitai.generated.Cubesatsim.CubesatsimAo7;
import org.josast.kaitai.generated.Cubesatsim.CubesatsimData;
@@ -29,16 +26,15 @@ import io.kaitai.struct.ByteBufferKaitaiStream;
*/
public class SoundmodemToInfluxDB {
- private static String version = "1.0";
+ private static String version = "1.1";
private static String configurationfile = "config.ini";
-
+
/**
*
*/
public SoundmodemToInfluxDB() {
- // TODO Auto-generated constructor stub
+
}
-
private static Options configParameters() {
@@ -87,31 +83,27 @@ public class SoundmodemToInfluxDB {
return options;
}
-
+
/**
- * @param configurationfile
+ * @param configurationfile
* @param args
*/
public void execute(String configurationfile) {
- byte[] cbuf = new byte[1000];
// connection to Sound Modem
InfluxDBInstance database = InfluxDBInstance.getInstance();
InfluxDatabaseConfig config = new InfluxDatabaseConfig(configurationfile);
-
+
database.conect(config.getAdresse(), config.getLogin(), config.getPassword());
database.createDataBase("CubesatSim");
-
- SoundModemConfiguration smconf = new SoundModemConfiguration (configurationfile);
- SoundModemClient sm = new SoundModemClient(smconf);
-
+
+ SoundModemClient sm = new SoundModemClient(configurationfile);
+
// waiting data
while (true) {
- int nb = sm.receiveData(cbuf);
- KissFrame kf = new KissFrame();
- KissData kissData = kf.extactMessage(cbuf, nb);
+ byte[] temp = sm.receivedRawData();
+ Cubesatsim cube = new Cubesatsim(new ByteBufferKaitaiStream(temp));
- Cubesatsim cube = new Cubesatsim(new ByteBufferKaitaiStream(kissData.getData()));
System.out.println(cube.ax25Header().srcAddress().srcAddressStr());
System.out.println(cube.ax25Header().destAddress().destAddressStr());
System.out.println(cube.ax25Header().ctrl());
@@ -183,8 +175,4 @@ public class SoundmodemToInfluxDB {
smd.execute(configurationfile);
}
-
-
-
-
}
diff --git a/ModuleEntrySatTelemetry/pom.xml b/ModuleEntrySatTelemetry/pom.xml
index 6226219df169c5084c3c2d21c5183d2cec94db3a..06aa53c77391c292859fd8aa9f88cb87e8a67ef3 100644
--- a/ModuleEntrySatTelemetry/pom.xml
+++ b/ModuleEntrySatTelemetry/pom.xml
@@ -3,14 +3,6 @@
-
-
-
- org.josast
- JOSAST-parent
- 0.0.1-SNAPSHOT
-
-
4.0.0
org.josast
@@ -27,12 +19,46 @@
1.8
${env.JAVA_HOME}
+
+ 2.8
+ 2.3.2
+ 2.8
+ 2.8
+ 1.3
+ 2.8.1
+ 2.3
+ 3.12.0
+ 2.2.2
+ 3.4
+ 2.3
+ 2.1.2
+ 2.13
+ 2.12
+ 2.2
+ 2.6
+ 1.3.1
+
+ ${project.basedir}/code-analysis/checkstyle.xml
+
+ ${project.basedir}/code-analysis/pmd.xml
+
+ false
+ false
+ false
+ false
+ false
-
+
+ junit
+ junit
+ 4.11
+ test
+
+
commons-cli
@@ -69,10 +95,528 @@
-
+
+
+
+ org.apache.maven.plugins
+ maven-project-info-reports-plugin
+ 2.8
+
+
+
-
+
+
+
+ org.apache.maven.plugins
+ maven-changelog-plugin
+ ${plugin.maven-changelog.version}
+
+
+ org.apache.maven.plugins
+ maven-assembly-plugin
+ 2.3
+
+
+ org.apache.maven.plugins
+ maven-resources-plugin
+ 2.5
+
+
+ org.apache.maven.plugins
+ maven-jar-plugin
+ 2.4
+
+
+ org.apache.maven.plugins
+ maven-source-plugin
+ ${plugin.source.version}
+
+
+ org.apache.maven.plugins
+ maven-enforcer-plugin
+ ${plugin.enforcer.version}
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+ ${plugin.compiler.version}
+
+
+ org.apache.maven.plugins
+ maven-surefire-plugin
+ ${plugin.surefire.version}
+
+
+ org.apache.maven.plugins
+ maven-failsafe-plugin
+ ${plugin.failsafe.version}
+
+
+ org.apache.maven.plugins
+ maven-project-info-reports-plugin
+ 2.4
+
+
+ org.apache.maven.plugins
+ maven-jxr-plugin
+ ${plugin.jxr.version}
+
+
+ org.apache.maven.plugins
+ maven-checkstyle-plugin
+ ${plugin.checkstyle.version}
+
+
+ org.apache.maven.plugins
+ maven-pmd-plugin
+ ${plugin.pmd-plugin.version}
+
+
+ org.apache.maven.plugins
+ maven-javadoc-plugin
+ ${plugin.javadoc.version}
+
+
+ org.codehaus.mojo
+ versions-maven-plugin
+ ${plugin.versions-maven.version}
+
+
+ org.codehaus.mojo
+ cobertura-maven-plugin
+ ${plugin.cobertura-maven.version}
+
+
+ org.codehaus.mojo
+ findbugs-maven-plugin
+ 2.4.0
+
+
+ org.codehaus.mojo
+ taglist-maven-plugin
+ 2.4
+
+
+ org.apache.maven.plugins
+ maven-release-plugin
+ ${plugin.release.version}
+
+
+ org.apache.maven.plugins
+ maven-dependency-plugin
+ ${plugin.dependency.version}
+
+
+ org.apache.maven.plugins
+ maven-deploy-plugin
+ ${plugin.deploy.version}
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-source-plugin
+
+ true
+
+
+
+ generate-sources
+ verify
+
+ jar-no-fork
+
+
+
+
+
+ maven-site-plugin
+ ${plugin.site.version}
+
+
+ org.apache.maven.wagon
+ wagon-ssh
+ ${plugin.wagon-ssh.version}
+
+
+
+ true
+
+
+
+ org.apache.maven.plugins
+ maven-project-info-reports-plugin
+
+ false
+ false
+
+
+
+
+ summary
+ project-team
+ dependencies
+ issue-tracking
+
+ modules
+ plugins
+
+
+
+ org.apache.maven.plugins
+ maven-jxr-plugin
+
+
+ org.apache.maven.plugins
+ maven-checkstyle-plugin
+
+ ${checkstyle.skip}
+ ${maven-checkstyle-plugin.configLocation}
+ false
+ true
+ true
+
+
+
+ org.apache.maven.plugins
+ maven-pmd-plugin
+
+ ${pmd.skip}
+ ${maven.compiler.source}
+ ${project.build.sourceEncoding}
+
+
+ /rulesets/basic.xml
+ /rulesets/unnecessary.xml
+
+
+ false
+
+
+
+ org.apache.maven.plugins
+ maven-javadoc-plugin
+
+ ${javadocs.skip}
+ false
+
+
+
+ org.apache.maven.plugins
+ maven-surefire-plugin
+
+
+ org.apache.maven.plugins
+ maven-failsafe-plugin
+
+
+ org.codehaus.mojo
+ versions-maven-plugin
+
+
+
+ dependency-updates-report
+ plugin-updates-report
+ property-updates-report
+
+
+
+
+
+ org.codehaus.mojo
+ cobertura-maven-plugin
+
+ ${cobertura.skip}
+
+
+
+ org.codehaus.mojo
+ findbugs-maven-plugin
+
+ ${findbugs.skip}
+ true
+
+
+
+ org.codehaus.mojo
+ taglist-maven-plugin
+
+ ${project.build.sourceEncoding}
+ en
+
+
+
+ Code sections needing review
+
+
+ REVIEWREQUIRED
+ exact
+
+
+
+
+ Todo Work
+
+
+ todo
+ ignoreCase
+
+
+ @todo
+ ignoreCase
+
+
+
+
+ Noted Bugs
+
+ fixme
+ ignoreCase
+
+
+
+ Deprecated Items
+
+ @deprecated
+ ignoreCase
+
+
+
+
+
+
+
+
+
+
+ attach-descriptor
+
+ attach-descriptor
+
+
+
+
+
+
+ org.codehaus.mojo
+ cobertura-maven-plugin
+
+ ${cobertura.skip}
+ 1024m
+
+ html
+ xml
+
+
+ false
+
+ 70
+ 70
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ **/*.class
+
+
+ **/model/*.class
+
+
+
+
+
+ clean
+ clean
+
+ clean
+
+
+
+ package
+ package
+
+ check
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-jxr-plugin
+
+ true
+
+
+
+ process-resources
+
+ jxr
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-javadoc-plugin
+
+
+ false
+ ${javadocs.skip}
+
+
+
+
+ org.apache.maven.plugins
+ maven-surefire-plugin
+
+
+ alphabetical
+ false
+ ${surefire.jvm.args}
+
+
+
+
+ org.apache.maven.plugins
+ maven-failsafe-plugin
+
+
+ integration-test
+
+ integration-test
+
+
+
+ verify
+
+ verify
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-pmd-plugin
+
+ ${pmd.skip}
+ ${maven.compiler.source}
+ ${project.build.sourceEncoding}
+
+
+ ${maven-pmd-plugin.configLocation}
+
+ false
+
+
+
+ verify
+
+ check
+ cpd-check
+
+
+
+
+
+
+ org.mortbay.jetty
+ maven-jetty-plugin
+ 6.1.10
+
+ 5
+ foo
+ 9999
+
+
+
+
+ org.apache.maven.plugins
+ maven-checkstyle-plugin
+
+ ${checkstyle.skip}
+ ${maven-checkstyle-plugin.configLocation}
+ false
+ true
+ true
+
+
+
+ run-checkstyle
+ verify
+
+ checkstyle
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-enforcer-plugin
+
+
+ enforce-property
+ generate-sources
+
+ enforce
+
+
+
+
+ java.16.home
+
+
+ Required 'java.16.home' property not defined.
+ Typically found in
+ settings.xml
+
+
+
+ true
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+
+ true
+ true
+
+ ${java.16.home}/bin/javac
+ ${jdk.version}
+
+ ${maven.compiler.target}
+ 128m
+ 512m
+ Cp1252
+
+
+
diff --git a/ModuleEquationKepler/src/test/java/org/josast/equationKepler/KeplerTest.java b/ModuleEquationKepler/src/test/java/org/josast/equationKepler/KeplerTest.java
index 48bbc44da8a597538bbba27c20cef3538d108b81..e7671556c663b649a987609e3ebe9c3e48616e14 100644
--- a/ModuleEquationKepler/src/test/java/org/josast/equationKepler/KeplerTest.java
+++ b/ModuleEquationKepler/src/test/java/org/josast/equationKepler/KeplerTest.java
@@ -3,10 +3,6 @@
*/
package org.josast.equationKepler;
-import org.josast.equationKepler.Kepler;
-import org.josast.equationKepler.KeplerFixPpoint;
-import org.josast.equationKepler.KeplerNewton;
-
import junit.framework.Assert;
import junit.framework.TestCase;
diff --git a/ModuleJourJulien/src/test/java/org/josast/util/date/GenericDateTest.java b/ModuleJourJulien/src/test/java/org/josast/util/date/GenericDateTest.java
index 5e2795f61ba1f5699f6c0d1b694c80ec009f7a22..2667beeb06af13bb8e003b47925e41568aaf4b17 100644
--- a/ModuleJourJulien/src/test/java/org/josast/util/date/GenericDateTest.java
+++ b/ModuleJourJulien/src/test/java/org/josast/util/date/GenericDateTest.java
@@ -1,7 +1,5 @@
package org.josast.util.date;
-import org.josast.util.date.GenericDate;
-
import junit.framework.TestCase;
diff --git a/ModuleJourJulien/src/test/java/org/josast/util/date/JulianDayTest.java b/ModuleJourJulien/src/test/java/org/josast/util/date/JulianDayTest.java
index e3aee2458ba843a987922fbe6212875784821529..a7af41ccd99259666e3286e64c9da67c048b0c71 100644
--- a/ModuleJourJulien/src/test/java/org/josast/util/date/JulianDayTest.java
+++ b/ModuleJourJulien/src/test/java/org/josast/util/date/JulianDayTest.java
@@ -5,8 +5,6 @@ import junit.framework.TestCase;
import java.util.GregorianCalendar;
-import org.josast.util.date.JulianDay;
-
/**
* DOCUMENT ME!
@@ -160,7 +158,7 @@ public class JulianDayTest extends TestCase {
Assert.assertEquals(27183, JulianDay.diffdate(J2, J1), 0);
// new test for bug ?
- //Le problème rencontré est que lorsque j'essais de soustraire 1940-02-29 et 1940-01-01 j'ai comme résultat 57 alors que je m'attends à avoir 59.
+ //Le probl�me rencontr� est que lorsque j'essais de soustraire 1940-02-29 et 1940-01-01 j'ai comme r�sultat 57 alors que je m'attends � avoir 59.
J1 = new GregorianCalendar(1940, GregorianCalendar.FEBRUARY, 29, 0, 0, 0);
J2 = new GregorianCalendar(1940, GregorianCalendar.JANUARY, 1, 0, 0, 0);
diff --git a/ModuleSIDS/pom.xml b/ModuleSIDS/pom.xml
index a424825f2ed5b57aa7007253a327aac5191f9a13..53ee33e929dc509bf02bd9cf67f88a4827faadbe 100644
--- a/ModuleSIDS/pom.xml
+++ b/ModuleSIDS/pom.xml
@@ -1,4 +1,4 @@
-cd ..
4.0.0
diff --git a/ModuleSoundModem/pom.xml b/ModuleSoundModem/pom.xml
index 7bb0b40268e4eeae0161ac143dd133f6a45ff0a6..164a1aa5ddfb2b0f078ccc0006fb25f188ad86b8 100644
--- a/ModuleSoundModem/pom.xml
+++ b/ModuleSoundModem/pom.xml
@@ -40,7 +40,13 @@
commons-cli
1.4
-
+
+org.junit.jupiter
+ junit-jupiter-engine
+ 5.5.2
+ test
+
+
diff --git a/ModuleSoundModem/src/main/java/org/josast/ModuleSoundModem/SoundModemClient.java b/ModuleSoundModem/src/main/java/org/josast/ModuleSoundModem/SoundModemClient.java
index 66330cd56ac4d5d728628d96867fafbebd694591..8b56c52707d508244762017272cbca008405599c 100644
--- a/ModuleSoundModem/src/main/java/org/josast/ModuleSoundModem/SoundModemClient.java
+++ b/ModuleSoundModem/src/main/java/org/josast/ModuleSoundModem/SoundModemClient.java
@@ -142,6 +142,16 @@ public class SoundModemClient {
public boolean isOpen() {
return open;
}
+ public byte[] receivedRawData() {
+ byte[] temp = receivedKissData();
+ kiss k = new kiss(temp);
+ try {
+ temp = k.toRaw();
+ } catch (KissException e) {
+ log.log(Level.SEVERE, "Extract Raw data " + e.toString());
+ }
+ return temp;
+ }
diff --git a/ModuleSoundModem/src/main/java/org/josast/ModuleSoundModem/kiss.java b/ModuleSoundModem/src/main/java/org/josast/ModuleSoundModem/kiss.java
index eba3658dd188f8f3339ec198c623317e7c796540..3f46182f00f6c3ff30e5746997575d3b3ea0228e 100644
--- a/ModuleSoundModem/src/main/java/org/josast/ModuleSoundModem/kiss.java
+++ b/ModuleSoundModem/src/main/java/org/josast/ModuleSoundModem/kiss.java
@@ -43,13 +43,13 @@ public class kiss {
rawData[cptraw++] = kissdata[i++];
} else {
if (kissdata[i + 1] == TFEND) {
- System.out.println("TFEND");
+
rawData[cptraw++] = FEND;
- i = i + 1;
+ i = i + 2;
} else if (kissdata[i + 1] == TFESC) {
- System.out.println("TFESC");
+
rawData[cptraw++] = FESC;
- i = i + 1;
+ i = i +2;
} else {
rawData[cptraw++] = kissdata[i++];
}
diff --git a/ModuleSoundModem/src/test/java/org/josast/ModuleSoundModem/kissTest.java b/ModuleSoundModem/src/test/java/org/josast/ModuleSoundModem/kissTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..2514392f46fd51de9729bdc4015bceb11d3ce8f4
--- /dev/null
+++ b/ModuleSoundModem/src/test/java/org/josast/ModuleSoundModem/kissTest.java
@@ -0,0 +1,88 @@
+package org.josast.ModuleSoundModem;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+class kissTest {
+
+ @BeforeAll
+ static void setUpBeforeClass() throws Exception {
+ }
+
+ @AfterAll
+ static void tearDownAfterClass() throws Exception {
+ }
+
+ @BeforeEach
+ void setUp() throws Exception {
+ }
+
+ @AfterEach
+ void tearDown() throws Exception {
+ }
+
+ @Test
+ void testToRaw() {
+ byte [] temp = new byte [] { (byte)0xc0, 0x4f, (byte)0xd0,
+ 0x20, (byte)0xea, 0x3a, 0x69, 0x10, (byte)0xa2, (byte)0xd8, 0x08, 0x00, 0x2b,
+ 0x30, 0x30, (byte)0xc0};
+ byte [] out = new byte [] { 0x4f, (byte)0xd0,
+ 0x20, (byte)0xea, 0x3a, 0x69, 0x10, (byte)0xa2, (byte)0xd8, 0x08, 0x00, 0x2b,
+ 0x30, 0x30, };
+ kiss k = new kiss(temp);
+ try {
+ byte [] res = k.toRaw();
+ assertArrayEquals(res,out);
+
+ } catch (KissException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ }
+ @Test
+ void testToRawFEND() {
+ byte [] temp = new byte [] { (byte)0xc0, 0x4f, (byte)0xd0,
+ 0x20, (byte)0xea, 0x3a, 0x69,(byte) 0xDB, (byte)0xDC, (byte)0xd8, 0x08, 0x00, 0x2b,
+ 0x30, 0x30, (byte)0xc0};
+ byte [] out = new byte [] { 0x4f, (byte)0xd0,
+ 0x20, (byte)0xea, 0x3a, 0x69,(byte) 0xC0, (byte)0xd8, 0x08, 0x00, 0x2b,
+ 0x30, 0x30, };
+ kiss k = new kiss(temp);
+ try {
+ byte [] res = k.toRaw();
+ assertArrayEquals(res,out);
+
+ } catch (KissException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+
+
+ }
+ @Test
+ void testToRawFESC() {
+ byte [] temp = new byte [] { (byte)0xc0, 0x4f, (byte)0xd0,
+ 0x20, (byte)0xea, 0x3a, 0x69,(byte) 0xDB, (byte)0xDD, (byte)0xd8, 0x08, 0x00, 0x2b,
+ (byte) 0xDB, (byte)0xDD, (byte)0xc0};
+ byte [] out = new byte [] { 0x4f, (byte)0xd0,
+ 0x20, (byte)0xea, 0x3a, 0x69,(byte) 0xDB, (byte)0xd8, 0x08, 0x00, 0x2b,
+ (byte) 0xDB, };
+ kiss k = new kiss(temp);
+ try {
+ byte [] res = k.toRaw();
+ assertArrayEquals(res,out);
+
+ } catch (KissException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+
+
+ }
+
+}
diff --git a/pom.xml b/pom.xml
index 4932a2bf08a060bc8546255047afeb340a190979..1009af38a4892a132b44b20dfcc892dd179e7048 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,372 +1,1020 @@
-
-
- 4.0.0
-
- org.josast
- JOSAST-parent
- 0.0.2-SNAPSHOT
- pom
- josast Parent
- https://code.electrolab.fr/xtof/josast
-
-
- UTF-8
-
- 1.8
- 1.8
- C:\Program Files\Java\jdk1.8.0_181\bin
-
-
- 3.2.0
- 3.1.0
- 3.1.0
- 3.0.0
- 3.8.1
- 3.1.1
- 3.0.0-M1
- 3.0.5
- 3.1.1
- 3.12.0
- 2.5.3
- 3.8.2
- 2.3
- 3.2.0
- 3.0.0-M2
- 3.0.0-M2
- 3.0.0
- 2.7
- ${project.basedir}/code-analysis/checkstyle.xml
- ${project.basedir}/../code-analysis/pmd.xml
- false
- false
- false
- false
-
-
-
-
- junit
- junit
- 3.8.2
- test
-
-
-
- log4j
- log4j
- 1.2.17
-
-
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-project-info-reports-plugin
- ${plugin.project-info-reports.version}
-
-
- org.apache.maven.plugins
- maven-pmd-plugin
- ${plugin.pmd-plugin.version}
-
-
- org.codehaus.mojo
- findbugs-maven-plugin
- ${plugin.findbugs-maven.version}
-
-
- org.apache.maven.plugins
- maven-checkstyle-plugin
- ${plugin.checkstyle.version}
-
-
-
-
-
- checkstyle
-
-
-
-
- checkstyle-aggregate
- false
-
- true
-
-
- checkstyle-aggregate
-
-
-
-
-
-
- org.codehaus.mojo
- versions-maven-plugin
- ${plugin.versions-maven.version}
-
-
-
-
-
-
-
-
-
- com.github.spotbugs
- spotbugs-maven-plugin
-
- -Duser.language=en
-
-
-
-
- org.apache.maven.plugins
- maven-project-info-reports-plugin
- ${plugin.project-info-reports.version}
-
-
-
-
- org.apache.maven.plugins
- maven-changelog-plugin
- ${plugin.maven-changelog.version}
-
-
-
- org.apache.maven.plugins
- maven-assembly-plugin
- ${plugin.maven-assembly.version}
-
-
- org.apache.maven.plugins
- maven-resources-plugin
- ${plugin.maven-resources.version}
-
-
- UTF-8
-
-
-
-
-
- org.apache.maven.plugins
- maven-jar-plugin
- 3.2.0
-
-
-
- org.apache.maven.plugins
- maven-source-plugin
- ${plugin.source.version}
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
- ${plugin.compiler.version}
-
-
-
- org.apache.maven.plugins
- maven-surefire-plugin
- ${plugin.surefire.version}
-
-
- org.apache.maven.plugins
- maven-failsafe-plugin
- ${plugin.failsafe.version}
-
-
-
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-pmd-plugin
- ${plugin.pmd-plugin.version}
-
-
- org.apache.maven.plugins
- maven-javadoc-plugin
- ${plugin.javadoc.version}
-
-
- org.codehaus.mojo
- versions-maven-plugin
- ${plugin.versions-maven.version}
-
-
-
-
-
-
-
- org.codehaus.mojo
- findbugs-maven-plugin
- ${plugin.findbugs-maven.version}
-
-
- org.codehaus.mojo
- taglist-maven-plugin
- 2.4
-
-
- org.apache.maven.plugins
- maven-release-plugin
- ${plugin.release.version}
-
-
- org.apache.maven.plugins
- maven-dependency-plugin
- ${plugin.dependency.version}
-
-
- org.apache.maven.plugins
- maven-deploy-plugin
- ${plugin.deploy.version}
-
-
-
-
-
- org.jacoco
- jacoco-maven-plugin
- 0.8.5
-
-
-
- prepare-agent
-
-
-
-
- report
- test
-
- report
-
-
-
-
-
- org.apache.maven.plugins
- maven-source-plugin
-
- true
-
-
-
- generate-sources
- verify
-
- jar-no-fork
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-site-plugin
- ${plugin.site.version}
-
-
-
- org.apache.maven.plugins
- maven-project-info-reports-plugin
- ${plugin.project-info-reports.version}
-
+
+
+
+
+ 4.0.0
+
+
+ org.josast
+
+
+ JOSAST-parent
+
+
+ 0.0.2-SNAPSHOT
+
+
+ pom
+
+
+ josast Parent
+
+
+ https://code.electrolab.fr/xtof/josast
+
+
+
+
+
+ UTF-8
+
+
+ 1.8
+
+
+ 1.8
+
+
+ C:\Program Files\Java\jdk1.8.0_181\bin
+
+
+
+
+
+ 3.2.0
+
+
+ 3.1.0
+
+
+ 3.1.0
+
+
+ 3.0.0
+
+
+ 3.8.1
+
+
+ 3.1.1
+
+
+ 3.0.0-M1
+
+
+ 3.0.5
+
+
+ 3.1.1
+
+
+ 3.12.0
+
+
+ 2.5.3
+
+
+ 3.8.2
+
+
+ 2.3
+
+
+ 3.2.0
+
+
+ 3.0.0-M2
+
+
+ 3.0.0-M2
+
+
+ 3.0.0
+
+
+ 2.7
+
+
+ ${project.basedir}/code-analysis/checkstyle.xml
+
+
+ ${project.basedir}/../code-analysis/pmd.xml
+
+
+ false
+
+
+ false
+
+
+ false
+
+
+ false
+
+
+
+
+
+
+
+
+
+
+
+ junit
+
+
+ junit
+
+
+ 3.8.2
+
+
+ test
+
+
+
+
+
+
+
+
+
+
+
+ log4j
+
+
+ log4j
+
+
+ 1.2.17
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ org.apache.maven.plugins
+
+
+ maven-project-info-reports-plugin
+
+
+ ${plugin.project-info-reports.version}
+
+
+
+
+
+
+
+
+ org.apache.maven.plugins
+
+
+ maven-pmd-plugin
+
+
+ ${plugin.pmd-plugin.version}
+
+
+
+
+
+
+
+
+ org.codehaus.mojo
+
+
+ findbugs-maven-plugin
+
+
+ ${plugin.findbugs-maven.version}
+
+
+
+
+
+
+
+
+ org.apache.maven.plugins
+
+
+ maven-checkstyle-plugin
+
+
+ ${plugin.checkstyle.version}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ checkstyle
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ checkstyle-aggregate
+
+
+ false
+
+
+
+
+
+ true
+
+
+
+
+
+
+
+
+ checkstyle-aggregate
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ org.codehaus.mojo
+
+
+ versions-maven-plugin
+
+
+ ${plugin.versions-maven.version}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ com.github.spotbugs
+
+
+ spotbugs-maven-plugin
+
+
+
+
+ -Duser.language=en
+
+
+
+
+
+
+
+
+
+
+
+ org.apache.maven.plugins
+
+
+ maven-project-info-reports-plugin
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ org.apache.maven.plugins
+
+
+ maven-changelog-plugin
+
+
+ ${plugin.maven-changelog.version}
+
+
+
+
+
+
+
+
+ org.apache.maven.plugins
+
+
+ maven-assembly-plugin
+
+
+ ${plugin.maven-assembly.version}
+
+
+
+
+
+
+
+
+ org.apache.maven.plugins
+
+
+ maven-resources-plugin
+
+
+ ${plugin.maven-resources.version}
+
+
+
+
+
+ UTF-8
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ org.apache.maven.plugins
+
+
+ maven-jar-plugin
+
+
+ 3.2.0
+
+
+
+
+
+
+
+
+ org.apache.maven.plugins
+
+
+ maven-source-plugin
+
+
+ ${plugin.source.version}
+
+
+
+
+
+
+
+
+ org.apache.maven.plugins
+
+
+ maven-compiler-plugin
+
+
+ ${plugin.compiler.version}
+
+
+
+
+
+
+
+
+ org.apache.maven.plugins
+
+
+ maven-surefire-plugin
+
+
+ ${plugin.surefire.version}
+
+
+
+
+
+
+
+
+ org.apache.maven.plugins
+
+
+ maven-failsafe-plugin
+
+
+ ${plugin.failsafe.version}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ org.apache.maven.plugins
+
+
+ maven-pmd-plugin
+
+
+ ${plugin.pmd-plugin.version}
+
+
+
+
+
+
+
+
+ org.apache.maven.plugins
+
+
+ maven-javadoc-plugin
+
+
+ ${plugin.javadoc.version}
+
+
+
+
+
+
+
+
+ org.codehaus.mojo
+
+
+ versions-maven-plugin
+
+
+ ${plugin.versions-maven.version}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ org.codehaus.mojo
+
+
+ findbugs-maven-plugin
+
+
+ ${plugin.findbugs-maven.version}
+
+
+
+
+
+
+
+
+ org.codehaus.mojo
+
+
+ taglist-maven-plugin
+
+
+ 2.4
+
+
+
+
+
+
+
+
+ org.apache.maven.plugins
+
+
+ maven-release-plugin
+
+
+ ${plugin.release.version}
+
+
+
+
+
+
+
+
+ org.apache.maven.plugins
+
+
+ maven-dependency-plugin
+
+
+ ${plugin.dependency.version}
+
+
+
+
+
+
+
+
+ org.apache.maven.plugins
+
+
+ maven-deploy-plugin
+
+
+ ${plugin.deploy.version}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ org.jacoco
+
+
+ jacoco-maven-plugin
+
+
+ 0.8.5
+
+
+
+
+
+
+
+
+
+
+
+ prepare-agent
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ report
+
+
+ test
+
+
+
+
+
+ report
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ org.apache.maven.plugins
+
+
+ maven-source-plugin
+
+
+
+
+
+ true
+
+
+
+
+
+
+
+
+
+
+
+ generate-sources
+
+
+ verify
+
+
+
+
+
+ jar-no-fork
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ org.apache.maven.plugins
+
+
+ maven-site-plugin
+
+
+ ${plugin.site.version}
+
+
+
+
+
+
+
+
+ org.apache.maven.plugins
+
+
+ maven-project-info-reports-plugin
+
+
+ ${plugin.project-info-reports.version}
+
+
+
+
-
- org.apache.maven.plugins
- maven-javadoc-plugin
-
-
- false
- ${javadocs.skip}
-
-
-
- org.apache.maven.plugins
- maven-surefire-plugin
-
-
+
+
+ false
+
+
+ ${javadocs.skip}
+
+
+
+
+
+
+
+
+
+
+
+ org.apache.maven.plugins
+
+
+ maven-surefire-plugin
+
+
+
+
+
+
- alphabetical
- false
- ${surefire.jvm.args}
-
-
-
- org.apache.maven.plugins
- maven-failsafe-plugin
-
-
- integration-test
-
- integration-test
-
-
-
- verify
-
- verify
-
-
-
-
-
- org.apache.maven.plugins
- maven-pmd-plugin
-
- ${pmd.skip}
- ${maven.compiler.source}
- ${project.build.sourceEncoding}
-
-
-
- /category/java/bestpractices.xml
-
-
- false
-
-
-
- verify
-
- check
- cpd-check
-
-
-
-
-
- org.mortbay.jetty
- maven-jetty-plugin
- 6.1.26
-
- 5
- foo
- 9999
-
-
-
-
-
-
-
-
-
+
+
+ alphabetical
+
+
+ false
+
+
+ ${surefire.jvm.args}
+
+
+
+
+
+
+
+
+
+
+
+ org.apache.maven.plugins
+
+
+ maven-failsafe-plugin
+
+
+
+
+
+
+
+
+ integration-test
+
+
+
+
+
+ integration-test
+
+
+
+
+
+
+
+
+
+
+
+ verify
+
+
+
+
+
+ verify
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ org.apache.maven.plugins
+
+
+ maven-pmd-plugin
+
+
+
+
+
+ ${pmd.skip}
+
+
+ ${maven.compiler.source}
+
+
+ ${project.build.sourceEncoding}
+
+
+
+
+
+
+
+
+
+
+
+ /category/java/bestpractices.xml
+
+
+
+
+
+
+
+
+ false
+
+
+
+
+
+
+
+
+
+
+
+ verify
+
+
+
+
+
+ check
+
+
+ cpd-check
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ org.mortbay.jetty
+
+
+ maven-jetty-plugin
+
+
+ 6.1.26
+
+
+
+
+
+ 5
+
+
+ foo
+
+
+ 9999
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ModuleAmicalsat
+
+
+ AplicationAmicalsat
+
+
+
-