From a75173546237b202e18256fb790e843022ab03cf Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Sat, 15 Jul 2023 08:20:36 +0200 Subject: [PATCH 01/12] #38 add include for uint32_t --- Common/RemoteUser.h | 1 + DGWRemoteControl/RemoteControlStarNetUser.h | 1 + 2 files changed, 2 insertions(+) diff --git a/Common/RemoteUser.h b/Common/RemoteUser.h index ff5fcfe..eb3b40f 100644 --- a/Common/RemoteUser.h +++ b/Common/RemoteUser.h @@ -20,6 +20,7 @@ #pragma once #include +#include class CRemoteUser { public: diff --git a/DGWRemoteControl/RemoteControlStarNetUser.h b/DGWRemoteControl/RemoteControlStarNetUser.h index df42db7..12c9401 100644 --- a/DGWRemoteControl/RemoteControlStarNetUser.h +++ b/DGWRemoteControl/RemoteControlStarNetUser.h @@ -20,6 +20,7 @@ #define RemoteControlStarNetUser_H #include +#include class CRemoteControlStarNetUser { public: From 0cbf2010ffba799a7235c2216b7507bc8ccb2b9d Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Sat, 15 Jul 2023 08:20:52 +0200 Subject: [PATCH 02/12] add compatiblitw with libgps 14 --- Common/APRSGPSDIdFrameProvider.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Common/APRSGPSDIdFrameProvider.cpp b/Common/APRSGPSDIdFrameProvider.cpp index 7f621be..969c9f9 100644 --- a/Common/APRSGPSDIdFrameProvider.cpp +++ b/Common/APRSGPSDIdFrameProvider.cpp @@ -74,14 +74,15 @@ bool CAPRSGPSDIdFrameProvider::buildAPRSFramesInt(const CAPRSEntry * entry, std: return false; #endif -#if GPSD_API_MAJOR_VERSION >= 10 +#if GPSD_API_MAJOR_VERSION >= 10 && GPSD_API_MAJOR_VERSION < 14 if(m_gpsdData.fix.status == STATUS_NO_FIX) return false; #else - if (m_gpsdData.status != STATUS_FIX) + if (m_gpsdData.fix.status < STATUS_GPS) return false; #endif + bool latlonSet = (m_gpsdData.set & LATLON_SET) == LATLON_SET; bool altitudeSet = (m_gpsdData.set & ALTITUDE_SET) == ALTITUDE_SET; bool velocitySet = (m_gpsdData.set & SPEED_SET) == SPEED_SET; From 0439332629c122a34ff16fdc96a4848bc526aac4 Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Sat, 15 Jul 2023 08:21:23 +0200 Subject: [PATCH 03/12] udpate build task to all --- .vscode/tasks.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 9f00615..6d6532b 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -13,7 +13,10 @@ "USE_GPSD=1", "all" ], - "group": "build", + "group": { + "kind": "build", + "isDefault": true + }, "problemMatcher": [] }, { @@ -91,10 +94,7 @@ "ENABLE_DEBUG=1", "USE_GPSD=1" ], - "group": { - "kind": "build", - "isDefault": true - }, + "group": "build", "problemMatcher": [] } ] From 417d3734a585146ce5178e6297bc14a1fcd22d76 Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Sat, 15 Jul 2023 08:27:25 +0200 Subject: [PATCH 04/12] wild geussing gpsd version history --- Common/APRSGPSDIdFrameProvider.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Common/APRSGPSDIdFrameProvider.cpp b/Common/APRSGPSDIdFrameProvider.cpp index 969c9f9..231ee6e 100644 --- a/Common/APRSGPSDIdFrameProvider.cpp +++ b/Common/APRSGPSDIdFrameProvider.cpp @@ -74,8 +74,8 @@ bool CAPRSGPSDIdFrameProvider::buildAPRSFramesInt(const CAPRSEntry * entry, std: return false; #endif -#if GPSD_API_MAJOR_VERSION >= 10 && GPSD_API_MAJOR_VERSION < 14 - if(m_gpsdData.fix.status == STATUS_NO_FIX) +#if GPSD_API_MAJOR_VERSION >= 10 && GPSD_API_MAJOR_VERSION < 13 + if(m_gpsdData.status == STATUS_NO_FIX) return false; #else if (m_gpsdData.fix.status < STATUS_GPS) From 07c2c7e90c28a803a9507053a1a9e7b6f4c812e8 Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Sat, 15 Jul 2023 08:28:52 +0200 Subject: [PATCH 05/12] still guessing gpsd --- Common/APRSGPSDIdFrameProvider.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Common/APRSGPSDIdFrameProvider.cpp b/Common/APRSGPSDIdFrameProvider.cpp index 231ee6e..eb8bfe1 100644 --- a/Common/APRSGPSDIdFrameProvider.cpp +++ b/Common/APRSGPSDIdFrameProvider.cpp @@ -74,7 +74,7 @@ bool CAPRSGPSDIdFrameProvider::buildAPRSFramesInt(const CAPRSEntry * entry, std: return false; #endif -#if GPSD_API_MAJOR_VERSION >= 10 && GPSD_API_MAJOR_VERSION < 13 +#if GPSD_API_MAJOR_VERSION >= 10 && GPSD_API_MAJOR_VERSION < 12 if(m_gpsdData.status == STATUS_NO_FIX) return false; #else From a1c1f4faf017daf91301c9fd41ca07a91115ca0f Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Sat, 15 Jul 2023 08:30:39 +0200 Subject: [PATCH 06/12] gpsd wild guessing --- Common/APRSGPSDIdFrameProvider.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Common/APRSGPSDIdFrameProvider.cpp b/Common/APRSGPSDIdFrameProvider.cpp index eb8bfe1..b3c4bdd 100644 --- a/Common/APRSGPSDIdFrameProvider.cpp +++ b/Common/APRSGPSDIdFrameProvider.cpp @@ -74,7 +74,7 @@ bool CAPRSGPSDIdFrameProvider::buildAPRSFramesInt(const CAPRSEntry * entry, std: return false; #endif -#if GPSD_API_MAJOR_VERSION >= 10 && GPSD_API_MAJOR_VERSION < 12 +#if GPSD_API_MAJOR_VERSION >= 10 && GPSD_API_MAJOR_VERSION < 11 if(m_gpsdData.status == STATUS_NO_FIX) return false; #else From f0bed5fff0884b56c7e7ce3ba8390c0a1176e0d2 Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Sat, 15 Jul 2023 08:46:17 +0200 Subject: [PATCH 07/12] gpsd, again --- Common/APRSGPSDIdFrameProvider.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Common/APRSGPSDIdFrameProvider.cpp b/Common/APRSGPSDIdFrameProvider.cpp index b3c4bdd..01386d6 100644 --- a/Common/APRSGPSDIdFrameProvider.cpp +++ b/Common/APRSGPSDIdFrameProvider.cpp @@ -74,11 +74,11 @@ bool CAPRSGPSDIdFrameProvider::buildAPRSFramesInt(const CAPRSEntry * entry, std: return false; #endif -#if GPSD_API_MAJOR_VERSION >= 10 && GPSD_API_MAJOR_VERSION < 11 - if(m_gpsdData.status == STATUS_NO_FIX) +#if GPSD_API_MAJOR_VERSION == 10 + if(m_gpsdData.fix.status == STATUS_NO_FIX) return false; #else - if (m_gpsdData.fix.status < STATUS_GPS) + if (m_gpsdData.fix.status == STATUS_UNK) return false; #endif From 8de55e328061a33b2178b856317144a87fb54548 Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Sat, 15 Jul 2023 08:48:46 +0200 Subject: [PATCH 08/12] gpsd --- Common/APRSGPSDIdFrameProvider.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Common/APRSGPSDIdFrameProvider.cpp b/Common/APRSGPSDIdFrameProvider.cpp index 01386d6..19d529a 100644 --- a/Common/APRSGPSDIdFrameProvider.cpp +++ b/Common/APRSGPSDIdFrameProvider.cpp @@ -75,7 +75,7 @@ bool CAPRSGPSDIdFrameProvider::buildAPRSFramesInt(const CAPRSEntry * entry, std: #endif #if GPSD_API_MAJOR_VERSION == 10 - if(m_gpsdData.fix.status == STATUS_NO_FIX) + if(m_gpsdData.status == STATUS_NO_FIX) return false; #else if (m_gpsdData.fix.status == STATUS_UNK) From 36534215e42c9f0f7186d6e5541a4e1f1dd542bf Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Sat, 15 Jul 2023 08:53:46 +0200 Subject: [PATCH 09/12] dirty ack because gps s*cks --- Common/APRSGPSDIdFrameProvider.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Common/APRSGPSDIdFrameProvider.cpp b/Common/APRSGPSDIdFrameProvider.cpp index 19d529a..4adbee5 100644 --- a/Common/APRSGPSDIdFrameProvider.cpp +++ b/Common/APRSGPSDIdFrameProvider.cpp @@ -78,8 +78,14 @@ bool CAPRSGPSDIdFrameProvider::buildAPRSFramesInt(const CAPRSEntry * entry, std: if(m_gpsdData.status == STATUS_NO_FIX) return false; #else - if (m_gpsdData.fix.status == STATUS_UNK) + +#ifndef STATUS_UNK +#define STATUS_UNK STATUS_NO_FIX #Dirty ack. because gpsd history doc just s*cks +#endif + + if (m_gpsdData.fix.status == STATUS_UNK) return false; + #endif From 0011ffa2b47c9b38d0e053533413af62c3181bf9 Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Sat, 15 Jul 2023 08:56:07 +0200 Subject: [PATCH 10/12] typo --- Common/APRSGPSDIdFrameProvider.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Common/APRSGPSDIdFrameProvider.cpp b/Common/APRSGPSDIdFrameProvider.cpp index 4adbee5..8b99a7a 100644 --- a/Common/APRSGPSDIdFrameProvider.cpp +++ b/Common/APRSGPSDIdFrameProvider.cpp @@ -80,7 +80,7 @@ bool CAPRSGPSDIdFrameProvider::buildAPRSFramesInt(const CAPRSEntry * entry, std: #else #ifndef STATUS_UNK -#define STATUS_UNK STATUS_NO_FIX #Dirty ack. because gpsd history doc just s*cks +#define STATUS_UNK STATUS_NO_FIX //Dirty ack. because gpsd history doc just s*cks #endif if (m_gpsdData.fix.status == STATUS_UNK) From 97a743af0accc90504078abc0a1ae81b9e822dfc Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Sat, 15 Jul 2023 08:58:54 +0200 Subject: [PATCH 11/12] undo gpsd move to other branch --- Common/APRSGPSDIdFrameProvider.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/Common/APRSGPSDIdFrameProvider.cpp b/Common/APRSGPSDIdFrameProvider.cpp index 8b99a7a..7a2a0e5 100644 --- a/Common/APRSGPSDIdFrameProvider.cpp +++ b/Common/APRSGPSDIdFrameProvider.cpp @@ -79,16 +79,14 @@ bool CAPRSGPSDIdFrameProvider::buildAPRSFramesInt(const CAPRSEntry * entry, std: return false; #else -#ifndef STATUS_UNK -#define STATUS_UNK STATUS_NO_FIX //Dirty ack. because gpsd history doc just s*cks -#endif - - if (m_gpsdData.fix.status == STATUS_UNK) +#if GPSD_API_MAJOR_VERSION >= 10 + if(m_gpsdData.fix.status == STATUS_NO_FIX) + return false; +#else + if (m_gpsdData.status != STATUS_FIX) return false; - #endif - bool latlonSet = (m_gpsdData.set & LATLON_SET) == LATLON_SET; bool altitudeSet = (m_gpsdData.set & ALTITUDE_SET) == ALTITUDE_SET; bool velocitySet = (m_gpsdData.set & SPEED_SET) == SPEED_SET; From babeb23fe7023e863a86894e0f9c6d2f950444a6 Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Sat, 15 Jul 2023 09:02:30 +0200 Subject: [PATCH 12/12] typo --- Common/APRSGPSDIdFrameProvider.cpp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Common/APRSGPSDIdFrameProvider.cpp b/Common/APRSGPSDIdFrameProvider.cpp index 7a2a0e5..7f621be 100644 --- a/Common/APRSGPSDIdFrameProvider.cpp +++ b/Common/APRSGPSDIdFrameProvider.cpp @@ -74,11 +74,6 @@ bool CAPRSGPSDIdFrameProvider::buildAPRSFramesInt(const CAPRSEntry * entry, std: return false; #endif -#if GPSD_API_MAJOR_VERSION == 10 - if(m_gpsdData.status == STATUS_NO_FIX) - return false; -#else - #if GPSD_API_MAJOR_VERSION >= 10 if(m_gpsdData.fix.status == STATUS_NO_FIX) return false;