Skip to content

expose CSQL capability #2

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

expose CSQL capability #2

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
2 changes: 1 addition & 1 deletion index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,7 @@ type LevelType = 'AF' | 'PREAMP' | 'ATT' | 'RF' | 'SQL' | 'RFPOWER' | 'MICGAIN'
/**
* Function type
*/
type FunctionType = 'FAGC' | 'NB' | 'COMP' | 'VOX' | 'TONE' | 'TSQL' | 'SBKIN' |
type FunctionType = 'FAGC' | 'NB' | 'COMP' | 'VOX' | 'TONE' | 'TSQL' | 'CSQL' | 'SBKIN' |
'FBKIN' | 'ANF' | 'NR' | 'AIP' | 'APF' | 'TUNER' | 'XIT' |
'RIT' | 'LOCK' | 'MUTE' | 'VSC' | 'REV' | 'SQL' | 'ABM' |
'BC' | 'MBC' | 'AFC' | 'SATMODE' | 'SCOPE' | 'RESUME' | 'TRANSCEIVE' |
Expand Down
7 changes: 6 additions & 1 deletion src/hamlib.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ struct NamedBit {

static const NamedBit kMemoryFunctionBits[] = {
{"FAGC", SHIM_RIG_FUNC_FAGC}, {"NB", SHIM_RIG_FUNC_NB}, {"COMP", SHIM_RIG_FUNC_COMP},
{"VOX", SHIM_RIG_FUNC_VOX}, {"TONE", SHIM_RIG_FUNC_TONE}, {"TSQL", SHIM_RIG_FUNC_TSQL},
{"VOX", SHIM_RIG_FUNC_VOX}, {"TONE", SHIM_RIG_FUNC_TONE}, {"TSQL", SHIM_RIG_FUNC_TSQL}, {"CSQL", SHIM_RIG_FUNC_CSQL},
{"SBKIN", SHIM_RIG_FUNC_SBKIN}, {"FBKIN", SHIM_RIG_FUNC_FBKIN}, {"ANF", SHIM_RIG_FUNC_ANF},
{"NR", SHIM_RIG_FUNC_NR}, {"AIP", SHIM_RIG_FUNC_AIP}, {"APF", SHIM_RIG_FUNC_APF},
{"MON", SHIM_RIG_FUNC_MON}, {"MN", SHIM_RIG_FUNC_MN}, {"RF", SHIM_RIG_FUNC_RF},
Expand Down Expand Up @@ -4266,6 +4266,8 @@ Napi::Value NodeHamLib::SetFunction(const Napi::CallbackInfo & info) {
funcType = SHIM_RIG_FUNC_TONE;
} else if (funcTypeStr == "TSQL") {
funcType = SHIM_RIG_FUNC_TSQL;
} else if (funcTypeStr == "CSQL") {
funcType = SHIM_RIG_FUNC_CSQL;
} else if (funcTypeStr == "SBKIN") {
funcType = SHIM_RIG_FUNC_SBKIN;
} else if (funcTypeStr == "FBKIN") {
Expand Down Expand Up @@ -4352,6 +4354,8 @@ Napi::Value NodeHamLib::GetFunction(const Napi::CallbackInfo & info) {
funcType = SHIM_RIG_FUNC_TONE;
} else if (funcTypeStr == "TSQL") {
funcType = SHIM_RIG_FUNC_TSQL;
} else if (funcTypeStr == "CSQL") {
funcType = SHIM_RIG_FUNC_CSQL;
} else if (funcTypeStr == "SBKIN") {
funcType = SHIM_RIG_FUNC_SBKIN;
} else if (funcTypeStr == "FBKIN") {
Expand Down Expand Up @@ -4427,6 +4431,7 @@ Napi::Value NodeHamLib::GetSupportedFunctions(const Napi::CallbackInfo & info) {
if (functions & SHIM_RIG_FUNC_VOX) values->push_back("VOX");
if (functions & SHIM_RIG_FUNC_TONE) values->push_back("TONE");
if (functions & SHIM_RIG_FUNC_TSQL) values->push_back("TSQL");
if (functions & SHIM_RIG_FUNC_CSQL) values->push_back("CSQL");
if (functions & SHIM_RIG_FUNC_SBKIN) values->push_back("SBKIN");
if (functions & SHIM_RIG_FUNC_FBKIN) values->push_back("FBKIN");
if (functions & SHIM_RIG_FUNC_ANF) values->push_back("ANF");
Expand Down
1 change: 1 addition & 0 deletions src/shim/hamlib_shim.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,7 @@ typedef void* hamlib_shim_handle_t;
#define SHIM_RIG_FUNC_TBURST (1ULL << 29)
#define SHIM_RIG_FUNC_TUNER (1ULL << 30)
#define SHIM_RIG_FUNC_XIT (1ULL << 31)
#define SHIM_RIG_FUNC_CSQL (1ULL << 33)
#define SHIM_RIG_FUNC_TRANSCEIVE (1ULL << 42)
#define SHIM_RIG_FUNC_SPECTRUM (1ULL << 43)
#define SHIM_RIG_FUNC_SPECTRUM_HOLD (1ULL << 44)
Expand Down