feat: enable machine limits

fluidd-core · Oct 26, 2020 · 762399e · 762399e
1 parent 38c563c
commit 762399e
Show file tree

Hide file tree

Showing 4 changed files with 77 additions and 71 deletions.
diff --git a/src/components/widgets/PrinterLimitsWidget.vue b/src/components/widgets/PrinterLimitsWidget.vue
@@ -1,69 +1,67 @@
 <template>
-  <v-expansion-panels flat>
-    <v-expansion-panel>
-      <v-expansion-panel-header>Acceleration, Velocity &amp; Limits</v-expansion-panel-header>
-      <v-expansion-panel-content>
-        <!-- <v-col>
-          Velocity Limits
-          These are not persistent. They will reset to your printer configuration on host reboot.
-          <v-divider></v-divider>
-        </v-col> -->
-        <!-- Speed and Flow Adjust -->
-        <v-row>
-          <v-col cols="12" sm="6" class="px-2 pt-0 pb-5">
-            <input-slider
-              label="Velocity"
-              value-suffix="mm/s"
-              :value="velocity.current"
-              :min="0"
-              :max="velocity.max"
-              :disabled="!klippyConnected"
-              :loading="hasWait(waits.onSetVelocity)"
-              @input="setVelocity($event)">
-            </input-slider>
-          </v-col>
-          <v-col cols="12" sm="6" class="px-2 pt-0 pb-5">
-            <input-slider
-              label="Square Corner Velocity"
-              value-suffix="mm/s"
-              :value="scv.current"
-              :min="0"
-              :max="scv.max"
-              :disabled="!klippyConnected"
-              :loading="hasWait(waits.onSetSQV)"
-              @input="setSCV($event)">
-            </input-slider>
-          </v-col>
-        </v-row>
-        <v-row>
-          <v-col cols="12" sm="6" class="px-2 py-0">
-            <input-slider
-              label="Acceleration"
-              value-suffix="mm/s^2"
-              :value="accel.current"
-              :min="0"
-              :max="accel.max"
-              :disabled="!klippyConnected"
-              :loading="hasWait(waits.onSetAcceleration)"
-              @input="setAcceleration($event)">
-            </input-slider>
-          </v-col>
-          <v-col cols="12" sm="6" class="px-2 py-0">
-            <input-slider
-              label="Deceleration"
-              value-suffix="mm/s^2"
-              :value="decel.current"
-              :min="0"
-              :max="decel.max"
-              :disabled="!klippyConnected"
-              :loading="hasWait(waits.onSetDeceleration)"
-              @input="setDeceleration($event)">
-            </input-slider>
-          </v-col>
-        </v-row>
-      </v-expansion-panel-content>
-    </v-expansion-panel>
-  </v-expansion-panels>
+  <div>
+    <v-btn block text @click="limitsVisible = !limitsVisible" class="mb-2">
+      {{ (limitsVisible) ? 'Hide' : 'Show' }} machine limits
+      <v-icon>{{ (limitsVisible) ? icons.chevronUp : icons.chevronDown }}</v-icon>
+    </v-btn>
+    <v-expand-transition>
+      <!-- Speed and Flow Adjust -->
+      <div v-show="limitsVisible">
+      <v-row>
+        <v-col cols="12" sm="6" class="px-2 pt-0 pb-5">
+          <input-slider
+            label="Velocity"
+            value-suffix="mm/s"
+            :value="velocity.current"
+            :min="0"
+            :max="velocity.max"
+            :disabled="!klippyConnected"
+            :loading="hasWait(waits.onSetVelocity)"
+            @input="setVelocity($event)">
+          </input-slider>
+        </v-col>
+        <v-col cols="12" sm="6" class="px-2 pt-0 pb-5">
+          <input-slider
+            label="Square Corner Velocity"
+            value-suffix="mm/s"
+            :value="scv.current"
+            :min="0"
+            :max="scv.max"
+            :disabled="!klippyConnected"
+            :loading="hasWait(waits.onSetSQV)"
+            @input="setSCV($event)">
+          </input-slider>
+        </v-col>
+      </v-row>
+      <v-row>
+        <v-col cols="12" sm="6" class="px-2 pt-0 pb-0">
+          <input-slider
+            label="Acceleration"
+            value-suffix="mm/s^2"
+            :value="accel.current"
+            :min="0"
+            :max="accel.max"
+            :disabled="!klippyConnected"
+            :loading="hasWait(waits.onSetAcceleration)"
+            @input="setAcceleration($event)">
+          </input-slider>
+        </v-col>
+        <v-col cols="12" sm="6" class="px-2 pt-0 pb-0">
+          <input-slider
+            label="Deceleration"
+            value-suffix="mm/s^2"
+            :value="decel.current"
+            :min="0"
+            :max="decel.max"
+            :disabled="!klippyConnected"
+            :loading="hasWait(waits.onSetDeceleration)"
+            @input="setDeceleration($event)">
+          </input-slider>
+        </v-col>
+      </v-row>
+      </div>
+    </v-expand-transition>
+  </div>
 </template>
 
 <script lang="ts">
@@ -80,6 +78,14 @@ import InputSlider from '@/components/inputs/InputSlider.vue'
 export default class PrinterLimitsWidget extends Mixins(UtilsMixin) {
   waits = Waits
 
+  get limitsVisible (): boolean {
+    return this.$store.state.config.localConfig.limitsVisible
+  }
+
+  set limitsVisible (val: boolean) {
+    this.$store.dispatch('config/saveLocalStorage', { limitsVisible: val })
+  }
+
   get velocity () {
     const max = parseInt(this.$store.state.socket.printer.configfile.config.printer.max_velocity)
     return {

diff --git a/src/components/widgets/ToolheadWidget.vue b/src/components/widgets/ToolheadWidget.vue
@@ -8,21 +8,19 @@
       </v-col>
 
       <v-col class="pt-0">
-        <!-- Extruder Moves, Tooldhead Position-->
-        <!-- <v-container fluid class="pa-0"> -->
-          <extruder-moves-widget v-if="!printerPrinting"></extruder-moves-widget>
-          <toolhead-position-widget></toolhead-position-widget>
-        <!-- </v-container> -->
+        <extruder-moves-widget v-if="!printerPrinting"></extruder-moves-widget>
+        <toolhead-position-widget></toolhead-position-widget>
       </v-col>
     </v-row>
 
     <v-row>
       <v-col class="pt-0">
         <!-- Part cooling -->
         <fans-widget></fans-widget>
+
         <!-- Speed and Flow Adjustments  -->
         <speed-and-flow-adjust-widget></speed-and-flow-adjust-widget>
-        <!-- <printer-limits-widget></printer-limits-widget> -->
+        <printer-limits-widget></printer-limits-widget>
       </v-col>
     </v-row>
   </v-container>

diff --git a/src/store/config/index.ts b/src/store/config/index.ts
@@ -15,6 +15,7 @@ export const state: ConfigState = {
   localConfig: {
     cameraVisible: false,
     chartVisible: true,
+    limitsVisible: false,
     darkMode: true
   },
   fileConfig: {

diff --git a/src/store/config/types.ts b/src/store/config/types.ts
@@ -12,6 +12,7 @@ export interface LocalConfig {
   [key: string]: string | boolean | number;
   cameraVisible: boolean;
   chartVisible: boolean;
+  limitsVisible: boolean;
   darkMode: boolean;
 }