Skip to content

Commit aa0e269

Browse files
committed
fixes and slashes
1 parent fe680ce commit aa0e269

File tree

5 files changed

+19
-15
lines changed

5 files changed

+19
-15
lines changed

DuetRRFOutputDevice.py

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,7 @@ class DeviceType(Enum):
3333

3434

3535
class DuetRRFOutputDevice(OutputDevice):
36-
def __init__(
37-
self,
38-
name="DuetRRF",
39-
url="http://printer.local",
40-
duet_password="reprap",
41-
http_user=None,
42-
http_password=None,
43-
device_type=DeviceType.print
44-
):
36+
def __init__(self, name, url, duet_password, http_user, http_password, device_type):
4537
self._device_type = device_type
4638
if device_type == DeviceType.print:
4739
description = catalog.i18nc("@action:button", "Print on {0}").format(name)

DuetRRFPlugin.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,8 @@ def saveInstance(self, oldName, name, url, duet_password, http_user, http_passwo
9999
manager = self.getOutputDeviceManager()
100100
if oldName and oldName != name:
101101
self.removeInstance(name)
102+
if not url.endswith('/'):
103+
url += '/'
102104
self._instances[name] = {
103105
"url": url,
104106
"duet_password": duet_password,

DuetRRFPlugin.qml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ UM.Dialog
257257
Item { width: parent.width; height: displayNameLabel.height; }
258258
Label {
259259
visible: !instanceDialog.validUrl;
260-
text: catalog.i18nc("@error", "URL not valid. Example: http://192.168.1.42");
260+
text: catalog.i18nc("@error", "URL not valid. Example: http://192.168.1.42/");
261261
}
262262
}
263263

README.md

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,18 +29,28 @@ above.
2929
* From the menu bar choose: Extensions -> DuetRRF -> DuetRRF Connections
3030
* Click "Add"
3131
* Enter the name of your printer
32-
* Enter the URL to your DuetRRF instance, e.g., http://printer.local or http://192.168.1.42
33-
* Leave "HTTP Basic Auth" empty if you don't run a reverse-proxy
32+
- e.g., `MyBigBox`
33+
* Enter the URL to your DuetWifi/DuetEthernet board
34+
- make sure this URL works if you copy & paste it into your browser
35+
- if you browse to that URL, you should see the DuetWebControl (DWC)
36+
- e.g., `http://printer.local/` or `http://192.168.1.42/`
37+
* If you used `M551` in your `config.g`, enter the password
38+
- e.g., `my_little!secret` or the default `reprap`
39+
* If you use a reverse proxy to add *HTTP Basic Auth*, enter the credentials
40+
- if you don't know what *HTTP Basic Auth* is, leave these fields empty
41+
- e.g., username: `alice`, password: `ecila`
3442
* Click "Ok"
35-
* Done! Look at the bottom right - there should be the big blue button with you printer name on it!
43+
* Done!
44+
45+
Look at the bottom right - there should be the big blue button with you printer name on it!
3646

3747
## Features
3848

3949
* Upload / Simulate / Print
4050
* Works with HTTP and HTTPS connections and URLS
4151
* Works with HTTP Basic Auth (optional)
4252
* Works with RRF passwords (if you used `M551`, default is `reprap`)
43-
* No support for UNC paths as URL
53+
* No support for UNC paths, only IP addresses or resolvable domain names (DNS)
4454

4555

4656
## Use

plugin.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
"name": "DuetRRF",
33
"author": "Thomas Kriechbaumer",
44
"description": "Provides direct upload of gcode to DuetRRF.",
5-
"version": "0.0.10",
5+
"version": "0.0.11",
66
"api": 4
77
}

0 commit comments

Comments
 (0)