Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions android/app/src/main/java/com/openipc/decoder/Decoder.java
Original file line number Diff line number Diff line change
Expand Up @@ -1558,6 +1558,8 @@ private Map<String, Object> debugState() {
// The toy drone's protocol counters (#187)
Map<String, Object> ufo = rtspClient != null ? rtspClient.flowUfoStats() : null;
if (ufo != null) single.put("flowufo", ufo);
Map<String, Object> jl = rtspClient != null ? rtspClient.jieliStats() : null;
if (jl != null) single.put("jieli", jl);
Map<String, Object> hb = rtspClient != null ? rtspClient.heartbeatStats() : null;
if (hb != null) single.put("heartbeat", hb);
m.put("single", single);
Expand Down Expand Up @@ -1600,6 +1602,8 @@ private Map<String, Object> debugState() {
c.put("audio", i == quadAudio);
Map<String, Object> ufo = cell.flowUfoStats();
if (ufo != null) c.put("flowufo", ufo);
Map<String, Object> jl = cell.jieliStats();
if (jl != null) c.put("jieli", jl);
Map<String, Object> hb = cell.heartbeatStats();
if (hb != null) c.put("heartbeat", hb);
}
Expand Down Expand Up @@ -1670,6 +1674,7 @@ private String slotTransport(int i, String url) {
if (RtpListener.Url.matches(url)) return "UDP listen";
if (HttpMjpeg.matches(url)) return "HTTP";
if (FlowUfo.Url.matches(url)) return "FLOW-UFO UDP";
if (Jieli.Url.matches(url)) return "Jieli RTP";
Transport.Mode m = StreamProbe.probeMode(mTransports[i]);
return "check over " + (m == Transport.Mode.MULTICAST ? "multicast" : m.name());
}
Expand Down
8 changes: 4 additions & 4 deletions android/app/src/main/java/com/openipc/decoder/FlowUfo.java
Original file line number Diff line number Diff line change
Expand Up @@ -635,19 +635,19 @@ static String subnetHint(InetAddress target, List<InetAddress> local) {
+ " flowufo://192.168.169.1");
}
if (on80 && !on169 && !on1) {
sentence(parts, "Toys on 192.168.80.x (HF_ Wi-Fi) use another protocol, not supported"
+ " yet");
sentence(parts, "This phone is on 192.168.80.x (HF_ Wi-Fi), a Jieli toy: try"
+ " jieli://192.168.80.1");
}
return parts.length() > 0 ? parts.toString() : null;
}

private static void sentence(StringBuilder sb, String s) {
static void sentence(StringBuilder sb, String s) {
if (sb.length() > 0) sb.append(". ");
sb.append(s);
}

/** {@code a} is in 192.168.{@code third}.0/24. */
private static boolean in24(InetAddress a, int third) {
static boolean in24(InetAddress a, int third) {
if (!(a instanceof Inet4Address)) return false;
byte[] b = a.getAddress();
return (b[0] & 0xFF) == 192 && (b[1] & 0xFF) == 168 && (b[2] & 0xFF) == third;
Expand Down
Loading
Loading