refactoring

Author: jvde-github

Application/Receiver.cpp

@@ -423,8 +423,8 @@ void OutputScreen::connect(Receiver &r)
 			if (r.OutputGPS(j).canConnect(((StreamIn<AIS::GPS>)msg2screen).getGroupsIn()))
 				r.OutputGPS(j).Connect((StreamIn<AIS::GPS> *)&msg2screen);
 
-			if (r.OutputADSB(j).canConnect(((StreamIn<JSON::JSON>)msg2screen).getGroupsIn()))
-				r.OutputADSB(j).Connect((StreamIn<JSON::JSON> *)&msg2screen);
+			if (r.OutputADSB(j).canConnect(((StreamIn<Plane::ADSB>)msg2screen).getGroupsIn()))
+				r.OutputADSB(j).Connect((StreamIn<Plane::ADSB> *)&msg2screen);
 		}
 
 		msg2screen.setDetail(level);
@@ -438,9 +438,6 @@ void OutputScreen::connect(Receiver &r)
 
 			if (r.OutputGPS(j).canConnect(((StreamIn<AIS::GPS>)json2screen).getGroupsIn()))
 				r.OutputGPS(j).Connect((StreamIn<AIS::GPS> *)&json2screen);
-
-			if (r.OutputADSB(j).canConnect(((StreamIn<JSON::JSON>)json2screen).getGroupsIn()))
-				r.OutputADSB(j).Connect((StreamIn<JSON::JSON> *)&json2screen);
 		}
 
 		if (level == MessageFormat::JSON_SPARSE)

Application/Receiver.h

@@ -160,7 +160,7 @@ class Receiver {
 	// Receiver output are Messages or JSON
 	Connection<AIS::Message>& Output(int i) { return models[i]->Output().out; }
 	Connection<AIS::GPS>& OutputGPS(int i) { return models[i]->OutputGPS().out; }
-	Connection<JSON::JSON>& OutputADSB(int i) { return models[i]->OutputADSB().out; }
+	Connection<Plane::ADSB>& OutputADSB(int i) { return models[i]->OutputADSB().out; }
 
 	Connection<JSON::JSON>& OutputJSON(int i) { return jsonais[i].out; }
 

Application/WebViewer.cpp

@@ -313,7 +313,7 @@ void WebViewer::connect(Receiver &r)
 
 			r.OutputJSON(j).Connect((StreamIn<JSON::JSON> *)&ships);
 			r.OutputGPS(j).Connect((StreamIn<AIS::GPS> *)&ships);
-			r.OutputADSB(j).Connect((StreamIn<JSON::JSON> *)&planes);
+			//r.OutputADSB(j).Connect((StreamIn<JSON::JSON> *)&planes);
 
 			*r.device >> raw_counter;
 		}

CMakeLists.txt

@@ -789,7 +789,7 @@ set(CPP
     Device/FileRAW.cpp Device/HACKRF.cpp Device/UDP.cpp Device/RTLTCP.cpp Device/ZMQ.cpp Device/SoapySDR.cpp Device/SpyServer.cpp Library/Message.cpp Library/NMEA.cpp
     Library/Utilities.cpp Library/TCP.cpp JSON/JSON.cpp IO/Network.cpp IO/HTTPServer.cpp JSON/StringBuilder.cpp JSON/Parser.cpp Library/Logger.cpp
     Device/AIRSPY.cpp Device/Serial.cpp IO/HTTPClient.cpp Application/WebDB.cpp
-    DSP/DSP.cpp Device/N2KsktCAN.cpp Library/Basestation.cpp Library/Beast.cpp
+    DSP/DSP.cpp Device/N2KsktCAN.cpp Library/Basestation.cpp Library/Beast.cpp Library/ADSB.cpp
     IO/MsgOut.cpp IO/N2KStream.cpp Library/N2K.cpp IO/N2KInterface.cpp Protocol/Protocol.cpp)
 
 set(HEADER

DSP/Model.h

@@ -73,18 +73,18 @@ namespace AIS
 
 	// idea is to avoid that message threads from different devices cause issues downstream (e.g. with sending UDP or updating the database).
 	// can also be done further downstream
-	class MessageMutexADSB : public SimpleStreamInOut<JSON::JSON, JSON::JSON>
+	class MessageMutexADSB : public SimpleStreamInOut<Plane::ADSB, Plane::ADSB>
 	{
 		static std::mutex mtx;
 
 	public:
 		virtual ~MessageMutexADSB() {}
-		virtual void Receive(const JSON::JSON *data, int len, TAG &tag)
+		virtual void Receive(const Plane::ADSB *data, int len, TAG &tag)
 		{
 			std::lock_guard<std::mutex> lock(mtx);
 			Send(data, len, tag);
 		}
-		virtual void Receive(JSON::JSON *data, int len, TAG &tag)
+		virtual void Receive(Plane::ADSB *data, int len, TAG &tag)
 		{
 			std::lock_guard<std::mutex> lock(mtx);
 			Send(data, len, tag);
@@ -114,7 +114,7 @@ namespace AIS
 
 		StreamOut<Message> &Output() { return output; }
 		StreamOut<GPS> &OutputGPS() { return output_gps; }
-		StreamOut<JSON::JSON> &OutputADSB() { return outputADSB; }
+		StreamOut<Plane::ADSB> &OutputADSB() { return outputADSB; }
 
 		void setName(std::string s) { name = s; }
 		std::string getName() { return name; }

IO/MsgOut.cpp

@@ -101,21 +101,11 @@ namespace IO
 		}
 	}
 
-	void MessageToScreen::Receive(const JSON::JSON *data, int len, TAG &tag)
+	void MessageToScreen::Receive(const Plane::ADSB *data, int len, TAG &tag)
 	{
 		for (int i = 0; i < len; i++)
 		{
-			if (filter.include(*(AIS::Message *)data[i].binary))
-			{
-				for (const auto &p : data[i].getProperties())
-					if (p.Key() == AIS::KEY_RAW_MESSAGE)
-					{
-						if(level == MessageFormat::JSON_NMEA)
-							std::cout << "{\"raw_message\":\"" <<  p.Get().getString() << "\"}" << std::endl;
-						else
-							std::cout << "*" << p.Get().getString() << ";" << std::endl;
-					}
-			}
+			data[i].Print();
 		}
 	}
 

IO/MsgOut.h

@@ -24,7 +24,7 @@
 #include "Stream.h"
 #include "AIS.h"
 #include "Utilities.h"
-
+#include "ADSB.h"
 #include "Keys.h"
 #include "JSON/JSON.h"
 #include "JSON/StringBuilder.h"
@@ -230,7 +230,7 @@ namespace IO
 		virtual ~StringToScreen() {}
 	};
 
