--- delme.txt   2020-01-15 08:47:11.464750000 +0000
+++ "pocket nc.cps" 2020-01-15 08:48:46.530650300 +0000
@@ -4,8 +4,8 @@

   Pocket NC post processor configuration.

-  $Revision: 42473 905303e8374380273c82d214b32b7e80091ba92e $
-  $Date: 2019-09-04 00:46:02 $
+  $Revision: 42623 7d0467ea3f2bde989ba0ea01849c82dbe0ce81f2 $
+  $Date: 2020-01-09 16:17:13 $

   FORKID {B9F40C50-EBFF-4547-90FF-CAF4C01C8E30}
 */
@@ -58,11 +58,11 @@

 // user-defined property definitions
 propertyDefinitions = {
-  writeMachine: {title:"Write machine", description:"Output the machine settings in the header of the code.", group:0, type:"boolean"},
-  writeTools: {title:"Write tool list", description:"Output a tool list in the header of the code.", group:0, type:"boolean"},
-  showSequenceNumbers: {title:"Use sequence numbers", description:"Use sequence numbers for each block of outputted code.", group:1, type:"boolean"},
-  sequenceNumberStart: {title:"Start sequence number", description:"The number at which to start the sequence numbers.", group:1, type:"integer"},
-  sequenceNumberIncrement: {title:"Sequence number increment", description:"The amount by which the sequence number is incremented by in each block.", group:1, type:"integer"},
+  writeMachine: {title:"Write machine", description:"Output the machine settings in the header of the code.", group:1, type:"boolean"},
+  writeTools: {title:"Write tool list", description:"Output a tool list in the header of the code.", group:1, type:"boolean"},
+  showSequenceNumbers: {title:"Use sequence numbers", description:"Use sequence numbers for each block of outputted code.", group:2, type:"boolean"},
+  sequenceNumberStart: {title:"Start sequence number", description:"The number at which to start the sequence numbers.", group:2, type:"integer"},
+  sequenceNumberIncrement: {title:"Sequence number increment", description:"The amount by which the sequence number is incremented by in each block.", group:2, type:"integer"},
   optionalStop: {title:"Optional stop", description:"Outputs optional stop code during when necessary in the code.", type:"boolean"},
   separateWordsWithSpace: {title:"Separate words with space", description:"Adds spaces between words if 'yes' is selected.", type:"boolean"},
   useRadius: {title:"Radius arcs", description:"If yes is selected, arcs are outputted using radius values rather than IJK.", type:"boolean"},
@@ -77,12 +77,14 @@
   useG0: {title:"Use G0", description:"Specifies that G0 rapid moves should be output. Highfeed G1s will be output when disabled.", type:"boolean"},
   machineModel: {
     title: "Machine model",
-    description: "Select the machine model.",
+    description: "Select the machine model.  V1 and V2 have a maximum RPM of 10,000 RPM, V2-50 has a maximum RPM of 50,000 RPM",
     type: "enum",
     values:[
       {title:"V1", id:"V1"},
-      {title:"V2", id:"V2"}
-    ]
+      {title:"V2-10", id:"V2"},
+      {title:"V2-50", id:"V2-50"}
+    ],
+    group:0
   }
 };

@@ -216,9 +218,12 @@
   if (properties.machineModel == "V1") {
     spindleMin = 65;
     spindleMax = 10000;
-  } else {
+  } else if (properties.machineModel == "V2") {
     spindleMin = 2000;
     spindleMax = 10000;
+  } else {
+    spindleMin = 2000;
+    spindleMax = 50000;
   }

   if (true) { // only one kind of machine
@@ -587,7 +592,9 @@
 function remapToABC(currentABC, previousABC) {
   var both = machineConfiguration.getABCByDirectionBoth(machineConfiguration.getDirection(currentABC));
   var abc1 = machineConfiguration.remapToABC(both[0], previousABC);
+  abc1 = machineConfiguration.remapABC(abc1);
   var abc2 = machineConfiguration.remapToABC(both[1], previousABC);
+  abc2 = machineConfiguration.remapABC(abc2);
   if (Vector.diff(abc1, previousABC).length < Vector.diff(abc2, previousABC).length) {
     return abc1;
   } else {