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 Jan 7, 2023
2 parents ca7234d + 575adac commit 6f598d2
Show file tree
Hide file tree
Showing 92 changed files with 2,759 additions and 2,073 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,6 @@ Please see the [docs](https://docs.fluidd.xyz) for help with installation and co
A big thank you to:

- the [Voron Community](http://vorondesign.com/)
- Kevin O'Connor for [Klipper](https://github.com/KevinOConnor/klipper)
- Kevin O'Connor for [Klipper](https://github.com/Klipper3d/klipper)
- Eric Callahan for [Moonraker](https://github.com/Arksine/moonraker)
- Ray for [MainsailOS](https://github.com/raymondh2/MainsailOS)
2 changes: 2 additions & 0 deletions components.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ declare module 'vue' {
AppCodeView: typeof import('./src/components/ui/AppCodeView.vue')['default']
AppColorPicker: typeof import('./src/components/ui/AppColorPicker.vue')['default']
AppColumnPicker: typeof import('./src/components/ui/AppColumnPicker.vue')['default']
AppDialog: typeof import('./src/components/ui/AppDialog.vue')['default']
AppFocusableContainer: typeof import('./src/components/ui/AppFocusableContainer.vue')['default']
AppFooter: typeof import('./src/components/layout/AppFooter.vue')['default']
AppIcon: typeof import('./src/components/ui/AppIcon.vue')['default']
Expand All @@ -43,6 +44,7 @@ declare module 'vue' {
FlashMessage: typeof import('./src/components/common/FlashMessage.vue')['default']
KlippyStatusCard: typeof import('./src/components/common/KlippyStatusCard.vue')['default']
ManualProbeDialog: typeof import('./src/components/common/ManualProbeDialog.vue')['default']
RegisterServiceWorker: typeof import('./src/components/common/RegisterServiceWorker.vue')['default']
RouterLink: typeof import('vue-router')['RouterLink']
RouterView: typeof import('vue-router')['RouterView']
SocketDisconnected: typeof import('./src/components/common/SocketDisconnected.vue')['default']
Expand Down
12 changes: 4 additions & 8 deletions docs/configuration/moonraker.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,18 +32,14 @@ cases, you shouldn't need to touch anything here.

## [file_manager] block

If you have a FluiddPI installation of `1.14` or below, it may be worth adding a
logs path, which will expose all logs inside of Fluidd. [KIUAH](/installation/kiauh) can
provide a gracefull upgrade path in order to re-arrange all of your logs into
the same place for this to be most benifical.
If you want to be able to cancel single objects on a muilti-object print, then
you will need to set `enable_object_processing: True` here to enable it.

```yaml
[file_manager]
log_path: ~/klipper_logs
enable_object_processing: True
```
See the [configuration example](/configuration/moonraker_conf) where this belongs.
## [data_store] block
Temperature and gcode store sizes can be configured in moonraker.
Expand Down Expand Up @@ -113,7 +109,7 @@ Automated updates can be configured by ensuring the following is in your
[update_manager]
enable_auto_refresh: True
[update_manager client fluidd]
[update_manager fluidd]
type: web
repo: fluidd-core/fluidd
path: ~/fluidd
Expand Down
2 changes: 1 addition & 1 deletion docs/configuration/moonraker_conf.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ trusted_clients:
[update_manager]
enable_auto_refresh: True

[update_manager client fluidd]
[update_manager fluidd]
type: web
repo: fluidd-core/fluidd
path: ~/fluidd
Expand Down
2 changes: 1 addition & 1 deletion docs/faq.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ permalink: /faq
## Klipper updated and now my printer has an error

- Klipper likely has configuration changes. Please see
[here](https://github.com/KevinOConnor/klipper/blob/master/docs/Config_Changes.md)
[here](https://www.klipper3d.org/Config_Changes.html)
for a list of recent changes.

## The host reboot / shutdown commands don't work
Expand Down
2 changes: 1 addition & 1 deletion docs/installation/docker.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
layout: default
title: Docker
parent: Installation
nav_order: 2
nav_order: 3
permalink: /installation/docker
---

Expand Down
9 changes: 7 additions & 2 deletions docs/installation/fluiddpi.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
layout: default
title: FluiddPI
parent: Installation
nav_order: 1
nav_order: 2
permalink: /installation/fluiddpi
---

Expand All @@ -20,10 +20,15 @@ permalink: /installation/fluiddpi
## Overview

FluiddPI is a Raspberry Pi OS Lite image, preconfigured with Klipper, Moonraker and
Fluidd. It is the recommended way to install Fluidd.
Fluidd.

[View on GitHub](https://github.com/fluidd-core/FluiddPi){: .btn .fs-5 .mb-4 .mb-md-0 }

**WARNING:** FluiddPI is not under active maintenance and we've had reports
of users finding issues while using it. As such, our recommendation is that you
**do not use FluiddPI**, and instead use [KIAUH](/installation/kiauh) to install
Fluidd.

## Download

Start by downloading the latest release of [FluiddPI](https://github.com/fluidd-core/FluiddPi/releases/latest).
Expand Down
3 changes: 1 addition & 2 deletions docs/installation/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,5 @@ permalink: /installation

# Installation

For a single printer instance, the easiest approach to installing Fluidd is
by flashing FluiddPI.
The recommended way to install Fluidd is to use KIAUH.
{: .fs-6 .fw-300 }
10 changes: 6 additions & 4 deletions docs/installation/kiauh.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
layout: default
title: KIAUH
parent: Installation
nav_order: 2
nav_order: 1
permalink: /installation/kiauh
---

Expand All @@ -11,9 +11,11 @@ permalink: /installation/kiauh

---

KIAUH makes installation and updates a breeze. This is the recommended approach
when you'd like to trial more than one user interface on your pi, or have more
of an advanced setup.
KIAUH is the recommended way to install Fluidd.

KIAUH makes installation and updates a breeze, no matter if it is just a simple
install or when you'd like to trial more than one user interface on your device,
or have more of an advanced setup.

For more information on KIAUH, please visit its github page.

Expand Down
4 changes: 2 additions & 2 deletions docs/installation/manual.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
layout: default
title: Manual Installation
parent: Installation
nav_order: 2
nav_order: 4
permalink: /installation/manual
---

Expand All @@ -25,7 +25,7 @@ You can serve these with your preferred HTTP server, for example [NGINX](https:/

Please note that building on a Raspberry Pi isn't supported as of now (due to hardware limitations).
If you'd like to serve your Fluidd installation from a Raspberry Pi, please build it on a PC and copy the `dist` directory over using [scp](https://linux.die.net/man/1/scp) (or a method of your choice). Alternatively, you may want to consider one of our alternative installation methods:
* [FluiddPi](/installation/fluiddpi)
* [KIAUH](/installation/kiauh)
* [FluiddPi](/installation/fluiddpi)

To build Fluidd for development purposes, run `npm run serve` instead of `npm run build` to enable hot-reloads.
Loading

0 comments on commit 6f598d2

Please sign in to comment.