Skip to content

Commit 23acc0c

Browse files
timschneidertimschneider
committed
changed tapulator and revert z lift
- changed tabulator and space usage in file - revert change milling z lift after milling
1 parent 3e356ef commit 23acc0c

File tree

2 files changed

+36
-34
lines changed

2 files changed

+36
-34
lines changed

‎.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
2+
mill-outlines_v9.0.ulp

‎mill-outlines.ulp

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1811,25 +1811,25 @@ string getMachineCoordinate( real coord ) {
18111811
string coordString = "";
18121812
switch(CNCmillResolution) { // 2011-02-02
18131813
case Res32 : CNCsolution = 100;
1814-
sprintf(coordString, "%05.0f", coord * CNCsolution);
1815-
break;
1814+
sprintf(coordString, "%05.0f", coord * CNCsolution);
1815+
break;
18161816
case Res33 : CNCsolution = 1000;
18171817
sprintf(coordString, "%06.0f", coord * CNCsolution);
1818-
break;
1818+
break;
18191819
case Res34 : CNCsolution = 10000;
18201820
sprintf(coordString, "%07.0f", coord * CNCsolution);
1821-
break;
1821+
break;
18221822
case Res3_2 : CNCsolution = 1; // 2011-02-03
18231823
sprintf(coordString, "%05.2f", coord * CNCsolution);
1824-
break;
1824+
break;
18251825
case Res3_3 : CNCsolution = 1;
18261826
sprintf(coordString, "%06.3f", coord * CNCsolution);
1827-
break;
1827+
break;
18281828
case Res3_4 : CNCsolution = 1;
18291829
sprintf(coordString, "%07.4f", coord * CNCsolution);
1830-
break;
1830+
break;
18311831
}
1832-
1832+
18331833
return coordString;
18341834
}
18351835

@@ -1862,7 +1862,7 @@ void endlineCnc( int x2, int y2) {
18621862
}
18631863

