@duet3d/monacotokens 3.7.0-beta.2 → 3.7.0-rc.1

package/dist/expressions/expressions.json

@@ -183,7 +183,7 @@
         },
         {
             "name": "result",
-            "description": "0 if the last G-/M-/T-code succeeded, 1 = warning, >= 2 = error"
+            "description": "0 if the last G-/M-/T-code succeeded, 1 = warning, >= 2 = error, -1 = blocking M291 cancelled or timed out"
         },
         {
             "name": "input",
@@ -193,11 +193,11 @@
     "scopes": [
         {
             "name": "global",
-            "description": "Global variables persisted for the current DCS/DSF session"
+            "description": "Global variables, persisted until the machine is reset"
         },
         {
             "name": "var",
-            "description": "Local variables of the current macro / job / trigger"
+            "description": "Local variables, scoped to the enclosing indentation block"
         },
         {
             "name": "param",

package/dist/gcodes/gcodes.json

@@ -358,7 +358,7 @@
             },
             {
                 "letter": "P",
-                "description": "Trigger value (ADC units)"
+                "description": "Trigger value (ADC units, or grams for load cell probes)"
             },
             {
                 "letter": "Z",
@@ -626,12 +626,7 @@
     {
         "code": "M0",
         "summary": "Stop or Unconditional stop",
-        "parameters": [
-            {
-                "letter": "H",
-                "description": "Prevent heaters being turned off"
-            }
-        ]
+        "parameters": []
     },
     {
         "code": "M1",
@@ -797,6 +792,28 @@
                 "letter": "S",
                 "description": "File position from start of file (bytes)"
             },
+            {
+                "letter": "C",
+                "description": "Motion command in effect at that file position",
+                "values": [
+                    {
+                        "value": "0",
+                        "description": "G0"
+                    },
+                    {
+                        "value": "1",
+                        "description": "G1"
+                    },
+                    {
+                        "value": "2",
+                        "description": "G2"
+                    },
+                    {
+                        "value": "3",
+                        "description": "G3"
+                    }
+                ]
+            },
             {
                 "letter": "P",
                 "description": "Proportion of first move to skip (0 to <1)"
@@ -955,14 +972,6 @@
             {
                 "letter": "S",
                 "description": "Pin value (0.0-1.0 or >1.0-255; 0 = off)"
-            },
-            {
-                "letter": "F",
-                "description": "PWM frequency"
-            },
-            {
-                "letter": "I",
-                "description": "Invert PWM output"
             }
         ]
     },
@@ -1047,7 +1056,8 @@
         ],
         "axisParameter": {
             "description": "Disable {axis} motor(s)"
-        }
+        },
+        "deprecated": "Use M18 to disable motors and M906 T to set the idle timeout"
     },
     {
         "code": "M92",
@@ -1308,15 +1318,15 @@
         "parameters": [
             {
                 "letter": "P",
-                "description": "Tool number"
+                "description": "Tool number(s); P without a value waits for all tools"
             },
             {
                 "letter": "H",
-                "description": "Heater number"
+                "description": "Heater number(s)"
             },
             {
                 "letter": "C",
-                "description": "Chamber number"
+                "description": "Chamber number(s); C without a value waits for all chambers"
             },
             {
                 "letter": "S",
@@ -1623,36 +1633,6 @@
             {
                 "letter": "E",
                 "description": "LED strip number"
-            },
-            {
-                "letter": "X",
-                "description": "LED type",
-                "values": [
-                    {
-                        "value": "0",
-                        "description": "DotStar"
-                    },
-                    {
-                        "value": "1",
-                        "description": "RGB NeoPixel"
-                    },
-                    {
-                        "value": "2",
-                        "description": "Bit-banged RGB NeoPixel"
-                    },
-                    {
-                        "value": "3",
-                        "description": "RGBW NeoPixel"
-                    },
-                    {
-                        "value": "4",
-                        "description": "Bit-banged RGBW NeoPixel"
-                    }
-                ]
-            },
-            {
-                "letter": "Q",
-                "description": "SPI frequency"
             }
         ]
     },
@@ -1725,15 +1705,15 @@
     },
     {
         "code": "M201.1",
-        "summary": "Set reduced acceleration for special move types",
+        "summary": "Set acceleration for special move types",
         "parameters": [
             {
                 "letter": "E",
-                "description": "Reduced acceleration for extruders (units/s^2)"
+                "description": "Acceleration for extruders (units/s^2)"
             }
         ],
         "axisParameter": {
-            "description": "Reduced acceleration for {axis} axis (units/s^2)"
+            "description": "Acceleration for {axis} axis (units/s^2)"
         }
     },
     {
@@ -1744,6 +1724,20 @@
                 "letter": "E",
                 "description": "Max extruder feedrate(s) (mm/min)"
             },
