Skip to content

Fix: read currently effective frequency ranges #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
shankerwangmiao wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix: read currently effective frequency ranges #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/hamlib.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7894,8 +7894,8 @@ Napi::Value NodeHamLib::GetFrequencyRanges(const Napi::CallbackInfo& info) {
(void)error_message;
shim_freq_range_t rx_buf[30];
shim_freq_range_t tx_buf[30];
int rx_count = shim_rig_get_caps_rx_range(instance->my_rig, rx_buf, 30);
int tx_count = shim_rig_get_caps_tx_range(instance->my_rig, tx_buf, 30);
int rx_count = shim_rig_get_rx_range(instance->my_rig, rx_buf, 30);
int tx_count = shim_rig_get_tx_range(instance->my_rig, tx_buf, 30);
data->rx.assign(rx_buf, rx_buf + std::max(0, rx_count));
data->tx.assign(tx_buf, tx_buf + std::max(0, tx_count));
},
Expand Down
8 changes: 4 additions & 4 deletions src/shim/hamlib_shim.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2101,12 +2101,12 @@ SHIM_API int shim_rig_get_caps_dcs_list(hamlib_shim_handle_t h, unsigned int* ou

/* ===== Capability Query: Frequency ranges ===== */

SHIM_API int shim_rig_get_caps_rx_range(hamlib_shim_handle_t h, shim_freq_range_t* out, int max_count) {
SHIM_API int shim_rig_get_rx_range(hamlib_shim_handle_t h, shim_freq_range_t* out, int max_count) {
RIG *rig = (RIG *)h;
if (!rig || !out || max_count <= 0) return 0;
int count = 0;
for (int i = 0; i < HAMLIB_FRQRANGESIZ && count < max_count; i++) {
const freq_range_t *r = &rig->caps->rx_range_list1[i];
const freq_range_t *r = &rig->state.rx_range_list[i];
if (r->startf == 0 && r->endf == 0) break;
out[count].start_freq = (double)r->startf;
out[count].end_freq = (double)r->endf;
Expand All @@ -2120,12 +2120,12 @@ SHIM_API int shim_rig_get_caps_rx_range(hamlib_shim_handle_t h, shim_freq_range_
return count;
}

SHIM_API int shim_rig_get_caps_tx_range(hamlib_shim_handle_t h, shim_freq_range_t* out, int max_count) {
SHIM_API int shim_rig_get_tx_range(hamlib_shim_handle_t h, shim_freq_range_t* out, int max_count) {
RIG *rig = (RIG *)h;
if (!rig || !out || max_count <= 0) return 0;
int count = 0;
for (int i = 0; i < HAMLIB_FRQRANGESIZ && count < max_count; i++) {
const freq_range_t *r = &rig->caps->tx_range_list1[i];
const freq_range_t *r = &rig->state.tx_range_list[i];
if (r->startf == 0 && r->endf == 0) break;
out[count].start_freq = (double)r->startf;
out[count].end_freq = (double)r->endf;
Expand Down
4 changes: 2 additions & 2 deletions src/shim/hamlib_shim.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -846,8 +846,8 @@ SHIM_API int shim_rig_get_caps_ctcss_list(hamlib_shim_handle_t h, unsigned int*
SHIM_API int shim_rig_get_caps_dcs_list(hamlib_shim_handle_t h, unsigned int* out, int max_count);

/* Group C: Structured data */
SHIM_API int shim_rig_get_caps_rx_range(hamlib_shim_handle_t h, shim_freq_range_t* out, int max_count);
SHIM_API int shim_rig_get_caps_tx_range(hamlib_shim_handle_t h, shim_freq_range_t* out, int max_count);
SHIM_API int shim_rig_get_rx_range(hamlib_shim_handle_t h, shim_freq_range_t* out, int max_count);
SHIM_API int shim_rig_get_tx_range(hamlib_shim_handle_t h, shim_freq_range_t* out, int max_count);
SHIM_API int shim_rig_get_caps_tuning_steps(hamlib_shim_handle_t h, shim_mode_value_t* out, int max_count);
SHIM_API int shim_rig_get_caps_filters(hamlib_shim_handle_t h, shim_mode_value_t* out, int max_count);
SHIM_API int shim_rig_get_level_granularity(hamlib_shim_handle_t h, uint64_t level, shim_granularity_t* out);
Expand Down