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

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",
@@ -255,7 +255,7 @@
         },
         {
             "name": "sbc",
-            "description": "Information about the SBC which Duet Software Framework is running on. This is null if the system is operating in standalone mode"
+            "description": "Information about the SBC running Duet Software Framework, null in standalone mode"
         },
         {
             "name": "sensors",

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",
@@ -421,7 +421,8 @@
         "parameters": [
             {
                 "letter": "P",
-                "description": "Probe number to use"
+                "description": "Probe number to use",
+                "deprecated": "Use K instead"
             },
             {
                 "letter": "K",
@@ -442,7 +443,8 @@
         "parameters": [
             {
                 "letter": "P",
-                "description": "Probe number to use"
+                "description": "Probe number to use",
+                "deprecated": "Use K instead"
             },
             {
                 "letter": "K",
@@ -463,7 +465,8 @@
         "parameters": [
             {
                 "letter": "P",
-                "description": "Probe number to use"
+                "description": "Probe number to use",
+                "deprecated": "Use K instead"
             },
             {
                 "letter": "K",
@@ -484,7 +487,8 @@
         "parameters": [
             {
                 "letter": "P",
-                "description": "Probe number to use"
+                "description": "Probe number to use",
+                "deprecated": "Use K instead"
             },
             {
                 "letter": "K",
@@ -626,12 +630,7 @@
     {
         "code": "M0",
         "summary": "Stop or Unconditional stop",
-        "parameters": [
-            {
-                "letter": "H",
-                "description": "Prevent heaters being turned off"
-            }
-        ]
+        "parameters": []
     },
     {
         "code": "M1",
@@ -797,6 +796,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)"
@@ -1301,15 +1322,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",
@@ -1688,15 +1709,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)"
         }
     },
     {
@@ -1707,6 +1728,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)"
@@ -2247,28 +2282,6 @@
             }
         ]
     },
-    {
-        "code": "M301",
-        "summary": "Set PID parameters",
-        "parameters": [
-            {
-                "letter": "H",
-                "description": "Heater number"
-            },
-            {
-                "letter": "P",
-                "description": "Proportional (Kp)"
-            },
-            {
-                "letter": "I",
-                "description": "Integral (Ki)"
-            },
-            {
-                "letter": "D",
-                "description": "Derivative (Kd)"
-            }
-        ]
-    },
     {
         "code": "M302",
         "summary": "Allow cold extrudes",
@@ -2345,24 +2358,6 @@
             }
         ]
     },
-    {
-        "code": "M304",
-        "summary": "Set PID parameters - Bed",
-        "parameters": [
-            {
-                "letter": "P",
-                "description": "Proportional (Kp)"
-            },
-            {
-                "letter": "I",
-                "description": "Integral (Ki)"
-            },
-            {
-                "letter": "D",
-                "description": "Derivative (Kd)"
-            }
-        ]
-    },
     {
         "code": "M305",
         "summary": "Set temperature sensor parameters",
@@ -2586,6 +2581,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)"
                     }
                 ]
             },
@@ -2595,11 +2606,11 @@
             },
             {
                 "letter": "U",
-                "description": "Reading offset u, or unit string (linear analog)"
+                "description": "Temperature reading offset (degC)"
             },
             {
                 "letter": "V",
-                "description": "Reading slope v: adjusted = raw*(1+v)+u"
+                "description": "Temperature reading slope adjustment"
             },
             {
                 "letter": "T",
@@ -2657,7 +2668,7 @@
             },
             {
                 "letter": "A",
-                "description": "Feedforward advance time"
+                "description": "Feedforward advance time (ms)"
             }
         ]
     },
@@ -2837,6 +2848,7 @@
     {
         "code": "M404",
         "summary": "Filament diameter",
+        "deprecated": "Use M200 instead",
         "parameters": [
             {
                 "letter": "N",
@@ -2844,47 +2856,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"
             }
         ]
     },
@@ -3312,15 +3285,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",
@@ -3337,6 +3306,10 @@
                     {
                         "value": "11",
                         "description": "Scanning Z probe with analog output"
+                    },
+                    {
+                        "value": "12",
+                        "description": "Load cell probe, triggers on nozzle contact force"
                     }
                 ]
             },
@@ -3371,6 +3344,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"
             }
         ]
     },
