.

Author: tinic

elle-app/elle-frontend/src/App.vue

@@ -64,6 +64,7 @@ const {
   zpitchactive,
   xstepperactive,
   zstepperactive,
+  currentToolIndex,
   updateHALOut
 } = useHAL()
 
@@ -431,7 +432,6 @@ function setFinalNumber(value: number) {
       break
     case TurningEntryType.turningFeedRate:
       setTurningParameter(TurningEntryType.turningFeedRate, value)
-      updatePitchFromTurning()
       break
     case TurningEntryType.turningStepDown:
       setTurningParameter(TurningEntryType.turningStepDown, value)
@@ -833,13 +833,6 @@ const pitchClicked = (axis: string) => {
               if (xpitchangle.value > 0) {
                 xpitch.value = pitchForAngle(zpitch.value, xpitchangle.value)
               }
-              // If we're in turning mode, also update the turning feed rate parameter
-              if (
-                selectedMenu.value === MenuType.cannedCycles &&
-                selectedCannedCycle.value === CannedCycle.turning
-              ) {
-                turningFeedRate.value = value
-              }
             }
             break
           case 'x':
@@ -1078,11 +1071,6 @@ const turningResetClicked = () => {
 }
 
 const updatePitchFromTurning = () => {
-  // Update feed rate display for turning (feed rate is in mm/rev)
-  if (turningFeedRate.value !== null) {
-    zpitch.value = Math.abs(turningFeedRate.value)
-  }
-
   // Minimal cross feed for turning
   xpitch.value = 0.001
   xpitchangle.value = 0
@@ -1218,6 +1206,8 @@ onUnmounted(() => {
           :cursorpos="cursorpos"
           :diameter-mode="diameterMode"
           :show-x-pitch="true"
+          :show-z-pitch="true"
+          :tool-index="currentToolIndex"
           @number-clicked="numberClicked"
           @zero-clicked="zeroClicked"
           @pitch-clicked="pitchClicked"
@@ -1441,6 +1431,8 @@ onUnmounted(() => {
           :cursorpos="cursorpos"
           :diameter-mode="diameterMode"
           :show-x-pitch="false"
+          :show-z-pitch="false"
+          :tool-index="currentToolIndex"
           @number-clicked="numberClicked"
           @zero-clicked="zeroClicked"
           @pitch-clicked="pitchClicked"

elle-app/elle-frontend/src/components/DRODisplay.vue

@@ -41,6 +41,8 @@ interface Props {
   cursorpos?: number
   diameterMode?: boolean
   showXPitch?: boolean
+  showZPitch?: boolean
+  toolIndex?: number
 }
 
 const props = withDefaults(defineProps<Props>(), {
@@ -61,7 +63,9 @@ const props = withDefaults(defineProps<Props>(), {
   metric: true,
   cursorpos: 0,
   diameterMode: false,
-  showXPitch: true
+  showXPitch: true,
+  showZPitch: true,
+  toolIndex: 0
 })
 
 enum ZeroEntry {
@@ -191,6 +195,11 @@ const zpitchCursorFormatted = computed(() => {
 
 const rpmsUnitFormatted = computed(() => `rpm${  ' '.repeat(3)}`)
 
+const toolFormatted = computed(() => {
+  const toolNum = props.toolIndex.toString().padStart(2, '0')
+  return `🧰${toolNum}`
+})
+
 const xposClicked = () => {
   emit('numberClicked', NumberEntry.xpos, props.xpos)
 }
@@ -322,12 +331,17 @@ const zpitchLabel = computed(() => props.entryActive == NumberEntry.zpitch
       {{ props.xpitchlabel }}
     </button>
     <br />
-    <div class="inline" @click="zpitchClicked">
+    <div
+      class="inline"
+      :style="{ visibility: showZPitch ? 'visible' : 'hidden' }"
+      @click="zpitchClicked"
+    >
       <span v-html="zpitchLabel" />{{ zpitchFormatted }}<font size="-1">&nbsp;</font><font color="#aaaaaa">{{ zpitchUnitFormatted }}</font>
     </div>
     <button
       class="dro-font-display-button align-content-center ml-5"
       style="width: 6em; padding: 0.75rem"
+      :style="{ visibility: showZPitch ? 'visible' : 'hidden' }"
       @click="zpitchSelectClicked"
     >
       {{ props.zpitchlabel }}
@@ -343,6 +357,7 @@ const zpitchLabel = computed(() => props.entryActive == NumberEntry.zpitch
     >
       mm↔in
     </button>
+    <div class="inline ml-3">{{ toolFormatted }}</div>
     <br />
     <div style="position: absolute; top: 0.71em">
       <span style="color: #ff0000">{{ xposCursorFormatted }}</span>

elle-app/elle-frontend/src/composables/useHAL.ts

@@ -26,6 +26,8 @@ export function useHAL() {
   const zpitchactive = ref(false)
   const xstepperactive = ref(false)
   const zstepperactive = ref(false)
+  const currentToolIndex = ref(0)
+  const currentToolOffset = ref(0)
 
   let updateInterval: NodeJS.Timeout
   let halOutResetPositionScheduled: boolean = false
@@ -399,6 +401,8 @@ export function useHAL() {
     zpitchactive,
     xstepperactive,
     zstepperactive,
+    currentToolIndex,
+    currentToolOffset,
     putHalOut,
     putLinuxCNC,
     getHalIn,