Merge lp:~petr-kubanek/stellarium/stellarium into lp:stellarium

[Petr Kubánek]

Support for RTS2 JSON API telescopes.

I added support for RTS2 JSON API protocols. All RTS2 supported telescopes can now have position shown in Stellarium, with goto abilities as well.

Also configuration dialog for telescope plugin was modified, so it hides irrelevant parts.

[Alexander Wolf (alexwolf)]

Please resolve conflict (see stars/default/stars_hip_sp_0v0_0.cat.THIS file)

review: Needs Fixing

[gzotti (georg-zotti)]

Hi!
In
void TelescopeClientJsonRts2::telescopeGoto(const Vec3d &j2000Pos)

you can use SteUtils::void rectToSphe(double *lng, double *lat, const Vec3d& v);

I must install RTS2 before I can further comment.

[Petr Kubánek (petr-kubanek)]

Hi,

I removed old catalogue version, which caused the conflict. I also use now rectToSphe, which seems to work as a charm (although the calculations done in this function seems to be different from what I had in code).

However, other telescope clients still use make-up version of conversion. Shall I rewrite others clients to use rectToSphe as well?

[Petr Kubánek (petr-kubanek)]

> Please resolve conflict (see stars/default/stars_hip_sp_0v0_0.cat.THIS file)

Fixed, hope this will propagate to merge request as well.

[Petr Kubánek (petr-kubanek)]

> Please resolve conflict (see stars/default/stars_hip_sp_0v0_0.cat.THIS file)

review: Needs Resubmitting

[Petr Kubánek (petr-kubanek)]

> Hi!
> In
> void TelescopeClientJsonRts2::telescopeGoto(const Vec3d &j2000Pos)
>
> you can use SteUtils::void rectToSphe(double *lng, double *lat, const Vec3d&
> v);
>
> I must install RTS2 before I can further comment.

You can work with RTS2 dummy - grab source from GitHub, compile (I am working on Debian packages, but that's still a long way) and you should have dummy T0 in rts2-mon. Then connect (you will need to run rts2-httpd). Let me know if you hit any problems.

[gzotti (georg-zotti)]

Hi! I was not aware the other telescope clients also have this code. We should be able to fix that, thanks.

I have compiled RTS2 from github on my Ubuntu 16.04 notebook (CoreDuo from 2009), following instructions. Install worked well so far. I was totally unaware of this amazing project! I am also (far too seldom) observer, but only with a small EQ3 and (modified) DSLR, nothing stationary. (I have access to an EQ6 occasionally.) As a total beginner with RTS2, any intro manual you have available would be helpful. I will try to continue again on weekend.

[Alexander Wolf (alexwolf)]

It's OK for me now. Some visual improvements may be added after merge.

Georg?

review: Approve

[gzotti (georg-zotti)]

We will fix the GUI to only show the relevant settings depending on which type of telescope is being configured.

Petr, I was able to install on Ubuntu 16.04, sudo services rts2 start, and see (dummy) T0 and can write commands into the rts2 console. (park, move 90 0, etc. ) rts2-httpd requires database, I have installed the stars database as described in RUN, retried starting rts2-httpd, but rts2-mon still complains that I shall check that root can connect to database. (could not connect to database "stars" on line 162.) I am also not really familiar with postgresql usage, maybe I am doing something wrong.

On the other side, I have set up an RTS2 telescope on my Windows PC with your version.

from the logfile:

connectionType: 5 initString: "RTS2 dummy Telescope:RTS2:J2000:http://gzotti:[e-mail]:8889"
Creating telescope "RTS2 dummy Telescope:RTS2:J2000:http://gzotti:[e-mail]:8889" ; name/type/equinox/params: "RTS2 dummy Telescope" "RTS2" J2000 "http://gzotti:[e-mail]:8889"
TelescopeRTS2 paramaters: "http://gzotti:[e-mail]:8889"
request url: "http://gzotti:[e-mail]:8889/api/devbytype?t=2"
TelescopeRTS2 error QNetworkReply::NetworkError(ConnectionRefusedError)

The telescope overview panel in Stellarium states "connected", and I see a telescope control panel for my RTS2 dummy telescope, but it shows default all-0 coordinates, not the currently set 6h00/0° RA/DEC (from rts2-mon move 90 0). So it seems more than likely that connection has not been properly established and "ConnectionRefused" is not properly handled yet. As I understand, this would connect to the running rts2-httpd, but it does not run...

When I am connected (or not) to RTS2 like this, quitting Stellarium results in a crash.

Sorry, I am total beginner with RTS2 and automated telescopes. A guide book "RTS2 for dummies" or so would be helpful. And then a thorough book about robotic observatories with RTS2 with instructions, sectioned by topic, not alphabetized (where to start reading the manpages?))

It would be perfect if you can add a section on RTS2 to the Guide: in guide/plg_atTheTelescope.tex. Not a complete RTS2 manual, but things to take case of, etc. Don't bother with too much formatting, we will likely edit a bit, but just to get info from you on what is important, like having rts2-httpd running.

I will try to follow the postgresql instructions now, maybe I can get this to work.

review: Needs Fixing

[gzotti (georg-zotti)]

I restarted with the database part and instructions from RUN and rts2.org/faq.html. When I add myself as database user, I can look into the database, fine. But rts2-https must be started by root, and then there is an error

gzotti@alcyone:~/DEV/rts2/src$ sudo rts2-httpd
[sudo] Passwort für gzotti:
2017-04-01T23:41:29.319 CET rts2-httpd 1 cannot connect to DB 'stars'. Please check if the database server is running (on specified port, or on port 5432, which is the default one; please be aware that RTS2 does not parse PostgreSQL configuration, so if the database is running on the non-default port, it will not be accessible unless you specify the port). Also please make sure that the current user, root(0) can log into database: could not connect to database "stars" on line 162
2017-04-01T23:41:29.320 CET rts2-httpd 1 cannot init daemon, exiting

gzotti@alcyone:~/DEV/rts2/src$ rts2-httpd
2017-04-01T23:42:05.060 CET rts2-httpd 1 cannot create lock file /var/run/rts2_HTTPD: Permission denied - do you have correct permission? Try to run daemon as root (sudo,..)

I finally made /var/run write-all, deleted rts2_HTTPD (as root), and was able to start rts2-httpd as myself, but this seems sub-optimal. Now I have an error in Stellarium's log.txt

