Skip to content

Commit

Permalink
Merge pull request #82 from Peter-van-Tol/79-stepgen-only-working-up-…
Browse files Browse the repository at this point in the history
…to-4-steppers

79 stepgen only working up to 4 steppers
  • Loading branch information
Peter-van-Tol committed Feb 12, 2024
2 parents 5cd392f + 452c189 commit 79a9db2
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
4 changes: 4 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,16 @@ is a safeguard to prevent miscommunication.
Version 1.2.2 (upcoming)
========================

Bugfix version for ``stepgen`` module, which was affected by an error in the ``encoder`` module.

* ``driver``:

* ``encoder``: counts and position of encoder can be reset (#74)
* ``encoder``: incorrect required read buffer reported has been corrected. This affected the module ``stepgen`` (#79)
* ``watchdog``: the watchdog is reset when the card is reset. Prevents the ``has_bitten`` message when LinuxCNC
is restarted without power-cycling the card. (#80)


Version 1.2.1
=============

Expand Down
2 changes: 1 addition & 1 deletion src/litexcnc/driver/modules/litexcnc_encoder.c
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ size_t required_read_buffer(void *instance) {
// (32 bits). When there are more then 32 encoders, another DWORD is added to the
// registers. For each encoder there is also a struct with the number of counts
// retrieved.
return single_dword_buffer(encoder) + num_instances * sizeof(litexcnc_encoder_instance_read_data_t);
return single_dword_buffer(encoder) + encoder->num_instances * sizeof(litexcnc_encoder_instance_read_data_t);
}


Expand Down

0 comments on commit 79a9db2

Please sign in to comment.