Merge pull request #1 from anki/master

Merge upstream
iplusplus42 · Oct 1, 2020 · 4da0d52 · 4da0d52
2 parents 8949fb6 + dd29ede
commit 4da0d52
Show file tree

Hide file tree

Showing 41 changed files with 614 additions and 951 deletions.
diff --git a/docs/source/adb.rst b/docs/source/adb.rst
@@ -116,3 +116,7 @@ Final Installation (All Platforms)
 
       List of devices attached
       88148a08 unauthorized
+
+`Terms and Conditions <https://www.anki.com/en-us/company/terms-and-conditions>`_ and `Privacy Policy <https://www.anki.com/en-us/company/privacy>`_
+
+`Click here to return to the Anki Developer website. <http://developer.anki.com>`_
diff --git a/docs/source/api.rst b/docs/source/api.rst
@@ -26,6 +26,7 @@ The API
     cozmo.robot
     cozmo.robot_alignment
     cozmo.run
+    cozmo.song
     cozmo.tkview
     cozmo.util
     cozmo.world
@@ -34,4 +35,6 @@ The API
 
 ----
 
-`Click here to return to the Cozmo Developer website. <http://developer.anki.com>`_
+`Terms and Conditions <https://www.anki.com/en-us/company/terms-and-conditions>`_ and `Privacy Policy <https://www.anki.com/en-us/company/privacy>`_
+
+`Click here to return to the Anki Developer website. <http://developer.anki.com>`_
diff --git a/docs/source/downloads.rst b/docs/source/downloads.rst
@@ -20,4 +20,6 @@ Clone, fork, or report issues on the `GitHub cozmo-python-sdk repository <https:
 
 ----
 
-`Click here to return to the Cozmo Developer website. <http://developer.anki.com>`_
+`Terms and Conditions <https://www.anki.com/en-us/company/terms-and-conditions>`_ and `Privacy Policy <https://www.anki.com/en-us/company/privacy>`_
+
+`Click here to return to the Anki Developer website. <http://developer.anki.com>`_
diff --git a/docs/source/getstarted.rst b/docs/source/getstarted.rst
@@ -145,4 +145,6 @@ Now, nightnight.py is saved in the same folder as 01_hello_world.py.
 
 Now that you have written your own Cozmo program, take a look at the rest of the Cozmo SDK and at the many other example programs to get more ideas.
 
-`Click here to return to the Cozmo Developer website. <http://developer.anki.com>`_
+`Terms and Conditions <https://www.anki.com/en-us/company/terms-and-conditions>`_ and `Privacy Policy <https://www.anki.com/en-us/company/privacy>`_
+
+`Click here to return to the Anki Developer website. <http://developer.anki.com>`_
diff --git a/docs/source/index.rst b/docs/source/index.rst
@@ -33,12 +33,6 @@ Welcome to the Cozmo SDK!
 
     getstarted.rst
 
-.. toctree::
-    :maxdepth: 2
-    :caption: Advanced Tutorial
-
-    tutorial-advanced.rst
-
 .. toctree::
     :maxdepth: 2
     :caption: SDK Versions
@@ -61,4 +55,6 @@ Indices and tables
 
 ----
 
-`Click here to return to the Cozmo Developer website. <http://developer.anki.com>`_
+`Terms and Conditions <https://www.anki.com/en-us/company/terms-and-conditions>`_ and `Privacy Policy <https://www.anki.com/en-us/company/privacy>`_
+
+`Click here to return to the Anki Developer website. <http://developer.anki.com>`_
diff --git a/docs/source/initial.rst b/docs/source/initial.rst
@@ -68,4 +68,6 @@ Please visit the `Cozmo SDK Forums <https://forums.anki.com/>`_ to ask questions
 
 ----
 
-`Click here to return to the Cozmo Developer website. <http://developer.anki.com>`_
+`Terms and Conditions <https://www.anki.com/en-us/company/terms-and-conditions>`_ and `Privacy Policy <https://www.anki.com/en-us/company/privacy>`_
+
+`Click here to return to the Anki Developer website. <http://developer.anki.com>`_
diff --git a/docs/source/install-linux.rst b/docs/source/install-linux.rst
@@ -113,4 +113,6 @@ Please see the :ref:`trouble` section of the Initial Setup page for tips, or vis
 
 ----
 