TelescopeRTS2 error QNetworkReply::NetworkError(AuthenticationRequiredError)

User and password are visible in the Stellarium logfile like in the previous report and are correct.

Interesting: I wanted to connect to this webserver in Firefox. I see the menu, but a click on a menu entry opened the auth panel. my login&password don't work. I may have overlooked this: do I have another name when using rts2, and where would I have configured this? (I assue these are the auth. data I also need to give in Stellarium...) In the database I use the same username that I use in Ubuntu.

I am getting closer, but must have overlooked something.

review: Needs Information

[gzotti (georg-zotti)]

Hah, I have found the rts2 wiki, and rts2-user -a <name>, finally. I still would like to find a complete beginner's guide to RTS2: When to use Linux user account, Database user name (and what to do as root, what as postgres, what as regular user -- I can have 20 years of Linux experience, never used postgresql!), rts2 user name. Basically an advanced amateur's guide to building a remote robotic observatory with RTS2, is there something available? (May be some affordable print-on-demand book, or even a €15 PDF to download a current doc (this may give you some gratification), it would just have to be complete and correct.) RTS2 seems very complete, but the settings overwhelm me.

Now I have connection, and messages in log.txt like

request url: "http://gzotti:[e-mail]:8889/api/get?d=T0"
TelescopeRTS2 error QNetworkReply::NetworkError(NoError)
TelescopeRTS2 object false "no error occurred" 0 120 0
TelescopeRTS2 RADEC 2.0944 0
request url: "http://gzotti:[e-mail]:8889/api/get?d=T0"
TelescopeRTS2 error QNetworkReply::NetworkError(NoError)
TelescopeRTS2 object false "no error occurred" 0 120 0
TelescopeRTS2 RADEC 2.0944 0
request url: "http://gzotti:[e-mail]:8889/api/get?d=T0"

The 0 120 0 may come from the move 120 0 issued earlier in rts2-mon.

I assumed the rts2 was in OFF mode, switched ON in rts2-mon. In Stellarium, I tried in the telescope panel "Move telescope to [current object], [SLEW]". The entries in the logfile get more, but no change. rts2-mon shows the OBJ coordinates 2h/15° from another command given "move 30 15", and the logfile has

TelescopeRTS2 error QNetworkReply::NetworkError(NoError)
TelescopeRTS2 object false "no error occurred" 0 30 15
TelescopeRTS2 RADEC 0.523599 0.261799

It appears the SLEW command is not transferred to RTS2. But I also don't see a telescope marker on screen at 30°/15°. I don't know whether RTS2 has disabled the T0 telescope for safety during daylight or something (I have switched State:ON in rts2-mon before). I can apparently issue move commands in rts2-mon, these coordinates are displayed in rts2-mon, are transferred to Stellarium, but no telescope marker is visible, and I cannot isssue a GOTO command from Stellarium that would impress rts2-mon in any way.

So I see some connection is established, but something is likely still misconfigured.

review: Needs Information

[gzotti (georg-zotti)]

I just observed: when I freshly connect to the RTS dummy telescope, I have a telescope marker at the coordinates which I have set in rts2-mon. Any slew commmand from stellarium makes the marker disappear, and rts2-mon shows no change in position (command ignored). Disconnect/connect shows it at the old location.

When I issue a "move" command in rts2-mon, the telescope marker in Stellarium moves! So the telescope pointing record is properly transmitted, at least.

[Petr Kubánek (petr-kubanek)]

In users database is (added) column, which describes which devices a user can command. Default is NULL, meaning none. When you set it to all (*) as this:
<pre>
psql stars
update users set allowed_devices = '*';
</pre>
you will be able to command devices. It looks as connection brokes after error and is not reconnected. I will investigate this issue.

[gzotti (georg-zotti)]

Ah, that sounds like it. I hope I can try tonight, maybe only on Wednesday. Please handle the connection errors at least with diagnostic messages to the logfile like "cannot connect, is rts2-httpd running on <IP address>?"; "User XXX unknown. Use rts2-user -a XXX to create"; "User XXX cannot control telescope. See manual for details." and please write this section for our guide (there is a \sectionauthor*{} macro to mark personal contributions). You made incredible software, but is is quite advanced and users will flood us *or you* with emails with always the same questions when these are not easily answered in manuals :-) When you write a general manual for RTS2, I am afraid this should include a short intro to psql. If you don't have the time (I understand we are all busy), maybe some DIY observatory maker can write such intro booklet for beginners while he is building it, based on his own experiences and pitfalls. The telescope parameters look impressive alone, all those mount tweaks, ...

Is there a useful scenario for RTS2 with mobile telescope? Just to run an automated night of captures from an object list? (No dome, no weather sensors, ... just a mount, DSLR or CCD, optional filter wheel, optional autofocuser?) Not sure about the resources, but they don't look too big. RTS2 could maybe run on a small low-power ARM SBC or so (think Raspberry Pi3?).

[gzotti (georg-zotti)]

OK, after this database update I was able to slew the dummy RTS2 telescope.

However, the crash-on-exit persists. I have only Telescope plugin active. When I exit immediately after program start, all is OK. When I press the telescope button and see the panel "No telescopes connected", I press "configure", I see the unconnected RTS2 and an unconnected Stellarium Dummy telescope. When I quit Stellarium at this point, already here I have a crash. So it does not even require connection, only being (partially?) loaded. Maybe some uninitialized pointer?

review: Needs Fixing

[gzotti (georg-zotti)]

Strange: The logfile indicates Telescope plugin has been successfully unloaded. We did have a few days recently where trunk crashed on exit. Maybe your latest merge was in these days. Can you merge from trunk again before resubmitting, maybe the problem is somewhere entirely else.

review: Needs Fixing

[Petr Kubánek (petr-kubanek)]

I merged again from trunk, and also I made parts irrelevant for the setting to be hidden from the dialog box. So if you choose local, you will see only serial port & type, remote hostname and port, and RTS2 URL, username and password.

I do not see any crash, Stellarium exits cleanly without core dump on all ocassion. If you can please try again, and if you see a crash, try to be as specific as possible about conditions causing it.

[lp:~petr-kubanek/stellarium/stellarium]

9262. By Alexander Wolf on 2017-04-06

