Version 1.7.1.0

svenhb · Dec 18, 2023 · 8047710 · 8047710
1 parent bd1b40a
commit 8047710
Show file tree

Hide file tree

Showing 2 changed files with 83 additions and 14 deletions.
diff --git a/GRBL-Plotter/App.config b/GRBL-Plotter/App.config
@@ -1772,6 +1772,18 @@
       <setting name="importSVGAddComments" serializeAs="String">
         <value>False</value>
       </setting>
+      <setting name="importSVGAddOnEnable" serializeAs="String">
+        <value>False</value>
+      </setting>
+      <setting name="importSVGAddOnFile" serializeAs="String">
+        <value>data\examples\addon_frame_stamp1.svg</value>
+      </setting>
+      <setting name="importSVGAddOnPosition" serializeAs="String">
+        <value>1</value>
+      </setting>
+      <setting name="importSVGAddOnScale" serializeAs="String">
+        <value>0.9</value>
+      </setting>
       <setting name="importSVGApplyFill" serializeAs="String">
         <value>False</value>
       </setting>
@@ -1943,6 +1955,27 @@
       <setting name="mainFormWinState" serializeAs="String">
         <value>Normal</value>
       </setting>
+      <setting name="multipleLoadAllwaysClear" serializeAs="String">
+        <value>False</value>
+      </setting>
+      <setting name="multipleLoadAllwaysLoad" serializeAs="String">
+        <value>True</value>
+      </setting>
+      <setting name="multipleLoadByX" serializeAs="String">
+        <value>True</value>
+      </setting>
+      <setting name="multipleLoadGap" serializeAs="String">
+        <value>10</value>
+      </setting>
+      <setting name="multipleLoadLimitNo" serializeAs="String">
+        <value>True</value>
+      </setting>
+      <setting name="multipleLoadNoX" serializeAs="String">
+        <value>3</value>
+      </setting>
+      <setting name="multipleLoadNoY" serializeAs="String">
+        <value>3</value>
+      </setting>
       <setting name="notifierMailClientAdr" serializeAs="String">
         <value>smtp.gmail.com</value>
       </setting>
@@ -2261,27 +2294,30 @@
       <setting name="useCaseLastLoaded" serializeAs="String">
         <value>?</value>
       </setting>
-      <setting name="multipleLoadNoX" serializeAs="String">
-        <value>3</value>
+      <setting name="processTimerInterval" serializeAs="String">
+        <value>1000</value>
       </setting>
-      <setting name="multipleLoadNoY" serializeAs="String">
-        <value>3</value>
+      <setting name="probingFiducialCodeStart" serializeAs="String">
+        <value>G59</value>
       </setting>
-      <setting name="multipleLoadByX" serializeAs="String">
-        <value>True</value>
+      <setting name="probingFiducialCodeEnd" serializeAs="String">
+        <value>G54</value>
       </setting>
-      <setting name="multipleLoadLimitNo" serializeAs="String">
+      <setting name="probingFiducialOffsetX" serializeAs="String">
+        <value>0</value>
+      </setting>
+      <setting name="probingFiducialOffsetY" serializeAs="String">
+        <value>0</value>
+      </setting>
+      <setting name="probingFiducialSkip1stMove" serializeAs="String">
         <value>True</value>
       </setting>
-      <setting name="multipleLoadAllwaysLoad" serializeAs="String">
+      <setting name="probingFiducial2ndChance" serializeAs="String">
         <value>True</value>
       </setting>
-      <setting name="multipleLoadAllwaysClear" serializeAs="String">
+      <setting name="probingInvertLogic" serializeAs="String">
         <value>False</value>
       </setting>
-      <setting name="multipleLoadGap" serializeAs="String">
-        <value>10</value>
-      </setting>
     </GrblPlotter.Properties.Settings>
     <GRBL_Plotter.Properties.Settings>
       <setting name="cameraColorCross" serializeAs="String">

diff --git a/GRBL-Plotter/GRBL-Plotter.csproj b/GRBL-Plotter/GRBL-Plotter.csproj
@@ -29,8 +29,8 @@
     <ProductName>GRBL-Plotter</ProductName>
     <PublisherName>GRBL-Plotter</PublisherName>
     <OpenBrowserOnPublish>false</OpenBrowserOnPublish>
-    <ApplicationRevision>4</ApplicationRevision>
-    <ApplicationVersion>1.7.0.4</ApplicationVersion>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.7.1.0</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
     <PublishWizardCompleted>true</PublishWizardCompleted>
@@ -60,6 +60,8 @@
     <WarningLevel>1</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <CodeAnalysisRuleSet>
+    </CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup>
     <StartupObject>GrblPlotter.Program</StartupObject>
@@ -318,6 +320,12 @@
     <Compile Include="MachineControl\ControlSetupUseCase.Designer.cs">
       <DependentUpon>ControlSetupUseCase.cs</DependentUpon>
     </Compile>
+    <Compile Include="MachineControl\ControlMoveXY.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="MachineControl\ControlMoveXY.Designer.cs">
+      <DependentUpon>ControlMoveXY.cs</DependentUpon>
+    </Compile>
     <Compile Include="MachineControl\GCode2DViewpaths.cs" />
     <Compile Include="MachineControl\GCodeAnalyze.cs" />
     <Compile Include="MachineControl\GCodeParser.cs" />
@@ -466,6 +474,21 @@
     <Content Include="data\automations\example2.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="data\automations\example_probe_fiducial.xml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="data\examples\addon_frame_stamp1.svg">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="data\examples\addon_frame_stamp2.svg">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="data\examples\addon_frame_stamp3.svg">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="data\examples\addon_sign_mysign.svg">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="data\examples\exampleFrameFix.jpg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -800,6 +823,12 @@
     <Content Include="data\scripts\script_stamp_refresh.nc">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="data\examples\graphic_fiducial.dxf">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="data\buttons\Pen_dot_Servo.ini">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <None Include="Properties\app.manifest" />
     <None Include="Resources\LeadInOut.png" />
     <None Include="Resources\rndOff.png" />
@@ -1315,6 +1344,9 @@
     <EmbeddedResource Include="MachineControl\ControlLaser.zh-CN.resx">
       <DependentUpon>ControlLaser.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="MachineControl\ControlMoveXY.resx">
+      <DependentUpon>ControlMoveXY.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="MachineControl\ControlProbing.ar.resx">
       <DependentUpon>ControlProbing.cs</DependentUpon>
     </EmbeddedResource>
@@ -1833,6 +1865,7 @@
     <EmbeddedResource Include="Resources\ResStrings.de-DE.resx" />
     <EmbeddedResource Include="Resources\ResStrings.es.resx" />
     <EmbeddedResource Include="Resources\ResStrings.fr.resx" />
+    <EmbeddedResource Include="Resources\ResStrings.it.resx" />
     <EmbeddedResource Include="Resources\ResStrings.ja.resx" />
     <EmbeddedResource Include="Resources\ResStrings.pl.resx" />
     <EmbeddedResource Include="Resources\ResStrings.pt.resx" />