+            {
+                "letter": "S",
+                "description": "Units of the values in this command",
+                "values": [
+                    {
+                        "value": "0",
+                        "description": "mm/min (default)"
+                    },
+                    {
+                        "value": "1",
+                        "description": "mm/sec"
+                    }
+                ]
+            },
             {
                 "letter": "I",
                 "description": "Minimum allowed feedrate (mm/min)"
@@ -1764,6 +1758,11 @@
             {
                 "letter": "T",
                 "description": "Travel acceleration (mm/s^2)"
+            },
+            {
+                "letter": "S",
+                "description": "Acceleration for both printing and travel moves",
+                "deprecated": "Use P and T instead"
             }
         ]
     },
@@ -2239,7 +2238,17 @@
         "parameters": [
             {
                 "letter": "P",
-                "description": "Cancel operation: 0 = continue, 1 = cancel"
+                "description": "Whether the current operation is cancelled",
+                "values": [
+                    {
+                        "value": "0",
+                        "description": "Continue the operation"
+                    },
+                    {
+                        "value": "1",
+                        "description": "Cancel the operation"
+                    }
+                ]
             },
             {
                 "letter": "R",
@@ -2608,6 +2617,22 @@
                     {
                         "value": "ads131.chan0.b",
                         "description": "Duet 3 ADC daughterboard, bipolar"
+                    },
+                    {
+                        "value": "ads131.chan1",
+                        "description": "Duet 3 ADC daughterboard, second channel"
+                    },
+                    {
+                        "value": "thermopile_tpis.object",
+                        "description": "Bondtech INDX radiant heat sensor"
+                    },
+                    {
+                        "value": "thermopile_tpis.ambient",
+                        "description": "Bondtech INDX ambient temperature (secondary output)"
+                    },
+                    {
+                        "value": "thermopile_tpis.environment",
+                        "description": "Bondtech INDX tool surround thermistor (secondary output)"
                     }
                 ]
             },
@@ -2859,6 +2884,7 @@
     {
         "code": "M404",
         "summary": "Filament diameter",
+        "deprecated": "Use M200 instead",
         "parameters": [
             {
                 "letter": "N",
@@ -2866,47 +2892,8 @@
             },
             {
                 "letter": "D",
-                "description": "Nozzle diameter (mm)"
-            }
-        ]
-    },
-    {
-        "code": "M408",
-        "summary": "Report JSON-style response",
-        "parameters": [
-            {
-                "letter": "S",
-                "description": "Response type (used when R absent)",
-                "values": [
-                    {
-                        "value": "0",
-                        "description": "Short-form response (only types 0 and 1.6.0+)"
-                    },
-                    {
-                        "value": "1",
-                        "description": "Like type 0 but also includes static values"
-                    },
-                    {
-                        "value": "2",
-                        "description": "Similar to the Duet Web Control web server response"
-                    },
-                    {
-                        "value": "3",
-                        "description": "Extended type 2 with additional rarely-changing parameters"
-                    },
-                    {
-                        "value": "4",
-                        "description": "Extended type 2 used to poll current printer statistics"
-                    },
-                    {
-                        "value": "5",
-                        "description": "Reports the current machine configuration"
-                    }
-                ]
-            },
-            {
-                "letter": "R",
-                "description": "Response sequence number"
+                "description": "Nozzle diameter (mm)",
+                "deprecated": "Ignored, has no effect"
             }
         ]
     },
@@ -2984,42 +2971,13 @@
             {
                 "letter": "F",
                 "description": "PWM frequency (Hz, default 500)"
-            },
-            {
-                "letter": "P",
-                "description": "Logical pin number used to control the laser"
-            },
-            {
-                "letter": "I",
-                "description": "Invert output polarity (I1 inverts, I0 default)"
             }
         ]
     },
     {
         "code": "M453",
         "summary": "Select CNC Device Mode",
-        "parameters": [
-            {
-                "letter": "S",
-                "description": "Spindle index (default 0)"
-            },
-            {
-                "letter": "C",
-                "description": "Spindle motor port names (PWM, on/off, fwd/rev)"
-            },
-            {
-                "letter": "Q",
-                "description": "PWM frequency (Hz)"
-            },
-            {
-                "letter": "T",
-                "description": "Tool number to assign spindle to"
-            },
-            {
-                "letter": "R",
-                "description": "Spindle RPM achieved at full PWM"
-            }
-        ]
+        "parameters": []
     },
     {
         "code": "M470",
@@ -3363,15 +3321,11 @@
                     },
                     {
                         "value": "2",
-                        "description": "Simple modulated IR probe"
-                    },
-                    {
-                        "value": "3",
-                        "description": "As P1 but control signal driven low"
+                        "description": "Simple modulated IR probe (deprecated)"
                     },
                     {
                         "value": "5",
-                        "description": "Filtered digital switch (NC by default)"
+                        "description": "Filtered digital switch, NC by default (deprecated, use P8)"
                     },
                     {
                         "value": "8",
@@ -3388,6 +3342,10 @@
                     {
                         "value": "11",
                         "description": "Scanning Z probe with analog output"
+                    },
+                    {
+                        "value": "12",
+                        "description": "Load cell probe, triggers on nozzle contact force"
                     }
                 ]
             },
@@ -3422,6 +3380,14 @@
             {
                 "letter": "B",
                 "description": "B1 = turn off all heaters while probing (default B0)"
+            },
+            {
+                "letter": "V",
+                "description": "Load cell scale (grams per count), required for probe type 12"
+            },
+            {
+                "letter": "U",
+                "description": "Load cell preload window (grams, low:high); equal values disable the check"
             }
         ]
     },
@@ -3505,6 +3471,16 @@
             }
         ]
     },
+    {
+        "code": "M558.4",
+        "summary": "Tare load cell probe",
+        "parameters": [
+            {
+                "letter": "K",
+                "description": "Probe number (default 0); must be a load cell probe"
+            }
+        ]
+    },
     {
         "code": "M559",
         "summary": "Upload file",
@@ -3633,6 +3609,20 @@
                         "description": "Limit movement within axis boundaries"
                     }
                 ]
+            },
+            {
+                "letter": "R",
+                "description": "Handling of relative moves that exceed the axis boundaries",
+                "values": [
+                    {
+                        "value": "0",
+                        "description": "Throw an error"
+                    },
+                    {
+                        "value": "1",
+                        "description": "Clamp the move to the axis boundaries (default)"
+                    }
+                ]
             }
         ]
     },
@@ -3883,6 +3873,10 @@
                 "letter": "A",
                 "description": "Acceleration feedforward constant"
             },
