From 1f3360e11d6f624483efbe32b6348be1f2b1aa7f Mon Sep 17 00:00:00 2001 From: Mike Black W9MDB Date: Tue, 10 Sep 2024 22:36:55 -0500 Subject: [PATCH] Fix compile warnings in k3.c for MacOS --- rigs/kenwood/k3.c | 8 ++++++++ rigs/kenwood/level_gran_elecraft.h | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/rigs/kenwood/k3.c b/rigs/kenwood/k3.c index 636b1ba3c..02e3abd98 100644 --- a/rigs/kenwood/k3.c +++ b/rigs/kenwood/k3.c @@ -569,7 +569,15 @@ struct rig_caps k4_caps = .has_get_parm = RIG_PARM_NONE, .has_set_parm = RIG_PARM_NONE, /* FIXME: parms */ .level_gran = { +#define NO_LVL_ATT +#define NO_LVL_CWPITCH +#define NO_LVL_VOXDELAY +#define NO_LVL_PREAMP #include "level_gran_elecraft.h" +#undef NO_LVL_ATT +#undef NO_LVL_CWPITCH +#undef NO_LVL_VOXDELAY +#undef NO_LVL_PREAMP [LVL_CWPITCH] = { .min = { .i = 250 }, .max = { .i = 950 }, .step = { .i = 10 } }, [LVL_ATT] = { .min = { .i = 0 }, .max = { .i = 15 }, .step = { .i = 5 } }, [LVL_VOXDELAY] = { .min = { .i = 0 }, .max = { .i = 255 }, .step = { .i = 10 } }, diff --git a/rigs/kenwood/level_gran_elecraft.h b/rigs/kenwood/level_gran_elecraft.h index 4e3a24498..4e7d3c357 100644 --- a/rigs/kenwood/level_gran_elecraft.h +++ b/rigs/kenwood/level_gran_elecraft.h @@ -4,16 +4,24 @@ /* raw data */ [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } }, /* levels with dB units */ +#if !defined(NO_LVL_PREAMP) [LVL_PREAMP] = { .min = { .i = 0 }, .max = { .i = 20 }, .step = { .i = 10 } }, +#endif +#if !defined(NO_LVL_ATT) [LVL_ATT] = { .min = { .i = 0 }, .max = { .i = 10 }, .step = { .i = 10 } }, +#endif [LVL_STRENGTH] = { .min = { .i = 0 }, .max = { .i = 60 }, .step = { .i = 0 } }, [LVL_NB] = { .min = { .f = 0 }, .max = { .f = 10 }, .step = { .f = 1 } }, /* levels with WPM units */ [LVL_KEYSPD] = { .min = { .i = 8 }, .max = { .i = 50 }, .step = { .i = 1 } }, /* levels with Hz units */ +#if !defined(NO_LVL_CWPITCH) [LVL_CWPITCH] = { .min = { .i = 300 }, .max = { .i = 800 }, .step = { .i = 10 } }, +#endif /* levels with time units */ +#if !defined(NO_LVL_CWPITCH) [LVL_VOXDELAY] = { .min = { .i = 0 }, .max = { .i = 255 }, .step = { .i = 50 } }, +#endif /* levels with 0-1 values -- increment based on rig's range */ [LVL_NR] = { .min = { .f = 0 }, .max = { .f = 1 }, .step = { .f = 1.0f/10.0f } }, [LVL_AF] = { .min = { .f = 0 }, .max = { .f = 1.0 }, .step = { .f = 1.0f/255.0f } },