Web API: /sdrangel/deviceset/{deviceSetIndex}/channel (POST) fix and example

pull/127/head
f4exb 2017-12-11 01:36:34 +01:00
rodzic 0e3b558141
commit a513bd62b5
2 zmienionych plików z 53 dodań i 1 usunięć

Wyświetl plik

@ -797,7 +797,7 @@ void WebAPIRequestMapper::devicesetChannelService(
if (jsonObject.contains("channelType") && jsonObject["channelType"].isString())
{
normalResponse.setChannelType(new QString(jsonObject["deviceHwType"].toString()));
normalResponse.setChannelType(new QString(jsonObject["channelType"].toString()));
int status = m_adapter->devicesetChannelPost(deviceSetIndex, normalResponse, errorResponse);

Wyświetl plik

@ -0,0 +1,52 @@
#!/usr/bin/env python
import requests, json, traceback, sys
from optparse import OptionParser
base_url = "http://127.0.0.1:8888/sdrangel"
# ======================================================================
def getInputOptions():
parser = OptionParser(usage="usage: %%prog [-t]\n")
parser.add_option("-a", "--address", dest="address", help="address and port", metavar="ADDRESS", type="string")
parser.add_option("-d", "--device-index", dest="device_index", help="device set index", metavar="INDEX", type="int")
parser.add_option("-c", "--channel-id", dest="channel_id", help="channel ID of channel to add", metavar="ID", type="string")
(options, args) = parser.parse_args()
if options.address is None:
options.address = "127.0.0.1:8888"
if options.device_index is None or options.device_index < 0:
options.device_index = 0
if options.channel_id is None:
print("Please specify channel Id")
exit(1)
return options
# ======================================================================
def main():
try:
options = getInputOptions()
global base_url
base_url = "http://%s/sdrangel" % options.address
device_url = base_url + ("/deviceset/%d/channel" % options.device_index)
r = requests.post(url=device_url, json={"tx": 0, "channelType": options.channel_id})
if r.status_code == 200:
print("Success")
print json.dumps(r.json(), indent=4, sort_keys=True)
else:
print("Error adding channel. HTTP: %d" % r.status_code)
print json.dumps(r.json(), indent=4, sort_keys=True)
except Exception, msg:
tb = traceback.format_exc()
print >> sys.stderr, tb
if __name__ == "__main__":
main()