VE7UWU
/
sdrangel
mirror of https://github.com/f4exb/sdrangel.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Airspy input: implemeted WEB API (2)

This commit is contained in:
f4exb 2018-05-25 22:39:38 +02:00
parent 3203a5511d
commit 83c0935e41
2 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sdrbase/webapi/webapirequestmapper.cpp
View File

@ -1681,6 +1681,21 @@ bool WebAPIRequestMapper::validateDeviceSettings(
return false;
}
}
else if ((*deviceHwType == "Airspy") && (deviceSettings.getTx() == 0))
{
if (jsonObject.contains("airspySettings") && jsonObject["airspySettings"].isObject())
{
QJsonObject airspySettingsJsonObject = jsonObject["airspySettings"].toObject();
deviceSettingsKeys = airspySettingsJsonObject.keys();
deviceSettings.setAirspySettings(new SWGSDRangel::SWGAirspySettings());
deviceSettings.getAirspySettings()->fromJsonObject(airspySettingsJsonObject);
return true;
}
else
{
return false;
}
}
else if ((*deviceHwType == "AirspyHF") && (deviceSettings.getTx() == 0))
{
if (jsonObject.contains("airspyHFSettings") && jsonObject["airspyHFSettings"].isObject())

14
swagger/sdrangel/examples/rx_test.py
View File

@ -97,7 +97,19 @@ def setupDevice(deviceset_url, options):
if settings is None:
exit(-1)
if options.device_hwid == "AirspyHF":
if options.device_hwid == "Airspy":
settings["airspySettings"]["centerFrequency"] = options.device_freq*1000
settings["airspySettings"]["devSampleRateIndex"] = 1
settings['airspySettings']['log2Decim'] = options.log2_decim
settings['airspySettings']['fcPos'] = options.fc_pos
settings['airspySettings']['dcBlock'] = options.fc_pos == 2
settings['airspySettings']['iqImbalance'] = options.fc_pos == 2
settings['airspySettings']['lnaGain'] = 14
settings['airspySettings']['mixerGain'] = 15
settings['airspySettings']['vgaGain'] = 4
settings['airspySettings']['lnaAGC'] = 1
settings['airspySettings']['mixerAGC'] = 1
elif options.device_hwid == "AirspyHF":
if options.device_freq > 30000:
settings["airspyHFSettings"]["bandIndex"] = 1
else: