Skip to content

Commit 28f8128

Browse files
akaJesakaJes
committed
updated libraries & docs
1 parent f30982f commit 28f8128

File tree

14 files changed

+251
-39
lines changed

14 files changed

+251
-39
lines changed

‎package.json‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "marlin-conf",
3-
"version": "2.10.1-",
3+
"version": "2.10.2",
44
"description": "configuration tool for Marlin project",
55
"main": "./index.js",
66
"scripts": {
@@ -13,7 +13,7 @@
1313
"rebuild": "npm rebuild serialport --update-binary",
1414
"prepublishOnly": "./node_modules/.bin/json -I -f package.json -e 'if(this.devDependencies)this.devDependenciesOff=this.devDependencies;this.devDependencies=undefined'",
1515
"postpublish": "./node_modules/.bin/json -I -f package.json -e 'if(this.devDependenciesOff)this.devDependencies=this.devDependenciesOff;this.devDependenciesOff=undefined'",
16-
"postinstall": "cd node_modules/ot ; npm i ; node_modules/.bin/grunt --force ; rm -r node_modules"
16+
"postinstall-": "cd node_modules/ot ; npm i ; node_modules/.bin/grunt --force ; rm -r node_modules"
1717
},
1818
"build": {
1919
"appId": "com.akajes.marlin.conf",
@@ -36,7 +36,7 @@
3636
"nsis": {},
3737
"mac": {
3838
"target": [
39-
"tar.gz"
39+
"zip"
4040
]
4141
},
4242
"dmg": {}
@@ -72,38 +72,38 @@
7272
"highlight.js": "^9.11.0",
7373
"jquery": "^3.3.1",
7474
"jquery-ui-dist": "^1.12.1",
75-
"js-yaml": "^3.11.0",
75+
"js-yaml": "^3.12.0",
7676
"jstree": "^3.3.5",
77-
"marked": "^0.3.19",
77+
"marked": "^0.4.0",
7878
"mkdirp": "^0.5.1",
79-
"moment": "^2.22.1",
79+
"moment": "^2.22.2",
8080
"nat-upnp": "git+https://github.com/MelvinTo/node-nat-upnp.git",
8181
"node-machine-id": "^1.1.10",
8282
"node-notifier": "^5.2.1",
8383
"opn": "^5.3.0",
8484
"ot": "git+https://github.com/Operational-Transformation/ot.js.git",
85-
"platformio-node-helpers": "^0.4.3",
85+
"platformio-node-helpers": "^0.5.2",
8686
"qr-image": "^3.2.0",
8787
"rtcmulticonnection-v3": "^3.4.4",
8888
"serialport": "^6.2.0",
89-
"simple-git": "^1.92.0",
89+
"simple-git": "^1.95.1",
9090
"socket.io": "^2.1.1",
9191
"swig-templates": "^2.0.2",
9292
"tether": "^1.4.4",
9393
"tmp": "0.0.33",
9494
"tty2html": "^1.0.0",
95-
"universal-analytics": "^0.4.16",
95+
"universal-analytics": "^0.4.17",
9696
"vex-js": "^4.1.0",
97-
"which": "^1.2.14",
98-
"yauzl": "^2.9.1",
97+
"which": "^1.3.1",
98+
"yauzl": "^2.9.2",
9999
"yazl": "^2.4.3"
100100
},
101101
"devDependencies": {
102102
"devtron": "^1.4.0",
103-
"electron": "latest",
104-
"electron-builder": "latest",
103+
"electron": "^2.0.1",
104+
"electron-builder": "^20.15.1",
105105
"eslint": "^4.18.1",
106106
"json": "^9.0.6",
107-
"nodemon": "^1.15.1"
107+
"nodemon": "^1.17.5"
108108
}
109109
}

