add ac mode

Author: csyangbinbin

ac_decoder.cpp

@@ -96,7 +96,7 @@ int ac_decoder::get_ac_type(unsigned short modeac )
 		dvalue==7)
 		)
 	{
-		unsigned int counted =get_mode_count_stat(a_mode_stat , modeac);
+		 int counted =get_mode_count_stat(a_mode_stat , modeac);
 		inc_mode_stat(a_mode_stat,modeac);
 		if(counted ==-1 || counted	>MIN_AC_COUNT)
 		{
@@ -108,7 +108,7 @@ int ac_decoder::get_ac_type(unsigned short modeac )
 		}
 	}
 
-	unsigned int counted =get_mode_count_stat(na_mode_stat ,modeac);
+	 int counted =get_mode_count_stat(na_mode_stat ,modeac);
 	if(counted >MIN_AC_COUNT)
 	{
 		int altitude = AC_INVALID_ALTITUDE ; 

mlat/client/coordinator.py

@@ -149,7 +149,12 @@ def update_aircraft(self, now):
             ac = self.aircraft.get(icao)
             if not ac:
                 ac = Aircraft(icao)
-                ac.requested = (icao in self.requested_traffic)
+
+                if(icao>0xFF0000):
+                    ac.requested = (icao in self.requested_modeac)
+                else:
+                    ac.requested = (icao in self.requested_traffic)
+
                 ac.rate_measurement_start = now
                 self.aircraft[icao] = ac
 
@@ -432,6 +437,22 @@ def received_df17(self, message, now):
             self.server.send_sync(ac.even_message, ac.odd_message)
 
     def received_modeac(self, message, now):
+        #AC Mode
+        ac = self.aircraft.get(message.address)
+        if not ac:
+            ac = Aircraft(message.address)
+            ac.requested = (message.address in self.requested_modeac)
+            ac.messages += 1
+            ac.last_message_time = now
+            ac.rate_measurement_start = now
+            self.aircraft[message.address] = ac
+            return  # wait for more messages
+
+        ac.messages += 1
+        ac.last_message_time = now
+        if ac.messages < 10:
+            return
+
         if message.address not in self.requested_modeac:
             return
 

mlat/client/jsonclient.py

@@ -36,7 +36,7 @@
 from mlat.client.util import log, monotonic_time
 from mlat.client.stats import global_stats
 
-DEBUG = False
+DEBUG = True
 
 # UDP protocol submessages
 

modes_message.c

@@ -386,22 +386,23 @@ static int decode(modesmessage *self)
     Py_CLEAR(self->altitude);
 
     if (self->datalen == 2) {
-
-    unsigned char ac[2] ;
-    memcpy(ac , self->data , 2);
-
-    ac_decode_result_t  ac_ret  = ac_decode(ac) ;
-    if(ac_ret.type == AC_MODE_A)
-    {
-        self->df = DF_MODEAC;
-        int ac_fix_icao = 0x00FF0000 | ac_ret.squawk ;
-        self->address = PyLong_FromLong(ac_fix_icao) ;
-        self->valid = 1;
-        printf("A Mode:%06X\r\n" ,self->address );
-        return 0;
-    }
-    else
-        return -1;
+    //AC Message decode , A Mode Start With 0xFFXXXX
+
+        unsigned char ac[2] ;
+        memcpy(ac , self->data , 2);
+
+        ac_decode_result_t  ac_ret  = ac_decode(ac) ;
+        if(ac_ret.type == AC_MODE_A)
+        {
+            self->df = DF_MODEAC;
+            int ac_fix_icao = 0x00FF0000 | ac_ret.squawk ;
+            self->address = PyLong_FromLong(ac_fix_icao) ;
+            self->valid = 1;
+            printf("A Mode:%06X\r\n" ,ac_fix_icao);
+            return 0;
+        }
+        else
+            return -1;
     }
 
     self->df = (self->data[0] >> 3) & 31;

modes_reader.c

@@ -1384,11 +1384,20 @@ static int filter_message(modesreader *self, PyObject *o)
     modesmessage *message = (modesmessage *)o;
 
     if (message->df == DF_MODEAC) {
+        if (self->seen != NULL && self->seen != Py_None)
+         {
+            if (PySet_Add(self->seen, message->address) < 0) {
+                printf("DF_MODEAC PySet_Add Failed!\r\n") ;
+
+                return -1;
+            }
+         }
+
+
         if (self->modeac_filter != NULL && self->modeac_filter != Py_None) {
             return PySequence_Contains(self->modeac_filter, message->address);
         }
-
-        return 1;
+        return 0;
     }
 
     if (!message->valid) {

nogps.sh

@@ -0,0 +1 @@
+mlat-client --input-type sbs --input-connect 10.1.1.172:10001 --server 127.0.0.1:12590 --lon 121.429367 --lat 37.525049 --alt 35 --user SHDL