-
Notifications
You must be signed in to change notification settings - Fork 2.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
fd01499
commit 6496fe9
Showing
2 changed files
with
37 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
Index: external/hamlib/hamlib/rig.h | ||
=================================================================== | ||
--- external/hamlib/hamlib/rig.h | ||
+++ external/hamlib/hamlib/rig.h | ||
@@ -147,7 +147,7 @@ typedef struct rig RIG; | ||
|
||
#define RIGNAMSIZ 30 | ||
#define RIGVERSIZ 8 | ||
-#define FILPATHLEN 100 | ||
+#define HAMLIB_FILPATHLEN 100 | ||
#define FRQRANGESIZ 30 | ||
#define MAXCHANDESC 30 /* describe channel eg: "WWV 5Mhz" */ | ||
#define TSLSTSIZ 20 /* max tuning step list size, zero ended */ | ||
@@ -1479,7 +1479,7 @@ typedef struct hamlib_port { | ||
int timeout; /*!< Timeout, in mS */ | ||
int retry; /*!< Maximum number of retries, 0 to disable */ | ||
|
||
- char pathname[FILPATHLEN]; /*!< Port pathname */ | ||
+ char pathname[HAMLIB_FILPATHLEN]; /*!< Port pathname */ | ||
|
||
union { | ||
struct { | ||
|
||
Index: src/rig/RigThread.cpp | ||
=================================================================== | ||
--- src/rig/RigThread.cpp | ||
+++ src/rig/RigThread.cpp | ||
@@ -114,7 +114,7 @@ void RigThread::run() { | ||
std::cout << "Rig thread starting." << std::endl; | ||
|
||
rig = rig_init(rigModel); | ||
- strncpy(rig->state.rigport.pathname, rigFile.c_str(), FILPATHLEN - 1); | ||
+ strncpy(rig->state.rigport.pathname, rigFile.c_str(), HAMLIB_FILPATHLEN - 1); | ||
rig->state.rigport.parm.serial.rate = serialRate; | ||
retcode = rig_open(rig); | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters