Fix compile warnings in ts2000.c for MacOS

pull/1610/head
Mike Black W9MDB 2024-09-10 17:50:46 -05:00
rodzic 82c03a80fc
commit ed7b65d58c
2 zmienionych plików z 30 dodań i 0 usunięć

Wyświetl plik

@ -17,14 +17,20 @@
#endif
[LVL_IF] = { .min = { .i = -1000 }, .max = { .i = 1000 }, .step = { .i = 1 } },
[LVL_NOTCHF] = { .min = { .i = 1 }, .max = { .i = 3200 }, .step = { .i = 10 } },
#if !defined(NO_LVL_SLOPE_LOW)
[LVL_SLOPE_LOW] = { .min = { .i = 10}, .max = { .i = 1000 }, .step = { .i = 50 } },
#endif
#if !defined(NO_LVL_SLOPE_HIGH)
[LVL_SLOPE_HIGH] = { .min = { .i = 1000 }, .max = { .i = 5000 }, .step = { .i = 10 } },
#endif
/* levels with time units */
#if !defined(NO_LVL_VOXDELAY)
[LVL_VOXDELAY] = { .min = { .i = 3 }, .max = { .i = 300 }, .step = { .i = 1 } },
#endif
[LVL_BKINDL] = { .min = { .i = 30 }, .max = { .i = 3000 }, .step = { .i = 1 } },
#if !defined(NO_LVL_BKIN_DLYMS)
[LVL_BKIN_DLYMS] = { .min = { .i = 30 }, .max = { .i = 3000 }, .step = { .i = 1 } },
#endif
/* level with misc units */
[LVL_SWR] = { .min = { .f = 0 }, .max = { .f = 5.0 }, .step = { .f = 1.0f/255.0f } },
[LVL_BAND_SELECT] = { .min = { .i = 0 }, .max = { .i = 16 }, .step = { .i = 1 } },

Wyświetl plik

@ -1704,7 +1704,19 @@ struct rig_caps ts2000_caps =
.has_set_parm = RIG_PARM_NONE,
.level_gran =
{
#define NO_LVL_VOXDELAY
#define NO_LVL_KEYSPD
#define NO_LVL_CWPITCH
#define NO_LVL_BKIN_DLYMS
#define NO_LVL_SLOPE_LOW
#define NO_LVL_SLOPE_HIGH
#include "level_gran_kenwood.h"
#undef NO_LVL_VOXDELAY
#undef NO_LVL_KEYSPD
#undef NO_LVL_CWPITCH
#undef NO_LVL_BKIN_DLYMS
#undef NO_LVL_SLOPE_LOW
#undef NO_LVL_SLOPE_HIGH
[LVL_VOXDELAY] = { .min = { .i = 0 }, .max = { .i = 30 }, .step = { .i = 1 } },
[LVL_KEYSPD] = {.min = {.i = 10}, .max = {.i = 60}, .step = {.i = 1}},
[LVL_CWPITCH] = {.min = {.i = 400}, .max = {.i = 1000}, .step = {.i = 50}},
@ -1950,7 +1962,19 @@ struct rig_caps sdrconsole_caps =
.has_set_parm = RIG_PARM_NONE,
.level_gran =
{
#define NO_LVL_VOXDELAY
#define NO_LVL_KEYSPD
#define NO_LVL_CWPITCH
#define NO_LVL_BKIN_DLYMS
#define NO_LVL_SLOPE_LOW
#define NO_LVL_SLOPE_HIGH
#include "level_gran_kenwood.h"
#undef NO_LVL_VOXDELAY
#undef NO_LVL_KEYSPD
#undef NO_LVL_CWPITCH
#undef NO_LVL_BKIN_DLYMS
#undef NO_LVL_SLOPE_LOW
#undef NO_LVL_SLOPE_HIGH
[LVL_VOXDELAY] = { .min = { .i = 0 }, .max = { .i = 30 }, .step = { .i = 1 } },
[LVL_KEYSPD] = {.min = {.i = 10}, .max = {.i = 60}, .step = {.i = 1}},
[LVL_CWPITCH] = {.min = {.i = 400}, .max = {.i = 1000}, .step = {.i = 50}},