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) {