feat: support a color or colour variable from tool change macros (#1244)

Co-authored-by: Stefan Dej <[email protected]>
mainsail-crew · Feb 18, 2023 · e0e90bc · e0e90bc
1 parent 6a2a1ba
commit e0e90bc
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/src/components/panels/ExtruderControlPanel.vue b/src/components/panels/ExtruderControlPanel.vue
@@ -63,6 +63,7 @@
                             :key="tool.name"
                             :class="tool.active ? 'primary--text' : {}"
                             :disabled="isPrinting"
+                            :style="{ 'background-color': '#' + tool.color }"
                             dense
                             class="flex-grow-1 px-0"
                             @click="doSend(tool.name)">
@@ -85,7 +86,7 @@
                         attribute-name="S"></tool-slider>
                 </v-container>
                 <!-- PRESSURE ADVANCE SETTINGS -->
-                <template v-if="!extruderSteppers.length > 0">
+                <template v-if="!(extruderSteppers.length > 0)">
                     <v-divider></v-divider>
                     <pressure-advance-settings></pressure-advance-settings>
                 </template>

diff --git a/src/store/printer/getters.ts b/src/store/printer/getters.ts
@@ -1097,6 +1097,7 @@ export const getters: GetterTree<PrinterState, RootState> = {
                 tools.push({
                     name: macro.name,
                     active: macro.variables.active ?? false,
+                    color: macro.variables.color ?? macro.variables.colour ?? null,
                 })
             )
 

diff --git a/src/store/printer/types.ts b/src/store/printer/types.ts
@@ -252,6 +252,7 @@ export interface PrinterStateExtruderStepper {
 export interface PrinterStateToolchangeMacro {
     name: string
     active: boolean
+    color: string
 }
 
 export interface PrinterGetterObject {