‎views/configuration.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1453,7 +1453,7 @@ Option|Description
14531453
`REPRAP_DISCOUNT_SMART_CONTROLLER`|[RepRapDiscount Smart Controller](http://reprap.org/wiki/RepRapDiscount_Smart_Controller). Usually sold with a white PCB.
14541454
`G3D_PANEL`|[Gadgets3D G3D LCD/SD Controller](http://reprap.org/wiki/RAMPS_1.3/1.4_GADGETS3D_Shield_with_Panel). Usually sold with a blue PCB.
14551455
`RIGIDBOT_PANEL`|[RigidBot Panel V1.0](http://www.inventapart.com/).
1456-
`ANET_KEYPAD_LCD`|[Anet Keypad LCD](http://www.anet3d.com/English/3D_Printer/107.html) for the Anet A3
1456+
`ANET_KEYPAD_LCD`|[Anet Keypad LCD](http://www.anet3d.com/prod_view.aspx?TypeId=10&Id=178) for the Anet A3
14571457

14581458
### Graphical LCDs
14591459

@@ -1468,7 +1468,7 @@ Option|Description
14681468
`REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER`|[RepRapDiscount Full Graphic Smart Controller](http://reprap.org/wiki/RepRapDiscount_Full_Graphic_Smart_Controller).
14691469
`MINIPANEL`|[MakerLab Mini Panel](http://reprap.org/wiki/Mini_panel) with graphic controller and SD support.
14701470
`BQ_LCD_SMART_CONTROLLER`|BQ LCD Smart Controller shipped with the BQ Hephestos 2 and Witbox 2.
1471-
`ANET_FULL_GRAPHICS_LCD`|[Anet Full Graphics LCD](http://www.anet3d.com/English/3D_Printer/107.html) for the Anet A3
1471+
`ANET_FULL_GRAPHICS_LCD`|[Anet Full Graphics LCD](http://www.anet3d.com/prod_view.aspx?TypeId=10&Id=178) for the Anet A3
14721472

14731473
### Keypads
14741474

‎views/gcode/G005.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,14 @@ parameters:
4444
-
4545
tag: pos
4646
type: float
47+
-
48+
tag: F
49+
optional: true
50+
description: The maximum feedrate of the move between the start and end point (in current units per second). This value applies to all subsequent moves.
51+
values:
52+
-
53+
tag: rate
54+
type: float
4755
-
4856
tag: I
4957
optional: false

‎views/gcode/G029-ubl.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@ examples:
393393
G29 S1 ; Save UBL mesh points to EEPROM.
394394
G29 F 10.0 ; Set Fade Height for correction at 10.0 mm.
395395
G29 A ; Activate the UBL System.
396-
M500 ; Save current setup. WARNING - UBL will be active at power up, before any `G28`.
396+
M500 ; Save current setup. WARNING - UBL will be active at power up, before any G28.
397397
-
398398
pre: Use `G26` and `G29` commands to fine-tune a measured mesh
399399
code: |
@@ -409,4 +409,4 @@ examples:
409409
G29 L1 ; Load the mesh stored in slot 1 (from G29 S1)
410410
G29 J ; No size specified on the J option tells G29 to probe the specified 3 points and tilt the mesh according to what it finds.
411411
412-
---
412+
---

‎views/gcode/M027.md‎

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
tag: m027
33
title: Report SD print status
44
brief: Print SD progress to serial
5-
author: thinkyhead
5+
author: thinkyhead,TheSFReader
66

77
experimental: false
88
requires: SDSUPPORT
@@ -11,14 +11,42 @@ group: sdcard
1111
codes:
1212
- M27
1313

14-
long: Report the current SD read position in the form "SD printing byte 123/12345".
14+
long:
15+
- With no parameter, report the current SD read position in the form "`SD printing byte 123/12345`." If no file is open the response is "`Not SD printing`."
16+
- With 'S<seconds>', set the SD status auto-report interval. (Requires `AUTO_REPORT_SD_STATUS`)
17+
- With 'C', get the currently open file's name (and long filename if possible). Print "`(no file)`" if no file is open.
1518

1619
notes:
1720
- Requires [`SDSUPPORT`](/docs/configuration/configuration.html#sd-card)
1821

1922
parameters:
23+
-
24+
tag: S
25+
optional: true
26+
description: Interval between auto-reports. `S0` to disable.
27+
values:
28+
-
29+
tag: seconds
30+
type: int
31+
-
32+
tag: C
33+
optional: true
34+
description: Report the filename and long filename of the current file.
35+
2036

2137
examples:
38+
-
39+
pre: Report current SD status
40+
code: M27 S4
41+
-
42+
pre: Report SD status every 4 seconds
43+
code: M27 S4
44+
-
45+
pre: Stop reporting SD status
46+
code: M27 S0
47+
-
48+
pre: Report currently open filename
49+
code: M27 C
2250

2351
---
2452

‎views/gcode/M104.md‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,23 @@ parameters:
4242
-
4343
tag: temp
4444
type: float
45+
-
46+
tag: T
47+
optional: true
48+
description: Hotend index. If omitted, the currently active hotend will be used.
49+
values:
50+
-
51+
tag: index
52+
type: int
4553

4654

4755
examples:
4856
-
49-
pre: Simple set target temperature
50-
code: M104 S180
57+
pre: Set target temperature for the active hotend
58+
code: M104 S185
59+
-
60+
pre: Set target temperature for E1
61+
code: M104 T1 S205
5162
-
5263
pre: '`AUTOTEMP`: Set autotemp range'
5364
code: M104 F S180 B190

‎views/gcode/M109.md‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,15 +51,26 @@ parameters:
5151
-
5252
tag: temp
5353
type: float
54+
-
55+
tag: T
56+
optional: true
57+
description: Hotend index. If omitted, the currently active hotend will be used.
58+
values:
59+
-
60+
tag: index
61+
type: int
5462

5563

5664
examples:
5765
-
58-
pre: Set target temperature and wait (if heating)
66+
pre: Set target temperature and wait (if heating up)
5967
code: M109 S180
6068
-
6169
pre: Set target temperature, wait even if cooling
6270
code: M109 R120
71+
-
72+
pre: Set target temperature for E1 and wait (if heating up)
73+
code: M109 T1 R205
6374
-
6475
pre: '`AUTOTEMP`: Set autotemp range, wait for temp'
6576
code: M109 F S180 B190

‎views/gcode/M118.md‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
---
2+
tag: m118
3+
title: Serial print
4+
brief: Send text to serial
5+
author: thinkyhead
6+
7+
experimental: false
8+
group: hosts
9+
10+
codes:
11+
- M118
12+
13+
long: Send a message to the connected host for display in the host console or to perform a host action.
14+
15+
notes: The `E` and `A` parameters must precede the message.
16+
17+
parameters:
18+
-
19+
tag: string
20+
optional: true
21+
description: Message string. If omitted, a blank line will be sent.
22+
-
23+
tag: A1
24+
optional: true
25+
description: Prepend `// ` to denote a comment or action command. Hosts like OctoPrint can interpret such commands to perform special actions. See your host's documentation.
26+
-
27+
tag: E1
28+
optional: true
29+
description: Prepend `echo:` to the message. Some hosts will display echo messages differently when preceded by `echo:`.
30+
31+
examples:
32+
-
33+
pre: Echo "Yello World!" in the console
34+
code: M118 E1 Yello World!
35+
-
36+
pre: Tell [OctoPrint](http://docs.octoprint.org/en/master/features/action_commands.html) to cancel the print job
37+
code: M118 A1 action:cancel
38+
39+
---

‎views/gcode/M150.md‎

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
---
22
tag: m150
3-
title: Set RGB Color
4-
brief: Set the color of the RGB LED, backlight, or LED strip.
3+
title: Set RGB(W) Color
4+
brief: Set the color of the RGB(W) LED, backlight, or LED strip.
55
author: thinkyhead
66

77
experimental: false
8-
requires: BLINKM|RGB_LED
8+
requires: BLINKM|RGB_LED|RGBW_LED|NEOPIXEL_LED|PCA9632
99
group: lcd
1010

1111
codes:
1212
- M150
1313

14-
long: If you have an RGB light, either as part of a controller or installed separately, the `M150` command can be used to set its color.
14+
long: If you have an RGB(W) light, either as part of a controller or installed separately, the `M150` command can be used to set its color.
1515

16-
notes: Requires `BLINKM` or `RGB_LED`.
16+
notes: Requires `BLINKM`, `RGB_LED`, `RGBW_LED`, `NEOPIXEL_LED` or `PCA9632`.
1717

1818
parameters:
1919
-
@@ -40,7 +40,22 @@ parameters:
4040
-
4141
tag: intensity
4242
type: byte
43-
43+
-
44+
tag: W
45+
optional: true
46+
description: White component from 0 to 255 (`RGBW_LED` or `NEOPIXEL_LED` only)
47+
values:
48+
-
49+
tag: intensity
50+
type: byte
51+
-
52+
tag: P
53+
optional: true
54+
description: Brightness from 0 to 255 (`NEOPIXEL_LED` only)
55+
values:
56+
-
57+
tag: intensity
58+
type: byte
4459
examples:
4560

4661
---

‎views/gcode/M428.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ codes:
1414
long: |
1515
Use `M428` to set a persistent offset to the native home position and coordinate space by assigning the current position as the native home position. See the example below.
1616
17+
- The current position must be within 2cm from 0 or an endstop.
1718
- The current position is set to the native home position.
1819
- Any previous position shift from `G92` is cleared.
1920
- The home offset is persistent — added to the current position until changed.

0 commit comments

Comments
 (0)