-	class MessageToScreen : public StreamIn<AIS::Message>, public StreamIn<AIS::GPS>, public StreamIn<JSON::JSON>, public Setting
+	class MessageToScreen : public StreamIn<AIS::Message>, public StreamIn<AIS::GPS>, public StreamIn<Plane::ADSB>, public Setting
 	{
 	private:
 		MessageFormat level;
@@ -242,7 +242,7 @@ namespace IO
 
 		void Receive(const AIS::Message *data, int len, TAG &tag);
 		void Receive(const AIS::GPS *data, int len, TAG &tag);
-		void Receive(const JSON::JSON *data, int len, TAG &tag);
+		void Receive(const Plane::ADSB *data, int len, TAG &tag);
 
 
 		Setting &Set(std::string option, std::string arg)

Library/ADSB.cpp

@@ -0,0 +1,114 @@
+/*
+    Copyright(c) 2021-2025 jvde.github@gmail.com
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+#include "ADSB.h"
+
+namespace Plane
+{
+  
+    void ADSB::Callsign()
+    {
+        static const char *cs_table = "#ABCDEFGHIJKLMNOPQRSTUVWXYZ##### ###############0123456789######";
+        char temp[9] = {0};
+        int len = 0;
+
+        for (int i = 0; i < 8; i++)
+        {
+            uint32_t c = getBits( 40 + (i * 6), 6);
+            if (cs_table[c] != '#')
+            {
+                temp[len++] = cs_table[c];
+            }
+        }
+
+        if (len > 0)
+        {
+            std::strncpy(callsign, temp, sizeof(callsign) - 1);
+            callsign[sizeof(callsign) - 1] = '\0';
+        }
+    }
+
+    void ADSB::Decode()
+    {
+        if(msgtype == '1') return;
+
+         df = getBits(0, 5);
+
+        switch (df)
+        {
+        case 0:  // Short Air-Air Surveillance
+        case 4:  // Surveillance, Altitude Reply
+        case 20: // Comm-B, Altitude Reply
+        {
+            //unsigned ac = getBits( 19, 13);
+            //if (ac)
+            //    altitude = decodeESAlt(ac);
+        }
+        break;
+
+        case 11: // All-Call Reply
+            hexident = getBits(8, 24);
+            break;
+
+        case 17: // Extended Squitter
+        case 18: // Extended Squitter/Supplementary
+        {
+            hexident = getBits( 8, 24);
+            msgtype = getBits( 32, 5);
+
+            switch (msgtype)
+            {
+            case 1:
+            case 2:
+            case 3:
+            case 4: // Aircraft Identification
+                Callsign();
+                break;
+
+            case 19: // Airborne Velocity
+                //decodeVelocity();
+                break;
+
+            case 5:
+            case 6:
+            case 7:
+            case 8: // Surface Position
+            case 9:
+            case 10:
+            case 11:
+            case 12: // Airborne Position
+            case 13:
+            case 14:
+            case 15:
+            case 16:
+            case 17:
+            case 18:
+                if (msgtype >= 9)
+                {
+                    //unsigned ac = getBits( 37, 12);
+                    //if (ac)
+                    //    altitude = decodeESAlt(ac);
+                }
+                //Position( getBits(msgData, 54, 1));
+                break;
+            }
+        }
+        break;
+        }
+
+    }
+}