Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
Signed-off-by: Pedro Lamas <[email protected]>
  • Loading branch information
pedrolamas committed Apr 20, 2023
2 parents 6a0ddac + 714ded6 commit 8866926
Show file tree
Hide file tree
Showing 59 changed files with 860 additions and 716 deletions.
2 changes: 1 addition & 1 deletion .husky/commit-msg
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ EOF

COMMIT_MESSAGE=$(cat $1)

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

if ! echo "$COMMIT_MESSAGE" | grep -iqE "$COMMIT_HEAD"; then
Expand Down
Binary file added docs/assets/images/multiple-extruder-steppers.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/assets/images/multiple-extruders.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 8 additions & 3 deletions docs/features/cameras.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
layout: default
title: Cameras
parent: Features
nav_order: 10
nav_order: 12
permalink: /features/cameras
---

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

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

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

- HLS Stream
This will load an HLS (HTTP Live Streaming) video stream via [HLS.js](https://hlsjs.video-dev.org/).
It relies on HTML5 video and MediaSource Extensions for playback, so you will
need a modern browser that supports it.

- IP Camera
This is an experimental option. Effectively, it swaps out the `<img>` tag
for a `<video>` tag. You should only use this if you can provide a URL
Expand Down
25 changes: 25 additions & 0 deletions docs/features/multiple_extruders.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
---
layout: default
title: Multiple Extruders
parent: Features
nav_order: 10
permalink: /features/multiple_extruders
---

# Multiple Extruders
{: .no_toc }

---

Fluidd supports single extruder, multiple extruders, and multiple extruder
stepper configurations.

There is full support to set Pressure Advance values in all configurations.

![screenshot](/assets/images/multiple-extruders.png)

For multiple extruder steppers configurations, Fluidd will show a section for
each stepper, allowing to enable/disable it, associate with an extruder, and set
the specific Pressure Advance values.

![screenshot](/assets/images/multiple-extruder-steppers.png)
2 changes: 1 addition & 1 deletion docs/features/presets.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
layout: default
title: Thermal Presets
parent: Features
nav_order: 8
nav_order: 11
permalink: /features/presets
---

Expand Down
2 changes: 1 addition & 1 deletion docs/features/print_history.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
layout: default
title: Print History
parent: Features
nav_order: 12
nav_order: 13
permalink: /features/print_history
---

Expand Down
1 change: 1 addition & 0 deletions docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ firmware.
- View and Edit your Klipper config in app with code folding and Codelens support
- View and Edit your Gcode files in app
- [Bed Mesh](/features/bed_mesh) levelling
- [Multiple extruder](/features/multiple_extruders) configurations
- [Thermal Presets](/features/presets)
- [Multiple web cam](/features/cameras) support
- Control power devices - GPIO (relays), TPLink Smartplug, and Tasmota
Expand Down
Loading

0 comments on commit 8866926

Please sign in to comment.