Compare commits

...

14 Commits

39 changed files with 352 additions and 22 deletions

2
.gitignore vendored
View File

@@ -1,5 +1,3 @@
examples/
axamples
.directory
/settings/settings.private.xml
*.vcsettings

View File

@@ -62,8 +62,5 @@ Nächste Schritte:
</cameraHomography>
<cameraURL></cameraURL>
<cameraTiming>0</cameraTiming>
<projectorTiming>0</projectorTiming>
<projectorWidth>0</projectorWidth>
<projectorHeight>0</projectorHeight>
<name>Epilog Zing 24 50W</name>
</laserDevice>

View File

@@ -0,0 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<laserDevice version="0">
<originBottomLeft>false</originBottomLeft>
<jobSentText>Job was sent as '$jobname'
Please:
-Close the lid
-Turn on the Ventilation
-And press 'start' on the Lasercutter $name</jobSentText>
<jobPrefix>visicut </jobPrefix>
<laserCutter class="de.thomas_oster.liblasercut.drivers.Ruida">
<baudRate>921600</baudRate>
<host>192.168.1.1</host>
<comport>auto</comport>
<flipXaxis>true</flipXaxis>
<flipYaxis>false</flipYaxis>
<BedWidth>500.0</BedWidth>
<BedHeight>300.0</BedHeight>
<LaserPowerMin>0</LaserPowerMin>
<LaserPowerMax>80</LaserPowerMax>
<MaxVectorCutSpeed>500</MaxVectorCutSpeed>
<MaxVectorMoveSpeed>500</MaxVectorMoveSpeed>
<serialTimeout>15000</serialTimeout>
<exportPath></exportPath>
<uploadMethod>USB</uploadMethod>
</laserCutter>
<cameraTiming>0</cameraTiming>
<name>OMTech Polar 50W</name>
</laserDevice>

View File

