Fix #354

CHANGELOG.txt

@@ -2,6 +2,7 @@ v1.0.371:
  - Updated Max Rate for LEAD1010 Plasma Add On profile
  - Added electron's app.setAppUserModelId(id) to clean up Windows notications (to be tested)
  - Fixed Issue #335 Keyboard shortcuts - handle Metro naming of keys
+ - Fixed Issue #347 Added Interface's Wifi Config to Interface USB Prep Wizard
  - Fixed Issue #353 Jog buttons no longer accidentally change override sliders if sliders was in focus
 v1.0.371:
  - Fixed Issue #257 Changed Arc drawing behavior for G2 full circles in 3D viewer

app/index.html

@@ -53,7 +53,7 @@
     <div class="window" style="height: 100vh; overflow-y: hidden;">
       <div id="windowtitlebar" class="window-caption bg-openbuilds" style="-webkit-app-region: drag;">
         <!-- <span class="icon mif-cog"></span> -->
-        <span class="icon"><img src="icon-transparent.png" /></span>
+        <span class="icon" style="top: -2px;"><img src="icon-transparent.png" /></span>
         <span class="title" id="windowtitle">OpenBuilds CONTROL</span>
         <div class="buttons" style="-webkit-app-region: no-drag">
           <span title="Minimize" class="btn-custom" onclick="socket.emit('minimize')"><i class="fas fa-window-minimize"></i></span>

app/wizards/interface/PROFILESGRBL/1010PLAS.SET

@@ -0,0 +1,34 @@
+$0=10 ;Step pulse time, microseconds
+$1=255 ;Step idle delay, milliseconds
+$2=0 ;Step pulse invert, mask
+$3=4 ;Step direction invert, mask
+$4=1 ;Invert step enable pin, boolean
+$5=0 ;Invert limit pins, boolean
+$6=1 ;Invert probe pin, boolean
+$10=1 ;Status report options, mask
+$11=0.010 ;Junction deviation, millimeters
+$12=0.002 ;Arc tolerance, millimeters
+$13=0 ;Report in inches, boolean
+$20=0 ;Soft limits enable, boolean
+$21=0 ;Hard limits enable, boolean
+$22=1 ;Homing cycle enable, boolean
+$23=1 ;Homing direction invert, mask
+$24=100.000 ;Homing locate feed rate, mm/min
+$25=1000.000 ;Homing search seek rate, mm/min
+$26=250 ;Homing switch debounce delay, milliseconds
+$27=5.000 ;Homing switch pull-off distance, millimeters
+$30=1000 ;Maximum spindle speed, RPM
+$31=0 ;Minimum spindle speed, RPM
+$32=0 ;Laser mode
+$100=199.100 ;X-axis steps per millimeter
+$101=199.100 ;Y-axis steps per millimeter
+$102=199.100 ;Z-axis steps per millimeter
+$110=4000.000 ;X-axis maximum rate, mm/min
+$111=4000.000 ;Y-axis maximum rate, mm/min
+$112=2500.000 ;Z-axis maximum rate, mm/min
+$120=150.000 ;X-axis acceleration, mm/sec^2
+$121=150.000 ;Y-axis acceleration, mm/sec^2
+$122=150.000 ;Z-axis acceleration, mm/sec^2
+$130=740 ;X-axis maximum travel, millimeters
+$131=830 ;Y-axis maximum travel, millimeters
+$132=80 ;Z-axis maximum travel, millimeters

app/wizards/interface/PROFILESHAL/1010PLAS.SET

