Merge branch 'master' into after-hope

.circleci/config.yml

@@ -5,11 +5,11 @@ jobs:
       - image: "python:3.6"
     steps:
       - checkout
-      - run: apt update
-      - run: apt install gettext-base
-      - run: envsubst < setup.py.template > setup.py
+#       - run: apt update
+#       - run: apt install gettext-base
+#       - run: envsubst < setup.py > setup.py
       - run: cat setup.py
-      - run: python setup.py sdist
+      - run: python setup.py sdist bdist_wheel && ls -l
       - run: pip install twine
       - run: twine upload dist/*
     branches:

README.md

@@ -9,6 +9,8 @@ Based on Communication Protocol V1.1.4 (_latest version [here](https://www.dobot
 Installation
 ---
 
+Install driver from https://www.silabs.com/products/development-tools/software/usb-to-uart-bridge-vcp-drivers.
+
 ```
 pip install pydobot
 ```
@@ -39,25 +41,25 @@ Methods
 * **Dobot(port, verbose=False)** Creates an instance of dobot connected to given serial port.
     * **port**: _string_ with name of serial port to connect
     * **verbose**: _bool_ will print to console all serial comms
-  
+
 * **.pose()** Returns the current pose of dobot, as a tuple (x, y, z, r, j1, j2, j3, j4)
-    * **x**: _float_ current x cartesian coordinate 
+    * **x**: _float_ current x cartesian coordinate
     * **y**: _float_ current y cartesian coordinate
     * **z**: _float_ current z cartesian coordinate
-    * **r**: _float_ current effector rotation 
-    * **j1**: _float_ current joint 1 angle 
-    * **j2**: _float_ current joint 2 angle 
-    * **j3**: _float_ current joint 3 angle 
-    * **j4**: _float_ current joint 4 angle 
+    * **r**: _float_ current effector rotation
+    * **j1**: _float_ current joint 1 angle
+    * **j2**: _float_ current joint 2 angle
+    * **j3**: _float_ current joint 3 angle
+    * **j4**: _float_ current joint 4 angle
 * **.move_to(x, y, z, r, wait=False)** queues a translation in dobot to given coordinates
-    * **x**: _float_ x cartesian coordinate to move 
-    * **y**: _float_ y cartesian coordinate to move 
-    * **z**: _float_ z cartesian coordinate to move 
-    * **r**: _float_ r effector rotation 
+    * **x**: _float_ x cartesian coordinate to move
+    * **y**: _float_ y cartesian coordinate to move
+    * **z**: _float_ z cartesian coordinate to move
+    * **r**: _float_ r effector rotation
     * **wait**: _bool_ waits until command has been executed to return to process
 * **.speed(velocity, acceleration)** changes velocity and acceleration at which the dobot moves to future coordinates
-    * **velocity**: _float_ desired translation velocity 
-    * **acceleration**: _float_ desired translation acceleration 
+    * **velocity**: _float_ desired translation velocity
+    * **acceleration**: _float_ desired translation acceleration
 * **.suck(enable)**
     * **enable**: _bool_ enables/disables suction
 * **.grip(enable)**

setup.py.template → setup.py

@@ -6,14 +6,14 @@
 setuptools.setup(
     name='pydobot',
     packages=['pydobot'],
-    version='1.0.2',
+    version='1.1.0',
     description='Python library for Dobot Magician',
     long_description=long_description,
     long_description_content_type='text/markdown',
     author='Luis Mesas',
     author_email='[email protected]',
     url='https://github.com/luismesas/pydobot',
-    download_url='https://github.com/luismesas/pydobot/archive/v1.0.2.tar.gz',
+    download_url='https://github.com/luismesas/pydobot/archive/v1.1.0.tar.gz',
     keywords=['dobot', 'magician', 'robotics'],
     classifiers=[],
     install_requires=[