kopia lustrzana https://github.com/bertrik/ttnhabbridge
Replace Locale.US by Locale.ROOT
rodzic
4539a426b2
commit
4f9984dd27
|
@ -80,7 +80,7 @@ public final class CayenneItem {
|
|||
|
||||
@Override
|
||||
public String toString() {
|
||||
return String.format(Locale.US, "{chan=%d,type=%s,value=%s}", channel, type, Arrays.toString(format()));
|
||||
return String.format(Locale.ROOT, "{chan=%d,type=%s,value=%s}", channel, type, Arrays.toString(format()));
|
||||
}
|
||||
|
||||
public void encode(ByteBuffer bb) throws CayenneException {
|
||||
|
|
|
@ -35,7 +35,7 @@ public final class FloatFormatter extends BaseFormatter {
|
|||
for (double d = scale; d < 1.0; d *= 10) {
|
||||
decimals++;
|
||||
}
|
||||
return String.format(Locale.US, "%%.%df", decimals);
|
||||
return String.format(Locale.ROOT, "%%.%df", decimals);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -51,7 +51,7 @@ public final class FloatFormatter extends BaseFormatter {
|
|||
public String[] format(Double[] values) {
|
||||
final String[] formatted = new String[length];
|
||||
for (int i = 0; i < length; i++) {
|
||||
formatted[i] = String.format(Locale.US, formatString, values[i]);
|
||||
formatted[i] = String.format(Locale.ROOT, formatString, values[i]);
|
||||
}
|
||||
return formatted;
|
||||
}
|
||||
|
|
|
@ -22,9 +22,9 @@ public final class GpsFormatter extends BaseFormatter {
|
|||
@Override
|
||||
public String[] format(Double[] values) {
|
||||
return new String[] {
|
||||
String.format(Locale.US, "%.4f", values[0]),
|
||||
String.format(Locale.US, "%.4f", values[1]),
|
||||
String.format(Locale.US, "%.2f", values[2])
|
||||
String.format(Locale.ROOT, "%.4f", values[0]),
|
||||
String.format(Locale.ROOT, "%.4f", values[1]),
|
||||
String.format(Locale.ROOT, "%.2f", values[2])
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
@ -89,8 +89,8 @@ public final class PayloadDecoder {
|
|||
final double altitude = sodaq.getAltitude();
|
||||
final Instant instant = Instant.ofEpochSecond(sodaq.getTimeStamp());
|
||||
final Sentence sentence = new Sentence(callSign, counter, instant, latitude, longitude, altitude);
|
||||
sentence.addField(String.format(Locale.US, "%.0f", sodaq.getBoardTemp()));
|
||||
sentence.addField(String.format(Locale.US, "%.2f", sodaq.getBattVoltage()));
|
||||
sentence.addField(String.format(Locale.ROOT, "%.0f", sodaq.getBoardTemp()));
|
||||
sentence.addField(String.format(Locale.ROOT, "%.2f", sodaq.getBattVoltage()));
|
||||
return sentence;
|
||||
} catch (BufferUnderflowException e) {
|
||||
throw new DecodeException("Error decoding sodaqone", e);
|
||||
|
@ -119,8 +119,8 @@ public final class PayloadDecoder {
|
|||
final JsonNode tempNode = fields.get("temp");
|
||||
final JsonNode vccNode = fields.get("vcc");
|
||||
if ((tempNode != null) && (vccNode != null)) {
|
||||
sentence.addField(String.format(Locale.US, "%.1f", tempNode.doubleValue()));
|
||||
sentence.addField(String.format(Locale.US, "%.3f", vccNode.doubleValue()));
|
||||
sentence.addField(String.format(Locale.ROOT, "%.1f", tempNode.doubleValue()));
|
||||
sentence.addField(String.format(Locale.ROOT, "%.3f", vccNode.doubleValue()));
|
||||
}
|
||||
return sentence;
|
||||
} catch (RuntimeException e) {
|
||||
|
|
|
@ -61,12 +61,12 @@ public final class Sentence {
|
|||
public String format() {
|
||||
// format time
|
||||
final LocalDateTime local = LocalDateTime.ofInstant(time, ZoneId.of("UTC"));
|
||||
final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("HH:mm:ss", Locale.US);
|
||||
final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("HH:mm:ss", Locale.ROOT);
|
||||
final String timeString = local.format(formatter);
|
||||
|
||||
// format basic string
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(String.format(Locale.US, "%s,%d,%s,%.6f,%.6f,%.1f", callSign, id, timeString, latitude, longitude,
|
||||
sb.append(String.format(Locale.ROOT, "%s,%d,%s,%.6f,%.6f,%.1f", callSign, id, timeString, latitude, longitude,
|
||||
altitude));
|
||||
for (String s : extras) {
|
||||
sb.append(',');
|
||||
|
@ -77,7 +77,7 @@ public final class Sentence {
|
|||
// append header, checksum, etc
|
||||
final byte[] bytes = basic.getBytes(StandardCharsets.US_ASCII);
|
||||
final int crcValue = crc16.calculate(bytes, 0xFFFF);
|
||||
return String.format(Locale.US, "$$%s*%04X\n", basic, crcValue);
|
||||
return String.format(Locale.ROOT, "$$%s*%04X\n", basic, crcValue);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -115,7 +115,7 @@ public final class SodaqOnePayload {
|
|||
|
||||
@Override
|
||||
public String toString() {
|
||||
return String.format(Locale.US, "ts=%d,batt=%.2f,temp=%.0f,lat=%f,lon=%f,alt=%.0f", timeStamp, battVoltage,
|
||||
return String.format(Locale.ROOT, "ts=%d,batt=%.2f,temp=%.0f,lat=%f,lon=%f,alt=%.0f", timeStamp, battVoltage,
|
||||
boardTemp, latitude, longitude, altitude);
|
||||
}
|
||||
|
||||
|
|
|
@ -155,7 +155,7 @@ public final class HabitatUploader {
|
|||
private String createDocId(byte[] bytes) {
|
||||
final byte[] base64 = base64Encoder.encode(bytes);
|
||||
final byte[] hash = sha256.digest(base64);
|
||||
return DatatypeConverter.printHexBinary(hash).toLowerCase(Locale.US);
|
||||
return DatatypeConverter.printHexBinary(hash).toLowerCase(Locale.ROOT);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
Ładowanie…
Reference in New Issue