Added context support for constellations and asterisms names

[Petr Kubánek (petr-kubanek)]

review: Approve

[Petr Kubánek (petr-kubanek)]

Regarding low power ARM boards: we run RTS2 on SAAO 1m autoguiders, so code compiles and run on ARM as well.

Is there any hint where to put documentation/translation? Thanks.

[gzotti (georg-zotti)]

Documentation: as I wrote, please add a section to the Guide. The LaTeX files are in the guide subdirectory. Your guidelines should go into ch_atTheTelescope.tex. Don't bother too much about our formatting macros, just write the relevant text, and I will reformat as needed. But please cover the required steps for RTS2 beginners, and how to avoid trouble.

I will try your branch later today.

[gzotti (georg-zotti)]

OK, it works, and exits nicely. The GUI selection/hiding is well done, just what I had in mind. I might reduce its debug output, but we can merge it. Maybe we should think about particular debugging with startup flags (Florian enabled such possibility recently). Thanks a lot for a fine contribution!

review: Approve

[Alexander Wolf (alexwolf)]

review: Approve

[lp:~petr-kubanek/stellarium/stellarium]

9263. By Alexander Wolf on 2017-04-07

Added support RTS2 for Telescope Control Plugin

[Petr Kubánek (petr-kubanek)]

I plan to add documentation and cleanup debug logs, so I changed my branch back to mature.

=== modified file 'plugins/TelescopeControl/CMakeLists.txt'
--- plugins/TelescopeControl/CMakeLists.txt	2016-04-23 13:33:16 +0000
+++ plugins/TelescopeControl/CMakeLists.txt	2017-04-06 13:21:42 +0000
@@ -3,7 +3,7 @@
 # otherwise the local copy will be overwritten each time Stellarium is started.
 SET(TELESCOPE_CONTROL_MAJOR "0")
 SET(TELESCOPE_CONTROL_MINOR "2")
-SET(TELESCOPE_CONTROL_PATCH "11")
+SET(TELESCOPE_CONTROL_PATCH "12")
 SET(TELESCOPE_CONTROL_VERSION "${TELESCOPE_CONTROL_MAJOR}.${TELESCOPE_CONTROL_MINOR}.${TELESCOPE_CONTROL_PATCH}")
 
 IF(APPLE)

