rigctl command table: rename indices to avoid a name clash

diff --git a/rigctl.c b/rigctl.c
index a38d4a5e955a91687d6dfdbf4e9631754a3aba6b..bd471d34abdeaae0a0c04b1c2da1a9bde3467ebb 100644 (file)
--- a/rigctl.c
+++ b/rigctl.c
@@ -168,111 +168,111 @@ int ctcss_mode; // Numbers 0/1 - on off.
 static gpointer rigctl_client(gpointer data);
 
 cat_command commands[NUM_CMDS] = {
-    [AC] = { "AC", cmd_type_none, false, 0, false, 0, 0 },
-    [AG] = { "AG", cmd_type_num, true, 3, false, 0, 255 },
-    [AI] = { "AI", cmd_type_bool, true, 1, false, 0, 1 },
-    [AL] = { "AL", cmd_type_none, false, 0, false, 0, 0 },
-    [AM] = { "AM", cmd_type_none, false, 0, false, 0, 0 },
-    [AN] = { "AN", cmd_type_none, false, 0, false, 0, 0 },
-    [AS] = { "AS", cmd_type_none, false, 0, false, 0, 0 },
-    [BC] = { "BC", cmd_type_none, false, 0, false, 0, 0 },
-    [BD] = { "BD", cmd_type_none, true, 0, false, 0, 0 },
-    [BP] = { "BP", cmd_type_none, false, 0, false, 0, 0 },
-    [BS] = { "BS", cmd_type_none, false, 0, false, 0, 0 },
-    [BU] = { "BU", cmd_type_none, true, 0, false, 0, 0 },
-    [BY] = { "BY", cmd_type_none, false, 0, false, 0, 0 },
-    [CA] = { "CA", cmd_type_none, false, 0, false, 0, 0 },
-    [CG] = { "CG", cmd_type_none, false, 0, false, 0, 0 },
-    [CI] = { "CI", cmd_type_none, false, 0, false, 0, 0 },
-    [CM] = { "CM", cmd_type_none, false, 0, false, 0, 0 },
-    [CN] = { "CN", cmd_type_num,  true, 2,  false, 1,  49 },
-    [CT] = { "CT", cmd_type_bool, true, 1,  false, 0,  1 },
-    [DC] = { "DC", cmd_type_none, false, 0, false, 0, 0 },
-    [DN] = { "DN", cmd_type_none, true, 0,  false, 0,  0 },
-    [DQ] = { "DQ", cmd_type_none, false, 0, false, 0, 0 },
-    [EX] = { "EX", cmd_type_none, false, 0, false, 0, 0 },
-    [FA] = { "FA", cmd_type_string, true, 11, false, 0,  0 },
-    [FB] = { "FB", cmd_type_string, true, 11, false, 0,  0 },
-    [FC] = { "FC", cmd_type_none, false, 0, false, 0, 0 },
-    [FD] = { "FD", cmd_type_none, false, 0, false, 0, 0 },
-    [FR] = { "FR", cmd_type_num, true, 1,  false, 0,  1 },
-    [FS] = { "FS", cmd_type_none, false, 0, false, 0, 0 },
-    [FT] = { "FT", cmd_type_num, true, 1,  false, 0,  1 },
-    [GT] = { "GT", cmd_type_num, true, 3,  false, 0,  5 },
-    [ID] = { "ID", cmd_type_none, true, 0,  false, 0,  0 },
-    [IF] = { "IF", cmd_type_string, true, 25, false, 0,  0 },
-    [IS] = { "IS", cmd_type_none, true, 0, false, 0, 0 },
-    [KS] = { "KS", cmd_type_num, true, 3,  false, 10, 60 },
-    [KY] = { "KY", cmd_type_string, true, 25, false, 0,  0 },
-    [LK] = { "LK", cmd_type_bool, true, 1, false, 0, 1 },
-    [LM] = { "LM", cmd_type_none, false, 0, false, 0, 0 },
-    [LT] = { "LT", cmd_type_none, false, 0, false, 0, 0 },
-    [MC] = { "MC", cmd_type_none, false, 0, false, 0, 0 },
-    [MD] = { "MD", cmd_type_num, true, 1,  false, 1,  9 },
-    [MF] = { "MF", cmd_type_none, false, 0, false, 0, 0 },
-    [MG] = { "MG", cmd_type_num, true, 3,  false, 1,  100 },
-    [ML] = { "ML", cmd_type_none, false, 0, false, 0, 0 },
-    [MO] = { "MO", cmd_type_bool, false, 0,  false, 0,  0 },
-    [MR] = { "MR", cmd_type_none, false, 0, false, 0, 0 },
-    [MU] = { "MU", cmd_type_none, false, 0, false, 0, 0 },
-    [MW] = { "MW", cmd_type_none, false, 0, false, 0, 0 },
-    [NB] = { "NB", cmd_type_bool, true, 1,  false, 0,  1 },
-    [NL] = { "NL", cmd_type_none, false, 0, false, 0, 0 },
-    [NR] = { "NR", cmd_type_none, true, 0, false, 0, 0 },
-    [NT] = { "NT", cmd_type_bool, true, 1,  false, 0, 1 },
-    [OF] = { "OF", cmd_type_none, false, 9,  false, 0, 0 }, // ignore
-    [OI] = { "OI", cmd_type_none, false, 0, false, 0, 0 },
-    [OS] = { "OS", cmd_type_num, false, 1,  false, 0, 2 },
-    [PA] = { "PA", cmd_type_num, true, 2, false, 0, 1 }, // preamp 
-    [PB] = { "PB", cmd_type_none, false, 0, false, 0, 0 },
-    [PC] = { "PC", cmd_type_num, true, 3,  false, 0, 100 },
-    [PI] = { "PI", cmd_type_none, false, 0, false, 0, 0 },
-    [PK] = { "PK", cmd_type_none, false, 0, false, 0, 0 },
-    [PL] = { "PL", cmd_type_none, false, 0, false, 0, 0 }, // speech proc - unimplemented
-    [PM] = { "PM", cmd_type_none, false, 0, false, 0, 0 },
-    [PR] = { "PR", cmd_type_num, false, 1,  false, 0, 0 },
-    [PS] = { "PS", cmd_type_num, true, 1,  false, 0, 1 },
-    [QC] = { "QC", cmd_type_none, false, 0, false, 0, 0 },
-    [QI] = { "QI", cmd_type_none, false, 0,  false, 0, 0 },
-    [QR] = { "QR", cmd_type_none, false, 0, false, 0, 0 },
-    [RA] = { "RA", cmd_type_none, false, 0, false, 0, 0},
-    [RC] = { "RC", cmd_type_none, true, 0,  false, 0, 0 },
-    [RD] = { "RD", cmd_type_none, false, 5,  false, 0, 0 }, // ignore
-    [RG] = { "RG", cmd_type_none, false, 0, false, 0, 0 },
-    [RL] = { "RL", cmd_type_none, false, 0, false, 0, 0 },
-    [RM] = { "RM", cmd_type_none, false, 0, false, 0, 0 },
-    [RT] = { "RT", cmd_type_bool, true, 1,  false, 0, 1 },
-    [RU] = { "RU", cmd_type_none, false, 5,  false, 0, 0 }, // ignore
-    [RX] = { "RX", cmd_type_none, true, 0,  false, 0, 0 },
-    [SA] = { "SA", cmd_type_none, false, 0, false, 0, 0 },
-    [SB] = { "SB", cmd_type_none, false, 0, false, 0, 0 },
-    [SC] = { "SC", cmd_type_none, false, 0, false, 0, 0 },
-    [SD] = { "SD", cmd_type_none, false, 0, false, 0, 0 },
-    [SH] = { "SH", cmd_type_num, true, 2,  false, 0, 11 },
-    [SI] = { "SI", cmd_type_none, false, 0, false, 0, 0 },
-    [SL] = { "SL", cmd_type_num, true, 2,  false, 0, 11 },
-    [SM] = { "SM", cmd_type_num, true, 4,  false, 0, 30 },
-    [SQ] = { "SQ", cmd_type_num, true, 3,  false, 0, 160 },
-    [SR] = { "SR", cmd_type_none, false, 0, false, 0, 0 },
-    [SS] = { "SS", cmd_type_none, false, 0, false, 0, 0 },
-    [ST] = { "ST", cmd_type_none, false, 0, false, 0, 0 },
-    [SU] = { "SU", cmd_type_none, false, 0, false, 0, 0 },
-    [SV] = { "SV", cmd_type_none, false, 0, false, 0, 0 },
-    [TC] = { "TC", cmd_type_none, false, 0, false, 0, 0 },
-    [TD] = { "TD", cmd_type_none, false, 0, false, 0, 0 },
-    [TI] = { "TI", cmd_type_none, false, 0, false, 0, 0 },
-    [TN] = { "TN", cmd_type_none, false, 0, false, 0, 0 },
-    [TO] = { "TO", cmd_type_none, false, 0, false, 0, 0 },
-    [TS] = { "TS", cmd_type_none, false, 0, false, 0, 0 },
-    [TX] = { "TX", cmd_type_none, true, 0, false, 0, 0 },
-    [TY] = { "TY", cmd_type_none, false, 0, false, 0, 0 },
-    [UL] = { "UL", cmd_type_none, false, 0, false, 0, 0 },
-    [UP] = { "UP", cmd_type_none, true, 0, false, 0, 0 },
-    [VD] = { "VD", cmd_type_none, false, 0, false, 0, 0 },
-    [VG] = { "VG", cmd_type_none, false, 0, false, 0, 0 },
-    [VR] = { "VR", cmd_type_none, false, 0, false, 0, 0 },
-    [VX] = { "VX", cmd_type_none, false, 0, false, 0, 0 },
-    [XT] = { "XT", cmd_type_bool, true, 1, false, 0, 1 },
+    [CMD_AC] = { "AC", cmd_type_none, false, 0, false, 0, 0 },
+    [CMD_AG] = { "AG", cmd_type_num, true, 3, false, 0, 255 },
+    [CMD_AI] = { "AI", cmd_type_bool, true, 1, false, 0, 1 },
+    [CMD_AL] = { "AL", cmd_type_none, false, 0, false, 0, 0 },
+    [CMD_AM] = { "AM", cmd_type_none, false, 0, false, 0, 0 },
+    [CMD_AN] = { "AN", cmd_type_none, false, 0, false, 0, 0 },
+    [CMD_AS] = { "AS", cmd_type_none, false, 0, false, 0, 0 },
+    [CMD_BC] = { "BC", cmd_type_none, false, 0, false, 0, 0 },
+    [CMD_BD] = { "BD", cmd_type_none, true, 0, false, 0, 0 },
+    [CMD_BP] = { "BP", cmd_type_none, false, 0, false, 0, 0 },
+    [CMD_BS] = { "BS", cmd_type_none, false, 0, false, 0, 0 },
+    [CMD_BU] = { "BU", cmd_type_none, true, 0, false, 0, 0 },
+    [CMD_BY] = { "BY", cmd_type_none, false, 0, false, 0, 0 },
+    [CMD_CA] = { "CA", cmd_type_none, false, 0, false, 0, 0 },
+    [CMD_CG] = { "CG", cmd_type_none, false, 0, false, 0, 0 },
+    [CMD_CI] = { "CI", cmd_type_none, false, 0, false, 0, 0 },
+    [CMD_CM] = { "CM", cmd_type_none, false, 0, false, 0, 0 },
+    [CMD_CN] = { "CN", cmd_type_num,  true, 2,  false, 1,  49 },
+    [CMD_CT] = { "CT", cmd_type_bool, true, 1,  false, 0,  1 },
+    [CMD_DC] = { "DC", cmd_type_none, false, 0, false, 0, 0 },
+    [CMD_DN] = { "DN", cmd_type_none, true, 0,  false, 0,  0 },
+    [CMD_DQ] = { "DQ", cmd_type_none, false, 0, false, 0, 0 },
+    [CMD_EX] = { "EX", cmd_type_none, false, 0, false, 0, 0 },
+    [CMD_FA] = { "FA", cmd_type_string, true, 11, false, 0,  0 },
+    [CMD_FB] = { "FB", cmd_type_string, true, 11, false, 0,  0 },
+    [CMD_FC] = { "FC", cmd_type_none, false, 0, false, 0, 0 },
+    [CMD_FD] = { "FD", cmd_type_none, false, 0, false, 0, 0 },
+    [CMD_FR] = { "FR", cmd_type_num, true, 1,  false, 0,  1 },
+    [CMD_FS] = { "FS", cmd_type_none, false, 0, false, 0, 0 },
+    [CMD_FT] = { "FT", cmd_type_num, true, 1,  false, 0,  1 },
+    [CMD_GT] = { "GT", cmd_type_num, true, 3,  false, 0,  5 },
+    [CMD_ID] = { "ID", cmd_type_none, true, 0,  false, 0,  0 },
+    [CMD_IF] = { "IF", cmd_type_string, true, 25, false, 0,  0 },
+    [CMD_IS] = { "IS", cmd_type_none, true, 0, false, 0, 0 },
+    [CMD_KS] = { "KS", cmd_type_num, true, 3,  false, 10, 60 },
+    [CMD_KY] = { "KY", cmd_type_string, true, 25, false, 0,  0 },
+    [CMD_LK] = { "LK", cmd_type_bool, true, 1, false, 0, 1 },
+    [CMD_LM] = { "LM", cmd_type_none, false, 0, false, 0, 0 },
+    [CMD_LT] = { "LT", cmd_type_none, false, 0, false, 0, 0 },
+    [CMD_MC] = { "MC", cmd_type_none, false, 0, false, 0, 0 },
+    [CMD_MD] = { "MD", cmd_type_num, true, 1,  false, 1,  9 },
+    [CMD_MF] = { "MF", cmd_type_none, false, 0, false, 0, 0 },
+    [CMD_MG] = { "MG", cmd_type_num, true, 3,  false, 1,  100 },
+    [CMD_ML] = { "ML", cmd_type_none, false, 0, false, 0, 0 },
+    [CMD_MO] = { "MO", cmd_type_bool, false, 0,  false, 0,  0 },
+    [CMD_MR] = { "MR", cmd_type_none, false, 0, false, 0, 0 },
+    [CMD_MU] = { "MU", cmd_type_none, false, 0, false, 0, 0 },
+    [CMD_MW] = { "MW", cmd_type_none, false, 0, false, 0, 0 },
+    [CMD_NB] = { "NB", cmd_type_bool, true, 1,  false, 0,  1 },
+    [CMD_NL] = { "NL", cmd_type_none, false, 0, false, 0, 0 },
+    [CMD_NR] = { "NR", cmd_type_none, true, 0, false, 0, 0 },
+    [CMD_NT] = { "NT", cmd_type_bool, true, 1,  false, 0, 1 },
+    [CMD_OF] = { "OF", cmd_type_none, false, 9,  false, 0, 0 }, // CMD_CMD_ignore
+    [CMD_OI] = { "OI", cmd_type_none, false, 0, false, 0, 0 },
+    [CMD_OS] = { "OS", cmd_type_num, false, 1,  false, 0, 2 },
+    [CMD_PA] = { "PA", cmd_type_num, true, 2, false, 0, 1 }, // CMD_CMD_CMD_preamp 
+    [CMD_PB] = { "PB", cmd_type_none, false, 0, false, 0, 0 },
+    [CMD_PC] = { "PC", cmd_type_num, true, 3,  false, 0, 100 },
+    [CMD_PI] = { "PI", cmd_type_none, false, 0, false, 0, 0 },
+    [CMD_PK] = { "PK", cmd_type_none, false, 0, false, 0, 0 },
+    [CMD_PL] = { "PL", cmd_type_none, false, 0, false, 0, 0 }, // speech CMD_proc - unimplemented
+    [CMD_PM] = { "PM", cmd_type_none, false, 0, false, 0, 0 },
+    [CMD_PR] = { "PR", cmd_type_num, false, 1,  false, 0, 0 },
+    [CMD_PS] = { "PS", cmd_type_num, true, 1,  false, 0, 1 },
+    [CMD_QC] = { "QC", cmd_type_none, false, 0, false, 0, 0 },
+    [CMD_QI] = { "QI", cmd_type_none, false, 0,  false, 0, 0 },
+    [CMD_QR] = { "QR", cmd_type_none, false, 0, false, 0, 0 },
+    [CMD_RA] = { "RA", cmd_type_none, false, 0, false, 0, 0},
+    [CMD_RC] = { "RC", cmd_type_none, true, 0,  false, 0, 0 },
+    [CMD_RD] = { "RD", cmd_type_none, false, 5,  false, 0, 0 }, // CMD_CMD_ignore
+    [CMD_RG] = { "RG", cmd_type_none, false, 0, false, 0, 0 },
+    [CMD_RL] = { "RL", cmd_type_none, false, 0, false, 0, 0 },
+    [CMD_RM] = { "RM", cmd_type_none, false, 0, false, 0, 0 },
+    [CMD_RT] = { "RT", cmd_type_bool, true, 1,  false, 0, 1 },
+    [CMD_RU] = { "RU", cmd_type_none, false, 5,  false, 0, 0 }, // CMD_CMD_CMD_ignore
+    [CMD_RX] = { "RX", cmd_type_none, true, 0,  false, 0, 0 },
+    [CMD_SA] = { "SA", cmd_type_none, false, 0, false, 0, 0 },
+    [CMD_SB] = { "SB", cmd_type_none, false, 0, false, 0, 0 },
+    [CMD_SC] = { "SC", cmd_type_none, false, 0, false, 0, 0 },
+    [CMD_SD] = { "SD", cmd_type_none, false, 0, false, 0, 0 },
+    [CMD_SH] = { "SH", cmd_type_num, true, 2,  false, 0, 11 },
+    [CMD_SI] = { "SI", cmd_type_none, false, 0, false, 0, 0 },
+    [CMD_SL] = { "SL", cmd_type_num, true, 2,  false, 0, 11 },
+    [CMD_SM] = { "SM", cmd_type_num, true, 4,  false, 0, 30 },
+    [CMD_SQ] = { "SQ", cmd_type_num, true, 3,  false, 0, 160 },
+    [CMD_SR] = { "SR", cmd_type_none, false, 0, false, 0, 0 },
+    [CMD_SS] = { "SS", cmd_type_none, false, 0, false, 0, 0 },
+    [CMD_ST] = { "ST", cmd_type_none, false, 0, false, 0, 0 },
+    [CMD_SU] = { "SU", cmd_type_none, false, 0, false, 0, 0 },
+    [CMD_SV] = { "SV", cmd_type_none, false, 0, false, 0, 0 },
+    [CMD_TC] = { "TC", cmd_type_none, false, 0, false, 0, 0 },
+    [CMD_TD] = { "TD", cmd_type_none, false, 0, false, 0, 0 },
+    [CMD_TI] = { "TI", cmd_type_none, false, 0, false, 0, 0 },
+    [CMD_TN] = { "TN", cmd_type_none, false, 0, false, 0, 0 },
+    [CMD_TO] = { "TO", cmd_type_none, false, 0, false, 0, 0 },
+    [CMD_TS] = { "TS", cmd_type_none, false, 0, false, 0, 0 },
+    [CMD_TX] = { "TX", cmd_type_none, true, 0, false, 0, 0 },
+    [CMD_TY] = { "TY", cmd_type_none, false, 0, false, 0, 0 },
+    [CMD_UL] = { "UL", cmd_type_none, false, 0, false, 0, 0 },
+    [CMD_UP] = { "UP", cmd_type_none, true, 0, false, 0, 0 },
+    [CMD_VD] = { "VD", cmd_type_none, false, 0, false, 0, 0 },
+    [CMD_VG] = { "VG", cmd_type_none, false, 0, false, 0, 0 },
+    [CMD_VR] = { "VR", cmd_type_none, false, 0, false, 0, 0 },
+    [CMD_VX] = { "VX", cmd_type_none, false, 0, false, 0, 0 },
+    [CMD_XT] = { "XT", cmd_type_bool, true, 1, false, 0, 1 },
 };
 
 void close_rigctl_ports() {

diff --git a/rigctl.h b/rigctl.h
index 868fc49e0ddd37f48ae41e6e4b40c2772b16906f..f0b4d3163d65aaf64dab4f48a6c18d19efc1ff03 100644 (file)
--- a/rigctl.h
+++ b/rigctl.h
@@ -38,111 +38,111 @@ typedef struct cat_command {
 
 enum cmds {
     // #S
-    AC = 1,
-    AG,
-    AI,
-    AL,
-    AM,
-    AN,
-    AS,
-    BC,
-    BD,
-    BP,
-    BS,
-    BU,
-    BY,
-    CA,
-    CG,
-    CI,
-    CM,
-    CN,
-    CT,
-    DC,
-    DN,
-    DQ,
-    EX,
-    FA,
-    FB,
-    FC,
-    FD,
-    FR,
-    FS,
-    FT,
-    GT,
-    ID,
-    IF,
-    IS,
-    KS,
-    KY,
-    LK,
-    LM,
-    LT,
-    MC,
-    MD,
-    MF,
-    MG,
-    ML,
-    MO,
-    MR,
-    MU,
-    MW,
-    NB,
-    NL,
-    NR,
-    NT,
-    OF,
-    OI,
-    OS,
-    PA,
-    PB,
-    PC,
-    PI,
-    PK,
-    PL,
-    PM,
-    PR,
-    PS,
-    QC,
-    QI,
-    QR,
-    RA,
-    RC,
-    RD,
-    RG,
-    RL,
-    RM,
-    RT,
-    RU,
-    RX,
-    SA,
-    SB,
-    SC,
-    SD,
-    SH,
-    SI,
-    SL,
-    SM,
-    SQ,
-    SR,
-    SS,
-    ST,
-    SU,
-    SV,
-    TC,
-    TD,
-    TI,
-    TN,
-    TO,
-    TS,
-    TX,
-    TY,
-    UL,
-    UP,
-    VD,
-    VG,
-    VR,
-    VX,
-    XT,
+    CMD_AC = 1,
+    CMD_AG,
+    CMD_AI,
+    CMD_AL,
+    CMD_AM,
+    CMD_AN,
+    CMD_AS,
+    CMD_BC,
+    CMD_BD,
+    CMD_BP,
+    CMD_BS,
+    CMD_BU,
+    CMD_BY,
+    CMD_CA,
+    CMD_CG,
+    CMD_CI,
+    CMD_CM,
+    CMD_CN,
+    CMD_CT,
+    CMD_DC,
+    CMD_DN,
+    CMD_DQ,
+    CMD_EX,
+    CMD_FA,
+    CMD_FB,
+    CMD_FC,
+    CMD_FD,
+    CMD_FR,
+    CMD_FS,
+    CMD_FT,
+    CMD_GT,
+    CMD_ID,
+    CMD_IF,
+    CMD_IS,
+    CMD_KS,
+    CMD_KY,
+    CMD_LK,
+    CMD_LM,
+    CMD_LT,
+    CMD_MC,
+    CMD_MD,
+    CMD_MF,
+    CMD_MG,
+    CMD_ML,
+    CMD_MO,
+    CMD_MR,
+    CMD_MU,
+    CMD_MW,
+    CMD_NB,
+    CMD_NL,
+    CMD_NR,
+    CMD_NT,
+    CMD_OF,
+    CMD_OI,
+    CMD_OS,
+    CMD_PA,
+    CMD_PB,
+    CMD_PC,
+    CMD_PI,
+    CMD_PK,
+    CMD_PL,
+    CMD_PM,
+    CMD_PR,
+    CMD_PS,
+    CMD_QC,
+    CMD_QI,
+    CMD_QR,
+    CMD_RA,
+    CMD_RC,
+    CMD_RD,
+    CMD_RG,
+    CMD_RL,
+    CMD_RM,
+    CMD_RT,
+    CMD_RU,
+    CMD_RX,
+    CMD_SA,
+    CMD_SB,
+    CMD_SC,
+    CMD_SD,
+    CMD_SH,
+    CMD_SI,
+    CMD_SL,
+    CMD_SM,
+    CMD_SQ,
+    CMD_SR,
+    CMD_SS,
+    CMD_ST,
+    CMD_SU,
+    CMD_SV,
+    CMD_TC,
+    CMD_TD,
+    CMD_TI,
+    CMD_TN,
+    CMD_TO,
+    CMD_TS,
+    CMD_TX,
+    CMD_TY,
+    CMD_UL,
+    CMD_UP,
+    CMD_VD,
+    CMD_VG,
+    CMD_VR,
+    CMD_VX,
+    CMD_XT,
     NUM_CMDS, // define new commands above this line
 };