Merge pull request #8 from mabrobotics/1.5.1_release_candidate

1.5.1 release candidate
mabrobotics · Jun 24, 2024 · 5023bda · 5023bda
2 parents 8feac32 + ad106d4
commit 5023bda
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,3 +8,4 @@ build
 wheelhouse
 tmpvenv
 src/pyCandleMAB.egg-info
+venv/
diff --git a/bindings.cpp b/bindings.cpp
@@ -309,7 +309,8 @@ PYBIND11_MODULE(pyCandle, m)
 		.def_readwrite("targetTorque", &mab::regRW_st::targetTorque)
 		.def_readwrite("motionMode", &mab::regRW_st::motionMode)
 		.def_readwrite("state", &mab::regRW_st::state)
-		.def_readwrite("reverseDirection", &mab::regRW_st::reverseDirection);
+		.def_readwrite("reverseDirection", &mab::regRW_st::reverseDirection)
+		.def_readwrite("brakeMode", &mab::regRW_st::brakeMode);
 
 	py::class_<mab::ImpedanceControllerGains_t>(m, "ImpedanceControllerGains_t")
 		.def(py::init())

diff --git a/setup.py b/setup.py
@@ -80,7 +80,7 @@ def build_extension(self, ext):
 
 setup(
     name="pyCandleMAB",
-    version="1.5.0",
+    version="1.5.1",
     author="Piotr Wasilewski",
     author_email="[email protected]",
     description="Python package for controlling MD80-based actuators",

diff --git a/src/candle b/src/candle
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,3 +8,4 @@ build @@
     wheelhouse
     tmpvenv
     src/pyCandleMAB.egg-info
+    venv/
+1 −1		CMakeLists.txt
+3 −0		include/register.hpp
+1 −0		include/usbDevice.hpp
+2 −1		src/candle.cpp
+1 −0		src/register.cpp
+1 −0		src/usbDevice.cpp