From 379fe6b23050dbf928fb16d6c4c2a8140a219e66 Mon Sep 17 00:00:00 2001 From: "Williams, Gavin J" Date: Thu, 16 Sep 2021 14:35:30 -0400 Subject: [PATCH] Removed User Selected Axis --- Haas_Mills_BIDC/Bechtel DT.cps | 29 +++++++++++++++-------------- Haas_Mills_BIDC/Bechtel VF2.cps | 29 +++++++++++++++-------------- Haas_Mills_BIDC/Bechtel VF4.cps | 18 +++++++++--------- 3 files changed, 39 insertions(+), 37 deletions(-) diff --git a/Haas_Mills_BIDC/Bechtel DT.cps b/Haas_Mills_BIDC/Bechtel DT.cps index a7d8a35..c618ce4 100644 --- a/Haas_Mills_BIDC/Bechtel DT.cps +++ b/Haas_Mills_BIDC/Bechtel DT.cps @@ -71,7 +71,7 @@ properties = {/* ], value: "none", scope: "post" - },*/ + }, hasAAxis: { title: "Has A-axis rotary", description: "Enable if the machine has an A-axis table/trunnion. Check the table direction on the machine and use the (Reversed) selection if the table is moving in the opposite direction.", @@ -110,7 +110,7 @@ properties = {/* ], value: "false", scope: "post" - },/* + }, throughSpindle: { title: "Allow Through Spindle Coolant", description: "Enables through spindle coolant, if off uses flood", @@ -417,7 +417,7 @@ properties = {/* }, toolLengthValidation: { title: "Tool Length Validation", - description: "Length validation. By turning this off, you accept responsibility for any resulting crashes.", + description: "Length validation. By setting this to optional, you accept responsibility for any resulting crashes.", group: 99, type: "boolean", value: true, @@ -425,7 +425,7 @@ properties = {/* }, pencilWCSValidation: { title: "WCS Validation", - description: "WCS validation. By turning this off, you accept responsibility for any resulting crashes.", + description: "WCS validation. By setting this to optional, you accept responsibility for any resulting crashes.", group: 99, type: "boolean", value: true, @@ -433,7 +433,7 @@ properties = {/* }, measureToolsAtStart: { title: "Tool Probing", - description: "Tool Probing. By turning this off, you accept responsibility for any resulting crashes.", + description: "Tool Probing. By setting this to optional, you accept responsibility for any resulting crashes.", group: 99, type: "boolean", value: true, @@ -441,7 +441,7 @@ properties = {/* }, loadToolsAtStart: { title: "Tool Loading", - description: "Tool Loading. By turning this off, you accept responsibility for any resulting crashes.", + description: "Tool Loading. By setting this to optional, you accept responsibility for any resulting crashes.", group: 99, type: "boolean", value: true, @@ -486,6 +486,9 @@ staticProperties = { coolantPressure: "", singleResultsFile: true, useP9995: true, + hasAAxis: "false", + hasBAxis: "false", + hasCAxis: "false", postVersion: "DT1G8A21" }; @@ -897,7 +900,6 @@ function prepareForToolCheck() { function writeToolMeasureBlock(tool, preMeasure) { var writeFunction = getProperty("measureToolsAtStart") ? writeBlock : writeOptionalBlock; - // var writeFunction = writeBlock; var comment = measureTool ? formatComment("MEASURE TOOL") : ""; if (!preMeasure) { prepareForToolCheck(); @@ -1098,9 +1100,9 @@ function setFeedrateMode(reset) { } function defineMachine() { - hasA = getProperty("hasAAxis") != "false"; - hasB = getProperty("hasBAxis") != "false"; - hasC = getProperty("hasCAxis") != "false"; + hasA = staticProperties.hasAAxis != "false"; + hasB = staticProperties.hasBAxis != "false"; + hasC = staticProperties.hasCAxis != "false"; if (hasA && hasB && hasC) { error(localize("Only two rotary axes can be active at the same time.")); @@ -1119,7 +1121,7 @@ function defineMachine() { var cAxis; var useTCPC = getProperty("useTCPC"); if (hasA) { // A Axis - For horizontal machines and trunnions - var dir = getProperty("hasAAxis") == "reversed" ? -1 : 1; + var dir = staticProperties.hasAAxis == "reversed" ? -1 : 1; if (hasC || hasB) { var aMin = (dir == 1) ? -120 - 0.0001 : -30 - 0.0001; var aMax = (dir == 1) ? 30 + 0.0001 : 120 + 0.0001; @@ -1130,7 +1132,7 @@ function defineMachine() { } if (hasB) { // B Axis - For horizontal machines and trunnions - var dir = getProperty("hasBAxis") == "reversed" ? -1 : 1; + var dir = staticProperties.hasBAxis == "reversed" ? -1 : 1; if (hasC) { var bMin = (dir == 1) ? -120 - 0.0001 : -30 - 0.0001; var bMax = (dir == 1) ? 30 + 0.0001 : 120 + 0.0001; @@ -1143,7 +1145,7 @@ function defineMachine() { } if (hasC) { // C Axis - For trunnions only - var dir = getProperty("hasCAxis") == "reversed" ? -1 : 1; + var dir = staticProperties.hasCAxis == "reversed" ? -1 : 1; cAxis = createAxis({coordinate:2, table:true, axis:[0, 0, dir], cyclic:true, reset:1, tcp:useTCPC}); } @@ -1441,7 +1443,6 @@ function onOpen() { comment += " " + localize("TAPER") + "=" + taperFormat.format(tool.taperAngle) + localize("deg"); } comment += " - " + getToolTypeName(tool.type); - writeComment(tool.description); writeFunction("T" + toolFormat.format(tool.number), mFormat.format(6)); //Changes Tool displayMedia("toolLoad" + tool.number + ".jpg", !getProperty("loadToolsAtStart")); diff --git a/Haas_Mills_BIDC/Bechtel VF2.cps b/Haas_Mills_BIDC/Bechtel VF2.cps index b46e4c2..091fbfc 100644 --- a/Haas_Mills_BIDC/Bechtel VF2.cps +++ b/Haas_Mills_BIDC/Bechtel VF2.cps @@ -71,7 +71,7 @@ properties = {/* ], value: "none", scope: "post" - },*/ + }, hasAAxis: { title: "Has A-axis rotary", description: "Enable if the machine has an A-axis table/trunnion. Check the table direction on the machine and use the (Reversed) selection if the table is moving in the opposite direction.", @@ -110,7 +110,7 @@ properties = {/* ], value: "false", scope: "post" - },/* + }, throughSpindle: { title: "Allow Through Spindle Coolant", description: "Enables through spindle coolant, if off uses flood", @@ -417,7 +417,7 @@ properties = {/* }, toolLengthValidation: { title: "Tool Length Validation", - description: "Length validation. By turning this off, you accept responsibility for any resulting crashes.", + description: "Length validation. By setting this to optional, you accept responsibility for any resulting crashes.", group: 99, type: "boolean", value: true, @@ -425,7 +425,7 @@ properties = {/* }, pencilWCSValidation: { title: "WCS Validation", - description: "WCS validation. By turning this off, you accept responsibility for any resulting crashes.", + description: "WCS validation. By setting this to optional, you accept responsibility for any resulting crashes.", group: 99, type: "boolean", value: true, @@ -433,7 +433,7 @@ properties = {/* }, measureToolsAtStart: { title: "Tool Probing", - description: "Tool Probing. By turning this off, you accept responsibility for any resulting crashes.", + description: "Tool Probing. By setting this to optional, you accept responsibility for any resulting crashes.", group: 99, type: "boolean", value: true, @@ -441,7 +441,7 @@ properties = {/* }, loadToolsAtStart: { title: "Tool Loading", - description: "Tool Loading. By turning this off, you accept responsibility for any resulting crashes.", + description: "Tool Loading. By setting this to optional, you accept responsibility for any resulting crashes.", group: 99, type: "boolean", value: true, @@ -486,6 +486,9 @@ staticProperties = { coolantPressure: "", singleResultsFile: true, useP9995: true, + hasAAxis: "false", + hasBAxis: "false", + hasCAxis: "false", postVersion: "VF2G8A21" }; @@ -897,7 +900,6 @@ function prepareForToolCheck() { function writeToolMeasureBlock(tool, preMeasure) { var writeFunction = getProperty("measureToolsAtStart") ? writeBlock : writeOptionalBlock; - var comment = measureTool ? formatComment("MEASURE TOOL") : ""; if (!preMeasure) { prepareForToolCheck(); @@ -1098,9 +1100,9 @@ function setFeedrateMode(reset) { } function defineMachine() { - hasA = getProperty("hasAAxis") != "false"; - hasB = getProperty("hasBAxis") != "false"; - hasC = getProperty("hasCAxis") != "false"; + hasA = staticProperties.hasAAxis != "false"; + hasB = staticProperties.hasBAxis != "false"; + hasC = staticProperties.hasCAxis != "false"; if (hasA && hasB && hasC) { error(localize("Only two rotary axes can be active at the same time.")); @@ -1119,7 +1121,7 @@ function defineMachine() { var cAxis; var useTCPC = getProperty("useTCPC"); if (hasA) { // A Axis - For horizontal machines and trunnions - var dir = getProperty("hasAAxis") == "reversed" ? -1 : 1; + var dir = staticProperties.hasAAxis == "reversed" ? -1 : 1; if (hasC || hasB) { var aMin = (dir == 1) ? -120 - 0.0001 : -30 - 0.0001; var aMax = (dir == 1) ? 30 + 0.0001 : 120 + 0.0001; @@ -1130,7 +1132,7 @@ function defineMachine() { } if (hasB) { // B Axis - For horizontal machines and trunnions - var dir = getProperty("hasBAxis") == "reversed" ? -1 : 1; + var dir = staticProperties.hasBAxis == "reversed" ? -1 : 1; if (hasC) { var bMin = (dir == 1) ? -120 - 0.0001 : -30 - 0.0001; var bMax = (dir == 1) ? 30 + 0.0001 : 120 + 0.0001; @@ -1143,7 +1145,7 @@ function defineMachine() { } if (hasC) { // C Axis - For trunnions only - var dir = getProperty("hasCAxis") == "reversed" ? -1 : 1; + var dir = staticProperties.hasCAxis == "reversed" ? -1 : 1; cAxis = createAxis({coordinate:2, table:true, axis:[0, 0, dir], cyclic:true, reset:1, tcp:useTCPC}); } @@ -1441,7 +1443,6 @@ function onOpen() { comment += " " + localize("TAPER") + "=" + taperFormat.format(tool.taperAngle) + localize("deg"); } comment += " - " + getToolTypeName(tool.type); - writeComment(tool.description); writeFunction("T" + toolFormat.format(tool.number), mFormat.format(6)); //Changes Tool displayMedia("toolLoad" + tool.number + ".jpg", !getProperty("loadToolsAtStart")); diff --git a/Haas_Mills_BIDC/Bechtel VF4.cps b/Haas_Mills_BIDC/Bechtel VF4.cps index a3218d7..359bc34 100644 --- a/Haas_Mills_BIDC/Bechtel VF4.cps +++ b/Haas_Mills_BIDC/Bechtel VF4.cps @@ -417,7 +417,7 @@ properties = {/* }, toolLengthValidation: { title: "Tool Length Validation", - description: "Length validation. By turning this off, you accept responsibility for any resulting crashes.", + description: "Length validation. By setting this to optional, you accept responsibility for any resulting crashes.", group: 99, type: "boolean", value: true, @@ -425,7 +425,7 @@ properties = {/* }, pencilWCSValidation: { title: "WCS Validation", - description: "WCS validation. By turning this off, you accept responsibility for any resulting crashes.", + description: "WCS validation. By setting this to optional, you accept responsibility for any resulting crashes.", group: 99, type: "boolean", value: true, @@ -433,7 +433,7 @@ properties = {/* }, measureToolsAtStart: { title: "Tool Probing", - description: "Tool Probing. By turning this off, you accept responsibility for any resulting crashes.", + description: "Tool Probing. By setting this to optional, you accept responsibility for any resulting crashes.", group: 99, type: "boolean", value: true, @@ -441,7 +441,7 @@ properties = {/* }, loadToolsAtStart: { title: "Tool Loading", - description: "Tool Loading. By turning this off, you accept responsibility for any resulting crashes.", + description: "Tool Loading. By setting this to optional, you accept responsibility for any resulting crashes.", group: 99, type: "boolean", value: true, @@ -486,9 +486,9 @@ staticProperties = { coolantPressure: "", singleResultsFile: true, useP9995: true, - hasAAxis: false, - hasBAxis: false, - hasCAxis: false, + hasAAxis: "false", + hasBAxis: "false", + hasCAxis: "false", postVersion: "VF4G8A21" }; @@ -899,7 +899,6 @@ function prepareForToolCheck() { function writeToolMeasureBlock(tool, preMeasure) { var writeFunction = getProperty("measureToolsAtStart") ? writeBlock : writeOptionalBlock; - // var writeFunction = writeBlock; var comment = measureTool ? formatComment("MEASURE TOOL") : ""; if (!preMeasure) { prepareForToolCheck(); @@ -2322,7 +2321,7 @@ function onSection() { // writeBlock(gFormat.format(53), "X" + macroFormat.format(100), yOutput.format(0)); writeBlock(gFormat.format(55), gFormat.format(0), xOutput.format(Stock_X_55)); writeBlock(gFormat.format(53), gFormat.format(0), yOutput.format(0)); - displayMedia("loadStock.jpg"); + displayMedia("loadStock.jpg", false); writeBlock(mFormat.format(0)); } @@ -2823,6 +2822,7 @@ function onSection() { if (tool.type != TOOL_PROBE) { setCoolant(tool.coolant); + writeBlock(gFormat.format(4), "P500"); } writeComment("BEGIN OPERATION");