mirror
/
codec2_talkie
kopia lustrzana https://github.com/sh123/codec2_talkie
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Encode altitude into Mic-E if enabled

legacy
sh123 2022-07-25 21:03:49 +03:00
rodzic 83f7428366
commit 6422c0cb76
2 zmienionych plików z 19 dodań i 7 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

24
codec2talkie/src/main/java/com/radio/codec2talkie/protocol/aprs/AprsDataPositionReportMicE.java
Wyświetl plik

@ -1,7 +1,5 @@
package com.radio.codec2talkie.protocol.aprs;
import android.util.Log;
import com.radio.codec2talkie.protocol.aprs.tools.AprsTools;
import com.radio.codec2talkie.protocol.message.TextMessage;
import com.radio.codec2talkie.protocol.position.Position;
@ -85,6 +83,18 @@ public class AprsDataPositionReportMicE implements AprsData {
buffer.put(symbol[1]);
buffer.put(symbol[0]);
// encode altitude if enabled
if (position.isAltitudeEnabled && position.hasAltitude) {
int datumAltitude = (int) (10000 + position.altitudeMeters);
int a1 = 33 + (datumAltitude / (91 * 91));
buffer.put((byte)a1);
int a2 = 33 + ((datumAltitude % (91 * 91)) / 91);
buffer.put((byte)a2);
int a3 = 33 + ((datumAltitude % (91 * 91)) % 91);
buffer.put((byte)a3);
buffer.put((byte)'}');
}
// comment
buffer.put(position.comment.getBytes());
@ -207,8 +217,13 @@ public class AprsDataPositionReportMicE implements AprsData {
// read symbol table + symbol code
_position.symbolCode = String.format(Locale.US, "%c%c", infoData[7], infoData[6]);
// read comment until the end
_position.comment = new String(Arrays.copyOfRange(infoData, 8, infoData.length));
if (infoData.length > 11 && infoData[11] == '}') {
_position.hasAltitude = true;
_position.altitudeMeters = ((infoData[8] - 33) * 91 * 91 + (infoData[9] - 33) * 91 + (infoData[10] - 33)) - 10000;
_position.comment = new String(Arrays.copyOfRange(infoData, 12, infoData.length));
} else {
_position.comment = new String(Arrays.copyOfRange(infoData, 8, infoData.length));
}
_position.maidenHead = UnitTools.decimalToMaidenhead(_position.latitude, _position.longitude);
_isValid = true;
@ -224,7 +239,6 @@ public class AprsDataPositionReportMicE implements AprsData {
return _isValid;
}
private String generateDestinationCallsign(Position position) {
byte[] latitude = AprsTools.applyPrivacyOnUncompressedNmeaCoordinate(

2
codec2talkie/src/main/java/com/radio/codec2talkie/transport/UsbSerial.java
Wyświetl plik

@ -1,7 +1,5 @@
package com.radio.codec2talkie.transport;
import android.util.Log;
import com.hoho.android.usbserial.driver.SerialTimeoutException;
import com.hoho.android.usbserial.driver.UsbSerialPort;