=== modified file 'plugins/TelescopeControl/resources/device_models.json'
--- plugins/TelescopeControl/resources/device_models.json	2016-04-23 13:33:16 +0000
+++ plugins/TelescopeControl/resources/device_models.json	2017-04-06 13:21:42 +0000
@@ -1,5 +1,5 @@
 {
-	"version": "0.2.11",
+	"version": "0.2.12",
 	"list" :
 	[
 		{

=== modified file 'plugins/TelescopeControl/src/CMakeLists.txt'
--- plugins/TelescopeControl/src/CMakeLists.txt	2016-06-21 14:43:30 +0000
+++ plugins/TelescopeControl/src/CMakeLists.txt	2017-04-06 13:21:42 +0000
@@ -22,6 +22,8 @@
      clients/TelescopeClientDirectLx200.cpp
      clients/TelescopeClientDirectNexStar.hpp
      clients/TelescopeClientDirectNexStar.cpp
+     clients/TelescopeClientJsonRts2.hpp
+     clients/TelescopeClientJsonRts2.cpp
      TelescopeControl.hpp
      TelescopeControl.cpp
      gui/SlewDialog.hpp

=== modified file 'plugins/TelescopeControl/src/TelescopeControl.cpp'
--- plugins/TelescopeControl/src/TelescopeControl.cpp	2016-11-28 14:24:21 +0000
+++ plugins/TelescopeControl/src/TelescopeControl.cpp	2017-04-06 13:21:42 +0000
@@ -101,6 +101,7 @@
 	connectionTypeNames.insert(ConnectionInternal, "internal");
 	connectionTypeNames.insert(ConnectionLocal, "local");
 	connectionTypeNames.insert(ConnectionRemote, "remote");
+	connectionTypeNames.insert(ConnectionRTS2, "RTS2");
 }
 
 TelescopeControl::~TelescopeControl()
@@ -746,6 +747,9 @@
 		int delay = 0;
 		QString deviceModelName;
 		QString portSerial;
+		QString rts2Url("localhost");
+		QString rts2Username("");
+		QString rts2Password("");
 
 		if (connectionType == ConnectionInternal)
 		{
@@ -789,15 +793,32 @@
 			}
 		}
 
+		if (connectionType == ConnectionRTS2)
+		{
+			//Validation: Host name
+			rts2Url = telescope.value("url").toString();
+			if(rts2Url.isEmpty())
+			{
+				qDebug() << "[TelescopeControl] loadTelescopes(): No URL at slot" << key;
+				map.remove(key);
+				continue;
+			}
+			rts2Username = telescope.value("username").toString();
+			rts2Password = telescope.value("password").toString();
+		}
+
 		if (connectionType != ConnectionVirtual)
 		{
-			//Validation: TCP port
-			portTCP = telescope.value("tcp_port").toInt();
-			if(!telescope.contains("tcp_port") || !isValidPort(portTCP))
+			if (connectionType != ConnectionRTS2)
 			{
-				qDebug() << "[TelescopeControl] Unable to load telescope: No valid TCP port at slot" << key;
-				map.remove(key);
-				continue;
+				//Validation: TCP port
+				portTCP = telescope.value("tcp_port").toInt();
+				if(!telescope.contains("tcp_port") || !isValidPort(portTCP))
+				{
+					qDebug() << "[TelescopeControl] Unable to load telescope: No valid TCP port at slot" << key;
+					map.remove(key);
+					continue;
+				}
 			}
 
 			//Validation: Delay
@@ -879,7 +900,7 @@
 			}
 			else
 			{
-				if(!startClientAtSlot(slot, connectionType, name, equinox, hostName, portTCP, delay, internalCircles))
+				if(!startClientAtSlot(slot, connectionType, name, equinox, hostName, portTCP, delay, internalCircles, deviceModelName, portSerial, rts2Url, rts2Username, rts2Password))
 				{
 					qDebug() << "[TelescopeControl] Unable to create a telescope client at slot" << slot;
 					//Unnecessary due to if-else construction;
@@ -903,7 +924,7 @@
 	telescopeDescriptions = result;
 }
 
-bool TelescopeControl::addTelescopeAtSlot(int slot, ConnectionType connectionType, QString name, QString equinox, QString host, int portTCP, int delay, bool connectAtStartup, QList<double> circles, QString deviceModelName, QString portSerial)
+bool TelescopeControl::addTelescopeAtSlot(int slot, ConnectionType connectionType, QString name, QString equinox, QString host, int portTCP, int delay, bool connectAtStartup, QList<double> circles, QString deviceModelName, QString portSerial, QString rts2Url, QString rts2Username, QString rts2Password)
 {
 	//Validation
 	if(!isValidSlotNumber(slot) || name.isEmpty() || equinox.isEmpty() || connectionType <= ConnectionNA || connectionType >= ConnectionCount)
@@ -923,6 +944,15 @@
 		telescope.insert("host_name", host);
 	}
 
+	if(connectionType == ConnectionRTS2)
+	{
+		if (rts2Url.isEmpty())
+			return false;
+		telescope.insert("url", rts2Url);
+		telescope.insert("username", rts2Username);
+		telescope.insert("password", rts2Password);
+	}
+
 	if(connectionType == ConnectionInternal)
 	{
 		if (!deviceModels.contains(deviceModelName))
@@ -936,9 +966,12 @@
 
 	if (connectionType != ConnectionVirtual)
 	{
-		if (!isValidPort(portTCP))
-			return false;
-		telescope.insert("tcp_port", portTCP);
+		if (connectionType != ConnectionRTS2)
+		{
+			if (!isValidPort(portTCP))
+				return false;
+			telescope.insert("tcp_port", portTCP);
+		}
 
 		if (!isValidDelay(delay))
 			return false;
@@ -960,7 +993,7 @@
 	return true;
 }
 
-bool TelescopeControl::getTelescopeAtSlot(int slot, ConnectionType& connectionType, QString& name, QString& equinox, QString& host, int& portTCP, int& delay, bool& connectAtStartup, QList<double>& circles, QString& deviceModelName, QString& portSerial)
+bool TelescopeControl::getTelescopeAtSlot(int slot, ConnectionType& connectionType, QString& name, QString& equinox, QString& host, int& portTCP, int& delay, bool& connectAtStartup, QList<double>& circles, QString& deviceModelName, QString& portSerial, QString& rts2Url, QString& rts2Username, QString& rts2Password)
 {
 	//Validation
 	if(!isValidSlotNumber(slot))
@@ -996,6 +1029,12 @@
 		deviceModelName = telescope.value("device_model").toString();
 		portSerial = telescope.value("serial_port").toString();
 	}
+	if(connectionType == ConnectionRTS2)
+	{
+		rts2Url = telescope.value("url").toString();
+		rts2Username = telescope.value("username").toString();
+		rts2Password = telescope.value("password").toString();
+	}
 
 	return true;
 }
@@ -1027,7 +1066,10 @@
 	QList<double> circles;
 	QString deviceModelName;
 	QString portSerial;
-	if(!getTelescopeAtSlot(slot, connectionType, name, equinox, host, portTCP, delay, connectAtStartup, circles, deviceModelName, portSerial))
+	QString rts2Url;
+	QString rts2Username;
+	QString rts2Password;
+	if(!getTelescopeAtSlot(slot, connectionType, name, equinox, host, portTCP, delay, connectAtStartup, circles, deviceModelName, portSerial, rts2Url, rts2Username, rts2Password))
 	{
 		//TODO: Add debug
 		return false;
@@ -1063,7 +1105,7 @@
 	}
 	else
 	{
-		if (startClientAtSlot(slot, connectionType, name, equinox, host, portTCP, delay, circles))
+		if (startClientAtSlot(slot, connectionType, name, equinox, host, portTCP, delay, circles, deviceModelName, portSerial, rts2Url, rts2Username, rts2Password))
 		{
 			emit clientConnected(slot, name);
 			return true;
@@ -1199,7 +1241,7 @@
 	return true;
 }
 
-bool TelescopeControl::startClientAtSlot(int slotNumber, ConnectionType connectionType, QString name, QString equinox, QString host, int portTCP, int delay, QList<double> circles, QString deviceModelName, QString portSerial)
+bool TelescopeControl::startClientAtSlot(int slotNumber, ConnectionType connectionType, QString name, QString equinox, QString host, int portTCP, int delay, QList<double> circles, QString deviceModelName, QString portSerial, QString rts2Url, QString rts2Username, QString rts2Password)
 {
 	//Validation
 	if(!isValidSlotNumber(slotNumber))
@@ -1230,13 +1272,18 @@
 				initString = QString("%1:TCP:%2:%3:%4:%5").arg(name, equinox, "localhost", QString::number(portTCP), QString::number(delay));
 			break;
 
+		case ConnectionRTS2:
+			if (!rts2Url.isEmpty())
+				initString = QString("%1:RTS2:%2:http://%3:%4@%5").arg(name, equinox, rts2Username, rts2Password, rts2Url);
+			break;
+
 		case ConnectionRemote:
 		default:
 			if (isValidPort(portTCP) && !host.isEmpty())
 				initString = QString("%1:TCP:%2:%3:%4:%5").arg(name, equinox, host, QString::number(portTCP), QString::number(delay));
 	}
 
-	//qDebug() << "initString:" << initString;
+	qDebug() << "connectionType:" << connectionType << " initString:" << initString;
 
 	TelescopeClient* newTelescope = TelescopeClient::create(initString);
 	if (newTelescope)

=== modified file 'plugins/TelescopeControl/src/TelescopeControl.hpp'
--- plugins/TelescopeControl/src/TelescopeControl.hpp	2016-07-10 03:16:07 +0000
+++ plugins/TelescopeControl/src/TelescopeControl.hpp	2017-04-06 13:21:42 +0000
@@ -119,9 +119,9 @@
 	//These are public, but not slots, because they don't use sufficient validation. Scripts shouldn't be able to add/remove telescopes, only to point them.
 	//! Adds a telescope description containing the given properties. DOES NOT VALIDATE its parameters. If serverName is specified, portSerial should be specified too. Call saveTelescopes() to write the modified configuration to disc. Call startTelescopeAtSlot() to start this telescope.
 	//! @param portSerial must be a valid serial port name for the particular platform, e.g. "COM1" for Microsoft Windows of "/dev/ttyS0" for Linux
-	bool addTelescopeAtSlot(int slot, ConnectionType connectionType, QString name, QString equinox, QString host = QString("localhost"), int portTCP = DEFAULT_TCP_PORT, int delay = DEFAULT_DELAY, bool connectAtStartup = false, QList<double> circles = QList<double>(), QString serverName = QString(), QString portSerial = QString());
+	bool addTelescopeAtSlot(int slot, ConnectionType connectionType, QString name, QString equinox, QString host = QString("localhost"), int portTCP = DEFAULT_TCP_PORT, int delay = DEFAULT_DELAY, bool connectAtStartup = false, QList<double> circles = QList<double>(), QString serverName = QString(), QString portSerial = QString(), QString rts2Url = QString(), QString rts2Username = QString(), QString rts2Password = QString());
 	//! Retrieves a telescope description. Returns false if the slot is empty. Returns empty serverName and portSerial if the description contains no server.
-	bool getTelescopeAtSlot(int slot, ConnectionType& connectionType, QString& name, QString& equinox, QString& host, int& portTCP, int& delay, bool& connectAtStartup, QList<double>& circles, QString& serverName, QString& portSerial);
+	bool getTelescopeAtSlot(int slot, ConnectionType& connectionType, QString& name, QString& equinox, QString& host, int& portTCP, int& delay, bool& connectAtStartup, QList<double>& circles, QString& serverName, QString& portSerial, QString& rts2Url, QString& rts2Username, QString& rts2Password);
 	//! Removes info from the tree. Should it include stopTelescopeAtSlot()?
 	bool removeTelescopeAtSlot(int slot);
 	
@@ -338,7 +338,7 @@
 	bool stopServerAtSlot(int slot);
 
 	//! A wrapper for TelescopeClient::create(). Used internally by loadTelescopes() and startTelescopeAtSlot(). Does not perform any validation on its arguments.
-	bool startClientAtSlot(int slot, ConnectionType connectionType, QString name, QString equinox, QString host, int portTCP, int delay, QList<double> circles, QString serverName = QString(), QString portSerial = QString());
+	bool startClientAtSlot(int slot, ConnectionType connectionType, QString name, QString equinox, QString host, int portTCP, int delay, QList<double> circles, QString serverName = QString(), QString portSerial = QString(), QString rts2Url = QString(), QString rts2Username = QString(), QString rts2Password = QString());
 	
 	//! Returns true if the TelescopeClient at this slot has been stopped successfully or doesn't exist
 	bool stopClientAtSlot(int slot);

=== modified file 'plugins/TelescopeControl/src/TelescopeControlGlobals.hpp'
--- plugins/TelescopeControl/src/TelescopeControlGlobals.hpp	2016-01-08 21:01:34 +0000
+++ plugins/TelescopeControl/src/TelescopeControlGlobals.hpp	2017-04-06 13:21:42 +0000
@@ -52,6 +52,7 @@
 		ConnectionInternal,
 		ConnectionLocal,
 		ConnectionRemote,
+		ConnectionRTS2,
 		ConnectionCount
 	};
 	

=== modified file 'plugins/TelescopeControl/src/clients/TelescopeClient.cpp'
--- plugins/TelescopeControl/src/clients/TelescopeClient.cpp	2017-03-13 11:34:19 +0000
+++ plugins/TelescopeControl/src/clients/TelescopeClient.cpp	2017-04-06 13:21:42 +0000
@@ -24,6 +24,7 @@
  */
 
 #include "TelescopeClient.hpp"
+#include "TelescopeClientJsonRts2.hpp"
 #include "TelescopeClientDirectLx200.hpp"
 #include "TelescopeClientDirectNexStar.hpp"
 #include "StelUtils.hpp"
@@ -93,6 +94,10 @@
 	{
 		newTelescope = new TelescopeTCP(name, params, eq);
 	}
+	else if (type == "RTS2")
+	{
+		newTelescope = new TelescopeClientJsonRts2(name, params, eq);
+	}
 	else if (type == "TelescopeServerLx200") //BM: One of the rare occasions of painless extension
 	{
 		newTelescope= new TelescopeClientDirectLx200(name, params, eq);

=== added file 'plugins/TelescopeControl/src/clients/TelescopeClientJsonRts2.cpp'
--- plugins/TelescopeControl/src/clients/TelescopeClientJsonRts2.cpp	1970-01-01 00:00:00 +0000
+++ plugins/TelescopeControl/src/clients/TelescopeClientJsonRts2.cpp	2017-04-06 13:21:42 +0000
@@ -0,0 +1,175 @@
+/*
+ * RTS2 Json stellarium plugin
+ * 
+ * Copyright (C) 2014-2016 Petr Kubanek
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA  02110-1335, USA.
+ */
+
+#include "StelUtils.hpp"
+
+#include "QByteArray"
+#include "QJsonArray"
+#include "QJsonDocument"
+#include "QJsonParseError"
+#include "QJsonObject"
+#include "QUrlQuery"
+
+#include "TelescopeClientJsonRts2.hpp"
+
+TelescopeClientJsonRts2::TelescopeClientJsonRts2(const QString &name, const QString &params, Equinox eq)
+	: TelescopeClient(name)
+	, networkManager(new QNetworkAccessManager)
+	, equinox(eq)
+	, baseurl("http://localhost:8889/")
+	, telName("")
+	, time_delay(500)
+{
+	// Example params:
+	// petr:test@localhost:8889/tel
+
+	qDebug() << "TelescopeRTS2 paramaters: " << params;
+
+	baseurl.setUrl(params);
+	if (!baseurl.isValid())
+	{
+		qWarning() << "TelescopeRTS2 invalid URL";
+		return;
+	}
+
+	QUrl rurl(baseurl);
+
+	rurl.setPath(baseurl.path() + "/api/devbytype");
+
+	QUrlQuery query;
+	query.addQueryItem("t", "2");
+	rurl.setQuery(query);
+
+	QNetworkRequest cfgRequest;
+
+	cfgRequest.setUrl(rurl);
+
+	qDebug() << "request url:" << rurl.toString();
+
+	connect(&networkManager, SIGNAL(finished(QNetworkReply*)), this, SLOT(replyFinished(QNetworkReply*)));
+
+	networkManager.get(cfgRequest);
+}
+
+TelescopeClientJsonRts2::~TelescopeClientJsonRts2(void)
+{
+}
+
+void TelescopeClientJsonRts2::replyFinished(QNetworkReply *reply)
+{
+	qDebug() << "TelescopeRTS2 error" << reply->error();
+	if (reply->error() != QNetworkReply::NoError)
+	{
+		telName = "";
+		return;
+	}
+
+	QByteArray data = reply->readAll();
+	//qDebug() << "TelescopeRTS2 data" << (QString) data;
+
+	QJsonDocument doc;
+	QJsonParseError jsonError;
+	doc = QJsonDocument::fromJson(data, &jsonError);
+
+	if (reply->url().path().endsWith("/api/devbytype"))
+	{
+		QJsonArray arr = doc.array();
+		telName = arr[0].toString();
+
+		QUrl rurl(baseurl);
+
+		rurl.setPath(baseurl.path() + "/api/get");
+
+		QUrlQuery query;
+		query.addQueryItem("d", telName);
+		rurl.setQuery(query);
+
+		request.setUrl(rurl);
+
+		qDebug() << "request url:" << rurl.toString();
+
+		networkManager.get(request);
+	}
+	else if (reply->url().path().endsWith("/api/get"))
+	{
+		QJsonObject docObject = doc.object();
+		QJsonObject dObject = docObject["d"].toObject();
+		QJsonObject telObject = dObject["TEL"].toObject();
+
+		qDebug() << "TelescopeRTS2 object" << doc.isNull() << jsonError.errorString() << jsonError.offset << telObject["ra"].toDouble() << telObject["dec"].toDouble();
+
+		const double ra = telObject["ra"].toDouble() * M_PI / 180.0;
+		const double dec = telObject["dec"].toDouble() * M_PI / 180.0;
+		const double cdec = cos(dec);
+	
+		qDebug() << "TelescopeRTS2 RADEC" << ra << dec;
+
+		Vec3d pos(cos(ra)*cdec, sin(ra)*cdec, sin(dec));
+		interpolatedPosition.add(pos, getNow(), getNow(), 0);
+
+		qDebug() << "request url:" << request.url().toString();
+	
+		networkManager.get(request);
+	}
+	else
+	{
+		qWarning() << "unhandled reply: " << reply->url().toString();
+	}
+}
+
+bool TelescopeClientJsonRts2::isConnected(void) const
+{
+	return telName.isEmpty() == false;
+}
+
+Vec3d TelescopeClientJsonRts2::getJ2000EquatorialPos(const StelCore* core) const
+{
+	const qint64 now = getNow() - time_delay;
+	return interpolatedPosition.get(now);
+}
+
+void TelescopeClientJsonRts2::telescopeGoto(const Vec3d &j2000Pos)
+{
+	if (!isConnected())
+		return;
+
+	double ra, dec;
+	StelUtils::rectToSphe(&ra, &dec, j2000Pos);
+
+	QUrl set(baseurl);
+	set.setPath(baseurl.path() + "/api/cmd");
+
+	QUrlQuery query;
+	query.addQueryItem("d", telName);
+	query.addQueryItem("c", QString("move+%1+%2").arg(ra * 180 / M_PI).arg(dec * 180 / M_PI));
+	set.setQuery(query);
+
+	QNetworkRequest setR;
+	setR.setUrl(set);
+
+	qDebug() << "GoTo request: " << set.toString();
+
+	networkManager.get(setR);
+}
+
+bool TelescopeClientJsonRts2::hasKnownPosition(void) const
+{
+	return interpolatedPosition.isKnown();
+}

=== added file 'plugins/TelescopeControl/src/clients/TelescopeClientJsonRts2.hpp'
--- plugins/TelescopeControl/src/clients/TelescopeClientJsonRts2.hpp	1970-01-01 00:00:00 +0000
+++ plugins/TelescopeControl/src/clients/TelescopeClientJsonRts2.hpp	2017-04-06 13:21:42 +0000
@@ -0,0 +1,61 @@
+/*
+ * RTS2 Json stellarium plugin
+ * 
+ * Copyright (C) 2014-2016 Petr Kubanek
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA  02110-1335, USA.
+ */
+
+#ifndef _TELESCOPE_CLIENT_JSON_RTS2_HPP_
+#define _TELESCOPE_CLIENT_JSON_RTS2_HPP_
+
+#include "QNetworkAccessManager"
+#include "QNetworkRequest"
+#include "QNetworkReply"
+#include "QUrl"
+
+#include "TelescopeClient.hpp"
+
+#include "StelCore.hpp"
+
+//! RTS2 JSON telescope.
+class TelescopeClientJsonRts2 : public TelescopeClient
+{
+	Q_OBJECT
+public:
+	TelescopeClientJsonRts2(const QString &name, const QString &params, Equinox eq = EquinoxJ2000);
+	~TelescopeClientJsonRts2(void);
+	virtual bool isConnected(void) const;
+
+	Vec3d getJ2000EquatorialPos(const StelCore* core=0) const;
+
+	void telescopeGoto(const Vec3d &j2000Pos);
+	bool hasKnownPosition(void) const;
+
+private:
+	QNetworkAccessManager networkManager;
+	Equinox equinox;
+	QUrl baseurl;
+	QString telName;
+	QNetworkRequest request;
+	Vec3d position;
+	InterpolatedPosition interpolatedPosition;
+	int time_delay;
+
+private slots:
+	void replyFinished(QNetworkReply *reply);
+};
+
+#endif // _TELESCOPE_CLIENT_JSON_RTS2_HPP_

=== modified file 'plugins/TelescopeControl/src/gui/TelescopeConfigurationDialog.cpp'
--- plugins/TelescopeControl/src/gui/TelescopeConfigurationDialog.cpp	2017-01-05 15:28:52 +0000
+++ plugins/TelescopeControl/src/gui/TelescopeConfigurationDialog.cpp	2017-04-06 13:21:42 +0000
@@ -43,7 +43,7 @@
 	, configuredSlot(0)
 {
 	ui = new Ui_telescopeConfigurationDialog();
-	
+
 	telescopeManager = GETSTELMODULE(TelescopeControl);
 
 	telescopeNameValidator = new QRegExpValidator (QRegExp("[^:\"]+"), this);//Test the update for JSON
@@ -122,7 +122,7 @@
 void TelescopeConfigurationDialog::createDialogContent()
 {
 	ui->setupUi(dialog);
-	
+
 	//Inherited connect
 	connect(&StelApp::getInstance(), SIGNAL(languageChanged()), this, SLOT(retranslate()));
 	connect(ui->closeStelWindow, SIGNAL(clicked()), this, SLOT(buttonDiscardPressed()));
@@ -133,6 +133,7 @@
 	connect(ui->radioButtonTelescopeLocal, SIGNAL(toggled(bool)), this, SLOT(toggleTypeLocal(bool)));
 	connect(ui->radioButtonTelescopeConnection, SIGNAL(toggled(bool)), this, SLOT(toggleTypeConnection(bool)));
 	connect(ui->radioButtonTelescopeVirtual, SIGNAL(toggled(bool)), this, SLOT(toggleTypeVirtual(bool)));
+	connect(ui->radioButtonTelescopeRTS2, SIGNAL(toggled(bool)), this, SLOT(toggleTypeRTS2(bool)));
 	
 	connect(ui->pushButtonSave, SIGNAL(clicked()), this, SLOT(buttonSavePressed()));
 	connect(ui->pushButtonDiscard, SIGNAL(clicked()), this, SLOT(buttonDiscardPressed()));
@@ -149,6 +150,10 @@
 //Set the configuration panel in a predictable state
 void TelescopeConfigurationDialog::initConfigurationDialog()
 {
+	ui->groupBoxConnectionSettings->hide();
+	ui->groupBoxDeviceSettings->hide();
+	ui->groupBoxRTS2Settings->hide();
+
 	//Reusing code used in both methods that call this one
 	deviceModelNames = telescopeManager->getDeviceModels().keys();
 	
@@ -213,7 +218,7 @@
 	configuredSlot = slot;
 	initConfigurationDialog();
 	ui->stelWindowTitle->setText(q_("Configure Telescope"));
-	
+
 	//Read the telescope properties
 	QString name;
 	ConnectionType connectionType;
@@ -225,7 +230,10 @@
 	QList<double> circles;
 	QString deviceModelName;
 	QString serialPortName;
-	if(!telescopeManager->getTelescopeAtSlot(slot, connectionType, name, equinox, host, portTCP, delay, connectAtStartup, circles, deviceModelName, serialPortName))
+	QString rts2Url;
+	QString rts2Username;
+	QString rts2Password;
+	if(!telescopeManager->getTelescopeAtSlot(slot, connectionType, name, equinox, host, portTCP, delay, connectAtStartup, circles, deviceModelName, serialPortName, rts2Url, rts2Username, rts2Password))
 	{
 		//TODO: Add debug
 		return;
@@ -265,10 +273,17 @@
 		ui->radioButtonTelescopeConnection->setChecked(true);
 		ui->lineEditHostName->setText("localhost");
 	}
-	else
+	else if (connectionType == ConnectionVirtual)
 	{
 		ui->radioButtonTelescopeVirtual->setChecked(true);
 	}
+	else if (connectionType == ConnectionRTS2)
+	{
+		ui->radioButtonTelescopeRTS2->setChecked(true);
+		ui->lineEditRTS2Url->setText(rts2Url);
+		ui->lineEditRTS2Username->setText(rts2Username);
+		ui->lineEditRTS2Password->setText(rts2Password);
+	}
 
 	//Equinox
 	if (equinox == "JNow")
@@ -310,16 +325,13 @@
 		ui->lineEditHostName->setText("localhost");
 		ui->spinBoxTCPPort->setValue(DEFAULT_TCP_PORT_FOR_SLOT(configuredSlot));
 
-		//Enable/disable controls
-		ui->labelHost->setEnabled(false);
-		ui->lineEditHostName->setEnabled(false);
+		ui->groupBoxDeviceSettings->show();
 
 		ui->scrollArea->ensureWidgetVisible(ui->groupBoxTelescopeProperties);
 	}
 	else
 	{
-		ui->labelHost->setEnabled(true);
-		ui->lineEditHostName->setEnabled(true);
+		ui->groupBoxDeviceSettings->hide();
 	}
 }
 
@@ -331,25 +343,38 @@
 		ui->lineEditHostName->setText("localhost");
 		ui->spinBoxTCPPort->setValue(DEFAULT_TCP_PORT_FOR_SLOT(configuredSlot));
 
-		ui->groupBoxDeviceSettings->setEnabled(false);
+		ui->groupBoxConnectionSettings->show();
 
 		ui->scrollArea->ensureWidgetVisible(ui->groupBoxTelescopeProperties);
 	}
 	else
 	{
-		ui->groupBoxDeviceSettings->setEnabled(true);
+		ui->groupBoxConnectionSettings->hide();
 	}
 }
 
 void TelescopeConfigurationDialog::toggleTypeVirtual(bool isChecked)
 {
-	//TODO: This really should be done in the GUI
-	ui->groupBoxDeviceSettings->setEnabled(!isChecked);
-	ui->groupBoxConnectionSettings->setEnabled(!isChecked);
-
 	ui->scrollArea->ensureWidgetVisible(ui->groupBoxTelescopeProperties);
 }
 
+void TelescopeConfigurationDialog::toggleTypeRTS2(bool isChecked)
+{
+	if(isChecked)
+	{
+		//Re-initialize values that may have been changed
+		ui->lineEditRTS2Url->setText("localhost:8889");
+
+		ui->groupBoxRTS2Settings->show();
+
+		ui->scrollArea->ensureWidgetVisible(ui->groupBoxRTS2Settings);
+	}
+	else
+	{
+		ui->groupBoxRTS2Settings->hide();
+	}
+}
+
 void TelescopeConfigurationDialog::buttonSavePressed()
 {
 	//Main telescope properties
@@ -415,6 +440,11 @@
 		type = ConnectionVirtual;
 		telescopeManager->addTelescopeAtSlot(configuredSlot, type, name, equinox, QString(), portTCP, delay, connectAtStartup, circles);
 	}
+	else if (ui->radioButtonTelescopeRTS2->isChecked())
+	{
+		type = ConnectionRTS2;
+		telescopeManager->addTelescopeAtSlot(configuredSlot, type, name, equinox, host, portTCP, delay, connectAtStartup, circles, QString(), QString(), ui->lineEditRTS2Url->text(), ui->lineEditRTS2Username->text(), ui->lineEditRTS2Password->text());
+	}
 	
 	emit changesSaved(name, type);
 }

=== modified file 'plugins/TelescopeControl/src/gui/TelescopeConfigurationDialog.hpp'
--- plugins/TelescopeControl/src/gui/TelescopeConfigurationDialog.hpp	2016-04-23 13:33:16 +0000
+++ plugins/TelescopeControl/src/gui/TelescopeConfigurationDialog.hpp	2017-04-06 13:21:42 +0000
@@ -63,6 +63,7 @@
 	void toggleTypeLocal(bool);
 	void toggleTypeConnection(bool);
 	void toggleTypeVirtual(bool);
+	void toggleTypeRTS2(bool);
 	
 	void deviceModelSelected(const QString&);
 	bool validateHost(QString hostName);

=== modified file 'plugins/TelescopeControl/src/gui/TelescopeDialog.cpp'
--- plugins/TelescopeControl/src/gui/TelescopeDialog.cpp	2017-01-05 15:28:52 +0000
+++ plugins/TelescopeControl/src/gui/TelescopeDialog.cpp	2017-04-06 13:21:42 +0000
@@ -176,7 +176,10 @@
 		QList<double> circles;
 		QString serverName;
 		QString portSerial;
-		if(!telescopeManager->getTelescopeAtSlot(slotNumber, connectionType, name, equinox, host, portTCP, delay, connectAtStartup, circles, serverName, portSerial))
+		QString rts2Url;
+		QString rts2Username;
+		QString rts2Password;
+		if(!telescopeManager->getTelescopeAtSlot(slotNumber, connectionType, name, equinox, host, portTCP, delay, connectAtStartup, circles, serverName, portSerial, rts2Url, rts2Username, rts2Password))
 			continue;
 		
 		//Determine the server type
@@ -502,6 +505,10 @@
 			// TRANSLATORS: Telescope connection type
 			typeLabel = N_("virtual");
 			break;
+		case ConnectionRTS2:
+			// TRANSLATORS: Telescope connection type
+			typeLabel = N_("RTS2");
+			break;
 		default:
 			;
 	}

