From 7aea377959d7d56b14665c756d9158b7c628c523 Mon Sep 17 00:00:00 2001 From: "Williams, Gavin J" Date: Fri, 9 Jul 2021 12:15:40 -0400 Subject: [PATCH] Removed hardcoded machine configs --- .gitignore | 3 ++- Haas_Next_Generation/haas vf2.cps | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f94f965..767cc43 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ Old/haas next generation.cps *.nc -Haas_Next_Generation/haas next* \ No newline at end of file +Haas_Next_Generation/haas next* +*.dmp \ No newline at end of file diff --git a/Haas_Next_Generation/haas vf2.cps b/Haas_Next_Generation/haas vf2.cps index 5fed4e3..14283f9 100644 --- a/Haas_Next_Generation/haas vf2.cps +++ b/Haas_Next_Generation/haas vf2.cps @@ -1095,9 +1095,11 @@ function defineMachine() { function onOpen() { receivedMachineConfiguration = (typeof machineConfiguration.isReceived == "function") ? machineConfiguration.isReceived() : ((machineConfiguration.getDescription() != "") || machineConfiguration.isMultiAxisConfiguration()); - if (typeof defineMachine == "function") { + + // removed hardcoded machine configs to allow for simulation + /*if (typeof defineMachine == "function") { defineMachine(); // hardcoded machine configuration - } + }*/ activateMachine(); // enable the machine optimizations and settings if (staticProperties.useDPMFeeds) {