@@ -130,10 +130,10 @@ function segment7write (x,y,w,string)
*/
// each sample we test will be a square of this width in mm
var squareSize = 8;
var squareSize = 6;
// spacing between the squares, both horizontally and vertically
var squareSpacing = 2;
var squareSpacing = 1.25;
// if this is set, an outline close to the remaining content will be cut
var cutOutline = true;
@@ -242,12 +242,10 @@ function focusTest(x, y) {
function cutSpeedTest(contentXOffset, contentYOffset, powersToTest, speedsToTest) {
var fontWidth = 2;
contentYOffset += 20;
var firstPowerRowOffset = fontWidth * 3 + squareSpacing;
// TODO: improve
var speedsText = "speeds";
var speedsText = "speed";
for (var i = 0; i < speedsText.length; ++i) {
var currentCharYOffset = i * (fontWidth * 3) + firstPowerRowOffset;
segment7write(contentXOffset, contentYOffset + currentCharYOffset, fontWidth, speedsText.slice(i, i+1));
@@ -259,7 +257,7 @@ function cutSpeedTest(contentXOffset, contentYOffset, powersToTest, speedsToTest
// TODO: improve
// this text will be aligned centrally above the X axis
var firstColumnOffset = 3 * fontWidth * 1.5;
var powersText = "powers";
var powersText = "power";
segment7write(contentXOffset + firstColumnOffset + powersToTest.length / 2 * (squareSize + squareSpacing - 0) - (powersText.length / 2) * fontWidth * 1.5, 15, fontWidth, powersText);
// write column texts in the first ever row
@@ -308,7 +306,7 @@ function cutSpeedTest(contentXOffset, contentYOffset, powersToTest, speedsToTest
}
// could render at (0, 0), but then again, why not add some spacing right away?
var xOffset = 25;
var xOffset = 5;
var yOffset = 5;
if (cutOutline) {
@@ -346,4 +344,6 @@ if (!promptUserForMaxMinIntervals) {
}
}
yOffset += 20;
cutSpeedTest(xOffset, yOffset, powersToTest, speedsToTest);

View File

@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<linked-list version="0.0.0.0">
<PowerSpeedFocusFrequencyProperty>
<power>5</power>
<speed>100</speed>
<focus>0.0</focus>
<hideFocus>false</hideFocus>
<frequency>5000</frequency>
</PowerSpeedFocusFrequencyProperty>
</linked-list>

View File

@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<linked-list version="0.0.0.0">
<PowerSpeedFocusFrequencyProperty>
<power>5</power>
<speed>100</speed>
<focus>0.0</focus>
<hideFocus>false</hideFocus>
<frequency>5000</frequency>
</PowerSpeedFocusFrequencyProperty>
</linked-list>

View File

@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<linked-list version="0.0.0.0">
<PowerSpeedFocusFrequencyProperty>
<power>65</power>
<speed>100</speed>
<focus>-1.0</focus>
<hideFocus>false</hideFocus>
<frequency>5000</frequency>
</PowerSpeedFocusFrequencyProperty>
</linked-list>

View File

@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<linked-list version="0.0.0.0">
<PowerSpeedFocusFrequencyProperty>
<power>30</power>
<speed>100</speed>
<focus>-10.0</focus>
<hideFocus>false</hideFocus>
<frequency>5000</frequency>
</PowerSpeedFocusFrequencyProperty>
</linked-list>

View File

@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<linked-list version="0.0.0.0">
<com.t__oster.liblasercut.drivers.EpilogEngraveProperty>
<power>30</power>
<speed>100</speed>
<focus>0.0</focus>
<hideFocus>false</hideFocus>
<engraveBottomUp>true</engraveBottomUp>
</com.t__oster.liblasercut.drivers.EpilogEngraveProperty>
</linked-list>

View File

@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<linked-list version="0.0.0.0">
<PowerSpeedFocusFrequencyProperty>
<power>5</power>
<speed>100</speed>
<focus>0.0</focus>
<hideFocus>false</hideFocus>
<frequency>5000</frequency>
</PowerSpeedFocusFrequencyProperty>
</linked-list>

View File

@@ -2,7 +2,7 @@
<linked-list version="0.0.0.0">
<PowerSpeedFocusFrequencyProperty>
<power>8</power>
<power>5</power>
<speed>100</speed>
<focus>0.0</focus>
<hideFocus>false</hideFocus>

View File

@@ -2,7 +2,7 @@
<linked-list version="0.0.0.0">
<PowerSpeedFocusFrequencyProperty>
<power>8</power>
<power>5</power>
<speed>100</speed>
<focus>0.0</focus>
<hideFocus>false</hideFocus>

View File

@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<linked-list version="0.0.0.0">
<PowerSpeedFocusFrequencyProperty>
<power>5</power>
<speed>100</speed>
<focus>0.0</focus>
<hideFocus>false</hideFocus>
<frequency>5000</frequency>
</PowerSpeedFocusFrequencyProperty>
</linked-list>

View File

@@ -2,7 +2,7 @@
<linked-list version="0.0.0.0">
<PowerSpeedFocusFrequencyProperty>
<power>7</power>
<power>5</power>
<speed>100</speed>
<focus>0.0</focus>
<hideFocus>false</hideFocus>

View File

@@ -2,7 +2,7 @@
<linked-list version="0.0.0.0">
<PowerSpeedFocusFrequencyProperty>
<power>7</power>
<power>5</power>
<speed>100</speed>
<focus>0.0</focus>
<hideFocus>false</hideFocus>

View File

@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<linked-list version="0.0.0.0">
<PowerSpeedFocusFrequencyProperty>
<power>5</power>
<speed>100</speed>
<focus>0.0</focus>
<hideFocus>false</hideFocus>
<frequency>5000</frequency>
</PowerSpeedFocusFrequencyProperty>
</linked-list>

View File

@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<linked-list version="0.0.0.0">
<PowerSpeedFocusFrequencyProperty>
<power>80</power>
<speed>100</speed>
<focus>-3.0</focus>
<hideFocus>false</hideFocus>
<frequency>5000</frequency>
</PowerSpeedFocusFrequencyProperty>
</linked-list>

View File

@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<linked-list version="0.0.0.0">
<PowerSpeedFocusFrequencyProperty>
<power>5</power>
<speed>100</speed>
<focus>0.0</focus>
<hideFocus>false</hideFocus>
<frequency>5000</frequency>
</PowerSpeedFocusFrequencyProperty>
</linked-list>

View File

@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<linked-list version="0.0.0.0">
<com.t__oster.liblasercut.drivers.EpilogEngraveProperty>
<power>100</power>
<speed>50</speed>
<focus>0.0</focus>
<hideFocus>false</hideFocus>
<engraveBottomUp>true</engraveBottomUp>
</com.t__oster.liblasercut.drivers.EpilogEngraveProperty>
</linked-list>

View File

@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<linked-list version="0.0.0.0">
<PowerSpeedFocusFrequencyProperty>
<power>100</power>
<speed>100</speed>
<focus>-1.0</focus>
<hideFocus>false</hideFocus>
<frequency>5000</frequency>
</PowerSpeedFocusFrequencyProperty>
</linked-list>

View File

@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<linked-list version="0.0.0.0">
<com.t__oster.liblasercut.FloatMinMaxPowerSpeedFocusFrequencyProperty>
<power>80.0</power>
<speed>10.0</speed>
<focus>15.0</focus>
<frequency>5000</frequency>
<min__power>70.0</min__power>
</com.t__oster.liblasercut.FloatMinMaxPowerSpeedFocusFrequencyProperty>
</linked-list>

View File

@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<linked-list version="0.0.0.0">
<com.t__oster.liblasercut.FloatMinMaxPowerSpeedFocusFrequencyProperty>
<power>80.0</power>
<speed>100.0</speed>
<focus>14.0</focus>
<frequency>500</frequency>
<min__power>80.0</min__power>
</com.t__oster.liblasercut.FloatMinMaxPowerSpeedFocusFrequencyProperty>
</linked-list>

View File

@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<linked-list version="0.0.0.0">
<com.t__oster.liblasercut.FloatMinMaxPowerSpeedFocusFrequencyProperty>
<power>35.0</power>
<speed>100.0</speed>
<focus>14.0</focus>
<frequency>500</frequency>
<min__power>20.0</min__power>
</com.t__oster.liblasercut.FloatMinMaxPowerSpeedFocusFrequencyProperty>
</linked-list>

View File

@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<linked-list version="0.0.0.0">
<com.t__oster.liblasercut.FloatMinMaxPowerSpeedFocusFrequencyProperty>
<power>80.0</power>
<speed>4.0</speed>
<focus>14.0</focus>
<frequency>500</frequency>
<min__power>60.0</min__power>
</com.t__oster.liblasercut.FloatMinMaxPowerSpeedFocusFrequencyProperty>
</linked-list>

View File

@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<linked-list version="0.0.0.0">
<com.t__oster.liblasercut.FloatMinMaxPowerSpeedFocusFrequencyProperty>
<power>40.0</power>
<speed>100.0</speed>
<focus>14.0</focus>
<frequency>500</frequency>
<min__power>40.0</min__power>
</com.t__oster.liblasercut.FloatMinMaxPowerSpeedFocusFrequencyProperty>
</linked-list>

View File

@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<linked-list version="0.0.0.0">
<com.t__oster.liblasercut.FloatMinMaxPowerSpeedFocusFrequencyProperty>
<power>80.0</power>
<speed>8.0</speed>
<focus>14.0</focus>
<frequency>500</frequency>
<min__power>70.0</min__power>
</com.t__oster.liblasercut.FloatMinMaxPowerSpeedFocusFrequencyProperty>
</linked-list>

View File

@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<linked-list version="0.0.0.0">
<com.t__oster.liblasercut.FloatMinMaxPowerSpeedFocusFrequencyProperty>
<power>35.0</power>
<speed>100.0</speed>
<focus>13.0</focus>
<frequency>2000</frequency>
<min__power>35.0</min__power>
</com.t__oster.liblasercut.FloatMinMaxPowerSpeedFocusFrequencyProperty>
</linked-list>

View File

@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<linked-list version="0.0.0.0">
<com.t__oster.liblasercut.FloatMinMaxPowerSpeedFocusFrequencyProperty>
<power>30.0</power>
<speed>100.0</speed>
<focus>13.0</focus>
<frequency>2000</frequency>
<min__power>20.0</min__power>
</com.t__oster.liblasercut.FloatMinMaxPowerSpeedFocusFrequencyProperty>
</linked-list>

View File

@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<linked-list version="0.0.0.0">
<com.t__oster.liblasercut.FloatMinMaxPowerSpeedFocusFrequencyProperty>
<power>80.0</power>
<speed>7.0</speed>
<focus>13.0</focus>
<frequency>2000</frequency>
<min__power>70.0</min__power>
</com.t__oster.liblasercut.FloatMinMaxPowerSpeedFocusFrequencyProperty>
</linked-list>

View File

@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<linked-list version="0.0.0.0">
<com.t__oster.liblasercut.FloatMinMaxPowerSpeedFocusFrequencyProperty>
<power>40.0</power>
<speed>100.0</speed>
<focus>9.0</focus>
<frequency>2000</frequency>
<min__power>40.0</min__power>
</com.t__oster.liblasercut.FloatMinMaxPowerSpeedFocusFrequencyProperty>
</linked-list>

View File

@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<linked-list version="0.0.0.0">
<com.t__oster.liblasercut.FloatMinMaxPowerSpeedFocusFrequencyProperty>
<power>35.0</power>
<speed>100.0</speed>
<focus>9.0</focus>
<frequency>2000</frequency>
<min__power>25.0</min__power>
</com.t__oster.liblasercut.FloatMinMaxPowerSpeedFocusFrequencyProperty>
</linked-list>

View File

@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<linked-list version="0.0.0.0">
<com.t__oster.liblasercut.FloatMinMaxPowerSpeedFocusFrequencyProperty>
<power>80.0</power>
<speed>3.0</speed>
<focus>9.0</focus>
<frequency>500</frequency>
<min__power>80.0</min__power>
</com.t__oster.liblasercut.FloatMinMaxPowerSpeedFocusFrequencyProperty>
</linked-list>

View File

@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<linked-list version="0.0.0.0">
<com.t__oster.liblasercut.FloatMinMaxPowerSpeedFocusFrequencyProperty>
<power>80.0</power>
<speed>100.0</speed>
<focus>2.0</focus>
<frequency>2000</frequency>
<min__power>70.0</min__power>
</com.t__oster.liblasercut.FloatMinMaxPowerSpeedFocusFrequencyProperty>
</linked-list>

View File

@@ -2,9 +2,9 @@
<material version="0">
<description>Kunststoffplatten aus Polymethylmethacrylat (PMMA)</description>
<engraveColor>#fefefe</engraveColor>
<engraveColor>#010101</engraveColor>
<cutColor>#ff0033</cutColor>
<color>#4ab5ff</color>
<color>#83ccff</color>
<name>Acrylglas (Plexiglas, PMMA)</name>
<materialThicknesses>
<float>2.0</float>

View File

@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<material version="0">
<engraveColor>#000000</engraveColor>
<cutColor>#ff0000</cutColor>
<color>#b0ebe6</color>
<name>Polyethylenterephthalat, glykolmodifiziert (PET-G)</name>
<materialThicknesses>
<float>2.0</float>
</materialThicknesses>
</material>

View File

@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<material version="0">
<description></description>
<engraveColor>#000000</engraveColor>
<cutColor>#ff0000</cutColor>
<color>#c5c5c5</color>
<name>Polypropylen-Schaum (PP-Schaum)</name>
<materialThicknesses>
<float>20.0</float>
</materialThicknesses>
</material>

View File

@@ -8,6 +8,7 @@
<materialThicknesses>
<float>3.0</float>
<float>4.0</float>
<float>6.0</float>
<float>8.0</float>
</materialThicknesses>
</material>

View File

@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<material version="0">
<engraveColor>#000000</engraveColor>
<cutColor>#ff0000</cutColor>
<color>#ffffff</color>
<name>Wäschzwicker</name>
<materialThicknesses>
<float>14.0</float>
</materialThicknesses>
</material>

View File

@@ -4,10 +4,6 @@
<defaultMapping>schneide rot, markiere grün, ignoriere blau, graviere Rest</defaultMapping>
<disableSandbox>false</disableSandbox>
<useFilenamesForJobs>true</useFilenamesForJobs>
<labName>FabLab Altmühlfranken</labName>
<enableQRCodes>false</enableQRCodes>
<fastQRCodes>false</fastQRCodes>
<fabqrActive>false</fabqrActive>
<autoUpdateSettingsDisabled>false</autoUpdateSettingsDisabled>
<lastAutoUpdateTime>0</lastAutoUpdateTime>
<useThicknessAsFocusOffset>false</useThicknessAsFocusOffset>