+            {
+                "letter": "B",
+                "description": "Position error deadband at standstill (full steps); B0 disables it, negative restores the automatic value"
+            },
             {
                 "letter": "H",
                 "description": "Minimum holding current (% of motor current)"
@@ -3912,6 +3906,46 @@
             {
                 "letter": "V",
                 "description": "Value to write (omit to read)"
+            },
+            {
+                "letter": "S",
+                "description": "Sine table harmonic to correct",
+                "values": [
+                    {
+                        "value": "4",
+                        "description": "4th harmonic"
+                    },
+                    {
+                        "value": "8",
+                        "description": "8th harmonic"
+                    },
+                    {
+                        "value": "12",
+                        "description": "12th harmonic"
+                    },
+                    {
+                        "value": "16",
+                        "description": "16th harmonic"
+                    }
+                ]
+            },
+            {
+                "letter": "J",
+                "description": "Correction magnitude (degrees, 0-90); J0 removes the harmonic"
+            },
+            {
+                "letter": "O",
+                "description": "Correction phase (degrees)",
+                "values": [
+                    {
+                        "value": "0",
+                        "description": "0 degrees (default)"
+                    },
+                    {
+                        "value": "180",
+                        "description": "180 degrees"
+                    }
+                ]
             }
         ]
     },
@@ -4145,6 +4179,10 @@
         "code": "M574",
         "summary": "Set endstop configuration",
         "parameters": [
+            {
+                "letter": "E",
+                "description": "Extruder to bind a filament endstop to; P gives the M950 J input port"
+            },
             {
                 "letter": "P",
                 "description": "Pin name(s) for the endstop"
@@ -4168,6 +4206,10 @@
                     {
                         "value": "4",
                         "description": "Multiple motor load detection (stop each motor individually)"
+                    },
+                    {
+                        "value": "5",
+                        "description": "Encoder position error, triggers at the M569.1 E warning threshold"
                     }
                 ]
             },
@@ -4200,7 +4242,25 @@
         "parameters": [
             {
                 "letter": "P",
-                "description": "Serial channel number"
+                "description": "Serial channel number",
+                "values": [
+                    {
+                        "value": "0",
+                        "description": "Main serial interface, typically USB"
+                    },
+                    {
+                        "value": "1",
+                        "description": "Second serial interface, typically USB"
+                    },
+                    {
+                        "value": "2",
+                        "description": "Auxiliary serial port, typically io0 (PanelDue)"
+                    },
+                    {
+                        "value": "3",
+                        "description": "Second auxiliary serial port, typically io1"
+                    }
+                ]
             },
             {
                 "letter": "B",
@@ -4269,6 +4329,24 @@
                         "description": "Device, eg Modbus or UART (if supported)"
                     }
                 ]
+            },
+            {
+                "letter": "F",
+                "description": "Data bits and parity, applied in Device mode only",
+                "values": [
+                    {
+                        "value": "0",
+                        "description": "8 data bits, no parity (default)"
+                    },
+                    {
+                        "value": "1",
+                        "description": "8 data bits, even parity"
+                    },
+                    {
+                        "value": "2",
+                        "description": "8 data bits, odd parity"
+                    }
+                ]
             }
         ]
     },
@@ -4280,13 +4358,17 @@
                 "letter": "S",
                 "description": "Max delay between SPI transfers (ms)"
             },
-            {
-                "letter": "F",
-                "description": "Max delay between SPI transfers with a file open (ms)"
-            },
             {
                 "letter": "P",
                 "description": "Events required to skip the delay"
+            },
+            {
+                "letter": "B",
+                "description": "Burst mode window after an expression, assignment or macro request (ms)"
+            },
+            {
+                "letter": "D",
+                "description": "Delay between SPI transfers in burst mode (ms)"
             }
         ]
     },
