Merge branch 'dev'

Author: mikecentola

.vscode/vscode-gcode-syntax.code-snippets

@@ -0,0 +1,19 @@
+{
+	// Snippets for developing extensions
+
+	"Create Snippet": {
+		"scope": "json",
+		"prefix": "snip",
+		"body": [
+			"\"$1\": {",
+				"\t\"scope\": \"gcode\",",
+				"\t\"prefix\": \"$2\",",
+					"\t\"body\": [",
+						"\t\t\"$0\"",
+					"\t],",
+				"\t\"description\": \"$3\"",
+			"}"
+		],
+		"description": "Create Snippet"
+	}
+}

README.md

@@ -2,7 +2,7 @@
 
 [![MIT License](https://badgen.net/badge/license/MIT)](https://opensource.org/licenses/MIT)
 [![GitHub](https://badgen.net/github/release/appliedengdesign/vscode-gcode-syntax)](https://github.com/appliedengdesign/vscode-gcode-syntax)
-[![GitHub Issues](https://badgen.net/github/issues/appliedengdesign/vscode-gcode-syntax)](https://github.com/appliedengdesign/vscode-gcode-syntax/issues)
+[![GitHub Issues](https://badgen.net/github/open-issues/appliedengdesign/vscode-gcode-syntax)](https://github.com/appliedengdesign/vscode-gcode-syntax/issues)
 ![Gihub Stars](https://badgen.net/github/stars/appliedengdesign/vscode-gcode-syntax)
 [![VS Marketplace Installs](https://badgen.net/vs-marketplace/i/appliedengdesign.vscode-gcode-syntax)](https://marketplace.visualstudio.com/items?itemName=appliedengdesign.vscode-gcode-syntax)
 [![Follow @appliedengdesign](https://badgen.net/twitter/follow/appliedengdes)](https://twitter.com/appliedengdes)

snippets/gcode-snippets.json

@@ -1,12 +1,58 @@
 {
+    "G04": {
+        "scope": "gcode",
+        "prefix": "G04",
+        "body": [
+            "G04 P${0:[Dwell]}"
+        ],
+        "description": "G04 Dwell"
+    },
+    "G43": {
+        "scope": "gcode",
+        "prefix": "G43",
+        "body": [
+            "G43 Z${1:[Z Loc]} H${0:[Tool Num]}"
+        ],
+        "description": ""
+    },
     "G81": {
         "prefix": "G81",
         "scope": "gcode",
         "body": [
-            "G81 Z${1:[Depth]} R${2:[Retract Plate]} F${3:[Feed Rate]}",
+            "G81 X${1:[X Loc]} Y${2:[Y Loc]} Z${3:[Depth]} R${4:[Retract Plane]} F${5:[Feed Rate]}",
+            " $0",
+            "G80"
+        ],
+        "description": "G81 Drill Cycle"
+    },
+    "G82": {
+        "prefix": "G82",
+        "scope": "gcode",
+        "body": [
+            "G82 X${1:[X Loc]} Y${2:[Y Loc]} Z${3:[Depth]} R${4:[Retract Plane]} F${5:[Feed Rate]} P${6:[Dwell]}",
+            " $0",
+            "G80"
+        ],
+        "description": "G82 Drill Cycle w/ Dwell"
+    },
+    "G83": {
+        "prefix": "G83",
+        "scope": "gcode",
+        "body": [
+            "G83 X${1:[X Loc]} Y${2:[Y Loc]} Z${3:[Depth]} R${4:[Retract Plane]} Q${5:[Peck Incr]} F${6:[Feed Rate]}",
+            " $0",
+            "G80"
+        ],
+        "description": "G83 Deep Hole Peck Cycle"
+    },
+    "G84": {
+        "scope": "gcode",
+        "prefix": "G84",
+        "body": [
+            "G84 X${1:[X Loc]} Y${2:[Y Loc]} Z${3:[Depth]} R${4:[Retract Plane]} F${5:[Feed Rate]}",
             " $0",
             "G80"
         ],
-        "description": "G81 Canned Drill Cycle"
+        "description": "G84 Tapping cycle"
     }
 }

snippets/general-snippets.json

@@ -14,9 +14,9 @@
         "description": "GOTO Number"
     },
     "NXXXX": {
-        "prefix": "N",
+        "prefix": "sub",
         "body": [
-            "N{1:NNNN}",
+            "N${1:NNNN}",
             " $0",
             "M99"
         ],

snippets/mcode-snippets.json

@@ -1,13 +1,39 @@
 {
+    "Spindle": {
+        "scope": "gcode",
+        "prefix": "S",
+        "body": [
+            "S${1:[RPM]} M0${2|3,4|}"
+        ],
+        "description": "Spindle Speed"
+    },
+    "M06": {
+        "scope": "gcode",
+        "prefix": "M06",
+        "body": [
+            "M06 T${0:[Tool Num]}"
+        ],
+        "description": "M06 Tool Change"
+    },
+    "M19": {
+        "scope": "gcode",
+        "prefix": "M19",
+        "body": [
+            "M19 ${1|P,S|}${0:[Angle]}"
+        ],
+        "description": "M19 Spindle Orient"
+    },
     "M97": {
         "scope": "gcode",
+        "prefix": "M97",
         "body": [
             "M97 P${2:0000} L${0:1}"
         ],
         "description": "M97 Local Subprogram Call"
     },
     "M98": {
         "scope": "gcode",
+        "prefix": "M98",
         "body": [
             "M98 P${1:0000} L${0:1}"
         ],

syntaxes/gcode.tmLanguage.json

@@ -71,7 +71,11 @@
         "operators": {
             "patterns": [
                 {
+<<<<<<< HEAD
                     "match": "(SIN)|(COS)|(TAN)|(ASIN)|(ACOS)|(ATAN)|(LN)|(SQRT)|(MOD)|(EXP)",
+=======
+                    "match": "(SIN)|(COS)|(TAN)|(ASIN)|(ACOS)|(ATAN)|(FIX)|(FUP)|(LN)|(ROUND)|(SQRT)",
+>>>>>>> added snippets
                     "name": "support.constant.math.gcode"
                 },
                 {