diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 435044c..1b5c94d 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,3 +1,4 @@ +v1.0.269: Added Machine profiles to Interface USB Drive Wizard, renamed menu entry for Keyboard shortcuts editor v1.0.268: Fixed cosmetic layout css issue v1.0.267: Fixed probe complete dialog, added 1% laser focus power, restore incremental if it was set prior to probe, added 3rd decimal for Inch mode DRO / padding to 2 decimals for mm mode, added Machine Coordinates to DRO tooltip, Handle M0 Pauses (Carbide etc) v1.0.266: Updated "error 9" dialog to also include details of earlier ALARMs for troubleshooting, Fixed CheckSize bug with Lightburn Relative Coordinates diff --git a/app/index.html b/app/index.html index f46534a..f562a56 100644 --- a/app/index.html +++ b/app/index.html @@ -328,7 +328,7 @@
  • Calibrate Z-Axes Steps/mm
  • Calibrate Servo Pen Up/Down
  • -
  • Customize Shortcut Key Assignments
  • +
  • Customize Keyboard Shortcuts
  • Firmware Flashing Tool
  • Prepare USB Flashdrive for Interface
  • diff --git a/app/wizards/interface/PROFILES/ACRO1010.SET b/app/wizards/interface/PROFILES/ACRO1010.SET new file mode 100644 index 0000000..e7cc626 --- /dev/null +++ b/app/wizards/interface/PROFILES/ACRO1010.SET @@ -0,0 +1,34 @@ +$0=10 ;Step pulse time, microseconds +$1=255 ;Step idle delay, milliseconds +$2=0 ;Step pulse invert, mask +$3=1 ;Step direction invert, mask +$4=1 ;Invert step enable pin, boolean +$5=0 ;Invert limit pins, boolean +$6=0 ;Invert probe pin, boolean +$10=1 ;Status report options, mask +$11=0.020 ;Junction deviation, millimeters +$12=0.002 ;Arc tolerance, millimeters +$13=0 ;Report in inches, boolean +$20=0 ;Soft limits enable, boolean +$21=1 ;Hard limits enable, boolean +$22=1 ;Homing cycle enable, boolean +$23=7 ;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=1 ;Laser-mode enable, boolean +$100=57.143 ;X-axis steps per millimeter-1/16 step +$101=57.143 ;Y-axis steps per millimeter-1/16 step +$102=57.143 ;Z-axis steps per millimeter-1/16 step +$110=5000.000 ;X-axis maximum rate, mm/min +$111=5000.000 ;Y-axis maximum rate, mm/min +$112=5000.000 ;Z-axis maximum rate, mm/min +$120=500.000 ;X-axis acceleration, mm/sec^2 +$121=500.000 ;Y-axis acceleration, mm/sec^2 +$122=500.000 ;Z-axis acceleration, mm/sec^2 +$130=800.000 ;X-axis maximum travel, millimeters +$131=800.000 ;Y-axis maximum travel, millimeters +$132=70.000 ;Z-axis maximum travel, millimeters diff --git a/app/wizards/interface/PROFILES/ACRO1510.SET b/app/wizards/interface/PROFILES/ACRO1510.SET new file mode 100644 index 0000000..0315596 --- /dev/null +++ b/app/wizards/interface/PROFILES/ACRO1510.SET @@ -0,0 +1,34 @@ +$0=10 ;Step pulse time, microseconds +$1=255 ;Step idle delay, milliseconds +$2=0 ;Step pulse invert, mask +$3=1 ;Step direction invert, mask +$4=1 ;Invert step enable pin, boolean +$5=0 ;Invert limit pins, boolean +$6=0 ;Invert probe pin, boolean +$10=1 ;Status report options, mask +$11=0.020 ;Junction deviation, millimeters +$12=0.002 ;Arc tolerance, millimeters +$13=0 ;Report in inches, boolean +$20=0 ;Soft limits enable, boolean +$21=1 ;Hard limits enable, boolean +$22=1 ;Homing cycle enable, boolean +$23=7 ;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=1 ;Laser-mode enable, boolean +$100=57.143 ;X-axis steps per millimeter-1/16 step +$101=57.143 ;Y-axis steps per millimeter-1/16 step +$102=57.143 ;Z-axis steps per millimeter-1/16 step +$110=5000.000 ;X-axis maximum rate, mm/min +$111=5000.000 ;Y-axis maximum rate, mm/min +$112=5000.000 ;Z-axis maximum rate, mm/min +$120=500.000 ;X-axis acceleration, mm/sec^2 +$121=500.000 ;Y-axis acceleration, mm/sec^2 +$122=500.000 ;Z-axis acceleration, mm/sec^2 +$130=800.000 ;X-axis maximum travel, millimeters +$131=1300.000 ;Y-axis maximum travel, millimeters +$132=70.000 ;Z-axis maximum travel, millimeters diff --git a/app/wizards/interface/PROFILES/ACRO1515.SET b/app/wizards/interface/PROFILES/ACRO1515.SET new file mode 100644 index 0000000..64eb2a1 --- /dev/null +++ b/app/wizards/interface/PROFILES/ACRO1515.SET @@ -0,0 +1,34 @@ +$0=10 ;Step pulse time, microseconds +$1=255 ;Step idle delay, milliseconds +$2=0 ;Step pulse invert, mask +$3=1 ;Step direction invert, mask +$4=1 ;Invert step enable pin, boolean +$5=0 ;Invert limit pins, boolean +$6=0 ;Invert probe pin, boolean +$10=1 ;Status report options, mask +$11=0.020 ;Junction deviation, millimeters +$12=0.002 ;Arc tolerance, millimeters +$13=0 ;Report in inches, boolean +$20=0 ;Soft limits enable, boolean +$21=1 ;Hard limits enable, boolean +$22=1 ;Homing cycle enable, boolean +$23=7 ;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=1 ;Laser-mode enable, boolean +$100=57.143 ;X-axis steps per millimeter-1/16 step +$101=57.143 ;Y-axis steps per millimeter-1/16 step +$102=57.143 ;Z-axis steps per millimeter-1/16 step +$110=5000.000 ;X-axis maximum rate, mm/min +$111=5000.000 ;Y-axis maximum rate, mm/min +$112=5000.000 ;Z-axis maximum rate, mm/min +$120=500.000 ;X-axis acceleration, mm/sec^2 +$121=500.000 ;Y-axis acceleration, mm/sec^2 +$122=500.000 ;Z-axis acceleration, mm/sec^2 +$130=1300.000 ;X-axis maximum travel, millimeters +$131=1300.000 ;Y-axis maximum travel, millimeters +$132=70.000 ;Z-axis maximum travel, millimeters diff --git a/app/wizards/interface/PROFILES/ACRO510.SET b/app/wizards/interface/PROFILES/ACRO510.SET new file mode 100644 index 0000000..c1f7e82 --- /dev/null +++ b/app/wizards/interface/PROFILES/ACRO510.SET @@ -0,0 +1,34 @@ +$0=10 ;Step pulse time, microseconds +$1=255 ;Step idle delay, milliseconds +$2=0 ;Step pulse invert, mask +$3=1 ;Step direction invert, mask +$4=1 ;Invert step enable pin, boolean +$5=0 ;Invert limit pins, boolean +$6=0 ;Invert probe pin, boolean +$10=1 ;Status report options, mask +$11=0.020 ;Junction deviation, millimeters +$12=0.002 ;Arc tolerance, millimeters +$13=0 ;Report in inches, boolean +$20=0 ;Soft limits enable, boolean +$21=1 ;Hard limits enable, boolean +$22=1 ;Homing cycle enable, boolean +$23=7 ;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=1 ;Laser-mode enable, boolean +$100=57.143 ;X-axis steps per millimeter-1/16 step +$101=57.143 ;Y-axis steps per millimeter-1/16 step +$102=57.143 ;Z-axis steps per millimeter-1/16 step +$110=5000.000 ;X-axis maximum rate, mm/min +$111=5000.000 ;Y-axis maximum rate, mm/min +$112=5000.000 ;Z-axis maximum rate, mm/min +$120=500.000 ;X-axis acceleration, mm/sec^2 +$121=500.000 ;Y-axis acceleration, mm/sec^2 +$122=500.000 ;Z-axis acceleration, mm/sec^2 +$130=800.000 ;X-axis maximum travel, millimeters +$131=300.000 ;Y-axis maximum travel, millimeters +$132=70.000 ;Z-axis maximum travel, millimeters diff --git a/app/wizards/interface/PROFILES/ACRO55.SET b/app/wizards/interface/PROFILES/ACRO55.SET new file mode 100644 index 0000000..6fe3477 --- /dev/null +++ b/app/wizards/interface/PROFILES/ACRO55.SET @@ -0,0 +1,34 @@ +$0=10 ;Step pulse time, microseconds +$1=255 ;Step idle delay, milliseconds +$2=0 ;Step pulse invert, mask +$3=1 ;Step direction invert, mask +$4=1 ;Invert step enable pin, boolean +$5=0 ;Invert limit pins, boolean +$6=0 ;Invert probe pin, boolean +$10=1 ;Status report options, mask +$11=0.020 ;Junction deviation, millimeters +$12=0.002 ;Arc tolerance, millimeters +$13=0 ;Report in inches, boolean +$20=0 ;Soft limits enable, boolean +$21=1 ;Hard limits enable, boolean +$22=1 ;Homing cycle enable, boolean +$23=7 ;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=1 ;Laser-mode enable, boolean +$100=57.143 ;X-axis steps per millimeter-1/16 step +$101=57.143 ;Y-axis steps per millimeter-1/16 step +$102=57.143 ;Z-axis steps per millimeter-1/16 step +$110=5000.000 ;X-axis maximum rate, mm/min +$111=5000.000 ;Y-axis maximum rate, mm/min +$112=5000.000 ;Z-axis maximum rate, mm/min +$120=500.000 ;X-axis acceleration, mm/sec^2 +$121=500.000 ;Y-axis acceleration, mm/sec^2 +$122=500.000 ;Z-axis acceleration, mm/sec^2 +$130=300.000 ;X-axis maximum travel, millimeters +$131=300.000 ;Y-axis maximum travel, millimeters +$132=70.000 ;Z-axis maximum travel, millimeters diff --git a/app/wizards/interface/PROFILES/CBEAM.SET b/app/wizards/interface/PROFILES/CBEAM.SET new file mode 100644 index 0000000..292b736 --- /dev/null +++ b/app/wizards/interface/PROFILES/CBEAM.SET @@ -0,0 +1,34 @@ +$0=10 ;Step pulse time, microseconds +$1=255 ;Step idle delay, milliseconds +$2=0 ;Step pulse invert, mask +$3=5 ;Step direction invert, mask +$4=1 ;Invert step enable pin, boolean +$5=0 ;Invert limit pins, boolean +$6=0 ;Invert probe pin, boolean +$10=2 ;Status report options, mask +$11=0.020 ;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=0 ;Homing cycle enable, boolean +$23=1 ;Homing direction invert, mask +$24=2000.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=1000.000 ;X-axis maximum rate, mm/min +$111=1000.000 ;Y-axis maximum rate, mm/min +$112=1000.000 ;Z-axis maximum rate, mm/min +$120=100.000 ;X-axis acceleration, mm/sec^2 +$121=100.000 ;Y-axis acceleration, mm/sec^2 +$122=100.000 ;Z-axis acceleration, mm/sec^2 +$130=270.000 ;X-axis maximum travel, millimeters +$131=270.000 ;Y-axis maximum travel, millimeters +$132=80.000 ;Z-axis maximum travel, millimeters diff --git a/app/wizards/interface/PROFILES/CBEAMXL.SET b/app/wizards/interface/PROFILES/CBEAMXL.SET new file mode 100644 index 0000000..7c99cdf --- /dev/null +++ b/app/wizards/interface/PROFILES/CBEAMXL.SET @@ -0,0 +1,34 @@ +$0=10 ;Step pulse time, microseconds +$1=255 ;Step idle delay, milliseconds +$2=0 ;Step pulse invert, mask +$3=6 ;Step direction invert, mask +$4=1 ;Invert step enable pin, boolean +$5=0 ;Invert limit pins, boolean +$6=0 ;Invert probe pin, boolean +$10=2 ;Status report options, mask +$11=0.020 ;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=0 ;Homing cycle enable, boolean +$23=0 ;Homing direction invert, mask +$24=2000.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=1000.000 ;X-axis maximum rate, mm/min +$111=1000.000 ;Y-axis maximum rate, mm/min +$112=1000.000 ;Z-axis maximum rate, mm/min +$120=100.000 ;X-axis acceleration, mm/sec^2 +$121=100.000 ;Y-axis acceleration, mm/sec^2 +$122=100.000 ;Z-axis acceleration, mm/sec^2 +$130=200.000 ;X-axis maximum travel, millimeters +$131=200.000 ;Y-axis maximum travel, millimeters +$132=200.000 ;Z-axis maximum travel, millimeters diff --git a/app/wizards/interface/PROFILES/LD1010LS.SET b/app/wizards/interface/PROFILES/LD1010LS.SET new file mode 100644 index 0000000..34305a5 --- /dev/null +++ b/app/wizards/interface/PROFILES/LD1010LS.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=0 ;Invert probe pin, boolean +$10=1 ;Status report options, mask +$11=0.020 ;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=3 ;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=255 ;Maximum spindle speed, RPM +$31=0 ;Minimum spindle speed, RPM +$32=1 ;Maximum spindle speed, RPM +$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=4000.000 ;Z-axis maximum rate, mm/min +$120=700.000 ;X-axis acceleration, mm/sec^2 +$121=700.000 ;Y-axis acceleration, mm/sec^2 +$122=700.000 ;Z-axis acceleration, mm/sec^2 +$130=810 ;X-axis maximum travel, millimeters +$131=730 ;Y-axis maximum travel, millimeters +$132=90 ;Z-axis maximum travel, millimeters diff --git a/app/wizards/interface/PROFILES/LEAD1010.SET b/app/wizards/interface/PROFILES/LEAD1010.SET new file mode 100644 index 0000000..a3adbb1 --- /dev/null +++ b/app/wizards/interface/PROFILES/LEAD1010.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=0 ;Invert probe pin, boolean +$10=1 ;Status report options, mask +$11=0.020 ;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=3 ;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=2500.000 ;X-axis maximum rate, mm/min +$111=2500.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=810 ;X-axis maximum travel, millimeters +$131=730 ;Y-axis maximum travel, millimeters +$132=90 ;Z-axis maximum travel, millimeters diff --git a/app/wizards/interface/PROFILES/LEAD1515.SET b/app/wizards/interface/PROFILES/LEAD1515.SET new file mode 100644 index 0000000..58655fc --- /dev/null +++ b/app/wizards/interface/PROFILES/LEAD1515.SET @@ -0,0 +1,34 @@ +$0=10 ;Step pulse time, microseconds +$1=255 ;Step idle delay, milliseconds +$2=0 ;Step pulse invert, mask +$3=0 ;Step direction invert, mask +$4=1 ;Invert step enable pin, boolean +$5=0 ;Invert limit pins, boolean +$6=0 ;Invert probe pin, boolean +$10=1 ;Status report options, mask +$11=0.020 ;Junction deviation, millimeters +$12=0.002 ;Arc tolerance, millimeters +$13=0 ;Report in inches, boolean +$20=0 ;Soft limits enable, boolean +$21=1 ;Hard limits enable, boolean +$22=1 ;Homing cycle enable, boolean +$23=3 ;Homing direction invert, mask +$24=100.000 ;Homing locate feed rate, mm/min +$25=2000.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=198.109 ;X-axis steps per millimeter +$101=198.109 ;Y-axis steps per millimeter +$102=199.100 ;Z-axis steps per millimeter +$110=3500.000 ;X-axis maximum rate, mm/min +$111=3500.000 ;Y-axis maximum rate, mm/min +$112=1000.000 ;Z-axis maximum rate, mm/min +$120=350.000 ;X-axis acceleration, mm/sec^2 +$121=350.000 ;Y-axis acceleration, mm/sec^2 +$122=350.000 ;Z-axis acceleration, mm/sec^2 +$130=1170 ;X-axis maximum travel, millimeters +$131=1250 ;Y-axis maximum travel, millimeters +$132=90 ;Z-axis maximum travel, millimeters diff --git a/app/wizards/interface/PROFILES/MINIMILL.SET b/app/wizards/interface/PROFILES/MINIMILL.SET new file mode 100644 index 0000000..ac7465d --- /dev/null +++ b/app/wizards/interface/PROFILES/MINIMILL.SET @@ -0,0 +1,34 @@ +$0=10 ;Step pulse time, microseconds +$1=255 ;Step idle delay, milliseconds +$2=0 ;Step pulse invert, mask +$3=3 ;Step direction invert, mask +$4=1 ;Invert step enable pin, boolean +$5=0 ;Invert limit pins, boolean +$6=0 ;Invert probe pin, boolean +$10=2 ;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=1 ;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=500.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=1500.000 ;X-axis maximum rate, mm/min +$111=1500.000 ;Y-axis maximum rate, mm/min +$112=1500.000 ;Z-axis maximum rate, mm/min +$120=50.000 ;X-axis acceleration, mm/sec^2 +$121=50.000 ;Y-axis acceleration, mm/sec^2 +$122=50.000 ;Z-axis acceleration, mm/sec^2 +$130=120.000 ;X-axis maximum travel, millimeters +$131=120.000 ;Y-axis maximum travel, millimeters +$132=60.000 ;Z-axis maximum travel, millimeters diff --git a/app/wizards/interface/PROFILES/SPNX1050.SET b/app/wizards/interface/PROFILES/SPNX1050.SET new file mode 100644 index 0000000..f2e8526 --- /dev/null +++ b/app/wizards/interface/PROFILES/SPNX1050.SET @@ -0,0 +1,34 @@ +$0=10 ;Step pulse time, microseconds +$1=255 ;Step idle delay, milliseconds +$2=0 ;Step pulse invert, mask +$3=3 ;Step direction invert, mask +$4=1 ;Invert step enable pin, boolean +$5=0 ;Invert limit pins, boolean +$6=0 ;Invert probe pin, boolean +$10=1 ;Status report options, mask +$11=0.020 ;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=3 ;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=2500.000 ;X-axis maximum rate, mm/min +$111=2500.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=833.5 ;X-axis maximum travel, millimeters +$131=325 ;Y-axis maximum travel, millimeters +$132=85 ;Z-axis maximum travel, millimeters diff --git a/app/wizards/interface/PROFILES/SPNX55.SET b/app/wizards/interface/PROFILES/SPNX55.SET new file mode 100644 index 0000000..3f14913 --- /dev/null +++ b/app/wizards/interface/PROFILES/SPNX55.SET @@ -0,0 +1,34 @@ +$0=10 ;Step pulse time, microseconds +$1=255 ;Step idle delay, milliseconds +$2=0 ;Step pulse invert, mask +$3=3 ;Step direction invert, mask +$4=1 ;Invert step enable pin, boolean +$5=0 ;Invert limit pins, boolean +$6=0 ;Invert probe pin, boolean +$10=1 ;Status report options, mask +$11=0.020 ;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=3 ;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=2500.000 ;X-axis maximum rate, mm/min +$111=2500.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=333.000 ;X-axis maximum travel, millimeters +$131=325.000 ;Y-axis maximum travel, millimeters +$132=85.000 ;Z-axis maximum travel, millimeters diff --git a/app/wizards/interface/PROFILES/WBEE1010.SET b/app/wizards/interface/PROFILES/WBEE1010.SET new file mode 100644 index 0000000..feefa68 --- /dev/null +++ b/app/wizards/interface/PROFILES/WBEE1010.SET @@ -0,0 +1,34 @@ +$0=10 ;Step pulse time, microseconds +$1=255 ;Step idle delay, milliseconds +$2=0 ;Step pulse invert, mask +$3=3 ;Step direction invert, mask +$4=1 ;Invert step enable pin, boolean +$5=0 ;Invert limit pins, boolean +$6=0 ;Invert probe pin, boolean +$10=1 ;Status report options, mask +$11=0.020 ;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=3 ;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=2500.000 ;X-axis maximum rate, mm/min +$111=2500.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=824.000 ;X-axis maximum travel, millimeters +$131=780.000 ;Y-axis maximum travel, millimeters +$132=122.000 ;Z-axis maximum travel, millimeters diff --git a/app/wizards/interface/PROFILES/WBEE1050.SET b/app/wizards/interface/PROFILES/WBEE1050.SET new file mode 100644 index 0000000..3a529e1 --- /dev/null +++ b/app/wizards/interface/PROFILES/WBEE1050.SET @@ -0,0 +1,34 @@ +$0=10 ;Step pulse time, microseconds +$1=255 ;Step idle delay, milliseconds +$2=0 ;Step pulse invert, mask +$3=3 ;Step direction invert, mask +$4=1 ;Invert step enable pin, boolean +$5=0 ;Invert limit pins, boolean +$6=0 ;Invert probe pin, boolean +$10=1 ;Status report options, mask +$11=0.020 ;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=3 ;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=2500.000 ;X-axis maximum rate, mm/min +$111=2500.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=317.000 ;X-axis maximum travel, millimeters +$131=762.000 ;Y-axis maximum travel, millimeters +$132=122.000 ;Z-axis maximum travel, millimeters diff --git a/app/wizards/interface/PROFILES/WBEE1510.SET b/app/wizards/interface/PROFILES/WBEE1510.SET new file mode 100644 index 0000000..e21ecf7 --- /dev/null +++ b/app/wizards/interface/PROFILES/WBEE1510.SET @@ -0,0 +1,34 @@ +$0=10 ;Step pulse time, microseconds +$1=255 ;Step idle delay, milliseconds +$2=0 ;Step pulse invert, mask +$3=1 ;Step direction invert, mask +$4=1 ;Invert step enable pin, boolean +$5=0 ;Invert limit pins, boolean +$6=0 ;Invert probe pin, boolean +$10=1 ;Status report options, mask +$11=0.020 ;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=3 ;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=26.667 ;X-axis steps per millimeter +$101=26.667 ;Y-axis steps per millimeter +$102=199.100 ;Z-axis steps per millimeter +$110=10000.000 ;X-axis maximum rate, mm/min +$111=10000.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=824.000 ;X-axis maximum travel, millimeters +$131=1280.000 ;Y-axis maximum travel, millimeters +$132=122.000 ;Z-axis maximum travel, millimeters diff --git a/firmware.bin b/firmware.bin index 51bd6b2..3f266c4 100644 Binary files a/firmware.bin and b/firmware.bin differ diff --git a/index.js b/index.js index 994d50d..cc5f4e0 100644 --- a/index.js +++ b/index.js @@ -782,6 +782,29 @@ io.on("connection", function(socket) { } }); + var src = path.join(__dirname, './app/wizards/interface/PROFILES/'); + var dest = path.join(data, "/PROFILES/"); + + ncp(src, dest, + function(err) { + if (err) { + var output = { + 'command': 'Interface USB Drive', + 'response': "Failed to copy MACHINE PROFILES to " + dest + ": " + JSON.stringify(err), + 'type': 'error' + } + io.sockets.emit('data', output); + errorCount++ + } else { + var output = { + 'command': 'Interface USB Drive', + 'response': "Copied MACHINE PROFILES to " + dest + " succesfully!", + 'type': 'success' + } + io.sockets.emit('data', output); + } + }); + setTimeout(function() { if (errorCount == 0) { var output = { @@ -2438,7 +2461,6 @@ if (isElectron()) { jogWindow.on('close', function(event) { if (!forceQuit) { - event.preventDefault(); jogWindow.hide(); return false; } diff --git a/package-lock.json b/package-lock.json index 024e3cf..37e0cd2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "OpenBuildsCONTROL", - "version": "1.0.262", + "version": "1.0.269", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -164,9 +164,9 @@ "dev": true }, "@types/fs-extra": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-9.0.1.tgz", - "integrity": "sha512-B42Sxuaz09MhC3DDeW5kubRcQ5by4iuVQ0cRRWM2lggLzAa/KVom0Aft/208NgMvNQQZ86s5rVcqDdn/SH0/mg==", + "version": "9.0.6", + "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-9.0.6.tgz", + "integrity": "sha512-ecNRHw4clCkowNOBJH1e77nvbPxHYnWIXMv1IAoG/9+MYGkgoyr3Ppxr7XYFNL41V422EDhyV4/4SSK8L2mlig==", "dev": true, "requires": { "@types/node": "*" @@ -186,18 +186,18 @@ } }, "@types/yargs": { - "version": "15.0.5", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.5.tgz", - "integrity": "sha512-Dk/IDOPtOgubt/IaevIUbTgV7doaKkoorvOyYM2CMwuDyP89bekI7H4xLIwunNYiK9jhCkmc6pUrJk3cj2AB9w==", + "version": "15.0.12", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.12.tgz", + "integrity": "sha512-f+fD/fQAo3BCbCDlrUpznF1A5Zp9rB0noS5vnoormHSIPFKL0Z2DcUJ3Gxp5ytH4uLRNxy7AwYUC9exZzqGMAw==", "dev": true, "requires": { "@types/yargs-parser": "*" } }, "@types/yargs-parser": { - "version": "15.0.0", - "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-15.0.0.tgz", - "integrity": "sha512-FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw==", + "version": "20.2.0", + "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-20.2.0.tgz", + "integrity": "sha512-37RSHht+gzzgYeobbG+KWryeAW8J33Nhr69cjTqSYymXVZEN9NbRYWoYlRtDhHKPVT1FyNKwaTPC1NynKZpzRA==", "dev": true }, "accepts": { @@ -215,9 +215,9 @@ "integrity": "sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8=" }, "ajv": { - "version": "6.12.3", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz", - "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==", + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", "dev": true, "requires": { "fast-deep-equal": "^3.1.1", @@ -297,27 +297,27 @@ } }, "app-builder-bin": { - "version": "3.5.9", - "resolved": "https://registry.npmjs.org/app-builder-bin/-/app-builder-bin-3.5.9.tgz", - "integrity": "sha512-NSjtqZ3x2kYiDp3Qezsgukx/AUzKPr3Xgf9by4cYt05ILWGAptepeeu0Uv+7MO+41o6ujhLixTou8979JGg2Kg==", + "version": "3.5.10", + "resolved": "https://registry.npmjs.org/app-builder-bin/-/app-builder-bin-3.5.10.tgz", + "integrity": "sha512-Jd+GW68lR0NeetgZDo47PdWBEPdnD+p0jEa7XaxjRC8u6Oo/wgJsfKUkORRgr2NpkD19IFKN50P6JYy04XHFLQ==", "dev": true }, "app-builder-lib": { - "version": "22.8.0", - "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-22.8.0.tgz", - "integrity": "sha512-RGaIRjCUrqkmh6QOGsyekQPEOaVynHfmeh8JZuyUymFYUOFdzBbPamkA2nhBVBTkkgfjRHsxK7LhedFKPzvWEQ==", + "version": "22.9.1", + "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-22.9.1.tgz", + "integrity": "sha512-KfXim/fiNwFW2SKffsjEMdAU7RbbEXn62x5YyXle1b4j9X/wEHW9iwox8De6y0hJdR+/kCC/49lI+VgNwLhV7A==", "dev": true, "requires": { "7zip-bin": "~5.0.3", "@develar/schema-utils": "~2.6.5", "async-exit-hook": "^2.0.1", "bluebird-lst": "^1.0.9", - "builder-util": "22.8.0", + "builder-util": "22.9.1", "builder-util-runtime": "8.7.2", "chromium-pickle-js": "^0.2.0", - "debug": "^4.1.1", - "ejs": "^3.1.3", - "electron-publish": "22.8.0", + "debug": "^4.3.0", + "ejs": "^3.1.5", + "electron-publish": "22.9.1", "fs-extra": "^9.0.1", "hosted-git-info": "^3.0.5", "is-ci": "^2.0.0", @@ -332,11 +332,29 @@ "temp-file": "^3.3.7" }, "dependencies": { - "semver": { - "version": "7.3.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz", - "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==", + "debug": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", + "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", + "dev": true, + "requires": { + "ms": "2.1.2" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", "dev": true + }, + "semver": { + "version": "7.3.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz", + "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==", + "dev": true, + "requires": { + "lru-cache": "^6.0.0" + } } } }, @@ -610,9 +628,9 @@ } }, "boolean": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/boolean/-/boolean-3.0.1.tgz", - "integrity": "sha512-HRZPIjPcbwAVQvOTxR4YE3o8Xs98NqbbL1iEZDCz7CL8ql0Lt5iOyJFxfnAB0oFs8Oh02F/lLlg30Mexv46LjA==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/boolean/-/boolean-3.0.2.tgz", + "integrity": "sha512-RwywHlpCRc3/Wh81MiCKun4ydaIFyW5Ea6JbL6sRCVx5q5irDw7pMXBUFYF/jArQ6YrG36q0kpovc9P/Kd3I4g==", "dev": true, "optional": true }, @@ -648,6 +666,12 @@ "supports-color": "^7.1.0" } }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, "is-fullwidth-code-point": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", @@ -674,11 +698,14 @@ "ansi-regex": "^5.0.0" } }, - "type-fest": { - "version": "0.8.1", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", - "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==", - "dev": true + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } } } }, @@ -716,25 +743,83 @@ "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==" }, "builder-util": { - "version": "22.8.0", - "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-22.8.0.tgz", - "integrity": "sha512-H80P1JzVy3TGpi63x81epQDK24XalL034+jAZlrPb5IhLtYmnNNdxCCAVJvg3VjSISd73Y71O+uhqCxWpqbPHw==", + "version": "22.9.1", + "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-22.9.1.tgz", + "integrity": "sha512-5hN/XOaYu4ZQUS6F+5CXE6jTo+NAnVqAxDuKGSaHWb9bejfv/rluChTLoY3/nJh7RFjkoyVjvFJv7zQDB1QmHw==", "dev": true, "requires": { "7zip-bin": "~5.0.3", "@types/debug": "^4.1.5", "@types/fs-extra": "^9.0.1", - "app-builder-bin": "3.5.9", + "app-builder-bin": "3.5.10", "bluebird-lst": "^1.0.9", "builder-util-runtime": "8.7.2", "chalk": "^4.1.0", - "debug": "^4.1.1", + "debug": "^4.3.0", "fs-extra": "^9.0.1", "is-ci": "^2.0.0", "js-yaml": "^3.14.0", "source-map-support": "^0.5.19", "stat-mode": "^1.0.0", "temp-file": "^3.3.7" + }, + "dependencies": { + "chalk": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "debug": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", + "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", + "dev": true, + "requires": { + "ms": "2.1.2" + } + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + }, + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + }, + "source-map-support": { + "version": "0.5.19", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz", + "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + } + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + } } }, "builder-util-runtime": { @@ -794,9 +879,9 @@ }, "dependencies": { "get-stream": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz", - "integrity": "sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", + "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", "dev": true, "requires": { "pump": "^3.0.0" @@ -821,16 +906,6 @@ "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", "dev": true }, - "chalk": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", - "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, "charenc": { "version": "0.0.2", "resolved": "https://registry.npmjs.org/charenc/-/charenc-0.0.2.tgz", @@ -862,9 +937,9 @@ "dev": true }, "cli-boxes": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-2.2.0.tgz", - "integrity": "sha512-gpaBrMAizVEANOpfZp/EEUixTXDyGt7DFzdK5hU+UbWt/J0lB0w20ncZj59Z9a93xHb9u12zF5BS6i9RKbtg4w==", + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-2.2.1.tgz", + "integrity": "sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw==", "dev": true }, "cliui": { @@ -1075,13 +1150,6 @@ "yargs": "^15.3.1" } }, - "core-js": { - "version": "3.6.5", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.5.tgz", - "integrity": "sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA==", - "dev": true, - "optional": true - }, "core-util-is": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", @@ -1214,13 +1282,13 @@ "integrity": "sha512-2N43msQptKbi3WMfIs+U09yi6bfyKL+MWyj5VMj8t1F/Tx04bt1cn/EEIU3o1JBltlJk7NQnzOEuTNa/KQvbWA==" }, "dmg-builder": { - "version": "22.8.0", - "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-22.8.0.tgz", - "integrity": "sha512-orePWjcrl97SYLA8F/6UUtbXJSoZCYu5KOP1lVqD4LOomr8bjGDyEVYZmZYcg5WqKmXucdmO6OpqgzH/aRMMuA==", + "version": "22.9.1", + "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-22.9.1.tgz", + "integrity": "sha512-jc+DAirqmQrNT6KbDHdfEp8D1kD0DBTnsLhwUR3MX+hMBun5bT134LQzpdK0GKvd22GqF8L1Cz/NOgaVjscAXQ==", "dev": true, "requires": { - "app-builder-lib": "22.8.0", - "builder-util": "22.8.0", + "app-builder-lib": "22.9.1", + "builder-util": "22.9.1", "fs-extra": "^9.0.1", "iconv-lite": "^0.6.2", "js-yaml": "^3.14.0", @@ -1239,9 +1307,9 @@ } }, "dot-prop": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.2.0.tgz", - "integrity": "sha512-uEUyaDKoSQ1M4Oq8l45hSE26SnTxL6snNnqvK/VWx5wJhmff5z0FUVJDKDanor/6w3kzE3i7XZOk+7wC0EXr1A==", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz", + "integrity": "sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==", "dev": true, "requires": { "is-obj": "^2.0.0" @@ -1297,18 +1365,18 @@ "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=" }, "ejs": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.3.tgz", - "integrity": "sha512-wmtrUGyfSC23GC/B1SMv2ogAUgbQEtDmTIhfqielrG5ExIM9TP4UoYdi90jLF1aTcsWCJNEO0UrgKzP0y3nTSg==", + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.5.tgz", + "integrity": "sha512-dldq3ZfFtgVTJMLjOe+/3sROTzALlL9E34V4/sDtUd/KlBSS0s6U1/+WPE1B4sj9CXHJpL1M6rhNJnc9Wbal9w==", "dev": true, "requires": { "jake": "^10.6.1" } }, "electron": { - "version": "9.2.0", - "resolved": "https://registry.npmjs.org/electron/-/electron-9.2.0.tgz", - "integrity": "sha512-4ecZ3rcGg//Gk4fAK3Jo61T+uh36JhU6HHR/PTujQqQiBw1g4tNPd4R2hGGth2d+7FkRIs5GdRNef7h64fQEMw==", + "version": "9.4.0", + "resolved": "https://registry.npmjs.org/electron/-/electron-9.4.0.tgz", + "integrity": "sha512-hOC4q0jkb+UDYZRy8vrZ1IANnq+jznZnbkD62OEo06nU+hIbp2IrwDRBNuSLmQ3cwZMVir0WSIA1qEVK0PkzGA==", "dev": true, "requires": { "@electron/get": "^1.0.1", @@ -1317,44 +1385,152 @@ }, "dependencies": { "@types/node": { - "version": "12.12.54", - "resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.54.tgz", - "integrity": "sha512-ge4xZ3vSBornVYlDnk7yZ0gK6ChHf/CHB7Gl1I0Jhah8DDnEQqBzgohYG4FX4p81TNirSETOiSyn+y1r9/IR6w==", + "version": "12.19.11", + "resolved": "https://registry.npmjs.org/@types/node/-/node-12.19.11.tgz", + "integrity": "sha512-bwVfNTFZOrGXyiQ6t4B9sZerMSShWNsGRw8tC5DY1qImUNczS9SjT4G6PnzjCnxsu5Ubj6xjL2lgwddkxtQl5w==", "dev": true } } }, "electron-builder": { - "version": "22.8.0", - "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-22.8.0.tgz", - "integrity": "sha512-dUv4F3srJouqxhWivtKqSoQP4Df6vYgjooGdzms+iYMTFi9f0b4LlEbr7kgsPvte8zAglee7VOGOODkCRJDkUQ==", + "version": "22.9.1", + "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-22.9.1.tgz", + "integrity": "sha512-GXPt8l5Mxwm1QKYopUM6/Tdh9W3695G6Ax+IFyj5pQ51G4SD5L1uq4/RkPSsOgs3rP7jNSV6g6OfDzdtVufPdA==", "dev": true, "requires": { "@types/yargs": "^15.0.5", - "app-builder-lib": "22.8.0", + "app-builder-lib": "22.9.1", "bluebird-lst": "^1.0.9", - "builder-util": "22.8.0", + "builder-util": "22.9.1", "builder-util-runtime": "8.7.2", "chalk": "^4.1.0", - "dmg-builder": "22.8.0", + "dmg-builder": "22.9.1", "fs-extra": "^9.0.1", "is-ci": "^2.0.0", "lazy-val": "^1.0.4", "read-config-file": "6.0.0", "sanitize-filename": "^1.6.3", - "update-notifier": "^4.1.0", - "yargs": "^15.3.1" + "update-notifier": "^4.1.1", + "yargs": "^16.0.3" + }, + "dependencies": { + "ansi-regex": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", + "dev": true + }, + "chalk": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "cliui": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", + "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", + "dev": true, + "requires": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^7.0.0" + } + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true + }, + "string-width": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", + "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", + "dev": true, + "requires": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.0" + } + }, + "strip-ansi": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", + "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", + "dev": true, + "requires": { + "ansi-regex": "^5.0.0" + } + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + }, + "wrap-ansi": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dev": true, + "requires": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + } + }, + "y18n": { + "version": "5.0.5", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.5.tgz", + "integrity": "sha512-hsRUr4FFrvhhRH12wOdfs38Gy7k2FFzB9qgN9v3aLykRq0dRcdcpz5C9FxdS2NuhOrI/628b/KSTJ3rwHysYSg==", + "dev": true + }, + "yargs": { + "version": "16.2.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", + "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", + "dev": true, + "requires": { + "cliui": "^7.0.2", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", + "require-directory": "^2.1.1", + "string-width": "^4.2.0", + "y18n": "^5.0.5", + "yargs-parser": "^20.2.2" + } + }, + "yargs-parser": { + "version": "20.2.4", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz", + "integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==", + "dev": true + } } }, "electron-publish": { - "version": "22.8.0", - "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-22.8.0.tgz", - "integrity": "sha512-uM0Zdi9hUqqGOrPj478v7toTvV1Kgto1w11rIiI168batiXAJvNLD8VZRfehOrZT0ibUyZlw8FtxoGCrjyHUOw==", + "version": "22.9.1", + "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-22.9.1.tgz", + "integrity": "sha512-ducLjRJLEeU87FaTCWaUyDjCoLXHkawkltP2zqS/n2PyGke54ZIql0tBuUheht4EpR8AhFbVJ11spSn1gy8r6w==", "dev": true, "requires": { "@types/fs-extra": "^9.0.1", "bluebird-lst": "^1.0.9", - "builder-util": "22.8.0", + "builder-util": "22.9.1", "builder-util-runtime": "8.7.2", "chalk": "^4.1.0", "fs-extra": "^9.0.1", @@ -1362,11 +1538,36 @@ "mime": "^2.4.6" }, "dependencies": { - "mime": { - "version": "2.4.6", - "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.6.tgz", - "integrity": "sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA==", + "chalk": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true + }, + "mime": { + "version": "2.4.7", + "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.7.tgz", + "integrity": "sha512-dhNd1uA2u397uQk3Nv5LM4lm93WYDUXFn3Fu291FJerns4jyTudqhIWe4W04YLy7Uk1tm1Ore04NpjRvQp/NPA==", + "dev": true + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } } } }, @@ -1486,6 +1687,12 @@ "dev": true, "optional": true }, + "escalade": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", + "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", + "dev": true + }, "escape-goat": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/escape-goat/-/escape-goat-2.1.1.tgz", @@ -1498,11 +1705,10 @@ "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=" }, "escape-string-regexp": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", - "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", - "dev": true, - "optional": true + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", + "dev": true }, "esprima": { "version": "4.0.1", @@ -1745,6 +1951,12 @@ "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" }, + "function-bind": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", + "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", + "dev": true + }, "gauge": { "version": "2.7.4", "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz", @@ -1809,22 +2021,40 @@ "serialize-error": "^7.0.1" }, "dependencies": { - "semver": { - "version": "7.3.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz", - "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==", + "core-js": { + "version": "3.8.1", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.8.1.tgz", + "integrity": "sha512-9Id2xHY1W7m8hCl8NkhQn5CufmF/WuR30BTRewvCXc1aZd3kMECwNZ69ndLbekKfakw9Rf2Xyc+QR6E7Gg+obg==", "dev": true, "optional": true + }, + "semver": { + "version": "7.3.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz", + "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==", + "dev": true, + "optional": true, + "requires": { + "lru-cache": "^6.0.0" + } } } }, "global-dirs": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-2.0.1.tgz", - "integrity": "sha512-5HqUqdhkEovj2Of/ms3IeS/EekcO54ytHRLV4PEY2rhRwrHXLQjeVEES0Lhka0xwNDtGYn58wyC4s5+MHsOO6A==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-2.1.0.tgz", + "integrity": "sha512-MG6kdOUh/xBnyo9cJFeIKkLEc1AyFq42QTU4XiX51i2NEdxLxLWXIjEjmqKeSuKR7pAZjTqUVoT2b2huxVLgYQ==", "dev": true, "requires": { - "ini": "^1.3.5" + "ini": "1.3.7" + }, + "dependencies": { + "ini": { + "version": "1.3.7", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.7.tgz", + "integrity": "sha512-iKpRpXP+CrP2jyrxvg1kMUpXDyRUFDWurxbnVT1vQPx+Wz9uCYsMIqYuSBLV+PAaZG/d7kRLKRFc9oDMsH+mFQ==", + "dev": true + } } }, "global-tunnel-ng": { @@ -1874,6 +2104,15 @@ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==" }, + "has": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", + "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", + "dev": true, + "requires": { + "function-bind": "^1.1.1" + } + }, "has-binary2": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/has-binary2/-/has-binary2-1.0.3.tgz", @@ -1895,9 +2134,9 @@ "integrity": "sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk=" }, "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", "dev": true }, "has-unicode": { @@ -1920,9 +2159,9 @@ } }, "hosted-git-info": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-3.0.5.tgz", - "integrity": "sha512-i4dpK6xj9BIpVOTboXIlKG9+8HMKggcrMX7WA24xZtKwX0TPelq/rbaS5rCKeNX8sJXZJGdSxpnEGtta+wismQ==", + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-3.0.7.tgz", + "integrity": "sha512-fWqc0IcuXs+BmE9orLDyVykAG9GJtGLGuZAAqgcckPgv5xad4AcXGIv8galtQvlwutxSlaMcdw7BUtq2EIvqCQ==", "dev": true, "requires": { "lru-cache": "^6.0.0" @@ -2029,6 +2268,15 @@ "ci-info": "^2.0.0" } }, + "is-core-module": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.2.0.tgz", + "integrity": "sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==", + "dev": true, + "requires": { + "has": "^1.0.3" + } + }, "is-fullwidth-code-point": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", @@ -2146,18 +2394,6 @@ "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", "dev": true }, - "escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", - "dev": true - }, - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", - "dev": true - }, "supports-color": { "version": "5.5.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", @@ -2330,6 +2566,15 @@ "optional": true, "requires": { "escape-string-regexp": "^4.0.0" + }, + "dependencies": { + "escape-string-regexp": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", + "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", + "dev": true, + "optional": true + } } }, "md5": { @@ -2455,9 +2700,9 @@ "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==" }, "node-abi": { - "version": "2.18.0", - "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.18.0.tgz", - "integrity": "sha512-yi05ZoiuNNEbyT/xXfSySZE+yVnQW6fxPZuFbLyS1s6b5Kw3HzV2PHOM4XR+nsjzkHxByK+2Wg+yCQbe35l8dw==", + "version": "2.19.3", + "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.19.3.tgz", + "integrity": "sha512-9xZrlyfvKhWme2EXFKQhZRp1yNWT/uI1luYPr3sFl+H4keYY4xR+1jO7mvTTijIsHf1M+QDe9uWuKeEpLInIlg==", "requires": { "semver": "^5.4.1" } @@ -2750,9 +2995,9 @@ "dev": true }, "pupa": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/pupa/-/pupa-2.0.1.tgz", - "integrity": "sha512-hEJH0s8PXLY/cdXh66tNEQGndDrIKNqNC5xmrysZy3i5C3oEoLna7YAOad+7u125+zH1HNXUmGEkrhb3c2VriA==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/pupa/-/pupa-2.1.1.tgz", + "integrity": "sha512-l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A==", "dev": true, "requires": { "escape-goat": "^2.0.0" @@ -2827,9 +3072,9 @@ } }, "registry-auth-token": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-4.2.0.tgz", - "integrity": "sha512-P+lWzPrsgfN+UEpDS3U8AQKg/UjZX6mQSJueZj3EK+vNESoqBSpBUD3gmu4sF9lOsjXWjF11dQKUqemf3veq1w==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-4.2.1.tgz", + "integrity": "sha512-6gkSb4U6aWJB4SF2ZvLb76yCBjcvufXBqvvEx1HbmKPkutswjW1xNVRY0+daljIYRbogN7O0etYSlbiaEQyMyw==", "dev": true, "requires": { "rc": "^1.2.8" @@ -2857,11 +3102,12 @@ "dev": true }, "resolve": { - "version": "1.17.0", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz", - "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==", + "version": "1.19.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz", + "integrity": "sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==", "dev": true, "requires": { + "is-core-module": "^2.1.0", "path-parse": "^1.0.6" } }, @@ -2883,13 +3129,13 @@ } }, "roarr": { - "version": "2.15.3", - "resolved": "https://registry.npmjs.org/roarr/-/roarr-2.15.3.tgz", - "integrity": "sha512-AEjYvmAhlyxOeB9OqPUzQCo3kuAkNfuDk/HqWbZdFsqDFpapkTjiw+p4svNEoRLvuqNTxqfL+s+gtD4eDgZ+CA==", + "version": "2.15.4", + "resolved": "https://registry.npmjs.org/roarr/-/roarr-2.15.4.tgz", + "integrity": "sha512-CHhPh+UNHD2GTXNYhPWLnU8ONHdI+5DI+4EYIAOaiD63rHeYlZvyh8P+in5999TTSFgUYuKUAjzRI4mdh/p+2A==", "dev": true, "optional": true, "requires": { - "boolean": "^3.0.0", + "boolean": "^3.0.1", "detect-node": "^2.0.4", "globalthis": "^1.0.1", "json-stringify-safe": "^5.0.1", @@ -3009,6 +3255,15 @@ "optional": true, "requires": { "type-fest": "^0.13.1" + }, + "dependencies": { + "type-fest": { + "version": "0.13.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.13.1.tgz", + "integrity": "sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==", + "dev": true, + "optional": true + } } }, "serialport": { @@ -3240,22 +3495,6 @@ } } }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - }, - "source-map-support": { - "version": "0.5.19", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz", - "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==", - "dev": true, - "requires": { - "buffer-from": "^1.0.0", - "source-map": "^0.6.0" - } - }, "spdx-correct": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz", @@ -3283,9 +3522,9 @@ } }, "spdx-license-ids": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz", - "integrity": "sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==", + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz", + "integrity": "sha512-U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ==", "dev": true }, "sprintf-js": { @@ -3376,15 +3615,6 @@ "debug": "^4.1.0" } }, - "supports-color": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", - "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - }, "tar-fs": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.0.tgz", @@ -3472,9 +3702,9 @@ } }, "term-size": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/term-size/-/term-size-2.2.0.tgz", - "integrity": "sha512-a6sumDlzyHVJWb8+YofY4TW112G6p2FCPEAFk+59gIYHv3XHRhm9ltVQ9kli4hNWeQBwSpe8cRN25x0ROunMOw==", + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/term-size/-/term-size-2.2.1.tgz", + "integrity": "sha512-wK0Ri4fOGjv/XPy8SBHZChl8CM7uMc5VML7SqiQ0zG7+J5Vr+RMQDoHa2CNT6KHUnTGIXH34UDMkPzAUyapBZg==", "dev": true }, "through2": { @@ -3554,11 +3784,10 @@ } }, "type-fest": { - "version": "0.13.1", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.13.1.tgz", - "integrity": "sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==", - "dev": true, - "optional": true + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", + "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==", + "dev": true }, "type-is": { "version": "1.6.18", @@ -3618,9 +3847,9 @@ "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=" }, "update-notifier": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-4.1.0.tgz", - "integrity": "sha512-w3doE1qtI0/ZmgeoDoARmI5fjDoT93IfKgEGqm26dGUOh8oNpaSTsGNdYRN/SjOuo10jcJGwkEL3mroKzktkew==", + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-4.1.3.tgz", + "integrity": "sha512-Yld6Z0RyCYGB6ckIjffGOSOmHXj1gMeE7aROz4MG+XMkmixBX4jUngrGXNYz7wPKBmtoD4MnBa2Anu7RSKht/A==", "dev": true, "requires": { "boxen": "^4.2.0", @@ -3647,13 +3876,28 @@ "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" } + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } } } }, "uri-js": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz", - "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==", + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.0.tgz", + "integrity": "sha512-B0yRTzYdUCCn9n+F4+Gh4yIDtMQcaJsmYBDsTSG8g/OejKBodLQ2IHfN3bM7jUsRXndopT7OIXWdYqc1fjmV6g==", "dev": true, "requires": { "punycode": "^2.1.0" diff --git a/package.json b/package.json index 5668fe0..4d1052d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "OpenBuildsCONTROL", - "version": "1.0.268", + "version": "1.0.269", "license": "AGPL-3.0", "description": "OpenBuildsCONTROL CNC Machine Interface Software", "author": "github.com/openbuilds ",