Skip to content

Commit 41a2500

Browse files
mikecentolamikecentola
committed
Merge branch 'hotfix-0.5.1'
2 parents b04a028 + 1d47a87 commit 41a2500

31 files changed

+517
-1282
lines changed

‎.gitignore‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
.eslintcache
2-
node_modules
3-
releases
42
*.vsix
5-
out
63
dist
7-
images/*.ai
4+
images/*.ai
5+
node_modules
6+
out
7+
releases
8+
tsconfig.tsbuildinfo

‎.vscode/launch.json‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,25 @@
1919
],
2020
"preLaunchTask": "${defaultBuildTask}"
2121
},
22+
{
23+
"name": "Run G-Code (Sandbox) - Open Samples",
24+
"type": "extensionHost",
25+
"request": "launch",
26+
"runtimeExecutable": "${execPath}",
27+
"args": [
28+
"--disable-extensions",
29+
"--extensionDevelopmentPath=${workspaceFolder}",
30+
"${workspaceFolder}/samplenc/sample-colors.nc",
31+
"${workspaceFolder}/samplenc/sample-profile.nc"
32+
],
33+
"stopOnEntry": false,
34+
"sourceMaps": true,
35+
"smartStep": true,
36+
"outFiles": [
37+
"${workspaceFolder}/out/**/*.js"
38+
],
39+
"preLaunchTask": "${defaultBuildTask}"
40+
},
2241
{
2342
"name": "Run G-Code Tests",
2443
"type": "extensionHost",

‎.vscodeignore‎

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,25 @@
1+
.eslintcache
2+
.eslintignore
3+
.eslintrc.json
4+
.gitattributes
15
.github/**
2-
.vscode/**
6+
.gitignore
7+
.prettierignore
8+
.prettierrc
39
.vscode-test/**
4-
out/test/**
5-
test/**
6-
src/**
10+
.vscode/**
711
**/*.map
8-
.gitignore
9-
.gitattributes
10-
tsconfig.json
11-
package-lock.json
12-
vsc-extension-quickstart.md
12+
CODE_OF_CONDUCT.md
13+
CONTRIBUTING.md
1314
images/*.ai
1415
images/*.svg
1516
LICENSE
16-
CONTRIBUTING.md
17-
CODE_OF_CONDUCT.md
1817
node_modules/**
19-
.eslintignore
20-
.eslintcache
18+
out/test/**
19+
package-lock.json
20+
samplenc/**
21+
src/**
22+
test/**
23+
tsconfig.json
24+
tsconfig.tsbuildinfo
2125
webpack.config.js

‎CHANGELOG.md‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,19 @@
22

33
All changes to vscode-code-syntax will be documented here.
44

5+
## v0.5.1 [#](https://github.com/appliedengesign/vscode-gcode-syntax/releases/tag/v0.5.1)
6+
7+
### Fixes
8+
9+
- Fixed Runtime Stats error in circular interpolation [#22](https://github.com/appliedengdesign/vscode-gcode-syntax/issues/22)
10+
- Fixed Runtime Stats Error with incorrect Values [#22](https://github.com/appliedengdesign/vscode-gcode-syntax/issues/22)
11+
- Fixed colorization of H/T/D codes with period at the end
12+
13+
### Other
14+
15+
- Added extra launch debugging configurations
16+
- Updated [README.md](https://github.com/appliedengdesign/vscode-gcode-syntax/blob/master/README.md)
17+
518
## v0.5.0 [#](https://github.com/appliedengesign/vscode-gcode-syntax/releases/tag/v0.5.0)
619

720
### New Features

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ Visit our [projects page](https://github.com/appliedengdesign/vscode-gcode-synta
106106

107107
## Changelog
108108

109-
Latest Version: v0.5.0
109+
Latest Version: v0.5.1
110110

111111
Please refer to our [CHANGELOG](https://github.com/appliedengdesign/vscode-gcode-syntax/blob/master/CHANGELOG.md) doc.
112112

‎package-lock.json‎

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"displayName": "G-Code Syntax",
44
"shortName": "G-Code",
55
"description": "CNC G-Code Syntax Langauge",
6-
"version": "0.5.0",
6+
"version": "0.5.1",
77
"license": "MIT",
88
"publisher": "appliedengdesign",
99
"author": {
@@ -237,7 +237,7 @@
237237
{
238238
"view": "gcode.views.stats",
239239
"contents": "G-Code Stats only available when viewing G-Code",
240-
"when": "!statsEnabled"
240+
"when": "!gcode:stats:enabled"
241241
}
242242
],
243243
"menus": {
@@ -343,7 +343,7 @@
343343
"devDependencies": {
344344
"@types/glob": "^7.1.3",
345345
"@types/mocha": "^8.2.1",
346-
"@types/node": "^14.14.32",
346+
"@types/node": "^14.14.33",
347347
"@types/vscode": "^1.54.0",
348348
"@typescript-eslint/eslint-plugin": "^4.17.0",
349349
"@typescript-eslint/parser": "^4.17.0",

‎resources/icons/gcode.svg‎

Lines changed: 1 addition & 1019 deletions
Loading

‎samplenc/sample-colors.nc‎

Lines changed: 133 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,133 @@
1+
%
2+
O01234
3+
G40 G49 G80
4+
( BEGIN TOOL LIST )
5+
( TOOL 17 - 3/8 EM - DESC: 0.3771 DIA, 2 FLUTE, CARBIDE MAT )
6+
( ENDOF TOOL LIST )
7+
8+
( WORK ZERO )
9+
G54
10+
11+
(POCKET SLOTS)
12+
(Tool Diameter = 0.3771 Length = 1.5 )
13+
G20 T17 M6
14+
T808
15+
16+
T0202
17+
18+
M08
19+
S12000 M03
20+
21+
T#123
22+
23+
H#123
24+
25+
H27.4
26+
27+
S3200 M04
28+
G90 G0 X-1.9996 Y-6.2902
29+
G43 Z-2.8833 H17
30+
G1 Z-3.1333 F45.
31+
X-2.0486 Y-6.2744 Z-3.1378 F67.5
32+
X-2.1029 Y-6.2565 Z-3.1428
33+
X-2.157 Y-6.238 Z-3.1478
34+
X-2.2109 Y-6.2191 Z-3.1528
35+
X-2.2647 Y-6.1997 Z-3.1578
36+
G02 X5. Y6. R2.0
37+
G03 X5. Y6. R3.5
38+
39+
G04 P50.
40+
41+
G154 P25
42+
43+
G54.1 P35
44+
45+
G05.1
46+
47+
G68.2
48+
49+
G53.1
50+
51+
G59 P25
52+
53+
G112
54+
55+
G15 H10
56+
57+
X.1234
58+
59+
X-.1242
60+
61+
M04 S5000
62+
63+
(POCKET SLOTS)
64+
(Tool Diameter = 0.3771 Length = 1.5 )
65+
M06 T12
66+
M08
67+
S12000 M03
68+
69+
S5000 M03
70+
M3 S#1243
71+
72+
M3 S[1234 / #123]
73+
74+
G41 D02
75+
76+
#3004=0
77+
#28=0(LOOP CHECKING)
78+
WHILE[ABS[#5+7.]]LT0.1]D02(WAIT FOR OPCODE)
79+
G02X#[#31+10.]
80+
#28=#28+1
81+
IF[#28 LT 5000] GOTO300
82+
#33=78
83+
N300
84+
END2
85+
E.#234
86+
E#234
87+
88+
F[#123/2]
89+
90+
X[#234 / 2]
91+
92+
G04 P1.
93+
G04 P.5
94+
G04 P500
95+
96+
IF[#898EQ#996]GOTO19999
97+
98+
#[#8 + 7.]=0
99+
100+
G51 P[ #5 * 1000 ]
101+
102+
#101 = FIX[ #1 MOD 1000 ]
103+
104+
G65 P5000 A1. B2. C3.
105+
106+
M09
107+
108+
(POCKET SLOTS)
109+
(Tool Diameter = 0.3771 Length = 1.5 )
110+
G20 T1 M06
111+
M08
112+
S12000 M03
113+
114+
M97 P1000
115+
116+
T13 M6
117+
118+
M30
119+
120+
121+
N1000
122+
( LOCAL SUB PROGRAM)
123+
124+
G00 X0. Y0.
125+
126+
M6 T25
127+
128+
M99
129+
130+
131+
132+
133+
%

‎samplenc/sample-profile.nc‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
%
2+
O0
3+
G40 G49 G80
4+
( BEGIN TOOL LIST )
5+
( TOOL 3 - .25 EM - DESC: 0.2497 DIA, 3 FLUTE, CARBIDE MAT )
6+
( ENDOF TOOL LIST )
7+
(2 1/2 Axis Profiling)
8+
(Tool Diameter = 0.2497 Length = 3.5 )
9+
G20 T03 M6
10+
M08
11+
S12000 M03
12+
G90 G00 X4.8752 Y0.
13+
G43 Z0.25 H03
14+
G01 Z0. F18.
15+
Y4. F36.
16+
G17
17+
G03 X4. Y4.8752 I-0.8752 J0.
18+
G01 X-4.
19+
G03 X-4.8752 Y4. I0. J-0.8752
20+
G01 Y1.
21+
G03 X-4. Y0.1248 I0.8752 J0.
22+
G01 X-2.
23+
G02 X0.1248 Y-2. I0. J-2.1248
24+
G01 Y-4.
25+
G03 X1. Y-4.8752 I0.8752 J0.
26+
G01 X4.
27+
G03 X4.8752 Y-4. I0. J0.8752
28+
G01 Y0.
29+
G00 Z0.25
30+
M05
31+
M09
32+
G28 G91 Z0.0
33+
M30
34+
%

0 commit comments

Comments
 (0)