From 0b2993f47d32cdc91c789d9997bb36518af5f45e Mon Sep 17 00:00:00 2001 From: Ladislav Foldyna Date: Fri, 4 Oct 2024 19:28:14 +0200 Subject: [PATCH] Fixed compilation issue - missing RIG_IS_SOFT_ERRCODE under Ubuntu 20.04 --- rig/drivers/HamlibRigDrv.cpp | 7 +++++++ rotator/drivers/HamlibRotDrv.cpp | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/rig/drivers/HamlibRigDrv.cpp b/rig/drivers/HamlibRigDrv.cpp index 9e7404b..99883e5 100644 --- a/rig/drivers/HamlibRigDrv.cpp +++ b/rig/drivers/HamlibRigDrv.cpp @@ -10,6 +10,13 @@ #define HAMLIB_FILPATHLEN FILPATHLEN #endif +#ifndef RIG_IS_SOFT_ERRCODE +#define RIG_IS_SOFT_ERRCODE(errcode) (errcode == RIG_EINVAL || errcode == RIG_ENIMPL || errcode == RIG_ERJCTED \ + || errcode == RIG_ETRUNC || errcode == RIG_ENAVAIL || errcode == RIG_ENTARGET \ + || errcode == RIG_EVFO || errcode == RIG_EDOM) + +#endif + // macro introduced hamlib 4.6 #ifndef PTTPORT #define PTTPORT(r) (&r->state.pttport) diff --git a/rotator/drivers/HamlibRotDrv.cpp b/rotator/drivers/HamlibRotDrv.cpp index b331062..2b215cb 100644 --- a/rotator/drivers/HamlibRotDrv.cpp +++ b/rotator/drivers/HamlibRotDrv.cpp @@ -19,6 +19,13 @@ #define HAMLIB_FILPATHLEN FILPATHLEN #endif +#ifndef RIG_IS_SOFT_ERRCODE +#define RIG_IS_SOFT_ERRCODE(errcode) (errcode == RIG_EINVAL || errcode == RIG_ENIMPL || errcode == RIG_ERJCTED \ + || errcode == RIG_ETRUNC || errcode == RIG_ENAVAIL || errcode == RIG_ENTARGET \ + || errcode == RIG_EVFO || errcode == RIG_EDOM) + +#endif + #define POOL_INTERVAL 500 MODULE_IDENTIFICATION("qlog.rotator.driver.hamlibdrv");