1
0
mirror of https://github.com/nophead/NopSCADlib.git synced 2025-09-03 12:22:46 +02:00

Compare commits

...

5 Commits

Author SHA1 Message Date
Chris Palmer
4b93623492 changelog.py now omits "Updated changelog" commits. 2021-03-13 11:19:59 +00:00
Chris Palmer
d496898c80 Updated changelog 2021-03-13 10:46:30 +00:00
Chris Palmer
544e69c71b pulley_pr() now has an optional belt type for non-standard belt over smooth pulleys. 2021-03-13 10:45:54 +00:00
Chris Palmer
e46e6b6e5b Fixed markdown numbered points in core_xy. 2021-03-08 22:57:00 +00:00
Chris Palmer
4925979519 Updated changelog. 2021-03-06 21:41:15 +00:00
5 changed files with 15 additions and 5 deletions

View File

@@ -3,7 +3,16 @@
This changelog is generated by `changelog.py` using manually added semantic version tags to classify commits as breaking changes, additions or fixes.
* 2021-03-13 [`0d160da`](https://github.com/nophead/NopSCADlib/commit/0d160da40c5d06c5d088733b488d726d1c4d98b0 "show commit") [C.P.](# "Chris Palmer") changelog now omits "Updated changelog" commits.
* 2021-03-13 [`544e69c`](https://github.com/nophead/NopSCADlib/commit/544e69c71b404636df320be278b3fa7442f10429 "show commit") [C.P.](# "Chris Palmer") `pulley_pr()` now has an optional belt type for non-standard belt over smooth pulleys.
* 2021-03-08 [`e46e6b6`](https://github.com/nophead/NopSCADlib/commit/e46e6b6e5b95792b5b2b4d7a7e4360beed22df0b "show commit") [C.P.](# "Chris Palmer") Fixed markdown numbered points in `core_xy`.
## [v14.0.0](https://github.com/nophead/NopSCADlib/releases/tag/v14.0.0 "show release") Breaking Changes [...](https://github.com/nophead/NopSCADlib/compare/v13.5.0...v14.0.0 "diff with v13.5.0")
* 2021-03-06 [`298d1f9`](https://github.com/nophead/NopSCADlib/commit/298d1f92841f30e13b437c6770fc113954b94108 "show commit") [C.P.](# "Chris Palmer") Interface is the same but filenames to be included or used changed.
Changlog upated.
* 2021-03-06 [`491c3b4`](https://github.com/nophead/NopSCADlib/commit/491c3b4ea8d2ef51e55fd389f0dc0b9a6b9bd9a4 "show commit") [C.P.](# "Chris Palmer") Updated readme, `lib.scad` and image.
* 2021-03-06 [`3023604`](https://github.com/nophead/NopSCADlib/commit/30236046a81a6251bf2e869f826c881830569c06 "show commit") [M.B.](# "Martin Budden") Renamed `rounded_right_triangle` files to `rounded_triangle`.
@@ -40,8 +49,6 @@ This changelog is generated by `changelog.py` using manually added semantic vers
* 2021-03-03 [`a7eae4f`](https://github.com/nophead/NopSCADlib/commit/a7eae4f549b51dbe4624a8b67012919cef6cb24a "show commit") [C.P.](# "Chris Palmer") Neater changlog format.
* 2021-03-03 [`7b770ab`](https://github.com/nophead/NopSCADlib/commit/7b770abe12b71fa4b4f7415aa9f46d0f2c9d54f1 "show commit") [C.P.](# "Chris Palmer") Udpated changelog
* 2021-03-03 [`31ab856`](https://github.com/nophead/NopSCADlib/commit/31ab8562a783464f93812b8c7c45d403587efd0a "show commit") [C.P.](# "Chris Palmer") Updated images
* 2021-02-27 [`73c436e`](https://github.com/nophead/NopSCADlib/commit/73c436ee1568c21afd2919593d3f434eb47b53f2 "show commit") [M.B.](# "Martin Budden") Improved contrast of carbon fiber sheets.

View File

@@ -2681,7 +2681,7 @@ Timing belt pulleys, both toothed and plain with internal bearings for idlers.
| `pulley_height(type)` | Total height of pulley |
| `pulley_ir(type)` | Inside radius of the teeth |
| `pulley_offset(type)` | Offset of the belt path centre |
| `pulley_pr(type)` | Pitch radius |
| `pulley_pr(type, belt = undef)` | Pitch radius, `belt` only needed for non-standard belt over smooth pulleys |
### Modules
| Module | Description |
@@ -5583,6 +5583,7 @@ Parameterised Core XY implementation. Draws the belts and provides utilities for
The belts are positioned according the bottom left "anchor" pulley and the top right drive pulley.
Implementation has the following features:
1. The drive and idler pulleys may be different sizes.
2. The belt separation is parameterised.
3. The separation of the plain and toothed pulleys on the Y carriages is parameterised, in both the X and the Y direction.

View File

@@ -159,5 +159,6 @@ if __name__ == '__main__':
print('%s [%s](%s "show release") %s %s' % ('#' * (level + 1), ver, url + '/releases/tag/' + ver, type, diff), file = file)
# Print commits excluding merges
if not c.comment.startswith('Merge branch') and not c.comment.startswith('Merge pull'):
if not c.comment.startswith('Merge branch') and not c.comment.startswith('Merge pull') and not re.match(r'U..ated changelog.*', c.comment):
print('* %s [`%s`](%s "show commit") %s %s\n' % (c.date, c.hash[:7], url + '/commit/' + c.hash, initials(c.author), fixup_comment(c.comment, url)), file = file)

View File

@@ -22,6 +22,7 @@
//!
//! The belts are positioned according the bottom left "anchor" pulley and the top right drive pulley.
//! Implementation has the following features:
//!
//! 1. The drive and idler pulleys may be different sizes.
//! 2. The belt separation is parameterised.
//! 3. The separation of the plain and toothed pulleys on the Y carriages is parameterised, in both the X and the Y direction.

View File

@@ -42,7 +42,7 @@ function pulley_screw(type) = type[13]; //! Grub screw type
function pulley_screws(type) = type[14]; //! Number of grub screws
function pulley_ir(type) = pulley_od(type) / 2 - (pulley_teeth(type) ? belt_tooth_height(pulley_belt(type)) : 0); //! Inside radius of the teeth
function pulley_pr(type) = let(belt = pulley_belt(type)) //! Pitch radius
function pulley_pr(type, belt = undef) = let(belt = is_undef(belt) ? pulley_belt(type) : belt) //! Pitch radius, `belt` only needed for non-standard belt over smooth pulleys
pulley_teeth(type) ? pulley_teeth(type) * belt_pitch(belt) / 2 / PI
: pulley_ir(type) + belt_thickness(belt) - belt_pitch_height(belt);