Skip to content
Snippets Groups Projects
Commit 8f26dff4 authored by chris's avatar chris
Browse files

fix : Attention : traiter incohérence sur Spino

parent a14b0cb6
No related branches found
No related tags found
1 merge request!37WIP: Resolve "New application for Spino"
......@@ -24,6 +24,7 @@
<ModuleSIDS.version>${josast.version}</ModuleSIDS.version>
<JavaFx.version>11.0.2</JavaFx.version>
<josast-version> 0.0.2</josast-version>
<kaitai-struct-runtime-version>0.10</kaitai-struct-runtime-version>
</properties>
<dependencies>
......@@ -96,10 +97,10 @@
<version>0.0.2</version>
</dependency>
<dependency>
<dependency>
<groupId>io.kaitai</groupId>
<artifactId>kaitai-struct-runtime</artifactId>
<version>0.10</version>
<version>${kaitai-struct-runtime-version}</version>
</dependency>
<dependency>
<groupId>name.valery1707.kaitai</groupId>
......
......@@ -27,7 +27,11 @@
</dependency>
<dependency>
<groupId>org.josast</groupId>
<artifactId>ModuleUtil</artifactId>
<version>0.0.2</version>
</dependency>
<dependency>
<groupId>org.josast</groupId>
......
......@@ -62,7 +62,7 @@ import org.josast.spino.commande.CommandeMailBoxAllMessage;
import org.josast.spino.commande.CommandeMailboxGetLastMessage;
import org.josast.spino.serial.SerialConfiguration;
import org.josast.spino.serial.SerialPortDriver;
import org.josast.spino.test.TestBasicCommand;
import org.josast.telemetry.DataTelemetry;
import org.josast.telemetry.api.InterfaceAnalyseData;
import org.josast.telemetry.api.TelemetryDataInterface;
......@@ -588,7 +588,7 @@ public class PrimaryController {
// ssendData(cmdHexa, cmdHexa.length);
}
byte[] cmdHexa = TestBasicCommand.hexStringToByteArray(headerH + cmd.tohex());
byte[] cmdHexa = hexStringToByteArray(headerH + cmd.tohex());
// OutputStream outputStream = this.socket.getOutputStream();
socket.sendData(cmdHexa, cmdHexa.length);
......@@ -634,7 +634,7 @@ public class PrimaryController {
// ssendData(cmdHexa, cmdHexa.length);
}
byte[] cmdHexa = TestBasicCommand.hexStringToByteArray(headerH + cmd.tohex());
byte[] cmdHexa = hexStringToByteArray(headerH + cmd.tohex());
// OutputStream outputStream = this.socket.getOutputStream();
socket.sendData(cmdHexa, cmdHexa.length);
......@@ -874,7 +874,7 @@ public class PrimaryController {
new AX25header(destinationDigi.getBytes(), (byte) 3, senderCallsign.getBytes(), (byte) 1);
String headerHd = headerDIgi.tohex();
CommandeDigipeaterMessage dp = new CommandeDigipeaterMessage(TextFieldMessage.getText());
byte[] messageHexa = TestBasicCommand.hexStringToByteArray(headerHd + dp.tohex());
byte[] messageHexa = hexStringToByteArray(headerHd + dp.tohex());
socket.sendData(messageHexa, messageHexa.length);
// Wfile.writeTofile(cmdHexa, cmdHexa.length, "ENVOI_MSG_DIGI");
System.out.println("taille MESSAGE DIGI 2 " + messageHexa.length);
......@@ -907,7 +907,7 @@ public class PrimaryController {
CommandeMailBoxAddMessage cmd =
new CommandeMailBoxAddMessage(TextFieldMailboxMessage.getText());
byte[] cmdConfig = TestBasicCommand.hexStringToByteArray(headerHd + cmd.tohex());
byte[] cmdConfig = hexStringToByteArray(headerHd + cmd.tohex());
socket.sendData(cmdConfig, cmdConfig.length);
}
......@@ -927,7 +927,7 @@ public class PrimaryController {
String headerHd = headerDIgi.tohex();
System.out.println("CMD_MAILBOX_ALL_MESSAGE");
CommandeMailBoxAllMessage cmd = new CommandeMailBoxAllMessage(senderCallsign.getBytes());
byte[] cmdConfig = TestBasicCommand.hexStringToByteArray(headerHd + cmd.tohex());
byte[] cmdConfig = hexStringToByteArray(headerHd + cmd.tohex());
socket.sendData(cmdConfig, cmdConfig.length);
}
......@@ -949,7 +949,7 @@ public class PrimaryController {
System.out.println("CMD_MAILBOX_GET_LAST_MSG");
CommandeMailboxGetLastMessage cmd =
new CommandeMailboxGetLastMessage(Commande.CMD_MAILBOX_GET_LAST_MSG, senderCallsign);
byte[] cmdConfig = TestBasicCommand.hexStringToByteArray(headerHd + cmd.tohex());
byte[] cmdConfig = hexStringToByteArray(headerHd + cmd.tohex());
socket.sendData(cmdConfig, cmdConfig.length);
}
......@@ -970,7 +970,7 @@ public class PrimaryController {
System.out.println("MAILBOX GET ALL Mailbox ");
CommandeGeneric cmd = new CommandeGeneric(Commande.CMD_MAILBOX_GET_LIST_BOX);
byte[] cmdConfig = TestBasicCommand.hexStringToByteArray(headerHd + cmd.tohex());
byte[] cmdConfig = hexStringToByteArray(headerHd + cmd.tohex());
socket.sendData(cmdConfig, cmdConfig.length);
}
......
......@@ -10,7 +10,7 @@ import java.util.Vector;
import java.util.concurrent.BlockingQueue;
import java.util.logging.Logger;
import org.josast.ApplicationSpinoControlCenter.ManageDataFile;
import org.avmdti.josast.util.ManageDataFile;
public class tcpConnection {
......
......@@ -22,7 +22,7 @@
<ModuleConfig.version>${josast.version}</ModuleConfig.version>
<ModuleAmicalsat.version>${josast.version}</ModuleAmicalsat.version>
<ModuleSIDS.version>${josast.version}</ModuleSIDS.version>
<JavaFx.version>18-ea+10</JavaFx.version>
<JavaFx.version>13</JavaFx.version>
</properties>
<dependencies>
......
......@@ -8,8 +8,8 @@ import java.nio.file.Files;
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.KissException;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll;
......
......@@ -17,8 +17,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<!--
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
......
......@@ -21,7 +21,7 @@ public class ax25Frame extends AFrame {
public ax25Frame(Ax25Frame o) {
ax25Header = o.ax25Header();
payloadvalue = o.payloadvalue();
// payloadvalue = o.payloadvalue();
}
public String getTelemetryName() {
......
......@@ -10,4 +10,56 @@ A strong refactoring of theses artefacts has been started.
This repositories is the new referential for the project.
Pour en savoir plus sur le projet consultez le [Wiki](https://code.electrolab.fr/xtof/josast/wikis/home)
| Name | Status | Comments |
|------|--------|----------|
| ApplicationAmicalsat | Superseded | Replaced by KissTool |
| ApplicationAmicalsatCli | Superseded | Replaced by KissTool |
| ApplicationCubesatSim | Stable | |
| ApplicationDatabaseSynchronisation | Experimental | |
| ApplicationEntrySatDecoder | End of Support | |
| ApplicationJMultisat | Experimental | |
| ApplicationKissTool | Stable | |
| ApplicationSatelliteDatabaseCli | Experimental | |
| ApplicationSerial | Deprecated | |
| ApplicationSpinoControlCenter | Maturing | |
| ApplicationUVSQsatDecoder | Superseded | Replaced by KissTool |
| ModuleAPRSIS | Stable | |
| ModuleAmicalsat | End of Support | |
| ModuleAutomation | Maturing | |
| ModuleConfig | Stable | |
| ModuleCubesatSim | Stable | |
| ModuleDriverSerial | Stable | |
| ModuleEntrySatTelemetry | End of Support | |
| ModuleEquationKepler | Stable | |
| ModuleInflux | Stable | |
| ModuleInspireSat7 | Stable | |
| ModuleJosastGeneric | Maturing | |
| ModuleJourJulien | Stable | |
| ModuleSIDS | Stable | |
| ModuleSatelliteDatabase | Stable | |
| ModuleSound | Stable | |
| ModuleSoundModem | Stable | |
| ModuleSpino | Stable | |
| ModuleUVSQsatTelemetry | Stable | |
| ModuleUtil | Stable | |
| ToolGenaratePOJOFromKSY | Experimental | |
| ToolsXSDtojava | Experimental | |
| WebAmsatFMVPVue | Stable | |
| WebAmsatMVP | Maturing | |
**Stable** : The module or application is reliable, well tested and ready for production use.
**Maturing**: The module or application is at an advanced stage of development, but may still require further enhancements or testing before being considered stable.
**Experimental**: The module or application is in the testing or early development phase. It may be unstable or subject to significant changes.
**Deprecated**: The module or application is obsolete and should no longer be used. It will probably be removed in future versions.
**End of Support**: Support for this module or application has ended. It will no longer receive updates or bug fixes.
**Superseded**: The module or application has been replaced by a newer version or technology, as indicated in the comments.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment