updates

app/console.js

@@ -2,7 +2,7 @@ var EventEmitter = require('events');
 var sio = require('socket.io');
 var fs = require('fs');
 var path = require('path');
-var SerialPort = require('serialport-v5');
+var SerialPort = require('serialport');
 var linuxList = require('./linux-list');
 var promisify = require('./helpers').promisify;
 
@@ -15,7 +15,7 @@ var open=(http,p,speed)=>new Promise((done,fail)=>{
       root=p; //root='\\\\.\\'+p;
     var port = new SerialPort(root, {
       autoOpen: false,
-      parser0: SerialPort.parsers.readline('\n'),
+//      parser0: SerialPort.parsers.readline('\n'),
       baudRate: speed,
 //      rtscts: true,
     });

package.json

@@ -1,13 +1,13 @@
 {
   "name": "marlin-conf",
-  "version": "2.7.10",
+  "version": "2.7.11",
   "description": "configuration tool for Marlin project",
   "main": "./index.js",
   "scripts": {
     "start": "electron . -G ~/TEST",
     "build": "build --dir",
     "build-dev": "build -m --x64",
-    "dist": "node builder.js",
+    "dist": "GH_TOKEN=`./node_modules/.bin/json -f ~/.github.json -c 'console.log(this.OAuth)'` build -mwl --x64 --ia32 -p always",
     "test": "echo \"Error: no test specified\" && exit 1",
     "lint": "eslint .",
     "rebuild": "npm rebuild serialport-v4 --update-binary",
@@ -17,7 +17,11 @@
   },
   "build": {
     "appId": "com.akajes.marlin.conf",
+    "publish": {
+      "provider": "github"
+    },
     "linux": {
+      "category": "Development",
       "target": [
         "deb",
         "AppImage"
@@ -73,7 +77,7 @@
     "opn": "^5.0.0",
     "qr-image": "^3.2.0",
     "rtcmulticonnection-v3": "^3.4.4",
-    "serialport-v5": "*",
+    "serialport": "6.0.0-beta1",
     "simple-git": "^1.72.0",
     "socket.io": "^2.0.1",
     "swig-templates": "^2.0.2",
@@ -84,7 +88,7 @@
   },
   "devDependencies": {
     "devtron": "^1.4.0",
-    "electron": "^1.6.10",
+    "electron": "*",
     "electron-builder": "*",
     "eslint": "^4.3.0",
     "json": "^9.0.6",

views/configuration.md

@@ -921,15 +921,21 @@ Set to `true` to enable the option to constrain movement to the physical boundar
 
 ### Movement Bounds
 
+```cpp
+#define X_BED_SIZE 200
+#define Y_BED_SIZE 200
+```
+With Marlin 1.1.5 and up you can directly specify the bed size. This allows Marlin to do extra logic related to the bed size when it differs from the movement limits below. If the XY carriage is able to move outside of the bed, you can specify a wider range below.
+
 ```cpp
 #define X_MIN_POS 0
 #define Y_MIN_POS 0
 #define Z_MIN_POS 0
-#define X_MAX_POS 200
-#define Y_MAX_POS 200
+#define X_MAX_POS X_BED_SIZE
+#define Y_MAX_POS Y_BED_SIZE
 #define Z_MAX_POS 170
 ```
-These values specify the physical limits of the machine. Usually the `[XYZ]_MIN_POS` values are set to 0, because endstops are positioned at the bed limits. `[XYZ]_MAX_POS` should be set to the farthest reachable point. By default, these positions are used for homing as well. However, the `MANUAL_[XYZ]_HOME_POS` options can be used to override these, if needed.
+These values specify the physical limits of the machine. Usually the `[XYZ]_MIN_POS` values are set to 0, because endstops are positioned at the bed limits. `[XYZ]_MAX_POS` should be set to the farthest reachable point. By default, these are used as your homing positions as well. However, the `MANUAL_[XYZ]_HOME_POS` options can be used to override these, if needed.
 
 {% panel info Home Offset %}
 Although home positions are fixed, `M206` can be used to apply offsets to the home position if needed.
@@ -1177,21 +1183,29 @@ The EEPROM-related commands are:
 - `M502`: Reset all settings to their default values (as set by `Configuration.h`)
 - `M503`: Print the current settings (in RAM, not EEPROM)
 
+#### EEPROM Options
+```cpp
+//#define DISABLE_M503    // Saves ~2700 bytes of PROGMEM. Disable for release!
+#define EEPROM_CHITCHAT   // Give feedback on EEPROM commands. Disable to save PROGMEM.
+```
+These EEPROM options should be left as they are, but for 128K and smaller boards they may be used to recover some program memory. Vendors are strongly discouraged from using `DISABLE_M503`.
+
 {% alert info %}
 Settings that can be changed and saved to EEPROM are marked with <em class="fa fa-sticky-note-o" aria-hidden="true"></em>. Options marked with <em class="fa fa-desktop" aria-hidden="true"></em> can be changed from the LCD controller.
 {% endalert %}
 
 {% alert info %}
-Certain EEPROM behaviors may be confusing. For example, when you edit the configurations and re-flash the firmware, you may discover that your new settings don't have any effect! What's going on? They are still overridden by the settings last saved to EEPROM! Use `M502` to restore settings to defaults, then `M500` to save them. Note that `M503` shows current settings in volatile memory even without `EEPROM_SETTINGS`.
+When you change saveable settings in the configuration files and re-flash, the new values don't take effect right away. They are still overridden by the saved values in EEPROM. To get your new default settings into the EEPROM, use `M502` followed by `M500`.
 {% endalert %}
 
 ### Host Keepalive
 
 ```cpp
-#define HOST_KEEPALIVE_FEATURE
-#define DEFAULT_KEEPALIVE_INTERVAL 2
+#define HOST_KEEPALIVE_FEATURE        // Disable this if your host doesn't like keepalive messages
+#define DEFAULT_KEEPALIVE_INTERVAL 2  // Number of seconds between "busy" messages. Set with M113.
+#define BUSY_WHILE_HEATING            // Some hosts require "busy" messages even during heating
 ```
-When Host Keepalive is enabled Marlin will send a busy status message to the host every couple of seconds when it can't accept commands. Disable if your host doesn't like keepalive messages. Use `DEFAULT_KEEPALIVE_INTERVAL` for the default number of seconds between "busy" messages. Override with [`M113`](/docs/gcode/M113.html).
+When Host Keepalive is enabled Marlin will send a busy status message to the host every couple of seconds when it can't accept commands. Disable if your host doesn't like keepalive messages. Use `DEFAULT_KEEPALIVE_INTERVAL` for the default number of seconds between "busy" messages. Override with [`M113`](/docs/gcode/M113.html). Marlin 1.1.5 and up include the `BUSY_WHILE_HEATING` option for hosts that treat host keepalive as a strict busy protocol.
 
 ### Free Memory Watcher
 ```cpp

views/gcode/G010.md

@@ -12,9 +12,23 @@ group: planner
 codes:
   - G10
 
-long: Retract the filament according to settings of [`M207`](/docs/gcode/M207.html).
+long: 
+  - Retract the filament according to settings of [`M207`](/docs/gcode/M207.html).
+  - Firmware retraction allows you to tune retraction at the machine level and can significantly reduce the size of G-code files.
 
-notes: Requires `FWRETRACT`.
+notes:
+  - Requires `FWRETRACT`.
+  - See related codes [`G11`](/docs/gcode/G011.html), [`M207`](/docs/gcode/M207.html), [`M208`](/docs/gcode/M208.html), and [`M209`](/docs/gcode/M209.html).
+
+parameters:
+  -
+    tag: S
+    optional: true
+    description: Use `G10 S1` to do a swap retraction, before changing extruders. The subsequent `G11` (after tool change) will do a swap recover. (Requires `EXTRUDERS` > 1)
+    values:
+      -
+        tag: flag
+        type: bool
 
 example:
   -

views/gcode/G011.md

@@ -14,7 +14,9 @@ codes:
 
 long: Unretract (i.e., recover, prime) the filament according to settings of [`M208`](/docs/gcode/M208.html).
 
-notes: Requires `FWRETRACT`.
+notes:
+  - Requires `FWRETRACT`.
+  - See related codes [`G10`](/docs/gcode/G010.html), [`M207`](/docs/gcode/M207.html), [`M208`](/docs/gcode/M208.html), and [`M209`](/docs/gcode/M209.html).
 
 example:
   -

views/gcode/M207.md

@@ -13,7 +13,9 @@ codes:
 
 long: Set lengths, feedrate, and Z lift for firmware-based retraction. See parameters below.
 
-notes: Requires `FWRETRACT`.
+notes:
+  - Requires `FWRETRACT`.
+  - See related codes [`G10`](/docs/gcode/G010.html), [`G11`](/docs/gcode/G010.html), [`M208`](/docs/gcode/M208.html), and [`M209`](/docs/gcode/M209.html).
 
 parameters:
   -

views/gcode/M208.md

@@ -13,7 +13,9 @@ codes:
 
 long: Set lengths and feedrate for firmware-based retract recovery. The new values will apply to all subsequent G11
 
-notes: Requires `FWRETRACT`.
+notes:
+  - Requires `FWRETRACT`.
+  - See related codes [`G10`](/docs/gcode/G010.html), [`G11`](/docs/gcode/G010.html), [`M207`](/docs/gcode/M207.html), and [`M209`](/docs/gcode/M209.html).
 
 parameters:
   -

views/gcode/M209.md

@@ -16,8 +16,10 @@ long:
   - When auto-retract is enabled, all reversed E-only moves are treated as retraction. (Recover moves are also automatically overridden.) When disabled, E retraction derives from G-code.
 
 notes:
+  - Requires `FWRETRACT`.
   - Most slicers today can generate `G10`/`G11`. But this option is useful for older G-code.
   - Though not currently very popular, both volumetric extrusion and firmware-based retraction (and/or `M209`) make G-code more immune to changes from one machine to another, and permit changing the hardware without needing to re-slice.
+  - See related codes [`G10`](/docs/gcode/G010.html), [`G11`](/docs/gcode/G010.html), [`M207`](/docs/gcode/M207.html), and [`M208`](/docs/gcode/M208.html).
 
 parameters:
   -