=== modified file 'plugins/TelescopeControl/src/gui/telescopeConfigurationDialog.ui'
--- plugins/TelescopeControl/src/gui/telescopeConfigurationDialog.ui	2016-04-23 15:55:46 +0000
+++ plugins/TelescopeControl/src/gui/telescopeConfigurationDialog.ui	2017-04-06 13:21:42 +0000
@@ -213,6 +213,28 @@
        </widget>
       </item>
       <item>
+       <widget class="QRadioButton" name="radioButtonTelescopeRTS2">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="minimumSize">
+         <size>
+          <width>0</width>
+          <height>24</height>
+         </size>
+        </property>
+        <property name="toolTip">
+         <string>Telescope which is accessible through RTS2(.org) JSON API</string>
+        </property>
+        <property name="text">
+         <string>RTS2 telescope</string>
+        </property>
+       </widget>
+      </item>
+      <item>
        <widget class="QRadioButton" name="radioButtonTelescopeVirtual">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
@@ -243,9 +265,9 @@
       <property name="geometry">
        <rect>
         <x>0</x>
-        <y>0</y>
-        <width>549</width>
-        <height>520</height>
+        <y>-283</y>
+        <width>547</width>
+        <height>603</height>
        </rect>
       </property>
       <layout class="QVBoxLayout" name="verticalLayoutScrollArea">
