Skip to content

Commit 8866926

Browse files
committed
Merge branch 'develop'
Signed-off-by: Pedro Lamas <pedrolamas@gmail.com>
2 parents 6a0ddac + 714ded6 commit 8866926

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+860
-716
lines changed

.husky/commit-msg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ EOF
2626

2727
COMMIT_MESSAGE=$(cat $1)
2828

29-
COMMIT_HEAD="^merge.+|(feat|fix|docs|style|refactor|perf|test|build|ci|chore|revert|types)(\(.+\))?: .{1,50}"
29+
COMMIT_HEAD="^merge.+|(feat|fix|docs|style|refactor|perf|test|build|ci|chore|revert|types|i18n)(\(.+\))?: .{1,50}"
3030
COMMIT_SIGNED_OFF="signed-off-by: .*<.*@.*>"
3131

3232
if ! echo "$COMMIT_MESSAGE" | grep -iqE "$COMMIT_HEAD"; then
49.7 KB
Loading
75 KB
Loading

docs/features/cameras.md

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
layout: default
33
title: Cameras
44
parent: Features
5-
nav_order: 10
5+
nav_order: 12
66
permalink: /features/cameras
77
---
88

@@ -22,15 +22,20 @@ You can add up to four cameras to display on your dashboard.
2222
Currently supported types are:
2323

2424
- MJPEG Stream
25-
This is the traditional mjpegstream service. The service pushes images to
25+
This is the traditional mjpegstream/ustreamer service. The service pushes images to
2626
fluidd at the configured resolution and FPS you have setup. This requires
2727
a lot of bandwidth, and can cause issues with unstable network connections.
2828

2929
- MJPEG Adaptive
30-
This will PULL images from the mjpegstream service, using the snapshot URL.
30+
This will PULL images from the mjpegstream/ustreamer service, using the snapshot URL.
3131
You can set a target FPS, and your browser will try to keep up with the
3232
intended target. This can be a more reliable approach for some.
3333

34+
- HLS Stream
35+
This will load an HLS (HTTP Live Streaming) video stream via [HLS.js](https://hlsjs.video-dev.org/).
36+
It relies on HTML5 video and MediaSource Extensions for playback, so you will
37+
need a modern browser that supports it.
38+
3439
- IP Camera
3540
This is an experimental option. Effectively, it swaps out the `<img>` tag
3641
for a `<video>` tag. You should only use this if you can provide a URL
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
---
2+
layout: default
3+
title: Multiple Extruders
4+
parent: Features
5+
nav_order: 10
6+
permalink: /features/multiple_extruders
7+
---
8+
9+
# Multiple Extruders
10+
{: .no_toc }
11+
12+
---
13+
14+
Fluidd supports single extruder, multiple extruders, and multiple extruder
15+
stepper configurations.
16+
17+
There is full support to set Pressure Advance values in all configurations.
18+
19+
![screenshot](/assets/images/multiple-extruders.png)
20+
21+
For multiple extruder steppers configurations, Fluidd will show a section for
22+
each stepper, allowing to enable/disable it, associate with an extruder, and set
23+
the specific Pressure Advance values.
24+
25+
![screenshot](/assets/images/multiple-extruder-steppers.png)

docs/features/presets.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
layout: default
33
title: Thermal Presets
44
parent: Features
5-
nav_order: 8
5+
nav_order: 11
66
permalink: /features/presets
77
---
88

docs/features/print_history.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
layout: default
33
title: Print History
44
parent: Features
5-
nav_order: 12
5+
nav_order: 13
66
permalink: /features/print_history
77
---
88

docs/index.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ firmware.
3333
- View and Edit your Klipper config in app with code folding and Codelens support
3434
- View and Edit your Gcode files in app
3535
- [Bed Mesh](/features/bed_mesh) levelling
36+
- [Multiple extruder](/features/multiple_extruders) configurations
3637
- [Thermal Presets](/features/presets)
3738
- [Multiple web cam](/features/cameras) support
3839
- Control power devices - GPIO (relays), TPLink Smartplug, and Tasmota

0 commit comments

Comments
 (0)