Skip to content

Commit 947bb14

Browse files
authored
Merge branch 'master' into fix/init_planner
2 parents 7f04984 + b471af5 commit 947bb14

File tree

8 files changed

+550
-144
lines changed

8 files changed

+550
-144
lines changed

AUTHORS.rst

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ If you use COMPAS FAB in a project, please use the following citation:
1616
D\"{o}rfler, K. and
1717
Helmreich, M. and
1818
Gandia, A. and
19-
Ma, Z
19+
Ma, Z. and
20+
Ariza, I.
2021
},
2122
howpublished={https://github.com/compas-dev/compas\_fab/},
2223
note={Gramazio Kohler Research, ETH Z\"{u}rich},
@@ -35,3 +36,4 @@ Authors
3536
* Matthias Helmreich <[email protected]> `@mhelmrei <https://github.com/mhelmrei>`_
3637
* Augusto Gandia <[email protected]> `@augustogandia <https://github.com/augustogandia>`_
3738
* Zhao Ma <[email protected]> `@xarthurx <https://github.com/xarthurx>`_
39+
* Inés Ariza <[email protected]> `@inesariza <https://github.com/inesariza>`_

CHANGELOG.rst

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,25 @@ Unreleased
1212

1313
**Changed**
1414

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

23+
* Added ``compas_fab.sensors.baumer.PosCon3D.reset()``
24+
* Added ``compas_fab.sensors.baumer.PosConCM.reset()``
25+
26+
1727
**Removed**
1828

29+
* Removed ``compas_fab.sensors.baumer.PosConCM.get_live_monitor_data()``
30+
1931
**Fixed**
2032

21-
- Fixed missing planner initialization when used without context manager.
33+
* Fixed missing planner initialization when used without context manager.
2234

2335
0.6.0
2436
----------
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)