@@ -0,0 +1,34 @@
+$0=10 ;Step pulse time, microseconds
+$1=255 ;Step idle delay, milliseconds
+$2=0 ;Step pulse invert, mask
+$3=4 ;Step direction invert, mask
+$4=0 ;Invert step enable pin, boolean
+$5=7 ;Invert limit pins, mask
+$6=0 ;Invert probe pin, boolean
+$10=511 ;Status report options, mask
+$11=0.010 ;Junction deviation, millimeters
+$12=0.002 ;Arc tolerance, millimeters
+$13=0 ;Report in inches, boolean
+$20=0 ;Soft limits enable, boolean
+$21=0 ;Hard limits enable, boolean
+$22=1 ;Homing cycle enable, boolean
+$23=1 ;Homing direction invert, mask
+$24=100.000 ;Homing locate feed rate, mm/min
+$25=1000.000 ;Homing search seek rate, mm/min
+$26=250 ;Homing switch debounce delay, milliseconds
+$27=5.000 ;Homing switch pull-off distance, millimeters
+$30=1000 ;Maximum spindle speed, RPM
+$31=0 ;Minimum spindle speed, RPM
+$32=0 ;Laser mode
+$100=199.100 ;X-axis steps per millimeter
+$101=199.100 ;Y-axis steps per millimeter
+$102=199.100 ;Z-axis steps per millimeter
+$110=4000.000 ;X-axis maximum rate, mm/min
+$111=4000.000 ;Y-axis maximum rate, mm/min
+$112=2500.000 ;Z-axis maximum rate, mm/min
+$120=150.000 ;X-axis acceleration, mm/sec^2
+$121=150.000 ;Y-axis acceleration, mm/sec^2
+$122=150.000 ;Z-axis acceleration, mm/sec^2
+$130=740 ;X-axis maximum travel, millimeters
+$131=830 ;Y-axis maximum travel, millimeters
+$132=80 ;Z-axis maximum travel, millimeters

index.js

@@ -1023,6 +1023,48 @@ io.on("connection", function(socket) {
 
     var errorCount = 0;
 
+    if (data.ssid && data.psk) {
+
+
+      const folderPath = path.join(data.drive, "CONFIG");
+
+      // Create the subfolder if it doesn't exist and then write the file
+      fs.mkdir(folderPath, {
+        recursive: true
+      }, (err) => {
+        if (err) {
+          var output = {
+            'command': 'Interface USB Drive',
+            'response': `Failed to create folder ${folderPath}! Error: ${err}`,
+            'type': 'error'
+          };
+          io.sockets.emit('data', output);
+        } else {
+          var fileContent = `${data.ssid}\n${data.psk}`;
+
+          fs.writeFile(path.join(folderPath, "wifi.cfg"), fileContent, (err) => {
+            if (err) {
+              errorCount++;
+              var output = {
+                'command': 'Interface USB Drive',
+                'response': `Failed to create Wifi Configuration file in ${folderPath}! Error: ${err}`,
+                'type': 'error'
+              };
+              io.sockets.emit('data', output);
+            } else {
+              var output = {
+                'command': 'Interface USB Drive',
+                'response': `Created Wifi Configuration file in ${folderPath} successfully!`,
+                'type': 'success'
+              };
+              io.sockets.emit('data', output);
+            }
+          });
+        }
+      });
+
+    }
+
     ncp(probesrc, probedest, function(err) {
       if (err) {
         var output = {
@@ -1063,41 +1105,6 @@ io.on("connection", function(socket) {
     });
 
 
-    const folderPath = path.join(data.drive, "CONFIG");
-
-    // Create the subfolder if it doesn't exist and then write the file
-    fs.mkdir(folderPath, {
-      recursive: true
-    }, (err) => {
-      if (err) {
-        var output = {
-          'command': 'Interface USB Drive',
-          'response': `Failed to create folder ${folderPath}! Error: ${err}`,
-          'type': 'error'
-        };
-        io.sockets.emit('data', output);
-      } else {
-        var fileContent = `${data.ssid}\n${data.psk}`;
-
-        fs.writeFile(path.join(folderPath, "wifi.cfg"), fileContent, (err) => {
-          if (err) {
-            var output = {
-              'command': 'Interface USB Drive',
-              'response': `Failed to create Wifi Configuration file in ${folderPath}! Error: ${err}`,
-              'type': 'error'
-            };
-            io.sockets.emit('data', output);
-          } else {
-            var output = {
-              'command': 'Interface USB Drive',
-              'response': `Created Wifi Configuration file in ${folderPath} successfully!`,
-              'type': 'success'
-            };
-            io.sockets.emit('data', output);
-          }
-        });
-      }
-    });
 
     setTimeout(function() {
       if (errorCount == 0) {