Skip to content

Commit 77df9a2

Browse files
authored
Merge pull request #72 from compas-dev/update_baumer
Update sensors.baumer module
2 parents 744338b + 55a9472 commit 77df9a2

File tree

7 files changed

+544
-142
lines changed

7 files changed

+544
-142
lines changed

CHANGELOG.rst

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,21 @@ Unreleased
1111
----------
1212

1313
**Changed**
14+
* Changed example for loading PosConCM (includes parity argument, differs from PosCon3D)
15+
* Changed format ``compas_fab.sensors.baumer.PosConCM.set_flex_mount()``
16+
* Changed tasks.py to run ``invoke test``
17+
* Fixed Python 2 vs Python 3 incompatibilities
18+
1419

1520
**Added**
1621

22+
* Added ``compas_fab.sensors.baumer.PosCon3D.reset()``
23+
* Added ``compas_fab.sensors.baumer.PosConCM.reset()``
24+
25+
1726
**Removed**
1827

28+
* Removed ``compas_fab.sensors.baumer.PosConCM.get_live_monitor_data()``
1929

2030
0.6.0
2131
----------
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
2+
.. automodule:: compas_fab.sensors

src/compas_fab/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
compas_fab.backends
1717
compas_fab.robots
1818
compas_fab.utilities
19-
19+
compas_fab.sensors
2020
compas_fab.blender
2121
compas_fab.ghpython
2222
compas_fab.rhino

src/compas_fab/sensors/__init__.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,17 @@
77
88
Package containing a common interface to integrate sensors of various vendors.
99
10+
Main classes
11+
------------
12+
1013
.. autosummary::
1114
:toctree: generated/
1215
:nosignatures:
1316
1417
SerialSensor
1518
1619
Baumer sensors
17-
==============
20+
--------------
1821
1922
.. currentmodule:: compas_fab.sensors.baumer
2023
@@ -25,7 +28,11 @@
2528
:nosignatures:
2629
2730
PosCon3D
31+
PosConCM
2832
2933
"""
3034

3135
from .base import *
36+
from .baumer import *
37+
38+
__all__ = [name for name in dir() if not name.startswith('_')]

0 commit comments

Comments
 (0)