@@ -3454,6 +3435,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",
@@ -3846,6 +3837,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)"
@@ -3875,6 +3870,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"
+                    }
+                ]
             }
         ]
     },
@@ -4094,16 +4129,6 @@
             }
         ]
     },
-    {
-        "code": "M573",
-        "summary": "Report heater PWM",
-        "parameters": [
-            {
-                "letter": "P",
-                "description": "Heater number"
-            }
-        ]
-    },
     {
         "code": "M574",
         "summary": "Set endstop configuration",
@@ -4135,6 +4160,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"
                     }
                 ]
             },
@@ -4283,13 +4312,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)"
             }
         ]
     },
@@ -5114,6 +5147,11 @@
         "summary": "Filament change pause",
         "parameters": []
     },
+    {
+        "code": "M601",
+        "summary": "Pause print",
+        "parameters": []
+    },
     {
         "code": "M606",
         "summary": "Fork input file reader",
@@ -5412,7 +5450,7 @@
             },
             {
                 "letter": "R",
-                "description": "Min print radius (SCARA), or turntable radius (polar)"
+                "description": "Min print radius (SCARA), or min:max reachable radius (polar)"
             },
             {
                 "letter": "F",
@@ -5735,6 +5773,10 @@
                 "letter": "P",
                 "description": "Drive number(s) to configure, or use axis letters instead"
             },
+            {
+                "letter": "E",
+                "description": "Extruder number(s) to configure"
+            },
             {
                 "letter": "S",
                 "description": "Stall detection threshold"
@@ -5924,7 +5966,21 @@
             },
             {
                 "letter": "T",
-                "description": "Sensor (heater), LED type, or control type (spindle)"
+                "description": "Sensor (heater), LED type, or control type (spindle)",
+                "values": [
+                    {
+                        "value": "0",
+                        "description": "DotStar (LED strip), or enable/direction inputs (spindle)"
+                    },
+                    {
+                        "value": "1",
+                        "description": "RGB Neopixel (LED strip), or forward/reverse inputs (spindle)"
+                    },
+                    {
+                        "value": "2",
+                        "description": "RGBW Neopixel (LED strip)"
+                    }
+                ]
             },
             {
                 "letter": "B",
@@ -5936,7 +5992,33 @@
             },
             {
                 "letter": "K",
-                "description": "Spindle PWM values, fan tacho count, or LED colour order"
+                "description": "Spindle PWM values, fan tacho count, or LED colour order",
+                "values": [
+                    {
+                        "value": "0",
+                        "description": "BGR"
+                    },
+                    {
+                        "value": "1",
+                        "description": "BRG"
+                    },
+                    {
+                        "value": "2",
+                        "description": "RGB"
+                    },
+                    {
+                        "value": "3",
+                        "description": "RBG"
+                    },
+                    {
+                        "value": "4",
+                        "description": "GBR"
+                    },
+                    {
+                        "value": "5",
+                        "description": "GRB"
+                    }
+                ]
             },
             {
                 "letter": "U",
@@ -6068,7 +6150,7 @@
         "parameters": [
             {
                 "letter": "P",
-                "description": "Accelerometer as <board>.<index> (e.g. 0.0)"
+                "description": "Accelerometer number"
             },
             {
                 "letter": "I",
@@ -6084,7 +6166,7 @@
             },
             {
                 "letter": "C",
-                "description": "CS and INT pin names (in that order)"
+                "description": "CAN address plus CS and INT pin names, or CAN address plus I2C info (toolboards)"
             },
             {
                 "letter": "Q",
@@ -6098,7 +6180,7 @@
         "parameters": [
             {
                 "letter": "P",
-                "description": "Accelerometer as <board>.<index> (e.g. 0.0)"
+                "description": "Accelerometer number"
             },
             {
                 "letter": "S",
@@ -6186,7 +6268,7 @@
     },
     {
         "code": "M959",
-        "summary": "Configure CAN expansion board connection",
+        "summary": "Configure CAN expansion board behaviour",
         "parameters": [
             {
                 "letter": "B",
@@ -6257,6 +6339,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.3",
+  "version": "3.7.0-rc.2",
   "description": "TypeScript library that holds syntax highlighting files for the Monaco editor",
   "type": "module",
   "main": "dist/index.js",