Merge branch 'master' into devel

This commit is contained in:
Oskar Weigl
2018-03-04 01:01:13 -08:00
2 changed files with 2 additions and 2 deletions
+1 -1
View File
@@ -129,7 +129,7 @@ If the flashing worked, you can start sending commands. If you want to do that n
## Communicating over USB or UART
Warning: If testing USB or UART communication for the first time it is recommend that your motors are free to spin continuously and are not connected to a drivetrain with limited travel.
### From Linux/Windows/macOS
There are two example python scripts to help you get started with controlling the ODrive using python. One will drop you into an interactive shell to query settings, parameters, and variables, and let you send setpoints manually ([tools/explore_odrive.py](tools/explore_odrive.py)). The other is a demo application to show you how to control the ODrive programmatically ([tools/demo.py](tools/demo.py)). Below follows a step-by-step guide on how to run these.
There are two example python scripts to help you get started with controlling the ODrive using python. One will drop you into an interactive shell to query settings, parameters, and variables, and let you send setpoints manually ([tools/explore_odrive.py](../tools/explore_odrive.py)). The other is a demo application to show you how to control the ODrive programmatically ([tools/demo.py](../tools/demo.py)). Below follows a step-by-step guide on how to run these.
* __Windows__: It is recommended to use a Unix style command prompt, such as Git Bash that comes with [Git for windows](https://git-scm.com/download/win).
+1 -1
View File
@@ -52,7 +52,7 @@ s type index value
** `0` is float
** `1` is int
** `2` is bool
* `index` is the index in the corresponding [exposed variable table](MotorControl/commands.c).
* `index` is the index in the corresponding [exposed variable table](MotorControl/legacy_commands.c).
For example
* `g 0 12` will return the phase resistance of M0