18641864
void fullineCnc( int x1, int y1, int x2, int y2) {
1865-
printf("G00 X%s Y%s F%.0f\nG01 Z%s F%.0f\nG01 X%s Y%s F%.0f\nG00 Z%s F%.0f\n",
1865+
printf("G00 X%s Y%s F%.0f\nG01 Z%s F%.0f\nG01 X%s Y%s F%.0f\nG00 Z%s F%.0f\n",
18661866
getMachineCoordinate(Mirror * u2mm(x1 + Mill_OffsetX) + u2mm(MillMirr_Offset)),
18671867
getMachineCoordinate(u2mm(y1 + Ref_null_offsetY)), Fast_vel * CNCrevolution,
18681868
getMachineCoordinate(Actualmilldeep), Drill_Vel * CNCrevolution, // Z-Achse eintauchen
@@ -2098,16 +2098,16 @@ void CircleDraw(int centerx, int centery, int diam, real drilldiamround, int dri
20982098
case devCNC:
20992099
// for CNC 1. Start point arc,
21002100
// 2. Center point arc
2101-
printf("G00 X%s Y%s\nG01 Z%s\n",
2102-
getMachineCoordinate(Mirror * (u2mm((centerx + diam / 2 - tool_diameter / 2) + Mill_OffsetX)) + u2mm(MillMirr_Offset)),
2103-
getMachineCoordinate(u2mm(centery + Ref_null_offsetY)),
2104-
getMachineCoordinate(Actualmilldeep)
2105-
);
2106-
printf("G03 X%s Y%s\nG00 Z%s\n",
2107-
getMachineCoordinate(Mirror * u2mm(centerx + Mill_OffsetX) + u2mm(MillMirr_Offset)),
2108-
getMachineCoordinate(u2mm(centery + Ref_null_offsetY)),
2109-
getMachineCoordinate(Mill_z_safety)
2110-
);
2101+
printf("G00 X%s Y%s\nG01 Z%s\n",
2102+
getMachineCoordinate(Mirror * (u2mm((centerx + diam / 2 - tool_diameter / 2) + Mill_OffsetX)) + u2mm(MillMirr_Offset)),
2103+
getMachineCoordinate(u2mm(centery + Ref_null_offsetY)),
2104+
getMachineCoordinate(Actualmilldeep)
2105+
);
2106+
printf("G03 X%s Y%s\nG00 Z%s\n",
2107+
getMachineCoordinate(Mirror * u2mm(centerx + Mill_OffsetX) + u2mm(MillMirr_Offset)),
2108+
getMachineCoordinate(u2mm(centery + Ref_null_offsetY)),
2109+
getMachineCoordinate(Mill_z_safety)
2110+
);
21112111

21122112
break;
21132113
}
@@ -2258,15 +2258,15 @@ void DeviceDraw(int x1, int y1, int x2, int y2, int state) {
22582258
break;
22592259

22602260
case Drill_coord :
2261-
printf("G00 X%s Y%s F%.0f\n",
2262-
getMachineCoordinate(Mirror * u2mm(x2 + Mill_OffsetX) + u2mm(MillMirr_Offset)),
2263-
getMachineCoordinate(u2mm(y2 + Ref_null_offsetY)), Fast_vel * CNCrevolution
2264-
);
2265-
printf("G01 Z%s F%.0f\nG00 Z%s F%.0f\n", // langsam Eintauchen, schnell hoch 2011-01-27
2266-
getMachineCoordinate(Actualmilldeep), Drill_Vel * CNCrevolution,
2267-
getMachineCoordinate(Mill_z_safety), Fast_vel * CNCrevolution
2268-
);
2269-
2261+
printf("G00 X%s Y%s F%.0f\n",
2262+
getMachineCoordinate(Mirror * u2mm(x2 + Mill_OffsetX) + u2mm(MillMirr_Offset)),
2263+
getMachineCoordinate(u2mm(y2 + Ref_null_offsetY)), Fast_vel * CNCrevolution
2264+
);
2265+
printf("G01 Z%s F%.0f\nG00 Z%s F%.0f\n", // langsam Eintauchen, schnell hoch 2011-01-27
2266+
getMachineCoordinate(Actualmilldeep), Drill_Vel * CNCrevolution,
2267+
getMachineCoordinate(Mill_z_safety), Fast_vel * CNCrevolution
2268+
);
2269+
22702270
break;
22712271

22722272
case One_line : fullineCnc(x1, y1, x2, y2);
@@ -2751,7 +2751,7 @@ void DeviceEnd(void) {
27512751
break;
27522752

27532753
case devCNC:
2754-
printf("G00 Z%.0f\nG00 X%.0f Y%.0f\n", ParkZposition * CNCsolution, ParkXposition * CNCsolution, ParkYposition * CNCsolution);
2754+
printf("G00 Z%.0f\nG00 X%.0f Y%.0f\n", ParkZposition * CNCsolution, ParkXposition * CNCsolution, ParkYposition * CNCsolution);
27552755
printf("M05\nM30 Device ende\n"); // referenzpunkt anfahren 2011-01-27
27562756
break;
27572757
}
@@ -2905,10 +2905,10 @@ string RUN_pass(string run_Pass) {
29052905
Dim_on_off, // argv[29]
29062906
MInner_contour, // argv[30]
29072907
CNCmillResolution, // argv[31] 2011-02-02
2908-
Spindle_rpm, // argv[32] 2018-05-15
2909-
Tool_vel, // argv[33] 2018-05-15
2910-
Fast_vel, // argv[34] 2018-05-15
2911-
Drill_Vel, // argv[35] 2018-05-15
2908+
Spindle_rpm, // argv[32] 2018-05-15
2909+
Tool_vel, // argv[33] 2018-05-15
2910+
Fast_vel, // argv[34] 2018-05-15
2911+
Drill_Vel, // argv[35] 2018-05-15
29122912
Mill_z_safety, // argv[36] 2011-02-03
29132913
Drill_z_deep, // argv[37]
29142914
Z_down, // argv[38]
@@ -5121,7 +5121,7 @@ if (InPassPour) { // third run, wide isolate und copper pouring
51215121
string millout;
51225122
string s;
51235123
string coordoutline;
5124-
Actualmilldeep = Z_down*2; // 2018-05-16 two times milling deep Z Achse
5124+
Actualmilldeep = Z_down; // 2011-01-27 milling Z Achse
51255125
board(B) {
51265126
real x1 = u2mm(B.area.x1) - MillToolFree/2, y1 = u2mm(B.area.y1) - MillToolFree/2;
51275127
real x2 = u2mm(B.area.x2) + MillToolFree/2, y2 = u2mm(B.area.y2) + MillToolFree/2;

0 commit comments

Comments
 (0)