Version 1.7.1.1

svenhb · Jan 24, 2024 · 18d6984 · 18d6984
1 parent c14fad2
commit 18d6984
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 19 deletions.
diff --git a/GRBL-Plotter/App.config b/GRBL-Plotter/App.config
@@ -1842,13 +1842,13 @@
         <value>1000</value>
       </setting>
       <setting name="laserScanPowerFrom" serializeAs="String">
-        <value>250</value>
+        <value>50</value>
       </setting>
       <setting name="laserScanPowerStep" serializeAs="String">
         <value>5</value>
       </setting>
       <setting name="laserScanPowerTo" serializeAs="String">
-        <value>300</value>
+        <value>100</value>
       </setting>
       <setting name="laserScanSpeedFrom" serializeAs="String">
         <value>2500</value>
@@ -2057,6 +2057,24 @@
       <setting name="probingFeedZ" serializeAs="String">
         <value>100</value>
       </setting>
+      <setting name="probingFiducial2ndChance" serializeAs="String">
+        <value>True</value>
+      </setting>
+      <setting name="probingFiducialCodeEnd" serializeAs="String">
+        <value>G54</value>
+      </setting>
+      <setting name="probingFiducialCodeStart" serializeAs="String">
+        <value>G59</value>
+      </setting>
+      <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="probingFinalX" serializeAs="String">
         <value>1</value>
       </setting>
@@ -2066,6 +2084,9 @@
       <setting name="probingFinalZ" serializeAs="String">
         <value>1</value>
       </setting>
+      <setting name="probingInvertLogic" serializeAs="String">
+        <value>False</value>
+      </setting>
       <setting name="probingOffsetX" serializeAs="String">
         <value>0.1</value>
       </setting>
@@ -2111,6 +2132,9 @@
       <setting name="processSplitDistance" serializeAs="String">
         <value>300</value>
       </setting>
+      <setting name="processTimerInterval" serializeAs="String">
+        <value>1000</value>
+      </setting>
       <setting name="projectorColorBackground" serializeAs="String">
         <value>Black</value>
       </setting>
@@ -2294,30 +2318,21 @@
       <setting name="useCaseLastLoaded" serializeAs="String">
         <value>?</value>
       </setting>
-      <setting name="processTimerInterval" serializeAs="String">
-        <value>1000</value>
-      </setting>
-      <setting name="probingFiducialCodeStart" serializeAs="String">
-        <value>G59</value>
-      </setting>
-      <setting name="probingFiducialCodeEnd" serializeAs="String">
-        <value>G54</value>
-      </setting>
-      <setting name="probingFiducialOffsetX" serializeAs="String">
-        <value>0</value>
-      </setting>
-      <setting name="probingFiducialOffsetY" serializeAs="String">
+      <setting name="importImageEngravingAngle" serializeAs="String">
         <value>0</value>
       </setting>
-      <setting name="probingFiducialSkip1stMove" serializeAs="String">
+      <setting name="importImageEngravingOneDirection" serializeAs="String">
         <value>True</value>
       </setting>
-      <setting name="probingFiducial2ndChance" serializeAs="String">
-        <value>True</value>
+      <setting name="importImageSLaserOnly" serializeAs="String">
+        <value>False</value>
       </setting>
-      <setting name="probingInvertLogic" serializeAs="String">
+      <setting name="importImageEngravingCross" serializeAs="String">
         <value>False</value>
       </setting>
+      <setting name="importImageEngravingTopDown" serializeAs="String">
+        <value>True</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
@@ -1349,42 +1349,54 @@
     </EmbeddedResource>
     <EmbeddedResource Include="MachineControl\ControlProbing.ar.resx">
       <DependentUpon>ControlProbing.cs</DependentUpon>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="MachineControl\ControlProbing.cs.resx">
       <DependentUpon>ControlProbing.cs</DependentUpon>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="MachineControl\ControlProbing.de-DE.resx">
       <DependentUpon>ControlProbing.cs</DependentUpon>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="MachineControl\ControlProbing.es.resx">
       <DependentUpon>ControlProbing.cs</DependentUpon>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="MachineControl\ControlProbing.fr.resx">
       <DependentUpon>ControlProbing.cs</DependentUpon>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="MachineControl\ControlProbing.it.resx">
       <DependentUpon>ControlProbing.cs</DependentUpon>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="MachineControl\ControlProbing.ja.resx">
       <DependentUpon>ControlProbing.cs</DependentUpon>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="MachineControl\ControlProbing.pl.resx">
       <DependentUpon>ControlProbing.cs</DependentUpon>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="MachineControl\ControlProbing.pt.resx">
       <DependentUpon>ControlProbing.cs</DependentUpon>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="MachineControl\ControlProbing.resx">
       <DependentUpon>ControlProbing.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="MachineControl\ControlProbing.ru.resx">
       <DependentUpon>ControlProbing.cs</DependentUpon>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="MachineControl\ControlProbing.tr.resx">
       <DependentUpon>ControlProbing.cs</DependentUpon>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="MachineControl\ControlProbing.zh-CN.resx">
       <DependentUpon>ControlProbing.cs</DependentUpon>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="MachineControl\ControlProcessAutomation.ar.resx">
       <DependentUpon>ControlProcessAutomation.cs</DependentUpon>