Merge branch 'master' of https://github.com/jtdx-project/jtdx-devel

Author: Arvo Järve

CMakeLists.txt

@@ -59,9 +59,9 @@ else ()
   set (PROJECT_CONTACT "Igor Chernikov <c_igor@inbox.ru>, Arvo Järve <arvo.jarve@eesti.ee>")
   set (PROJECT_COPYRIGHT "Copyright (C) 2016-2020 by Igor Chernikov, UA3DJY and Arvo Järve, ES1JA.")
 endif (WIN32)
-set (PROJECT_HOMEPAGE http://jtdx.tech/)
+set (PROJECT_HOMEPAGE http://sourceforge.net/projects/jtdx/)
 set (PROJECT_MANUAL index.php/videos-guides)
-set (PROJECT_MANUAL_DIRECTORY_URL http://jtdx.tech/)
+set (PROJECT_MANUAL_DIRECTORY_URL http://sourceforge.net/projects/jtdx/)
 set (PROJECT_SAMPLES_URL http://jtdx.tech/public_html/downloads/)
 set (PROJECT_SAMPLES_UPLOAD_DEST frs.sourceforge.net:/home/frs/project/wsjt/)
 set (PROJECT_SUMMARY_DESCRIPTION "${PROJECT_NAME} - Digital Modes for Amateur Radio.")
@@ -175,6 +175,7 @@ set (wsjt_qt_CXXSRCS
   revision_utils.cpp
   WFPalette.cpp
   Radio.cpp
+  NonInheritingProcess.cpp
   IARURegions.cpp
   Bands.cpp
   Modes.cpp

Configuration.cpp

@@ -132,6 +132,7 @@ class Configuration final
   bool do_pwr() const;
   bool rig_power() const;
   bool rig_power_off() const;
+  bool rig_ptt_share() const;
   bool tci_audio() const;
   bool id_after_73 () const;
   bool tx_QSY_allowed () const;

Configuration.hpp

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>700</width>
-    <height>567</height>
+    <height>600</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -19,7 +19,7 @@
   <property name="minimumSize">
    <size>
     <width>686</width>
-    <height>550</height>
+    <height>586</height>
    </size>
   </property>
   <property name="windowTitle">
@@ -1359,7 +1359,7 @@ other hardware interface for PTT.</string>
             </attribute>
            </widget>
           </item>
-          <item row="2" column="0" rowspan="2" colspan="2">
+          <item row="2" column="0" rowspan="3" colspan="2">
            <layout class="QFormLayout" name="formLayout_4">
             <property name="fieldGrowthPolicy">
              <enum>QFormLayout::ExpandingFieldsGrow</enum>
@@ -1399,6 +1399,22 @@ other hardware interface for PTT.</string>
               </property>
              </widget>
             </item>
+            <item row="1" column="0" colspan="2">
+             <widget class="QCheckBox" name="rig_ptt_share_check_box">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="toolTip">
+               <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Request enable PTT port sharing in Hamlib.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+              </property>
+              <property name="text">
+               <string>Share PTT port</string>
+              </property>
+             </widget>
+            </item>
            </layout>
           </item>
          </layout>

Configuration.ui

@@ -304,6 +304,7 @@ HamlibTransceiver::HamlibTransceiver (unsigned model_number, TransceiverFactory:
   if (!is_dummy_)
     {
 
+//      printf("Hamlib open params: power_on=%d power_off=%d ptt_share=%d\n",(params.poll_interval & rig__power) == rig__power,(params.poll_interval & rig__power_off) == rig__power_off,(params.poll_interval & ptt__share) == ptt__share);
       if (params.poll_interval & rig__power) { set_conf ("auto_power_on","1"); }
       if (params.poll_interval & rig__power_off) { set_conf ("auto_power_off","1"); }
       if (params.poll_interval & do__snr) do_snr_ = true;
@@ -395,7 +396,7 @@ HamlibTransceiver::HamlibTransceiver (unsigned model_number, TransceiverFactory:
         {
           set_conf ("ptt_type", "RTS");
         }
-      set_conf ("ptt_share", "1");
+      if (params.poll_interval & ptt__share) set_conf ("ptt_share", "1"); else set_conf ("ptt_share", "0");
     }
 
   // Make Icom CAT split commands less glitchy
@@ -1272,7 +1273,7 @@ void HamlibTransceiver::do_poll ()
                     fclose (pFile);
 #endif
 //                    printf ("SWR %.3f\n",strength.f);
-                    if (strength.f > 1.000)
+                    if (strength.f >= 1.000)
                       update_swr (strength.f*100);
                     else
                       update_swr (0);

HamlibTransceiver.cpp

@@ -58,13 +58,13 @@ from sources something like the following recipe should suffice:
 
 $ mkdir ~/hamlib-prefix
 $ cd ~/hamlib-prefix
-$ git clone git://github.com/jtdx-project/jtdxhamlib src
+$ git clone git://git.code.sf.net/p/jtdx/hamlib src
 $ cd src
 $ ./bootstrap
 $ mkdir ../build
 $ cd ../build
 $ ../src/configure --prefix=$HOME/hamlib-prefix \
-   --disable-shared --enable-static --without-readline \
+   --disable-static --enable-shared --without-readline \
    --without-indi --without-cxx-binding --disable-winradio \
    CFLAGS="-g -O2 -fdata-sections -ffunction-sections" \
    LDFLAGS="-Wl,--gc-sections"
@@ -83,7 +83,7 @@ project's git repository.
 
 $ mkdir -p ~/jtdx-prefix/build
 $ cd ~/jtdx-prefix
-$ git clone git://github.com/jtdx-project/jtdx src
+$ git clone git://git.code.sf.net/p/jtdx/code src
 
 
 To build JTDX you will need CMake and asciidoc installed.
@@ -141,14 +141,14 @@ In an MSYS shell:-
 
 $ mkdir ~/hamib-prefix
 $ cd ~/hamlib-prefix
-$ git clone git://git.code.sf.net/u/bsomervi/hamlib src
+$ git clone git://git.code.sf.net/p/jtdx/hamlib src
 $ cd src
 $ git checkout integration
 $ ./bootstrap
 $ mkdir ../build
 $ cd ../build
    ../src/configure --prefix=$HOME/hamlib-prefix \
-   --disable-shared --enable-static \
+   --disable-static --enable-shared \
    --without-indi --without-cxx-binding --disable-winradio \
    CC=<path-to-Qt-MinGW-tools>/gcc \
    CXX=<path-to-Qt-MinGW-tools>/g++ \
@@ -199,13 +199,14 @@ texinfo
 gcc9
 fftw-3-single +gcc9
 asciidoc
+asciidoctor
 libusb-devel
 
 These are installed by typing:
 
 $ sudo port install autoconf automake \
    libtool pkgconfig texinfo gcc9 asciidoc \
-   fftw-3-single +gcc9 libusb-devel
+   asciidoctor fftw-3-single +gcc9 libusb-devel
 
 Once complete you should have all the tools required to build JTDX.
 
@@ -223,20 +224,21 @@ First fetch hamlib from the repository, in this case my fork of Hamlib
 
 $ mkdir -p ~/hamlib-prefix/build
 $ cd ~/hamlib-prefix
-$ git clone git://github.com/jtdx-project/jtdxhamlib src
+$ git clone git://git.code.sf.net/p/jtdx/hamlib src
 $ cd src
 $ ./bootstrap
 
 To build:
 
 $ cd ~/hamlib-prefix/build
 $ ../src/configure \
-   --enable-static \
-   --disable-shared \
+   --enable-shared \
+   --disable-static \
    --disable-winradio \
    --prefix=$HOME/hamlib-prefix \
    --without-readline \
    --without-indi \
+   --without-cxx-binding \
    CFLAGS="-g -O2 -mmacosx-version-min=10.13 -I/opt/local/include" \
    LIBUSB_LIBS="-L/opt/local/lib -lusb-1.0"
 $ make
@@ -327,7 +329,7 @@ First fetch the source from the repository:
 
 $ mkdir -p ~/jtdx-prefix/build
 $ cd ~/jtdx-prefix
-$ git clone git://github.com/jtdx-project/jtdx src
+$ git clone git://git.code.sf.net/p/jtdx/code src
 
 this links to the Git repository in a read-only fashion, if you
 intend to  contribute to the project  then you probably want  to get a

INSTALL

@@ -1,5 +1,3 @@
-// last time modified by Igor UA3DJY on 20200207
-
 #include "MessageClient.hpp"
 
 #include <stdexcept>
@@ -32,6 +30,7 @@ class MessageClient::impl
     , version_ {version}
     , server_port_ {server_port}
     , schema_ {2}  // use 2 prior to negotiation not 1 which is broken
+    , force_ {false}
     , heartbeat_timer_ {new QTimer {this}}
   {
     connect (heartbeat_timer_, &QTimer::timeout, this, &impl::heartbeat);
@@ -77,6 +76,7 @@ class MessageClient::impl
   port_type server_port_;
   QHostAddress server_;
   quint32 schema_;
+  bool force_;
   QTimer * heartbeat_timer_;
   std::vector<QHostAddress> blocked_addresses_;
 
@@ -281,8 +281,9 @@ void MessageClient::impl::send_message (QByteArray const& message)
     {
       if (!server_.isNull ())
         {
-          if (message != last_message_) // avoid duplicates
+          if (force_ || message != last_message_) // avoid duplicates, force status dupe for same callsign UDP reply
             {
+              force_=false;
               writeDatagram (message, server_, server_port_);
               last_message_ = message;
             }
@@ -410,7 +411,7 @@ void MessageClient::status_update (Frequency f, QString const& mode, QString con
                                    , qint32 rx_df, qint32 tx_df, QString const& de_call
                                    , QString const& de_grid, QString const& dx_grid
                                    , bool watchdog_timeout, QString const& sub_mode
-                                   , bool fast_mode, bool tx_first)
+                                   , bool fast_mode, bool tx_first, bool force)
 {
   if (m_->server_port_ && !m_->server_string_.isEmpty ())
     {
@@ -420,6 +421,7 @@ void MessageClient::status_update (Frequency f, QString const& mode, QString con
           << tx_enabled << transmitting << decoding << rx_df << tx_df << de_call.toUtf8 ()
           << de_grid.toUtf8 () << dx_grid.toUtf8 () << watchdog_timeout << sub_mode.toUtf8 ()
           << fast_mode << tx_first;
+      if(force) m_->force_=true;
       m_->send_message (out, message);
     }
 }

MessageClient.cpp

@@ -1,5 +1,3 @@
-// last time modified by Igor UA3DJY on 20200205
-
 #ifndef MESSAGE_CLIENT_HPP__
 #define MESSAGE_CLIENT_HPP__
 
@@ -52,7 +50,7 @@ class MessageClient
                              , QString const& tx_mode, bool tx_enabled, bool transmitting, bool decoding
                              , qint32 rx_df, qint32 tx_df, QString const& de_call, QString const& de_grid
                              , QString const& dx_grid, bool watchdog_timeout, QString const& sub_mode
-                             , bool fast_mode, bool tx_first);
+                             , bool fast_mode, bool tx_first, bool force);
   Q_SLOT void decode (bool is_new, QTime time, qint32 snr, float delta_time, quint32 delta_frequency
                       , QString const& mode, QString const& message, bool low_confidence
                       , bool off_air);

MessageClient.hpp

@@ -1,5 +1,3 @@
-// last time modified by Igor UA3DJY on 20200205
-
 #include "MessageServer.hpp"
 
 #include <stdexcept>
@@ -213,6 +211,7 @@ void MessageServer::impl::parse_message (QHostAddress const& sender, port_type s
                 QByteArray sub_mode;
                 bool fast_mode {false};
                 bool tx_first {false};
+                bool force {false};
                 in >> f >> mode >> dx_call >> report >> tx_mode >> tx_enabled >> transmitting >> decoding
                    >> rx_df >> tx_df >> de_call >> de_grid >> dx_grid >> watchdog_timeout >> sub_mode
                    >> fast_mode >> tx_first;
@@ -224,7 +223,7 @@ void MessageServer::impl::parse_message (QHostAddress const& sender, port_type s
                                                  , tx_enabled, transmitting, decoding, rx_df, tx_df
                                                  , QString::fromUtf8 (de_call), QString::fromUtf8 (de_grid)
                                                  , QString::fromUtf8 (dx_grid), watchdog_timeout
-                                                 , QString::fromUtf8 (sub_mode), fast_mode, tx_first);
+                                                 , QString::fromUtf8 (sub_mode), fast_mode, tx_first, force);
                   }
               }
               break;

MessageServer.cpp

@@ -1,5 +1,3 @@
-// last time modified by Igor UA3DJY on 20200205
-
 #ifndef MESSAGE_SERVER_HPP__
 #define MESSAGE_SERVER_HPP__
 
@@ -71,7 +69,8 @@ class MessageServer
                                , QString const& report, QString const& tx_mode, bool tx_enabled
                                , bool transmitting, bool decoding, qint32 rx_df, qint32 tx_df
                                , QString const& de_call, QString const& de_grid, QString const& dx_grid
-                               , bool watchdog_timeout, QString const& sub_mode, bool fast_mode, bool tx_first);
+                               , bool watchdog_timeout, QString const& sub_mode, bool fast_mode
+                               , bool tx_first, bool force);
   Q_SIGNAL void client_closed (QString const& id);
   Q_SIGNAL void decode (bool is_new, QString const& id, QTime time, qint32 snr, float delta_time
                         , quint32 delta_frequency, QString const& mode, QString const& message);