Skip to content

Commit 4089ff3

Browse files
author
AndyEveritt
committed
get response from send_code when using DWC api
1 parent a5df837 commit 4089ff3

5 files changed

Lines changed: 36 additions & 4 deletions

File tree

.bumpversion.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[bumpversion]
2-
current_version = 1.1.2-b4
2+
current_version = 1.1.2-b5
33
commit = False
44
tag = False
55
allow_dirty = False

duetwebapi/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
__version__ = "1.1.2-b4"
1+
__version__ = "1.1.2-b5"
22

33
from .dwa_factory import DuetWebAPI

duetwebapi/api/base.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,14 @@ def base_url(self, value: str):
2121
value = f'http://{value}'
2222
self._base_url = value
2323

24+
def connect(self, **kwargs):
25+
""" Start connection to Duet """
26+
raise NotImplementedError
27+
28+
def disconnect(self):
29+
""" End connection to Duet """
30+
raise NotImplementedError
31+
2432
def get_model(self, key: str = None) -> Dict:
2533
""" Get Duet object model. RRF3 only """
2634
raise NotImplementedError

duetwebapi/api/dwc_api.py

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,22 @@ class DWCAPI(DuetAPI):
1717
"""
1818
api_name = 'DWC_REST'
1919

20+
def connect(self, password=''):
21+
""" Start connection to Duet """
22+
url = f'{self.base_url}/rr_connect'
23+
r = requests.get(url, {'password': password})
24+
if not r.ok:
25+
raise ValueError
26+
return r.json()
27+
28+
def disconnect(self):
29+
""" End connection to Duet """
30+
url = f'{self.base_url}/rr_disconnect'
31+
r = requests.get(url)
32+
if not r.ok:
33+
raise ValueError
34+
return r.json()
35+
2036
def get_model(self, key: str = None) -> Dict:
2137
url = f'{self.base_url}/rr_model'
2238
r = requests.get(url, {'flags': 'd99vn', 'key': key})
@@ -25,12 +41,20 @@ def get_model(self, key: str = None) -> Dict:
2541
j = r.json()
2642
return j['result']
2743

44+
def _get_reply(self) -> Dict:
45+
url = f'{self.base_url}/rr_reply'
46+
r = requests.get(url)
47+
if not r.ok:
48+
raise ValueError
49+
return r.text
50+
2851
def send_code(self, code: str) -> Dict:
2952
url = f'{self.base_url}/rr_gcode'
3053
r = requests.get(url, {'gcode': code})
3154
if not r.ok:
3255
raise ValueError
33-
return {'response': ''}
56+
reply = self._get_reply()
57+
return {'response': reply}
3458

3559
def get_file(self, filename: str, directory: str = 'gcodes') -> str:
3660
"""

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
setup(
1111
name="duetwebapi",
12-
version="1.1.2-b4",
12+
version="1.1.2-b5",
1313
include_package_data=True,
1414
packages=find_packages(),
1515

0 commit comments

Comments
 (0)