Fix k3.c vfo_op -- was missing a break statement

Revert "Refactoring GPIO push-to-talk logic to use libgpiod rather than the d…"

.github/codeql-analysis.yml

@@ -16,7 +16,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
         # We must fetch at least the immediate parents so that if this is
         # a pull request then we can checkout the head.
@@ -29,7 +29,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v4
       # Override language selection by uncommenting this and choosing your languages
       # with:
       #   languages: go, javascript, csharp, python, cpp, java
@@ -37,7 +37,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     #- name: Autobuild
-    #  uses: github/codeql-action/autobuild@v2
+    #  uses: github/codeql-action/autobuild@v4
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -52,4 +52,4 @@ jobs:
        make
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v4

.github/workflows/c-cpp.yml

@@ -12,10 +12,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: bootstrap
       run: |
         sudo apt install libusb-1.0-0-dev
+        sudo apt install libgpiod-dev
         sudo apt install grep
         ./bootstrap
     - name: README Debug

.github/workflows/c-cpp32.yml

@@ -12,10 +12,11 @@ jobs:
     runs-on: fedora:32
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: bootstrap
       run: |
         sudo apt install libusb-1.0-0-dev
+        sudo apt install libgpiod-dev
         ./bootstrap
     - name: configure
       run: ./configure --without-cxx-binding

.github/workflows/codeql-analysis.yml

@@ -39,11 +39,11 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -54,7 +54,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     #- name: Autobuild
-    #  uses: github/codeql-action/autobuild@v2
+    #  uses: github/codeql-action/autobuild@v3
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -65,9 +65,10 @@ jobs:
 
     - run: |
        sudo apt install libusb-1.0-0-dev
+       sudo apt install libgpiod-dev
        ./bootstrap
        ./configure
        make
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3

.gitignore

@@ -8,6 +8,8 @@
 *.lo
 *.la
 *.orig
+*.sh.log
+*.sh.trs
 *.swp
 $depbase.Tpo
 Makefile
@@ -53,6 +55,8 @@ tests/ampctld
 tests/rigctl
 tests/rigctlcom
 tests/rigctld
+tests/rigctlsync
+tests/rigctltcp
 tests/rigmem
 tests/rigsmtr
 tests/rigswr
@@ -60,6 +64,8 @@ tests/rotctl
 tests/rotctld
 tests/testlibusb
 tests/rigtestlibusb
+tests/rigtestmcast
+tests/rigtestmcastrx
 src/hamlibdatetime.h
 .gdbinit
 build/
@@ -67,3 +73,5 @@ libs/
 obj/
 .project
 .cproject
+.DS_Store
+._.DS_Store

CODE_OF_CONDUCT.md