-`Click here to return to the Cozmo Developer website. <http://developer.anki.com>`_
+`Terms and Conditions <https://www.anki.com/en-us/company/terms-and-conditions>`_ and `Privacy Policy <https://www.anki.com/en-us/company/privacy>`_
+
+`Click here to return to the Anki Developer website. <http://developer.anki.com>`_
diff --git a/docs/source/install-macos.rst b/docs/source/install-macos.rst
@@ -65,4 +65,6 @@ Please see the :ref:`trouble` section of the Initial Setup page for tips, or vis
 
 ----
 
-`Click here to return to the Cozmo Developer website. <http://developer.anki.com>`_
+`Terms and Conditions <https://www.anki.com/en-us/company/terms-and-conditions>`_ and `Privacy Policy <https://www.anki.com/en-us/company/privacy>`_
+
+`Click here to return to the Anki Developer website. <http://developer.anki.com>`_
diff --git a/docs/source/install-windows.rst b/docs/source/install-windows.rst
@@ -63,4 +63,6 @@ Please see the :ref:`trouble` section of the Initial Setup page for tips, or vis
 
 ----
 
-`Click here to return to the Cozmo Developer website. <http://developer.anki.com>`_
+`Terms and Conditions <https://www.anki.com/en-us/company/terms-and-conditions>`_ and `Privacy Policy <https://www.anki.com/en-us/company/privacy>`_
+
+`Click here to return to the Anki Developer website. <http://developer.anki.com>`_
diff --git a/docs/source/sdk-versions.rst b/docs/source/sdk-versions.rst
@@ -43,9 +43,39 @@ The Cozmo SDK is updated often in order to provide you with the best possible us
 +---------------+---------------+
 | 2.1.0         | 1.2.1         |
 +---------------+---------------+
+| 2.2.0         | 1.3.0         |
++---------------+---------------+
+| 2.3.0         | 1.3.1         |
++---------------+---------------+
+| 2.4.0         | 1.3.2         |
++---------------+---------------+
+| 2.5.0         | 1.4.0         |
++---------------+---------------+
+| 2.6.0         | 1.4.1         |
++---------------+---------------+
+| 2.7.0         | 1.4.2         |
++---------------+---------------+
+| 2.8.0         | 1.4.3         |
++---------------+---------------+
+| 2.9.0         | 1.4.4         |
++---------------+---------------+
+| 2.10.0        | 1.4.5         |
++---------------+---------------+
+| 3.0.1         | 1.4.6         |
++---------------+---------------+
+| 3.1.0         | 1.4.7         |
++---------------+---------------+
+| 3.2.0         | 1.4.8         |
++---------------+---------------+
+| 3.3.0         | 1.4.9         |
++---------------+---------------+
+| 3.4.0         | 1.4.10        |
++---------------+---------------+
 
 If you have incompatible versions of the app and the SDK, please update the app and SDK.
 
 ----
 
-`Click here to return to the Cozmo Developer website. <http://developer.anki.com>`_
+`Terms and Conditions <https://www.anki.com/en-us/company/terms-and-conditions>`_ and `Privacy Policy <https://www.anki.com/en-us/company/privacy>`_
+
+`Click here to return to the Anki Developer website. <http://developer.anki.com>`_
diff --git a/docs/source/tutorial-advanced.rst b/docs/source/tutorial-advanced.rst
diff --git a/docs/source/vagrant.rst b/docs/source/vagrant.rst
@@ -136,4 +136,6 @@ For example, to run the Hello World example program, you would type ``./hello_wo
 
 ----
 
-`Click here to return to the Cozmo Developer website. <http://developer.anki.com>`_
+`Terms and Conditions <https://www.anki.com/en-us/company/terms-and-conditions>`_ and `Privacy Policy <https://www.anki.com/en-us/company/privacy>`_
+
+`Click here to return to the Anki Developer website. <http://developer.anki.com>`_
diff --git a/examples/README.md b/examples/README.md
@@ -2,7 +2,7 @@
 
 See the [tutorials](tutorials) directory for a progression of example programs all the way from [hello_world](tutorials/01_basics/01_hello_world.py) in the [01_basics](tutorials/01_basics) sub-directory, through to more advanced vision and action examples.
 
-See the [apps](apps) directory for some fun fully-featured programs like a remote control, a desk security guard, and integrations with Twitter.
+See the [apps](apps) directory for some fun fully-featured programs like a remote control and a desk security guard.
 
 See the [if_this_then_that](if_this_then_that) directory for some examples that connect Cozmo to the "If This Then That" service.
 

diff --git a/examples/apps/cozmo_reads_tweets.py b/examples/apps/cozmo_reads_tweets.py