@@ -580,7 +602,7 @@
           <item row="0" column="0">
            <widget class="QLabel" name="labelHost">
             <property name="enabled">
-             <bool>false</bool>
+             <bool>true</bool>
             </property>
             <property name="text">
              <string>Host:</string>
@@ -590,7 +612,7 @@
           <item row="1" column="0">
            <widget class="QLineEdit" name="lineEditHostName">
             <property name="enabled">
-             <bool>false</bool>
+             <bool>true</bool>
             </property>
             <property name="toolTip">
              <string>Host name or IPv4 address of the machine that hosts the telescope server</string>
@@ -640,6 +662,90 @@
         </widget>
        </item>
        <item>
+        <widget class="QGroupBox" name="groupBoxRTS2Settings">
+         <property name="title">
+          <string>RTS2 telescope settings</string>
+         </property>
+         <layout class="QGridLayout" name="gridLayout">
+          <property name="leftMargin">
+           <number>0</number>
+          </property>
+          <property name="topMargin">
+           <number>0</number>
+          </property>
+          <property name="rightMargin">
+           <number>0</number>
+          </property>
+          <property name="bottomMargin">
+           <number>0</number>
+          </property>
+          <item row="0" column="0">
+           <widget class="QLabel" name="labelRTS2Host">
+            <property name="text">
+             <string>URL:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="0">
+           <widget class="QLabel" name="labelRTS2Username">
+            <property name="text">
+             <string>Username:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="1">
+           <widget class="QLabel" name="labelRTS2Password">
+            <property name="text">
+             <string>Password:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="0">
+           <widget class="QLineEdit" name="lineEditRTS2Username">
+            <property name="toolTip">
+             <string>RTS2 username</string>
+            </property>
+            <property name="text">
+             <string notr="true"/>
+            </property>
+            <property name="maxLength">
+             <number>50</number>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="1">
+           <widget class="QLineEdit" name="lineEditRTS2Password">
+            <property name="toolTip">
+             <string>RTS2 password</string>
+            </property>
+            <property name="text">
+             <string notr="true"/>
+            </property>
+            <property name="maxLength">
+             <number>50</number>
+            </property>
+            <property name="echoMode">
+             <enum>QLineEdit::Password</enum>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="0" colspan="2">
+           <widget class="QLineEdit" name="lineEditRTS2Url">
+            <property name="toolTip">
+             <string>URL of the machine that hosts the RTS2 JSON (httpd) server</string>
+            </property>
+            <property name="text">
+             <string notr="true">localhost</string>
+            </property>
+            <property name="maxLength">
+             <number>255</number>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item>
         <widget class="QGroupBox" name="groupBoxUserInterface">
          <property name="title">
           <string>User interface settings</string>