@@ -0,0 +1,128 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, religion, or sexual identity
+and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our
+community include:
+
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the
+  overall community
+
+Examples of unacceptable behavior include:
+
+* The use of sexualized language or imagery, and sexual attention or
+  advances of any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or email
+  address, without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement at
+.
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series
+of actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or
+permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior,  harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within
+the community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.0, available at
+https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
+
+Community Impact Guidelines were inspired by [Mozilla's code of conduct
+enforcement ladder](https://github.com/mozilla/diversity).
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see the FAQ at
+https://www.contributor-covenant.org/faq. Translations are available at
+https://www.contributor-covenant.org/translations.

CONTRIBUTING.md

@@ -0,0 +1,93 @@
+# Welcome to Hamlib docs contributing guide <!-- omit in toc -->
+
+Thank you for investing your time in contributing to our project! Any contribution you make will be reflected on [docs.github.com](https://docs.github.com/en) :sparkles:.
+
+Read our [Code of Conduct](./CODE_OF_CONDUCT.md) to keep our community approachable and respectable.
+
+In this guide you will get an overview of the contribution workflow from opening an issue, creating a PR, reviewing, and merging the PR.
+
+Use the table of contents icon <img src="/contributing/images/table-of-contents.png" width="25" height="25" /> on the top left corner of this document to get to a specific section of this guide quickly.
+
+## New contributor guide
+
+To get an overview of the project, read the [README](../README.md) file. Here are some resources to help you get started with open source contributions:
+
+- [Finding ways to contribute to open source on GitHub](https://docs.github.com/en/get-started/exploring-projects-on-github/finding-ways-to-contribute-to-open-source-on-github)
+- [Set up Git](https://docs.github.com/en/get-started/getting-started-with-git/set-up-git)
+- [GitHub flow](https://docs.github.com/en/get-started/using-github/github-flow)
+- [Collaborating with pull requests](https://docs.github.com/en/github/collaborating-with-pull-requests)
+
+
+## Getting started
+
+To navigate our codebase with confidence, see [the introduction to working in the docs repository](/contributing/README.md) :confetti_ball:. For more information on how we write our markdown files, see "[Using Markdown and Liquid in GitHub Docs](https://docs.github.com/en/contributing/writing-for-github-docs/using-markdown-and-liquid-in-github-docs)."
+
+Check to see what [types of contributions](/contributing/types-of-contributions.md) we accept before making changes. Some of them don't even require writing a single line of code :sparkles:.
+
+### Issues
+
+#### Create a new issue
+
+If you spot a problem with the docs, [search if an issue already exists](https://docs.github.com/en/github/searching-for-information-on-github/searching-on-github/searching-issues-and-pull-requests#search-by-the-title-body-or-comments). If a related issue doesn't exist, you can open a new issue using a relevant [issue form](https://github.com/github/docs/issues/new/choose).
+
+#### Solve an issue
+
+Scan through our [existing issues](https://github.com/github/docs/issues) to find one that interests you. You can narrow down the search using `labels` as filters. See "[Label reference](https://docs.github.com/en/contributing/collaborating-on-github-docs/label-reference)" for more information. As a general rule, we don’t assign issues to anyone. If you find an issue to work on, you are welcome to open a PR with a fix.
+
+### Make Changes
+
+#### Make changes in the UI
+
+Click **Make a contribution** at the bottom of any docs page to make small changes such as a typo, sentence fix, or a broken link. This takes you to the `.md` file where you can make your changes and [create a pull request](#pull-request) for a review.
+
+ <img src="/contributing/images/contribution_cta.png" />
+
+#### Make changes in a codespace
+
+For more information about using a codespace for working on GitHub documentation, see "[Working in a codespace](https://github.com/github/docs/blob/main/contributing/codespace.md)."
+
+#### Make changes locally
+
+1. Fork the repository.
+- Using GitHub Desktop:
+  - [Getting started with GitHub Desktop](https://docs.github.com/en/desktop/installing-and-configuring-github-desktop/getting-started-with-github-desktop) will guide you through setting up Desktop.
+  - Once Desktop is set up, you can use it to [fork the repo](https://docs.github.com/en/desktop/contributing-and-collaborating-using-github-desktop/cloning-and-forking-repositories-from-github-desktop)!
+
+- Using the command line:
+  - [Fork the repo](https://docs.github.com/en/github/getting-started-with-github/fork-a-repo#fork-an-example-repository) so that you can make your changes without affecting the original project until you're ready to merge them.
+
+2. Install or update to **Node.js**, at the version specified in `.node-version`. For more information, see [the development guide](../contributing/development.md).
+
+3. Create a working branch and start with your changes!
+
+### Commit your update
+
+Commit the changes once you are happy with them. Don't forget to use the "[Self review checklist](https://docs.github.com/en/contributing/collaborating-on-github-docs/self-review-checklist)" to speed up the review process :zap:.
+
+### Pull Request
+
+When you're finished with the changes, create a pull request, also known as a PR.
+- Fill the "Ready for review" template so that we can review your PR. This template helps reviewers understand your changes as well as the purpose of your pull request.
+- Don't forget to [link PR to issue](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue) if you are solving one.
+- Enable the checkbox to [allow maintainer edits](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/allowing-changes-to-a-pull-request-branch-created-from-a-fork) so the branch can be updated for a merge.
+Once you submit your PR, a Docs team member will review your proposal. We may ask questions or request additional information.
+- We may ask for changes to be made before a PR can be merged, either using [suggested changes](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/incorporating-feedback-in-your-pull-request) or pull request comments. You can apply suggested changes directly through the UI. You can make any other changes in your fork, then commit them to your branch.
+- As you update your PR and apply changes, mark each conversation as [resolved](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/commenting-on-a-pull-request#resolving-conversations).
+- If you run into any merge issues, checkout this [git tutorial](https://github.com/skills/resolve-merge-conflicts) to help you resolve merge conflicts and other issues.
+
+### Your PR is merged!
+
+Congratulations :tada::tada: The Hamlib team thanks you :sparkles:.
+
+Once your PR is merged, your contributions will be publicly visible on [Hamlib](https://github.com/Hamlib/Hamlib).
+
+## Windows
+
+This site can be developed on Windows, however a few potential gotchas need to be kept in mind:
+
+1. Regular Expressions: Windows uses `\r\n` for line endings, while Unix-based systems use `\n`. Therefore, when working on Regular Expressions, use `\r?\n` instead of `\n` in order to support both environments. The Node.js [`os.EOL`](https://nodejs.org/api/os.html#os_os_eol) property can be used to get an OS-specific end-of-line marker.
+2. Paths: Windows systems use `\` for the path separator, which would be returned by `path.join` and others. You could use `path.posix`, `path.posix.join` etc and the [slash](https://ghub.io/slash) module, if you need forward slashes - like for constructing URLs - or ensure your code works with either.
+3. Bash: Not every Windows developer has a terminal that fully supports Bash, so it's generally preferred to write [scripts](/script) in JavaScript instead of Bash.
+4. Filename too long error: There is a 260 character limit for a filename when Git is compiled with `msys`. While the suggestions below are not guaranteed to work and could cause other issues, a few workarounds include:
+    - Update Git configuration: `git config --system core.longpaths true`
+    - Consider using a different Git client on Windows

INSTALL

@@ -362,7 +362,7 @@ the command line of the application's 'configure' script:
 
 These can be set on the Hamlib 'configure' script's command line to see the
 effect on the Hamlib utilities when they are built as statically linked
-applicatins (--disable-shared option passed to 'configure').  With these
+applications (--disable-shared option passed to 'configure').  With these
 environment variables it can be seen that 'rigctl' contains no rotor symbols
 nor does 'rotctl' contain any rig symbols.
 

Makefile.am

@@ -6,12 +6,12 @@ aclocal_DATA = hamlib.m4
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = hamlib.pc
 
-EXTRA_DIST = PLAN LICENSE hamlib.m4 hamlib.pc.in README.developer \
+EXTRA_DIST = PLAN LICENSE hamlib.m4 hamlib.pc.in README.md README.developer \
 	README.betatester README.freqranges README.multicast README.osx \
 	Android.mk
 
 doc_DATA = ChangeLog COPYING COPYING.LIB LICENSE \
-	README README.betatester README.developer
+	README.md README.betatester README.developer
 
 SUBDIRS = macros include lib security \
 	$(BACKEND_LIST) \
@@ -28,4 +28,6 @@ DIST_SUBDIRS = macros include lib src c++ bindings tests doc android scripts rot
 	security $(BACKEND_LIST) $(RIG_BACKEND_LIST) $(ROT_BACKEND_LIST) $(AMP_BACKEND_LIST)
 
 # Install any third party macros into our tree for distribution
-ACLOCAL_AMFLAGS = -I macros --install
+ACLOCAL_AMFLAGS = -I macros --install 
+
+AM_CFLAGS=-D_TIME_BITS=64

NEWS

@@ -1,8 +1,8 @@
 Hamlib -- History of visible changes.
 
 Copyright (C) 2000-2003  Frank Singleton
-Copyright (C) 2000-2021  Stephane Fillod, and others
-Copyright (C) 2000-2021  Michael Black W9MDB, and others
+Copyright (C) 2000-2023  Stephane Fillod, and others
+Copyright (C) 2000-2023  Michael Black W9MDB, and others
 
 Please send Hamlib bug reports to hamlib-developer@lists.sourceforge.net
 
@@ -13,13 +13,152 @@ Version 5.x -- future
         * Change FT1000MP Mark V model names to align with FT1000MP
 
 Version 4.6
-        * 2023-11-XX -- Planned for Nov 2023
+        * Added SDR Radio SDRConsole -- TS-2000 is now hardware flow control so need separate entry
+        * Added --set-conf=filter_usb, filter_usbd, and filter_cw to allow Icom rigs set mode to set filter number too
+        * Added macros for applications to obtain pointers to Hamlib structures(issues #1445, #1420, #487).
+          Internal conversion is still a WIP, but use of these macros will make the final cutover transparent to applications. 
+        * Added Guohe Q900 entry 
+        * Unify behavior of all rigctl split commands
+          * Make the set_split_* commands modify the state of the specified split VFO -- the current or targeted VFO do not have any effect
+          * Make the set_split_* commands enable split automatically if not enabled
+          * Make the get_split_* commands return frequency of 0 Hz, mode NONE and filter of 0 Hz if split is not enabled
+          * Allow all split commands to avoid VFO swapping if supported by the rig model
+        * Improve Icom backend to set/get frequency, mode and filter without VFO swapping if supported by the rig model
+        * Improve Yaesu newcat backend split handling
+        * Expose "Targetable features" (RIG_TARGETABLE_*) in dump_caps output to allow clients to determine which commands can be executed without VFO swapping
+        * Added RIG_FUNC_SYNC for FTDX101D/MP
+        * Added Barrett 4100
+        * Added DL2MAN (tr)uSDX -- needs refinement
+        * Added Thetis entry -- derived from FlexRadio/Apache PowerSDR
+        * Added VOICE/CW memory capability to many rigs -- thanks to David Balharrie M0DGB/G8FKH
+        * Add -# --skip_init option to rigctl to skip rig initialization -- useful for executing commands quickly
+        * rig_caps is no longer constant -- this may break some 3rd party relying on the "const" declaration.  Here's an example of how to handle compatiblity.
+#ifdef RIGCAPS_NOT_CONST
+static int add_to_list(struct rig_caps* rc, void*)
+#else
+static int add_to_list(const struct rig_caps* rc, void*)
+#endif
+
+        * IC7610 now has IPP, DPP, and TX_INHIBIT functions set/get
+        * Hamlib now starts a multicast server that sends out rig information.  Does not receive commands yet.
+          See README.multicast
+
+        * rigctld has new -b/bind-all option to try all interfaces -- restores original behavior.  This was done to fix duplicate rigctld instances on Windows
+        * Yaesu rigs can now use send_morse to send keyer message 1-5 or a CW message up to 50 chars (which will use memory 1)
+        * rig set level METER can now take SWR,COMP,ALC,IC/ID,DB,PO,VDD,TEMP arguments to set which meter to display
+        * reg get level displays meter number=name now
+        * Added parm BANDSELECT for Yaesu rigs
+            'p BANDSELECT' returns current band of VFOA
+            'P BANDSELECT BAND160M' example selects the 160M band
+            'P BANDSELECT ?' shows  bands available for the rig
+        * Added rig_cm108_get/set_bit to API and get/set_gpio to rigctl(d) for GPIO1,2,3,4 access on CM108
+        * Added BG2FX FX4/C/CR/L
+        * Fixed IC7610 to use new 0x25 0x26 command added in latest firmware
+        * Fix W command in rigctld to work propery -- can take terminating char or # of bytes to expect
+        * Add rig_set_debug_filename so Python can redirect debug stream
+        * Fix Yaesu LBL_NR to use proper values
+        * Add IC-905
+        * Add Anytone D578UVIII -- should work on any D558 model and perhaps others too
+        * Add saebrtrack rotor https://sites.google.com/site/marklhammond/saebrtrack
+        * Add offset_vfoa and offset_vfob applying to rig_set_freq
+        * Fix K4 to put it in K40 mode when requesting ID
+        * Fixes for M2 Rotors
+        * Add rigctlsync utility to synchronize frequency from a rig to SDR# (or others)
+        * Add SDR# rig for use with SDR#'s gpredict plugin -- can only get/set freq 
+        * Add Apex Shared Loop rotator -- unidirectional only so far
+        * Add client_version to rigctld so client can report it's version for future use/compatibility/alternatives
+        * Add --set-conf=tuner_control_pathname=hamlib_tuner_control (default)
+          If file exists then it will be called with 0/1 (Off/On) argument
+          with 'U TUNER 0' or 'U TUNER 1"
+          Default path is for current directory
         * Add MDS 4710/9710 rigs
+        * Add FLIR PTU-D48, E46, D100, D300 rotors
+        * Fix FTDX3000 rig split
+
+Version 4.5.6
+        * Fix rigctld/rigctltcp information
+        * Fix FT817 get/set_vfo
+
+Version 4.5.5
+        * 2023-04-05
+        * Add park to rotorez.c
+        * Fix rig power on/off from rigctl cmd line and rigctld
+        * Enable async mode by default to prevent WSJT-X crash on IC9700 with transceive on
+        * Fix IC7610 get_powerstat to disable it -- cannot read power status
+        * Fix K3 K22 command error for remote operations
+        * Fix Gemini DX1200 gemini_set_level
+        * Fix async I/O to not call flush
+        * Change EX startup commands for Yaesu rigs to allow errors...Win4Yaesu not recognizing EX commands
+        * Fix jst145 set_freq and get_freq
+        * Restore tcflush as some odd behavior was seen that tclush fixes
+        * Fix XG3 operations
+        * Separate the validation cmd in newcat.c to allow rig post_write_delay to be in effect
+        * Increase post_write to 20ms for FT710
+        * Add attenuator level control for TS890
+        * Update SMeter/SWR tables for TS890
+        * Add fix for TMD700
+        * Improve FT-857 get_vfo response when error occurs
+        * Allow FT-857 to use cached vfo on get_vfo when error occurs reading EEPROM
+        * Fix FTDX10 FT710 set_level AF
+        * Fix FT-450D detection
+        * Fix VFO A/B swapping for gpredict -- hopefully better behavior for VFO swapping rigs
+          Should avoid setting RX freq while TX and avoid TX freq while RX
+        * Fix QRP QDX PTT to new TQ command due to firmware changes
+        * Remove EX103 check for FTDX5000
+        * Fix K3/K3S VFOB setting of mode/width
+        * Fix AGC level display in rigctld
+        * Change FTDX10 to no serial handshake
+        * Add TS2000 to has_ps exception
+        * Add FT991 to 60M exception
+        * Fix get_powerstat bad call in rigctl_parse.c
+        * Really fix CM108 ptt_bitnum usage
+        * Fix Elecraft power2mW precision/accuracy
+        * Fix power on/off/on for Icom rigs with rigctld power_on=0
+        
+Version 4.5.4
+        * 2023-01-10
+        * Fix CM108 ptt setting for non-default usage
+        * Fix power on/off for Icom rigs with rigctld power_on=0
+        * Fix get_powerstat status return for non-PS kenwood rigs
+        * Fix FT-710, FTDX10, FTDX101D/MP usage on 60M
+        * Fix timing on NRD-535D
+        * Fix AGC levels with rigctld
+        * Fix FTDX3000 EX039 error
+        * Fix Elecraft power2mW operation
+        * Fix rig_power2mW so it checks all ranges
+        * Allow rigctld to start with autopower_on=0 to avoid startup timeouts when rig is powered off
+        * Fix dummy device to work with grig by disallowing empty "u" call
+        * Fix ID5100 and promote to stable and hopefully ID4100 too
+        * Remove get_powerstat from Icom ID-5100,ID-4100,ID-31,ID-51 and fix get/set freq in all
+
+Version 4.5.3
+        * 2022-12-31
+        * Fix serial.c for hardware flow control on Linux and MacOSy
+        * Add QRPLabs QCX/QDX rig -- not quite a TS480
+        * Fix QRP QRDX firmware bugs in IF message so PTT works now
+        * FTDX5000 will now remember startup front/read settings and restore it
+        * Fix FTDX5000 write_delay with microham
+        * Fix grep error on MingW build
+
+Version 4.5.2
+        * 2022-12-23
+        * Fix PowerSDR ability to do commands while powered off
+        * Fix TX-500 operations
+        * Fix FTDX5000 to return to MIC input on closing
+        * Fix rig.c calling rig_get_mode when backend does not have get_mode
+        * Fix kenwood_ts890_get_level
+        * Add Prosistel D elevation CBOX az to fix problem with azimuth control
+        * Fix FT736R gpredict usage by adding cached get_freq
+        * Fix get_powerstat problem with Log4OM/Flex and others
+        * Fix -R option to not need argument
+        * Fix -R option to close rig on last rigctld client disconnect
+        * Add FTDX1200 to rigs that need to ensure PTT is off before changing frequency
+        * Add --disable-parallel configure option for mingw builds on Linux
 
 Version 4.5.1
-        * 2022-XX-XX
+        * 2022-12-08
         * FT2000, FTDX3000/D, FT891, FT991, FT950, FTDX5000 now set CAT TOT to 100ms
-        * Add missing NB2 setting to FT-950, FTDX-1200, FTDX-3000, FTDX-5000, FTDX-9000
+        * Add missing NB2 setting to FT-950, FTDX-1200, FT-2000, FTDX-3000, FTDX-5000, FTDX-9000
         * Add missing meter reading to TS-890S -- thanks to Geore Baltz N3GB
         * Fix FT736 VFOB freq and mode set
         * Added send_raw to rigctl -- see rigctl man page
@@ -118,7 +257,7 @@ Version 4.3.1
             - scripts: Update example in readme, since 4.0 817 is 1020
             - Make testlibusb.c compatible with libusb < 1.0.23
               Note: On systems with libusb < 1.0.23 a warning will be emitted
-              but compliation should proceed without error.
+              but compilation should proceed without error.
             - Update testlibusb.c warning to "may be" instead of "will be"
             - Change kenwood to only set VFOA default on 1st rig_open call
 

README.developer

@@ -2,7 +2,8 @@ Hamlib - (C) Frank Singleton 2000 (vk3fcs@ix.netcom.com)
          (C) Stephane Fillod 2000-2011
          (C) The Hamlib Group 2000-2013
 
-Take a look at http://sourceforge.net/projects/hamlib/
+Primary site for the latest development version of Hamlib is https://github.com/Hamlib/Hamlib
+Also take a look at http://sourceforge.net/projects/hamlib/
 Here you will find a mail list, and the latest releases.
 
 See README.md for frontend/backend outline.

README.multicast

@@ -1,13 +1,69 @@
-Planned for version 5.0 -- comments/suggestions about this are more than welcome
+Planned for version 4.6 -- comments/suggestions about this are more than welcome
+Example of multicast packet as of 2023-10-20
+===================================================================
+{
+  "app": "Hamlib",
+  "version": "4.6~git 2023-10-20T16:52:59Z SHA=d87671",
+  "seq": 183,
+  "time": "2023-10-20T20:13:53.139869-0000",
+  "crc": 0,
+  "rig": {
+    "id": "FLRig:127.0.0.1:12345:30508",
+    "status": "OK",
+    "errorMsg": "",
+    "name": "FLRig",
+    "split": false,
+    "splitVfo": "VFOA",
+    "satMode": false,
+    "modelist": "AM CW USB LSB FM CWR PKTLSB PKTUSB "
+  },
+  "vfos": [
+    {
+      "name": "VFOA",
+      "freq": 14074270,
+      "mode": "PKTUSB",
+      "width": 3,
+      "ptt": false,
+      "rx": true,
+      "tx": true
+    },
+    {
+      "name": "VFOB",
+      "freq": 14074500,
+      "mode": "",
+      "width": 0,
+      "ptt": false,
+      "rx": false,
+      "tx": false
+    }
+  ],
+  "spectra": [
+    {
+      "id": 0,
+      "name": "?",
+      "type": "FIXED",
+      "minLevel": 0,
+      "maxLevel": 0,
+      "minStrength": 0,
+      "maxStrength": 0,
+      "centerFreq": 0,
+      "span": 0,
+      "lowFreq": 0,
+      "highFreq": 0,
+      "length": 0,
+      "data": ""
+    }
+  ]
+}
+===========================================================
 Multicast UDP broadcast containing rig snapshot data
 Bidirectional rig control and status
 Choice of token pairs or JSON
 All packets will be tagged with ID=[unique name] -- so multiple rigs can broadcast/rx on the same port
-Will be able to set freq, mode, width, ptt, satmode, and split to start since those are common to many apps.
+Will eventually be able to set freq, mode, width, ptt, satmode, and split to start since those are common to many apps.
 More functions will be added as time goes on.
 
 Broadcast packet contents to be based on get_rig_info output
-This will be the text format of name=value pairs
 Can be multiple VFO lines
 Parsers should allow for unknown tags that may be added in the future
 
@@ -34,14 +90,23 @@ JSON data snapshot format for UDP packets:
   "crc": 0,
   "rig": {
     "__comment1__": "customizable rig identification -- will allow multiple rigs to be on the multicast",
-    "id": "Rig#1",
-    "name": "Dummy",
+    "id": {
+        "model":"IC-7300",
+        "endpoint":"com1",
+        "process":"53535",
+    }
+    "name": "IC-7300",
     "ptt" : false,
     "split": true,
     "splitVfo": "VFOB",
     "satMode": false,
     "status": "OK";
     "errorMsg": "OK",
+    "modes":[
+        "AM",
+        "CW",
+        "USB"
+    ]
   },
   "vfos": [
   {

Segfault-award

@@ -7,6 +7,10 @@ A developer cannot apply for HSHR for segfaults on his/her own code.
 
 Here is the list of the brave fellows:
 
+* Christoph Berg DF7CB  python with Hamlib.rig_parse(None)
+
+* Saku Nyland OH1KH v4.5.1, 10/2022, rigctld.c using ptt_type=RTS
+
 * David Kjellquist WB5NHL, v1.1.3, 09/2002, kenwood/ts570.c
 	caught on TS570D backend startup.
 

amplifiers/elecraft/kpa.c

@@ -21,7 +21,6 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include "misc.h"
 #include "kpa.h"
 
 struct fault_list
@@ -75,7 +74,7 @@ int kpa_init(AMP *amp)
         return -RIG_ENOMEM;
     }
 
-    amp->state.ampport.type.rig = RIG_PORT_SERIAL;
+    AMPPORT(amp)->type.rig = RIG_PORT_SERIAL;
 
     return RIG_OK;
 }
@@ -93,18 +92,14 @@ int kpa_close(AMP *amp)
 
 int kpa_flushbuffer(AMP *amp)
 {
-    struct amp_state *rs;
-
     rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
 
-    rs = &amp->state;
-
-    return rig_flush(&rs->ampport);
+    return rig_flush(AMPPORT(amp));
 }
 
 int kpa_transaction(AMP *amp, const char *cmd, char *response, int response_len)
 {
-    struct amp_state *rs;
+    hamlib_port_t *ampp = AMPPORT(amp);
     int err;
     int len = 0;
     int loop;
@@ -115,19 +110,17 @@ int kpa_transaction(AMP *amp, const char *cmd, char *response, int response_len)
 
     kpa_flushbuffer(amp);
 
-    rs = &amp->state;
-
     loop = 3;
 
     do   // wake up the amp by sending ; until we receive ;
     {
         char c = ';';
         rig_debug(RIG_DEBUG_VERBOSE, "%s waiting for ;\n", __func__);
-        err = write_block(&rs->ampport, (unsigned char *) &c, 1);
+        err = write_block(ampp, (unsigned char *) &c, 1);
 
         if (err != RIG_OK) { return err; }
 
-        len = read_string(&rs->ampport, (unsigned char *) response, response_len, ";",
+        len = read_string(ampp, (unsigned char *) response, response_len, ";",
                           1, 0, 1);
 
         if (len < 0) { return len; }
@@ -135,14 +128,14 @@ int kpa_transaction(AMP *amp, const char *cmd, char *response, int response_len)
     while (--loop > 0 && (len != 1 || response[0] != ';'));
 
     // Now send our command
-    err = write_block(&rs->ampport, (unsigned char *) cmd, strlen(cmd));
+    err = write_block(ampp, (unsigned char *) cmd, strlen(cmd));
 
     if (err != RIG_OK) { return err; }
 
     if (response) // if response expected get it
     {
         response[0] = 0;
-        len = read_string(&rs->ampport, (unsigned char *) response, response_len, ";",
+        len = read_string(ampp, (unsigned char *) response, response_len, ";",
                           1, 0, 1);
 
         if (len < 0)
@@ -165,11 +158,11 @@ int kpa_transaction(AMP *amp, const char *cmd, char *response, int response_len)
         {
             char c = ';';
             rig_debug(RIG_DEBUG_VERBOSE, "%s waiting for ;\n", __func__);
-            err = write_block(&rs->ampport, (unsigned char *) &c, 1);
+            err = write_block(ampp, (unsigned char *) &c, 1);
 
             if (err != RIG_OK) { return err; }
 
-            len = read_string(&rs->ampport, (unsigned char *) responsebuf, KPABUFSZ, ";", 1,
+            len = read_string(ampp, (unsigned char *) responsebuf, KPABUFSZ, ";", 1,
                               0, 1);
 
             if (len < 0) { return len; }
@@ -184,6 +177,7 @@ int kpa_transaction(AMP *amp, const char *cmd, char *response, int response_len)
  * Get Info
  * returns the model name string
  */
+// cppcheck-suppress *
 const char *kpa_get_info(AMP *amp)
 {
     const struct amp_caps *rc;
@@ -227,7 +221,7 @@ int kpa_get_freq(AMP *amp, freq_t *freq)
 
 int kpa_set_freq(AMP *amp, freq_t freq)
 {
-    char responsebuf[KPABUFSZ];
+    char responsebuf[KPABUFSZ] = "\0";
     int retval;
     unsigned long tfreq;
     int nargs;
@@ -277,7 +271,6 @@ int kpa_get_level(AMP *amp, setting_t level, value_t *val)
     int pwrinput;
     float float_value = 0;
     int int_value = 0, int_value2 = 0;
-    struct amp_state *rs = &amp->state;
     struct kpa_priv_data *priv = amp->state.priv;
 
 
@@ -373,7 +366,7 @@ int kpa_get_level(AMP *amp, setting_t level, value_t *val)
         //
         do
         {
-            retval = read_string(&rs->ampport, (unsigned char *) responsebuf,
+            retval = read_string(AMPPORT(amp), (unsigned char *) responsebuf,
                                  sizeof(responsebuf), ";", 1, 0,
                                  1);
 

amplifiers/elecraft/kpa.h

@@ -33,7 +33,7 @@
 // Is this big enough?
 #define KPABUFSZ 100
 
-extern const struct amp_caps kpa1500_rot_caps;
+extern const struct amp_caps kpa1500_amp_caps;
 
 /*
  * Private data structure

amplifiers/elecraft/kpa1500.c

@@ -22,7 +22,6 @@
  *
  */
 
-#include <hamlib/config.h>
 
 #include <stdio.h>
 
@@ -63,7 +62,7 @@ const struct amp_caps kpa1500_amp_caps =
     .mfg_name =     "Elecraft",
     .version =      "20220710.0",
     .copyright =    "LGPL",
-    .status =     RIG_STATUS_ALPHA,
+    .status =     RIG_STATUS_BETA,
     .amp_type =     AMP_TYPE_OTHER,
     .port_type =    RIG_PORT_SERIAL,
     .serial_rate_min =  4800,
@@ -110,7 +109,6 @@ const struct amp_caps kpa1500_amp_caps =
 
 static int kpa1500_send_priv_cmd(AMP *amp, const char *cmdstr)
 {
-    struct amp_state *rs;
     int err;
 
     rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
@@ -120,8 +118,7 @@ static int kpa1500_send_priv_cmd(AMP *amp, const char *cmdstr)
         return -RIG_EINVAL;
     }
 
-    rs = &amp->state;
-    err = write_block(&rs->ampport, cmdstr, strlen(cmdstr));
+    err = write_block(AMPPORT(amp), cmdstr, strlen(cmdstr));
 
     if (err != RIG_OK)
     {

amplifiers/expert/Android.mk

@@ -0,0 +1,12 @@
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := expert.c
+LOCAL_MODULE := expert
+
+LOCAL_CFLAGS := 
+LOCAL_C_INCLUDES := android include src
+LOCAL_LDLIBS := -lhamlib
+
+include $(BUILD_STATIC_LIBRARY)

amplifiers/expert/Makefile.am

@@ -0,0 +1,8 @@
+SRC = expert.c 
+
+EXPERTSRC = expert.h
+
+noinst_LTLIBRARIES = libhamlib-expert.la
+libhamlib_expert_la_SOURCES = $(SRC) $(EXPERTSRC)
+
+EXTRA_DIST = README.expert Android.mk

amplifiers/expert/README.expert

@@ -0,0 +1,7 @@
+hamlib - Copyright (C) 2023 The Hamlib Group
+
+File: README.expert
+
+Notes on Expert backends
+
+2023-03-20 Initial prototype for Expert amplifiers

amplifiers/expert/expert.c

@@ -0,0 +1,750 @@
+/*
+ *  Hamlib Expert amplifier backend - low level communication routines
+ *  Copyright (c) 2023 by Michael Black W9MDB
+ *
+ *
+ *   This library is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU Lesser General Public
+ *   License as published by the Free Software Foundation; either
+ *   version 2.1 of the License, or (at your option) any later version.
+ *
+ *   This library is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *   Lesser General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Lesser General Public
+ *   License along with this library; if not, write to the Free Software
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#include <stdlib.h>
+#include <string.h>
+#include "expert.h"
+#include "register.h"
+#include "misc.h"
+
+struct fault_list
+{
+    int code;
+    char *errmsg;
+};
+const struct fault_list expert_fault_list [] =
+{
+    {0, "No fault condition"},
+    {0x10, "Watchdog Timer was reset"},
+    {0x20, "PA Current is too high"},
+    {0x40, "Temperature is too high"},
+    {0x60, "Input power is too high"},
+    {0x61, "Gain is too low"},
+    {0x70, "Invalid frequency"},
+    {0x80, "50V supply voltage too low or too high"},
+    {0x81, "5V supply voltage too low or too high"},
+    {0x82, "10V supply voltage too low or too high"},
+    {0x83, "12V supply voltage too low or too high"},
+    {0x84, "-12V supply voltage too low or too high"},
+    {0x85, "5V or 400V LPF board supply voltages not detected"},
+    {0x90, "Reflected power is too high"},
+    {0x91, "SWR very high"},
+    {0x92, "ATU no match"},
+    {0xB0, "Dissipated power too high"},
+    {0xC0, "Forward power too high"},
+    {0xE0, "Forward power too high for current setting"},
+    {0xF0, "Gain is too high"},
+    {0, NULL}
+};
+
+/*
+ * Initialize data structures
+ */
+
+int expert_init(AMP *amp)
+{
+    rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
+
+    if (!amp)
+    {
+        return -RIG_EINVAL;
+    }
+
+    amp->state.priv = (struct expert_priv_data *)
+                      calloc(1, sizeof(struct expert_priv_data));
+
+    if (!amp->state.priv)
+    {
+        return -RIG_ENOMEM;
+    }
+
+    AMPPORT(amp)->type.rig = RIG_PORT_SERIAL;
+
+    return RIG_OK;
+}
+
+int expert_open(AMP *amp)
+{
+    unsigned char cmd = 0x80;
+    unsigned char response[256];
+
+    rig_debug(RIG_DEBUG_TRACE, "%s: entered\n", __func__);
+
+    expert_transaction(amp, &cmd, 1, response, 256);
+
+    return RIG_OK;
+}
+
+int expert_close(AMP *amp)
+{
+
+    unsigned char cmd = 0x81;
+    unsigned char response[256];
+
+    rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
+    expert_transaction(amp, &cmd, 1, response, 4);
+
+    if (amp->state.priv) { free(amp->state.priv); }
+
+    amp->state.priv = NULL;
+
+    return RIG_OK;
+}
+
+int expert_flushbuffer(AMP *amp)
+{
+    rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
+
+    return rig_flush(AMPPORT(amp));
+}
+
+int expert_transaction(AMP *amp, const unsigned char *cmd, int cmd_len,
+                       unsigned char *response, int response_len)
+{
+    hamlib_port_t *ampp = AMPPORT(amp);
+    int err;
+    int len = 0;
+    char cmdbuf[64];
+    int checksum = 0;
+
+    if (cmd) { rig_debug(RIG_DEBUG_VERBOSE, "%s called, cmd=%80s\n", __func__, cmd); }
+    else
+    {
+        rig_debug(RIG_DEBUG_ERR, "%s: cmd empty\n", __func__);
+        return -RIG_EINVAL;
+    }
+
+    if (!amp) { return -RIG_EINVAL; }
+
+    expert_flushbuffer(amp);
+
+    cmdbuf[0] = cmdbuf[1] = cmdbuf[2] = 0x55;
+
+    for (int i = 0; i < cmd_len; ++i) { checksum += cmd[i]; }
+
+    checksum = checksum % 256;
+    cmdbuf[3] = cmd_len;
+    memcpy(&cmdbuf[4], cmd, cmd_len);
+    cmdbuf[3 + cmd_len + 1] = checksum;
+
+    // Now send our command
+    err = write_block(ampp, (unsigned char *) cmdbuf, 3 + cmd_len + 2);
+
+    if (err != RIG_OK) { return err; }
+
+    if (response) // if response expected get it
+    {
+        int bytes = 0;
+        response[0] = 0;
+        // read the 4-byte header x55x55x55xXX where XX is the hex # of bytes
+        len = read_block_direct(ampp, (unsigned  char *) response, 4);
+        rig_debug(RIG_DEBUG_ERR, "%s: len=%d, bytes=%02x\n", __func__, len,
+                  response[3]);
+
+        if (len < 0)
+        {
+            rig_debug(RIG_DEBUG_VERBOSE, "%s: error=%s\n", __func__,
+                      rigerror(len));
+            return len;
+        }
+
+        if (len == 4) { bytes = response[3]; }
+
+        rig_debug(RIG_DEBUG_ERR, "%s: bytes=%d\n", __func__, bytes);
+        len = read_block_direct(ampp, (unsigned  char *) response, bytes - 3);
+        dump_hex(response, len);
+    }
+    else   // if no response expected try to get one
+    {
+        char responsebuf[KPABUFSZ];
+        responsebuf[0] = 0;
+        int loop = 3;
+
+        do
+        {
+            char c = ';';
+            rig_debug(RIG_DEBUG_VERBOSE, "%s waiting for ;\n", __func__);
+            err = write_block(ampp, (unsigned char *) &c, 1);
+
+            if (err != RIG_OK) { return err; }
+
+            len = read_string(ampp, (unsigned char *) responsebuf, KPABUFSZ, ";", 1,
+                              0, 1);
+
+            if (len < 0) { return len; }
+        }
+        while (--loop > 0 && (len != 1 || responsebuf[0] != ';'));
+    }
+
+    return RIG_OK;
+}
+
+/*
+ * Get Info
+ * returns the model name string
+ */
+// cppcheck-suppress constParameterCallback
+const char *expert_get_info(AMP *amp)
+{
+    const struct amp_caps *rc;
+
+    rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
+
+    if (!amp) { return (const char *) - RIG_EINVAL; }
+
+    rc = amp->caps;
+
+    return rc->model_name;
+}
+
+int expert_get_freq(AMP *amp, freq_t *freq)
+{
+    char responsebuf[KPABUFSZ] = "\0";
+    int retval;
+    unsigned long tfreq;
+    int nargs;
+
+    rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
+
+    if (!amp) { return -RIG_EINVAL; }
+
+    retval = expert_transaction(amp, NULL, 0, NULL, sizeof(responsebuf));
+
+    if (retval != RIG_OK) { return retval; }
+
+    nargs = sscanf(responsebuf, "^FR%lu", &tfreq);
+
+    if (nargs != 1)
+    {
+        rig_debug(RIG_DEBUG_VERBOSE, "%s Error: ^FR response='%s'\n", __func__,
+                  responsebuf);
+        return -RIG_EPROTO;
+    }
+
+    *freq = tfreq * 1000;
+    return RIG_OK;
+}
+
+int expert_set_freq(AMP *amp, freq_t freq)
+{
+    char responsebuf[KPABUFSZ] = "\0";
+    int retval;
+    unsigned long tfreq;
+    int nargs;
+    unsigned char cmd[KPABUFSZ];
+
+    rig_debug(RIG_DEBUG_VERBOSE, "%s called, freq=%"PRIfreq"\n", __func__, freq);
+
+    if (!amp) { return -RIG_EINVAL; }
+
+//    SNPRINTF(cmd, sizeof(cmd), "^FR%05ld;", (long)freq / 1000);
+    cmd[0] = 0x00;
+    retval = expert_transaction(amp, cmd, 0, NULL, 0);
+
+    if (retval != RIG_OK) { return retval; }
+
+    nargs = sscanf(responsebuf, "^FR%lu", &tfreq);
+
+    if (nargs != 1)
+    {
+        rig_debug(RIG_DEBUG_ERR, "%s Error: ^FR response='%s'\n", __func__,
+                  responsebuf);
+        return -RIG_EPROTO;
+    }
+
+    if (tfreq * 1000 != freq)
+    {
+        rig_debug(RIG_DEBUG_ERR,
+                  "%s Error setting freq: ^FR freq!=freq2, %f=%lu '%s'\n", __func__,
+                  freq, tfreq * 1000, responsebuf);
+        return -RIG_EPROTO;
+    }
+
+    return RIG_OK;
+}
+
+int expert_get_level(AMP *amp, setting_t level, value_t *val)
+{
+    char responsebuf[KPABUFSZ] = "\0";
+    unsigned char cmd[8];
+    int retval;
+    int fault;
+    int i;
+    int nargs;
+    int antenna;
+    int pwrpeak;
+    int pwrref;
+    int pwrfwd;
+    int pwrinput;
+    float float_value = 0;
+    int int_value = 0, int_value2 = 0;
+    struct expert_priv_data *priv = amp->state.priv;
+
+
+    rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
+
+    // get the current antenna selected
+    cmd[0] = 0x00;
+    retval = expert_transaction(amp, cmd, 0, NULL, sizeof(responsebuf));
+
+    if (retval != RIG_OK) { return retval; }
+
+    antenna = 0;
+    nargs = sscanf(responsebuf, "^AE%d", &antenna);
+
+    if (nargs != 1)
+    {
+        rig_debug(RIG_DEBUG_ERR, "%s: invalid value %s='%s'\n", __func__, cmd,
+                  responsebuf);
+        return -RIG_EPROTO;
+    }
+
+    rig_debug(RIG_DEBUG_VERBOSE, "%s: cmd=%s, antenna=%d\n", __func__, cmd,
+              antenna);
+
+    switch (level)
+    {
+    case AMP_LEVEL_SWR:
+        cmd[0] = 0x00;
+        break;
+
+    case AMP_LEVEL_NH:
+        cmd[0] = 0x00;
+        break;
+
+    case AMP_LEVEL_PF:
+        cmd[0] = 0x00;
+        break;
+
+    case AMP_LEVEL_PWR_INPUT:
+        cmd[0] = 0x00;
+        break;
+
+    case AMP_LEVEL_PWR_FWD:
+        cmd[0] = 0x00;
+        break;
+
+    case AMP_LEVEL_PWR_REFLECTED:
+        cmd[0] = 0x00;
+        break;
+
+    case AMP_LEVEL_PWR_PEAK:
+        cmd[0] = 0x00;
+        break;
+
+    case AMP_LEVEL_FAULT:
+        cmd[0] = 0x00;
+        break;
+    }
+
+    retval = expert_transaction(amp, cmd, 0, NULL, sizeof(responsebuf));
+
+    if (retval != RIG_OK) { return retval; }
+
+    switch (level)
+    {
+    case AMP_LEVEL_SWR:
+
+        //nargs = sscanf(responsebuf, "^SW%f", &float_value);
+
+        if (nargs != 1)
+        {
+            rig_debug(RIG_DEBUG_ERR, "%s invalid value %s='%s'\n", __func__, cmd,
+                      responsebuf);
+            return -RIG_EPROTO;
+        }
+
+        val->f = float_value / 10.0f;
+        return RIG_OK;
+
+    case AMP_LEVEL_NH:
+    case AMP_LEVEL_PF:
+
+        //nargs = sscanf(responsebuf, "^DF%d,%d", &int_value, &int_value2);
+
+        if (nargs != 2)
+        {
+            rig_debug(RIG_DEBUG_ERR, "%s invalid value %s='%s'\n", __func__, cmd,
+                      responsebuf);
+            return -RIG_EPROTO;
+        }
+
+        rig_debug(RIG_DEBUG_VERBOSE, "%s freq range=%dKHz,%dKHz\n", __func__,
+                  int_value, int_value2);
+
+        //
+        do
+        {
+            retval = read_string(AMPPORT(amp), (unsigned char *) responsebuf,
+                                 sizeof(responsebuf), ";", 1, 0,
+                                 1);
+
+            if (retval != RIG_OK) { return retval; }
+
+            if (strstr(responsebuf, "BYPASS") != 0)
+            {
+                int antenna2 = 0;
+                nargs = sscanf(responsebuf, "AN%d Side TX %d %*s %*s %d", &antenna2, &int_value,
+                               &int_value2);
+                rig_debug(RIG_DEBUG_VERBOSE, "%s response='%s'\n", __func__, responsebuf);
+
+                if (nargs != 3)
+                {
+                    rig_debug(RIG_DEBUG_ERR, "%s invalid value %s='%s'\n", __func__, cmd,
+                              responsebuf);
+                    return -RIG_EPROTO;
+                }
+
+                rig_debug(RIG_DEBUG_VERBOSE, "%s antenna=%d,nH=%d\n", __func__, antenna2,
+                          int_value);
+
+                val->i = level == AMP_LEVEL_NH ? int_value : int_value2;
+                return RIG_OK;
+            }
+        }
+        while (strstr(responsebuf, "BYPASS"));
+
+
+        break;
+
+
+    case AMP_LEVEL_PWR_INPUT:
+        cmd[0] = 0x00;
+        nargs = sscanf(responsebuf, "^SW%d", &pwrinput);
+
+        if (nargs != 1)
+        {
+            rig_debug(RIG_DEBUG_ERR, "%s invalid value %s='%s'\n", __func__, cmd,
+                      responsebuf);
+            return -RIG_EPROTO;
+        }
+
+        val->i = pwrinput;
+        return RIG_OK;
+
+        break;
+
+    case AMP_LEVEL_PWR_FWD:
+        cmd[0] = 0x00;
+        nargs = sscanf(responsebuf, "^SW%d", &pwrfwd);
+
+        if (nargs != 1)
+        {
+            rig_debug(RIG_DEBUG_ERR, "%s invalid value %s='%s'\n", __func__, cmd,
+                      responsebuf);
+            return -RIG_EPROTO;
+        }
+
+        val->i = pwrfwd;
+        return RIG_OK;
+
+        break;
+
+    case AMP_LEVEL_PWR_REFLECTED:
+        cmd[0] = 0x00;
+        nargs = sscanf(responsebuf, "^SW%d", &pwrref);
+
+        if (nargs != 1)
+        {
+            rig_debug(RIG_DEBUG_ERR, "%s invalid value %s='%s'\n", __func__, cmd,
+                      responsebuf);
+            return -RIG_EPROTO;
+        }
+
+        val->i = pwrref;
+        return RIG_OK;
+
+        break;
+
+    case AMP_LEVEL_PWR_PEAK:
+        cmd[0] = 0x00;
+        nargs = sscanf(responsebuf, "^SW%d", &pwrpeak);
+
+        if (nargs != 1)
+        {
+            rig_debug(RIG_DEBUG_ERR, "%s invalid value %s='%s'\n", __func__, cmd,
+                      responsebuf);
+            return -RIG_EPROTO;
+        }
+
+        val->i = pwrpeak;
+        return RIG_OK;
+
+        break;
+
+    case AMP_LEVEL_FAULT:
+        cmd[0] = 0x00;
+        nargs = sscanf(responsebuf, "^SW%d", &fault);
+
+        if (nargs != 1)
+        {
+            rig_debug(RIG_DEBUG_ERR, "%s invalid value %s='%s'\n", __func__, cmd,
+                      responsebuf);
+            return -RIG_EPROTO;
+        }
+
+        for (i = 0; expert_fault_list[i].errmsg != NULL; ++i)
+        {
+            if (expert_fault_list[i].code == fault)
+            {
+                val->s =  expert_fault_list[i].errmsg;
+                return RIG_OK;
+            }
+        }
+
+        rig_debug(RIG_DEBUG_ERR, "%s unknown fault from %s\n", __func__, responsebuf);
+        SNPRINTF(priv->tmpbuf, sizeof(priv->tmpbuf), "Unknown fault code=0x%02x",
+                 fault);
+        val->s = priv->tmpbuf;
+        return RIG_OK;
+
+        break;
+
+    default:
+        rig_debug(RIG_DEBUG_ERR, "%s unknown level=%s\n", __func__,
+                  rig_strlevel(level));
+
+    }
+
+    return -RIG_EINVAL;
+}
+
+int expert_get_powerstat(AMP *amp, powerstat_t *status)
+{
+    unsigned char responsebuf[KPABUFSZ] = "\0";
+    int retval;
+    int operate = 0;
+    int ampon = 0;
+    int nargs = 0;
+
+    rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
+
+    *status = RIG_POWER_UNKNOWN;
+
+    if (!amp) { return -RIG_EINVAL; }
+
+    retval = expert_transaction(amp, NULL, 0, responsebuf, sizeof(responsebuf));
+
+    if (retval != RIG_OK) { return retval; }
+
+    //nargs = sscanf(responsebuf, "^ON%d", &ampon);
+
+    if (nargs != 1)
+    {
+        rig_debug(RIG_DEBUG_VERBOSE, "%s Error: ^ON response='%s'\n", __func__,
+                  responsebuf);
+        return -RIG_EPROTO;
+    }
+
+    switch (ampon)
+    {
+    case 0: *status = RIG_POWER_OFF; return RIG_OK;
+
+    case 1: *status = RIG_POWER_ON; break;
+
+    default:
+        rig_debug(RIG_DEBUG_VERBOSE, "%s Error: ^ON unknown response='%s'\n", __func__,
+                  responsebuf);
+        return -RIG_EPROTO;
+    }
+
+    retval = expert_transaction(amp, NULL, 0, responsebuf, sizeof(responsebuf));
+
+    if (retval != RIG_OK) { return retval; }
+
+    //nargs = sscanf(responsebuf, "^ON%d", &operate);
+
+    if (nargs != 1)
+    {
+        rig_debug(RIG_DEBUG_VERBOSE, "%s Error: ^ON response='%s'\n", __func__,
+                  responsebuf);
+        return -RIG_EPROTO;
+    }
+
+    *status = operate == 1 ? RIG_POWER_OPERATE : RIG_POWER_STANDBY;
+
+    return RIG_OK;
+}
+
+int expert_set_powerstat(AMP *amp, powerstat_t status)
+{
+    int retval;
+    unsigned char cmd[8];
+    int cmd_len = 1;
+
+    rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
+
+    if (!amp) { return -RIG_EINVAL; }
+
+    switch (status)
+    {
+    case RIG_POWER_UNKNOWN: break;
+
+    case RIG_POWER_OFF: cmd[0] = 0x0a; break;
+
+    case RIG_POWER_ON:  cmd[0] = 0x0b; break;
+
+    case RIG_POWER_OPERATE: cmd[0] = 0x0d; break;
+
+    case RIG_POWER_STANDBY: cmd[0] = 0x0a; break;
+
+
+    default:
+        rig_debug(RIG_DEBUG_ERR, "%s invalid status=%d\n", __func__, status);
+        cmd[0] = 0x00;
+
+    }
+
+    retval = expert_transaction(amp, cmd, cmd_len, NULL, 0);
+
+    if (retval != RIG_OK) { return retval; }
+
+    return RIG_OK;
+}
+
+int expert_reset(AMP *amp, amp_reset_t reset)
+{
+    int retval;
+
+    rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
+
+    // toggling from standby to operate supposed to reset
+    retval = expert_set_powerstat(amp, RIG_POWER_STANDBY);
+
+    if (retval != RIG_OK)
+    {
+        rig_debug(RIG_DEBUG_ERR, "%s: error setting RIG_POWER_STANDBY '%s'\n", __func__,
+                  strerror(retval));
+
+    }
+
+    return  expert_set_powerstat(amp, RIG_POWER_OPERATE);
+}
+
+
+struct expert_priv_data *expert_priv;
+/*
+ * API local implementation
+ *
+ */
+
+/*
+ * Private helper function prototypes
+ */
+
+/* *************************************
+ *
+ * Separate model capabilities
+ *
+ * *************************************
+ */
+
+
+/*
+ * Expert 1.3K-FA, 1.5K-FA, and 2K-FA
+ */
+
+const struct amp_caps expert_amp_caps =
+{
+    AMP_MODEL(AMP_MODEL_EXPERT_FA),
+    .model_name =   "1.3K-FA/1.5K-FA/2K-FA",
+    .mfg_name =     "Expert",
+    .version =      "20230328.0",
+    .copyright =    "LGPL",
+    .status =     RIG_STATUS_BETA,
+    .amp_type =     AMP_TYPE_OTHER,
+    .port_type =    RIG_PORT_SERIAL,
+    .serial_rate_min =  9600,
+    .serial_rate_max =  115200,
+    .serial_data_bits = 8,
+    .serial_stop_bits = 1,
+    .serial_parity =  RIG_PARITY_NONE,
+    .serial_handshake = RIG_HANDSHAKE_NONE,
+    .write_delay =    0,
+    .post_write_delay = 0,
+    .timeout =      2000,
+    .retry =      2,
+    .has_get_level = AMP_LEVEL_SWR | AMP_LEVEL_NH | AMP_LEVEL_PF | AMP_LEVEL_PWR_INPUT | AMP_LEVEL_PWR_FWD | AMP_LEVEL_PWR_REFLECTED | AMP_LEVEL_FAULT,
+    .has_set_level = 0,
+
+    .amp_open = expert_open,
+    .amp_init = expert_init,
+    .amp_close = expert_close,
+    .reset = expert_reset,
+    .get_info = expert_get_info,
+    .get_powerstat = expert_get_powerstat,
+    .set_powerstat = expert_set_powerstat,
+    .set_freq = expert_set_freq,
+    .get_freq = expert_get_freq,
+    .get_level = expert_get_level,
+};
+
+
+/* ************************************
+ *
+ * API functions
+ *
+ * ************************************
+ */
+
+/*
+ *
+ */
+
+#if 0 // not implemented yet
+/*
+ * Send command string to amplifier
+ */
+
+static int expert_send_priv_cmd(AMP *amp, const char *cmdstr)
+{
+    int err;
+
+    rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
+
+    if (!amp)
+    {
+        return -RIG_EINVAL;
+    }
+
+    err = write_block(AMPPORT(amp), cmdstr, strlen(cmdstr));
+
+    if (err != RIG_OK)
+    {
+        return err;
+    }
+
+    return RIG_OK;
+}
+#endif
+
+/*
+ * Initialize backend
+ */
+
+DECLARE_INITAMP_BACKEND(expert)
+{
+    rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
+
+    amp_register(&expert_amp_caps);
+
+    return RIG_OK;
+}

amplifiers/expert/expert.h

@@ -0,0 +1,62 @@
+/*
+ * Hamlib backend library for the Expert amplifier set.
+ *
+ * expert.h - (C) Michael Black W9MDB 2023
+ *
+ * This shared library provides an API for communicating
+ * via serial interface to Expert amplifiers.
+ *
+ *
+ *   This library is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU Lesser General Public
+ *   License as published by the Free Software Foundation; either
+ *   version 2.1 of the License, or (at your option) any later version.
+ *
+ *   This library is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *   Lesser General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Lesser General Public
+ *   License along with this library; if not, write to the Free Software
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifndef _AMP_EXPERT_H
+#define _AMP_EXPERT_H 1
+
+#include <hamlib/amplifier.h>
+#include <iofunc.h>
+#include <serial.h>
+
+// Is this big enough?
+#define KPABUFSZ 100
+
+extern const struct amp_caps expert_amp_caps;
+
+/*
+ * Private data structure
+ */
+struct expert_priv_data
+{
+    char tmpbuf[256];  // for unknown error msg
+};
+
+
+int expert_init(AMP *amp);
+int expert_close(AMP *amp);
+int expert_reset(AMP *amp, amp_reset_t reset);
+int expert_flush_buffer(AMP *amp);
+int expert_transaction(AMP *amp, const unsigned  char *cmd, int cmd_len, unsigned char *response,
+                    int response_len);
+const char *expert_get_info(AMP *amp);
+int expert_get_freq(AMP *amp, freq_t *freq);
+int expert_set_freq(AMP *amp, freq_t freq);
+
+int expert_get_level(AMP *amp, setting_t level, value_t *val);
+int expert_get_powerstat(AMP *amp, powerstat_t *status);
+int expert_set_powerstat(AMP *amp, powerstat_t status);
+
+#endif  /* _AMP_EXPERT_H */
+

amplifiers/gemini/dx1200.c

@@ -22,7 +22,6 @@
  *
  */
 
-#include <hamlib/config.h>
 
 #include <stdio.h>
 
@@ -61,9 +60,9 @@ const struct amp_caps gemini_amp_caps =
     AMP_MODEL(AMP_MODEL_GEMINI_DX1200),
     .model_name =   "DX1200/HF-1K",
     .mfg_name =     "Gemini",
-    .version =      "20220710.0",
+    .version =      "20230318.0",
     .copyright =    "LGPL",
-    .status =     RIG_STATUS_ALPHA,
+    .status =     RIG_STATUS_STABLE,
     .amp_type =     AMP_TYPE_OTHER,
     .port_type =    RIG_PORT_NETWORK,
     .write_delay =    0,
@@ -105,7 +104,6 @@ const struct amp_caps gemini_amp_caps =
 
 static int gemini_send_priv_cmd(AMP *amp, const char *cmdstr)
 {
-    struct amp_state *rs;
     int err;
 
     rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
@@ -115,8 +113,7 @@ static int gemini_send_priv_cmd(AMP *amp, const char *cmdstr)
         return -RIG_EINVAL;
     }
 
-    rs = &amp->state;
-    err = write_block(&rs->ampport, cmdstr, strlen(cmdstr));
+    err = write_block(AMPPORT(amp), cmdstr, strlen(cmdstr));
 
     if (err != RIG_OK)
     {

amplifiers/gemini/gemini.c

@@ -24,11 +24,13 @@
 #include "misc.h"
 #include "gemini.h"
 
+#if 0
 struct fault_list
 {
     int code;
     char *errmsg;
 };
+#endif
 
 /*
  * Initialize data structures
@@ -51,7 +53,7 @@ int gemini_init(AMP *amp)
         return -RIG_ENOMEM;
     }
 
-    amp->state.ampport.type.rig = RIG_PORT_NETWORK;
+    AMPPORT(amp)->type.rig = RIG_PORT_NETWORK;
 
     return RIG_OK;
 }
@@ -69,22 +71,17 @@ int gemini_close(AMP *amp)
 
 int gemini_flushbuffer(AMP *amp)
 {
-    struct amp_state *rs;
-
     rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
 
-    rs = &amp->state;
-
-    return rig_flush(&rs->ampport);
+    return rig_flush(AMPPORT(amp));
 }
 
 int gemini_transaction(AMP *amp, const char *cmd, char *response,
                        int response_len)
 {
 
-    struct amp_state *rs;
+    hamlib_port_t *ampp = AMPPORT(amp);
     int err;
-    int len = 0;
 
     rig_debug(RIG_DEBUG_VERBOSE, "%s called, cmd=%s\n", __func__, cmd);
 
@@ -92,18 +89,16 @@ int gemini_transaction(AMP *amp, const char *cmd, char *response,
 
     gemini_flushbuffer(amp);
 
-    rs = &amp->state;
-
     // Now send our command
-    err = write_block(&rs->ampport, (unsigned char *) cmd, strlen(cmd));
+    err = write_block(ampp, (unsigned char *) cmd, strlen(cmd));
 
     if (err != RIG_OK) { return err; }
 
     if (response) // if response expected get it
     {
         response[0] = 0;
-        len = read_string(&rs->ampport, (unsigned char *) response, response_len, "\n",
-                          1, 0, 1);
+        int len = read_string(ampp, (unsigned char *) response, response_len,
+                              "\n", 1, 0, 1);
 
         if (len < 0)
         {
@@ -123,6 +118,7 @@ int gemini_transaction(AMP *amp, const char *cmd, char *response,
  * Get Info
  * returns the model name string
  */
+// cppcheck-suppress constParameterPointer
 const char *gemini_get_info(AMP *amp)
 {
     const struct amp_caps *rc;
@@ -157,7 +153,7 @@ int gemini_status_parse(AMP *amp)
     {
         char tmp[8];
         double freq;
-        n += sscanf(p, "BAND=%lf%s", &freq, tmp);
+        n += sscanf(p, "BAND=%lf%7s", &freq, tmp);
 
         if (tmp[0] == 'K') { priv->band = freq * 1000; }
 
@@ -168,10 +164,10 @@ int gemini_status_parse(AMP *amp)
         n += sscanf(p, "VSWR=%lf", &priv->vswr);
         n += sscanf(p, "CURRENT=%d", &priv->current);
         n += sscanf(p, "TEMPERATURE=%d", &priv->temperature);
-        n += sscanf(p, "STATE=%s", priv->state);
-        n += sscanf(p, "PTT=%s", tmp);
+        n += sscanf(p, "STATE=%7s", priv->state);
+        n += sscanf(p, "PTT=%7s", tmp);
         priv->ptt = tmp[0] == 'T';
-        n += sscanf(p, "TRIP=%s", priv->trip);
+        n += sscanf(p, "TRIP=%7s", priv->trip);
 
         if (n == 0)
         {
@@ -187,12 +183,14 @@ int gemini_status_parse(AMP *amp)
 int gemini_get_freq(AMP *amp, freq_t *freq)
 {
     int retval;
-    struct gemini_priv_data *priv = amp->state.priv;
+    struct gemini_priv_data *priv;
 
     rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
 
     if (!amp) { return -RIG_EINVAL; }
 
+    priv = amp->state.priv;
+
     retval = gemini_status_parse(amp);
 
     if (retval != RIG_OK) { return retval; }
@@ -282,13 +280,12 @@ int gemini_set_level(AMP *amp, setting_t level, value_t val)
 
         if (val.f < .67) { cmd = "PM\n"; }
 
-        return RIG_OK;
         break;
     }
 
     retval = gemini_transaction(amp, cmd, NULL, 0);
 
-    if (retval != RIG_OK) { return retval; }
+    if (retval == RIG_OK) { return retval; }
 
     rig_debug(RIG_DEBUG_ERR, "%s: Unknown level=%s\n", __func__,
               rig_strlevel(level));

bindings/Makefile.am

@@ -39,7 +39,7 @@ BUILT_SOURCES += hamlibperl_wrap.c
 MOSTLYCLEANFILES += hamlibperl_wrap.c Hamlib.pm Hamlib.bs Hamlib-pl.mk.old
 example_DATA += perltest.pl
 
-hamlibperl_wrap.c: hamlib.swg $(SWIGDEP)
+hamlibperl_wrap.c: hamlib.swg $(SWIGDEP) ignore.swg rig.swg
 	$(AM_V_GEN)$(SWIG) -perl5 -shadow $(AM_CPPFLAGS) -I$(top_srcdir)/bindings \
 		-o $@ $$(test -f hamlib.swg || echo '$(srcdir)/')hamlib.swg
 

bindings/amplifier.swg

@@ -92,14 +92,14 @@ typedef struct Amp {
   AMPMETHOD1(set_powerstat, powerstat_t)
 
 	void set_conf(const char *name, const char *val) {
-		token_t tok = amp_token_lookup(self->amp, name);
+		hamlib_token_t tok = amp_token_lookup(self->amp, name);
 		if (tok == RIG_CONF_END)
 			self->error_status = -RIG_EINVAL;
 		else
 			self->error_status = amp_set_conf(self->amp, tok, val);
 	}
 
-	AMPMETHOD2(set_conf, token_t, const_char_string)
+	AMPMETHOD2(set_conf, hamlib_token_t, const_char_string)
 
 /*
  * declare wrapper method with one output argument besides AMP* 
@@ -110,14 +110,14 @@ typedef struct Amp {
 
   /* get functions */
 
-  const char *get_conf(token_t tok) {
+  const char *get_conf(hamlib_token_t tok) {
           static char s[128] = "";
           self->error_status = amp_get_conf(self->amp, tok, s);
           return s;
   }
 
   const char *get_conf(const char *name) {
-          token_t tok = amp_token_lookup(self->amp, name);
+          hamlib_token_t tok = amp_token_lookup(self->amp, name);
           static char s[128] = "";
           if (tok == RIG_CONF_END)
                   self->error_status = -RIG_EINVAL;

bindings/csharp/multicast/PLAN.txt

@@ -0,0 +1,8 @@
+Phase I
+    Broadcast primary rig info plus full packet with dummy values
+Phase II
+    Receive basic rig commands
+Phase III
+    Extend broadcast info
+Phase IV
+    Extend rig commands

bindings/csharp/multicast/README.txt

@@ -2,15 +2,15 @@ Works on Windows and Linux
 
 Requires you get dotnet installed of course
 
-For Wiundows install Visual Studio or such to get dotnet
+For Windows install Visual Studio or such to get dotnet
 
-On Ubuntu 20.04 it was this
+On Ubuntu 21.04 it was this
 apt install snap
 apt install mono-complete
-snap install dotnet-sdk --classic --channel=5.0
+snap install dotnet-sdk --classic --channel=6.0
 snap alias dotnet-sdk.dotnet dotnet
-snap install dotnet-runtime-50 --classic
-snap alias dotnet-runtime-50.dotnet dotnet
+snap install dotnet-runtime-60 --classic
+snap alias dotnet-runtime-60.dotnet dotnet
 export DOTNET_ROOT=/snap/dotnet-sdk/current
 
 Once dotnet is OK
@@ -19,4 +19,20 @@ dotnet build
 
 You should then be able to run
 
-./bin/Debug/net5.0/multicast
+./bin/Debug/net6.0/multicast
+
+======================================================
+Waiting for Net 7.0/8.0 to be in Ubunut main packages
+Following did not work
+
+sudo apt remove 'dotnet*' 'aspnet*' 'netstandard*'
+touch /etc/apt/preferences
+// add to preferences
+Package: dotnet* aspnet* netstandard*
+Pin: origin "archive.ubuntu.com"
+Pin-Priority: -10
+// end preferences
+snap remove dotnet-sdk
+snap install dotnet-sdk --classic --channel=7.0
+snap alias dotnet-runtime-70.dotnet dotnet
+

bindings/csharp/multicast/multicast.cs

@@ -9,6 +9,7 @@ namespace HamlibMultiCast
 {
     public class HamlibMulticastClient
     {
+        public string __comment1__;
         public class VFO
         {
             public string Name;
@@ -17,19 +18,25 @@ namespace HamlibMultiCast
             public int Width;
             public bool RX;
             public bool TX;
+            public int WidthLower;
+            public int WidthUpper;
         }
+        public string __comment_spectrum__;
         public class SpectrumClass
         {
             public string Name;
             public int Length;
+            public string __comment_spectrum_data__;
             public string Data;
             public string Type;
             public int MinLevel;
             public int MaxLevel;
             public int MinStrength;
             public int MaxStrength;
+            public string __comment_spectrum_center__;
             public double CenterFreq;
             public int Span;
+            public string __comment_spectrum_fixed__;
             public double LowFreq;
             public double HighFreq;
         }
@@ -38,14 +45,26 @@ namespace HamlibMultiCast
             public string Command;
             public string Status;
         }
+        public string __comment_gps__;
+        public class GPS {
+            public double Latitude;
+            public double Longitude;
+            public double Altitude;
+        }
         public string ID;
+        public string VFOCurr;
         public List<VFO> VFOs { get; set; }
         public bool Split;
+        public string __comment_time__;
+        public string Time;
         public bool SatMode;
         public string Rig;
         public string App;
+        public string __comment_version__;
         public string Version;
+        public string __comment_seq__;
         public UInt32 Seq;
+        public string __comment_crc__;
         public string CRC;
         public List<SpectrumClass> Spectra { get; set; }
     }

bindings/csharp/multicast/multicast.csproj

@@ -2,11 +2,11 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
   </ItemGroup>
 
 </Project>

bindings/csharp/multicast/test.json

@@ -1,78 +1,16 @@
+"ID": "FT-991:/dev/ttyUSB0",
+"Time": 2023-05-05T04:32:47.834952-0000,
+"Sequence": 892,
+"VFOCurr": "VFOA",
+"VFOs": [
 {
-  "__comment1__": "customizable rig identification -- will allow multiple rigs to be on the multicast",
-  "ID": "Rig#1", 
-  "VFOs": [
-  {
-    "Name": "VFOA",
-    "Freq": 14074000, 
-    "Mode": "USB",
-    "Width": 5000, 
-    "RX": true, 
-    "TX": false
-  },
-  {
-    "Name": "VFOB",
-    "Freq": 14076000,
-    "Mode": "USB",
-    "Width": 5000,
-    "RX": false,
-    "TX": false
-  }],
-
-  "__comment_spectrum__": "Rigs that have spectrum output may include this data",
-  "Spectra": [
-  {
-    "Name": "Main",
-    "Length": 475,
-    "__comment_spectrum_data__": "2-char hex bytes so data len=2*Length",
-    "Data": "00AAFF75BD2AAA...",
-    "Type": "FIXED|CENTER",
-    "MinLevel": 0,
-    "MaxLevel": 140,
-    "MinStrength": -100,
-    "MaxStrength": 0,
-
-    "__comment_spectrum_center__": "If Type=CENTER, the following fields will be present:",
-    "CenterFreq": 14267000,
-    "Span": 25000,
-
-    "__comment_spectrum_fixed__": "If SpectrumType=FIXED, the following fields will be present:",
-    "LowFreq": 14000000,
-    "HighFreq": 14250000
-  },
-  {
-    "Name": "Sub",
-    "Length": 475,
-    "__comment_spectrum_data__": "2-char hex bytes so data len=2*Length",
-    "Data": "00AAFF75BD2AAA...",
-    "Type": "FIXED|CENTER",
-    "MinLevel": 0,
-    "MaxLevel": 140,
-    "MinStrength": -100,
-    "MaxStrength": 0,
-
-    "__comment_spectrum_center__": "If Type=CENTER, the following fields will be present:",
-    "CenterFreq": 14267000,
-    "Span": 25000,
-
-    "__comment_spectrum_fixed__": "If SpectrumType=FIXED, the following fields will be present:",
-    "LowFreq": 14000000,
-    "HighFreq": 14250000
-  }],
-  "LastCommand": {
-     "ID": "MyApp 123", 
-     "Command": "set_freq VFOA 14074000",
-     "Status": "OK"
-  },
-
-  "Split": true,
-  "SatMode": false,
-  "Rig": "Dummy",
-  "App": "Hamlib",
-  "__comment_version__": "protocol version date YYYYMMDD",
-  "Version": "20210520", 
-  "__comment_seq__": "Seq is 1-up sequence number 32-bit -- wraps around to 1 from 2^32-1",
-  "Seq": 1,  
-  "__comment_crc__": "32-bit CRC of entire JSON record replacing the CRC value with 0x00000000",
-  "CRC": "0x00000000"
+{
+,
+"Name": "VFOA",
+"Freq": 14086800,
+"Mode": "AM",
+"Width": 9000,
+"RX": True,
+"TX": False
 }
+

bindings/ignore.swg

@@ -213,6 +213,8 @@
 %ignore hamlib_version2;
 %ignore macro_name;
 
+%ignore FIFO_RIG;
+
 #ifdef SWIGLUA
 %ignore Rig::set_level(setting_t,int,vfo_t);
 %ignore Rig::set_ext_level(setting_t,value_t,vfo_t);

bindings/rig.swg

@@ -359,7 +359,7 @@ typedef channel_t * const_channel_t_p;
 	METHOD3(set_ts, shortfreq_t)
 	METHOD2(set_ant, ant_t, value_t)
 	METHOD2(set_func, setting_t, int)
-	METHOD2(set_ext_func, token_t, int)
+	METHOD2(set_ext_func, hamlib_token_t, int)
 	METHOD3(set_bank, int)
 	METHOD3(set_mem, int)
 	METHOD3(send_dtmf, const_char_string)
@@ -371,7 +371,7 @@ typedef channel_t * const_channel_t_p;
 	METHODSUPERSET(level, int, i, RIG_LEVEL_IS_FLOAT(stg))
 	METHODSUPERSET(level, float, f, !RIG_LEVEL_IS_FLOAT(stg))
 	METHODSTRSET(level)
-	METHOD2(set_ext_level, token_t, value_t)
+	METHOD2(set_ext_level, hamlib_token_t, value_t)
 
 	METHODSIMPLEGET(level, int, i, RIG_LEVEL_IS_FLOAT(stg))
 	METHODSIMPLEGET(level, float, f, !RIG_LEVEL_IS_FLOAT(stg))
@@ -403,8 +403,8 @@ typedef channel_t * const_channel_t_p;
 	METHOD1(ext_token_lookup, const_char_string)	/* level & parm */
 	METHOD1(token_lookup, const_char_string)	/* conf */
 
-	METHOD2(set_conf, token_t, const_char_string)
-	METHOD2(set_ext_parm, token_t, value_t)
+	METHOD2(set_conf, hamlib_token_t, const_char_string)
+	METHOD2(set_ext_parm, hamlib_token_t, value_t)
 
 	METHODSIMPLESET(parm, int, i, RIG_PARM_IS_FLOAT(stg))
 	METHODSIMPLESET(parm, float, f, !RIG_PARM_IS_FLOAT(stg))
@@ -420,7 +420,7 @@ typedef channel_t * const_channel_t_p;
 
 
 	void set_conf(const char *name, const char *val) {
-		token_t tok = rig_token_lookup(self->rig, name);
+		hamlib_token_t tok = rig_token_lookup(self->rig, name);
 		if (tok == RIG_CONF_END)
 			self->error_status = -RIG_EINVAL;
 		else
@@ -508,14 +508,14 @@ typedef channel_t * const_channel_t_p;
 		return chan;
 	}
 
-	void get_conf(token_t tok, char *returnstr) {
+	void get_conf(hamlib_token_t tok, char *returnstr) {
 		returnstr[0] = '\0';
 		self->error_status = rig_get_conf(self->rig, tok, returnstr);
 	}
 
 	void get_conf(const char *name, char *returnstr) {
 		returnstr[0] = '\0';
-		token_t tok = rig_token_lookup(self->rig, name);
+		hamlib_token_t tok = rig_token_lookup(self->rig, name);
 		if (tok == RIG_CONF_END)
 			self->error_status = -RIG_EINVAL;
 		else
@@ -540,7 +540,7 @@ typedef channel_t * const_channel_t_p;
 		return status;
 	}
 
-	int get_ext_func(token_t func, vfo_t vfo = RIG_VFO_CURR) {
+	int get_ext_func(hamlib_token_t func, vfo_t vfo = RIG_VFO_CURR) {
 		int status;
 		self->error_status = rig_get_ext_func(self->rig, vfo, func, &status);
 		return status;
@@ -554,7 +554,7 @@ typedef channel_t * const_channel_t_p;
 			/* TODO: dynamic casting */
 		}
 
-	void get_ext_level(token_t token, vfo_t vfo = RIG_VFO_CURR)
+	void get_ext_level(hamlib_token_t token, vfo_t vfo = RIG_VFO_CURR)
 		{ value_t val = {0}; self->error_status = rig_get_level(self->rig, vfo, token, &val);
 			//if (RIG_LEVEL_IS_FLOAT(level))
 			/* TODO: dynamic casting */
@@ -566,7 +566,7 @@ typedef channel_t * const_channel_t_p;
 			/* TODO: dynamic casting */
 		}
 
-	void get_ext_parm(token_t parm)
+	void get_ext_parm(hamlib_token_t parm)
 		{ value_t val = {0}; self->error_status = rig_get_parm(self->rig, parm, &val);
 			//if (RIG_LEVEL_IS_FLOAT(parm))
 			/* TODO: dynamic casting */

bindings/rotator.swg

@@ -88,23 +88,23 @@ typedef struct Rot {
 	ROTMETHOD1(token_lookup, const_char_string)	/* conf */
 
 	void set_conf(const char *name, const char *val) {
-		token_t tok = rot_token_lookup(self->rot, name);
+		hamlib_token_t tok = rot_token_lookup(self->rot, name);
 		if (tok == RIG_CONF_END)
 			self->error_status = -RIG_EINVAL;
 		else
 			self->error_status = rot_set_conf(self->rot, tok, val);
 	}
 
-	ROTMETHOD2(set_conf, token_t, const_char_string)
+	ROTMETHOD2(set_conf, hamlib_token_t, const_char_string)
 
-        const char *get_conf(token_t tok) {
+        const char *get_conf(hamlib_token_t tok) {
                 static char s[128] = "";
                 self->error_status = rot_get_conf(self->rot, tok, s);
                 return s;
         }
 
         const char *get_conf(const char *name) {
-                token_t tok = rot_token_lookup(self->rot, name);
+                hamlib_token_t tok = rot_token_lookup(self->rot, name);
                 static char s[128] = "";
                 if (tok == RIG_CONF_END)
                         self->error_status = -RIG_EINVAL;

c++/ampclass.cc

@@ -65,7 +65,7 @@ void Amplifier::close(void) {
 	CHECK_AMP( amp_close(theAmp) );
 }
 
-void Amplifier::setConf(token_t token, const char *val)
+void Amplifier::setConf(hamlib_token_t token, const char *val)
 {
 	CHECK_AMP( amp_set_conf(theAmp, token, val) );
 }
@@ -74,7 +74,7 @@ void Amplifier::setConf(const char *name, const char *val)
 	CHECK_AMP( amp_set_conf(theAmp, tokenLookup(name), val) );
 }
 
-void Amplifier::getConf(token_t token, char *val)
+void Amplifier::getConf(hamlib_token_t token, char *val)
 {
 	CHECK_AMP( amp_get_conf(theAmp, token, val) );
 }
@@ -83,7 +83,7 @@ void Amplifier::getConf(const char *name, char *val)
 	CHECK_AMP( amp_get_conf(theAmp, tokenLookup(name), val) );
 }
 
-token_t Amplifier::tokenLookup(const char *name)
+hamlib_token_t Amplifier::tokenLookup(const char *name)
 {
 	return amp_token_lookup(theAmp, name);
 }

c++/rigclass.cc

@@ -76,7 +76,7 @@ void Rig::close(void) {
 	CHECK_RIG( rig_close(theRig) );
 }
 
-void Rig::setConf(token_t token, const char *val)
+void Rig::setConf(hamlib_token_t token, const char *val)
 {
 	CHECK_RIG( rig_set_conf(theRig, token, val) );
 }
@@ -85,7 +85,7 @@ void Rig::setConf(const char *name, const char *val)
 	CHECK_RIG( rig_set_conf(theRig, tokenLookup(name), val) );
 }
 
-void Rig::getConf(token_t token, char *val)
+void Rig::getConf(hamlib_token_t token, char *val)
 {
 	CHECK_RIG( rig_get_conf(theRig, token, val) );
 }
@@ -94,7 +94,7 @@ void Rig::getConf(const char *name, char *val)
 	CHECK_RIG( rig_get_conf(theRig, tokenLookup(name), val) );
 }
 
-token_t Rig::tokenLookup(const char *name)
+hamlib_token_t Rig::tokenLookup(const char *name)
 {
 	return rig_token_lookup(theRig, name);
 }

c++/rotclass.cc

@@ -64,7 +64,7 @@ void Rotator::close(void) {
 	CHECK_ROT( rot_close(theRot) );
 }
 
-void Rotator::setConf(token_t token, const char *val)
+void Rotator::setConf(hamlib_token_t token, const char *val)
 {
 	CHECK_ROT( rot_set_conf(theRot, token, val) );
 }
@@ -73,7 +73,7 @@ void Rotator::setConf(const char *name, const char *val)
 	CHECK_ROT( rot_set_conf(theRot, tokenLookup(name), val) );
 }
 
-void Rotator::getConf(token_t token, char *val)
+void Rotator::getConf(hamlib_token_t token, char *val)
 {
 	CHECK_ROT( rot_get_conf(theRot, token, val) );
 }
@@ -82,7 +82,7 @@ void Rotator::getConf(const char *name, char *val)
 	CHECK_ROT( rot_get_conf(theRot, tokenLookup(name), val) );
 }
 
-token_t Rotator::tokenLookup(const char *name)
+hamlib_token_t Rotator::tokenLookup(const char *name)
 {
 	return rot_token_lookup(theRot, name);
 }

c++/testcpp.cc

@@ -11,7 +11,7 @@ int main(int argc, char* argv[])
 	Rig myRig {RIG_MODEL_DUMMY};
 
 	try {
-		myRig.setConf("rig_pathname", "/dev/ttyS1");
+		myRig.setConf("rig_pathname", "/dev/pts/4");
 		myRig.open();
 		myRig.setFreq(MHz(144));
 		std::cout << myRig.getLevelI(RIG_LEVEL_STRENGTH) << "dB" << std::endl;

configure.ac

@@ -15,6 +15,8 @@ dnl however, the use of '~' should be fine as apt (others?) will treat
 dnl it as an earlier version than the actual release.  TNX KA6MAL
 dnl PACKAGE_NAME + " " + PACKAGE_VERSION must not exceed 20 chars!
 AC_INIT([Hamlib],[4.6~git],[hamlib-developer@lists.sourceforge.net],[hamlib],[http://www.hamlib.org])
+#AC_INIT([PRODUCT_NAME], [Hamlib])
+#AC_DEFINE([Hamlib], [PRODUCT_VERSION_RESOURCE])
 
 AC_CONFIG_SRCDIR([include/hamlib/rig.h])
 AC_CONFIG_MACRO_DIR([macros])
@@ -41,27 +43,48 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 ## ------------------------------ ##
 ## Hamlib specific configuration. ##
 ## ------------------------------ ##
+AC_ARG_ENABLE([shared],
+              [AS_HELP_STRING([--enable-shared],
+                              [Enable shared libraries @<:@default=yes@:>@])],
+              [enable_shared=$enableval],
+              [enable_shared=yes])
+AC_ARG_ENABLE([static],
+              [AS_HELP_STRING([--enable-static],
+                              [Enable static libraries @<:@default=check@:>@])],
+              [enable_static=$enableval],
+              [enable_static=check])
+
+AS_IF([test "x$enable_static" = "xyes"], [
+    enable_shared=no
+])
+AS_IF([test "x$enable_static" = "xyes" && test "x$enable_shared" = "xyes"], [
+    AC_MSG_ERROR([Both --enable-static and --enable-shared cannot be enabled at the same time.])
+])
 
 dnl New backends must be listed here!  Also the new Makefile path must be
 dnl added to AC_CONFIG_FILES near the end of this file.  See README.developer
 dnl Beware of duplication should a backend directory include both rig and
 dnl rotor definitions, e.g. "dummy".  Optional backends will not be listed
 dnl here but will be added later, e.g. "winradio".
-RIG_BACKEND_LIST="rigs/adat rigs/alinco rigs/aor rigs/barrett rigs/codan rigs/dorji rigs/drake rigs/dummy rigs/elad rigs/flexradio rigs/icom rigs/icmarine rigs/jrc rigs/kachina rigs/kenwood rigs/kit rigs/lowe rigs/pcr rigs/prm80 rigs/racal rigs/rft rigs/rs rigs/skanti rigs/tapr rigs/tentec rigs/tuner rigs/uniden rigs/winradio rigs/wj rigs/yaesu rigs/gomspace rigs/mds"
-ROT_BACKEND_LIST="rotators/amsat rotators/ars rotators/celestron rotators/cnctrk rotators/grbltrk rotators/easycomm rotators/ether6 rotators/fodtrack rotators/gs232a rotators/heathkit rotators/m2 rotators/meade rotators/rotorez rotators/sartek rotators/spid rotators/ts7400 rotators/prosistel rotators/ioptron rotators/satel rotators/radant"
+RIG_BACKEND_LIST="rigs/adat rigs/alinco rigs/aor rigs/barrett rigs/codan rigs/dorji rigs/drake rigs/dummy rigs/elad rigs/flexradio rigs/icom rigs/icmarine rigs/jrc rigs/kachina rigs/kenwood rigs/kit rigs/lowe rigs/pcr rigs/prm80 rigs/racal rigs/rft rigs/rs rigs/skanti rigs/tapr rigs/tentec rigs/tuner rigs/uniden rigs/winradio rigs/wj rigs/yaesu rigs/gomspace rigs/mds rigs/anytone rigs/motorola"
+ROT_BACKEND_LIST="rotators/amsat rotators/apex rotators/ars rotators/celestron rotators/cnctrk rotators/grbltrk rotators/easycomm rotators/ether6 rotators/flir rotators/fodtrack rotators/gs232a rotators/heathkit rotators/m2 rotators/meade rotators/rotorez rotators/sartek rotators/saebrtrack rotators/spid rotators/ts7400 rotators/prosistel rotators/ioptron rotators/satel rotators/radant"
 # Amplifiers are all in the amplifiers directory
-AMP_BACKEND_LIST="amplifiers/elecraft amplifiers/gemini"
+AMP_BACKEND_LIST="amplifiers/elecraft amplifiers/gemini amplifiers/expert"
 
 dnl See README.release on setting these values
 # Values given to -version-info when linking.  See libtool documentation.
 # Set them here to keep c++/Makefile and src/Makefile in sync.
 ABI_VERSION=4
 ABI_REVISION=6
+ABI_PATCH=0
 ABI_AGE=0
 
 AC_DEFINE_UNQUOTED([ABI_VERSION], [$ABI_VERSION], [Frontend ABI version])
 AC_DEFINE_UNQUOTED([ABI_REVISION], [$ABI_REVISION], [Frontend ABI revision])
 AC_DEFINE_UNQUOTED([ABI_AGE], [$ABI_AGE], [Frontend ABI age])
+AC_DEFINE_UNQUOTED([ABI_VERSION_MAJOR], [$ABI_VERSION], [Frontend Major version])
+AC_DEFINE_UNQUOTED([ABI_VERSION_MINOR], [$ABI_REVISION], [Frontend Minor version])
+AC_DEFINE_UNQUOTED([ABI_VERSION_PATCH], [$ABI_PATCH], [Frontend Patch version])
 
 AC_SUBST([ABI_VERSION])
 AC_SUBST([ABI_REVISION])
@@ -71,7 +94,7 @@ AC_SUBST([ABI_AGE])
 AM_CPPFLAGS="${AM_CPPFLAGS} -DIN_HAMLIB"
 
 # Add Hamlib header include paths
-AM_CPPFLAGS="${AM_CPPFLAGS} -I\$(top_srcdir)/include -I\$(top_srcdir)/src -I\$(top_srcdir)/lib -I\$(top_builddir)/include"
+AM_CPPFLAGS="${AM_CPPFLAGS} -I\$(top_srcdir)/include -I\$(top_srcdir)/src -I\$(top_srcdir)/lib -I\$(top_builddir)/include  -I\$(top_srcdir)/include/hamlib -D_TIME_BITS=64 -D_FILE_OFFSET_BITS=64"
 
 
 ## --------------- ##
@@ -218,7 +241,17 @@ AC_CHECK_FUNC([gethostbyname],
 	      [],
 	      [AC_CHECK_LIB([ws2_32],
 			    [main],
-			    [NET_LIBS="$NET_LIBS -lws2_32"],
+			    [NET_LIBS="$NET_LIBS -lws2_32 -liphlpapi"],
+			    [],
+			    [])
+	      ])
+
+# Winsock2 32 bit
+AC_CHECK_FUNC([timeBeginPeriod],
+	      [],
+	      [AC_CHECK_LIB([winmm],
+			    [main],
+			    [NET_LIBS="$NET_LIBS -lwinmm"],
 			    [],
 			    [])
 	      ])
@@ -260,6 +293,7 @@ LT_PREREQ([2.2.6b])
 dnl N.B. LT_INIT([win32-dll]) does not work for older libtool
 dnl so require new enough version above.
 LT_INIT([win32-dll])
+LT_LANG([Windows Resource])
 
 
 ## -------------------------- ##
@@ -267,9 +301,10 @@ LT_INIT([win32-dll])
 ## -------------------------- ##
 
 dnl The host_os variable is set by the AC_CANONICAL_HOST macro above.
+AM_CONDITIONAL([VERSIONDLL], false)
 AS_CASE(["$host_os"],
     [freebsd*], [
-	AM_CPPFLAGS="-I/usr/local/include ${AM_CPPFLAGS}"
+	AM_CPPFLAGS="${AM_CPPFLAGS} -I/usr/local/include"
 	AM_LDFLAGS="${AM_LDFLAGS} -L/usr/local/lib"
 	AC_SUBST([AM_LDFLAGS])],
 
@@ -281,7 +316,9 @@ AS_CASE(["$host_os"],
 	AC_SUBST([OSXLDFLAGS])],
 
     [mingw* | pw32* | cygwin*], [
+	AM_CONDITIONAL([VERSIONDLL], true)
 	WINLDFLAGS="-Wl,--output-def,libhamlib.def -Wl,--add-stdcall-alias"
+    VERSIONDLL="version_dll.rc"
 	AC_SUBST([WINLDFLAGS])
 
 	# Enable ld's "auto import" for executables
@@ -362,12 +399,14 @@ AS_IF([test x"$ax_cv_lib_readline" = "xno"], [
 
 dnl Check if INDI support in rigctl/rotctl is wanted
 AC_MSG_CHECKING([whether to use INDI in rigctl/rotctl])
-AC_ARG_WITH([indi],
-    [AS_HELP_STRING([--without-indi],
-	[disable INDI in rigctl/rotctl @<:@default=yes@:>@])],
-	[cf_with_indi_support=no],
-	[cf_with_indi_support=yes]
+#AS_IF([test x"${cf_with_cxx_binding}" = "xyes"], [
+    AC_ARG_WITH([indi],
+        [AS_HELP_STRING([--without-indi],
+    	[disable INDI in rigctl/rotctl @<:@default=yes@:>@])],
+    	[cf_with_indi_support=yes],
+    	[cf_with_indi_support=no]
     )
+#])
 
 AS_IF([test x"$cf_with_indi_support" != "xno"], [
     # INDI support needs a C++ compiler, tested for presence above.
@@ -694,6 +733,15 @@ AC_ARG_ENABLE([winradio],
 	      [cf_with_winradio="yes" AC_DEFINE([HAVE_WINRADIO],[1],[Define if winradio backend is built])])
 AC_MSG_RESULT([$cf_with_winradio])
 
+dnl Parallel port device disable
+AC_MSG_CHECKING([whether to build parallel port devices])
+AC_ARG_ENABLE([parallel],
+	      [AS_HELP_STRING([--disable-parallel],
+			      [do not build parallel devices @<:@default=yes@:>@])],
+	      [cf_with_parallel="no"],
+	      [cf_with_parallel="yes" AC_DEFINE([HAVE_PARALLEL],[1],[Define if parallel devices are to be built])])
+AC_MSG_RESULT([$cf_with_parallel])
+
 DL_LIBS=""
 
 AS_IF([test x"${cf_with_winradio}" = "xyes"],
@@ -828,12 +876,14 @@ bindings/Makefile
 doc/Makefile
 doc/hamlib.cfg
 rotators/amsat/Makefile
+rotators/apex/Makefile
 rotators/ars/Makefile
 rotators/celestron/Makefile
 rotators/cnctrk/Makefile
 rotators/grbltrk/Makefile
 rotators/easycomm/Makefile
 rotators/ether6/Makefile
+rotators/flir/Makefile
 rotators/fodtrack/Makefile
 rotators/gs232a/Makefile
 rotators/heathkit/Makefile
@@ -843,6 +893,7 @@ rotators/meade/Makefile
 rotators/prosistel/Makefile
 rotators/rotorez/Makefile
 rotators/sartek/Makefile
+rotators/saebrtrack/Makefile
 rotators/spid/Makefile
 rotators/ts7400/Makefile
 rotators/indi/Makefile
@@ -880,11 +931,14 @@ rigs/wj/Makefile
 rigs/yaesu/Makefile
 rigs/gomspace/Makefile
 rigs/mds/Makefile
+rigs/anytone/Makefile
+rigs/motorola/Makefile
 tests/Makefile
 scripts/Makefile
 android/Makefile
 amplifiers/elecraft/Makefile
 amplifiers/gemini/Makefile
+amplifiers/expert/Makefile
 simulators/Makefile
 hamlib.pc
 ])
@@ -913,6 +967,7 @@ echo \
 
     Enable HTML rig feature matrix  ${cf_enable_html_matrix}
     Enable WinRadio		    ${cf_with_winradio}
+    Enable Parallel		    ${cf_with_parallel}
     Enable USRP 		    ${cf_with_usrp}
     Enable USB backends 	    ${cf_with_libusb}
     Enable shared libs		    ${enable_shared}

cppcheck.sh

@@ -1,5 +1,5 @@
 #!/bin/sh
-
+set -x
 # Author Michael Black W9MDB
 # This SUPPRESS setting results in no warnings as of 2020-01-14
 # There are things that could still be done...especially in the C++ area
@@ -14,6 +14,7 @@ SUPPRESS="\
 -i bindings \
 -i lib/getopt.c \
 -i lib/getopt_long.c \
+-i lib/cJSON.c \
 --suppress=*:extra/gnuradio/demod.h \
 --suppress=*:extra/gnuradio/HrAGC.h \
 --suppress=*:extra/gnuradio/nfm.h \
@@ -22,12 +23,9 @@ SUPPRESS="\
 --suppress=*:extra/gnuradio/wfm.h \
 --suppress=*:extra/gnuradio/wfm.h \
 --suppress=*:extra/gnuradio/HrAGC.h \
---suppress=knownConditionTrueFalse:tests/rotctl.c \
---suppress=knownConditionTrueFalse:tests/rigctl.c \
---suppress=knownConditionTrueFalse:tests/ampctl.c \
---suppress=knownConditionTrueFalse:tests/rotctl_parse.c \
---suppress=knownConditionTrueFalse:tests/rigctl_parse.c \
---suppress=knownConditionTrueFalse:tests/ampctl_parse.c"
+--suppress=*:extra/gnuradio/gnuradio.cc \
+--suppress=missingIncludeSystem \
+--suppress=*:style/rigs/adat/adat.c
 
 #CHECK="\
 #-D RIG_LEVEL_LINEOUT=1 \
@@ -73,6 +71,7 @@ CHECK="\
 -D SIGINT \
 -D WIN32 \
 -D CLOCK_REALTIME \
+-D HAVE_PTHREAD \
 -D HAVE_SIGNAL"
 
 # If no directory or file name provided, scan the entire project.
@@ -80,30 +79,35 @@ if test $# -eq 0 ; then
         echo "See cppcheck.log when done"
         echo "This takes a while to run"
         cppcheck --inline-suppr \
+                 --check-level=exhaustive \
                  -I src \
                  -I include \
-                 --include=include/config.h \
-                 --include=include/hamlib/rig.h \
+                 -I include/hamlib/ \
+                 -I lib \
+                 -I security \
                  -q \
                  --force \
                  --enable=all \
                  --std=c99 \
                  $SUPPRESS \
                  $CHECK \
+                 --template='{file}:{line},{severity},{id},{message}' \
                  . \
                  >cppcheck.log 2>&1
 else
-        cppcheck --check-config \
-                 --inline-suppr \
+        cppcheck --inline-suppr \
+                 --check-level=exhaustive \
                  -I src \
                  -I include \
-                 --include=include/config.h \
-                 --include=include/hamlib/rig.h \
+                 -I include/hamlib/ \
+                 -I lib \
+                 -I security \
                  -q \
                  --force \
                  --enable=all \
                  --std=c99 \
                  $SUPPRESS \
                  $CHECK \
-                 $1
+                 --template='{file}:{line},{severity},{id},{message}'\
+                 "$@"
 fi

doc/Makefile.am

@@ -2,7 +2,7 @@ EXTRA_DIST = hamlib.cfg index.doxygen hamlib.css footer.html hamlib.png
 
 dist_man_MANS = man1/ampctl.1 man1/ampctld.1 \
 	man1/rigctl.1 man1/rigctld.1 man1/rigmem.1 man1/rigsmtr.1 \
-	man1/rigswr.1 man1/rotctl.1 man1/rotctld.1 man1/rigctlcom.1 \
+	man1/rigswr.1 man1/rotctl.1 man1/rotctld.1 man1/rigctlcom.1 man1/rigctlsync.1 \
 	man7/hamlib.7 man7/hamlib-primer.7 man7/hamlib-utilities.7
 
 SRCDOCLST = \

doc/README.man-pages

@@ -159,7 +159,7 @@ PDF as blocks of constant width text and should be verbatim input or output
 in the shell, programs, or blocks of source code.
 
 Text intended to be typed at a shell or program prompt should be in bold and
-program orshell output in normal weight.  In some cases it will be necessary
+program or shell output in normal weight.  In some cases it will be necessary
 to use the "\fB...\fP" font formatting calls especially where backslash
 escapes ("\\") are required.
 

doc/hamlib.cfg.in

@@ -17,7 +17,7 @@ MAN_EXTENSION	= .3
 # Set GENERATE_LATEX to YES to generate the needed files for the PDF manual
 # and run 'make doc'.  Then 'cd latex ; make' to generate the PDF manual.
 #
-# See section 1.3.1.2 in @top_srcdir@/README.developer for the needed LaTEX
+# See section 1.3.1.2 in @top_srcdir@/README.developer for the needed LaTeX
 # packages.
 USE_PDFLATEX    = YES
 PDF_HYPERLINKS  = YES

doc/man1/rigctl.1

@@ -81,8 +81,7 @@ Use
 .I device
 as the file name of the port connected to the radio.
 .IP
-Often a serial port, but could be a USB to serial adapter.  Typically
-.IR /dev/ttyS0 ", " /dev/ttyS1 ", " /dev/ttyUSB0 ,
+Typically /dev/ttyS0 ", " /dev/ttyS1 ", " /dev/ttyUSB0 ,
 etc. on Linux,
 .IR COM1 ", " COM2 ,
 etc. on MS Windows.  The BSD flavors and Mac OS/X have their own designations.
@@ -187,8 +186,32 @@ above. Note the dummy device has no serial parameters.
 .
 .TP
 .BR \-C ", " \-\-set\-conf = \fIparm=val\fP [ \fI,parm=val\fP ]
-Set radio configuration parameter(s), e.g.
-.IR stop_bits=2 .
+Set configuration parameter(s). Some common ones are:
+.in +4n
+.EX
+.RB   async: "True enables asynchronous data transfer for backends that support it. This allows use of transceive and spectrum data."
+.RB   auto_power_on: "True enables compatible rigs to be powered up on open"
+.RB   auto_power_off: "True enables compatible rigs to be powered down on close"
+.RB   auto_disable_screensaver: "True enables compatible rigs to have their screen saver disabled on open"
+.RB   dcd_type: "Data Carrier Detect (or squelch) interface type override"
+.RB   dcd_pathname: "Path name to the device file of the Data Carrier Detect (or squelch)"
+.RB   disable_yaesu_bandselect: "True disables the automatic band select on band change for Yaesu rigs"
+.RB   dtr_state:  "ON turns on DTR, OFF turns it off, Unset disables it"
+.RB   lo_freq: "Frequency to add to the VFO frequency for use with a transverter"
+.RB   post_write_delay: "Delay in ms between each command sent out"
+.RB   ptt_share: "True enables ptt port to be shared with other apps"
+.RB   ptt_type: "Push-To-Talk interface type override"
+.RB   ptt_pathname: "Path name to the device file of the Push-To-Talk"
+.RB   ptt_bitnum: "Push-To-Talk GPIO bit number"
+.RB   retry: "Max number of retry"
+.RB   rts_state:  "ON turns on DTR, OFF turns it off, Unset disables it"
+.RB   twiddle_timeout: "For satellite ops when VFOB is twiddled will pause VFOB commands until timeout"
+.RB   twiddle_rit: "Suppress get_freq on VFOB for RIT tuning satellites"
+.RB   timeout: "Timeout in ms"
+.RB   write_delay: "Delay in ms between each byte sent out"
+.RB   tuner_control_pathname: "Path name to a script/program to control a tuner with 1 argument of 0/1 for Tuner Off/On"
+.EE
+.in
 .IP
 Use the
 .B -L
@@ -351,12 +374,12 @@ Since most of the
 .B Hamlib
 operations have a
 .BR set " and a " get
-method, an upper case letter will often be used for a
+method, a single upper case letter will often be used for a
 .B set
-method whereas the corresponding lower case letter refers to the
+method whereas the corresponding single lower case letter refers to the
 .B get
 method.  Each operation also has a long name; in interactive mode, prepend a
-backslash, \(oq\\\(cq, to enter a long command name.
+backslash, \(oq\\\(cq, to enter a long command name all lower case.
 .
 .PP
 Example: Use \(lq\\dump_caps\(rq to see what capabilities this radio and
@@ -701,7 +724,10 @@ Option returned depends on rig..for Icom is likely the RX only flag.
 .BR b ", " send_morse " \(aq" \fIMorse\fP \(aq
 Send
 .RI \(aq Morse \(aq
-symbols.  For Yaesu rigs use memory#.
+symbols.  For Yaesu rigs use memory#1-5 or up to 50 char msg
+.EX
+Example from command line:  rigctl -m 3073 -r /dev/ttyUSB0 b "CQ CQ DE ME"
+Yaesu example to send message#1: rigctl -m 1035 -r /dev/ttyUSB0 b 1
 .
 .TP
 .BR 0xbb ", " stop_morse "
@@ -712,6 +738,11 @@ Stop sending the current morse code.
 Wait for morse to finish -- only works on full break-in
 .
 .TP
+.BR 0x94 ", " send_voice_mem " \(aq" \fIMsgnum\fP \(aq
+Have rig transmit internal message
+.RI \(aq Msgnum \(aq
+.
+.TP
 .BR 0x8b ", " get_dcd
 Get
 .RI \(aq DCD \(aq
@@ -815,7 +846,60 @@ Func is a token: \(oqFAGC\(cq, \(oqNB\(cq, \(oqCOMP\(cq, \(oqVOX\(cq,
 \(oqARO\(cq, \(oqLOCK\(cq, \(oqMUTE\(cq, \(oqVSC\(cq, \(oqREV\(cq,
 \(oqSQL\(cq, \(oqABM\(cq, \(oqBC\(cq, \(oqMBC\(cq, \(oqRIT\(cq, \(oqAFC\(cq,
 \(oqSATMODE\(cq, \(oqSCOPE\(cq, \(oqRESUME\(cq, \(oqTBURST\(cq, \(oqTUNER\(cq,
-\(oqXIT\(cq.
+\(oqXIT\(cq, \(oqNB2\(cq, \(oqDSQL\(cq, \(oqAFLT\(cq, \(oqANL\(cq, \(oqBC2\(cq,
+\(oqDUAL_WATCH\(cq, \(oqDIVERSITY\(cq, \(oqCSQL\(cq, \(oqSCEN\(cq,
+\(oqTRANSCEIVE\(cq, \(oqSPECTRUM\(cq, \(oqSPECTRUM_HOLD\(cq, \(oqSEND_MORSE\(cq,
+\(oqSEND_VOICE_MEM\(cq, \(oqOVF_STATUS\(cq.
+
+ FAGC -- Fast AGC
+ NB -- Noise Blanker
+ COMP -- Speech Compression
+ VOX -- Voice Operated Relay
+ TONE -- CTCSS Tone TX
+ TSQL -- CTCSS Activate/De-activate RX
+ SBKIN -- Semi Break-in (CW mode)
+ FBKIN -- Full Break-in (CW mode)
+ ANF -- Automatic Notch Filter (DSP)
+ NR -- Noise Reduction (DSP)
+ AIP -- RF pre-amp (AIP on Kenwood, IPO on Yaesu, etc.)
+ APF -- Audio Peak Filter
+ MON -- Monitor transmitted signal
+ MN -- Manual Notch
+ RF -- RTTY Filter
+ ARO -- Auto Repeater Offset
+ LOCK -- Lock
+ MUTE -- Mute
+ VSC -- Voice Scan Control
+ REV -- Reverse transmit and receive frequencies
+ SQL -- Turn Squelch Monitor on/off
+ ABM -- Auto Band Mode
+ BC -- Beat Canceller
+ MBC -- Manual Beat Canceller
+ RIT -- Receiver Incremental Tuning
+ AFC -- Auto Frequency Control ON/OFF
+ SATMODE -- Satellite mode ON/OFF
+ SCOPE -- Simple bandscope ON/OFF
+ RESUME -- Scan auto-resume
+ TBURST -- 1750 Hz tone burst
+ TUNER -- Enable automatic tuner
+ XIT -- Transmitter Incremental Tuning
+ NB2 -- 2nd Noise Blanker
+ CSQL -- DCS Squelch setting
+ AFLT -- AF Filter setting
+ ANL -- Noise limiter setting
+ BC2 -- 2nd Beat Cancel
+ DUAL_WATCH -- Dual Watch / Sub Receiver
+ DIVERSITY -- Diversity receive
+ DSQL -- Digital modes squelch
+ SCEN -- scrambler/encryption
+ SLICE -- Rig slice selection -- Flex
+ TRANSCEIVE -- Send radio state changes automatically ON/OFF
+ SPECTRUM -- Spectrum scope data output ON/OFF
+ SPECTRUM_HOLD -- Pause spectrum scope updates ON/OFF
+ SEND_MORSE -- Send specified characters using CW
+ SEND_VOICE_MEM -- Transmit in SSB message stored in memory
+ OVF -- Read overflow status 0=Off, 1=On
+
 .IP
 Func Status is a non null value for \(lqactivate\(rq or \(lqde-activate\(rq
 otherwise, much as TRUE/FALSE definitions in the C language (true is non-zero
@@ -854,9 +938,9 @@ Level is a token: \(oqPREAMP\(cq, \(oqATT\(cq, \(oqVOXDELAY\(cq, \(oqAF\(cq,
 \(oqBAL\(cq, \(oqMETER\(cq, \(oqVOXGAIN\(cq, \(oqANTIVOX\(cq,
 \(oqSLOPE_LOW\(cq, \(oqSLOPE_HIGH\(cq, \(oqBKIN_DLYMS\(cq, \(oqRAWSTR\(cq, \(oqSWR\(cq,
 \(oqALC\(cq, \(oqSTRENGTH\(cq, \(oqRFPOWER_METER\(cq, \(oqCOMPMETER\(cq, \(oqVD_METER\(cq, \(oqID_METER\(cq,
-\(oqNOTCHF_RAW\(cq, \(oqMONITOR_GAIN\(cq, \(oqNQ\(cq, \(oqRFPOWER_METER_WATTS\cq, \(oqSPECTRUM_MODE\(cq,
-\(oqSPECTRUM_SPAN\(cq, \(oqSPECTRUM_EDGE_LOW\(cq, \(oqSPECTRUM_EDGE_HIGH\(cq, \(oqSPECTRUM_SPEED\cq,
-\(oqSPECTRUM_REF\(cq, (oqSPECTRUM_AVG\(cq, \(oqSPECTRUM_ATT\cq, \(oqTEMP_METER\cq, \(oqBAND_SELECT\(cq,
+\(oqNOTCHF_RAW\(cq, \(oqMONITOR_GAIN\(cq, \(oqNQ\(cq, \(oqRFPOWER_METER_WATTS\(cq, \(oqSPECTRUM_MODE\(cq,
+\(oqSPECTRUM_SPAN\(cq, \(oqSPECTRUM_EDGE_LOW\(cq, \(oqSPECTRUM_EDGE_HIGH\(cq, \(oqSPECTRUM_SPEED\(cq,
+\(oqSPECTRUM_REF\(cq, \(oqSPECTRUM_AVG\(cq, \(oqSPECTRUM_ATT\(cq, \(oqTEMP_METER\(cq, \(oqBANDSELECT\(cq,
 \(oqUSB_AF\(cq.
 .IP
 The Level Value can be a float or an integer value.  For the AGC token the
@@ -886,7 +970,7 @@ Seconds
     VOXDELAY(ds), BKINDL(ms), BKIN_DLYMS(ms)
 
 Raw info from rig
-    RAWSTR, BAND_SELECT (subject to change -- index right now but may convert to band name)
+    RAWSTR, BANDSELECT (subject to change -- index right now but may convert to band name)
 
 SWR
     SWR
@@ -901,6 +985,8 @@ Lookup - if level shows 0/0/0 then it's probably a lookup value
     SPECTRUM_MODE 0=None, 1=Center, 2=Fixed, 3=Center Scroll, 4=Fixed Scroll
     SPECTRUM_AVG rig specific
 
+METER -- SWR,COMP,ALC,IC/ID,DB,PO,VDD,TEMP or can use the numbers above in Lookup l METER returns the meter number=name
+
 Watts
     RFPOWER_METER_WATTS
 
@@ -938,12 +1024,25 @@ and
 .RI \(aq "Parm Value" \(aq.
 .IP
 Parm is a token: \(oqANN\(cq, \(oqAPO\(cq, \(oqBACKLIGHT\(cq, \(oqBEEP\(cq,
-\(oqTIME\(cq, \(oqBAT\(cq, \(oqKEYLIGHT\(cq.
+\(oqTIME\(cq, \(oqBAT\(cq, \(oqKEYLIGHT\(cq, \(oqSCREENSAVER\(cq, \(oqAFIF\(cq, \(oqBANDSELECT\(cq, \(oqKEYERTYPE\(cq.
 .IP
 .BR Note :
 Passing a \(oq?\(cq (query) as the first argument instead of a Parm token will
 return a space separated list of radio backend supported set parameter tokens.
 Use this to determine the supported parameters of a given radio backend.
+.IP
+ ANN -- "Announce" level, see ann_t
+ APO -- Auto power off, int in minute
+ BACKLIGHT -- LCD light, float [0.0 ... 1.0]
+ BEEP -- Beep on keypressed, int (0,1)
+ TIME -- hh:mm:ss, int in seconds from 00:00:00
+ BAT -- battery level, float [0.0 ... 1.0]
+ KEYLIGHT -- Button backlight, on/off
+ SCREENSAVER -- rig specific timeouts
+ AFIF -- 0=AF audio, 1=IF audio -- see IC-7300/9700/705
+ BANDSELECT -- band name, e.g. BAND160M, BAND80M.... a ? instead of band will show band possibilities
+ KEYERTYPE -- Icom keyer type 0,1,2 or STRAIGHT,BUG,PADDLE
+
 .
 .TP
 .BR p ", " get_parm " \(aq" \fIParm\fP \(aq
@@ -1069,7 +1168,7 @@ VFO reset, \(oq4\(cq = Memory Clear reset, \(oq8\(cq = Master reset.
 .IP
 Since these values are defined as a bitmask in
 .IR include/hamlib/rig.h ,
-it should be possible to AND these values together to do multiple resets at
+it should be possible to OR these values together to do multiple resets at
 once, if the backend supports it or supports a reset action via rig control at
 all.
 .
@@ -1182,11 +1281,11 @@ option above, will terminate each command string sent to the radio.  This
 character should not be a part of the input string.
 .
 .TP
-.BR W ", " send_cmd_rx " \(aq" \fICmd\fP\(aq " " \fI[nbytes or terminator char\FP
+.BR W ", " send_cmd_rx " \(aq" \fICmd\fP\(aq " " \fInbytes_or_terminator_char\fP
 Send a raw command string to the radio and expect nbytes returned or the terminator char (e.g. ;).
 .IP
 This is useful for testing and troubleshooting radio commands and responses when
-developing a backend.  If the # of bytes requested is <= the number actually returned no timeout will occur.
+developing a backend.  If the # of bytes requested is <= the number actually returned no timeout will occur. If a char is provided it will be used to terminate reading the string so ';' is popular for Kenwood/Yaesu commands for example.
 .IP
 The command argument can have no spaces in it.
 For binary protocols enter values as \\0xAA\\0xBB.  Expect a
@@ -1289,7 +1388,7 @@ CW Skimmer is started and "set_lock_mode 0" when CW Skimmer is stopped.
 Returns current lock mode status 1=On, 2=Off (only useful when using rigctld)
 .
 .TP
-.BR send_raw " \(aq" \fITerminator\fP "\(aq \(aq" \fIString\fp \(aq
+.BR send_raw " \(aq" \fITerminator\fP "\(aq \(aq" \fIString\fP \(aq
 .EX
 Can send ASCII string or 0xnn values -- there can be no spaces in the command string.
 Possible terminator values are CR, LF, ;, ICOM, 0-100 (bytes to read), or -1 meaning unknown (will timeout on read)
@@ -1299,6 +1398,44 @@ Examples:
   send_raw -1 0xFE;0xFE;0x94;0x03;0xFD
   send_raw 14 0xFE;0xFE;0x94;0x03;0xFD
 .
+.TP
+.BR client_version " \(aq" \fIString\fP "\(aq
+.EX
+  Client can send its version to rigctld and get feedback on compatibility, deprecation, and alternatives
+.TP
+.BR hamlib_version
+.EX
+Returns hamlib version with ISO8601 date/time
+.
+.TP
+.BR test
+.EX
+Performs test routines.  Under development.
+.
+.TP
+.BR set_gpio " \(aq" \fIGPIO#\fP "\(aq
+.EX
+Sets GPIO1, GPIO2, GPIO3, GPIO4 on the GPIO ptt port
+Can also use 1,2,3,4
+.
+.TP
+.BR get_gpio " \(aq" \fIGPIO#\fP "\(aq
+.EX
+Reads GPIO1, GPIO2, GPIO3, GPIO4 on the GPIO ptt port
+Can also use 1,2,3,4
+.
+.TP
+.BR skip_init
+.EX
+Skips rig initialization -- useful when executing commands with rigctl to speed up things
+.
+.TP
+.BR freq_skip " " 'skip'
+.EX
+When skip!=0 skips setting freq on TX_VFO when in RX and on RX_VFO when in TX -- for use with gpredict and rigs that do not have TARGETABLE_VFO
+.
+.SH READLINE
+.
 .SH READLINE
 .
 If

doc/man1/rigctld.1

@@ -127,8 +127,7 @@ Use
 .I device
 as the file name of the port connected to the radio.
 .IP
-Often a serial port, but could be a USB to serial adapter.  Typically
-.IR /dev/ttyS0 ", " /dev/ttyS1 ", " /dev/ttyUSB0 ,
+Typically /dev/ttyS0 ", " /dev/ttyS1 ", " /dev/ttyUSB0 ,
 etc. on Linux,
 .IR COM1 ", " COM2 ,
 etc. on MS Windows.  The BSD flavors and Mac OS/X have their own designations.
@@ -293,8 +292,32 @@ above.
 .
 .TP
 .BR \-C ", " \-\-set\-conf = \fIparm=val\fP [ \fI,parm=val\fP ]
-Set radio configuration parameter(s), e.g.
-.IR stop_bits=2 .
+Set configuration parameter(s). Some common ones are:
+.in +4
+.EX
+.RB   async: "True enables asynchronous data transfer for backends that support it. This allows use of transceive and spectrum data."
+.RB   auto_power_on: "True enables compatible rigs to be powered up on open"
+.RB   auto_power_off: "True enables compatible rigs to be powered down on close"
+.RB   auto_disable_screensaver: "True enables compatible rigs to have their screen saver disabled on open"
+.RB   dcd_type: "Data Carrier Detect (or squelch) interface type override"
+.RB   dcd_pathname: "Path name to the device file of the Data Carrier Detect (or squelch)"
+.RB   disable_yaesu_bandselect: "True disables the automatic band select on band change for Yaesu rigs"
+.RB   dtr_state:  "ON turns on DTR, OFF turns it off, Unset disables it"
+.RB   lo_freq: "Frequency to add to the VFO frequency for use with a transverter"
+.RB   post_write_delay: "Delay in ms between each command sent out"
+.RB   ptt_share: "True enables ptt port to be shared with other apps"
+.RB   ptt_type: "Push-To-Talk interface type override"
+.RB   ptt_pathname: "Path name to the device file of the Push-To-Talk"
+.RB   ptt_bitnum: "Push-To-Talk GPIO bit number"
+.RB   retry: "Max number of retry"
+.RB   rts_state:  "ON turns on DTR, OFF turns it off, Unset disables it"
+.RB   twiddle_timeout: "For satellite ops when VFOB is twiddled will pause VFOB commands until timeout"
+.RB   twiddle_rit: "Suppress get_freq on VFOB for RIT tuning satellites"
+.RB   timeout: "Timeout in ms"
+.RB   write_delay: "Delay in ms between each byte sent out"
+.RB   tuner_control_pathname: "Path name to a script/program to control a tuner with 1 argument of 0/1 for Tuner Off/On"
+.EE
+.in
 .IP
 Use the
 .B -L
@@ -372,10 +395,14 @@ option as it generates no output on its own.
 Sets password on rigctld which requires hamlib to use rig_set_password and rigctl to use \\password to access rigctld.  A 32-char shared secret will be displayed to be used on the client side.
 .
 .TP
-.BR \-R ", " \-\-rigctld_idle
+.BR \-R ", " \-\-rigctld\-idle
 Will make rigctld close the rig when no clients are connected.  Normally remains connected to speed up connects.
 .
 .TP
+.BR \-b ", " \-\-bind\-all
+Will make rigctld try to bind to first network device available.
+.
+.TP
 .BR \-h ", " \-\-help
 Show a summary of these options and exit.
 .
@@ -414,12 +441,12 @@ Since most of the
 .B Hamlib
 operations have a
 .BR set " and a " get
-method, an upper case letter will be used for
+method, a single upper case letter will be used for
 .B set
-methods whereas the corresponding lower case letter refers to the
+methods whereas the corresponding single lower case letter refers to the
 .B get
 method.  Each operation also has a long name; prepend a backslash, \(oq\\\(cq,
-to send a long command name.
+to send a long command name all in lower case.
 .
 .PP
 Example (Perl): \(lqprint $socket "\\\\dump_caps\\n";\(rq to see what the
@@ -701,7 +728,23 @@ number (\(oq0\(cq, \(oq1\(cq, \(oq2\(cq, ...).
 .BR b ", " send_morse " \(aq" \fIMorse\fP \(aq
 Send
 .RI \(aq Morse \(aq
-symbols.
+symbols.  For Yaesu rigs use memory# (1-5 for most rigs) or up to 50 char message (which will use memory#1)
+.EX
+Example from rigctld socket:  b CQ CQ DE ME
+Yaesu example to send message#1 frm rigctld socket: b 1
+.
+.TP
+.BR 0xbb ", " stop_morse "
+Stop sending the current morse code.
+.
+.TP
+.BR 0xbc ", " wait_morse "
+Wait for morse to finish -- only works on full break-in
+.
+.TP
+.BR 0x94 ", " send_voice_mem " \(aq" \fIMsgnum\fP \(aq
+Have rig transmit internal message
+.RI \(aq Msgnum \(aq
 .
 .TP
 .BR 0x8b ", " get_dcd
@@ -846,9 +889,9 @@ evel is a token: \(oqPREAMP\(cq, \(oqATT\(cq, \(oqVOXDELAY\(cq, \(oqAF\(cq,
 \(oqBAL\(cq, \(oqMETER\(cq, \(oqVOXGAIN\(cq, \(oqANTIVOX\(cq,
 \(oqSLOPE_LOW\(cq, \(oqSLOPE_HIGH\(cq, \(oqBKIN_DLYMS\(cq, \(oqRAWSTR\(cq, \(oqSWR\(cq,
 \(oqALC\(cq, \(oqSTRENGTH\(cq, \(oqRFPOWER_METER\(cq, \(oqCOMPMETER\(cq, \(oqVD_METER\(cq, \(oqID_METER\(cq,
-\(oqNOTCHF_RAW\(cq, \(oqMONITOR_GAIN\(cq, \(oqNQ\(cq, \(oqRFPOWER_METER_WATTS\cq, \(oqSPECTRUM_MODE\(cq,
-\(oqSPECTRUM_SPAN\(cq, \(oqSPECTRUM_EDGE_LOW\(cq, \(oqSPECTRUM_EDGE_HIGH\(cq, \(oqSPECTRUM_SPEED\cq,
-\(oqSPECTRUM_REF\(cq, (oqSPECTRUM_AVG\(cq, \(oqSPECTRUM_ATT\cq, \(oqTEMP_METER\cq, \(oqBAND_SELECT\(cq,
+\(oqNOTCHF_RAW\(cq, \(oqMONITOR_GAIN\(cq, \(oqNQ\(cq, \(oqRFPOWER_METER_WATTS\(cq, \(oqSPECTRUM_MODE\(cq,
+\(oqSPECTRUM_SPAN\(cq, \(oqSPECTRUM_EDGE_LOW\(cq, \(oqSPECTRUM_EDGE_HIGH\(cq, \(oqSPECTRUM_SPEED\(cq,
+\(oqSPECTRUM_REF\(cq, \(oqSPECTRUM_AVG\(cq, \(oqSPECTRUM_ATT\(cq, \(oqTEMP_METER\(cq, \(oqBAND_SELECT\(cq,
 \(oqUSB_AF\(cq.
 .IP
 The Level Value can be a float or an integer value.  For the AGC token the
@@ -883,7 +926,7 @@ and
 .RI \(aq "Parm Value" \(aq.
 .IP
 Parm is a token: \(oqANN\(cq, \(oqAPO\(cq, \(oqBACKLIGHT\(cq, \(oqBEEP\(cq,
-\(oqTIME\(cq, \(oqBAT\(cq, \(oqKEYLIGHT\(cq.
+\(oqTIME\(cq, \(oqBAT\(cq, \(oqKEYLIGHT\(cq, \(oqBANDSELECT\(cq, \(oqKEYERTYPE\(cq.
 .IP
 .BR Note :
 Passing a \(oq?\(cq (query) as the first argument instead of a Parm token will
@@ -1009,7 +1052,7 @@ VFO reset, \(oq4\(cq = Memory Clear reset, \(oq8\(cq = Master reset.
 .IP
 Since these values are defined as a bitmask in
 .IR include/hamlib/rig.h ,
-it should be possible to AND these values together to do multiple resets at
+it should be possible to OR these values together to do multiple resets at
 once, if the backend supports it or supports a reset action via rig control at
 all.
 .
@@ -1163,6 +1206,47 @@ CW Skimmer is started and "set_lock_mode 0" when CW Skimmer is stopped.
 .BR get_lock_mode
 Returns current lock mode status 1=On, 2=Off (only useful with rigctld)
 .
+.TP
+.BR send_raw " \(aq" \fITerminator\fP "\(aq \(aq" \fIString\fP \(aq
+.EX
+Can send ASCII string or 0xnn values -- there can be no spaces in the command string.
+Possible terminator values are CR, LF, ;, ICOM, 0-100 (bytes to read), or -1 meaning unknown (will timeout on read)
+Examples:
+  send_raw ; FA;MD;
+  send_raw icom 0xFE;0xFE;0x94;0x03;0xFD
+  send_raw -1 0xFE;0xFE;0x94;0x03;0xFD
+  send_raw 14 0xFE;0xFE;0x94;0x03;0xFD
+.
+.TP
+.BR client_version " \(aq" \fIString\fP "\(aq
+.EX
+  Client can send its version to rigctld and get feedback on compatibility, deprecation, and alternatives
+.TP
+.BR hamlib_version
+.EX
+Returns hamlib version with ISO8601 date/time
+.
+.TP
+.BR hamlib_version
+.EX
+Returns hamlib version with ISO8601 date/time
+.
+.TP
+.BR test
+.EX
+Performs test routines.  Under development.
+.
+.TP
+.BR set_gpio " \(aq" \fIGPIO#\fP "\(aq
+.EX
+Sets GPIO1, GPIO2, GPIO3, GPIO4 on the GPIO ptt port
+Can also use 1,2,3,4
+.
+.TP
+.BR get_gpio " \(aq" \fIGPIO#\fP "\(aq
+.EX
+Reads GPIO1, GPIO2, GPIO3, GPIO4 on the GPIO ptt port
+Can also use 1,2,3,4
 .
 .SH PROTOCOL
 .

doc/man1/rigctlsync.1

@@ -0,0 +1,329 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\"
+.\" For layout and available macros, see man(7), man-pages(7), groff_man(7)
+.\" Please adjust the date whenever revising the manpage.
+.\"
+.\" Note: Please keep this page in sync with the source, rigctlsync.c
+.\"
+.TH RIGCTLSYNC "1" "2023-01-27" "Hamlib" "Hamlib Utilities"
+.
+.
+.SH NAME
+.
+rigctlsync \- synchronize a rig to SDR# (or other rig) 
+.
+.SH SYNOPSIS
+.
+.
+.SY rigctlsync
+.OP \-hlLuV
+.OP \-m id
+.OP \-r device
+.OP \-R device
+.OP \-s baud
+.OP \-S baud
+.OP \-c id
+.OP \-C parm=val
+.OP \-B
+.RB [ \-v [ \-Z ]]
+.YS
+.
+.SH DESCRIPTION
+Allows you to synchornize frequence from a rig to SDR#.
+Best when used with rigctld, FlRig, or a multiport radio.
+.
+.PP
+Please report bugs and provide feedback at the e-mail address given in the
+.B BUGS
+section below.  Patches and code enhancements sent to the same address are
+welcome.
+.
+.
+.SH OPTIONS
+.
+This program follows the usual GNU command line syntax.  Short options that
+take an argument may have the value follow immediately or be separated by a
+space.  Long options starting with two dashes (\(oq\-\(cq) require an
+\(oq=\(cq between the option and any argument.
+.
+.PP
+Here is a summary of the supported options:
+.
+.TP
+.BR \-m ", " \-\-model = \fIid\fP
+Select radio model number.
+.IP
+See model list (use \(lqrigctlsync -l\(rq).
+.IP
+.BR Note :
+.B rigctlsync
+(or third party software using the C API) will use radio model 2 for
+.B NET rigctl
+(communicating with
+.BR rigctld ).
+.
+.TP
+.BR \-r ", " \-\-rig\-file = \fIdevice\fP
+Use
+.I device
+as the file name of the port connected to the radio.
+.IP
+Often a serial port, but could be a USB to serial adapter.  Typically
+.IR /dev/ttyS0 ", " /dev/ttyS1 ", " /dev/ttyUSB0 ,
+etc. on Linux,
+.IR COM1 ", " COM2 ,
+etc. on MS Windows.  The BSD flavors and Mac OS/X have their own designations.
+See your system's documentation.
+.IP
+The special string \(lquh\-rig\(rq may be given to enable micro-ham device
+support.
+.
+.TP
+.BR \-R ", " \-\-rig\-file2 = \fIdevice\fP
+Use
+.I device
+as the file name of one of the virtual com ports -- your program will connect
+to the other com port of the virtual pair.
+.
+.TP
+.BR \-s ", " \-\-serial\-speed = \fIbaud\fP
+Set serial speed to
+.I baud
+rate.
+.IP
+Uses maximum serial speed from radio backend capabilities (set by
+.B -m
+above) as the default.
+.
+.TP
+.BR \-S ", " \-\-serial\-speed2 = \fIbaud\fP
+Set serial speed to
+.I baud
+rate for virtual com port (see
+.BR -R ).
+.
+.IP
+Uses maximum serial speed from radio backend capabilities (set by
+.B -m
+above) as the default.
+.
+.TP
+.BR \-c ", " \-\-civaddr = \fIid\fP
+Use
+.I id
+as the CI-V address to communicate with the rig.
+.IP
+Only useful for Icom and some Ten-Tec rigs.
+.IP
+.BR Note :
+The
+.I id
+is in decimal notation, unless prefixed by
+.IR 0x ,
+in which case it is hexadecimal.
+.
+.TP
+.BR \-L ", " \-\-show\-conf
+List all config parameters for the radio defined with
+.B \-m
+above.
+.
+.TP
+.BR \-C ", " \-\-set\-conf = \fIparm=val\fP [ \fI,parm=val\fP ]
+Set radio configuration parameter(s), e.g.
+.IR stop_bits=2 .
+.IP
+Use the
+.B -L
+option above for a list of configuration parameters for a given model number.
+.
+.TP
+.BR \-u ", " \-\-dump\-caps
+Dump capabilities for the radio defined with
+.B -m
+above and exit.
+.
+.TP
+.BR \-l ", " \-\-list
+List all model numbers defined in
+.B Hamlib
+and exit.
+.IP
+The list is sorted by model number.
+.IP
+.BR Note :
+In Linux the list can be scrolled back using
+.BR Shift-PageUp / Shift-PageDown ,
+or using the scrollbars of a virtual terminal in X or the cmd window in
+Windows.  The output can be piped to
+.BR more (1)
+or
+.BR less (1),
+e.g. \(lqrigctl -l | more\(rq.
+.
+.TP
+.BR \-n ", " \-\-no\-restore\-ai
+.B rigctl
+restores the state of auto information (AI) on the controlled rig.
+.IP
+If this is not desired, for example if you are using
+.B rigctl
+to turn AI mode on or off, pass this option.
+.
+.TP
+.BR \-B ", " \-\-mapa2b
+Maps set_freq on VFOA to VFOB instead.
+This allows using CW skimmer with the rig in split mode and clicking on a frequency in CW skimmer
+will set VFOB to the transmit frequency.
+.
+.TP
+.BR \-v ", " \-\-verbose
+Set verbose mode, cumulative (see
+.B DIAGNOSTICS
+below).
+.
+.TP
+.BR \-Z ", " \-\-debug\-time\-stamps
+Enable time stamps for the debug messages.
+.IP
+Use only in combination with the
+.B -v
+option as it generates no output on its own.
+.
+.TP
+.BR \-h ", " \-\-help
+Show a summary of these options and exit.
+.
+.TP
+.BR \-V ", " \-\-version
+Show version of
+.B rigctl
+and exit.
+.
+.PP
+.BR Note :
+Some options may not be implemented by a given backend and will return an
+error.  This is most likely to occur with the
+.B \-\-set\-conf
+and
+.B \-\-show\-conf
+options.
+.
+.
+.SH DIAGNOSTICS
+.
+The
+.BR \-v ,
+.B \-\-verbose
+option allows different levels of diagnostics
+to be output to
+.B stderr
+and correspond to \-v for
+.BR BUG ,
+\-vv for
+.BR ERR ,
+\-vvv for
+.BR WARN ,
+\-vvvv for
+.BR VERBOSE ,
+or \-vvvvv for
+.BR TRACE .
+.
+.PP
+A given verbose level is useful for providing needed debugging information to
+the email address below.  For example, TRACE output shows all of the values
+sent to and received from the radio which is very useful for radio backend
+library development and may be requested by the developers.
+.
+.
+.SH EXIT STATUS
+.B rigctlsync
+exits with:
+.
+.TP
+.B 0
+if all operations completed normally;
+.
+.TP
+.B 1
+if there was an invalid command line option or argument;
+.
+.TP
+.B 2
+if an error was returned by
+.BR Hamlib .
+.
+.
+.SH EXAMPLE
+.
+Start
+.B rigctlsync
+with FLRig as the Hamlib model
+.UE .
+.
+.PP
+.in +4n
+.EX
+.RB $ " rigctlsync -m 4 -M 9 -R 192.168.1.1:4532"
+.EE
+.in
+.
+.PP
+The following diagram shows the communications flow that allows N1MM Logger+
+to communicate with a radio connected to Flrig:
+.
+.PP
+.in +4n
+.EE
+.in
+.
+.
+.SH BUGS
+.
+.PP
+Report bugs to:
+.IP
+.nf
+.MT hamlib\-developer@lists.sourceforge.net
+Hamlib Developer mailing list
+.ME
+.fi
+.
+.
+.SH COPYING
+.
+This file is part of Hamlib, a project to develop a library that simplifies
+radio, rotator, and amplifier control functions for developers of software
+primarily of interest to radio amateurs and those interested in radio
+communications.
+.
+.PP
+Copyright \(co 2000-2011 Stephane Fillod
+.br
+Copyright \(co 2000-2018 the Hamlib Group (various contributors)
+.br
+Copyright \(co 2010-2020 Nate Bargmann
+.br
+Copyright \(co 2019 Michael Black W9MDB
+.
+.PP
+This is free software; see the file COPYING for copying conditions.  There is
+NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+.
+.
+.SH SEE ALSO
+.
+.BR rigctld (1),
+.BR rigctl (1),
+.BR socat (1),
+.BR hamlib (7)
+.
+.
+.SH COLOPHON
+.
+Links to the Hamlib Wiki, Git repository, release archives, and daily snapshot
+archives are available via
+.
+.UR http://www.hamlib.org
+hamlib.org
+.UE .

doc/man1/rotctl.1

@@ -23,6 +23,8 @@ rotctl \- control antenna rotators
 .OP \-s baud
 .OP \-t char
 .OP \-C parm=val
+.OP \-o azoffset
+.OP \-O eloffset
 .RB [ \-v [ \-Z ]]
 .RB [ command | \- ]
 .YS
@@ -131,6 +133,15 @@ The semicolon (\(oq;\(cq) is a common terminator for rotators that accept
 ASCII character strings.
 .
 .TP
+.BR \-o ", " \-\-set\-azoffset
+Azimuth correction floating point -- during set value is added, during get value is subtracted.
+.
+.TP
+.BR \-O ", " \-\-set\-eloffset
+Elevation correction floating point -- during set value is added, during get value is subtracted.
+.
+.
+.TP
 .BR \-L ", " \-\-show\-conf
 List all configuration parameters for the rotator defined with
 .B \-m

extra/gnuradio/gnuradio.cc

@@ -132,7 +132,7 @@ int gr_init(RIG *rig)
   rig->state.priv = (void*)priv;
 
   rig_debug(RIG_DEBUG_VERBOSE,"%s called\n", __FUNCTION__ );
-  rig->state.rigport.type.rig = RIG_PORT_NONE;
+  RIGORT(rig)->type.rig = RIG_PORT_NONE;
 
   memset(priv->parms, 0, RIG_SETTING_MAX*sizeof(value_t));
 
@@ -160,7 +160,7 @@ int gr_init(RIG *rig)
 /*
  * Assumes rig!=NULL, rig->state.priv!=NULL
  */
-int gnuradio_set_conf(RIG *rig, token_t token, const char *val)
+int gnuradio_set_conf(RIG *rig, hamlib_token_t token, const char *val)
 {
 	struct gnuradio_priv_data *priv;
 	struct rig_state *rs;
@@ -184,7 +184,7 @@ int gnuradio_set_conf(RIG *rig, token_t token, const char *val)
  * Assumes rig!=NULL, rig->state.priv!=NULL
  *  and val points to a buffer big enough to hold the conf value.
  */
-int gnuradio_get_conf(RIG *rig, token_t token, char *val)
+int gnuradio_get_conf(RIG *rig, hamlib_token_t token, char *val)
 {
 	struct gnuradio_priv_data *priv;
 	struct rig_state *rs;
@@ -870,7 +870,6 @@ int gnuradio_vfo_op(RIG *rig, vfo_t vfo, vfo_op_t op)
   return ret;
 }
 
-// cppcheck-suppress *
 DECLARE_INITRIG_BACKEND(gnuradio)
 {
 	rig_debug(RIG_DEBUG_VERBOSE, "gnuradio: _init called\n");

extra/gnuradio/gnuradio.h

@@ -44,8 +44,8 @@ int gr_get_vfo(RIG *rig, vfo_t *vfo);
 int gr_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width);
 int gr_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width);
 
-int gnuradio_set_conf(RIG *rig, token_t token, const char *val);
-int gnuradio_get_conf(RIG *rig, token_t token, char *val);
+int gnuradio_set_conf(RIG *rig, hamlib_token_t token, const char *val);
+int gnuradio_get_conf(RIG *rig, hamlib_token_t token, char *val);
 int gnuradio_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val);
 int gnuradio_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val);
 
@@ -61,10 +61,10 @@ int graudioiq_open(RIG *rig);
 
 extern const struct confparams gnuradio_cfg_params[];
 
-extern const struct rig_caps gr_caps;
-extern const struct rig_caps mc4020_caps;
-extern const struct rig_caps graudio_caps;
-extern const struct rig_caps graudioiq_caps;
+extern struct rig_caps gr_caps;
+extern struct rig_caps mc4020_caps;
+extern struct rig_caps graudio_caps;
+extern struct rig_caps graudioiq_caps;
 
 __END_DECLS
 

extra/gnuradio/gr.c

@@ -19,7 +19,6 @@
  *
  */
 
-#include <hamlib/config.h>
 
 #include <stdlib.h>
 
@@ -50,7 +49,7 @@ static const struct gnuradio_priv_caps gr_priv_caps =
     .IF_center_freq = MHz(5.75),
 };
 
-const struct rig_caps gr_caps =
+struct rig_caps gr_caps =
 {
     .rig_model =      RIG_MODEL_GNURADIO,
     .model_name =     "GNU Radio dev",

extra/gnuradio/graudio.c

@@ -19,7 +19,6 @@
  *
  */
 
-#include <hamlib/config.h>
 
 #include <stdlib.h>
 
@@ -53,7 +52,7 @@ static const struct gnuradio_priv_caps graudio_priv_caps =
 };
 
 
-const struct rig_caps graudio_caps =
+struct rig_caps graudio_caps =
 {
     .rig_model =      RIG_MODEL_GRAUDIO,
     .model_name =     "GNU Radio GrAudio",
@@ -127,7 +126,7 @@ const struct rig_caps graudio_caps =
     .vfo_op =   gnuradio_vfo_op,
 };
 
-const struct rig_caps graudioiq_caps =
+struct rig_caps graudioiq_caps =
 {
     .rig_model =      RIG_MODEL_GRAUDIOIQ,
     .model_name =     "GNU Radio GrAudio I&Q",

extra/gnuradio/mc4020.c

@@ -19,7 +19,6 @@
  *
  */
 
-#include <hamlib/config.h>
 
 #include <stdlib.h>
 
@@ -50,7 +49,7 @@ static const struct gnuradio_priv_caps mc4020_priv_caps =
 };
 
 
-const struct rig_caps mc4020_caps =
+struct rig_caps mc4020_caps =
 {
     .rig_model =      RIG_MODEL_MC4020,
     .model_name =     "GNU Radio MC4020",

extra/gnuradio/testgr.cc

@@ -52,6 +52,7 @@ int main(int argc, char *argv[])
   }
 
   // turn this into a macro
+// cppcheck-suppress cstyleCast
   priv = (struct gnuradio_priv_data*)my_rig->state.priv;
   if (priv == NULL) {
 	printf("Internal error, can't retrieve priv data!\n");

extra/kylix/README.kylix

@@ -16,13 +16,13 @@ hamlib_rotapi.pas
 HamlibComponents.pas
 
     This file contain two components that encapsulate the rig and rotator 
-    frontends.  It is very simular to the C++ class.
+    frontends.  It is very similar to the C++ class.
 
   
 A simple test program is included in the tests/ directory.  It implements
 a selection dialog and a very simple Radio Control dialog.
 
-This binding was develop with Borland Kylix Open Edition Ver 2.0. Open Edition
+This binding was developed with Borland Kylix Open Edition Ver 2.0. Open Edition
 is freely downloadable from Borland's website for use with GPL projects.
  http://www.borland.com/kylix/
 

extra/kylix/hamlib_rigapi.pas

@@ -327,7 +327,7 @@ const
 //#define RIG_IS_TOKEN_FRONTEND(t) ((t)&(1<<30))
 
     {*
-     * strongly inspired from soundmedem. Thanks Thomas!
+     * strongly inspired from soundmodem. Thanks Thomas!
      *}
     RIG_CONF_STRING = 0;
     RIG_CONF_COMBO = 1;
@@ -472,7 +472,7 @@ type
 
 const
     {*
-     * tranceive mode, ie. the rig notify the host of any event,
+     * transceive mode, ie. the rig notify the host of any event,
      * like freq changed, mode changed, etc.
      *}
     RIG_TRN_OFF  = 0;

include/Makefile.am

@@ -3,4 +3,4 @@ noinst_HEADERS = bandplan.h num_stdio.h
 nobase_include_HEADERS = hamlib/rig.h hamlib/riglist.h hamlib/rig_dll.h \
 		hamlib/rotator.h hamlib/rotlist.h hamlib/rigclass.h \
 		hamlib/rotclass.h hamlib/amplifier.h hamlib/amplist.h \
-		hamlib/ampclass.h hamlib/config.h
+		hamlib/ampclass.h hamlib/multicast.h

include/hamlib/ampclass.h

@@ -53,11 +53,11 @@ public:
     // This method closes the communication port to the amp
     void close(void);
 
-    void setConf(token_t token, const char *val);
+    void setConf(hamlib_token_t token, const char *val);
     void setConf(const char *name, const char *val);
-    void getConf(token_t token, char *val);
+    void getConf(hamlib_token_t token, char *val);
     void getConf(const char *name, char *val);
-    token_t tokenLookup(const char *name);
+    hamlib_token_t tokenLookup(const char *name);
 
     void setFreq(freq_t freq);
     freq_t getFreq();

include/hamlib/amplifier.h

@@ -18,6 +18,7 @@
  *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
  */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #ifndef _AMPLIFIER_H
 #define _AMPLIFIER_H 1
@@ -232,9 +233,9 @@ struct amp_caps
   int (*set_freq)(AMP *amp, freq_t val);  /*!< Pointer to backend implementation of ::amp_set_freq(). */
   int (*get_freq)(AMP *amp, freq_t *val); /*!< Pointer to backend implementation of ::amp_get_freq(). */
 
-  int (*set_conf)(AMP *amp, token_t token, const char *val); /*!< Pointer to backend implementation of ::amp_set_conf(). */
-  int (*get_conf2)(AMP *amp, token_t token, char *val, int val_len);       /*!< Pointer to backend implementation of ::amp_get_conf(). */
-  int (*get_conf)(AMP *amp, token_t token, char *val);       /*!< Pointer to backend implementation of ::amp_get_conf(). */
+  int (*set_conf)(AMP *amp, hamlib_token_t token, const char *val); /*!< Pointer to backend implementation of ::amp_set_conf(). */
+  int (*get_conf2)(AMP *amp, hamlib_token_t token, char *val, int val_len);       /*!< Pointer to backend implementation of ::amp_get_conf(). */
+  int (*get_conf)(AMP *amp, hamlib_token_t token, char *val);       /*!< Pointer to backend implementation of ::amp_get_conf(). */
 
   /*
    *  General API commands, from most primitive to least.. :()
@@ -244,8 +245,8 @@ struct amp_caps
   int (*reset)(AMP *amp, amp_reset_t reset);                   /*!< Pointer to backend implementation of ::amp_reset(). */
   int (*get_level)(AMP *amp, setting_t level, value_t *val);   /*!< Pointer to backend implementation of ::amp_get_level(). */
   int (*set_level)(AMP *amp, setting_t level, value_t val);    /*!< Pointer to backend implementation of ::amp_get_level(). */
-  int (*get_ext_level)(AMP *amp, token_t level, value_t *val); /*!< Pointer to backend implementation of ::amp_get_ext_level(). */
-  int (*set_ext_level)(AMP *amp, token_t level, value_t val);  /*!< Pointer to backend implementation of ::amp_set_ext_level(). */
+  int (*get_ext_level)(AMP *amp, hamlib_token_t level, value_t *val); /*!< Pointer to backend implementation of ::amp_get_ext_level(). */
+  int (*set_ext_level)(AMP *amp, hamlib_token_t level, value_t val);  /*!< Pointer to backend implementation of ::amp_set_ext_level(). */
   int (*set_powerstat)(AMP *amp, powerstat_t status);          /*!< Pointer to backend implementation of ::amp_set_powerstat(). */
   int (*get_powerstat)(AMP *amp, powerstat_t *status);         /*!< Pointer to backend implementation of ::amp_get_powerstat(). */
 
@@ -335,11 +336,11 @@ amp_cleanup HAMLIB_PARAMS((AMP *amp));
 
 extern HAMLIB_EXPORT(int)
 amp_set_conf HAMLIB_PARAMS((AMP *amp,
-                            token_t token,
+                            hamlib_token_t token,
                             const char *val));
 extern HAMLIB_EXPORT(int)
 amp_get_conf HAMLIB_PARAMS((AMP *amp,
-                            token_t token,
+                            hamlib_token_t token,
                             char *val));
 extern HAMLIB_EXPORT(int)
 amp_set_powerstat HAMLIB_PARAMS((AMP *amp,
@@ -407,7 +408,7 @@ extern HAMLIB_EXPORT(const struct confparams *)
 amp_confparam_lookup HAMLIB_PARAMS((AMP *amp,
                                     const char *name));
 
-extern HAMLIB_EXPORT(token_t)
+extern HAMLIB_EXPORT(hamlib_token_t)
 amp_token_lookup HAMLIB_PARAMS((AMP *amp,
                                 const char *name));
 
@@ -428,12 +429,12 @@ amp_ext_lookup HAMLIB_PARAMS((AMP *amp,
 
 extern HAMLIB_EXPORT(int)
 amp_get_ext_level HAMLIB_PARAMS((AMP *amp,
-                                 token_t token,
+                                 hamlib_token_t token,
                                  value_t *val));
 
 extern HAMLIB_EXPORT(int)
 amp_set_ext_level HAMLIB_PARAMS((AMP *amp,
-                                 token_t token,
+                                 hamlib_token_t token,
                                  value_t val));
 
 extern HAMLIB_EXPORT(const char *) amp_strlevel(setting_t);
@@ -445,6 +446,8 @@ rig_ext_lookup HAMLIB_PARAMS((RIG *rig,
 extern HAMLIB_EXPORT(setting_t) amp_parse_level(const char *s);
 extern HAMLIB_EXPORT(const char *) amp_strlevel(setting_t);
 
+extern HAMLIB_EXPORT(void *) amp_data_pointer(AMP *amp, rig_ptrx_t idx);
+
 //! @endcond
 
 

include/hamlib/amplist.h

@@ -106,10 +106,15 @@
 //! @endcond
 #define AMP_MODEL_ELECRAFT_KPA1500 AMP_MAKE_MODEL(AMP_ELECRAFT, 1)
 //#define AMP_MODEL_ELECRAFT_KPA500 AMP_MAKE_MODEL(AMP_ELECRAFT, 2)
+
 #define AMP_GEMINI 3
 #define AMP_BACKEND_GEMINI "gemini"
 #define AMP_MODEL_GEMINI_DX1200 AMP_MAKE_MODEL(AMP_GEMINI, 1)
 
+#define AMP_EXPERT 4
+#define AMP_BACKEND_EXPERT "expert"
+#define AMP_MODEL_EXPERT_FA AMP_MAKE_MODEL(AMP_EXPERT, 1)
+
 
 /**
  * \brief Convenience type definition for an amplifier model.

include/hamlib/multicast.h

@@ -0,0 +1,45 @@
+//include <stdio.h>
+//#include <stdlib.h>
+//#include <string.h>
+//#include <errno.h>
+//#include <unistd.h>
+#include <hamlib/rig.h>
+//#include <sys/socket.h>
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef _WIN32
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#endif
+
+#ifdef HAVE_ARPA_INET_H
+#include <arpa/inet.h>
+#endif
+
+#ifndef MULTICAST_H
+#define MULTICAST_H
+
+struct multicast_vfo
+{
+    char *name;
+    double freq;
+    char *mode;
+    int width;
+    int widthLower;
+    int widthUpper;
+    unsigned char rx; // true if in rx mode
+    unsigned char tx; // true in in tx mode
+};
+
+struct multicast_broadcast
+{
+    char *ID;
+    struct multicast_vfo **vfo;
+};
+
+// returns # of bytes sent
+extern HAMLIB_EXPORT (int) multicast_init(RIG *rig, char *addr, int port);
+extern HAMLIB_EXPORT (int) multicast_send(RIG *rig, const char *msg, int msglen);
+extern HAMLIB_EXPORT (int) multicast_stop(RIG *rig);
+#endif //MULTICAST_H

include/hamlib/rigclass.h

@@ -46,7 +46,7 @@ public:
 #endif
 
 
-    const struct rig_caps *caps;
+    struct rig_caps *caps;
 
     // This method opens the communication port to the rig
     void open(void);
@@ -54,11 +54,11 @@ public:
     // This method closes the communication port to the rig
     void close(void);
 
-    void setConf(token_t token, const char *val);
+    void setConf(hamlib_token_t token, const char *val);
     void setConf(const char *name, const char *val);
-    void getConf(token_t token, char *val);
+    void getConf(hamlib_token_t token, char *val);
     void getConf(const char *name, char *val);
-    token_t tokenLookup(const char *name);
+    hamlib_token_t tokenLookup(const char *name);
 
     void setFreq(freq_t freq, vfo_t vfo = RIG_VFO_CURR);
     freq_t getFreq(vfo_t vfo = RIG_VFO_CURR);
@@ -177,22 +177,27 @@ public:
     void reset(reset_t reset);
 
     // callbacks available in your derived object
+// cppcheck-suppress unusedFunction
     virtual int FreqEvent(vfo_t, freq_t, rig_ptr_t) const
     {
         return RIG_OK;
     }
+// cppcheck-suppress unusedFunction
     virtual int ModeEvent(vfo_t, rmode_t, pbwidth_t, rig_ptr_t) const
     {
         return RIG_OK;
     }
+// cppcheck-suppress unusedFunction
     virtual int VFOEvent(vfo_t, rig_ptr_t) const
     {
         return RIG_OK;
     }
+// cppcheck-suppress unusedFunction
     virtual int PTTEvent(vfo_t, ptt_t, rig_ptr_t) const
     {
         return RIG_OK;
     }
+// cppcheck-suppress unusedFunction
     virtual int DCDEvent(vfo_t, dcd_t, rig_ptr_t) const
     {
         return RIG_OK;
@@ -287,6 +292,7 @@ public:
 //! @endcond
 
 
+// cppcheck-suppress unusedFunction
 inline void THROW(const RigException *e)
 {
 #if defined(__GNUG__)
@@ -298,6 +304,7 @@ inline void THROW(const RigException *e)
 #elif defined(_MSC_VER)
     throw* e;
 #elif defined(__SUNPRO_CC)
+// cppcheck-suppress cstyleCast
     genericerror(1, ((e != 0) ? (char *)(e->message) : ""));
 #else
 

include/hamlib/riglist.h

@@ -33,6 +33,8 @@
 #define RIG_MAKE_MODEL(a,b) ((a)*MAX_MODELS_PER_BACKEND+(b))
 #define RIG_BACKEND_NUM(a) ((a)/MAX_MODELS_PER_BACKEND)
 
+//! @endcond
+
 /*! \file riglist.h
  *  \brief Hamlib rig(radio) model definitions.
  *
@@ -49,6 +51,13 @@
  *  whishes to use. It is done with the rig_init() API call.
  */
 
+/**
+ * \def RIG_MODEL_NONE
+ * \brief A macro that returns the model number for an unknown model.
+ *
+ * The none backend, as the name suggests, does nothing.  It is mainly for
+ * internal use.
+ */
 #define RIG_MODEL_NONE 0
 
 /*! \def RIG_MODEL_DUMMY
@@ -62,16 +71,21 @@
  *  It has also been expanded to provide support to "virtual" type of rigs
  *  such as the network rig control backend and W1HKJ's Flrig application.
  */
+//! @cond Doxygen_Suppress
 #define RIG_DUMMY 0
 #define RIG_BACKEND_DUMMY "dummy"
+//! @endcond
 #define RIG_MODEL_DUMMY RIG_MAKE_MODEL(RIG_DUMMY, 1)
+//! @cond Doxygen_Suppress
 #define RIG_MODEL_NETRIGCTL RIG_MAKE_MODEL(RIG_DUMMY, 2)
 #define RIG_MODEL_ARMSTRONG RIG_MAKE_MODEL(RIG_DUMMY, 3)
 #define RIG_MODEL_FLRIG RIG_MAKE_MODEL(RIG_DUMMY, 4)
 #define RIG_MODEL_TRXMANAGER_RIG RIG_MAKE_MODEL(RIG_DUMMY, 5)
 #define RIG_MODEL_DUMMY_NOVFO RIG_MAKE_MODEL(RIG_DUMMY, 6)
 #define RIG_MODEL_TCI1X RIG_MAKE_MODEL(RIG_DUMMY, 7)
-
+#define RIG_MODEL_ACLOG RIG_MAKE_MODEL(RIG_DUMMY, 8)
+#define RIG_MODEL_SDRSHARP RIG_MAKE_MODEL(RIG_DUMMY, 9)
+#define RIG_MODEL_QUISK RIG_MAKE_MODEL(RIG_DUMMY, 10)
 
 /*
  * Yaesu
@@ -127,7 +141,8 @@
 #define RIG_MODEL_FT650 RIG_MAKE_MODEL(RIG_YAESU, 47)
 #define RIG_MODEL_FT990UNI RIG_MAKE_MODEL(RIG_YAESU, 48)
 #define RIG_MODEL_FT710 RIG_MAKE_MODEL(RIG_YAESU, 49)
-
+#define RIG_MODEL_FT9000OLD RIG_MAKE_MODEL(RIG_YAESU, 50)
+#define RIG_MODEL_Q900 RIG_MAKE_MODEL(RIG_YAESU, 51)
 
 /*
  * Kenwood
@@ -185,6 +200,11 @@
 #define RIG_MODEL_MALACHITE RIG_MAKE_MODEL(RIG_KENWOOD, 49)
 #define RIG_MODEL_LAB599_TX500 RIG_MAKE_MODEL(RIG_KENWOOD,50)
 #define RIG_MODEL_SDRUNO RIG_MAKE_MODEL(RIG_KENWOOD,51)
+#define RIG_MODEL_QRPLABS RIG_MAKE_MODEL(RIG_KENWOOD,52)
+#define RIG_MODEL_FX4 RIG_MAKE_MODEL(RIG_KENWOOD,53)
+#define RIG_MODEL_THETIS RIG_MAKE_MODEL(RIG_KENWOOD, 54)
+#define RIG_MODEL_TRUSDX RIG_MAKE_MODEL(RIG_KENWOOD, 55)
+#define RIG_MODEL_SDRCONSOLE RIG_MAKE_MODEL(RIG_KENWOOD, 56)
 
 /*
  * Icom
@@ -272,7 +292,7 @@
 #define RIG_MODEL_X6100 RIG_MAKE_MODEL(RIG_ICOM, 87)    /* Xiegu X6100 */
 #define RIG_MODEL_G90 RIG_MAKE_MODEL(RIG_ICOM, 88)    /* Xiegu G90 */
 #define RIG_MODEL_X5105 RIG_MAKE_MODEL(RIG_ICOM, 89)    /* Xiegu X5105 -- G90 compatible */
-
+#define RIG_MODEL_IC905 RIG_MAKE_MODEL(RIG_ICOM, 90)    
 
 /*
  * Optoelectronics (CI-V)
@@ -282,7 +302,6 @@
 #define RIG_MODEL_OS535 RIG_MAKE_MODEL(RIG_ICOM, 52)
 #define RIG_MODEL_OS456 RIG_MAKE_MODEL(RIG_ICOM, 53)
 
-
 /*
  * TenTec (CI-V)
  */
@@ -291,7 +310,6 @@
 #define RIG_MODEL_PARAGON2 RIG_MAKE_MODEL(RIG_ICOM, 59)
 #define RIG_MODEL_DELTAII RIG_MAKE_MODEL(RIG_ICOM, 64)
 
-
 /*
  * Icom PCR
  */
@@ -302,7 +320,6 @@
 #define RIG_MODEL_PCR1500 RIG_MAKE_MODEL(RIG_PCR, 3)
 #define RIG_MODEL_PCR2500 RIG_MAKE_MODEL(RIG_PCR, 4)
 
-
 /*
  * AOR
  */
@@ -325,7 +342,6 @@
 #define RIG_MODEL_AR7030P RIG_MAKE_MODEL(RIG_AOR, 15)
 #define RIG_MODEL_SR2200 RIG_MAKE_MODEL(RIG_AOR, 16)
 
-
 /*
  * JRC
  */
@@ -339,7 +355,6 @@
 #define RIG_MODEL_NRD535 RIG_MAKE_MODEL(RIG_JRC, 6)
 #define RIG_MODEL_NRD545 RIG_MAKE_MODEL(RIG_JRC, 7)
 
-
 /*
  * Radio Shack
  * Actually, they might be either Icom or Uniden. TBC --SF
@@ -353,7 +368,6 @@
 #define RIG_MODEL_RS2042 RIG_MAKE_MODEL(RIG_RADIOSHACK, 5)  /* w/ OptoElectronics OS435 Board */
 #define RIG_MODEL_RS2041 RIG_MAKE_MODEL(RIG_RADIOSHACK, 6)  /* PRO-2041 */
 
-
 /*
  * Uniden
  */
@@ -372,7 +386,6 @@
 #define RIG_MODEL_BCD996T RIG_MAKE_MODEL(RIG_UNIDEN, 11)
 #define RIG_MODEL_BC898 RIG_MAKE_MODEL(RIG_UNIDEN, 12)
 
-
 /*
  * Drake
  */
@@ -382,7 +395,6 @@
 #define RIG_MODEL_DKR8A RIG_MAKE_MODEL(RIG_DRAKE, 2)
 #define RIG_MODEL_DKR8B RIG_MAKE_MODEL(RIG_DRAKE, 3)
 
-
 /*
  * Lowe
  */
@@ -393,7 +405,6 @@
 #define RIG_MODEL_HF250 RIG_MAKE_MODEL(RIG_LOWE, 3)
 #define RIG_MODEL_HF235 RIG_MAKE_MODEL(RIG_LOWE, 4)
 
-
 /*
  * Racal
  */
@@ -405,7 +416,6 @@
 #define RIG_MODEL_RA3710 RIG_MAKE_MODEL(RIG_RACAL, 4)
 #define RIG_MODEL_RA3702 RIG_MAKE_MODEL(RIG_RACAL, 5)
 
-
 /*
  * Watkins-Johnson
  */
@@ -416,7 +426,6 @@
 #define RIG_MODEL_WJ8711 RIG_MAKE_MODEL(RIG_WJ, 3)
 #define RIG_MODEL_WJ8888 RIG_MAKE_MODEL(RIG_WJ, 4)
 
-
 /*
  * Rohde & Schwarz--ek
  */
@@ -428,7 +437,6 @@
 #define RIG_MODEL_EK895 RIG_MAKE_MODEL(RIG_EK, 4)
 #define RIG_MODEL_EK070 RIG_MAKE_MODEL(RIG_EK, 5)
 
-
 /*
  * Skanti
  */
@@ -439,7 +447,6 @@
 #define RIG_MODEL_TRP9000 RIG_MAKE_MODEL(RIG_SKANTI, 3)
 #define RIG_MODEL_TRP8255 RIG_MAKE_MODEL(RIG_SKANTI, 4)
 
-
 /*
  * WiNRADiO/LinRADiO
  */
@@ -457,7 +464,6 @@
 #define RIG_MODEL_G305 RIG_MAKE_MODEL(RIG_WINRADIO, 10)
 #define RIG_MODEL_G315 RIG_MAKE_MODEL(RIG_WINRADIO, 11)
 
-
 /*
  * Ten Tec
  */
@@ -476,7 +482,6 @@
 #define RIG_MODEL_RX331 RIG_MAKE_MODEL(RIG_TENTEC, 12)
 #define RIG_MODEL_TT599 RIG_MAKE_MODEL(RIG_TENTEC, 13)  /* Eagle */
 
-
 /*
  * Alinco
  */
@@ -485,7 +490,6 @@
 #define RIG_MODEL_DX77 RIG_MAKE_MODEL(RIG_ALINCO, 1)
 #define RIG_MODEL_DXSR8 RIG_MAKE_MODEL(RIG_ALINCO, 2)
 
-
 /*
  * Kachina
  */
@@ -493,7 +497,6 @@
 #define RIG_BACKEND_KACHINA "kachina"
 #define RIG_MODEL_505DSP RIG_MAKE_MODEL(RIG_KACHINA, 1)
 
-
 /*
  * Gnuradio backend
  */
@@ -505,7 +508,6 @@
 #define RIG_MODEL_GRAUDIOIQ RIG_MAKE_MODEL(RIG_GNURADIO, 4) /* I&Q stereo sound card source */
 #define RIG_MODEL_USRP_G RIG_MAKE_MODEL(RIG_GNURADIO, 5)    /* Universal Software Radio Peripheral */
 
-
 /*
  * Microtune tuners
  */
@@ -515,7 +517,6 @@
 #define RIG_MODEL_MICROTUNE_4702 RIG_MAKE_MODEL(RIG_MICROTUNE, 2)   /* Alan's */
 #define RIG_MODEL_MICROTUNE_4707 RIG_MAKE_MODEL(RIG_MICROTUNE, 3)
 
-
 /*
  * TAPR
  */
@@ -523,7 +524,6 @@
 #define RIG_BACKEND_TAPR "tapr"
 #define RIG_MODEL_DSP10 RIG_MAKE_MODEL(RIG_TAPR, 1)
 
-
 /*
  * Flex-radio
  */
@@ -534,7 +534,6 @@
 #define RIG_MODEL_DTTSP RIG_MAKE_MODEL(RIG_FLEXRADIO, 3)
 #define RIG_MODEL_DTTSP_UDP RIG_MAKE_MODEL(RIG_FLEXRADIO, 4)
 
-
 /*
  * VEB Funkwerk Köpenick RFT
  */
@@ -542,7 +541,6 @@
 #define RIG_BACKEND_RFT "rft"
 #define RIG_MODEL_EKD500 RIG_MAKE_MODEL(RIG_RFT, 1)
 
-
 /*
  * Various kits
  */
@@ -568,7 +566,6 @@
 #define RIG_MODEL_FUNCUBEDONGLEPLUS RIG_MAKE_MODEL(RIG_KIT, 18) /* FunCUBE Dongle Pro+ */
 #define RIG_MODEL_RSHFIQ RIG_MAKE_MODEL(RIG_KIT, 19)            /* RS-HFIQ */
 
-
 /*
  * SW/FM/TV tuner cards supported by Video4Linux,*BSD, ..
  */
@@ -577,7 +574,6 @@
 #define RIG_MODEL_V4L RIG_MAKE_MODEL(RIG_TUNER, 1)
 #define RIG_MODEL_V4L2 RIG_MAKE_MODEL(RIG_TUNER, 2)
 
-
 /*
  * Rohde & Schwarz--rs
  */
@@ -588,7 +584,6 @@
 #define RIG_MODEL_XK2100 RIG_MAKE_MODEL(RIG_RS, 3)
 #define RIG_MODEL_EK89X RIG_MAKE_MODEL(RIG_RS, 4)
 
-
 /*
  * Phillips/Simoco PRM80
  */
@@ -597,7 +592,6 @@
 #define RIG_MODEL_PRM8060 RIG_MAKE_MODEL(RIG_PRM80, 1)
 #define RIG_MODEL_PRM8070 RIG_MAKE_MODEL(RIG_PRM80, 2)
 
-
 /*
  * ADAT by HB9CBU
  *
@@ -607,7 +601,6 @@
 #define RIG_BACKEND_ADAT "adat"
 #define RIG_MODEL_ADT_200A RIG_MAKE_MODEL(RIG_ADAT, 1)
 
-
 /*
  * ICOM Marine
  */
@@ -618,7 +611,6 @@
 #define RIG_MODEL_IC_M710 RIG_MAKE_MODEL(RIG_ICMARINE, 3)
 #define RIG_MODEL_IC_M803 RIG_MAKE_MODEL(RIG_ICMARINE, 4)
 
-
 /*
  * Dorji transceiver modules
  */
@@ -635,6 +627,7 @@
 #define RIG_MODEL_BARRETT_2050 RIG_MAKE_MODEL(RIG_BARRETT, 1)
 #define RIG_MODEL_BARRETT_950 RIG_MAKE_MODEL(RIG_BARRETT, 2)
 #define RIG_MODEL_BARRETT_4050 RIG_MAKE_MODEL(RIG_BARRETT, 3)
+#define RIG_MODEL_BARRETT_4100 RIG_MAKE_MODEL(RIG_BARRETT, 4)
 
 /*
  * Elad
@@ -657,7 +650,6 @@
 #define RIG_GOMSPACE 35
 #define RIG_BACKEND_GOMSPACE "gomspace"
 #define RIG_MODEL_GS100 RIG_MAKE_MODEL(RIG_GOMSPACE, 1)
-//! @endcond
 
 /*
  * MDS Microwave Data Systems https://en.wikipedia.org/wiki/Microwave_Data_Systems
@@ -673,6 +665,22 @@
     etc.
 */
 
+/*
+ * AnyTone rigs
+ */
+#define RIG_ANYTONE 37
+#define RIG_BACKEND_ANYTONE "AnyTone"
+#define RIG_MODEL_ATD578UVIII RIG_MAKE_MODEL(RIG_ANYTONE, 1)
+
+/*
+ * Motorola rigs
+ */
+#define RIG_MOTOROLA 38
+#define RIG_BACKEND_MOTOROLA "Motorola"
+#define RIG_MODEL_MICOM2 RIG_MAKE_MODEL(RIG_MOTOROLA, 1)
+
+
+//! @endcond
 
 /*! \typedef typedef int rig_model_t
     \brief Convenience type definition for rig model.

include/hamlib/rotator.h

@@ -18,6 +18,7 @@
  *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
  */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #ifndef _ROTATOR_H
 #define _ROTATOR_H 1
@@ -413,8 +414,8 @@ struct rot_caps {
     int (*rot_open)(ROT *rot);     /*!< Pointer to backend implementation of ::rot_open(). */
     int (*rot_close)(ROT *rot);    /*!< Pointer to backend implementation of ::rot_close(). */
 
-    int (*set_conf)(ROT *rot, token_t token, const char *val); /*!< Pointer to backend implementation of ::rot_set_conf(). */
-    int (*get_conf)(ROT *rot, token_t token, char *val);       /*!< Pointer to backend implementation of ::rot_get_conf(). */
+    int (*set_conf)(ROT *rot, hamlib_token_t token, const char *val); /*!< Pointer to backend implementation of ::rot_set_conf(). */
+    int (*get_conf)(ROT *rot, hamlib_token_t token, char *val);       /*!< Pointer to backend implementation of ::rot_get_conf(). */
 
     /*
      *  General API commands, from most primitive to least.. :()
@@ -441,19 +442,19 @@ struct rot_caps {
     int (*set_parm)(ROT *rot, setting_t parm, value_t val);    /*!< Pointer to backend implementation of ::rot_set_parm(). */
     int (*get_parm)(ROT *rot, setting_t parm, value_t *val);   /*!< Pointer to backend implementation of ::rot_get_parm(). */
 
-    int (*set_ext_level)(ROT *rot, token_t token, value_t val);    /*!< Pointer to backend implementation of ::rot_set_ext_level(). */
-    int (*get_ext_level)(ROT *rot, token_t token, value_t *val);   /*!< Pointer to backend implementation of ::rot_get_ext_level(). */
+    int (*set_ext_level)(ROT *rot, hamlib_token_t token, value_t val);    /*!< Pointer to backend implementation of ::rot_set_ext_level(). */
+    int (*get_ext_level)(ROT *rot, hamlib_token_t token, value_t *val);   /*!< Pointer to backend implementation of ::rot_get_ext_level(). */
 
-    int (*set_ext_func)(ROT *rot, token_t token, int status);  /*!< Pointer to backend implementation of ::rot_set_ext_func(). */
-    int (*get_ext_func)(ROT *rot, token_t token, int *status); /*!< Pointer to backend implementation of ::rot_get_ext_func(). */
+    int (*set_ext_func)(ROT *rot, hamlib_token_t token, int status);  /*!< Pointer to backend implementation of ::rot_set_ext_func(). */
+    int (*get_ext_func)(ROT *rot, hamlib_token_t token, int *status); /*!< Pointer to backend implementation of ::rot_get_ext_func(). */
 
-    int (*set_ext_parm)(ROT *rot, token_t token, value_t val);     /*!< Pointer to backend implementation of ::rot_set_ext_parm(). */
-    int (*get_ext_parm)(ROT *rot, token_t token, value_t *val);    /*!< Pointer to backend implementation of ::rot_get_ext_parm(). */
+    int (*set_ext_parm)(ROT *rot, hamlib_token_t token, value_t val);     /*!< Pointer to backend implementation of ::rot_set_ext_parm(). */
+    int (*get_ext_parm)(ROT *rot, hamlib_token_t token, value_t *val);    /*!< Pointer to backend implementation of ::rot_get_ext_parm(). */
 
     int (*get_status)(ROT *rot, rot_status_t *status); /*!< Pointer to backend implementation of ::rot_get_status(). */
 
     const char *macro_name;                    /*!< Rotator model macro name. */
-    int (*get_conf2)(ROT *rot, token_t token, char *val, int val_len);       /*!< Pointer to backend implementation of ::rot_get_conf2(). */
+    int (*get_conf2)(ROT *rot, hamlib_token_t token, char *val, int val_len);       /*!< Pointer to backend implementation of ::rot_get_conf2(). */
 };
 //! @cond Doxygen_Suppress
 #define ROT_MODEL(arg) .rot_model=arg,.macro_name=#arg
@@ -544,16 +545,16 @@ rot_cleanup HAMLIB_PARAMS((ROT *rot));
 
 extern HAMLIB_EXPORT(int)
 rot_set_conf HAMLIB_PARAMS((ROT *rot,
-                            token_t token,
+                            hamlib_token_t token,
                             const char *val));
 extern HAMLIB_EXPORT(int)
 rot_get_conf HAMLIB_PARAMS((ROT *rot,
-                            token_t token,
+                            hamlib_token_t token,
                             char *val));
 
 extern HAMLIB_EXPORT(int)
 rot_get_conf2 HAMLIB_PARAMS((ROT *rot,
-                            token_t token,
+                            hamlib_token_t token,
                             char *val,
                             int val_len));
 
@@ -635,29 +636,29 @@ rot_get_parm HAMLIB_PARAMS((ROT *rig,
 
 extern HAMLIB_EXPORT(int)
 rot_set_ext_level HAMLIB_PARAMS((ROT *rig,
-                                 token_t token,
+                                 hamlib_token_t token,
                                  value_t val));
 extern HAMLIB_EXPORT(int)
 rot_get_ext_level HAMLIB_PARAMS((ROT *rig,
-                                 token_t token,
+                                 hamlib_token_t token,
                                  value_t *val));
 
 extern HAMLIB_EXPORT(int)
 rot_set_ext_func HAMLIB_PARAMS((ROT *rig,
-                                 token_t token,
+                                 hamlib_token_t token,
                                  int status));
 extern HAMLIB_EXPORT(int)
 rot_get_ext_func HAMLIB_PARAMS((ROT *rig,
-                                 token_t token,
+                                 hamlib_token_t token,
                                  int *status));
 
 extern HAMLIB_EXPORT(int)
 rot_set_ext_parm HAMLIB_PARAMS((ROT *rig,
-                                token_t token,
+                                hamlib_token_t token,
                                 value_t val));
 extern HAMLIB_EXPORT(int)
 rot_get_ext_parm HAMLIB_PARAMS((ROT *rig,
-                                token_t token,
+                                hamlib_token_t token,
                                 value_t *val));
 
 extern HAMLIB_EXPORT(const char *)
@@ -700,7 +701,7 @@ extern HAMLIB_EXPORT(const struct confparams *)
 rot_confparam_lookup HAMLIB_PARAMS((ROT *rot,
                                    const char *name));
 
-extern HAMLIB_EXPORT(token_t)
+extern HAMLIB_EXPORT(hamlib_token_t)
 rot_token_lookup HAMLIB_PARAMS((ROT *rot,
                                 const char *name));
 
@@ -729,8 +730,8 @@ rot_ext_lookup HAMLIB_PARAMS((ROT *rot,
 
 extern HAMLIB_EXPORT(const struct confparams *)
 rot_ext_lookup_tok HAMLIB_PARAMS((ROT *rot,
-                                  token_t token));
-extern HAMLIB_EXPORT(token_t)
+                                  hamlib_token_t token));
+extern HAMLIB_EXPORT(hamlib_token_t)
 rot_ext_token_lookup HAMLIB_PARAMS((ROT *rot,
                                     const char *name));
 
@@ -797,6 +798,8 @@ extern HAMLIB_EXPORT(const char *) rot_strlevel(setting_t);
 extern HAMLIB_EXPORT(const char *) rot_strparm(setting_t);
 extern HAMLIB_EXPORT(const char *) rot_strstatus(rot_status_t);
 
+extern HAMLIB_EXPORT(void *) rot_data_pointer(ROT *rot, rig_ptrx_t idx);
+
 //! @endcond
 
 /**

include/hamlib/rotclass.h

@@ -51,11 +51,11 @@ public:
     // This method closes the communication port to the rot
     void close(void);
 
-    void setConf(token_t token, const char *val);
+    void setConf(hamlib_token_t token, const char *val);
     void setConf(const char *name, const char *val);
-    void getConf(token_t token, char *val);
+    void getConf(hamlib_token_t token, char *val);
     void getConf(const char *name, char *val);
-    token_t tokenLookup(const char *name);
+    hamlib_token_t tokenLookup(const char *name);
 
     void setPosition(azimuth_t az, elevation_t el);
     void getPosition(azimuth_t& az, elevation_t& el);

include/hamlib/rotlist.h

@@ -557,6 +557,7 @@
 #define ROT_MODEL_PROSISTEL_D_AZ ROT_MAKE_MODEL(ROT_PROSISTEL, 1)
 #define ROT_MODEL_PROSISTEL_D_EL ROT_MAKE_MODEL(ROT_PROSISTEL, 2)
 #define ROT_MODEL_PROSISTEL_COMBI_TRACK_AZEL ROT_MAKE_MODEL(ROT_PROSISTEL, 3)
+#define ROT_MODEL_PROSISTEL_D_EL_CBOXAZ ROT_MAKE_MODEL(ROT_PROSISTEL, 4)
 
 
 /**
@@ -636,9 +637,17 @@
 #define ROT_MODEL_ANDROIDSENSOR ROT_MAKE_MODEL(ROT_ANDROIDSENSOR, 1)
 
 /**
- * \brief A macro that returns the model number of the GRBLTRK backend.
+ * \brief A macro that returns the model number of the ROT_MODEL_GRBLTRK_SER backend.
  *
- * \def ROT_MODEL_GRBLTRK
+ * \def ROT_MODEL_GRBLTRK_SER
+ *
+ * The GRBLTRK backend can be used with rotators that support the GRBL
+ * protocol.
+ */
+/**
+ * \brief A macro that returns the model number of the ROT_MODEL_GRBLTRK_NET backend.
+ *
+ * \def ROT_MODEL_GRBLTRK_NET
  *
  * The GRBLTRK backend can be used with rotators that support the GRBL
  * protocol.
@@ -650,6 +659,48 @@
 #define ROT_MODEL_GRBLTRK_SER ROT_MAKE_MODEL(ROT_GRBLTRK, 1)
 #define ROT_MODEL_GRBLTRK_NET ROT_MAKE_MODEL(ROT_GRBLTRK, 2)
 
+/**
+ * \brief A macro that returns the model number of the FLIR backend.
+ *
+ * \def ROT_MODEL_FLIR
+ *
+ * The FLIR backend can be used with FLIR and DirectedPercepition 
+ * rotators using the PTU protocol (e.g. PTU-D48). Currently only 
+ * the serial interface is supported and no ethernet.
+ */
+//! @cond Doxygen_Suppress
+#define ROT_FLIR 25
+#define ROT_BACKEND_FLIR "flir"
+//! @endcond
+#define ROT_MODEL_FLIR ROT_MAKE_MODEL(ROT_FLIR, 1)
+
+/**
+ * \brief A macro that returns the model number of the APEX backend.
+ *
+ * \def ROT_MODEL_APEX_SHARED_LOOP
+ *
+ * The APEX backend can be used with APEX * rotators. 
+ */
+//! @cond Doxygen_Suppress
+#define ROT_APEX 26
+#define ROT_BACKEND_APEX "apex"
+//! @endcond
+#define ROT_MODEL_APEX_SHARED_LOOP ROT_MAKE_MODEL(ROT_APEX, 1)
+
+/**
+ * \brief A macro that returns the model number of the SAEBRTRACK backend.
+ *
+ * \def ROT_MODEL_SAEBRTRACK
+ *
+ * The SAEBRTRACK backend can be used with SAEBRTRACK * rotators. 
+ */
+//! @cond Doxygen_Suppress
+#define ROT_SAEBRTRACK 27
+#define ROT_BACKEND_SAEBRTRACK "SAEBRTrack"
+//! @endcond
+#define ROT_MODEL_SAEBRTRACK ROT_MAKE_MODEL(ROT_SAEBRTRACK, 1)
+
+
 /**
  * \brief Convenience type definition for a rotator model.
  *

lib/Makefile.am

@@ -3,5 +3,5 @@ EXTRA_DIST = getopt.c getopt.h getopt_long.c usleep.c \
 
 noinst_LTLIBRARIES = libmisc.la
 
-libmisc_la_SOURCES = cJSON.c cJSON.h asyncpipe.c asyncpipe.h
+libmisc_la_SOURCES = cJSON.c cJSON.h asyncpipe.c asyncpipe.h precise_time.c
 libmisc_la_LIBADD = $(LTLIBOBJS) $(NET_LIBS)

lib/asyncpipe.c

@@ -43,6 +43,7 @@ int async_pipe_create(hamlib_async_pipe_t **pipe_out,
 
     if (!pipe->read)
     {
+        free(pipe);
         return -RIG_EINTERNAL;
     }
 
@@ -143,7 +144,7 @@ ssize_t async_pipe_read(hamlib_async_pipe_t *pipe, void *buf, size_t count,
     LPOVERLAPPED overlapped = &pipe->read_overlapped;
     DWORD wait_result;
     int result;
-    ssize_t bytes_read;
+    ssize_t bytes_read = 0;
 
     result = ReadFile(read_handle, buf, count, NULL, overlapped);
 
@@ -248,7 +249,7 @@ ssize_t async_pipe_write(hamlib_async_pipe_t *pipe, const unsigned char *buf,
     LPOVERLAPPED overlapped = &pipe->write_overlapped;
     DWORD wait_result;
     int result;
-    ssize_t bytes_written;
+    ssize_t bytes_written = 0;
 
     result = WriteFile(write_handle, buf, count, NULL, overlapped);
 

lib/cJSON.c

@@ -57,7 +57,6 @@
 #endif
 
 #include "cJSON.h"
-#include <hamlib/rig.h>
 
 /* define our own boolean type */
 #ifdef true
@@ -126,8 +125,8 @@ CJSON_PUBLIC(double) cJSON_GetNumberValue(const cJSON *const item)
 CJSON_PUBLIC(const char *) cJSON_Version(void)
 {
     static char version[15];
-    SNPRINTF(version, sizeof(version), "%i.%i.%i", CJSON_VERSION_MAJOR,
-             CJSON_VERSION_MINOR, CJSON_VERSION_PATCH);
+    sprintf(version, "%i.%i.%i", CJSON_VERSION_MAJOR, CJSON_VERSION_MINOR,
+            CJSON_VERSION_PATCH);
 
     return version;
 }
@@ -168,7 +167,7 @@ typedef struct internal_hooks
 /* work around MSVC error C2322: '...' address of dllimport '...' is not static */
 static void *CJSON_CDECL internal_malloc(size_t size)
 {
-    return calloc(1, size);
+    return malloc(size);
 }
 static void CJSON_CDECL internal_free(void *pointer)
 {
@@ -319,7 +318,7 @@ typedef struct
 
 /* Parse the input text to generate a number, and populate the result into item. */
 static cJSON_bool parse_number(cJSON *const item,
-                               parse_buffer *const input_buffer, int input_buffer_len)
+                               parse_buffer *const input_buffer)
 {
     double number = 0;
     unsigned char *after_end = NULL;
@@ -595,22 +594,23 @@ static cJSON_bool print_number(const cJSON *const item,
     /* This checks for NaN and Infinity */
     if (isnan(d) || isinf(d))
     {
-        SNPRINTF((char *)number_buffer, sizeof(number_buffer), "null");
-        length = strlen((char *)number_buffer);
+        length = sprintf((char *)number_buffer, "null");
+    }
+    else if (d == (double)item->valueint)
+    {
+        length = sprintf((char *)number_buffer, "%d", item->valueint);
     }
     else
     {
         /* Try 15 decimal places of precision to avoid nonsignificant nonzero digits */
-        SNPRINTF((char *)number_buffer, sizeof(number_buffer), "%1.15g", d);
-        length = strlen((char *)number_buffer);
+        length = sprintf((char *)number_buffer, "%1.15g", d);
 
         /* Check whether the original double can be recovered */
         if ((sscanf((char *)number_buffer, "%lg", &test) != 1)
                 || !compare_double((double)test, d))
         {
             /* If not, print with 17 decimal places of precision */
-            SNPRINTF((char *)number_buffer, sizeof(number_buffer), "%1.17g", d);
-            length = strlen((char *)number_buffer);
+            length = sprintf((char *)number_buffer, "%1.17g", d);
         }
     }
 
@@ -813,7 +813,7 @@ fail:
 
 /* Parse the input text into an unescaped cinput, and populate item. */
 static cJSON_bool parse_string(cJSON *const item,
-                               parse_buffer *const input_buffer, int input_buffer_len)
+                               parse_buffer *const input_buffer)
 {
     const unsigned char *input_pointer = buffer_at_offset(input_buffer) + 1;
     const unsigned char *input_end = buffer_at_offset(input_buffer) + 1;
@@ -964,7 +964,7 @@ fail:
 
 /* Render the cstring provided to an escaped version that can be printed. */
 static cJSON_bool print_string_ptr(const unsigned char *const input,
-                                   printbuffer *const output_buffer, int output_buffer_len)
+                                   printbuffer *const output_buffer)
 {
     const unsigned char *input_pointer = NULL;
     unsigned char *output = NULL;
@@ -1104,25 +1104,24 @@ static cJSON_bool print_string_ptr(const unsigned char *const input,
 }
 
 /* Invoke print_string_ptr (which is useful) on an item. */
-static cJSON_bool print_string(const cJSON *const item, printbuffer *const p,
-                               int p_len)
+static cJSON_bool print_string(const cJSON *const item, printbuffer *const p)
 {
-    return print_string_ptr((unsigned char *)item->valuestring, p, p_len);
+    return print_string_ptr((unsigned char *)item->valuestring, p);
 }
 
 /* Predeclare these prototypes. */
 static cJSON_bool parse_value(cJSON *const item,
-                              parse_buffer *const input_buffer, int output_buffer_len);
+                              parse_buffer *const input_buffer);
 static cJSON_bool print_value(const cJSON *const item,
-                              printbuffer *const output_buffer, int output_buffer_len);
+                              printbuffer *const output_buffer);
 static cJSON_bool parse_array(cJSON *const item,
-                              parse_buffer *const input_buffer, int output_buffer_len);
+                              parse_buffer *const input_buffer);
 static cJSON_bool print_array(const cJSON *const item,
-                              printbuffer *const output_buffer, int output_buffer_len);
+                              printbuffer *const output_buffer);
 static cJSON_bool parse_object(cJSON *const item,
-                               parse_buffer *const input_buffer, int output_buffer_len);
+                               parse_buffer *const input_buffer);
 static cJSON_bool print_object(const cJSON *const item,
-                               printbuffer *const output_buffer, int output_buffer_len);
+                               printbuffer *const output_buffer);
 
 /* Utility to jump whitespace and cr/lf */
 static parse_buffer *buffer_skip_whitespace(parse_buffer *const buffer)
@@ -1213,8 +1212,7 @@ CJSON_PUBLIC(cJSON *) cJSON_ParseWithLengthOpts(const char *value,
         goto fail;
     }
 
-    if (!parse_value(item, buffer_skip_whitespace(skip_utf8_bom(&buffer)),
-                     sizeof(buffer)))
+    if (!parse_value(item, buffer_skip_whitespace(skip_utf8_bom(&buffer))))
     {
         /* parse failure. ep is set. */
         goto fail;
@@ -1289,7 +1287,7 @@ static unsigned char *print(const cJSON *const item, cJSON_bool format,
                             const internal_hooks *const hooks)
 {
     static const size_t default_buffer_size = 256;
-    printbuffer buffer[16];
+    printbuffer buffer[1];
     unsigned char *printed = NULL;
 
     memset(buffer, 0, sizeof(buffer));
@@ -1306,7 +1304,7 @@ static unsigned char *print(const cJSON *const item, cJSON_bool format,
     }
 
     /* print the value */
-    if (!print_value(item, buffer, sizeof(buffer)))
+    if (!print_value(item, buffer))
     {
         goto fail;
     }
@@ -1393,7 +1391,7 @@ CJSON_PUBLIC(char *) cJSON_PrintBuffered(const cJSON *item, int prebuffer,
     p.format = fmt;
     p.hooks = global_hooks;
 
-    if (!print_value(item, &p, sizeof(p)))
+    if (!print_value(item, &p))
     {
         global_hooks.deallocate(p.buffer);
         return NULL;
@@ -1419,12 +1417,12 @@ CJSON_PUBLIC(cJSON_bool) cJSON_PrintPreallocated(cJSON *item, char *buffer,
     p.format = format;
     p.hooks = global_hooks;
 
-    return print_value(item, &p, sizeof(p));
+    return print_value(item, &p);
 }
 
 /* Parser core - when encountering text, process appropriately. */
 static cJSON_bool parse_value(cJSON *const item,
-                              parse_buffer *const input_buffer, int input_buffer_len)
+                              parse_buffer *const input_buffer)
 {
     if ((input_buffer == NULL) || (input_buffer->content == NULL))
     {
@@ -1464,7 +1462,7 @@ static cJSON_bool parse_value(cJSON *const item,
     if (can_access_at_index(input_buffer, 0)
             && (buffer_at_offset(input_buffer)[0] == '\"'))
     {
-        return parse_string(item, input_buffer, input_buffer_len);
+        return parse_string(item, input_buffer);
     }
 
     /* number */
@@ -1473,21 +1471,21 @@ static cJSON_bool parse_value(cJSON *const item,
                 || ((buffer_at_offset(input_buffer)[0] >= '0')
                     && (buffer_at_offset(input_buffer)[0] <= '9'))))
     {
-        return parse_number(item, input_buffer, input_buffer_len);
+        return parse_number(item, input_buffer);
     }
 
     /* array */
     if (can_access_at_index(input_buffer, 0)
             && (buffer_at_offset(input_buffer)[0] == '['))
     {
-        return parse_array(item, input_buffer, input_buffer_len);
+        return parse_array(item, input_buffer);
     }
 
     /* object */
     if (can_access_at_index(input_buffer, 0)
             && (buffer_at_offset(input_buffer)[0] == '{'))
     {
-        return parse_object(item, input_buffer, input_buffer_len);
+        return parse_object(item, input_buffer);
     }
 
     return false;
@@ -1495,7 +1493,7 @@ static cJSON_bool parse_value(cJSON *const item,
 
 /* Render a value to text. */
 static cJSON_bool print_value(const cJSON *const item,
-                              printbuffer *const output_buffer, int output_buffer_len)
+                              printbuffer *const output_buffer)
 {
     unsigned char *output = NULL;
 
@@ -1564,13 +1562,13 @@ static cJSON_bool print_value(const cJSON *const item,
     }
 
     case cJSON_String:
-        return print_string(item, output_buffer, output_buffer_len);
+        return print_string(item, output_buffer);
 
     case cJSON_Array:
-        return print_array(item, output_buffer, output_buffer_len);
+        return print_array(item, output_buffer);
 
     case cJSON_Object:
-        return print_object(item, output_buffer, output_buffer_len);
+        return print_object(item, output_buffer);
 
     default:
         return false;
@@ -1579,7 +1577,7 @@ static cJSON_bool print_value(const cJSON *const item,
 
 /* Build an array from input text. */
 static cJSON_bool parse_array(cJSON *const item,
-                              parse_buffer *const input_buffer, int input_buffer_len)
+                              parse_buffer *const input_buffer)
 {
     cJSON *head = NULL; /* head of the linked list */
     cJSON *current_item = NULL;
@@ -1646,7 +1644,7 @@ static cJSON_bool parse_array(cJSON *const item,
         input_buffer->offset++;
         buffer_skip_whitespace(input_buffer);
 
-        if (!parse_value(current_item, input_buffer, input_buffer_len))
+        if (!parse_value(current_item, input_buffer))
         {
             goto fail; /* failed to parse value */
         }
@@ -1689,7 +1687,7 @@ fail:
 
 /* Render an array to text */
 static cJSON_bool print_array(const cJSON *const item,
-                              printbuffer *const output_buffer, int output_buffer_len)
+                              printbuffer *const output_buffer)
 {
     unsigned char *output_pointer = NULL;
     size_t length = 0;
@@ -1715,7 +1713,7 @@ static cJSON_bool print_array(const cJSON *const item,
 
     while (current_element != NULL)
     {
-        if (!print_value(current_element, output_buffer, output_buffer_len))
+        if (!print_value(current_element, output_buffer))
         {
             return false;
         }
@@ -1762,7 +1760,7 @@ static cJSON_bool print_array(const cJSON *const item,
 
 /* Build an object from the text. */
 static cJSON_bool parse_object(cJSON *const item,
-                               parse_buffer *const input_buffer, int input_buffer_len)
+                               parse_buffer *const input_buffer)
 {
     cJSON *head = NULL; /* linked list head */
     cJSON *current_item = NULL;
@@ -1828,7 +1826,7 @@ static cJSON_bool parse_object(cJSON *const item,
         input_buffer->offset++;
         buffer_skip_whitespace(input_buffer);
 
-        if (!parse_string(current_item, input_buffer, input_buffer_len))
+        if (!parse_string(current_item, input_buffer))
         {
             goto fail; /* failed to parse name */
         }
@@ -1849,7 +1847,7 @@ static cJSON_bool parse_object(cJSON *const item,
         input_buffer->offset++;
         buffer_skip_whitespace(input_buffer);
 
-        if (!parse_value(current_item, input_buffer, input_buffer_len))
+        if (!parse_value(current_item, input_buffer))
         {
             goto fail; /* failed to parse value */
         }
@@ -1891,7 +1889,7 @@ fail:
 
 /* Render an object to text. */
 static cJSON_bool print_object(const cJSON *const item,
-                               printbuffer *const output_buffer, int output_buffer_len)
+                               printbuffer *const output_buffer)
 {
     unsigned char *output_pointer = NULL;
     size_t length = 0;
@@ -1942,8 +1940,7 @@ static cJSON_bool print_object(const cJSON *const item,
         }
 
         /* print key */
-        if (!print_string_ptr((unsigned char *)current_item->string, output_buffer,
-                              output_buffer_len))
+        if (!print_string_ptr((unsigned char *)current_item->string, output_buffer))
         {
             return false;
         }
@@ -1968,7 +1965,7 @@ static cJSON_bool print_object(const cJSON *const item,
         output_buffer->offset += length;
 
         /* print value */
-        if (!print_value(current_item, output_buffer, output_buffer_len))
+        if (!print_value(current_item, output_buffer))
         {
             return false;
         }
@@ -2573,9 +2570,9 @@ CJSON_PUBLIC(cJSON_bool) cJSON_ReplaceItemViaPointer(cJSON *const parent,
     else
     {
         /*
-             * To find the last item in array quickly, we use prev in array.
-             * We can't modify the last item's next pointer where this item was the parent's child
-             */
+         * To find the last item in array quickly, we use prev in array.
+         * We can't modify the last item's next pointer where this item was the parent's child
+         */
         if (replacement->prev != NULL)
         {
             replacement->prev->next = replacement;
@@ -2622,6 +2619,12 @@ static cJSON_bool replace_item_in_object(cJSON *object, const char *string,
 
     replacement->string = (char *)cJSON_strdup((const unsigned char *)string,
                           &global_hooks);
+
+    if (replacement->string == NULL)
+    {
+        return false;
+    }
+
     replacement->type &= ~cJSON_StringIsConst;
 
     return cJSON_ReplaceItemViaPointer(object, get_object_item(object, string,

lib/cJSON.h

@@ -124,9 +124,9 @@ typedef struct cJSON
 
 typedef struct cJSON_Hooks
 {
-    /* malloc/free are CDECL on Windows regardless of the default calling convention of the compiler, so ensure the hooks allow passing those functions directly. */
-    void *(CJSON_CDECL *malloc_fn)(size_t sz);
-    void (CJSON_CDECL *free_fn)(void *ptr);
+      /* malloc/free are CDECL on Windows regardless of the default calling convention of the compiler, so ensure the hooks allow passing those functions directly. */
+      void *(CJSON_CDECL *malloc_fn)(size_t sz);
+      void (CJSON_CDECL *free_fn)(void *ptr);
 } cJSON_Hooks;
 
 typedef int cJSON_bool;
@@ -255,7 +255,7 @@ CJSON_PUBLIC(cJSON *) cJSON_Duplicate(const cJSON *item, cJSON_bool recurse);
 CJSON_PUBLIC(cJSON_bool) cJSON_Compare(const cJSON * const a, const cJSON * const b, const cJSON_bool case_sensitive);
 
 /* Minify a strings, remove blank characters(such as ' ', '\t', '\r', '\n') from strings.
- * The input pointer json cannot point to a read-only address area, such as a string constant,
+ * The input pointer json cannot point to a read-only address area, such as a string constant, 
  * but should point to a readable and writable address area. */
 CJSON_PUBLIC(void) cJSON_Minify(char *json);
 
@@ -279,6 +279,13 @@ CJSON_PUBLIC(double) cJSON_SetNumberHelper(cJSON *object, double number);
 /* Change the valuestring of a cJSON_String object, only takes effect when type of object is cJSON_String */
 CJSON_PUBLIC(char*) cJSON_SetValuestring(cJSON *object, const char *valuestring);
 
+/* If the object is not a boolean type this does nothing and returns cJSON_Invalid else it returns the new type*/
+#define cJSON_SetBoolValue(object, boolValue) ( \
+    (object != NULL && ((object)->type & (cJSON_False|cJSON_True))) ? \
+    (object)->type=((object)->type &(~(cJSON_False|cJSON_True)))|((boolValue)?cJSON_True:cJSON_False) : \
+    cJSON_Invalid\
+)
+
 /* Macro for iterating over an array or object */
 #define cJSON_ArrayForEach(element, array) for(element = (array != NULL) ? (array)->child : NULL; element != NULL; element = element->next)
 

lib/dummy.c

@@ -1,7 +1,7 @@
 /* Dummy function to make sure libmisc never become an empty library.
  * Solaris linker does not like such libs.
  */
-
+// cppcheck-suppress unusedFunction
 void dummy(void)
 {
 

lib/precise_time.c

@@ -0,0 +1,181 @@
+// ---------------------------------------------------------------------
+// precise_time.cxx
+//
+// Copyright (C) 2023
+//      Dave Freese, W1HKJ
+//
+// This file is part of flrig
+//
+// flrig is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// flrig is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with fldigi.  If not, see <http://www.gnu.org/licenses/>.
+// ---------------------------------------------------------------------
+
+#include <errno.h>
+#include <time.h>
+#include <sys/time.h>
+
+#if 0
+// return current tick time in seconds
+double monotonic_seconds()
+{
+    static struct timeval t1;
+    gettimeofday(&t1, NULL);
+    return t1.tv_sec + t1.tv_usec / 1e6;
+}
+
+#else
+
+//======================================================================
+//
+// A cross platform monotonic timer.
+// Copyright 2013 Alex Reece.
+//
+
+#include <unistd.h>
+
+#define NANOS_PER_SECF 1000000000.0
+#define USECS_PER_SEC 1000000
+
+static int showme = 0;
+
+#if _POSIX_TIMERS > 0 && defined(_POSIX_MONOTONIC_CLOCK)
+// If we have it, use clock_gettime and CLOCK_MONOTONIC.
+
+#include <time.h>
+
+double monotonic_seconds()
+{
+    if (showme)
+    {
+        showme = 0;
+    }
+
+    struct timespec time;
+
+    // Note: Make sure to link with -lrt to define clock_gettime.
+    clock_gettime(CLOCK_MONOTONIC, &time);
+
+    return ((double) time.tv_sec) + ((double) time.tv_nsec / (NANOS_PER_SECF));
+}
+
+#elif defined(__APPLE__)
+// If we don't have CLOCK_MONOTONIC, we might be on a Mac. There we instead
+// use mach_absolute_time().
+
+#include <mach/mach_time.h>
+
+static mach_timebase_info_data_t info;
+static void __attribute__((constructor)) init_info()
+{
+    mach_timebase_info(&info);
+}
+
+double monotonic_seconds()
+{
+    uint64_t time = mach_absolute_time();
+    double dtime = (double) time;
+    dtime *= (double) info.numer;
+    dtime /= (double) info.denom;
+    return dtime / NANOS_PER_SECF;
+}
+
+#elif defined(__WIN32__)
+// On Windows, use QueryPerformanceCounter and QueryPerformanceFrequency.
+
+#include <windows.h>
+
+static double PCFreq = 0.0;
+
+// According to http://stackoverflow.com/q/1113409/447288, this will
+// make this function a constructor.
+// TODO(awreece) Actually attempt to compile on windows.
+// w1hkj - builds OK on mingw32
+
+static void __cdecl init_pcfreq();
+__declspec(allocate(".CRT$XCU")) void (__cdecl *init_pcfreq_)() = init_pcfreq;
+static void __cdecl init_pcfreq()
+{
+    // Accoring to http://stackoverflow.com/a/1739265/447288, this will
+    // properly initialize the QueryPerformanceCounter.
+    LARGE_INTEGER li;
+    int has_qpc = QueryPerformanceFrequency(&li);
+    assert(has_qpc);
+
+    PCFreq = ((double) li.QuadPart) / 1000.0;
+}
+
+double monotonic_seconds()
+{
+    LARGE_INTEGER li;
+    QueryPerformanceCounter(&li);
+    return ((double) li.QuadPart) / PCFreq;
+}
+
+#else
+// Fall back to rdtsc. The reason we don't use clock() is this scary message
+// from the man page:
+//     "On several other implementations, the value returned by clock() also
+//      includes the times of any children whose status has been collected via
+//      wait(2) (or another wait-type call)."
+//
+// Also, clock() only has microsecond accuracy.
+//
+// This whitepaper offered excellent advice on how to use rdtscp for
+// profiling: http://download.intel.com/embedded/software/IA/324264.pdf
+//
+// Unfortunately, we can't follow its advice exactly with our semantics,
+// so we're just going to use rdtscp with cpuid.
+//
+// Note that rdtscp will only be available on new processors.
+
+#include <stdint.h>
+
+static inline uint64_t rdtsc()
+{
+    uint32_t hi, lo;
+    uint64_t hi64, lo64;
+    asm volatile("rdtscp\n"
+                 "movl %%edx, %0\n"
+                 "movl %%eax, %1\n"
+                 "cpuid"
+                 : "=r"(hi), "=r"(lo) : : "%rax", "%rbx", "%rcx", "%rdx");
+    hi64 = hi;
+    lo64 = lo;
+    return (hi64 << 32) | lo64;
+}
+
+static uint64_t rdtsc_per_sec = 0;
+static void __attribute__((constructor)) init_rdtsc_per_sec()
+{
+    uint64_t before, after;
+
+    before = rdtsc();
+    usleep(USECS_PER_SEC);
+    after = rdtsc();
+
+    rdtsc_per_sec = after - before;
+}
+
+double monotonic_seconds()
+{
+    if (showme)
+    {
+        showme = false;
+    }
+
+    return (double) rdtsc() / (double) rdtsc_per_sec;
+}
+
+#endif
+
+#endif

lib/termios.c

@@ -1,5 +1,6 @@
 #include <hamlib/rig.h>
 #include <hamlib/config.h>
+#include "misc.h"
 
 #if defined(WIN32) && !defined(HAVE_TERMIOS_H)
 
@@ -9,9 +10,11 @@
 #ifdef DEBUG
 #define DEBUG_VERBOSE
 #define DEBUG_ERRORS
-#define report(a) fprintf(stderr,a)
-#define report_warning(a) fprintf(stderr,a)
-#define report_error(a) fprintf(stderr,a)
+static char message[256];
+static char datestr[64];
+#define report(a) fprintf(stderr, "%s: %s", date_strget(datestr, sizeof(datestr), 0), a)
+#define report_warning(a) fprintf(stderr, "%s: %s", date_strget(datestr, sizeof(datestr), 0), a)
+#define report_error(a) fprintf(stderr, "%s: %s", date_strget(datestr, sizeof(datestr), 0), a)
 #else
 #define report(a) do {} while (0)
 #define report_warning(a) do {} while (0)
@@ -65,31 +68,8 @@ int my_errno;
 #if 0
 extern int errno;
 #endif
-struct termios_list
-{
-    char filename[512];
-    int my_errno;
-    int interrupt;
-    int event_flag;
-    int tx_happened;
-    unsigned long *hComm;
-    struct termios *ttyset;
-    struct serial_struct *sstruct;
-    /* for DTR DSR */
-    unsigned char MSR;
-    struct async_struct *astruct;
-    struct serial_icounter_struct *sis;
-    int open_flags;
-    OVERLAPPED rol;
-    OVERLAPPED wol;
-    OVERLAPPED sol;
-    int fd;
-    struct termios_list *next;
-    struct termios_list *prev;
-};
-struct termios_list *first_tl = NULL;
 
-static struct termios_list *find_port(int);
+struct termios_list *first_tl = NULL;
 
 /*----------------------------------------------------------
 serial_test
@@ -130,7 +110,7 @@ int win32_serial_test(char *filename)
 
 static void termios_setflags(int fd, int termios_flags[])
 {
-    struct termios_list *index = find_port(fd);
+    struct termios_list *index = win32_serial_find_port(fd);
     int i, result;
     int windows_flags[11] = { 0, EV_RXCHAR, EV_TXEMPTY, EV_CTS, EV_DSR,
                               EV_RING | 0x2000, EV_RLSD, EV_ERR,
@@ -761,7 +741,7 @@ int win32_serial_close(int fd)
         return (0);
     }
 
-    index = find_port(fd);
+    index = win32_serial_find_port(fd);
 
     if (!index)
     {
@@ -1101,7 +1081,7 @@ termios_list()
    comments:
 ----------------------------------------------------------*/
 
-static struct termios_list *find_port(int fd)
+struct termios_list *win32_serial_find_port(int fd)
 {
 
     char message[80];
@@ -1489,7 +1469,7 @@ int win32_serial_write(int fd, const char *Str, int length)
         return 0;
     }
 
-    index = find_port(fd);
+    index = win32_serial_find_port(fd);
 
     if (!index)
     {
@@ -1588,7 +1568,7 @@ int win32_serial_read(int fd, void *vb, int size)
         return 0;
     }
 
-    index = find_port(fd);
+    index = win32_serial_find_port(fd);
 
     if (!index)
     {
@@ -1650,7 +1630,7 @@ int win32_serial_read(int fd, void *vb, int size)
         do
         {
             ClearErrors(index, &stat);
-            hl_usleep(1000);
+            hl_usleep(100);
         }
         while (stat.cbInQue < index->ttyset->c_cc[VMIN] && c > clock());
 
@@ -1787,7 +1767,7 @@ int win32_serial_read(int fd, void *vb, int size)
         return 0;
     }
 
-    index = find_port(fd);
+    index = win32_serial_find_port(fd);
 
     if (!index)
     {
@@ -2409,7 +2389,7 @@ int tcgetattr(int fd, struct termios *s_termios)
         return 0;
     }
 
-    index = find_port(fd);
+    index = win32_serial_find_port(fd);
 
     if (!index)
     {
@@ -2652,7 +2632,7 @@ int tcsetattr(int fd, int when, struct termios *s_termios)
         return 0;
     }
 
-    index = find_port(fd);
+    index = win32_serial_find_port(fd);
 
     if (!index)
     {
@@ -2863,7 +2843,7 @@ int tcsendbreak(int fd, int duration)
 
     ENTER("tcsendbreak");
 
-    index = find_port(fd);
+    index = win32_serial_find_port(fd);
 
     if (!index)
     {
@@ -2908,7 +2888,7 @@ int tcdrain(int fd)
     int old_flag;
 
     ENTER("tcdrain");
-    index = find_port(fd);
+    index = win32_serial_find_port(fd);
 
     if (!index)
     {
@@ -2985,7 +2965,7 @@ int tcflush(int fd, int queue_selector)
 
     ENTER("tcflush");
 
-    index = find_port(fd);
+    index = win32_serial_find_port(fd);
 
     if (!index)
     {
@@ -3166,7 +3146,7 @@ int win32_serial_ioctl(int fd, int request, ...)
         return 0;
     }
 
-    index = find_port(fd);
+    index = win32_serial_find_port(fd);
 
     if (!index)
     {
@@ -3635,7 +3615,7 @@ int win32_serial_fcntl(int fd, int command, ...)
         return 0;
     }
 
-    index = find_port(fd);
+    index = win32_serial_find_port(fd);
 
     if (!index)
     {
@@ -3688,7 +3668,7 @@ termios_interrupt_event_loop()
 ----------------------------------------------------------*/
 static void termios_interrupt_event_loop(int fd, int flag)
 {
-    struct termios_list *index = find_port(fd);
+    struct termios_list *index = win32_serial_find_port(fd);
 
     if (!index)
     {
@@ -3738,7 +3718,7 @@ int  win32_serial_select(int  n,  fd_set  *readfds,  fd_set  *writefds,
         goto fail;
     }
 
-    index = find_port(fd);
+    index = win32_serial_find_port(fd);
 
     if (!index)
     {
@@ -3798,9 +3778,9 @@ int  win32_serial_select(int  n,  fd_set  *readfds,  fd_set  *writefds,
                 goto end;
             }
 
-            hl_usleep(10000);
+            hl_usleep(1000);
             /* FIXME: not very accurate wrt process time */
-            timeout_usec -= 10000;
+            timeout_usec -= 1000;
 
             report("sleep...\n");
 
@@ -3895,7 +3875,7 @@ int  win32_serial_select(int  n,  fd_set  *readfds,  fd_set  *writefds,
         return 1;
     }
 
-    index = find_port(fd);
+    index = win32_serial_find_port(fd);
 
     if (!index)
     {
@@ -4028,7 +4008,7 @@ static int termiosGetParityErrorChar(int fd)
     DCB dcb;
 
     ENTER("termiosGetParityErrorChar");
-    index = find_port(fd);
+    index = win32_serial_find_port(fd);
 
     if (!index)
     {
@@ -4058,7 +4038,7 @@ static void termiosSetParityError(int fd, char value)
     struct termios_list *index;
 
     ENTER("termiosSetParityErrorChar");
-    index = find_port(fd);
+    index = win32_serial_find_port(fd);
 
     if (!index)
     {

lib/win32termios.h

@@ -119,6 +119,29 @@ struct serial_icounter_struct {
 	int reserved[9]; 	/* unused */
 };
 
+struct termios_list
+{
+    char filename[512];
+    int my_errno;
+    int interrupt;
+    int event_flag;
+    int tx_happened;
+    unsigned long *hComm;
+    struct termios *ttyset;
+    struct serial_struct *sstruct;
+    /* for DTR DSR */
+    unsigned char MSR;
+    struct async_struct *astruct;
+    struct serial_icounter_struct *sis;
+    int open_flags;
+    OVERLAPPED rol;
+    OVERLAPPED wol;
+    OVERLAPPED sol;
+    int fd;
+    struct termios_list *next;
+    struct termios_list *prev;
+};
+
 int win32_serial_test( char * );
 int win32_serial_open(const char *File, int flags, ... );
 int win32_serial_close(int fd);
@@ -126,6 +149,7 @@ int win32_serial_read(int fd, void *b, int size);
 int win32_serial_write(int fd, const char *Str, int length);
 int win32_serial_ioctl(int fd, int request, ... );
 int win32_serial_fcntl(int fd, int command, ...);
+struct termios_list *win32_serial_find_port(int);
 /*
  * lcc winsock.h conflicts
  */

rigs/adat/adat.h

@@ -5,7 +5,7 @@
 //  adat.h
 //
 //  Created by Frank Goenninger DG1SBG.
-//  Copyright © 2011, 2012 Frank Goenninger.
+//  Copyright © 2011, 2012, 2023 Frank Goenninger.
 //
 //   This library is free software; you can redistribute it and/or
 //   modify it under the terms of the GNU Lesser General Public
@@ -29,21 +29,23 @@
 // SYSTEM INCLUDES
 // ---------------------------------------------------------------------------
 
+#include <stddef.h>
 
 // ---------------------------------------------------------------------------
 //    HAMLIB INCLUDES
 // ---------------------------------------------------------------------------
 
 #include <hamlib/rig.h>
+#include "token.h"
 
 // ---------------------------------------------------------------------------
 //    GLOBAL DEFINITIONS
 // ---------------------------------------------------------------------------
 
-#define BACKEND_VER "20191206"
+#define BACKEND_VER "20230927"
 
-#define ADAT_BUFSZ                 256
-#define ADAT_RESPSZ                256
+#define ADAT_BUFSZ                 255
+#define ADAT_RESPSZ                255
 
 #define ADAT_CR                    "\x0d"
 #define ADAT_EOL                   "\x0a"
@@ -98,7 +100,7 @@
 
 // ADAT MODE DEFINITIONS
 
-#define ADAT_MODE_LENGTH           5
+#define ADAT_MODE_LENGTH           15
 #define ADAT_NR_MODES              8
 
 // Each mode is defined by three values:
@@ -322,31 +324,45 @@
 // -- GET POWER STATUS --
 
 // -- GET INFO --
+// Nothing to define here
 
 // -- OPEN ADAT --
+// Nothing to define here
 
 // -- ADAT SPECIAL: RECOVER FROM ERROR --
+// Nothing to define here
 
 // ---------------------------------------------------------------------------
 //    ADAT PRIVATE DATA
 // ---------------------------------------------------------------------------
 
+#define ADAT_PRIV_DATA_PRODUCTNAME_LENGTH    255
+#define ADAT_PRIV_DATA_SERIALNR_LENGTH       255
+#define ADAT_PRIV_DATA_IDCODE_LENGTH         255
+#define ADAT_PRIV_DATA_OPTIONS_LENGTH        255
+#define ADAT_PRIV_DATA_FWVERSION_LENGTH      255
+#define ADAT_PRIV_DATA_HWVERSION_LENGTH      255
+#define ADAT_PRIV_DATA_GUIFWVERSION_LENGTH   255
+#define ADAT_PRIV_DATA_CALLSIGN_LENGTH       255
+#define ADAT_PRIV_DATA_CMD_LENGTH            255
+#define ADAT_PRIV_DATA_RESULT_LENGTH         255
+
 typedef struct _adat_priv_data
 {
     int           nOpCode;
 
-    char         *pcProductName; // Future use (USB direct I/O)
+    char          acProductName[ ADAT_PRIV_DATA_PRODUCTNAME_LENGTH + 1]; // Future use (USB direct I/O)
 
     // ADAT device info
 
-    char         *pcSerialNr;
-    char         *pcIDCode;
-    char         *pcOptions;
-    char         *pcFWVersion;
-    char         *pcHWVersion;
-    char         *pcGUIFWVersion;
+    char          acSerialNr[ ADAT_PRIV_DATA_SERIALNR_LENGTH + 1 ];
+    char          acIDCode[ ADAT_PRIV_DATA_IDCODE_LENGTH + 1 ];
+    char          acOptions[ ADAT_PRIV_DATA_OPTIONS_LENGTH + 1 ];
+    char          acFWVersion[ ADAT_PRIV_DATA_FWVERSION_LENGTH + 1 ];
+    char          acHWVersion[ ADAT_PRIV_DATA_HWVERSION_LENGTH + 1 ];
+    char          acGUIFWVersion[ ADAT_PRIV_DATA_GUIFWVERSION_LENGTH + 1 ];
 
-    char         *pcCallsign;
+    char          acCallsign[ ADAT_PRIV_DATA_CALLSIGN_LENGTH + 1 ];
 
     // ADAT Operational Settings: will change during TRX use
 
@@ -377,10 +393,10 @@ typedef struct _adat_priv_data
 
     // ADAT Command-related Values
 
-    char         *pcCmd;
+    char          acCmd[ ADAT_PRIV_DATA_CMD_LENGTH + 1 ];
     int           nCmdKind;
 
-    char         *pcResult;
+    char          acResult[ ADAT_PRIV_DATA_RESULT_LENGTH + 1 ];
     int           nRC;
 
 } adat_priv_data_t,
@@ -531,9 +547,6 @@ int adat_cmd_recover_from_error(RIG *, int);
 
 int adat_transaction(RIG *, adat_cmd_list_ptr);
 
-adat_priv_data_ptr adat_new_priv_data(RIG *);
-void adat_del_priv_data(adat_priv_data_t **);
-
 // Command implementation
 
 int adat_cmd_fn_get_serial_nr(RIG *);
@@ -543,7 +556,6 @@ int adat_cmd_fn_get_gui_fw_version(RIG *);
 int adat_cmd_fn_get_id_code(RIG *);
 int adat_cmd_fn_get_options(RIG *);
 
-int adat_cmd_fn_set_callsign(RIG *);
 int adat_cmd_fn_get_callsign(RIG *);
 
 int adat_cmd_fn_set_freq(RIG *);
@@ -568,8 +580,8 @@ int adat_reset(RIG *, reset_t);
 int adat_open(RIG *);
 int adat_close(RIG *);
 
-int adat_set_conf(RIG *, token_t, const char *val);
-int adat_get_conf(RIG *, token_t, char *val);
+int adat_set_conf(RIG *, hamlib_token_t, const char *val);
+int adat_get_conf(RIG *, hamlib_token_t, char *val);
 
 int adat_set_freq(RIG *, vfo_t, freq_t);
 int adat_get_freq(RIG *, vfo_t, freq_t *);
@@ -598,7 +610,7 @@ int adat_power2mW(RIG *, unsigned int *, float, freq_t, rmode_t);
 
 int adat_get_powerstat(RIG *, powerstat_t *);
 
-extern const struct rig_caps adt_200a_caps;
+extern struct rig_caps adt_200a_caps;
 
 // ---------------------------------------------------------------------------
 //    END OF FILE

rigs/adat/adt_200a.c

@@ -5,7 +5,7 @@
 //  adt_200a.c
 //
 //  Created by Frank Goenninger DG1SBG.
-//  Copyright © 2011, 2012 Frank Goenninger.
+//  Copyright © 2011, 2012, 2023 Frank Goenninger.
 //
 //   This library is free software; you can redistribute it and/or
 //   modify it under the terms of the GNU Lesser General Public
@@ -21,9 +21,6 @@
 //   License along with this library; if not, write to the Free Software
 //   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
-
-#include <hamlib/config.h>
-
 // ---------------------------------------------------------------------------
 //    ADT-200A INCLUDES
 // ---------------------------------------------------------------------------
@@ -51,7 +48,7 @@
 //    ADT-200A HAMLIB CAPS / DESCRIPTION
 // ---------------------------------------------------------------------------
 
-const struct rig_caps adt_200a_caps =
+struct rig_caps adt_200a_caps =
 {
     RIG_MODEL(RIG_MODEL_ADT_200A),
     .model_name         =  "ADT-200A",
@@ -103,12 +100,18 @@ const struct rig_caps adt_200a_caps =
     .rx_range_list1 =
     {
         { kHz(10), MHz(30), ADT_200A_MODES, -1, -1, ADT_200A_VFO },
+        { MHz(50), MHz(50.5), ADT_200A_MODES, -1, -1, ADT_200A_VFO },
+        { MHz(70), MHz(70.7), ADT_200A_MODES, -1, -1, ADT_200A_VFO },
+        { MHz(146), MHz(148), ADT_200A_MODES, -1, -1, ADT_200A_VFO },
         RIG_FRNG_END,
     },
 
     .tx_range_list1 =
     {
         { kHz(10), MHz(30), ADT_200A_MODES, mW(100), W(50), ADT_200A_VFO },
+        { MHz(50), MHz(50.5), ADT_200A_MODES, mW(10), W(1), ADT_200A_FRA },
+        { MHz(70), MHz(70.7), ADT_200A_MODES, mW(10), W(1), ADT_200A_FRA },
+        { MHz(146), MHz(148), ADT_200A_MODES, mW(10), mW(100), ADT_200A_FRA },
         RIG_FRNG_END,
     },
 
@@ -166,8 +169,10 @@ const struct rig_caps adt_200a_caps =
         { RIG_MODE_FM, Hz(8000) },
         { RIG_MODE_FM, Hz(9000) },
         { RIG_MODE_FM, Hz(10000) },
-        { RIG_MODE_FM, Hz(11000) },
         { RIG_MODE_FM, Hz(12000) },
+        { RIG_MODE_FM, Hz(15000) },
+        { RIG_MODE_FM, Hz(20000) },
+        { RIG_MODE_FM, Hz(25000) },
         RIG_FLT_END,
     },
     .str_cal = ADT_200A_STR_CAL,

rigs/adat/adt_200a.h

@@ -25,6 +25,12 @@
 #if !defined( __ADT_200A_INCLUDED__ )
 #define __ADT_200A_INCLUDED__
 
+// ---------------------------------------------------------------------------
+//    HAMLIB INCLUDES
+// ---------------------------------------------------------------------------
+
+#include "rig.h"
+
 // ---------------------------------------------------------------------------
 //    ADAT INCLUDES
 // ---------------------------------------------------------------------------

rigs/alinco/alinco.c

@@ -19,7 +19,6 @@
  *
  */
 
-#include <hamlib/config.h>
 #include <hamlib/rig.h>
 #include <register.h>
 

rigs/alinco/alinco.h

@@ -23,12 +23,11 @@
 #define _ALINCO_H 1
 
 #include <hamlib/rig.h>
-#include <tones.h>
 
 #define BACKEND_VER "20200323"
 
-extern const struct rig_caps dx77_caps;
-extern const struct rig_caps dxsr8_caps;
+extern struct rig_caps dx77_caps;
+extern struct rig_caps dxsr8_caps;
 
 #define BUFSZ 32
 

rigs/alinco/dx77.c

@@ -19,8 +19,7 @@
  *
  */
 
-#include <hamlib/config.h>
-
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>  /* String function definitions */
@@ -29,8 +28,8 @@
 #include "idx_builtin.h"
 #include "alinco.h"
 #include <serial.h>
+#include "tones.h"
 #include <misc.h>
-#include <cal.h>
 
 /*
  * modes in use by the "2G" command
@@ -151,7 +150,7 @@ int dx77_get_mem(RIG *rig, vfo_t vfo, int *ch);
  *  - up/down
  *  - scan
  */
-const struct rig_caps dx77_caps =
+struct rig_caps dx77_caps =
 {
     RIG_MODEL(RIG_MODEL_DX77),
     .model_name =       "DX-77",
@@ -215,7 +214,6 @@ const struct rig_caps dx77_caps =
         RIG_FRNG_END,
     },
     .tx_range_list1 = {RIG_FRNG_END,},
-    .tx_range_list2 = {RIG_FRNG_END,},
 
     .rx_range_list2 =
     {
@@ -303,7 +301,7 @@ int dx77_transaction(RIG *rig,
 {
 
     int retval;
-    struct rig_state *rs;
+    hamlib_port_t *rp = RIGPORT(rig);
     char echobuf[BUFSZ + 1];
 
     if (cmd == NULL)
@@ -313,11 +311,9 @@ int dx77_transaction(RIG *rig,
         return -RIG_EINTERNAL;
     }
 
-    rs = &rig->state;
+    rig_flush(rp);
 
-    rig_flush(&rs->rigport);
-
-    retval = write_block(&rs->rigport, (unsigned char *) cmd, cmd_len);
+    retval = write_block(rp, (unsigned char *) cmd, cmd_len);
 
     if (retval != RIG_OK)
     {
@@ -328,7 +324,7 @@ int dx77_transaction(RIG *rig,
      * Transceiver sends an echo of cmd followed by a CR/LF
      * TODO: check whether cmd and echobuf match (optional)
      */
-    retval = read_string(&rs->rigport, (unsigned char *) echobuf, BUFSZ,
+    retval = read_string(rp, (unsigned char *) echobuf, BUFSZ,
                          LF, strlen(LF), 0, 1);
 
     if (retval < 0)
@@ -336,7 +332,7 @@ int dx77_transaction(RIG *rig,
         return retval;
     }
 
-    if (!(data && data_len))
+    if (((data == NULL) && (data_len > 0)) || ((data != NULL) && (data_len == 0)))
     {
         rig_debug(RIG_DEBUG_ERR, "%s: data and datalen not both NULL??\n", __func__);
         return -RIG_EINTERNAL;
@@ -345,7 +341,7 @@ int dx77_transaction(RIG *rig,
     /* no data expected, check for OK returned */
     if (data == NULL)
     {
-        retval = read_string(&rs->rigport, (unsigned char *) echobuf, BUFSZ,
+        retval = read_string(rp, (unsigned char *) echobuf, BUFSZ,
                              LF, strlen(LF), 0, 1);
 
         if (retval < 0)
@@ -367,7 +363,7 @@ int dx77_transaction(RIG *rig,
         }
     }
 
-    retval = read_string(&rs->rigport, (unsigned char *) data, BUFSZ,
+    retval = read_string(rp, (unsigned char *) data, BUFSZ,
                          LF, strlen(LF), 0, 1);
 
     if (retval < 0)
@@ -499,7 +495,6 @@ int dx77_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
     }
 
     /* at least 6 digits */
-    // cppcheck-suppress *
     SNPRINTF(freqbuf, sizeof(freqbuf), AL CMD_RXFREQ "%06"PRIll EOM, (int64_t)freq);
 
     return dx77_transaction(rig, freqbuf, strlen(freqbuf), NULL, NULL);
@@ -1015,11 +1010,11 @@ int dx77_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
         {
             lvl = 31;
         }
-        else if (val.i >= 6 && val.i < 20)
+        else if (val.i < 20)
         {
             lvl = val.i + 25;
         }
-        else if (val.i >= 20 && val.i <= 50)
+        else if (val.i <= 50)
         {
             lvl = val.i - 20;
         }
@@ -1263,7 +1258,7 @@ int dx77_set_parm(RIG *rig, setting_t parm, value_t val)
  */
 int dx77_set_ctcss_tone(RIG *rig, vfo_t vfo, tone_t tone)
 {
-    const struct rig_caps *caps;
+    struct rig_caps *caps;
     unsigned char tonebuf[BUFSZ];
     int i;
 

rigs/alinco/dxsr8.c

@@ -19,13 +19,13 @@
  *
  */
 
-#include <hamlib/config.h>
-
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>  /* String function definitions */
 
 #include <hamlib/rig.h>
 #include <serial.h>
+#include "tones.h"
 #include <misc.h>
 #include <iofunc.h>
 #include <num_stdio.h>
@@ -75,7 +75,7 @@ int dxsr8_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt);
  *      https://yo5ptd.wordpress.com/2017/02/12/alinco-dx-sr8/
  * for a partially documented protocol
  */
-const struct rig_caps dxsr8_caps =
+struct rig_caps dxsr8_caps =
 {
     RIG_MODEL(RIG_MODEL_DXSR8),
     .model_name =       "DX-SR8",
@@ -235,7 +235,7 @@ int dxsr8_transaction(RIG *rig,
 {
 
     int retval;
-    struct rig_state *rs;
+    hamlib_port_t *rp = RIGPORT(rig);
     char replybuf[BUFSZ + 1];
     int reply_len;
 
@@ -246,11 +246,9 @@ int dxsr8_transaction(RIG *rig,
         return -RIG_EINTERNAL;
     }
 
-    rs = &rig->state;
+    rig_flush(rp);
 
-    rig_flush(&rs->rigport);
-
-    retval = write_block(&rs->rigport, (unsigned char *) cmd, cmd_len);
+    retval = write_block(rp, (unsigned char *) cmd, cmd_len);
 
     if (retval != RIG_OK)
     {
@@ -261,7 +259,7 @@ int dxsr8_transaction(RIG *rig,
      * Transceiver sends an echo of cmd followed by a CR/LF
      * TODO: check whether cmd and echobuf match (optional)
      */
-    retval = read_string(&rs->rigport, (unsigned char *) replybuf, BUFSZ,
+    retval = read_string(rp, (unsigned char *) replybuf, BUFSZ,
                          LF, strlen(LF), 0, 1);
 
     if (retval < 0)
@@ -270,7 +268,7 @@ int dxsr8_transaction(RIG *rig,
     }
 
 
-    retval = read_string(&rs->rigport, (unsigned char *) replybuf, BUFSZ,
+    retval = read_string(rp, (unsigned char *) replybuf, BUFSZ,
                          LF, strlen(LF), 0, 1);
 
     if (retval < 0)
@@ -344,7 +342,6 @@ int dxsr8_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
         return -RIG_EINVAL;
     }
 
-    // cppcheck-suppress *
     SNPRINTF(cmd, sizeof(cmd), AL "~RW_RXF%08"PRIll EOM, (int64_t)freq);
     return dxsr8_transaction(rig, cmd, strlen(cmd), NULL, NULL);
 }
@@ -357,7 +354,7 @@ int dxsr8_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
 {
     int retval, data_len;
 
-    char cmd[] = AL "~RR_RXF" EOM;
+    const char cmd[] = AL "~RR_RXF" EOM;
     char freqbuf[BUFSZ];
 
     retval = dxsr8_transaction(rig, cmd, strlen(cmd), freqbuf, &data_len);
@@ -368,7 +365,7 @@ int dxsr8_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
     }
 
     /* extract RX freq */
-    retval = num_sscanf(freqbuf, "%"SCNfreq, freq);
+    num_sscanf(freqbuf, "%"SCNfreq, freq);
 
     return RIG_OK;
 }
@@ -469,9 +466,15 @@ int dxsr8_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
         return -RIG_EINVAL;
     }
 
-    filter = 0; // avoid compiler warings of being possibly uninitialized
+    filter = 0; // avoid compiler warnings of being possibly uninitialized
     retval = dxsr8_read_num(rig, AL "~RR_NAR" EOM, &filter);
 
+    if (retval != RIG_OK)
+    {
+        rig_debug(RIG_DEBUG_ERR, "%s: dxsr8_read_num:%s\n", __func__, rigerror(retval));
+        return retval;
+    }
+
     if (filter == 0)
     {
         *width = rig_passband_wide(rig, *mode);

rigs/anytone/Android.mk

@@ -0,0 +1,12 @@
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := anytone.c d578.c
+LOCAL_MODULE := anytone
+
+LOCAL_CFLAGS := 
+LOCAL_C_INCLUDES := android include src
+LOCAL_LDLIBS := $(LOCAL_SHARED_LIBRARIES) -Lobj/local/$(TARGET_ARCH_ABI)
+
+include $(BUILD_STATIC_LIBRARY)

rigs/anytone/Makefile.am

@@ -0,0 +1,6 @@
+ANYTONESRC = anytone.c d578.c anytone.h
+
+noinst_LTLIBRARIES = libhamlib-anytone.la
+libhamlib_anytone_la_SOURCES = $(ANYTONESRC)
+
+EXTRA_DIST = Android.mk 

rigs/anytone/anytone.c

@@ -0,0 +1,456 @@
+// ---------------------------------------------------------------------------
+//    AnyTone D578 Hamlib Backend
+// ---------------------------------------------------------------------------
+//
+//  d578.c
+//
+//  Created by Michael Black W9MDB
+//  Copyright © 2023 Michael Black W9MDB.
+//
+//   This library is free software; you can redistribute it and/or
+//   modify it under the terms of the GNU Lesser General Public
+//   License as published by the Free Software Foundation; either
+//   version 2.1 of the License, or (at your option) any later version.
+//
+//   This library is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//   Lesser General Public License for more details.
+//
+//   You should have received a copy of the GNU Lesser General Public
+//   License along with this library; if not, write to the Free Software
+//   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+// ---------------------------------------------------------------------------
+//    SYSTEM INCLUDES
+// ---------------------------------------------------------------------------
+
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <ctype.h>
+#include <errno.h>
+
+// ---------------------------------------------------------------------------
+//    HAMLIB INCLUDES
+// ---------------------------------------------------------------------------
+
+#include <hamlib/rig.h>
+#include "serial.h"
+#include "misc.h"
+#include "register.h"
+#include "riglist.h"
+
+// ---------------------------------------------------------------------------
+//    ANYTONE INCLUDES
+// ---------------------------------------------------------------------------
+
+#include "anytone.h"
+int anytone_transaction(RIG *rig, unsigned char *cmd, int cmd_len,
+                        unsigned char *reply, int reply_len, int expected_len);
+
+DECLARE_INITRIG_BACKEND(anytone)
+{
+    int retval = RIG_OK;
+
+    rig_register(&anytone_d578_caps);
+
+    return retval;
+}
+
+
+
+// ---------------------------------------------------------------------------
+// proberig_anytone
+// ---------------------------------------------------------------------------
+DECLARE_PROBERIG_BACKEND(anytone)
+{
+    int retval = RIG_OK;
+
+    if (!port)
+    {
+        return RIG_MODEL_NONE;
+    }
+
+    if (port->type.rig != RIG_PORT_SERIAL)
+    {
+        return RIG_MODEL_NONE;
+    }
+
+    port->write_delay = port->post_write_delay = 0;
+    port->parm.serial.stop_bits = 1;
+    port->retry = 1;
+
+
+    retval = serial_open(port);
+
+    if (retval != RIG_OK)
+    {
+        retval = -RIG_EIO;
+    }
+
+    return retval;
+}
+
+// AnyTone needs a keep-alive to emulate the MIC
+// Apparently to keep the rig from getting stuck in PTT if mic disconnects
+void *anytone_thread(void *vrig)
+{
+    RIG *rig = (RIG *)vrig;
+    hamlib_port_t *rp = RIGPORT(rig);
+    anytone_priv_data_t *p = STATE(rig)->priv;
+    rig_debug(RIG_DEBUG_TRACE, "%s: anytone_thread started\n", __func__);
+    p->runflag = 1;
+
+    while (p->runflag)
+    {
+        char c[64];
+        SNPRINTF(c, sizeof(c), "+ADATA:00,001\r\na\r\n");
+        MUTEX_LOCK(p->priv.mutex);
+        // if we don't have CACHE debug enabled then we only show WARN and higher for this rig
+        enum rig_debug_level_e debug_level_save;
+        rig_get_debug(&debug_level_save);
+
+        if (rig_need_debug(RIG_DEBUG_CACHE) == 0)
+        {
+            rig_set_debug(RIG_DEBUG_WARN);    // only show WARN debug otherwise too verbose
+        }
+
+        write_block(rp, (unsigned char *)c, strlen(c));
+        char buf[32];
+        read_block(rp, (unsigned char *)buf, 22);
+
+        if (rig_need_debug(RIG_DEBUG_CACHE) == 0)
+        {
+            rig_set_debug(debug_level_save);
+        }
+
+        MUTEX_UNLOCK(p->priv.mutex);
+        hl_usleep(1000 * 1000); // 1-second loop
+    }
+
+    return NULL;
+}
+
+// ---------------------------------------------------------------------------
+// anytone_send
+// ---------------------------------------------------------------------------
+int anytone_send(RIG  *rig,
+                 unsigned char *cmd, int cmd_len)
+{
+    int               retval       = RIG_OK;
+    hamlib_port_t *rp = RIGPORT(rig);
+
+    ENTERFUNC;
+
+    rig_flush(rp);
+
+    retval = write_block(rp, (unsigned char *) cmd,
+                         cmd_len);
+
+    RETURNFUNC(retval);
+}
+
+// ---------------------------------------------------------------------------
+// anytone_receive
+// ---------------------------------------------------------------------------
+int anytone_receive(RIG  *rig, unsigned char *buf, int buf_len, int expected)
+{
+    int               retval       = RIG_OK;
+    hamlib_port_t *rp = RIGPORT(rig);
+
+    ENTERFUNC;
+
+//    retval = read_string(rp, (unsigned char *) buf, buf_len,
+//                         NULL, 0, 0, expected);
+    retval = read_block(rp, buf, expected);
+
+    if (retval > 0)
+    {
+        retval = RIG_OK;
+        rig_debug(RIG_DEBUG_VERBOSE, "%s: read %d byte=0x%02x\n", __func__, retval,
+                  buf[0]);
+    }
+
+    RETURNFUNC(retval);
+}
+
+// ---------------------------------------------------------------------------
+// anytone_transaction
+// ---------------------------------------------------------------------------
+int anytone_transaction(RIG *rig, unsigned char *cmd, int cmd_len,
+                        unsigned char *reply, int reply_len, int expected_len)
+{
+    int retval   = RIG_OK;
+    //anytone_priv_data_t *p = STATE(rig)->priv;
+
+    ENTERFUNC;
+
+    retval = anytone_send(rig, cmd, cmd_len);
+
+    if (retval == RIG_OK && expected_len != 0)
+    {
+        int len = anytone_receive(rig, reply, reply_len,  expected_len);
+        rig_debug(RIG_DEBUG_VERBOSE, "%s(%d): rx len=%d\n", __func__, __LINE__, len);
+    }
+
+    RETURNFUNC(retval);
+}
+
+// ---------------------------------------------------------------------------
+// Function anytone_init
+// ---------------------------------------------------------------------------
+int anytone_init(RIG *rig)
+{
+    int retval = RIG_OK;
+
+    ENTERFUNC;
+
+    if (rig != NULL)
+    {
+        anytone_priv_data_ptr p = NULL;
+
+        // Get new Priv Data
+
+        p = calloc(1, sizeof(anytone_priv_data_t));
+
+        if (p == NULL)
+        {
+            retval = -RIG_ENOMEM;
+            RETURNFUNC(retval);
+        }
+        else
+        {
+            STATE(rig)->priv = p;
+            p->vfo_curr = RIG_VFO_NONE;
+#ifdef HAVE_PTHREAD
+            pthread_mutex_init(&p->mutex, NULL);
+#endif
+        }
+    }
+
+    RETURNFUNC(retval);
+}
+
+// ---------------------------------------------------------------------------
+// Function anytone_cleanup
+// ---------------------------------------------------------------------------
+int anytone_cleanup(RIG *rig)
+{
+    int retval = RIG_OK;
+
+    if (rig == NULL)
+    {
+        return -RIG_EARG;
+    }
+
+    ENTERFUNC;
+
+    free(STATE(rig)->priv);
+    STATE(rig)->priv = NULL;
+
+    RETURNFUNC(retval);
+}
+
+// ---------------------------------------------------------------------------
+// Function anytone_open
+// ---------------------------------------------------------------------------
+int anytone_open(RIG *rig)
+{
+    int retval = RIG_OK;
+    hamlib_port_t *rp = RIGPORT(rig);
+
+    ENTERFUNC;
+
+    unsigned char cmd[] = { 0x2B, 0x41, 0x44, 0x41, 0x54, 0x41, 0x3A, 0x30, 0x30, 0x2C, 0x30, 0x30, 0x31, 0x0d, 0x0a, 'a', 0x0d, 0x0a };
+    write_block(rp, cmd, sizeof(cmd));
+    hl_usleep(500 * 1000);
+    char cmd2[64];
+    SNPRINTF(cmd2, sizeof(cmd2), "+ADATA:00,016\r\n%cD578UV COM MODE\r\n", 0x01);
+    write_block(rp, (unsigned char *)cmd2, strlen(cmd2));
+    SNPRINTF(cmd2, sizeof(cmd2), "+ADATA:00,000\r\n");
+    unsigned char reply[512];
+    anytone_transaction(rig, (unsigned char *)cmd2, strlen(cmd2), reply,
+                        sizeof(reply), strlen(cmd2));
+
+    pthread_t id;
+    // will start the keep alive
+    int err = pthread_create(&id, NULL, anytone_thread, (void *)rig);
+
+    if (err)
+    {
+        rig_debug(RIG_DEBUG_ERR, "%s: pthread_create error: %s\n", __func__,
+                  strerror(errno));
+        RETURNFUNC(-RIG_EINTERNAL);
+    }
+
+    RETURNFUNC(retval);
+}
+
+// ---------------------------------------------------------------------------
+// Function anytone_close
+// ---------------------------------------------------------------------------
+int anytone_close(RIG *rig)
+{
+    int retval = RIG_OK;
+
+    ENTERFUNC;
+    char *cmd  = "+ADATA:00,000\r\n";
+    anytone_transaction(rig, (unsigned char *)cmd, strlen(cmd), NULL, 0, 0);
+
+    RETURNFUNC(retval);
+}
+
+// ---------------------------------------------------------------------------
+// Function anytone_get_vfo
+// ---------------------------------------------------------------------------
+int anytone_get_vfo(RIG *rig, vfo_t *vfo)
+{
+    int retval = RIG_OK;
+    //char cmd[] = { 0x41, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x06 };
+    //char cmd[] = { "+ADATA06:00,001",0x41, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x06 };
+
+    ENTERFUNC;
+
+    const anytone_priv_data_ptr p = (anytone_priv_data_ptr) STATE(rig)->priv;
+    unsigned char reply[512];
+    unsigned char cmd[] = { 0x2b, 0x41, 0x44, 0x41, 0x54, 0x41, 0x3a, 0x30, 0x30, 0x2c, 0x30, 0x30, 0x36, 0x0d, 0x0a, 0x04, 0x05, 0x00, 0x00, 0x00, 0x00, 0x0d, 0x0a };
+    anytone_transaction(rig, cmd, sizeof(cmd), reply, sizeof(reply), 114);
+
+    if (reply[113] == 0x9b) { *vfo = RIG_VFO_A; }
+    else if (reply[113] == 0x9c) { *vfo = RIG_VFO_B; }
+    else
+    {
+        *vfo = RIG_VFO_A; // default to VFOA
+        rig_debug(RIG_DEBUG_ERR, "%s: unknown vfo=0x%02x\n", __func__, reply[113]);
+    }
+
+    p->vfo_curr = *vfo;
+
+    RETURNFUNC(retval);
+}
+
+// ---------------------------------------------------------------------------
+// Function anytone_set_vfo
+// ---------------------------------------------------------------------------
+int anytone_set_vfo(RIG *rig, vfo_t vfo)
+{
+    ENTERFUNC;
+    RETURNFUNC(RIG_OK);
+}
+
+// ---------------------------------------------------------------------------
+// Function anytone_get_ptt
+// ---------------------------------------------------------------------------
+int anytone_get_ptt(RIG *rig, vfo_t vfo, ptt_t *ptt)
+{
+    int retval = RIG_OK;
+
+    ENTERFUNC;
+
+    anytone_priv_data_t *p = STATE(rig)->priv;
+    *ptt = p->ptt;
+
+    RETURNFUNC(retval);
+}
+// ---------------------------------------------------------------------------
+// anytone_set_ptt
+// ---------------------------------------------------------------------------
+int anytone_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt)
+{
+    int retval = RIG_OK;
+
+    ENTERFUNC;
+
+    //char buf[8] = { 0x41, 0x00, 0x00, 0x00, 0x27, 0x00, 0x00, 0x06 };
+    unsigned char ptton[] =  { 0x2B, 0x41, 0x44, 0x41, 0x54, 0x41, 0x3A, 0x30, 0x30, 0x2C, 0x30, 0x30, 0x31, 0x0d, 0x0a, 0x61, 0x0d, 0x0a };
+    unsigned char pttoff[] = { 0x2B, 0x41, 0x44, 0x41, 0x54, 0x41, 0x3A, 0x30, 0x30, 0x2C, 0x30, 0x32, 0x33, 0x0d, 0x0a, 0x56, 0x0d, 0x0a };
+    void *pttcmd = ptton;
+
+    if (!ptt) { pttcmd = pttoff; }
+
+    //if (!ptt) { cmd = " (unsigned char*)+ADATA:00,023\r\nV\r\n"; }
+
+    MUTEX_LOCK(p->mutex);
+    anytone_transaction(rig, pttcmd, sizeof(ptton), NULL, 0, 0);
+    anytone_priv_data_t *p = STATE(rig)->priv;
+    p->ptt = ptt;
+    MUTEX_UNLOCK(p->mutex);
+
+    RETURNFUNC(retval);
+}
+
+int anytone_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
+{
+    char cmd[32];
+    int retval;
+    hamlib_port_t *rp = RIGPORT(rig);
+
+    SNPRINTF(cmd, sizeof(cmd), "+ADATA:00,006\r\n");
+    cmd[15] = 0x04;
+    cmd[16] = 0x2c;
+    cmd[17] = 0x07;
+    cmd[18] = 0x00;
+    cmd[19] = 0x00;
+    cmd[21] = 0x00;
+    cmd[22] = 0x00;
+    cmd[23] = 0x0d;
+    cmd[24] = 0x0a;
+
+    if (vfo == RIG_VFO_B) { cmd[16] = 0x2d; }
+
+    int retry = 2;
+    MUTEX_LOCK(p->priv.mutex);
+    rig_flush(rp);
+
+    do
+    {
+        write_block(rp, (unsigned char *)cmd, 25);
+        unsigned char buf[512];
+        retval = read_block(rp, buf, 138);
+
+        if (retval == 138)
+        {
+            *freq = from_bcd_be(&buf[17], 8) * 10;
+            rig_debug(RIG_DEBUG_VERBOSE, "%s: VFOA freq=%g\n", __func__, *freq);
+            retval = RIG_OK;
+        }
+    }
+    while (retval != 138 && --retry > 0);
+
+    MUTEX_UNLOCK(p->priv.mutex);
+
+    return RIG_OK;
+}
+
+int anytone_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
+{
+    char cmd[64];
+    hamlib_port_t *rp = RIGPORT(rig);
+
+    if (vfo == RIG_VFO_A)
+    {
+        snprintf(cmd, sizeof(cmd), "ADATA:00,005\r\n%c%c%c%c\r\n", 2, 0, 0, 0);
+    }
+    else
+    {
+        snprintf(cmd, sizeof(cmd), "ADATA:00,005\r\n%c%c%c%c\r\n", 1, 0, 0, 0);
+    }
+
+    MUTEX_LOCK(p->priv.mutex);
+    rig_flush(rp);
+    write_block(rp, (unsigned char *) cmd, 20);
+    unsigned char backend[] = { 0x2f, 0x03, 0x00, 0xff, 0xff, 0xff, 0xff, 0x15, 0x50, 0x00, 0x00, 0x0d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xcf, 0x09, 0x00, 0x00, 0x0d, 0x0a};
+    snprintf(cmd, sizeof(cmd), "ADATA:00,023\r\n");
+    int bytes = strlen(cmd) + sizeof(backend);
+    memcpy(&cmd[15], backend, sizeof(backend));
+    hl_usleep(10 * 1000);
+    write_block(rp, (unsigned char *)cmd, bytes);
+    MUTEX_UNLOCK(p->priv.mutex);
+
+    return -RIG_ENIMPL;
+}
+
+// ---------------------------------------------------------------------------
+// END OF FILE
+// ---------------------------------------------------------------------------

rigs/anytone/anytone.h

@@ -0,0 +1,48 @@
+#ifndef _ANYTONE_H
+#define _ANYTONE_H 1
+
+#include "hamlib/rig.h"
+
+#define BACKEND_VER "20231001"
+
+#define ANYTONE_RESPSZ 64
+
+extern struct rig_caps anytone_d578_caps;
+
+#ifdef PTHREAD
+#include <pthread.h>
+#define MUTEX(var) static pthread_mutex_t var = PTHREAD_MUTEX_INITIALIZER
+#define MUTEX_LOCK(var) pthread_mutex_lock(var)
+#define MUTEX_UNLOCK(var)  pthread_mutex_unlock(var)
+#else
+#define MUTEX(var)
+#define MUTEX_LOCK(var)
+#define MUTEX_UNLOCK(var)
+#endif
+
+typedef struct _anytone_priv_data
+{
+    ptt_t         ptt;
+    vfo_t         vfo_curr;
+    int           runflag; // thread control
+    char          buf[64];
+    pthread_mutex_t mutex;
+} anytone_priv_data_t,
+* anytone_priv_data_ptr;
+
+
+extern int anytone_init(RIG *rig);
+extern int anytone_cleanup(RIG *rig);
+extern int anytone_open(RIG *rig);
+extern int anytone_close(RIG *rig);
+
+extern int anytone_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt);
+extern int anytone_get_ptt(RIG *rig, vfo_t vfo,ptt_t *ptt);
+
+extern int anytone_set_vfo(RIG *rig, vfo_t vfo);
+extern int anytone_get_vfo(RIG *rig, vfo_t *vfo);
+
+extern int anytone_set_freq(RIG *rig, vfo_t vfo, freq_t freq);
+extern int anytone_get_freq(RIG *rig, vfo_t vfo, freq_t *freq);
+
+#endif /* _ANYTONE_H */

rigs/anytone/d578.c

@@ -0,0 +1,95 @@
+// ---------------------------------------------------------------------------
+//   Anytone D578UVIII
+// ---------------------------------------------------------------------------
+//
+//  d578.c
+//
+//  Created by Michael Black W9MDB
+//  Copyright © 2023, Michael Black W9MDB.
+//
+//   This library is free software; you can redistribute it and/or
+//   modify it under the terms of the GNU Lesser General Public
+//   License as published by the Free Software Foundation; either
+//   version 2.1 of the License, or (at your option) any later version.
+//
+//   This library is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//   Lesser General Public License for more details.
+//
+//   You should have received a copy of the GNU Lesser General Public
+//   License along with this library; if not, write to the Free Software
+//   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+#include "anytone.h"
+
+#define D578_VFO (RIG_VFO_A|RIG_VFO_B)
+#define D578_MODES (RIG_MODE_USB|RIG_MODE_AM)
+
+struct rig_caps anytone_d578_caps =
+{
+    RIG_MODEL(RIG_MODEL_ATD578UVIII),
+    .model_name         =  "D578A",
+    .mfg_name           =  "AnyTone",
+    .version            =  BACKEND_VER ".0",
+    .copyright          =  "Michael Black W9MDB: GNU LGPL",
+    .status             =  RIG_STATUS_BETA,
+    .rig_type           =  RIG_TYPE_TRANSCEIVER,
+    .ptt_type           =  RIG_PTT_RIG,
+    .dcd_type           =  RIG_DCD_NONE,
+    .port_type          =  RIG_PORT_SERIAL,
+    .serial_rate_min    =  115200,
+    .serial_rate_max    =  115200,
+    .serial_data_bits   =  8,
+    .serial_stop_bits   =  1,
+    .serial_parity      =  RIG_PARITY_NONE,
+    .serial_handshake   =  RIG_HANDSHAKE_NONE,
+    .write_delay        =  0,
+    .post_write_delay   =  0,
+    .timeout            =  1000,
+    .retry              =  3,
+
+    .level_gran         =  {},
+    .parm_gran          =  {},
+    .ctcss_list         =  NULL,
+    .dcs_list           =  NULL,
+    .targetable_vfo     =  RIG_TARGETABLE_NONE,
+    .transceive         =  0,
+
+    .rx_range_list1 =
+    {
+        { MHz(108), MHz(174), D578_MODES, -1, -1, D578_VFO },
+        { MHz(144), MHz(148), D578_MODES, -1, -1, D578_VFO },
+        { MHz(222), MHz(225), D578_MODES, -1, -1, D578_VFO },
+        { MHz(420), MHz(450), D578_MODES, -1, -1, D578_VFO },
+        RIG_FRNG_END,
+    },
+
+    .tx_range_list1 =
+    {
+        { MHz(144), MHz(148), D578_MODES, W(1), W(55), D578_VFO },
+        { MHz(222), MHz(225), D578_MODES, W(1), W(40), D578_VFO },
+        { MHz(420), MHz(450), D578_MODES, W(1), W(25), D578_VFO },
+        RIG_FRNG_END,
+    },
+
+    .rig_init           =  anytone_init,
+    .rig_cleanup        =  anytone_cleanup,
+    .rig_open           =  anytone_open,
+    .rig_close          =  anytone_close,
+
+    .get_vfo            =  anytone_get_vfo,
+    .set_vfo            =  anytone_set_vfo,
+
+    .get_ptt            =  anytone_get_ptt,
+    .set_ptt            =  anytone_set_ptt,
+
+    .set_freq           =  anytone_set_freq,
+    .get_freq           =  anytone_get_freq,
+
+    .hamlib_check_rig_caps = HAMLIB_CHECK_RIG_CAPS
+};
+
+// ---------------------------------------------------------------------------
+//    END OF FILE
+// ---------------------------------------------------------------------------

rigs/aor/README.ar5000

@@ -16,7 +16,7 @@ The previous AR5000 could:
 Now, it:
 - can get and set frequency.
 - can read and set (all) modes.
-- still does not support VFO D & E. I probably have not understood how VFO_N(3) and VFO_N(4) are ment to be used :-(
+- still does not support VFO D & E. I probably have not understood how VFO_N(3) and VFO_N(4) are meant to be used :-(
 - can read AGC-level.
 
 

rigs/aor/aor.c

@@ -19,10 +19,9 @@
  *
  */
 
-#include <hamlib/config.h>
-
+#include <stdint.h>
 #include <stdio.h>
-#include <ctype.h>
+#include <string.h>
 
 #include "hamlib/rig.h"
 #include "serial.h"
@@ -59,7 +58,7 @@
 
 /*
  * aor_transaction
- * We assume that rig!=NULL, rig->state!= NULL, data!=NULL, data_len!=NULL
+ * We assume that rig!=NULL, STATE(rig)!= NULL, data!=NULL, data_len!=NULL
  * Otherwise, you'll get a nice seg fault. You've been warned!
  * return value: RIG_OK if everything's fine, negative value otherwise
  * TODO: error case handling
@@ -68,15 +67,13 @@ static int aor_transaction(RIG *rig, const char *cmd, int cmd_len, char *data,
                            int *data_len)
 {
     int retval;
-    struct rig_state *rs;
+    hamlib_port_t *rp = RIGPORT(rig);
     char ackbuf[BUFSZ];
     int ack_len;
 
-    rs = &rig->state;
+    rig_flush(rp);
 
-    rig_flush(&rs->rigport);
-
-    retval = write_block(&rs->rigport, (unsigned char *) cmd, cmd_len);
+    retval = write_block(rp, (unsigned char *) cmd, cmd_len);
 
     if (retval != RIG_OK)
     {
@@ -96,7 +93,7 @@ static int aor_transaction(RIG *rig, const char *cmd, int cmd_len, char *data,
     /*
      * Do wait for a reply
      */
-    retval = read_string(&rs->rigport, (unsigned char *) data, BUFSZ, EOM,
+    retval = read_string(rp, (unsigned char *) data, BUFSZ, EOM,
                          strlen(EOM), 0, 1);
 
     if (retval < 0)
@@ -125,7 +122,7 @@ static int aor_transaction(RIG *rig, const char *cmd, int cmd_len, char *data,
     if (retval >= 1 && data[0] == '?')
     {
         /* command failed? resync with radio */
-        write_block(&rs->rigport, (unsigned char *) EOM, 1);
+        write_block(rp, (unsigned char *) EOM, 1);
 
         return -RIG_EPROTO;
     }
@@ -145,7 +142,7 @@ int aor_close(RIG *rig)
      * since no reply is to be expected.
      */
 
-    return write_block(&rig->state.rigport, (unsigned char *) "EX" EOM, 3);
+    return write_block(RIGPORT(rig), (unsigned char *) "EX" EOM, 3);
 }
 
 static int format_freq(char *buf, int buf_len, freq_t freq)
@@ -175,7 +172,6 @@ static int format_freq(char *buf, int buf_len, freq_t freq)
 
     f = f * 100 + lowhz;
 
-    // cppcheck-suppress *
     SNPRINTF(buf, buf_len, "RF%010"PRIll, f);
     return strlen(buf);
 }
@@ -272,8 +268,8 @@ int aor_set_vfo(RIG *rig, vfo_t vfo)
     case RIG_VFO_MEM: vfocmd = "MR" EOM; break;
 
     default:
-        rig_debug(RIG_DEBUG_ERR, "aor_set_vfo: unsupported vfo %d\n",
-                  vfo);
+        rig_debug(RIG_DEBUG_ERR, "aor_set_vfo: unsupported vfo %s\n",
+                  rig_strvfo(vfo));
         return -RIG_EINVAL;
     }
 
@@ -541,7 +537,8 @@ int parse8k_aor_mode(RIG *rig, char aormode, char aorwidth, rmode_t *mode,
 int aor_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
 {
     struct aor_priv_caps *priv = (struct aor_priv_caps *)rig->caps->priv;
-    char ackbuf[BUFSZ], ackbuf2[BUFSZ];
+    char ackbuf[BUFSZ];
+    char ackbuf2[BUFSZ];
     char *mdp, *mdp2;
     int ack_len, ack2_len, retval;
 
@@ -608,7 +605,7 @@ int aor_set_ts(RIG *rig, vfo_t vfo, shortfreq_t ts)
 
 /*
  * aor_set_level
- * Assumes rig!=NULL, rig->state.priv!=NULL
+ * Assumes rig!=NULL, STATE(rig)->priv!=NULL
  */
 int aor_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
 {
@@ -616,7 +613,7 @@ int aor_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
     char lvlbuf[BUFSZ];
     int agc;
 
-    rs = &rig->state;
+    rs = STATE(rig);
 
 
     switch (level)
@@ -673,16 +670,14 @@ int aor_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
 
 /*
  * aor_get_level
- * Assumes rig!=NULL, rig->state.priv!=NULL, val!=NULL
+ * Assumes rig!=NULL, STATE(rig)->priv!=NULL, val!=NULL
  */
 int aor_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
 {
-    struct rig_state *rs;
+    struct rig_state *rs = STATE(rig);
     char lvlbuf[BUFSZ], ackbuf[BUFSZ];
     int ack_len, retval;
 
-    rs = &rig->state;
-
     switch (level)
     {
     case RIG_LEVEL_RAWSTR:
@@ -719,7 +714,7 @@ int aor_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
 
         if (rig->caps->rig_model == RIG_MODEL_AR8000)
         {
-            sscanf(ackbuf + 2, "%x", &val->i);
+            sscanf(ackbuf + 2, "%x", &val->u);
             val->i &= ~0x80; /* mask squelch status */
         }
         else if (rig->caps->rig_model == RIG_MODEL_AR8200 ||
@@ -729,7 +724,7 @@ int aor_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
         }
         else
         {
-            sscanf(ackbuf + 3, "%x", &val->i);
+            sscanf(ackbuf + 3, "%x", &val->u);
         }
 
         break;
@@ -760,7 +755,7 @@ int aor_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
 
         if (att > HAMLIB_MAXDBLSTSIZ || rs->attenuator[att - 1] == 0)
         {
-            rig_debug(RIG_DEBUG_ERR, "Unsupported att %s %d\n",
+            rig_debug(RIG_DEBUG_ERR, "Unsupported att %s %u\n",
                       __func__, att);
             return -RIG_EPROTO;
         }
@@ -823,7 +818,7 @@ int aor_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
 
 /*
  * aor_get_dcd
- * Assumes rig!=NULL, rig->state.priv!=NULL, val!=NULL
+ * Assumes rig!=NULL, STATE(rig)->priv!=NULL, val!=NULL
  */
 int aor_get_dcd(RIG *rig, vfo_t vfo, dcd_t *dcd)
 {
@@ -850,7 +845,7 @@ int aor_get_dcd(RIG *rig, vfo_t vfo, dcd_t *dcd)
 
 /*
  * aor_set_powerstat
- * Assumes rig!=NULL, rig->state.priv!=NULL
+ * Assumes rig!=NULL, STATE(rig)->priv!=NULL
  */
 int aor_set_powerstat(RIG *rig, powerstat_t status)
 {
@@ -894,7 +889,7 @@ int aor_vfo_op(RIG *rig, vfo_t vfo, vfo_op_t op)
 
 /*
  * aor_scan, scan operation
- * Assumes rig!=NULL, rig->state.priv!=NULL
+ * Assumes rig!=NULL, STATE(rig)->priv!=NULL
  */
 int aor_scan(RIG *rig, vfo_t vfo, scan_t scan, int ch)
 {
@@ -938,7 +933,7 @@ int aor_scan(RIG *rig, vfo_t vfo, scan_t scan, int ch)
  */
 int aor_set_mem(RIG *rig, vfo_t vfo, int ch)
 {
-    struct aor_priv_caps *priv = (struct aor_priv_caps *)rig->caps->priv;
+    const struct aor_priv_caps *priv = (struct aor_priv_caps *)rig->caps->priv;
     char membuf[BUFSZ];
     int mem_num;
     char bank_base;
@@ -972,7 +967,7 @@ int aor_set_mem(RIG *rig, vfo_t vfo, int ch)
  */
 int aor_get_mem(RIG *rig, vfo_t vfo, int *ch)
 {
-    struct aor_priv_caps *priv = (struct aor_priv_caps *)rig->caps->priv;
+    const struct aor_priv_caps *priv = (struct aor_priv_caps *)rig->caps->priv;
     int mem_len, retval;
     char membuf[BUFSZ];
 
@@ -1151,7 +1146,7 @@ static int parse_chan_line(RIG *rig, channel_t *chan, char *basep,
         char *tag2p;
         tagp = strstr(basep, "MD");
 
-        if (!tagp && mem_caps->mode && mem_caps->width)
+        if (!tagp)
         {
             rig_debug(RIG_DEBUG_WARN, "%s: no MD in returned string: '%s'\n",
                       __func__, basep);
@@ -1239,7 +1234,7 @@ static int parse_chan_line(RIG *rig, channel_t *chan, char *basep,
 
 int aor_get_channel(RIG *rig, vfo_t vfo, channel_t *chan, int read_only)
 {
-    struct aor_priv_caps *priv = (struct aor_priv_caps *)rig->caps->priv;
+    const struct aor_priv_caps *priv = (struct aor_priv_caps *)rig->caps->priv;
     char aorcmd[BUFSZ];
     int chan_len;
     char chanbuf[BUFSZ];
@@ -1345,9 +1340,9 @@ int aor_get_channel(RIG *rig, vfo_t vfo, channel_t *chan, int read_only)
 
 int aor_get_chan_all_cb(RIG *rig, vfo_t vfo, chan_cb_t chan_cb, rig_ptr_t arg)
 {
-    struct aor_priv_caps *priv = (struct aor_priv_caps *)rig->caps->priv;
+    const struct aor_priv_caps *priv = (struct aor_priv_caps *)rig->caps->priv;
     int i, j, retval;
-    chan_t *chan_list = rig->state.chan_list;
+    chan_t *chan_list = STATE(rig)->chan_list;
     channel_t *chan;
     int chan_count;
     char aorcmd[BUFSZ];
@@ -1424,7 +1419,7 @@ int aor_get_chan_all_cb(RIG *rig, vfo_t vfo, chan_cb_t chan_cb, rig_ptr_t arg)
             /*
              * get next line
              */
-            retval = read_string(&rig->state.rigport, (unsigned char *) chanbuf, BUFSZ,
+            retval = read_string(RIGPORT(rig), (unsigned char *) chanbuf, BUFSZ,
                                  EOM, strlen(EOM), 0, 1);
 
             if (retval < 0)
@@ -1457,7 +1452,7 @@ const char *aor_get_info(RIG *rig)
         return NULL;
     }
 
-    if (retval > 2) { idbuf[2] = '\0'; }
+    // never executed -- if (retval > 2) { idbuf[2] = '\0'; }
 
     retval = aor_transaction(rig, "VR" EOM, 3, frmbuf, &frm_len);
 

rigs/aor/aor.h

@@ -64,16 +64,16 @@ int aor_get_channel(RIG *rig, vfo_t vfo, channel_t *chan, int read_only);
 int aor_set_channel(RIG *rig, vfo_t vfo, const channel_t *chan);
 int aor_get_chan_all_cb (RIG * rig, vfo_t vfo, chan_cb_t chan_cb, rig_ptr_t);
 
-extern const struct rig_caps ar2700_caps;
-extern const struct rig_caps ar8200_caps;
-extern const struct rig_caps ar8000_caps;
-extern const struct rig_caps ar8600_caps;
-extern const struct rig_caps ar5000_caps;
-extern const struct rig_caps ar3000a_caps;
-extern const struct rig_caps ar7030_caps;
-extern const struct rig_caps ar3030_caps;
-extern const struct rig_caps ar5000a_caps;
-extern const struct rig_caps ar7030p_caps;
-extern const struct rig_caps sr2200_caps;
+extern struct rig_caps ar2700_caps;
+extern struct rig_caps ar8200_caps;
+extern struct rig_caps ar8000_caps;
+extern struct rig_caps ar8600_caps;
+extern struct rig_caps ar5000_caps;
+extern struct rig_caps ar3000a_caps;
+extern struct rig_caps ar7030_caps;
+extern struct rig_caps ar3030_caps;
+extern struct rig_caps ar5000a_caps;
+extern struct rig_caps ar7030p_caps;
+extern struct rig_caps sr2200_caps;
 
 #endif /* _AOR_H */

rigs/aor/ar2700.c

@@ -19,9 +19,8 @@
  *
  */
 
-#include <hamlib/config.h>
-
 #include <stdlib.h>
+#include <string.h>
 
 #include <hamlib/rig.h>
 #include "aor.h"
@@ -81,14 +80,14 @@ static const struct aor_priv_caps ar2700_priv_caps =
  * part of info from http://www.aoruk.com/2700.htm
  * Interface unit: CU-8232 (or equivalent)
  */
-const struct rig_caps ar2700_caps =
+struct rig_caps ar2700_caps =
 {
     RIG_MODEL(RIG_MODEL_AR2700),
     .model_name = "AR2700",
     .mfg_name =  "AOR",
     .version =  BACKEND_VER ".0",
     .copyright =  "LGPL",
-    .status =  RIG_STATUS_ALPHA,
+    .status =  RIG_STATUS_BETA,
     .rig_type =  RIG_TYPE_SCANNER,
     .ptt_type =  RIG_PTT_NONE,
     .dcd_type =  RIG_DCD_RIG,

rigs/aor/ar3000.c

@@ -19,16 +19,11 @@
  *
  */
 
-#include <hamlib/config.h>
-
 #include <stdio.h>
 #include <string.h>
 
 #include <hamlib/rig.h>
 #include <serial.h>
-#include <misc.h>
-
-#include "aor.h"
 
 static int ar3k_set_freq(RIG *rig, vfo_t vfo, freq_t freq);
 static int ar3k_get_freq(RIG *rig, vfo_t vfo, freq_t *freq);
@@ -67,7 +62,7 @@ static int ar3k_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val);
  * TODO:
  * set_channel, get_channel, set_func MUTE,SQL, get_dcd, ...
  */
-const struct rig_caps ar3000a_caps =
+struct rig_caps ar3000a_caps =
 {
     RIG_MODEL(RIG_MODEL_AR3000A),
     .model_name = "AR3000A",
@@ -190,13 +185,11 @@ static int ar3k_transaction(RIG *rig, const char *cmd, int cmd_len, char *data,
                             int *data_len)
 {
     int retval;
-    struct rig_state *rs;
+    hamlib_port_t *rp = RIGPORT(rig);
 
-    rs = &rig->state;
+    rig_flush(rp);
 
-    rig_flush(&rs->rigport);
-
-    retval = write_block(&rs->rigport, (unsigned char *) cmd, cmd_len);
+    retval = write_block(rp, (unsigned char *) cmd, cmd_len);
 
     if (retval != RIG_OK)
     {
@@ -209,7 +202,7 @@ static int ar3k_transaction(RIG *rig, const char *cmd, int cmd_len, char *data,
         return RIG_OK;
     }
 
-    retval = read_string(&rs->rigport, (unsigned char *) data, BUFSZ,
+    retval = read_string(rp, (unsigned char *) data, BUFSZ,
                          EOM, strlen(EOM), 0, 1);
 
     if (retval == -RIG_ETIMEOUT)

rigs/aor/ar3030.c

@@ -18,7 +18,6 @@
  *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
  */
-#include <hamlib/config.h>
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -28,7 +27,6 @@
 #include "serial.h"
 #include "idx_builtin.h"
 #include "misc.h"
-#include "aor.h"
 
 
 static int ar3030_set_vfo(RIG *rig, vfo_t vfo);
@@ -95,7 +93,7 @@ struct ar3030_priv_data
  *
  * ar3030 rig capabilities.
  */
-const struct rig_caps ar3030_caps =
+struct rig_caps ar3030_caps =
 {
     RIG_MODEL(RIG_MODEL_AR3030),
     .model_name = "AR3030",
@@ -218,22 +216,20 @@ static int ar3030_transaction(RIG *rig, const char *cmd, int cmd_len,
                               char *data, int *data_len)
 {
     int retval;
-    struct rig_state *rs;
+    hamlib_port_t *rp = RIGPORT(rig);
     int retry = 3;
     char tmpdata[BUFSZ];
 
-    rs = &rig->state;
-
     if (data == NULL)
     {
         data = tmpdata;
     }
 
-    rig_flush(&rs->rigport);
+    rig_flush(rp);
 
     do
     {
-        retval = write_block(&rs->rigport, (unsigned char *) cmd, cmd_len);
+        retval = write_block(rp, (unsigned char *) cmd, cmd_len);
 
         if (retval != RIG_OK)
         {
@@ -244,7 +240,7 @@ static int ar3030_transaction(RIG *rig, const char *cmd, int cmd_len,
         if (data)
         {
             /* expecting 0x0d0x0a on all commands so wait for the 0x0a */
-            retval = read_string(&rs->rigport, (unsigned char *) data, BUFSZ,
+            retval = read_string(rp, (unsigned char *) data, BUFSZ,
                                  "\x0a", 1, 0, 1);
 
             if (retval == -RIG_ETIMEOUT)
@@ -281,15 +277,16 @@ static int ar3030_transaction(RIG *rig, const char *cmd, int cmd_len,
 int ar3030_init(RIG *rig)
 {
     struct ar3030_priv_data *priv;
+    struct rig_state *rs = STATE(rig);
 
-    rig->state.priv = calloc(1, sizeof(struct ar3030_priv_data));
+    rs->priv = calloc(1, sizeof(struct ar3030_priv_data));
 
-    if (!rig->state.priv)
+    if (!rs->priv)
     {
         return -RIG_ENOMEM;
     }
 
-    priv = rig->state.priv;
+    priv = rs->priv;
 
     priv->curr_ch = 99; /* huh! FIXME: get_mem in open() ? */
     priv->curr_vfo = RIG_VFO_A;
@@ -299,7 +296,7 @@ int ar3030_init(RIG *rig)
 
 int ar3030_cleanup(RIG *rig)
 {
-    struct ar3030_priv_data *priv = rig->state.priv;
+    struct ar3030_priv_data *priv = STATE(rig)->priv;
 
     free(priv);
 
@@ -309,12 +306,10 @@ int ar3030_cleanup(RIG *rig)
 int ar3030_close(RIG *rig)
 {
     int retval;
-    struct rig_state *rs;
 
     rig_debug(RIG_DEBUG_TRACE, "%s:\n", __func__);
 
-    rs = &rig->state;
-    rig_flush(&rs->rigport);
+    rig_flush(RIGPORT(rig));
 
     retval = ar3030_transaction(rig, "Q" CR, strlen("Q" CR), NULL, NULL);
     rig_debug(RIG_DEBUG_TRACE, "%s: retval=%d\n", __func__, retval);
@@ -324,7 +319,7 @@ int ar3030_close(RIG *rig)
 
 int ar3030_set_vfo(RIG *rig, vfo_t vfo)
 {
-    struct ar3030_priv_data *priv = (struct ar3030_priv_data *)rig->state.priv;
+    struct ar3030_priv_data *priv = (struct ar3030_priv_data *)STATE(rig)->priv;
     char *cmd = "";
     int retval;
 
@@ -358,7 +353,8 @@ int ar3030_set_vfo(RIG *rig, vfo_t vfo)
 
 int ar3030_get_vfo(RIG *rig, vfo_t *vfo)
 {
-    struct ar3030_priv_data *priv = (struct ar3030_priv_data *)rig->state.priv;
+    const struct ar3030_priv_data *priv = (struct ar3030_priv_data *)
+                                          STATE(rig)->priv;
 
     *vfo = priv->curr_vfo;
 
@@ -372,7 +368,7 @@ int ar3030_get_vfo(RIG *rig, vfo_t *vfo)
  */
 int ar3030_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
 {
-    struct ar3030_priv_data *priv = (struct ar3030_priv_data *)rig->state.priv;
+    struct ar3030_priv_data *priv = (struct ar3030_priv_data *)STATE(rig)->priv;
     char freqbuf[BUFSZ];
     int retval;
 
@@ -396,7 +392,7 @@ int ar3030_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
  */
 int ar3030_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
 {
-    struct ar3030_priv_data *priv = (struct ar3030_priv_data *)rig->state.priv;
+    struct ar3030_priv_data *priv = (struct ar3030_priv_data *)STATE(rig)->priv;
     char *rfp;
     int freq_len, retval;
     char freqbuf[BUFSZ];
@@ -496,7 +492,7 @@ int ar3030_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
  */
 int ar3030_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
 {
-    struct ar3030_priv_data *priv = (struct ar3030_priv_data *)rig->state.priv;
+    struct ar3030_priv_data *priv = (struct ar3030_priv_data *)STATE(rig)->priv;
     int buf_len, retval;
     char buf[BUFSZ];
 
@@ -558,7 +554,7 @@ int ar3030_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
 
 int ar3030_set_mem(RIG *rig, vfo_t vfo, int ch)
 {
-    struct ar3030_priv_data *priv = (struct ar3030_priv_data *)rig->state.priv;
+    struct ar3030_priv_data *priv = (struct ar3030_priv_data *)STATE(rig)->priv;
     int retval = RIG_OK;
 
     if (priv->curr_vfo == RIG_VFO_MEM)
@@ -578,7 +574,7 @@ int ar3030_set_mem(RIG *rig, vfo_t vfo, int ch)
 
 int ar3030_get_mem(RIG *rig, vfo_t vfo, int *ch)
 {
-    struct ar3030_priv_data *priv = (struct ar3030_priv_data *)rig->state.priv;
+    struct ar3030_priv_data *priv = (struct ar3030_priv_data *)STATE(rig)->priv;
     char infobuf[BUFSZ];
     int info_len, retval;
 
@@ -651,7 +647,7 @@ int ar3030_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
 
 int ar3030_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
 {
-    struct ar3030_priv_data *priv = (struct ar3030_priv_data *)rig->state.priv;
+    struct ar3030_priv_data *priv = (struct ar3030_priv_data *)STATE(rig)->priv;
     int info_len, retval;
     char infobuf[BUFSZ], *p;
 
@@ -722,7 +718,7 @@ int ar3030_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
 
 int ar3030_get_channel(RIG *rig, vfo_t vfo, channel_t *chan, int read_only)
 {
-    struct ar3030_priv_data *priv = (struct ar3030_priv_data *)rig->state.priv;
+    struct ar3030_priv_data *priv = (struct ar3030_priv_data *)STATE(rig)->priv;
     char cmdbuf[BUFSZ], infobuf[BUFSZ];
     int info_len, retval;
 
@@ -798,7 +794,6 @@ int ar3030_get_channel(RIG *rig, vfo_t vfo, channel_t *chan, int read_only)
                   rig_passband_normal(rig, chan->mode);
 
 
-    // cppcheck-suppress *
     chan->levels[LVL_ATT].i = infobuf[6] == '0' ? 0 :
                               rig->caps->attenuator[infobuf[4] - '1'];
 
@@ -820,7 +815,7 @@ int ar3030_get_channel(RIG *rig, vfo_t vfo, channel_t *chan, int read_only)
 
 int ar3030_vfo_op(RIG *rig, vfo_t vfo, vfo_op_t op)
 {
-    struct ar3030_priv_data *priv = (struct ar3030_priv_data *)rig->state.priv;
+    struct ar3030_priv_data *priv = (struct ar3030_priv_data *)STATE(rig)->priv;
     char buf[16];
     int retval;
 

rigs/aor/ar5000.c

@@ -20,8 +20,6 @@
  *
  */
 
-#include <hamlib/config.h>
-
 #include <stdio.h>
 #include <string.h>
 #include <hamlib/rig.h>
@@ -101,7 +99,7 @@ static const struct aor_priv_caps ar5k_priv_caps =
  *
  * TODO: retrieve BW info, and rest of commands
  */
-const struct rig_caps ar5000_caps =
+struct rig_caps ar5000_caps =
 {
     RIG_MODEL(RIG_MODEL_AR5000),
     .model_name = "AR5000",
@@ -247,14 +245,14 @@ const struct rig_caps ar5000_caps =
  *
  * TODO: retrieve BW info, and rest of commands
  */
-const struct rig_caps ar5000a_caps =
+struct rig_caps ar5000a_caps =
 {
     RIG_MODEL(RIG_MODEL_AR5000A),
     .model_name = "AR5000A",
     .mfg_name =  "AOR",
     .version =  BACKEND_VER ".0",
     .copyright =  "LGPL",
-    .status =  RIG_STATUS_BETA,
+    .status =  RIG_STATUS_STABLE,
     .rig_type =  RIG_TYPE_SCANNER,
     .ptt_type =  RIG_PTT_NONE,
     .dcd_type =  RIG_DCD_RIG,

rigs/aor/ar7030.c

@@ -24,12 +24,9 @@
 // Version 2004.11.29 F.Melchert (DC9RP)
 //
 
-#include <hamlib/config.h>
-
 #include <stdio.h>
 
 #include <hamlib/rig.h>
-#include "aor.h"
 #include "serial.h"
 #include "idx_builtin.h"
 
@@ -69,23 +66,23 @@
 
 static int rxr_writeByte(RIG *rig, unsigned char c)
 {
-    return write_block(&rig->state.rigport, &c, 1);
+    return write_block(RIGPORT(rig), &c, 1);
 }
 
 
 static int rxr_readByte(RIG *rig)
 {
     unsigned char response[1];
-    unsigned char buf[] = {0x71}; // Read command
+    const unsigned char buf[] = {0x71}; // Read command
     int retval;
-    retval = write_block(&rig->state.rigport, buf, 1);
+    retval = write_block(RIGPORT(rig), buf, 1);
 
     if (retval != RIG_OK)
     {
         return retval;
     }
 
-    retval = read_block(&rig->state.rigport, response, 1);
+    retval = read_block(RIGPORT(rig), response, 1);
 
     if (retval != RIG_OK)
     {
@@ -193,7 +190,8 @@ static void Execute_Routine_2_1(RIG *rig, char mp, char ad, int numSteps)
 }
 #endif
 // Routine 3    Set passband    Setup all IF parameters from filter, pbsval and bfoval bytes.
-static void Execute_Routine_3_1(RIG *rig, char mp, char ad, int numSteps)
+static void Execute_Routine_3_1(RIG *rig, char mp, char ad,
+                                unsigned int numSteps)
 {
     setLock(rig, 1);      //Set Lock Level
     setMemPtr(rig, mp, ad);   //page, address
@@ -272,16 +270,17 @@ static void Execute_Routine_6_1(RIG *rig, char mp, char ad, int numSteps)
 static int Execute_Routine_14(RIG *rig)
 {
     unsigned char response[1];
-    unsigned char buf[] = {0x2e}; // Read command
+    hamlib_port_t *rp = RIGPORT(rig);
+    const unsigned char buf[] = {0x2e}; // Read command
     int retval;
-    retval = write_block(&rig->state.rigport, buf, 1);
+    retval = write_block(rp, buf, 1);
 
     if (retval != RIG_OK)
     {
         return retval;
     }
 
-    retval = read_block(&rig->state.rigport, response, 1);
+    retval = read_block(rp, response, 1);
 
     if (retval != RIG_OK)
     {
@@ -491,7 +490,7 @@ static int ar7030_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
 
     setMemPtr(rig, 0, 0x38);
 
-    if ((*width = BCD_To_int(rig, rxr_readByte(rig)) * 100) < 0)
+    if ((*width = (pbwidth_t)BCD_To_int(rig, rxr_readByte(rig)) * 100) < 0)
     {
         return -RIG_EINVAL;
     }
@@ -775,7 +774,7 @@ static int ar7030_reset(RIG *rig, reset_t reset)
 
 
 
-const struct rig_caps ar7030_caps =
+struct rig_caps ar7030_caps =
 {
     RIG_MODEL(RIG_MODEL_AR7030),
     .model_name = "AR7030",
@@ -805,7 +804,6 @@ const struct rig_caps ar7030_caps =
     .has_get_parm =  AR7030_PARM,
     .has_set_parm =  RIG_PARM_NONE,
     .level_gran =  {
-        // cppcheck-suppress *
         [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
     },
     .parm_gran =  {},

rigs/aor/ar7030p.c

@@ -24,8 +24,6 @@
  * Version 2009.11.21 Larry Gadallah (VE6VQ)
  */
 
-#include <hamlib/config.h>
-
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>
@@ -33,7 +31,6 @@
 
 #include "hamlib/rig.h"
 #include "ar7030p.h"
-#include "serial.h"
 #include "idx_builtin.h"
 
 #define AR7030P_MODES ( RIG_MODE_AM | \
@@ -231,7 +228,7 @@ static struct ext_list *alloc_init_ext(const struct confparams *cfp)
 }
 
 #if 0 /* unused; re-enabled as needed. */
-static struct ext_list *find_ext(struct ext_list *elp, token_t token)
+static struct ext_list *find_ext(struct ext_list *elp, hamlib_token_t token)
 {
     int i;
 
@@ -267,9 +264,9 @@ static int ar7030p_init(RIG *rig)
     {
         int i;
 
-        rig->state.priv = (void *) priv;
+        STATE(rig)->priv = (void *) priv;
 
-        rig->state.rigport.type.rig = RIG_PORT_SERIAL;
+        RIGPORT(rig)->type.rig = RIG_PORT_SERIAL;
 
         priv->powerstat = RIG_POWER_ON;
         priv->bank = 0;
@@ -330,12 +327,14 @@ static int ar7030p_init(RIG *rig)
 
 static int ar7030p_cleanup(RIG *rig)
 {
-    struct ar7030p_priv_data *priv = (struct ar7030p_priv_data *) rig->state.priv;
+    struct ar7030p_priv_data *priv = (struct ar7030p_priv_data *) STATE(rig)->priv;
     int rc = RIG_OK;
     int i;
 
     rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
 
+    if (priv == NULL) { return RIG_OK; }
+
     for (i = 0; i < NB_CHAN; i++)
     {
         free(priv->mem[ i ].ext_levels);
@@ -346,12 +345,9 @@ static int ar7030p_cleanup(RIG *rig)
 
     free(priv->ext_parms);
 
-    if (NULL != rig->state.priv)
-    {
-        free(rig->state.priv);
-    }
+    free(STATE(rig)->priv);
 
-    rig->state.priv = NULL;
+    STATE(rig)->priv = NULL;
 
     return (rc);
 }
@@ -367,8 +363,10 @@ static int ar7030p_open(RIG *rig)
 {
     int rc = RIG_OK;
     unsigned char v;
+    struct rig_state *rs;
 
     assert(NULL != rig);
+    rs = STATE(rig);
 
     rc = lockRx(rig, LOCK_1);
 
@@ -377,9 +375,9 @@ static int ar7030p_open(RIG *rig)
         int i;
 
         /* Load calibration table */
-        rig->state.str_cal.size = rig->caps->str_cal.size;
+        rs->str_cal.size = rig->caps->str_cal.size;
 
-        for (i = 0; i < rig->state.str_cal.size; i++)
+        for (i = 0; i < rs->str_cal.size; i++)
         {
             rc = readByte(rig, EEPROM1, SM_CAL + i, &v);
 
@@ -388,12 +386,12 @@ static int ar7030p_open(RIG *rig)
                 break;
             }
 
-            rig->state.str_cal.table[ i ].val = rig->caps->str_cal.table[ i ].val;
-            rig->state.str_cal.table[ i ].raw = (int) v;
+            rs->str_cal.table[ i ].val = rig->caps->str_cal.table[ i ].val;
+            rs->str_cal.table[ i ].raw = (int) v;
 
             rig_debug(RIG_DEBUG_VERBOSE, "%s: index %d, val %d, raw %d\n",
-                      __func__, i, rig->state.str_cal.table[ i ].val,
-                      rig->state.str_cal.table[ i ].raw);
+                      __func__, i, rs->str_cal.table[ i ].val,
+                      rs->str_cal.table[ i ].raw);
         }
 
         if (RIG_OK == rc)
@@ -431,6 +429,7 @@ static int ar7030p_open(RIG *rig)
  *
  * /return 0 on success, < 0 on failure
  */
+// cppcheck-suppress *
 static int ar7030p_close(RIG *rig)
 {
     assert(NULL != rig);
@@ -486,7 +485,7 @@ static int ar7030p_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
 
     if (RIG_OK == rc)
     {
-        const struct rig_caps *caps = rig->caps;
+        struct rig_caps *caps = rig->caps;
 
         if ((caps->rx_range_list1[ 0 ].endf   > freq) &&
                 (caps->rx_range_list1[ 0 ].startf < freq))
@@ -1223,7 +1222,7 @@ static int ar7030p_get_level(RIG *rig, vfo_t vfo, setting_t level,
 static int ar7030p_set_vfo(RIG *rig, vfo_t vfo)
 {
     int rc = RIG_OK;
-    struct ar7030p_priv_data *priv = (struct ar7030p_priv_data *) rig->state.priv;
+    struct ar7030p_priv_data *priv = (struct ar7030p_priv_data *) STATE(rig)->priv;
 
     switch (vfo)
     {
@@ -1267,7 +1266,8 @@ static int ar7030p_set_vfo(RIG *rig, vfo_t vfo)
 static int ar7030p_get_vfo(RIG *rig, vfo_t *vfo)
 {
     int rc = RIG_OK;
-    struct ar7030p_priv_data *priv = (struct ar7030p_priv_data *) rig->state.priv;
+    struct ar7030p_priv_data const *priv = (struct ar7030p_priv_data *)
+                                           STATE(rig)->priv;
 
     assert(NULL != vfo);
 
@@ -1276,6 +1276,7 @@ static int ar7030p_get_vfo(RIG *rig, vfo_t *vfo)
     return (rc);
 }
 
+// cppcheck-suppress constParameterCallback
 static int ar7030p_set_parm(RIG *rig, setting_t parm, value_t val)
 {
     int rc = -RIG_ENIMPL;
@@ -1300,6 +1301,7 @@ static int ar7030p_set_parm(RIG *rig, setting_t parm, value_t val)
     return (rc);
 }
 
+// cppcheck-suppress constParameterCallback
 static int ar7030p_get_parm(RIG *rig, setting_t parm, value_t *val)
 {
     int rc = -RIG_ENIMPL;
@@ -1329,7 +1331,7 @@ static int ar7030p_set_mem(RIG *rig, vfo_t vfo, int ch)
 {
     int rc = RIG_OK;
 
-    struct ar7030p_priv_data *priv = (struct ar7030p_priv_data *) rig->state.priv;
+    struct ar7030p_priv_data *priv = (struct ar7030p_priv_data *) STATE(rig)->priv;
 
     if (RIG_VFO_MEM == priv->curr_vfo)
     {
@@ -1349,8 +1351,9 @@ static int ar7030p_get_mem(RIG *rig, vfo_t vfo, int *ch)
 {
     int rc = RIG_OK;
 
-    struct ar7030p_priv_data *priv = (struct ar7030p_priv_data *) rig->state.priv;
-    channel_t *curr = priv->curr;
+    struct ar7030p_priv_data const *priv = (struct ar7030p_priv_data *)
+                                           STATE(rig)->priv;
+    const channel_t *curr = priv->curr;
 
     assert(NULL != ch);
 
@@ -1388,6 +1391,7 @@ static int ar7030p_vfo_op(RIG *rig, vfo_t vfo, vfo_op_t op)
     return (rc);
 }
 
+// cppcheck-suppress constParameterCallback
 static int ar7030p_scan(RIG *rig, vfo_t vfo, scan_t scan, int ch)
 {
     int rc = -RIG_ENIMPL;
@@ -1603,6 +1607,7 @@ static int ar7030p_reset(RIG *rig, reset_t reset)
     return (rc);
 }
 
+// cppcheck-suppress constParameterCallback
 static int ar7030p_set_func(RIG *rig, vfo_t vfo, setting_t func,
                             int status)
 {
@@ -1611,15 +1616,18 @@ static int ar7030p_set_func(RIG *rig, vfo_t vfo, setting_t func,
     return (-RIG_ENIMPL);
 }
 
+// cppcheck-suppress constParameterCallback
 static int ar7030p_get_func(RIG *rig, vfo_t vfo, setting_t func,
                             int *status)
 {
     assert(NULL != rig);
     assert(NULL != status);
+    *status = 0;
 
     return (-RIG_ENIMPL);
 }
 
+// cppcheck-suppress constParameterCallback
 static int ar7030p_decode_event(RIG *rig)
 {
     assert(NULL != rig);
@@ -1627,6 +1635,7 @@ static int ar7030p_decode_event(RIG *rig)
     return (-RIG_ENIMPL);
 }
 
+// cppcheck-suppress constParameterCallback
 static int ar7030p_set_channel(RIG *rig, vfo_t vfo, const channel_t *chan)
 {
     assert(NULL != rig);
@@ -1643,8 +1652,9 @@ static int ar7030p_get_channel(RIG *rig, vfo_t vfo, channel_t *chan,
     unsigned int f;
     unsigned char *p = NULL;
     int ch;
-    struct ar7030p_priv_data *priv = (struct ar7030p_priv_data *)rig->state.priv;
-    channel_t *curr = priv->curr;
+    const struct ar7030p_priv_data *priv = (struct ar7030p_priv_data *)
+                                           STATE(rig)->priv;
+    const channel_t *curr = priv->curr;
 
     assert(NULL != chan);
 
@@ -1673,7 +1683,6 @@ static int ar7030p_get_channel(RIG *rig, vfo_t vfo, channel_t *chan,
 
         if (RIG_OK == rc)
         {
-            // cppcheck-suppress *
             chan->levels[ LVL_SQL ].f = (float) v / 255.0;
         }
 
@@ -1766,7 +1775,7 @@ static int ar7030p_get_channel(RIG *rig, vfo_t vfo, channel_t *chan,
     return (rc);
 }
 
-const struct rig_caps ar7030p_caps =
+struct rig_caps ar7030p_caps =
 {
     RIG_MODEL(RIG_MODEL_AR7030P),
     .model_name = "AR7030 Plus",

rigs/aor/ar7030p_utils.c

@@ -31,7 +31,6 @@
 #include <hamlib/rig.h>
 #include "ar7030p.h"
 #include "serial.h"
-#include "idx_builtin.h"
 
 static enum PAGE_e curPage = NONE; /* Current memory page */
 static unsigned int curAddr = 65535; /* Current page address */
@@ -57,7 +56,7 @@ int NOP(RIG *rig, unsigned char x)
 
     assert(NULL != rig);
 
-    rc = write_block(&rig->state.rigport, (char *) &op, 1);
+    rc = write_block(RIGPORT(rig), (char *) &op, 1);
 
     if (0 != rc)
     {
@@ -79,7 +78,7 @@ int SRH(RIG *rig, unsigned char x)
 
     assert(NULL != rig);
 
-    rc = write_block(&rig->state.rigport, (char *) &op, 1);
+    rc = write_block(RIGPORT(rig), (char *) &op, 1);
 
     if (0 != rc)
     {
@@ -109,7 +108,7 @@ int PGE(RIG *rig, enum PAGE_e page)
     case EEPROM2:
     case EEPROM3:
     case ROM:
-        rc = write_block(&rig->state.rigport, (char *) &op, 1);
+        rc = write_block(RIGPORT(rig), (char *) &op, 1);
 
         if (0 != rc)
         {
@@ -142,7 +141,7 @@ int ADR(RIG *rig, unsigned char x)
 
     assert(NULL != rig);
 
-    rc = write_block(&rig->state.rigport, (char *) &op, 1);
+    rc = write_block(RIGPORT(rig), (char *) &op, 1);
 
     if (0 != rc)
     {
@@ -164,7 +163,7 @@ int ADH(RIG *rig, unsigned char x)
 
     assert(NULL != rig);
 
-    rc = write_block(&rig->state.rigport, (char *) &op, 1);
+    rc = write_block(RIGPORT(rig), (char *) &op, 1);
 
     if (0 != rc)
     {
@@ -188,7 +187,7 @@ int WRD(RIG *rig, unsigned char out)
 
     assert(NULL != rig);
 
-    rc = write_block(&rig->state.rigport, (char *) &op, 1);
+    rc = write_block(RIGPORT(rig), (char *) &op, 1);
 
     if (0 != rc)
     {
@@ -211,7 +210,7 @@ int MSK(RIG *rig, unsigned char mask)
 
     assert(NULL != rig);
 
-    rc = write_block(&rig->state.rigport, (char *) &op, 1);
+    rc = write_block(RIGPORT(rig), (char *) &op, 1);
 
     if (0 != rc)
     {
@@ -249,7 +248,7 @@ int EXE(RIG *rig, enum ROUTINE_e routine)
     case DISP_BUFF:
     case READ_SIGNAL:
     case READ_BTNS:
-        rc = write_block(&rig->state.rigport, (char *) &op, 1);
+        rc = write_block(RIGPORT(rig), (char *) &op, 1);
 
         if (0 != rc)
         {
@@ -281,7 +280,7 @@ int RDD(RIG *rig, unsigned char len)
 
     assert(NULL != rig);
 
-    rc = write_block(&rig->state.rigport, (char *) &op, 1);
+    rc = write_block(RIGPORT(rig), (char *) &op, 1);
 
     if (0 != rc)
     {
@@ -289,7 +288,7 @@ int RDD(RIG *rig, unsigned char len)
     }
     else
     {
-        rc = read_block(&rig->state.rigport, (char *) &inChr, len);
+        rc = read_block(RIGPORT(rig), (char *) &inChr, len);
 
         if (1 != rc)
         {
@@ -322,7 +321,7 @@ int LOC(RIG *rig, enum LOCK_LVL_e level)
     case LOCK_1:
     case LOCK_2:
     case LOCK_3:
-        rc = write_block(&rig->state.rigport, (char *) &op, 1);
+        rc = write_block(RIGPORT(rig), (char *) &op, 1);
 
         if (0 != rc)
         {
@@ -367,7 +366,7 @@ int BUT(RIG *rig, enum BUTTON_e button)
     case BTN_STAR:
     case BTN_MENU:
     case BTN_POWER:
-        rc = write_block(&rig->state.rigport, (char *) &op, 1);
+        rc = write_block(RIGPORT(rig), (char *) &op, 1);
 
         if (0 != rc)
         {
@@ -404,7 +403,7 @@ int execRoutine(RIG *rig, enum ROUTINE_e rtn)
 
     assert(NULL != rig);
 
-    if (0 == write_block(&rig->state.rigport, &v, 1))
+    if (0 == write_block(RIGPORT(rig), &v, 1))
     {
         rc = RIG_OK;
 
@@ -429,6 +428,7 @@ int execRoutine(RIG *rig, enum ROUTINE_e rtn)
 static int setAddr(RIG *rig, enum PAGE_e page, unsigned int addr)
 {
     int rc = RIG_OK;
+    hamlib_port_t *rp = RIGPORT(rig);
     unsigned char v;
 
     assert(NULL != rig);
@@ -441,7 +441,7 @@ static int setAddr(RIG *rig, enum PAGE_e page, unsigned int addr)
             {
                 v = PGE(page);
 
-                if (0 == write_block(&rig->state.rigport, &v, 1))
+                if (0 == write_block(rp, &v, 1))
                 {
                     curPage = page;
                     rc = RIG_OK;
@@ -458,7 +458,7 @@ static int setAddr(RIG *rig, enum PAGE_e page, unsigned int addr)
             {
                 v = SRH((0x0f0 & addr) >> 4);
 
-                rc = write_block(&rig->state.rigport, &v, 1);
+                rc = write_block(rp, &v, 1);
 
                 if (rc != RIG_OK)
                 {
@@ -467,13 +467,13 @@ static int setAddr(RIG *rig, enum PAGE_e page, unsigned int addr)
 
                 v = ADR((0x00f & addr));
 
-                if (0 == write_block(&rig->state.rigport, &v, 1))
+                if (0 == write_block(rp, &v, 1))
                 {
                     if (0xff < addr)
                     {
                         v = ADH((0xf00 & addr) >> 8);
 
-                        if (0 == write_block(&rig->state.rigport, &v, 1))
+                        if (0 == write_block(rp, &v, 1))
                         {
                             curAddr = addr;
                             rc = RIG_OK;
@@ -526,6 +526,7 @@ static int setAddr(RIG *rig, enum PAGE_e page, unsigned int addr)
 int writeByte(RIG *rig, enum PAGE_e page, unsigned int addr, unsigned char x)
 {
     int rc;
+    hamlib_port_t *rp = RIGPORT(rig);
     unsigned char hi = SRH((x & 0xf0) >> 4);
     unsigned char lo = WRD(x & 0x0f);
 
@@ -537,9 +538,9 @@ int writeByte(RIG *rig, enum PAGE_e page, unsigned int addr, unsigned char x)
     {
         rc = -RIG_EIO;
 
-        if (0 == write_block(&rig->state.rigport, &hi, 1))
+        if (0 == write_block(rp, &hi, 1))
         {
-            if (0 == write_block(&rig->state.rigport, &lo, 1))
+            if (0 == write_block(rp, &lo, 1))
             {
                 rc = RIG_OK;
                 curAddr++;
@@ -668,6 +669,7 @@ int writeInt(RIG *rig, enum PAGE_e page, unsigned int addr, unsigned int x)
 int readByte(RIG *rig, enum PAGE_e page, unsigned int addr, unsigned char *x)
 {
     int rc = RIG_OK;
+    hamlib_port_t *rp = RIGPORT(rig);
     unsigned char v = RDD(1);   // Read command
 
     assert(NULL != rig);
@@ -679,9 +681,9 @@ int readByte(RIG *rig, enum PAGE_e page, unsigned int addr, unsigned char *x)
     {
         rc = -RIG_EIO;
 
-        if (0 == write_block(&rig->state.rigport, &v, 1))
+        if (0 == write_block(rp, &v, 1))
         {
-            if (1 == read_block(&rig->state.rigport, x, 1))
+            if (1 == read_block(rp, x, 1))
             {
                 curAddr++;
                 rc = RIG_OK;
@@ -842,7 +844,7 @@ int readSignal(RIG *rig, unsigned char *x)
 
     if (RIG_OK == rc)
     {
-        if (1 == read_block(&rig->state.rigport, x, 1))
+        if (1 == read_block(RIGPORT(rig), x, 1))
         {
             rc = RIG_OK;
 
@@ -868,7 +870,7 @@ int flushBuffer(RIG *rig)
 
     assert(NULL != rig);
 
-    if (0 == write_block(&rig->state.rigport, &v, 1))
+    if (0 == write_block(RIGPORT(rig), &v, 1))
     {
         rc = RIG_OK;
     }
@@ -897,7 +899,7 @@ int lockRx(RIG *rig, enum LOCK_LVL_e level)
         {
             v = LOC(level);
 
-            if (0 == write_block(&rig->state.rigport, &v, 1))
+            if (0 == write_block(RIGPORT(rig), &v, 1))
             {
                 rc = RIG_OK;
 
@@ -985,27 +987,29 @@ int getCalLevel(RIG *rig, unsigned char rawAgc, int *dbm)
     int raw = (int) rawAgc;
     int step;
     unsigned char v;
+    struct rig_state *rs;
 
     assert(NULL != rig);
     assert(NULL != dbm);
+    rs = STATE(rig);
 
     rig_debug(RIG_DEBUG_VERBOSE, "%s: raw AGC %03d\n", __func__, rawAgc);
 
-    for (i = 0; i < rig->state.str_cal.size; i++)
+    for (i = 0; i < rs->str_cal.size; i++)
     {
-        *dbm = rig->state.str_cal.table[ i ].val;
+        *dbm = rs->str_cal.table[ i ].val;
 
         rig_debug(RIG_DEBUG_VERBOSE, "%s: got cal table[ %d ] dBm value %d\n", __func__,
                   i, *dbm);
 
         /* if the remaining difference in the raw value is negative */
-        if (0 > (raw - rig->state.str_cal.table[ i ].raw))
+        if (0 > (raw - rs->str_cal.table[ i ].raw))
         {
             /* calculate step size */
             if (0 < i)
             {
-                step = rig->state.str_cal.table[ i ].val -
-                       rig->state.str_cal.table[ i - 1 ].val;
+                step = rs->str_cal.table[ i ].val -
+                       rs->str_cal.table[ i - 1 ].val;
             }
             else
             {
@@ -1016,7 +1020,7 @@ int getCalLevel(RIG *rig, unsigned char rawAgc, int *dbm)
 
             /* interpolate the final value */
             *dbm -= step; /* HACK - table seems to be off by one index */
-            *dbm += (int)(((double) raw / (double) rig->state.str_cal.table[ i ].raw) *
+            *dbm += (int)(((double) raw / (double) rs->str_cal.table[ i ].raw) *
                           (double) step);
 
             rig_debug(RIG_DEBUG_VERBOSE, "%s: interpolated dBm value %d\n", __func__, *dbm);
@@ -1027,7 +1031,7 @@ int getCalLevel(RIG *rig, unsigned char rawAgc, int *dbm)
         else
         {
             /* calculate the remaining raw value */
-            raw = raw - rig->state.str_cal.table[ i ].raw;
+            raw = raw - rs->str_cal.table[ i ].raw;
 
             rig_debug(RIG_DEBUG_VERBOSE, "%s: residual raw value %d\n", __func__, raw);
         }

rigs/aor/ar8000.c

@@ -19,8 +19,6 @@
  *
  */
 
-#include <hamlib/config.h>
-
 #include <stdlib.h>
 
 #include <hamlib/rig.h>
@@ -62,7 +60,7 @@ static const struct aor_priv_caps ar8000_priv_caps =
  *
  * part of info from http://www.aoruk.com/8000.htm
  */
-const struct rig_caps ar8000_caps =
+struct rig_caps ar8000_caps =
 {
     RIG_MODEL(RIG_MODEL_AR8000),
     .model_name = "AR8000",

rigs/aor/ar8200.c

@@ -19,8 +19,6 @@
  *
  */
 
-#include <hamlib/config.h>
-
 #include <stdlib.h>
 
 #include <hamlib/rig.h>
@@ -86,14 +84,14 @@ static const struct aor_priv_caps ar8k_priv_caps =
  *
  * part of info from http://www.aoruk.com/8200.htm
  */
-const struct rig_caps ar8200_caps =
+struct rig_caps ar8200_caps =
 {
     RIG_MODEL(RIG_MODEL_AR8200),
     .model_name = "AR8200",
     .mfg_name =  "AOR",
     .version =  BACKEND_VER ".0",
     .copyright =  "LGPL",
-    .status =  RIG_STATUS_BETA,
+    .status =  RIG_STATUS_STABLE,
     .rig_type =  RIG_TYPE_SCANNER,
     .ptt_type =  RIG_PTT_NONE,
     .dcd_type =  RIG_DCD_RIG,

rigs/aor/ar8600.c

@@ -19,8 +19,6 @@
  *
  */
 
-#include <hamlib/config.h>
-
 #include <stdlib.h>
 
 #include <hamlib/rig.h>
@@ -88,7 +86,7 @@ static const struct aor_priv_caps ar8600_priv_caps =
  *
  * part of info from http://www.aoruk.com/8600.htm
  */
-const struct rig_caps ar8600_caps =
+struct rig_caps ar8600_caps =
 {
     RIG_MODEL(RIG_MODEL_AR8600),
     .model_name = "AR8600",