@@ -4311,10 +4393,6 @@
             {
                 "letter": "P",
                 "description": "Input pin to wait for (M950 J)"
-            },
-            {
-                "letter": "E",
-                "description": "Extruder drive endstop to wait for"
             }
         ],
         "axisParameter": {
@@ -4521,24 +4599,6 @@
             {
                 "letter": "R",
                 "description": "Probing radius from current position (mm)"
-            },
-            {
-                "letter": "E",
-                "description": "Custom endstop number to use, drive index"
-            },
-            {
-                "letter": "L",
-                "description": "Trigger level for custom endstop",
-                "values": [
-                    {
-                        "value": "0",
-                        "description": "Active-low"
-                    },
-                    {
-                        "value": "1",
-                        "description": "Active-high"
-                    }
-                ]
             }
         ],
         "axisParameter": {
@@ -5122,12 +5182,11 @@
                         "description": "Activate keepout zone (default if any axes are specified)"
                     }
                 ]
-            },
-            {
-                "letter": "X",
-                "description": "Axis identifier and limits (aaa:bbb)"
             }
-        ]
+        ],
+        "axisParameter": {
+            "description": "{axis} axis limits of the keepout zone (aaa:bbb)"
+        }
     },
     {
         "code": "M600",
@@ -5753,11 +5812,11 @@
         "parameters": [
             {
                 "letter": "P",
-                "description": "Drive number(s) to configure"
+                "description": "Drive number(s) to configure, or use axis letters instead"
             },
             {
-                "letter": "X",
-                "description": "Axis/axes to configure (alternative to P)"
+                "letter": "E",
+                "description": "Extruder number(s) to configure"
             },
             {
                 "letter": "S",
@@ -5807,7 +5866,10 @@
                     }
                 ]
             }
-        ]
+        ],
+        "axisParameter": {
+            "description": "Stall detection for the drivers of the {axis} axis"
+        }
     },
     {
         "code": "M916",
@@ -5947,6 +6009,10 @@
                 "letter": "T",
                 "description": "Sensor (heater), LED type, or control type (spindle)"
             },
+            {
+                "letter": "B",
+                "description": "Ambient temperature sensor number (heaters)"
+            },
             {
                 "letter": "L",
                 "description": "Spindle RPM at zero and at maximum PWM"
@@ -6201,6 +6267,20 @@
             }
         ]
     },
+    {
+        "code": "M959",
+        "summary": "Configure CAN expansion board connection",
+        "parameters": [
+            {
+                "letter": "B",
+                "description": "CAN address of the expansion board (1-126)"
+            },
+            {
+                "letter": "T",
+                "description": "Connection timeout (s), minimum 3, default 10"
+            }
+        ]
+    },
     {
         "code": "M970",
         "summary": "Enable/disable phase stepping",
@@ -6260,6 +6340,28 @@
             "description": "Acceleration constant (default 50000.0)"
         }
     },
+    {
+        "code": "M970.3",
+        "summary": "Configure phase stepping waveform correction",
+        "parameters": [
+            {
+                "letter": "P",
+                "description": "Driver number"
+            },
+            {
+                "letter": "S",
+                "description": "Harmonic of the electrical cycle to correct (1-16)"
+            },
+            {
+                "letter": "J",
+                "description": "Correction magnitude (degrees, 0-90); J0 removes the harmonic"
+            },
+            {
+                "letter": "O",
+                "description": "Correction phase (degrees, 0-360)"
+            }
+        ]
+    },
     {
         "code": "M997",
         "summary": "Perform in-application firmware update",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@duet3d/monacotokens",
-  "version": "3.7.0-beta.2",
+  "version": "3.7.0-rc.1",
   "description": "TypeScript library that holds syntax highlighting files for the Monaco editor",
   "type": "module",
   "main": "dist/index.js",
@@ -35,7 +35,7 @@
     "monaco-editor": { "optional": true }
   },
   "devDependencies": {
-    "@duet3d/objectmodel": "~3.7.0-beta.2",
+    "@duet3d/objectmodel": "~3.7.0-beta.6",
     "monaco-editor-core": "^0.56.0",
     "typescript": "^7.0.2"
   },