Skip to content

Commit f9408d2

Browse files
authored
Merge pull request #115 from Chr157i4n/dev
version 0.7.6
2 parents ee0afd5 + 1c44488 commit f9408d2

File tree

6 files changed

+18
-9
lines changed

6 files changed

+18
-9
lines changed

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
# Changelog
22

3+
## version 0.7.6
4+
5+
- added PwmConf reg
6+
- added initial value to gpio_setup when using gpiozero (RPi5)
7+
- fixed driver addr in demo/demo_script_06_multiple_drivers.py
8+
- fixed doubled log output when using multiple drivers
9+
- fixed VActual bit mask
10+
311
## version 0.7.5
412

513
- removed spidev dependency from TMC220X

demo/demo_script_06_multiple_drivers.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,16 @@
2929
# Multiple driver not tested
3030
if BOARD == Board.RASPBERRY_PI:
3131
tmc1 = Tmc2209(TmcEnableControlPin(21), TmcMotionControlStepDir(16, 20), TmcComUart("/dev/serial0"), driver_address=0)
32-
tmc2 = Tmc2209(TmcEnableControlPin(26), TmcMotionControlStepDir(13, 19), TmcComUart("/dev/serial0"), driver_address=0)
32+
tmc2 = Tmc2209(TmcEnableControlPin(26), TmcMotionControlStepDir(13, 19), TmcComUart("/dev/serial0"), driver_address=1)
3333
elif BOARD == Board.RASPBERRY_PI5:
3434
tmc1 = Tmc2209(TmcEnableControlPin(21), TmcMotionControlStepDir(16, 20), TmcComUart("/dev/ttyAMA0"), driver_address=0)
35-
tmc2 = Tmc2209(TmcEnableControlPin(26), TmcMotionControlStepDir(13, 19), TmcComUart("/dev/ttyAMA0"), driver_address=0)
35+
tmc2 = Tmc2209(TmcEnableControlPin(26), TmcMotionControlStepDir(13, 19), TmcComUart("/dev/ttyAMA0"), driver_address=1)
3636
elif BOARD == Board.NVIDIA_JETSON:
3737
raise Exception("Not tested for Nvidia Jetson, use with caution")
3838
else:
3939
# just in case
4040
tmc1 = Tmc2209(TmcEnableControlPin(21), TmcMotionControlStepDir(16, 20), TmcComUart("/dev/serial0"), driver_address=0)
41-
tmc2 = Tmc2209(TmcEnableControlPin(26), TmcMotionControlStepDir(13, 19), TmcComUart("/dev/serial0"), driver_address=0)
41+
tmc2 = Tmc2209(TmcEnableControlPin(26), TmcMotionControlStepDir(13, 19), TmcComUart("/dev/serial0"), driver_address=1)
4242

4343

4444

setup.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[metadata]
22
name = PyTmcStepper
3-
version = 0.7.5
3+
version = 0.7.6
44
author = Christian Köhlke
55
author_email = [email protected]
66
description = This is a Python libary to drive a stepper motor with a Trinamic stepper driver and a single board computer like a Raspberry Pi

src/tmc_driver/_tmc_gpio_board.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ def deinit(self):
234234
def gpio_setup(self, pin:int, mode:GpioMode, initial:Gpio=Gpio.LOW, pull_up_down:GpioPUD=GpioPUD.PUD_OFF):
235235
"""setup GPIO pin"""
236236
if mode == GpioMode.OUT:
237-
self._gpios[pin] = self.gpiozero.DigitalOutputDevice(pin)
237+
self._gpios[pin] = self.gpiozero.DigitalOutputDevice(pin, initial_value =bool(initial))
238238
else:
239239
self._gpios[pin] = self.gpiozero.DigitalInputDevice(pin)
240240

@@ -327,7 +327,7 @@ def gpio_output(self, pin:int, value):
327327

328328
board_mapping = {
329329
"raspberry pi 5": (GpiozeroWrapper, Board.RASPBERRY_PI5, "gpiozero", "https://gpiozero.readthedocs.io/en/stable/installing.html"),
330-
"raspberry": (RPiGPIOWrapper, Board.RASPBERRY_PI, "RPi.GPIO", "https://sourceforge.net/p/raspberry-gpio-python/wiki/install"),
330+
"raspberry": (GpiozeroWrapper, Board.RASPBERRY_PI, "RPi.GPIO", "https://sourceforge.net/p/raspberry-gpio-python/wiki/install"),
331331
"jetson": (JetsonGPIOWrapper, Board.NVIDIA_JETSON, "jetson-gpio", "https://github.com/NVIDIA/jetson-gpio"),
332332
"luckfox": (peripheryWrapper, Board.LUCKFOX_PICO, "periphery", "https://github.com/vsergeev/python-periphery"),
333333
"orange": (OPiGPIOWrapper, Board.ORANGE_PI, "OPi.GPIO", "https://github.com/rm-hull/OPi.GPIO")

src/tmc_driver/reg/_tmc220x_reg.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ def __init__(self, tmc_com: TmcCom):
144144
"""constructor"""
145145

146146
reg_map = [
147-
["vactual", 0, 0x1FFFFF, int, None, ""]
147+
["vactual", 0, 0xFFFFFF, int, None, ""]
148148
]
149149
super().__init__(0x22, "VACTUAL", tmc_com, reg_map)
150150

src/tmc_driver/tmc_220x.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,10 @@ def __init__(self,
7676
Defaults to None (messages are logged in the format
7777
'%(asctime)s - %(name)s - %(levelname)s - %(message)s').
7878
"""
79-
super().__init__(tmc_ec, tmc_mc, gpio_mode, loglevel, logprefix, log_handlers, log_formatter)
79+
if logprefix is None:
80+
logprefix = f"TMC2209 {driver_address}"
8081

81-
self.tmc_logger.set_logprefix(f"TMC2209 {driver_address}")
82+
super().__init__(tmc_ec, tmc_mc, gpio_mode, loglevel, logprefix, log_handlers, log_formatter)
8283

8384
if tmc_com is not None:
8485
self.tmc_com = tmc_com

0 commit comments

Comments
 (0)