From f9f233f2cbded02fd9d529966df26e4aa8959d32 Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Tue, 4 Aug 2020 12:10:55 +0100 Subject: [PATCH] Revert "Handle D-Plus reply of "BUSY" as a rejection. Treat "OKRO" in the same way." This reverts commit 46b78d333522f444055a923eb658873b76850711. --- Common/ConnectData.cpp | 8 ++++---- Common/Version.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Common/ConnectData.cpp b/Common/ConnectData.cpp index 5db4e80..2489b73 100644 --- a/Common/ConnectData.cpp +++ b/Common/ConnectData.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010,2012,2013,2020 by Jonathan Naylor G4KLX + * Copyright (C) 2010,2012,2013 by Jonathan Naylor G4KLX * * 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 @@ -252,10 +252,10 @@ bool CConnectData::setDPlusData(const unsigned char* data, unsigned int length, wxString reply((const char*)(data + 4U), wxConvLocal, 4U); wxLogMessage(wxT("D-Plus reply is %.4s"), reply.c_str()); - if (::memcmp(data + 4U, "OKRW", 4U) != 0) - return false; - else + if (::memcmp(data + 4U, "OKRW", 4U) == 0) m_type = CT_ACK; + else + m_type = CT_NAK; } break; diff --git a/Common/Version.h b/Common/Version.h index 572359c..477d0c1 100644 --- a/Common/Version.h +++ b/Common/Version.h @@ -24,9 +24,9 @@ const wxString VENDOR_NAME = wxT("G4KLX"); #if defined(__WXDEBUG__) -const wxString VERSION = wxT("20200803 - DEBUG"); +const wxString VERSION = wxT("20200621 - DEBUG"); #else -const wxString VERSION = wxT("20190803"); +const wxString VERSION = wxT("20190621"); #endif #endif