diff --git a/Haas_Next_Generation/README.txt b/Haas_Next_Generation/README.txt index da050fb..8e31c78 100644 --- a/Haas_Next_Generation/README.txt +++ b/Haas_Next_Generation/README.txt @@ -3,6 +3,7 @@ Changelog 06/14/21 Added media and QA 06/15/21 Check tool distance from stock, finalized QA 06/21/21 Tool probing required, tool probing now uses P9995 +06/28/21 Tool specific probing added, with cases for type of probing and k factor Function List: diff --git a/Haas_Next_Generation/haas vf2.cps b/Haas_Next_Generation/haas vf2.cps index d2eadbd..db75ad2 100644 --- a/Haas_Next_Generation/haas vf2.cps +++ b/Haas_Next_Generation/haas vf2.cps @@ -839,7 +839,7 @@ function getHaasKFactorBIDC(tool) { if (tool.type == TOOL_MILLING_RADIUS) { return NULL_HAAS_K_FACTOR; } - return DEFAULT_HAAS_K_FACTOR + tool.diameter; + return DEFAULT_HAAS_K_FACTOR + (tool.diameter/2); case HAAS_CENTER: case HAAS_PROBE: case HAAS_DRILL: @@ -877,7 +877,6 @@ function writeToolMeasureBlock(tool, preMeasure) { // var writeFunction = measureTool ? writeBlock : writeOptionalBlock; var writeFunction = writeBlock; var comment = measureTool ? formatComment("MEASURE TOOL") : ""; - if (!preMeasure) { prepareForToolCheck(); }