fix signal emitted via binCraft

Author: wiedehopf

globe_index.c

@@ -893,6 +893,10 @@ static int load_aircraft(char **p, char *end, int64_t now, threadpool_buffer_t *
     if (a->seen > now + 1 * MINUTES)
         a->seen = now - 26 * HOURS;
 
+    if (a->lastSignalTimestamp > now) {
+        a->lastSignalTimestamp = 0;
+    }
+
     if (a->globe_index > GLOBE_MAX_INDEX)
         a->globe_index = -5;
 

json_out.c

@@ -50,23 +50,6 @@ static const char *jsonEscapeString(const char *str, char *buf, int len) {
     return buf;
 }
 
-static inline double getSignal(struct aircraft *a) {
-    double sum;
-    if (likely(a->signalNext >= 8)) {
-        sum = a->signalLevel[0] + a->signalLevel[1] + a->signalLevel[2] + a->signalLevel[3] +
-            a->signalLevel[4] + a->signalLevel[5] + a->signalLevel[6] + a->signalLevel[7];
-    } else if (a->signalNext >= 4) {
-        sum = 0;
-        for (uint32_t i = 0; i < a->signalNext; i++) {
-            sum += a->signalLevel[i];
-        }
-    } else {
-        sum = 0;
-    }
-
-    return 10 * log10(sum / 8 + 1.125e-5);
-}
-
 static char *append_flags(char *p, char *end, struct aircraft *a, datasource_t source) {
     p = safe_snprintf(p, end, "[");
 

track.c

@@ -1973,7 +1973,7 @@ struct aircraft *trackUpdateFromMessage(struct modesMessage *mm) {
     } else {
         //fprintf(stderr, "signal zero: %06x; %s\n", a->addr, source_string(mm->source));
         // if we haven't received a message with signal level for a bit, set it to zero
-        if (now - a->lastSignalTimestamp > 15 * SECONDS) {
+        if (now - a->lastSignalTimestamp > 15 * SECONDS && a->signalNext > 0) {
             a->signalNext = 0;
             //fprintf(stderr, "no_sig_thresh: %06x; %d; %d\n", a->addr, (int) a->no_signal_count, (int) a->signalNext);
         }

track.h

@@ -752,13 +752,32 @@ static inline int bogus_lat_lon(double lat, double lon) {
         return 1;
     return 0;
 }
+
+static inline float signalRaw(struct aircraft *a) {
+    float sum;
+    if (a->signalNext >= 8) {
+        sum = a->signalLevel[0] + a->signalLevel[1] + a->signalLevel[2] + a->signalLevel[3] +
+            a->signalLevel[4] + a->signalLevel[5] + a->signalLevel[6] + a->signalLevel[7];
+    } else if (a->signalNext >= 4) {
+        sum = 0;
+        for (uint32_t i = 0; i < a->signalNext; i++) {
+            sum += a->signalLevel[i];
+        }
+    } else {
+        sum = 0;
+    }
+    return sum / 8.0f;
+}
+
+static inline float getSignal(struct aircraft *a) {
+    return 10.0f * log10f(signalRaw(a) + 1.125e-5f);
+}
+
 static inline int get8bitSignal(struct aircraft *a) {
-    double signal = (a->signalLevel[0] + a->signalLevel[1] + a->signalLevel[2] + a->signalLevel[3] +
-            a->signalLevel[4] + a->signalLevel[5] + a->signalLevel[6] + a->signalLevel[7]) / 8.0;
-    signal = sqrt(signal) * 255.0;
-    if (signal > 255) signal = 255;
-    if (signal < 1 && signal > 0) signal = 1;
-    return (int) nearbyint(signal);
+    float signal = sqrtf(signalRaw(a)) * 255.0f;
+    if (signal > 255.0f) signal = 255.0f;
+    if (signal < 1.0f && signal > 0.0f) signal = 1.0f;
+    return (int) nearbyintf(signal);
 }
 
 static inline const char *nonIcaoSpace(struct aircraft *a) {