Version 1.5.8.4

svenhb · Jun 6, 2021 · 2e46940 · 2e46940
1 parent 9806822
commit 2e46940
Show file tree

Hide file tree

Showing 16 changed files with 256 additions and 202 deletions.
diff --git a/GRBL-Plotter/bin/Release/GRBL-Plotter.application b/GRBL-Plotter/bin/Release/GRBL-Plotter.application
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <asmv1:assembly xsi:schemaLocation="urn:schemas-microsoft-com:asm.v1 assembly.adaptive.xsd" manifestVersion="1.0" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns="urn:schemas-microsoft-com:asm.v2" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xrml="urn:mpeg:mpeg21:2003:01-REL-R-NS" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:co.v1="urn:schemas-microsoft-com:clickonce.v1" xmlns:co.v2="urn:schemas-microsoft-com:clickonce.v2">
-  <assemblyIdentity name="GRBL-Plotter.application" version="1.5.8.2" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" xmlns="urn:schemas-microsoft-com:asm.v1" />
+  <assemblyIdentity name="GRBL-Plotter.application" version="1.5.8.4" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" xmlns="urn:schemas-microsoft-com:asm.v1" />
   <description asmv2:publisher="GRBL-Plotter" asmv2:product="GRBL-Plotter" xmlns="urn:schemas-microsoft-com:asm.v1" />
   <deployment install="true" co.v1:createDesktopShortcut="true" />
   <compatibleFrameworks xmlns="urn:schemas-microsoft-com:clickonce.v2">
     <framework targetVersion="4.0" profile="Full" supportedRuntime="4.0.30319" />
   </compatibleFrameworks>
   <dependency>
-    <dependentAssembly dependencyType="install" codebase="GRBL-Plotter.exe.manifest" size="97485">
-      <assemblyIdentity name="GRBL-Plotter.exe" version="1.5.8.2" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" type="win32" />
+    <dependentAssembly dependencyType="install" codebase="GRBL-Plotter.exe.manifest" size="97887">
+      <assemblyIdentity name="GRBL-Plotter.exe" version="1.5.8.4" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" type="win32" />
       <hash>
         <dsig:Transforms>
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>nxG1WhHJMz+I6UfPNYoUWVq65Rc=</dsig:DigestValue>
+        <dsig:DigestValue>0WauNSr0ITi/BQBxVbcCZIS6/EA=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

diff --git a/GRBL-Plotter/bin/Release/GRBL-Plotter.exe b/GRBL-Plotter/bin/Release/GRBL-Plotter.exe
diff --git a/GRBL-Plotter/bin/Release/GRBL-Plotter.exe.config b/GRBL-Plotter/bin/Release/GRBL-Plotter.exe.config
@@ -298,16 +298,16 @@
         <value>1</value>
       </setting>
       <setting name="ctrlToolScriptGet" serializeAs="String">
-        <value>data\scripts\</value>
+        <value>data\scripts\script_v1583_brush_select.nc</value>
       </setting>
       <setting name="ctrlToolScriptProbe" serializeAs="String">
         <value>data\scripts\</value>
       </setting>
       <setting name="ctrlToolScriptPut" serializeAs="String">
-        <value>data\scripts\script_pen2_remove.nc</value>
+        <value>data\scripts\</value>
       </setting>
       <setting name="ctrlToolScriptSelect" serializeAs="String">
-        <value>data\scripts\script_pen2_select.nc</value>
+        <value>data\scripts\script_v1583_brush_clean.nc</value>
       </setting>
       <setting name="ctrlUpgradeRequired" serializeAs="String">
         <value>True</value>
@@ -586,7 +586,7 @@
         <value>⚠ Hard RESET|#HRST|fuchsia</value>
       </setting>
       <setting name="guiCustomBtn13" serializeAs="String">
-        <value> | </value>
+        <value>⚙ Usecase Simple Z|data\usecases\import_simple_z.ini|#FFFF80</value>
       </setting>
       <setting name="guiCustomBtn14" serializeAs="String">
         <value> | </value>
@@ -979,7 +979,7 @@
         <value>False</value>
       </setting>
       <setting name="importGCLineSegmentLength" serializeAs="String">
-        <value>10</value>
+        <value>50</value>
       </setting>
       <setting name="importGCNoArcs" serializeAs="String">
         <value>False</value>
@@ -991,7 +991,7 @@
         <value>0.5</value>
       </setting>
       <setting name="importGCPWMDown" serializeAs="String">
-        <value>800</value>
+        <value>30</value>
       </setting>
       <setting name="importGCPWMEnable" serializeAs="String">
         <value>False</value>
@@ -1000,10 +1000,10 @@
         <value>False</value>
       </setting>
       <setting name="importGCPWMUp" serializeAs="String">
-        <value>200</value>
+        <value>20</value>
       </setting>
       <setting name="importGCPWMZero" serializeAs="String">
-        <value>500</value>
+        <value>25</value>
       </setting>
       <setting name="importGCRelative" serializeAs="String">
         <value>False</value>
@@ -1036,7 +1036,7 @@
         <value>False</value>
       </setting>
       <setting name="importGCSubroutine" serializeAs="String">
-        <value>data\scripts\subroutine.nc</value>
+        <value>data\scripts\script_v1583_brush_refresh.nc</value>
       </setting>
       <setting name="importGCTangentialAngle" serializeAs="String">
         <value>30</value>
@@ -1720,6 +1720,24 @@
       <setting name="createTextLineBreakEnable" serializeAs="String">
         <value>False</value>
       </setting>
+      <setting name="importGCPWMP93" serializeAs="String">
+        <value>1</value>
+      </setting>
+      <setting name="importGCPWMP94" serializeAs="String">
+        <value>15</value>
+      </setting>
+      <setting name="importGCPWMTextP93" serializeAs="String">
+        <value>Far up</value>
+      </setting>
+      <setting name="importGCPWMTextP94" serializeAs="String">
+        <value>Down stir</value>
+      </setting>
+      <setting name="importGCPWMDlyP93" serializeAs="String">
+        <value>0.5</value>
+      </setting>
+      <setting name="importGCPWMDlyP94" serializeAs="String">
+        <value>0.5</value>
+      </setting>
     </GRBL_Plotter.Properties.Settings>
   </userSettings>
   <connectionStrings>