mirror/SDR-DAB_dabradio
1
0
Fork 0
mirror of https://github.com/JvanKatwijk/dabradio synced 2025-10-06 00:02:49 +02:00
Code Issues Releases Wiki Activity

adapted to mirsdr-api 1.23

Browse Source
This commit is contained in:
JvanKatwijk
2018-07-16 17:51:24 +02:00
parent 99529969bd
commit 9836c7d267
4 changed files with 52 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
devices/sdrplay-handler/mirsdrapi-rsp.h
View File

@@ -15,7 +15,7 @@
// Application code should check that it is compiled against the same API version
// mir_sdr_ApiVersion() returns the API version
#define MIR_SDR_API_VERSION (float)(2.09)
#define MIR_SDR_API_VERSION (float)(2.13)
#if defined(ANDROID) || defined(__ANDROID__)
// Android requires a mechanism to request info from Java application
@@ -24,10 +24,14 @@ typedef enum
mir_sdr_GetFd = 0,
mir_sdr_FreeFd = 1,
mir_sdr_DevNotFound = 2,
mir_sdr_DevRemoved = 3
mir_sdr_DevRemoved = 3,
mir_sdr_GetVendorId = 4,
mir_sdr_GetProductId = 5,
mir_sdr_GetRevId = 6,
mir_sdr_GetDeviceId = 7
} mir_sdr_JavaReqT;
typedef int (*mir_sdr_SendJavaReq_t)(mir_sdr_JavaReqT cmd, int param);
typedef int (*mir_sdr_SendJavaReq_t)(mir_sdr_JavaReqT cmd, char *path, char *serNum);
#endif
typedef enum
@@ -45,7 +49,8 @@ typedef enum
mir_sdr_NotInitialised = 10,
mir_sdr_NotEnabled = 11,
mir_sdr_HwVerError = 12,
mir_sdr_OutOfMemError = 13
mir_sdr_OutOfMemError = 13,
mir_sdr_HwRemoved = 14
} mir_sdr_ErrT;
typedef enum
@@ -173,8 +178,14 @@ typedef struct
float min;
} mir_sdr_GainValuesT;
typedef enum
{
mir_sdr_rspDuo_Tuner_1 = 1,
mir_sdr_rspDuo_Tuner_2 = 2,
} mir_sdr_rspDuo_TunerSelT;
// mir_sdr_StreamInit() callback function prototypes
typedef void (*mir_sdr_StreamCallback_t)(short *xi, short *xq, unsigned int firstSampleNum, int grChanged, int rfChanged, int fsChanged, unsigned int numSamples, unsigned int reset, void *cbContext);
typedef void (*mir_sdr_StreamCallback_t)(short *xi, short *xq, unsigned int firstSampleNum, int grChanged, int rfChanged, int fsChanged, unsigned int numSamples, unsigned int reset, unsigned int hwRemoved, void *cbContext);
typedef void (*mir_sdr_GainChangeCallback_t)(unsigned int gRdB, unsigned int lnaGRdB, void *cbContext);
typedef mir_sdr_ErrT (*mir_sdr_Init_t)(int gRdB, double fsMHz, double rfMHz, mir_sdr_Bw_MHzT bwType, mir_sdr_If_kHzT ifType, int *samplesPerPacket);
@@ -208,6 +219,7 @@ typedef mir_sdr_ErrT (*mir_sdr_Reinit_t)(int *gRdB, double fsMHz, double rfMHz,
typedef mir_sdr_ErrT (*mir_sdr_GetGrByFreq_t)(double rfMHz, mir_sdr_BandT *band, int *gRdB, int LNAstate, int *gRdBsystem, mir_sdr_SetGrModeT setGrMode);
typedef mir_sdr_ErrT (*mir_sdr_DebugEnable_t)(unsigned int enable);
typedef mir_sdr_ErrT (*mir_sdr_GetCurrentGain_t)(mir_sdr_GainValuesT *gainVals);
typedef mir_sdr_ErrT (*mir_sdr_GainChangeCallbackMessageReceived_t)(void);
typedef mir_sdr_ErrT (*mir_sdr_GetDevices_t)(mir_sdr_DeviceT *devices, unsigned int *numDevs, unsigned int maxDevs);
typedef mir_sdr_ErrT (*mir_sdr_SetDeviceIdx_t)(unsigned int idx);
@@ -223,6 +235,17 @@ typedef mir_sdr_ErrT (*mir_sdr_RSP_SetGrLimits_t)(mir_sdr_MinGainReductionT minG
typedef mir_sdr_ErrT (*mir_sdr_AmPortSelect_t)(int port);
typedef mir_sdr_ErrT (*mir_sdr_rsp1a_BiasT_t)(int enable);
typedef mir_sdr_ErrT (*mir_sdr_rsp1a_DabNotch_t)(int enable);
typedef mir_sdr_ErrT (*mir_sdr_rsp1a_BroadcastNotch_t)(int enable);
typedef mir_sdr_ErrT (*mir_sdr_rspDuo_TunerSel_t)(mir_sdr_rspDuo_TunerSelT sel);
typedef mir_sdr_ErrT (*mir_sdr_rspDuo_ExtRef_t)(int enable);
typedef mir_sdr_ErrT (*mir_sdr_rspDuo_BiasT_t)(int enable);
typedef mir_sdr_ErrT (*mir_sdr_rspDuo_Tuner1AmNotch_t)(int enable);
typedef mir_sdr_ErrT (*mir_sdr_rspDuo_BroadcastNotch_t)(int enable);
typedef mir_sdr_ErrT (*mir_sdr_rspDuo_DabNotch_t)(int enable);
// API function definitions
#ifdef __cplusplus
extern "C"
@@ -288,9 +311,10 @@ extern "C"
_MIR_SDR_QUALIFIER mir_sdr_ErrT mir_sdr_StreamInit(int *gRdB, double fsMHz, double rfMHz, mir_sdr_Bw_MHzT bwType, mir_sdr_If_kHzT ifType, int LNAstate, int *gRdBsystem, mir_sdr_SetGrModeT setGrMode, int *samplesPerPacket, mir_sdr_StreamCallback_t StreamCbFn, mir_sdr_GainChangeCallback_t GainChangeCbFn, void *cbContext);
_MIR_SDR_QUALIFIER mir_sdr_ErrT mir_sdr_StreamUninit(void);
_MIR_SDR_QUALIFIER mir_sdr_ErrT mir_sdr_Reinit(int *gRdB, double fsMHz, double rfMHz, mir_sdr_Bw_MHzT bwType, mir_sdr_If_kHzT ifType, mir_sdr_LoModeT loMode, int LNAstate, int *gRdBsystem, mir_sdr_SetGrModeT setGrMode, int *samplesPerPacket, mir_sdr_ReasonForReinitT reasonForReinit);
_MIR_SDR_QUALIFIER mir_sdr_ErrT mir_sdr_GetGrByFreq(double rfMHz, mir_sdr_BandT *band, int *gRdB, int LNAstate, int *gRdBsystem, mir_sdr_SetGrModeT setGrMode);
_MIR_SDR_QUALIFIER mir_sdr_ErrT mir_sdr_DebugEnable(unsigned int enable);
_MIR_SDR_QUALIFIER mir_sdr_ErrT mir_sdr_GetCurrentGain(mir_sdr_GainValuesT *gainVals);
_MIR_SDR_QUALIFIER mir_sdr_ErrT mir_sdr_GetGrByFreq(double rfMHz, mir_sdr_BandT *band, int *gRdB, int LNAstate, int *gRdBsystem, mir_sdr_SetGrModeT setGrMode);
_MIR_SDR_QUALIFIER mir_sdr_ErrT mir_sdr_DebugEnable(unsigned int enable);
_MIR_SDR_QUALIFIER mir_sdr_ErrT mir_sdr_GetCurrentGain(mir_sdr_GainValuesT *gainVals);
_MIR_SDR_QUALIFIER mir_sdr_ErrT mir_sdr_GainChangeCallbackMessageReceived(void);
_MIR_SDR_QUALIFIER mir_sdr_ErrT mir_sdr_GetDevices(mir_sdr_DeviceT *devices, unsigned int *numDevs, unsigned int maxDevs);
_MIR_SDR_QUALIFIER mir_sdr_ErrT mir_sdr_SetDeviceIdx(unsigned int idx);
@@ -311,6 +335,18 @@ extern "C"
_MIR_SDR_QUALIFIER mir_sdr_ErrT mir_sdr_AmPortSelect(int port); // If called after mir_sdr_Init() a call to mir_sdr_Reinit(..., reasonForReinit = mir_sdr_CHANGE_AM_PORT)
// is also required to change the port
_MIR_SDR_QUALIFIER mir_sdr_ErrT mir_sdr_rsp1a_BiasT(int enable);
_MIR_SDR_QUALIFIER mir_sdr_ErrT mir_sdr_rsp1a_DabNotch(int enable);
_MIR_SDR_QUALIFIER mir_sdr_ErrT mir_sdr_rsp1a_BroadcastNotch(int enable);
_MIR_SDR_QUALIFIER mir_sdr_ErrT mir_sdr_rspDuo_TunerSel(mir_sdr_rspDuo_TunerSelT sel);
_MIR_SDR_QUALIFIER mir_sdr_ErrT mir_sdr_rspDuo_ExtRef(int enable);
_MIR_SDR_QUALIFIER mir_sdr_ErrT mir_sdr_rspDuo_BiasT(int enable);
_MIR_SDR_QUALIFIER mir_sdr_ErrT mir_sdr_rspDuo_Tuner1AmNotch(int enable);
_MIR_SDR_QUALIFIER mir_sdr_ErrT mir_sdr_rspDuo_BroadcastNotch(int enable);
_MIR_SDR_QUALIFIER mir_sdr_ErrT mir_sdr_rspDuo_DabNotch(int enable);
#ifdef __cplusplus
}
#endif

8
devices/sdrplay-handler/sdrplay-handler.cpp
View File

@@ -97,8 +97,8 @@ ULONG APIkeyValue_length = 255;
}
err = my_mir_sdr_ApiVersion (&ver);
if (ver < 2.05) {
fprintf (stderr, "sorry, library too old\n");
if (ver < 2.13) {
fprintf (stderr, "please install mir_sdr library >= 2.13\n");
#ifdef __MINGW32__
FreeLibrary (Handle);
#else
@@ -242,6 +242,7 @@ void myStreamCallback (int16_t *xi,
int32_t fsChanged,
uint32_t numSamples,
uint32_t reset,
uint32_t hwRemoved,
void *cbContext) {
int16_t i;
sdrplayHandler *p = static_cast<sdrplayHandler *> (cbContext);
@@ -249,6 +250,9 @@ float denominator = p -> denominator;
std::complex<float> *localBuf =
(std::complex<float> *)alloca (numSamples * sizeof (std::complex<float>));
if (reset || hwRemoved)
return;
for (i = 0; i < (int)numSamples; i ++)
localBuf [i] = std::complex<float> (float (xi [i]) / denominator,
float (xq [i]) / denominator);

1
devices/sdrplay-handler/sdrplay-handler.h
View File

@@ -37,6 +37,7 @@ typedef void (*mir_sdr_StreamCallback_t)(int16_t *xi,
int32_t fsChanged,
uint32_t numSamples,
uint32_t reset,
uint32_t hwRemoved,
void *cbContext);
typedef void (*mir_sdr_GainChangeCallback_t)(uint32_t gRdB,
uint32_t lnaGRdB,

1
radio.cpp
View File

@@ -281,6 +281,7 @@ void RadioInterface::nextChannel (void) {
this, SLOT (reset (void)));
return;
}
int tunedFrequency =
theBand -> Frequency (channelNumber);
QString text = "scanning ch ";