hamradio/Hamlib
1
0
Fork 0
mirror of https://github.com/Hamlib/Hamlib.git synced 2024-09-21 10:27:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix compile warnings in ft950.c for MacOS

Browse Source
This commit is contained in:
Mike Black W9MDB 2024-09-10 23:02:04 -05:00
parent 5f1c2b1348
commit a9f4a35c7d
2 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rigs/yaesu/ft950.c
View File

@ -107,7 +107,15 @@ struct rig_caps ft950_caps =
.has_set_parm = RIG_PARM_BANDSELECT,
.level_gran =
{
#define NO_LVL_CWPITCH
#define NO_LVL_KEYSPD
#define NO_LVL_NOTCHF
#define NO_LVL_RFPOWER
#include "level_gran_yaesu.h"
#undef NO_LVL_CWPITCH
#undef NO_LVL_KEYSPD
#undef NO_LVL_NOTCHF
#undef NO_LVL_RFPOWER
[LVL_CWPITCH] = { .min = { .i = 300 }, .max = { .i = 1050 }, .step = { .i = 50 } },
[LVL_KEYSPD] = { .min = { .i = 4 }, .max = { .i = 60 }, .step = { .i = 1 } },
[LVL_NOTCHF] = { .min = { .i = 1 }, .max = { .i = 3000 }, .step = { .i = 10 } },

24
rigs/yaesu/level_gran_yaesu.h
View File

@ -9,11 +9,17 @@
[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 */
#if !defined(LVL_KEYSPD)
[LVL_KEYSPD] = { .min = { .i = 4 }, .max = { .i = 60 }, .step = { .i = 1 } },
#endif
/* levels with Hz units */
#if !defined(NO_LVL_CWPITCH)
[LVL_CWPITCH] = { .min = { .i = 300 }, .max = { .i = 1050 }, .step = { .i = 10 } },
#endif
[LVL_IF] = { .min = { .i = -1200 }, .max = { .i = 1200 }, .step = { .i = 20 } },
#if !defined(NO_LVL_NOTCHF)
[LVL_NOTCHF] = { .min = { .i = 1 }, .max = { .i = 3200 }, .step = { .i = 10 } },
#endif
/* levels with time units */
[LVL_VOXDELAY] = { .min = { .i = 3 }, .max = { .i = 300 }, .step = { .i = 1 } },
[LVL_BKINDL] = { .min = { .i = 30 }, .max = { .i = 3000 }, .step = { .i = 1 } },
@ -24,20 +30,38 @@
[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 } },
// most recent rigs seem to have 15 as the maximum -- other values can be set in the backend
#if !defined(NO_LVL_NR)
[LVL_NR] = { .min = { .f = 0 }, .max = { .f = 1 }, .step = { .f = 1.0f/15.0f } },
#endif
/* levels with 0-1 values -- increment based on rig's range */
#if !defined(NO_LVL_AF)
[LVL_AF] = { .min = { .f = 0 }, .max = { .f = 1 }, .step = { .f = 1.0f/255.0f } },
#endif
#if !defined(NO_LVL_RF)
[LVL_RF] = { .min = { .f = 0 }, .max = { .f = 1 }, .step = { .f = 1.0f/255.0f } },
#endif
#if !defined(NO_LVL_RFPOWER)
[LVL_RFPOWER] = { .min = { .f = 5.0/255.0 }, .max = { .f = 1 }, .step = { .f = 1.0f/255.0f } },
#endif
[LVL_RFPOWER_METER] = { .min = { .f = 0 }, .max = { .f = 1 }, .step = { .f = 1.0f/255.0f } },
[LVL_COMP_METER] = { .min = { .f = 0 }, .max = { .f = 1 }, .step = { .f = 1.0f/255.0f } },
[LVL_ID_METER] = { .min = { .f = 0 }, .max = { .f = 1 }, .step = { .f = 1.0f/255.0f } },
[LVL_VD_METER] = { .min = { .f = 0 }, .max = { .f = 1 }, .step = { .f = 1.0f/255.0f } },
#if !defined(NO_LVL_SQL)
[LVL_SQL] = { .min = { .f = 0 }, .max = { .f = 1 }, .step = { .f = 1.0f/255.0f } },
#endif
#if !defined(NO_LVL_MICGAIN)
[LVL_MICGAIN] = { .min = { .f = 0 }, .max = { .f = 1 }, .step = { .f = 1.0f/255.0f } },
#endif
#if !defined(NO_LVL_MONITOR_GAIN)
[LVL_MONITOR_GAIN] = { .min = { .f = 0 }, .max = { .f = 1 }, .step = { .f = 1.0f/255.0f } },
#endif
#if !defined(NO_LVL_COMP)
[LVL_COMP] = { .min = { .f = 0 }, .max = { .f = 1 }, .step = { .f = 1.0f/100.0f } },
#endif
#if !defined(NO_LVL_VOXGAIN)
[LVL_VOXGAIN] = { .min = { .f = 0 }, .max = { .f = 1 }, .step = { .f = 1.0f/100.0f } },
#endif
[LVL_ANTIVOX] = { .min = { .f = 0 }, .max = { .f = 1 }, .step = { .f = 1.0f/100.0f } },
[LVL_ALC] = { .min = { .f = 0 }, .max = { .f = 1 }, .step = { .f = 1.0f/100.0f } },