Merge branch 'develop'

docs/configuration/moonraker.md

@@ -30,18 +30,21 @@ and
 This configures the general configuration of your moonraker instance. In most
 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.
 
-```sh
+```yaml
+[file_manager]
 log_path: ~/klipper_logs
 ```
 
 See the [configuration example](/configuration/moonraker_conf) where this belongs.
 
-### Temperature & GCODE store size
+## [data_store] block
 
 Temperature and gcode store sizes can be configured in moonraker.
 This is especially useful for temperature store data, as it
@@ -52,6 +55,7 @@ Temperature store size is in seconds, while the gcode store size is defined
 in an entry count.
 
 ```yaml
+[data_store]
 temperature_store_size: 600
 gcode_store_size: 1000
 ```

docs/configuration/moonraker_conf.md

@@ -19,10 +19,14 @@ Your moonraker configuration can usually be found here: `~/klipper_config/moonra
 host: 0.0.0.0
 port: 7125
 enable_debug_logging: False
+
+[file_manager]
 config_path: ~/klipper_config
+log_path: ~/klipper_logs
+
+[data_store]
 temperature_store_size: 600
 gcode_store_size: 1000
-log_path: ~/klipper_logs
 
 [authorization]
 force_logins: true

package.json

@@ -41,9 +41,8 @@
     "core-js": "^3.14.0",
     "dayjs": "^1.10.5",
     "deepmerge": "^4.2.2",
-    "echarts": "^5.1.2",
-    "echarts-for-vue": "^1.4.1",
-    "echarts-gl": "^2.0.6",
+    "echarts": "^5.3.0",
+    "echarts-gl": "^2.0.9",
     "jwt-decode": "^3.1.2",
     "lodash": "^4.17.21",
     "md5": "^2.3.0",
@@ -60,6 +59,7 @@
     "vue": "^2.6.14",
     "vue-class-component": "^7.2.3",
     "vue-debounce-decorator": "^1.0.1",
+    "vue-echarts": "^6.0.2",
     "vue-headful": "^2.1.0",
     "vue-i18n": "^8.24.5",
     "vue-inline-svg": "^2.0.0",
@@ -91,6 +91,7 @@
     "@vue/cli-plugin-unit-jest": "^4.5.13",
     "@vue/cli-plugin-vuex": "^4.5.13",
     "@vue/cli-service": "^4.5.13",
+    "@vue/composition-api": "^1.4.9",
     "@vue/eslint-config-standard": "^5.1.2",
     "@vue/eslint-config-typescript": "^5.0.2",
     "@vue/test-utils": "^1.2.1",

src/App.vue

@@ -29,6 +29,7 @@
       fab
       fixed
       bottom left
+      class="ml-2 mb-2"
       color="error"
       @click="emergencyStop()"
     >

src/components/settings/cameras/CameraConfigDialog.vue

@@ -129,7 +129,6 @@
             single-line
             hide-details="auto"
             v-model.number="camera.fpsidletarget"
-            :rules="[rules.required]"
           ></v-text-field>
         </app-setting>
 

src/components/settings/cameras/Cameras.vue

@@ -90,6 +90,7 @@ export default class CameraSettings extends Vue {
       name: '',
       type: 'mjpgadaptive',
       fpstarget: 15,
+      fpsidletarget: 5,
       url: Globals.DEFAULTS.CAMERA_URL
     }