Skip to content

Commit 2149bdb

Browse files
committed
Complete documentation
1 parent 7ef1721 commit 2149bdb

File tree

2 files changed

+88
-9
lines changed

2 files changed

+88
-9
lines changed

docs/README.md

Lines changed: 87 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,16 @@ We support Python2, Python3.5 or later.
8282
- [set_movement_type](#set_movement_type)
8383
- [get_movement_type](#get_movement_type)
8484
- [set_end_type](#set_end_type)
85-
- [get_movement_type](#get_movement_type-1)
85+
- [get_end_type](#get_end_type)
86+
- [get_plan_speed](#get_plan_speed)
87+
- [get_plan_acceleration](#get_plan_acceleration)
88+
- [set_plan_speed](#set_plan_speed)
89+
- [set_plan_acceleration](#set_plan_acceleration)
90+
- [get_servo_speeds](#get_servo_speeds)
91+
- [get_servo_currents](#get_servo_currents)
92+
- [get_servo_voltages](#get_servo_voltages)
93+
- [get_servo_status](#get_servo_status)
94+
- [get_servo_temps](#get_servo_temps)
8695
- [Raspberry pi -- GPIO](#raspberry-pi----gpio)
8796
- [gpio_init](#gpio_init)
8897
- [gpio_output](#gpio_output)
@@ -817,21 +826,91 @@ from pymycobot import MyCobot
817826
- **Parameters**:
818827
- `end`: 0 - flange, 1 - tool.
819828

820-
### get_movement_type
829+
### get_end_type
821830

822-
- **Prototype**: `get_movement_type()`
831+
- **Prototype**: `get_end_type()`
823832

824-
- **Description**: Get movement type.
833+
- **Description**: Get end coordinate system.
825834

826835
- **Return**: 0 - flange, 1 - tool.
827836

828-
<!-- ### get_plan_speed
837+
### get_plan_speed
829838

830-
- **Prototype**: `get_movement_type()`
839+
- **Prototype**: `get_plan_speed()`
831840

832-
- **Description**: Get movement type.
841+
- **Description**: Get planning speed.
842+
843+
- **Return**: [ `movel planning speed`, `movej planning speed`].
844+
845+
### get_plan_acceleration
846+
847+
- **Prototype**: `get_plan_acceleration()`
848+
849+
- **Description**: Get planning acceleration.
850+
851+
- **Return**: [ `movel planning acceleration`, `movej planning acceleration`].
852+
853+
### set_plan_speed
854+
855+
- **Prototype**: `set_plan_speed(speed, is_linear)`
856+
857+
- **Description**: Set planning speed.
858+
859+
- **Parameters**
860+
861+
- `speed` (`int`) 0 - 100.
862+
- `is_linear` (`int`): 0 / 1 (0 ->joint, 1 -> line)
863+
864+
### set_plan_acceleration
865+
866+
- **Prototype**: `set_plan_acceleration(acceleration, is_linear)`
867+
868+
- **Description**: Set planning acceleration.
869+
870+
- **Parameters**
871+
872+
- `acceleration` (`int`) 0 - 100.
873+
- `is_linear` (`int`): 0 / 1 (0 ->joint, 1 -> line)
874+
875+
### get_servo_speeds
876+
877+
- **Prototype**: `get_servo_speeds()`
878+
879+
- **Description**: Get joint velocity.
880+
881+
- **Return**: `list` Speed of each joint.
882+
883+
### get_servo_currents
884+
885+
- **Prototype**: `get_servo_currents()`
886+
887+
- **Description**: Get joint current.
888+
889+
- **Return**: `list` Current of each joint.
890+
891+
### get_servo_voltages
892+
893+
- **Prototype**: `get_servo_voltages()`
894+
895+
- **Description**: Get joint voltage.
896+
897+
- **Return**: `list` Voltage of each joint.
898+
899+
### get_servo_status
900+
901+
- **Prototype**: `get_servo_status()`
902+
903+
- **Description**: Get the state of each joint.
904+
905+
- **Return**: `list` the state of each joint.
906+
907+
### get_servo_temps
908+
909+
- **Prototype**: `get_servo_temps()`
910+
911+
- **Description**: Get the temperature of each joint.
833912

834-
- **Return**: 0 - flange, 1 - tool. -->
913+
- **Return**: `list` temperature of each joint.
835914

836915
## Raspberry pi -- GPIO
837916

pymycobot/generate.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -769,7 +769,7 @@ def set_plan_acceleration(self, acceleration, is_linear):
769769
"""
770770
return self._mesg(ProtocolCode.SET_PLAN_ACCELERATION, acceleration, is_linear)
771771

772-
def get_servo_speed(self):
772+
def get_servo_speeds(self):
773773
"""Get joint speed (Only for mycobot 350)"""
774774
return self._mesg(ProtocolCode.GET_SERVO_SPEED, has_reply=True)
775775

0 commit comments

Comments
 (0)