Simple multi pen support with pause/resume.

package.json

@@ -29,7 +29,7 @@
   },
   "dependencies": {
     "bytes": "^2.4.0",
-    "cncserver": "2.6.1",
+    "cncserver": "2.6.6",
     "d3plus": "^1.9.3",
     "fs-finder": "^1.8.1",
     "fs-plus": "^2.8.1",

resources/_i18n/robopaint.en-US.json

@@ -86,6 +86,26 @@
     "autofill": "Filling path __id__...",
     "autostroke": "Stroking path __id__...",
     "autocomplete": "Automatic Paint Complete!",
+    "manual": {
+      "status": "Waiting for manual change...",
+      "notice": "Please insert the __color__ __type__ to continue",
+      "info": "Motors unlocked for calibration, use the toggle button find the correct draw height, ensure the pen is put back in park position, then click continue to resume drawing.",
+      "resume": "Now drawing with __color__",
+      "options": {
+        "cancel": {
+          "title": "Cancel Print [Escape]",
+          "info": "Cancel the current print job, close the mode and return to the home screen."
+        },
+        "continue": {
+          "title": "Continue with __color__ [Enter]",
+          "info": "Once you've finished changing to the correct drawing implement, click to continue drawing."
+        },
+        "toggle": {
+          "title": "Toggle height [Space]",
+          "info": "Toggle the raising/lowering of the pen to calibrate its height."
+        }
+      }
+    },
     "spool": {
       "stroke": "Tracing stroke path __id__...",
       "fill": "Tracing fill path __id__...",

resources/colorsets/_i18n/colorsets.en-US.json

@@ -5,14 +5,14 @@
     "release": "0.9.2",
     "basetype": "colorset"
   },
-  
+
   "media":{
     "watercolor": "Watercolor",
-    "pen": "Pen",
+    "pen": "Pen/Pencil",
     "engraver": "Diamond Engraver",
     "wax": "Electro-Kistka"
   },
-  
+
   "colors": {
     "beige": "Beige",
     "black": "Black",

resources/colorsets/generic/_i18n/generic.en-US.json

@@ -9,5 +9,15 @@
     "manufacturer": "Generic",
     "name": "Standard",
     "description": "Set of primary colors in standard order. Use for stock Crayola, store brand or movable primary color pans."
+  },
+  "generic-pen-single": {
+    "manufacturer": "Generic",
+    "name": "Single pen/pencil",
+    "description": "Single color, use when only one implement needed."
+  },
+  "generic-pen-multi": {
+    "manufacturer": "Generic",
+    "name": "Multi pen/pencil",
+    "description": "Standard set of primary color pens/pencils."
   }
 }

resources/colorsets/generic/generic.json

@@ -1,19 +1,50 @@
-[{
-  "media": "watercolor",
-  "machineName": "generic",
-  "weight": -10,
-  "styles" : {
-    "src" : "standard.css",
-    "baseClass": "generic-standard"
-  },
-  "colors": [
-    {"black":"#000000"},
-    {"red":"#FF0000"},
-    {"orange":"#FFA500"},
-    {"yellow":"#FFFF00"},
-    {"green":"#008000"},
-    {"blue":"#0000FF"},
-    {"purple":"#800080"},
-    {"brown":"#8B4513"}
-  ]
-}]
+[{
+  "media": "watercolor",
+  "machineName": "generic",
+  "weight": -10,
+  "styles" : {
+    "src" : "standard.css",
+    "baseClass": "generic-standard"
+  },
+  "colors": [
+    {"black":"#000000"},
+    {"red":"#FF0000"},
+    {"orange":"#FFA500"},
+    {"yellow":"#FFFF00"},
+    {"green":"#008000"},
+    {"blue":"#0000FF"},
+    {"purple":"#800080"},
+    {"brown":"#8B4513"}
+  ]
+},
+{
+  "media": "pen",
+  "machineName": "generic-pen-single",
+  "weight": 20,
+  "styles" : {
+    "src" : "standard.css",
+    "baseClass": "generic-standard"
+  },
+  "colors": [
+    {"black":"#000000"}
+  ]
+},
+{
+  "media": "pen",
+  "machineName": "generic-pen-multi",
+  "weight": 21,
+  "styles" : {
+    "src" : "standard.css",
+    "baseClass": "generic-standard"
+  },
+  "colors": [
+    {"black":"#000000"},
+    {"red":"#FF0000"},
+    {"orange":"#FFA500"},
+    {"yellow":"#FFFF00"},
+    {"green":"#008000"},
+    {"blue":"#0000FF"},
+    {"purple":"#800080"},
+    {"brown":"#8B4513"}
+  ]
+}]

resources/colorsets/generic/standard.css

@@ -1,32 +1,32 @@
-.generic-standard #color0 {
-  background-color: black; /* Black */
-}
-
-.generic-standard #color1 {
-  background-color: red; /* Red */
-}
-
-.generic-standard #color2 {
-  background-color: orange; /* Orange */
-}
-
-#colors.generic-standard #color3 {
-  background-color: yellow; /* Yellow */
-  color: black;
-}
-
-.generic-standard #color4 {
-  background-color: green; /* Green */
-}
-
-.generic-standard #color5 {
-  background-color: blue; /* Blue */
-}
-
-.generic-standard #color6 {
-  background-color: purple; /* Violet */
-}
-
-.generic-standard #color7 {
-  background-color: SaddleBrown; /* Brown */
-}
+.generic-standard #color0 {
+  background-color: black; /* Black */
+}
+
+.generic-standard #color1 {
+  background-color: red; /* Red */
+}
+
+.generic-standard #color2 {
+  background-color: orange; /* Orange */
+}
+
+#colors.generic-standard #color3 {
+  background-color: yellow; /* Yellow */
+  color: black;
+}
+
+.generic-standard #color4 {
+  background-color: green; /* Green */
+}
+
+.generic-standard #color5 {
+  background-color: blue; /* Blue */
+}
+
+.generic-standard #color6 {
+  background-color: purple; /* Violet */
+}
+
+.generic-standard #color7 {
+  background-color: SaddleBrown; /* Brown */
+}

resources/main.html

@@ -42,11 +42,11 @@
 
 <div id="loader">...</div>
 
-<h1 class="loading">
+<h1 id="connection" class="loading">
   <b data-i18n="status.start">&#8987;</b>
   <div class="options hidden">
     <span data-i18n>status.question</span>
-    <div>
+    <div class="options">
       <button class="continue normal" data-i18n>status.button.continue</button>
       <button class="reconnect normal" data-i18n>status.button.retry</button>
       <button class="external normal" data-i18n>external.title</button>
@@ -64,6 +64,16 @@ <h4 data-i18n>external.address</h4>
   </div>
 </h1>
 
+<h1 id="manualswap" class="loading hidden">
+  <b data-i18n>libs.manual.notice</b>
+  <aside data-i18n>libs.manual.info</aside>
+  <div class="options">
+    <button data-bind-keycode="27" class="cancel normal" data-i18n="[title]libs.manual.options.cancel.info;libs.manual.options.cancel.title"></button>
+    <button data-bind-keycode="32" class="toggle normal" data-i18n="[title]libs.manual.options.toggle.info;libs.manual.options.toggle.title"></button>
+    <button data-bind-keycode="13" class="continue normal" data-i18n="[title]libs.manual.options.continue.info;libs.manual.options.continue.title"></button>
+  </div>
+</h1>
+
 <div id="calibrator">
   <div class="wrapper">
     <div class="step">