diff --git a/gerbers/daisyy.g1 b/gerbers/daisyy.g1 index f498912f3c558d7c1f219a770b49378d4fe2df4c..2712b555d4d9eceff01fdf795745421230fb4618 100644 --- a/gerbers/daisyy.g1 +++ b/gerbers/daisyy.g1 @@ -1,34 +1,30 @@ %FSLAX46Y46*% %MOMM*% %ADD10C,0.200000*% -%AMPS33* +%AMPS32* 1,1,1.350000,0.000000,0.000000* % -%ADD33PS33*% -%AMPS35* +%ADD32PS32*% +%AMPS34* 1,1,1.350000,0.000000,0.000000* % -%ADD35PS35*% -%AMPS36* +%ADD34PS34*% +%AMPS35* 1,1,1.350000,0.000000,0.000000* % -%ADD36PS36*% -%AMPS23* -1,1,1.700000,0.000000,0.000000* -% -%ADD23PS23*% -%AMPS28* +%ADD35PS35*% +%AMPS27* 1,1,1.550000,0.000000,0.000000* % -%ADD28PS28*% +%ADD27PS27*% %AMPS22* 1,1,1.450000,0.000000,0.000000* % %ADD22PS22*% -%AMPS25* +%AMPS24* 1,1,1.450000,0.000000,0.000000* % -%ADD25PS25*% +%ADD24PS24*% %AMPS15* 1,1,1.450000,0.000000,0.000000* % @@ -37,14 +33,14 @@ 1,1,2.000000,0.000000,0.000000* % %ADD14PS14*% -%AMPS29* +%AMPS28* 1,1,1.300000,0.000000,0.000000* % -%ADD29PS29*% -%AMPS26* +%ADD28PS28*% +%AMPS25* 1,1,1.400000,0.000000,0.000000* % -%ADD26PS26*% +%ADD25PS25*% %AMPS20* 1,1,1.400000,0.000000,0.000000* % @@ -53,18 +49,18 @@ 1,1,1.400000,0.000000,0.000000* % %ADD19PS19*% -%AMPS34* +%AMPS33* 1,1,1.200000,0.000000,0.000000* % -%ADD34PS34*% +%ADD33PS33*% %AMPS11* 1,1,1.200000,0.000000,0.000000* % %ADD11PS11*% -%AMPS32* +%AMPS31* 1,1,1.350000,0.000000,0.000000* % -%ADD32PS32*% +%ADD31PS31*% %AMPS17* 1,1,2.600000,0.000000,0.000000* % @@ -73,10 +69,10 @@ 1,1,1.700000,0.000000,0.000000* % %ADD18PS18*% -%AMPS24* +%AMPS23* 1,1,1.700000,0.000000,0.000000* % -%ADD24PS24*% +%ADD23PS23*% %AMPS16* 1,1,1.700000,0.000000,0.000000* % @@ -89,30 +85,30 @@ 1,1,1.700000,0.000000,0.000000* % %ADD21PS21*% -%AMPS31* +%AMPS30* 1,1,1.300000,0.000000,0.000000* % -%ADD31PS31*% -%AMPS38* +%ADD30PS30*% +%AMPS37* 1,1,0.500000,0.000000,0.000000* % -%ADD38PS38*% -%AMPS27* +%ADD37PS37*% +%AMPS26* 21,1,1.550000,1.550000,0.000000,0.000000,180.000000* % -%ADD27PS27*% +%ADD26PS26*% %AMPS12* 21,1,1.200000,1.200000,0.000000,0.000000,0.000000* % %ADD12PS12*% -%AMPS37* +%AMPS36* 21,1,1.350000,1.350000,0.000000,0.000000,90.000000* % -%ADD37PS37*% -%AMPS30* +%ADD36PS36*% +%AMPS29* 21,1,1.100000,1.100000,0.000000,0.000000,0.000000* % -%ADD30PS30*% +%ADD29PS29*% G01* %LPD*% G36* @@ -32837,19 +32833,19 @@ D22* X-44180000Y18097500D03* D22* X-42180000Y18097500D03* -D23* +D18* X22540000Y-24920000D03* -D23* +D18* X16190000Y-27460000D03* -D24* +D23* X-12382500Y36830000D03* D19* X22130000Y2080000D03* D19* X22130000Y9700000D03* -D25* +D24* X54000000Y36000000D03* -D25* +D24* X54000000Y34000000D03* D15* X-53975000Y33290000D03* @@ -32865,21 +32861,21 @@ D17* X-50150000Y11667000D03* D16* X-42000000Y4167000D03* -D26* +D25* X42190000Y-1000000D03* -D26* +D25* X49810000Y-1000000D03* D15* X-53975000Y6937500D03* D15* X-53975000Y8937500D03* -D23* +D18* X-17460000Y-24920000D03* -D23* +D18* X-23810000Y-27460000D03* -D23* +D18* X-17460000Y-4920000D03* -D23* +D18* X-23810000Y-7460000D03* D13* X-53975000Y-1587500D03* @@ -32889,9 +32885,9 @@ D20* X4000000Y38810000D03* D20* X4000000Y31190000D03* -D26* +D25* X18142500Y-682500D03* -D26* +D25* X25762500Y-682500D03* D20* X28825000Y21810000D03* @@ -32913,9 +32909,9 @@ D19* X54000000Y22760000D03* D19* X54000000Y30380000D03* -D27* +D26* X39052500Y3502500D03* -D28* +D27* X39052500Y-1597500D03* D13* X11430000Y11430000D03* @@ -32925,7 +32921,7 @@ D13* X11430000Y16510000D03* D13* X11430000Y13970000D03* -D24* +D23* X-12382500Y33972500D03* D14* X27115000Y42000000D03* @@ -32963,9 +32959,9 @@ D17* X38850000Y-8667000D03* D16* X47000000Y-16167000D03* -D25* +D24* X22130000Y17050000D03* -D25* +D24* X22130000Y15050000D03* D20* X35000000Y21810000D03* @@ -33009,39 +33005,39 @@ D19* X45000000Y6190000D03* D19* X45000000Y13810000D03* -D23* +D18* X2540000Y-24920000D03* -D23* +D18* X-3810000Y-27460000D03* D20* X19130000Y9700000D03* D20* X19130000Y2080000D03* -D24* +D23* X-12382500Y26352500D03* -D29* +D28* X-1270000Y41999999D03* -D29* +D28* X1269999Y41999999D03* -D30* -X-3810000Y41999999D03* D29* +X-3810000Y41999999D03* +D28* X3809999Y41999999D03* -D31* +D30* X29155000Y-5063750D03* -D32* +D31* X36655000Y-2523750D03* -D32* +D31* X29155000Y-7603750D03* -D32* +D31* X29155000Y-2523750D03* -D33* -X29155000Y16250D03* D32* +X29155000Y16250D03* +D31* X36655000Y-7603750D03* -D32* +D31* X36655000Y16250D03* -D32* +D31* X36655000Y-5063750D03* D16* X42000000Y-36500000D03* @@ -33053,148 +33049,148 @@ D17* X38850000Y-29000000D03* D16* X47000000Y-36500000D03* -D23* +D18* X22540000Y-4920000D03* -D23* +D18* X16190000Y-7460000D03* -D34* +D33* X29750000Y3365000D03* -D34* +D33* X32250000Y3365000D03* -D35* +D34* X-7600000Y-4150000D03* -D35* +D34* X-7600000Y28900000D03* -D36* -X7600000Y41600000D03* D35* +X7600000Y41600000D03* +D34* X-7600000Y6050000D03* -D35* +D34* X-7600000Y33950000D03* -D36* -X7600000Y18750000D03* D35* +X7600000Y18750000D03* +D34* X-7600000Y16200000D03* -D36* +D35* X7600000Y16200000D03* -D36* +D35* X7600000Y33950000D03* -D36* -X7600000Y-4150000D03* D35* +X7600000Y-4150000D03* +D34* X-7600000Y41600000D03* -D36* +D35* X7600000Y31450000D03* -D36* -X7600000Y-1600000D03* D35* +X7600000Y-1600000D03* +D34* X-7600000Y36500000D03* -D36* -X7600000Y11100000D03* D35* +X7600000Y11100000D03* +D34* X-7600000Y950000D03* -D35* +D34* X-7600000Y26350000D03* -D36* -X7600000Y8550000D03* D35* +X7600000Y8550000D03* +D34* X-7600000Y39050000D03* -D35* +D34* X-7600000Y-1600000D03* -D36* -X7600000Y28900000D03* D35* +X7600000Y28900000D03* +D34* X-7600000Y8550000D03* -D36* +D35* X7600000Y6050000D03* -D37* -X7600000Y44150000D03* D36* -X7600000Y36500000D03* +X7600000Y44150000D03* D35* +X7600000Y36500000D03* +D34* X-7600000Y3500000D03* -D35* +D34* X-7600000Y21250000D03* -D36* +D35* X7600000Y26350000D03* -D36* +D35* X7600000Y950000D03* -D36* +D35* X7600000Y21250000D03* -D36* -X7600000Y13650000D03* D35* +X7600000Y13650000D03* +D34* X-7600000Y31450000D03* -D35* +D34* X-7600000Y13650000D03* -D36* +D35* X7600000Y3500000D03* -D36* -X7600000Y39050000D03* D35* +X7600000Y39050000D03* +D34* X-7600000Y18750000D03* -D36* -X7600000Y23800000D03* D35* +X7600000Y23800000D03* +D34* X-7600000Y23800000D03* -D35* +D34* X-7600000Y44150000D03* -D35* +D34* X-7600000Y11100000D03* -D23* +D18* X2540000Y-4920000D03* -D23* +D18* X-3810000Y-7460000D03* -D38* +D37* X-53411409Y20073909D03* -D38* +D37* X-13970000Y-2857500D03* -D38* +D37* X32659Y15032659D03* -D38* +D37* X4127500Y26352500D03* -D38* +D37* X4400020Y23812500D03* -D38* +D37* X4127500Y29527500D03* -D38* +D37* X-4445000Y16510000D03* -D38* +D37* X9400000Y3400000D03* -D38* +D37* X6350000Y27622500D03* -D38* +D37* X31030000Y7000000D03* -D38* +D37* X19453730Y45475020D03* -D38* +D37* X-2151091Y17216409D03* -D38* +D37* X-11000000Y-2000000D03* -D38* +D37* X6032500Y22542500D03* -D38* +D37* X-13000000Y-4000000D03* -D38* +D37* X35560000Y8002500D03* -D38* +D37* X-50165000Y20002500D03* -D38* +D37* X-2857500Y18097500D03* -D38* +D37* X-52387500Y18097500D03* -D38* +D37* X-13017500Y-317500D03* -D38* +D37* X-12382500Y-1270000D03* -D38* +D37* X3492500Y11430000D03* -D38* +D37* X6032500Y25082500D03* -D38* +D37* X-47307500Y20002500D03* -D38* +D37* X35085000Y6190000D03* -D38* +D37* X-3563909Y15803591D03* M02* diff --git a/gerbers/daisyy.g2 b/gerbers/daisyy.g2 index 2befe8a12acbdf290c258bb86d4838cc48ce0ad1..2f99108fd927c81bba76c4308f1b9f1d6cc74449 100644 --- a/gerbers/daisyy.g2 +++ b/gerbers/daisyy.g2 @@ -1,34 +1,30 @@ %FSLAX46Y46*% %MOMM*% %ADD10C,0.200000*% -%AMPS33* +%AMPS32* 1,1,1.350000,0.000000,0.000000* % -%ADD33PS33*% -%AMPS35* +%ADD32PS32*% +%AMPS34* 1,1,1.350000,0.000000,0.000000* % -%ADD35PS35*% -%AMPS36* +%ADD34PS34*% +%AMPS35* 1,1,1.350000,0.000000,0.000000* % -%ADD36PS36*% -%AMPS23* -1,1,1.700000,0.000000,0.000000* -% -%ADD23PS23*% -%AMPS28* +%ADD35PS35*% +%AMPS27* 1,1,1.550000,0.000000,0.000000* % -%ADD28PS28*% +%ADD27PS27*% %AMPS22* 1,1,1.450000,0.000000,0.000000* % %ADD22PS22*% -%AMPS25* +%AMPS24* 1,1,1.450000,0.000000,0.000000* % -%ADD25PS25*% +%ADD24PS24*% %AMPS15* 1,1,1.450000,0.000000,0.000000* % @@ -37,14 +33,14 @@ 1,1,2.000000,0.000000,0.000000* % %ADD14PS14*% -%AMPS29* +%AMPS28* 1,1,1.300000,0.000000,0.000000* % -%ADD29PS29*% -%AMPS26* +%ADD28PS28*% +%AMPS25* 1,1,1.400000,0.000000,0.000000* % -%ADD26PS26*% +%ADD25PS25*% %AMPS20* 1,1,1.400000,0.000000,0.000000* % @@ -53,18 +49,18 @@ 1,1,1.400000,0.000000,0.000000* % %ADD19PS19*% -%AMPS34* +%AMPS33* 1,1,1.200000,0.000000,0.000000* % -%ADD34PS34*% +%ADD33PS33*% %AMPS11* 1,1,1.200000,0.000000,0.000000* % %ADD11PS11*% -%AMPS32* +%AMPS31* 1,1,1.350000,0.000000,0.000000* % -%ADD32PS32*% +%ADD31PS31*% %AMPS17* 1,1,2.600000,0.000000,0.000000* % @@ -73,10 +69,10 @@ 1,1,1.700000,0.000000,0.000000* % %ADD18PS18*% -%AMPS24* +%AMPS23* 1,1,1.700000,0.000000,0.000000* % -%ADD24PS24*% +%ADD23PS23*% %AMPS16* 1,1,1.700000,0.000000,0.000000* % @@ -89,30 +85,30 @@ 1,1,1.700000,0.000000,0.000000* % %ADD21PS21*% -%AMPS31* +%AMPS30* 1,1,1.300000,0.000000,0.000000* % -%ADD31PS31*% -%AMPS38* +%ADD30PS30*% +%AMPS37* 1,1,0.500000,0.000000,0.000000* % -%ADD38PS38*% -%AMPS27* +%ADD37PS37*% +%AMPS26* 21,1,1.550000,1.550000,0.000000,0.000000,180.000000* % -%ADD27PS27*% +%ADD26PS26*% %AMPS12* 21,1,1.200000,1.200000,0.000000,0.000000,0.000000* % %ADD12PS12*% -%AMPS37* +%AMPS36* 21,1,1.350000,1.350000,0.000000,0.000000,90.000000* % -%ADD37PS37*% -%AMPS30* +%ADD36PS36*% +%AMPS29* 21,1,1.100000,1.100000,0.000000,0.000000,0.000000* % -%ADD30PS30*% +%ADD29PS29*% G01* %LPD*% G36* @@ -34064,19 +34060,19 @@ D22* X-44180000Y18097500D03* D22* X-42180000Y18097500D03* -D23* +D18* X22540000Y-24920000D03* -D23* +D18* X16190000Y-27460000D03* -D24* +D23* X-12382500Y36830000D03* D19* X22130000Y2080000D03* D19* X22130000Y9700000D03* -D25* +D24* X54000000Y36000000D03* -D25* +D24* X54000000Y34000000D03* D15* X-53975000Y33290000D03* @@ -34092,21 +34088,21 @@ D17* X-50150000Y11667000D03* D16* X-42000000Y4167000D03* -D26* +D25* X42190000Y-1000000D03* -D26* +D25* X49810000Y-1000000D03* D15* X-53975000Y6937500D03* D15* X-53975000Y8937500D03* -D23* +D18* X-17460000Y-24920000D03* -D23* +D18* X-23810000Y-27460000D03* -D23* +D18* X-17460000Y-4920000D03* -D23* +D18* X-23810000Y-7460000D03* D13* X-53975000Y-1587500D03* @@ -34116,9 +34112,9 @@ D20* X4000000Y38810000D03* D20* X4000000Y31190000D03* -D26* +D25* X18142500Y-682500D03* -D26* +D25* X25762500Y-682500D03* D20* X28825000Y21810000D03* @@ -34140,9 +34136,9 @@ D19* X54000000Y22760000D03* D19* X54000000Y30380000D03* -D27* +D26* X39052500Y3502500D03* -D28* +D27* X39052500Y-1597500D03* D13* X11430000Y11430000D03* @@ -34152,7 +34148,7 @@ D13* X11430000Y16510000D03* D13* X11430000Y13970000D03* -D24* +D23* X-12382500Y33972500D03* D14* X27115000Y42000000D03* @@ -34190,9 +34186,9 @@ D17* X38850000Y-8667000D03* D16* X47000000Y-16167000D03* -D25* +D24* X22130000Y17050000D03* -D25* +D24* X22130000Y15050000D03* D20* X35000000Y21810000D03* @@ -34236,39 +34232,39 @@ D19* X45000000Y6190000D03* D19* X45000000Y13810000D03* -D23* +D18* X2540000Y-24920000D03* -D23* +D18* X-3810000Y-27460000D03* D20* X19130000Y9700000D03* D20* X19130000Y2080000D03* -D24* +D23* X-12382500Y26352500D03* -D29* +D28* X-1270000Y41999999D03* -D29* +D28* X1269999Y41999999D03* -D30* -X-3810000Y41999999D03* D29* +X-3810000Y41999999D03* +D28* X3809999Y41999999D03* -D31* +D30* X29155000Y-5063750D03* -D32* +D31* X36655000Y-2523750D03* -D32* +D31* X29155000Y-7603750D03* -D32* +D31* X29155000Y-2523750D03* -D33* -X29155000Y16250D03* D32* +X29155000Y16250D03* +D31* X36655000Y-7603750D03* -D32* +D31* X36655000Y16250D03* -D32* +D31* X36655000Y-5063750D03* D16* X42000000Y-36500000D03* @@ -34280,148 +34276,148 @@ D17* X38850000Y-29000000D03* D16* X47000000Y-36500000D03* -D23* +D18* X22540000Y-4920000D03* -D23* +D18* X16190000Y-7460000D03* -D34* +D33* X29750000Y3365000D03* -D34* +D33* X32250000Y3365000D03* -D35* +D34* X-7600000Y-4150000D03* -D35* +D34* X-7600000Y28900000D03* -D36* -X7600000Y41600000D03* D35* +X7600000Y41600000D03* +D34* X-7600000Y6050000D03* -D35* +D34* X-7600000Y33950000D03* -D36* -X7600000Y18750000D03* D35* +X7600000Y18750000D03* +D34* X-7600000Y16200000D03* -D36* +D35* X7600000Y16200000D03* -D36* +D35* X7600000Y33950000D03* -D36* -X7600000Y-4150000D03* D35* +X7600000Y-4150000D03* +D34* X-7600000Y41600000D03* -D36* +D35* X7600000Y31450000D03* -D36* -X7600000Y-1600000D03* D35* +X7600000Y-1600000D03* +D34* X-7600000Y36500000D03* -D36* -X7600000Y11100000D03* D35* +X7600000Y11100000D03* +D34* X-7600000Y950000D03* -D35* +D34* X-7600000Y26350000D03* -D36* -X7600000Y8550000D03* D35* +X7600000Y8550000D03* +D34* X-7600000Y39050000D03* -D35* +D34* X-7600000Y-1600000D03* -D36* -X7600000Y28900000D03* D35* +X7600000Y28900000D03* +D34* X-7600000Y8550000D03* -D36* +D35* X7600000Y6050000D03* -D37* -X7600000Y44150000D03* D36* -X7600000Y36500000D03* +X7600000Y44150000D03* D35* +X7600000Y36500000D03* +D34* X-7600000Y3500000D03* -D35* +D34* X-7600000Y21250000D03* -D36* +D35* X7600000Y26350000D03* -D36* +D35* X7600000Y950000D03* -D36* +D35* X7600000Y21250000D03* -D36* -X7600000Y13650000D03* D35* +X7600000Y13650000D03* +D34* X-7600000Y31450000D03* -D35* +D34* X-7600000Y13650000D03* -D36* +D35* X7600000Y3500000D03* -D36* -X7600000Y39050000D03* D35* +X7600000Y39050000D03* +D34* X-7600000Y18750000D03* -D36* -X7600000Y23800000D03* D35* +X7600000Y23800000D03* +D34* X-7600000Y23800000D03* -D35* +D34* X-7600000Y44150000D03* -D35* +D34* X-7600000Y11100000D03* -D23* +D18* X2540000Y-4920000D03* -D23* +D18* X-3810000Y-7460000D03* -D38* +D37* X-53411409Y20073909D03* -D38* +D37* X-13970000Y-2857500D03* -D38* +D37* X32659Y15032659D03* -D38* +D37* X4127500Y26352500D03* -D38* +D37* X4400020Y23812500D03* -D38* +D37* X4127500Y29527500D03* -D38* +D37* X-4445000Y16510000D03* -D38* +D37* X9400000Y3400000D03* -D38* +D37* X6350000Y27622500D03* -D38* +D37* X31030000Y7000000D03* -D38* +D37* X19453730Y45475020D03* -D38* +D37* X-2151091Y17216409D03* -D38* +D37* X-11000000Y-2000000D03* -D38* +D37* X6032500Y22542500D03* -D38* +D37* X-13000000Y-4000000D03* -D38* +D37* X35560000Y8002500D03* -D38* +D37* X-50165000Y20002500D03* -D38* +D37* X-2857500Y18097500D03* -D38* +D37* X-52387500Y18097500D03* -D38* +D37* X-13017500Y-317500D03* -D38* +D37* X-12382500Y-1270000D03* -D38* +D37* X3492500Y11430000D03* -D38* +D37* X6032500Y25082500D03* -D38* +D37* X-47307500Y20002500D03* -D38* +D37* X35085000Y6190000D03* -D38* +D37* X-3563909Y15803591D03* M02* diff --git a/gerbers/daisyy.gbl b/gerbers/daisyy.gbl index 62a0bc0aef9e2ad1384ee1ebdf66b8d88ea06717..9e6837a93b5421088602e1e242816d5819e1cf38 100644 --- a/gerbers/daisyy.gbl +++ b/gerbers/daisyy.gbl @@ -4,34 +4,30 @@ %ADD13C,0.600000*% %ADD12C,0.800000*% %ADD11C,1.000000*% -%AMPS45* +%AMPS44* 1,1,1.350000,0.000000,0.000000* % -%ADD45PS45*% -%AMPS47* +%ADD44PS44*% +%AMPS46* 1,1,1.350000,0.000000,0.000000* % -%ADD47PS47*% -%AMPS48* +%ADD46PS46*% +%AMPS47* 1,1,1.350000,0.000000,0.000000* % -%ADD48PS48*% -%AMPS29* -1,1,1.700000,0.000000,0.000000* -% -%ADD29PS29*% -%AMPS34* +%ADD47PS47*% +%AMPS33* 1,1,1.550000,0.000000,0.000000* % -%ADD34PS34*% +%ADD33PS33*% %AMPS27* 1,1,1.450000,0.000000,0.000000* % %ADD27PS27*% -%AMPS31* +%AMPS30* 1,1,1.450000,0.000000,0.000000* % -%ADD31PS31*% +%ADD30PS30*% %AMPS19* 1,1,1.450000,0.000000,0.000000* % @@ -40,14 +36,14 @@ 1,1,2.000000,0.000000,0.000000* % %ADD17PS17*% -%AMPS41* +%AMPS40* 1,1,1.300000,0.000000,0.000000* % -%ADD41PS41*% -%AMPS32* +%ADD40PS40*% +%AMPS31* 1,1,1.400000,0.000000,0.000000* % -%ADD32PS32*% +%ADD31PS31*% %AMPS24* 1,1,1.400000,0.000000,0.000000* % @@ -56,18 +52,18 @@ 1,1,1.400000,0.000000,0.000000* % %ADD23PS23*% -%AMPS46* +%AMPS45* 1,1,1.200000,0.000000,0.000000* % -%ADD46PS46*% +%ADD45PS45*% %AMPS14* 1,1,1.200000,0.000000,0.000000* % %ADD14PS14*% -%AMPS44* +%AMPS43* 1,1,1.350000,0.000000,0.000000* % -%ADD44PS44*% +%ADD43PS43*% %AMPS21* 1,1,2.600000,0.000000,0.000000* % @@ -76,10 +72,10 @@ 1,1,1.700000,0.000000,0.000000* % %ADD22PS22*% -%AMPS30* +%AMPS29* 1,1,1.700000,0.000000,0.000000* % -%ADD30PS30*% +%ADD29PS29*% %AMPS20* 1,1,1.700000,0.000000,0.000000* % @@ -92,23 +88,23 @@ 1,1,1.700000,0.000000,0.000000* % %ADD26PS26*% -%AMPS43* +%AMPS42* 1,1,1.300000,0.000000,0.000000* % -%ADD43PS43*% -%AMPS39* +%ADD42PS42*% +%AMPS38* 21,1,0.600000,1.500000,0.000000,0.000000,270.000000* % -%ADD39PS39*% -%AMPS40* +%ADD38PS38*% +%AMPS39* 21,1,0.600000,1.500000,0.000000,0.000000,90.000000* % -%ADD40PS40*% -%AMPS50* +%ADD39PS39*% +%AMPS49* 1,1,0.500000,0.000000,0.000000* % -%ADD50PS50*% -%AMPS36* +%ADD49PS49*% +%AMPS35* 1,1,0.340000,-0.330000,0.180000* 1,1,0.340000,0.330000,-0.180000* 1,1,0.340000,0.330000,0.180000* @@ -116,7 +112,7 @@ 21,1,0.360000,1.000000,0.000000,0.000000,270.000000* 1,1,0.340000,-0.330000,-0.180000* % -%ADD36PS36*% +%ADD35PS35*% %AMPS28* 1,1,0.340000,0.330000,-0.180000* 1,1,0.340000,-0.330000,0.180000* @@ -135,7 +131,7 @@ 1,1,0.340000,0.180000,-0.480000* % %ADD25PS25*% -%AMPS38* +%AMPS37* 1,1,0.340000,-0.480000,0.180000* 1,1,0.340000,0.480000,-0.180000* 1,1,0.340000,0.480000,0.180000* @@ -143,7 +139,7 @@ 21,1,0.360000,1.300000,0.000000,0.000000,270.000000* 1,1,0.340000,-0.480000,-0.180000* % -%ADD38PS38*% +%ADD37PS37*% %AMPS18* 1,1,0.340000,0.180000,0.480000* 1,1,0.340000,-0.180000,-0.480000* @@ -153,7 +149,7 @@ 1,1,0.340000,-0.180000,0.480000* % %ADD18PS18*% -%AMPS35* +%AMPS34* 1,1,0.340000,0.480000,-0.180000* 1,1,0.340000,-0.480000,0.180000* 1,1,0.340000,-0.480000,-0.180000* @@ -161,8 +157,8 @@ 21,1,0.360000,1.300000,0.000000,0.000000,90.000000* 1,1,0.340000,0.480000,0.180000* % -%ADD35PS35*% -%AMPS37* +%ADD34PS34*% +%AMPS36* 1,1,0.360000,-0.220000,-0.195000* 1,1,0.360000,0.220000,0.195000* 1,1,0.360000,-0.220000,0.195000* @@ -170,23 +166,23 @@ 21,1,0.440000,0.750000,0.000000,0.000000,360.000000* 1,1,0.360000,0.220000,-0.195000* % -%ADD37PS37*% -%AMPS33* +%ADD36PS36*% +%AMPS32* 21,1,1.550000,1.550000,0.000000,0.000000,180.000000* % -%ADD33PS33*% +%ADD32PS32*% %AMPS15* 21,1,1.200000,1.200000,0.000000,0.000000,0.000000* % %ADD15PS15*% -%AMPS49* +%AMPS48* 21,1,1.350000,1.350000,0.000000,0.000000,90.000000* % -%ADD49PS49*% -%AMPS42* +%ADD48PS48*% +%AMPS41* 21,1,1.100000,1.100000,0.000000,0.000000,0.000000* % -%ADD42PS42*% +%ADD41PS41*% G01* %LPD*% G36* @@ -52989,19 +52985,19 @@ D28* X-51365000Y20640000D03* D28* X-51365000Y22540000D03* -D29* +D22* X22540000Y-24920000D03* -D29* +D22* X16190000Y-27460000D03* -D30* +D29* X-12382500Y36830000D03* D23* X22130000Y2080000D03* D23* X22130000Y9700000D03* -D31* +D30* X54000000Y36000000D03* -D31* +D30* X54000000Y34000000D03* D19* X-53975000Y33290000D03* @@ -53017,21 +53013,21 @@ D21* X-50150000Y11667000D03* D20* X-42000000Y4167000D03* -D32* +D31* X42190000Y-1000000D03* -D32* +D31* X49810000Y-1000000D03* D19* X-53975000Y6937500D03* D19* X-53975000Y8937500D03* -D29* +D22* X-17460000Y-24920000D03* -D29* +D22* X-23810000Y-27460000D03* -D29* +D22* X-17460000Y-4920000D03* -D29* +D22* X-23810000Y-7460000D03* D16* X-53975000Y-1587500D03* @@ -53041,9 +53037,9 @@ D24* X4000000Y38810000D03* D24* X4000000Y31190000D03* -D32* +D31* X18142500Y-682500D03* -D32* +D31* X25762500Y-682500D03* D24* X28825000Y21810000D03* @@ -53065,9 +53061,9 @@ D23* X54000000Y22760000D03* D23* X54000000Y30380000D03* -D33* +D32* X39052500Y3502500D03* -D34* +D33* X39052500Y-1597500D03* D16* X11430000Y11430000D03* @@ -53077,7 +53073,7 @@ D16* X11430000Y16510000D03* D16* X11430000Y13970000D03* -D30* +D29* X-12382500Y33972500D03* D17* X27115000Y42000000D03* @@ -53101,9 +53097,9 @@ D21* X38850000Y11667000D03* D20* X47000000Y4167000D03* -D35* +D34* X-50482500Y19047500D03* -D35* +D34* X-50482500Y17147500D03* D24* X1000000Y38810000D03* @@ -53119,43 +53115,43 @@ D21* X38850000Y-8667000D03* D20* X47000000Y-16167000D03* -D36* +D35* X-54857500Y18097500D03* -D36* +D35* X-52457500Y19047500D03* -D36* +D35* X-52457500Y17147500D03* -D31* +D30* X22130000Y17050000D03* -D31* +D30* X22130000Y15050000D03* -D37* +D36* X-54725000Y30277500D03* -D37* +D36* X-53225000Y30277500D03* D24* X35000000Y21810000D03* D24* X35000000Y14190000D03* -D38* +D37* X-48260000Y17147500D03* -D38* +D37* X-48260000Y19047500D03* -D39* +D38* X28300000Y7365000D03* -D39* +D38* X28300000Y9905000D03* -D40* -X33700000Y7365000D03* D39* +X33700000Y7365000D03* +D38* X28300000Y6095000D03* -D39* +D38* X28300000Y8635000D03* -D40* +D39* X33700000Y9905000D03* -D40* +D39* X33700000Y8635000D03* -D40* +D39* X33700000Y6095000D03* D23* X32000000Y-17810000D03* @@ -53195,39 +53191,39 @@ D23* X45000000Y6190000D03* D23* X45000000Y13810000D03* -D29* +D22* X2540000Y-24920000D03* -D29* +D22* X-3810000Y-27460000D03* D24* X19130000Y9700000D03* D24* X19130000Y2080000D03* -D30* +D29* X-12382500Y26352500D03* -D41* +D40* X-1270000Y41999999D03* -D41* +D40* X1269999Y41999999D03* -D42* -X-3810000Y41999999D03* D41* +X-3810000Y41999999D03* +D40* X3809999Y41999999D03* -D43* +D42* X29155000Y-5063750D03* -D44* +D43* X36655000Y-2523750D03* -D44* +D43* X29155000Y-7603750D03* -D44* +D43* X29155000Y-2523750D03* -D45* -X29155000Y16250D03* D44* +X29155000Y16250D03* +D43* X36655000Y-7603750D03* -D44* +D43* X36655000Y16250D03* -D44* +D43* X36655000Y-5063750D03* D20* X42000000Y-36500000D03* @@ -53239,148 +53235,148 @@ D21* X38850000Y-29000000D03* D20* X47000000Y-36500000D03* -D29* +D22* X22540000Y-4920000D03* -D29* +D22* X16190000Y-7460000D03* -D46* +D45* X29750000Y3365000D03* -D46* +D45* X32250000Y3365000D03* -D47* +D46* X-7600000Y-4150000D03* -D47* +D46* X-7600000Y28900000D03* -D48* -X7600000Y41600000D03* D47* +X7600000Y41600000D03* +D46* X-7600000Y6050000D03* -D47* +D46* X-7600000Y33950000D03* -D48* -X7600000Y18750000D03* D47* +X7600000Y18750000D03* +D46* X-7600000Y16200000D03* -D48* +D47* X7600000Y16200000D03* -D48* +D47* X7600000Y33950000D03* -D48* -X7600000Y-4150000D03* D47* +X7600000Y-4150000D03* +D46* X-7600000Y41600000D03* -D48* +D47* X7600000Y31450000D03* -D48* -X7600000Y-1600000D03* D47* +X7600000Y-1600000D03* +D46* X-7600000Y36500000D03* -D48* -X7600000Y11100000D03* D47* +X7600000Y11100000D03* +D46* X-7600000Y950000D03* -D47* +D46* X-7600000Y26350000D03* -D48* -X7600000Y8550000D03* D47* +X7600000Y8550000D03* +D46* X-7600000Y39050000D03* -D47* +D46* X-7600000Y-1600000D03* -D48* -X7600000Y28900000D03* D47* +X7600000Y28900000D03* +D46* X-7600000Y8550000D03* -D48* +D47* X7600000Y6050000D03* -D49* -X7600000Y44150000D03* D48* -X7600000Y36500000D03* +X7600000Y44150000D03* D47* +X7600000Y36500000D03* +D46* X-7600000Y3500000D03* -D47* +D46* X-7600000Y21250000D03* -D48* +D47* X7600000Y26350000D03* -D48* +D47* X7600000Y950000D03* -D48* +D47* X7600000Y21250000D03* -D48* -X7600000Y13650000D03* D47* +X7600000Y13650000D03* +D46* X-7600000Y31450000D03* -D47* +D46* X-7600000Y13650000D03* -D48* +D47* X7600000Y3500000D03* -D48* -X7600000Y39050000D03* D47* +X7600000Y39050000D03* +D46* X-7600000Y18750000D03* -D48* -X7600000Y23800000D03* D47* +X7600000Y23800000D03* +D46* X-7600000Y23800000D03* -D47* +D46* X-7600000Y44150000D03* -D47* +D46* X-7600000Y11100000D03* -D29* +D22* X2540000Y-4920000D03* -D29* +D22* X-3810000Y-7460000D03* -D50* +D49* X-53411409Y20073909D03* -D50* +D49* X-13970000Y-2857500D03* -D50* +D49* X32659Y15032659D03* -D50* +D49* X4127500Y26352500D03* -D50* +D49* X4400020Y23812500D03* -D50* +D49* X4127500Y29527500D03* -D50* +D49* X-4445000Y16510000D03* -D50* +D49* X9400000Y3400000D03* -D50* +D49* X6350000Y27622500D03* -D50* +D49* X31030000Y7000000D03* -D50* +D49* X19453730Y45475020D03* -D50* +D49* X-2151091Y17216409D03* -D50* +D49* X-11000000Y-2000000D03* -D50* +D49* X6032500Y22542500D03* -D50* +D49* X-13000000Y-4000000D03* -D50* +D49* X35560000Y8002500D03* -D50* +D49* X-50165000Y20002500D03* -D50* +D49* X-2857500Y18097500D03* -D50* +D49* X-52387500Y18097500D03* -D50* +D49* X-13017500Y-317500D03* -D50* +D49* X-12382500Y-1270000D03* -D50* +D49* X3492500Y11430000D03* -D50* +D49* X6032500Y25082500D03* -D50* +D49* X-47307500Y20002500D03* -D50* +D49* X35085000Y6190000D03* -D50* +D49* X-3563909Y15803591D03* M02* diff --git a/gerbers/daisyy.gbs b/gerbers/daisyy.gbs index a9ceb0b54aad3ab9c23b25ebd6f9a2c60073e03b..9faa06998f1b171904b37e422fabd2913db7ceec 100644 --- a/gerbers/daisyy.gbs +++ b/gerbers/daisyy.gbs @@ -1,33 +1,29 @@ %FSLAX46Y46*% %MOMM*% -%AMPS44* +%AMPS43* 1,1,1.550000,0.000000,0.000000* % -%ADD44PS44*% -%AMPS46* +%ADD43PS43*% +%AMPS45* 1,1,1.550000,0.000000,0.000000* % -%ADD46PS46*% -%AMPS47* +%ADD45PS45*% +%AMPS46* 1,1,1.550000,0.000000,0.000000* % -%ADD47PS47*% -%AMPS26* -1,1,1.900000,0.000000,0.000000* -% -%ADD26PS26*% -%AMPS33* +%ADD46PS46*% +%AMPS32* 1,1,1.750000,0.000000,0.000000* % -%ADD33PS33*% +%ADD32PS32*% %AMPS24* 1,1,1.650000,0.000000,0.000000* % %ADD24PS24*% -%AMPS30* +%AMPS29* 1,1,1.650000,0.000000,0.000000* % -%ADD30PS30*% +%ADD29PS29*% %AMPS16* 1,1,1.650000,0.000000,0.000000* % @@ -36,14 +32,14 @@ 1,1,2.200000,0.000000,0.000000* % %ADD14PS14*% -%AMPS40* +%AMPS39* 1,1,1.500000,0.000000,0.000000* % -%ADD40PS40*% -%AMPS31* +%ADD39PS39*% +%AMPS30* 1,1,1.600000,0.000000,0.000000* % -%ADD31PS31*% +%ADD30PS30*% %AMPS21* 1,1,1.600000,0.000000,0.000000* % @@ -52,18 +48,18 @@ 1,1,1.600000,0.000000,0.000000* % %ADD20PS20*% -%AMPS45* +%AMPS44* 1,1,1.400000,0.000000,0.000000* % -%ADD45PS45*% +%ADD44PS44*% %AMPS11* 1,1,1.400000,0.000000,0.000000* % %ADD11PS11*% -%AMPS43* +%AMPS42* 1,1,1.550000,0.000000,0.000000* % -%ADD43PS43*% +%ADD42PS42*% %AMPS18* 1,1,2.800000,0.000000,0.000000* % @@ -72,10 +68,10 @@ 1,1,1.900000,0.000000,0.000000* % %ADD19PS19*% -%AMPS29* +%AMPS28* 1,1,1.900000,0.000000,0.000000* % -%ADD29PS29*% +%ADD28PS28*% %AMPS17* 1,1,1.900000,0.000000,0.000000* % @@ -88,35 +84,35 @@ 1,1,1.900000,0.000000,0.000000* % %ADD23PS23*% -%AMPS42* +%AMPS41* 1,1,1.500000,0.000000,0.000000* % -%ADD42PS42*% -%AMPS38* +%ADD41PS41*% +%AMPS37* 21,1,0.800000,1.700000,0.000000,0.000000,270.000000* % -%ADD38PS38*% -%AMPS39* +%ADD37PS37*% +%AMPS38* 21,1,0.800000,1.700000,0.000000,0.000000,90.000000* % -%ADD39PS39*% -%AMPS49* +%ADD38PS38*% +%AMPS48* 1,1,0.400000,0.000000,0.000000* % -%ADD49PS49*% -%AMPS27* +%ADD48PS48*% +%AMPS26* 1,1,4.200000,0.000000,0.000000* % -%ADD27PS27*% -%AMPS28* +%ADD26PS26*% +%AMPS27* 1,1,1.900000,0.000000,0.000000* % -%ADD28PS28*% +%ADD27PS27*% %AMPS10* 1,1,3.700000,0.000000,0.000000* % %ADD10PS10*% -%AMPS35* +%AMPS34* 1,1,0.540000,0.330000,-0.180000* 1,1,0.540000,-0.330000,0.180000* 1,1,0.540000,0.330000,0.180000* @@ -124,7 +120,7 @@ 21,1,0.900000,0.660000,0.000000,0.000000,270.000000* 21,1,0.360000,1.200000,0.000000,0.000000,270.000000* % -%ADD35PS35*% +%ADD34PS34*% %AMPS25* 1,1,0.540000,-0.330000,0.180000* 1,1,0.540000,0.330000,-0.180000* @@ -143,7 +139,7 @@ 21,1,0.360000,1.500000,0.000000,0.000000,360.000000* % %ADD22PS22*% -%AMPS37* +%AMPS36* 1,1,0.540000,0.480000,-0.180000* 1,1,0.540000,-0.480000,0.180000* 1,1,0.540000,0.480000,0.180000* @@ -151,7 +147,7 @@ 21,1,0.900000,0.960000,0.000000,0.000000,270.000000* 21,1,0.360000,1.500000,0.000000,0.000000,270.000000* % -%ADD37PS37*% +%ADD36PS36*% %AMPS15* 1,1,0.540000,-0.180000,-0.480000* 1,1,0.540000,0.180000,0.480000* @@ -161,7 +157,7 @@ 21,1,0.360000,1.500000,0.000000,0.000000,180.000000* % %ADD15PS15*% -%AMPS34* +%AMPS33* 1,1,0.540000,-0.480000,0.180000* 1,1,0.540000,0.480000,-0.180000* 1,1,0.540000,-0.480000,-0.180000* @@ -169,8 +165,8 @@ 21,1,0.900000,0.960000,0.000000,0.000000,90.000000* 21,1,0.360000,1.500000,0.000000,0.000000,90.000000* % -%ADD34PS34*% -%AMPS36* +%ADD33PS33*% +%AMPS35* 1,1,0.560000,0.220000,0.195000* 1,1,0.560000,-0.220000,-0.195000* 1,1,0.560000,-0.220000,0.195000* @@ -178,23 +174,23 @@ 21,1,1.000000,0.390000,0.000000,0.000000,360.000000* 21,1,0.440000,0.950000,0.000000,0.000000,360.000000* % -%ADD36PS36*% -%AMPS32* +%ADD35PS35*% +%AMPS31* 21,1,1.750000,1.750000,0.000000,0.000000,180.000000* % -%ADD32PS32*% +%ADD31PS31*% %AMPS12* 21,1,1.400000,1.400000,0.000000,0.000000,0.000000* % %ADD12PS12*% -%AMPS48* +%AMPS47* 21,1,1.550000,1.550000,0.000000,0.000000,90.000000* % -%ADD48PS48*% -%AMPS41* +%ADD47PS47*% +%AMPS40* 21,1,1.300000,1.300000,0.000000,0.000000,0.000000* % -%ADD41PS41*% +%ADD40PS40*% G01* %LPD*% G01* @@ -318,25 +314,25 @@ D25* X-51365000Y20640000D03* D25* X-51365000Y22540000D03* -D26* +D19* X22540000Y-24920000D03* -D27* +D26* X20000000Y-30000000D03* -D28* +D27* X15000000Y-30000000D03* -D28* +D27* X25000000Y-30000000D03* -D26* +D19* X16190000Y-27460000D03* -D29* +D28* X-12382500Y36830000D03* D20* X22130000Y2080000D03* D20* X22130000Y9700000D03* -D30* +D29* X54000000Y36000000D03* -D30* +D29* X54000000Y34000000D03* D16* X-53975000Y33290000D03* @@ -352,33 +348,33 @@ D18* X-50150000Y11667000D03* D17* X-42000000Y4167000D03* -D31* +D30* X42190000Y-1000000D03* -D31* +D30* X49810000Y-1000000D03* D16* X-53975000Y6937500D03* D16* X-53975000Y8937500D03* -D26* +D19* X-17460000Y-24920000D03* -D27* +D26* X-20000000Y-30000000D03* -D28* +D27* X-25000000Y-30000000D03* -D28* +D27* X-15000000Y-30000000D03* -D26* +D19* X-23810000Y-27460000D03* -D26* +D19* X-17460000Y-4920000D03* -D27* +D26* X-20000000Y-10000000D03* -D28* +D27* X-25000000Y-10000000D03* -D28* +D27* X-15000000Y-10000000D03* -D26* +D19* X-23810000Y-7460000D03* D13* X-53975000Y-1587500D03* @@ -388,9 +384,9 @@ D21* X4000000Y38810000D03* D21* X4000000Y31190000D03* -D31* +D30* X18142500Y-682500D03* -D31* +D30* X25762500Y-682500D03* D21* X28825000Y21810000D03* @@ -412,9 +408,9 @@ D20* X54000000Y22760000D03* D20* X54000000Y30380000D03* -D32* +D31* X39052500Y3502500D03* -D33* +D32* X39052500Y-1597500D03* D13* X11430000Y11430000D03* @@ -424,7 +420,7 @@ D13* X11430000Y16510000D03* D13* X11430000Y13970000D03* -D29* +D28* X-12382500Y33972500D03* D14* X27115000Y42000000D03* @@ -448,9 +444,9 @@ D18* X38850000Y11667000D03* D17* X47000000Y4167000D03* -D34* +D33* X-50482500Y19047500D03* -D34* +D33* X-50482500Y17147500D03* D21* X1000000Y38810000D03* @@ -466,43 +462,43 @@ D18* X38850000Y-8667000D03* D17* X47000000Y-16167000D03* -D35* +D34* X-54857500Y18097500D03* -D35* +D34* X-52457500Y19047500D03* -D35* +D34* X-52457500Y17147500D03* -D30* +D29* X22130000Y17050000D03* -D30* +D29* X22130000Y15050000D03* -D36* +D35* X-54725000Y30277500D03* -D36* +D35* X-53225000Y30277500D03* D21* X35000000Y21810000D03* D21* X35000000Y14190000D03* -D37* +D36* X-48260000Y17147500D03* -D37* +D36* X-48260000Y19047500D03* -D38* +D37* X28300000Y7365000D03* -D38* +D37* X28300000Y9905000D03* -D39* -X33700000Y7365000D03* D38* +X33700000Y7365000D03* +D37* X28300000Y6095000D03* -D38* +D37* X28300000Y8635000D03* -D39* +D38* X33700000Y9905000D03* -D39* +D38* X33700000Y8635000D03* -D39* +D38* X33700000Y6095000D03* D20* X32000000Y-17810000D03* @@ -542,45 +538,45 @@ D20* X45000000Y6190000D03* D20* X45000000Y13810000D03* -D26* +D19* X2540000Y-24920000D03* -D27* +D26* X0Y-30000000D03* -D28* +D27* X-5000000Y-30000000D03* -D28* +D27* X5000000Y-30000000D03* -D26* +D19* X-3810000Y-27460000D03* D21* X19130000Y9700000D03* D21* X19130000Y2080000D03* -D29* +D28* X-12382500Y26352500D03* -D40* +D39* X-1270000Y41999999D03* -D40* +D39* X1269999Y41999999D03* -D41* -X-3810000Y41999999D03* D40* +X-3810000Y41999999D03* +D39* X3809999Y41999999D03* -D42* +D41* X29155000Y-5063750D03* -D43* +D42* X36655000Y-2523750D03* -D43* +D42* X29155000Y-7603750D03* -D43* +D42* X29155000Y-2523750D03* -D44* -X29155000Y16250D03* D43* +X29155000Y16250D03* +D42* X36655000Y-7603750D03* -D43* +D42* X36655000Y16250D03* -D43* +D42* X36655000Y-5063750D03* D17* X42000000Y-36500000D03* @@ -592,160 +588,160 @@ D18* X38850000Y-29000000D03* D17* X47000000Y-36500000D03* -D26* +D19* X22540000Y-4920000D03* -D27* +D26* X20000000Y-10000000D03* -D28* +D27* X15000000Y-10000000D03* -D28* +D27* X25000000Y-10000000D03* -D26* +D19* X16190000Y-7460000D03* -D45* +D44* X29750000Y3365000D03* -D45* +D44* X32250000Y3365000D03* -D46* +D45* X-7600000Y-4150000D03* -D46* +D45* X-7600000Y28900000D03* -D47* -X7600000Y41600000D03* D46* +X7600000Y41600000D03* +D45* X-7600000Y6050000D03* -D46* +D45* X-7600000Y33950000D03* -D47* -X7600000Y18750000D03* D46* +X7600000Y18750000D03* +D45* X-7600000Y16200000D03* -D47* +D46* X7600000Y16200000D03* -D47* +D46* X7600000Y33950000D03* -D47* -X7600000Y-4150000D03* D46* +X7600000Y-4150000D03* +D45* X-7600000Y41600000D03* -D47* +D46* X7600000Y31450000D03* -D47* -X7600000Y-1600000D03* D46* +X7600000Y-1600000D03* +D45* X-7600000Y36500000D03* -D47* -X7600000Y11100000D03* D46* +X7600000Y11100000D03* +D45* X-7600000Y950000D03* -D46* +D45* X-7600000Y26350000D03* -D47* -X7600000Y8550000D03* D46* +X7600000Y8550000D03* +D45* X-7600000Y39050000D03* -D46* +D45* X-7600000Y-1600000D03* -D47* -X7600000Y28900000D03* D46* +X7600000Y28900000D03* +D45* X-7600000Y8550000D03* -D47* +D46* X7600000Y6050000D03* -D48* -X7600000Y44150000D03* D47* -X7600000Y36500000D03* +X7600000Y44150000D03* D46* +X7600000Y36500000D03* +D45* X-7600000Y3500000D03* -D46* +D45* X-7600000Y21250000D03* -D47* +D46* X7600000Y26350000D03* -D47* +D46* X7600000Y950000D03* -D47* +D46* X7600000Y21250000D03* -D47* -X7600000Y13650000D03* D46* +X7600000Y13650000D03* +D45* X-7600000Y31450000D03* -D46* +D45* X-7600000Y13650000D03* -D47* +D46* X7600000Y3500000D03* -D47* -X7600000Y39050000D03* D46* +X7600000Y39050000D03* +D45* X-7600000Y18750000D03* -D47* -X7600000Y23800000D03* D46* +X7600000Y23800000D03* +D45* X-7600000Y23800000D03* -D46* +D45* X-7600000Y44150000D03* -D46* +D45* X-7600000Y11100000D03* -D26* +D19* X2540000Y-4920000D03* -D27* +D26* X0Y-10000000D03* -D28* +D27* X-5000000Y-10000000D03* -D28* +D27* X5000000Y-10000000D03* -D26* +D19* X-3810000Y-7460000D03* -D49* +D48* X-53411409Y20073909D03* -D49* +D48* X-13970000Y-2857500D03* -D49* +D48* X32659Y15032659D03* -D49* +D48* X4127500Y26352500D03* -D49* +D48* X4400020Y23812500D03* -D49* +D48* X4127500Y29527500D03* -D49* +D48* X-4445000Y16510000D03* -D49* +D48* X9400000Y3400000D03* -D49* +D48* X6350000Y27622500D03* -D49* +D48* X31030000Y7000000D03* -D49* +D48* X19453730Y45475020D03* -D49* +D48* X-2151091Y17216409D03* -D49* +D48* X-11000000Y-2000000D03* -D49* +D48* X6032500Y22542500D03* -D49* +D48* X-13000000Y-4000000D03* -D49* +D48* X35560000Y8002500D03* -D49* +D48* X-50165000Y20002500D03* -D49* +D48* X-2857500Y18097500D03* -D49* +D48* X-52387500Y18097500D03* -D49* +D48* X-13017500Y-317500D03* -D49* +D48* X-12382500Y-1270000D03* -D49* +D48* X3492500Y11430000D03* -D49* +D48* X6032500Y25082500D03* -D49* +D48* X-47307500Y20002500D03* -D49* +D48* X35085000Y6190000D03* -D49* +D48* X-3563909Y15803591D03* M02* diff --git a/gerbers/daisyy.gtl b/gerbers/daisyy.gtl index b3be8c79e1fb10293254722839f616ebb1b3dd18..f3c83b6007b7452d279ff894d591f97c5e8fd811 100644 --- a/gerbers/daisyy.gtl +++ b/gerbers/daisyy.gtl @@ -2,34 +2,30 @@ %MOMM*% %ADD10C,0.200000*% %ADD11C,1.000000*% -%AMPS34* +%AMPS33* 1,1,1.350000,0.000000,0.000000* % -%ADD34PS34*% -%AMPS36* +%ADD33PS33*% +%AMPS35* 1,1,1.350000,0.000000,0.000000* % -%ADD36PS36*% -%AMPS37* +%ADD35PS35*% +%AMPS36* 1,1,1.350000,0.000000,0.000000* % -%ADD37PS37*% -%AMPS24* -1,1,1.700000,0.000000,0.000000* -% -%ADD24PS24*% -%AMPS29* +%ADD36PS36*% +%AMPS28* 1,1,1.550000,0.000000,0.000000* % -%ADD29PS29*% +%ADD28PS28*% %AMPS23* 1,1,1.450000,0.000000,0.000000* % %ADD23PS23*% -%AMPS26* +%AMPS25* 1,1,1.450000,0.000000,0.000000* % -%ADD26PS26*% +%ADD25PS25*% %AMPS16* 1,1,1.450000,0.000000,0.000000* % @@ -38,14 +34,14 @@ 1,1,2.000000,0.000000,0.000000* % %ADD15PS15*% -%AMPS30* +%AMPS29* 1,1,1.300000,0.000000,0.000000* % -%ADD30PS30*% -%AMPS27* +%ADD29PS29*% +%AMPS26* 1,1,1.400000,0.000000,0.000000* % -%ADD27PS27*% +%ADD26PS26*% %AMPS21* 1,1,1.400000,0.000000,0.000000* % @@ -54,18 +50,18 @@ 1,1,1.400000,0.000000,0.000000* % %ADD20PS20*% -%AMPS35* +%AMPS34* 1,1,1.200000,0.000000,0.000000* % -%ADD35PS35*% +%ADD34PS34*% %AMPS12* 1,1,1.200000,0.000000,0.000000* % %ADD12PS12*% -%AMPS33* +%AMPS32* 1,1,1.350000,0.000000,0.000000* % -%ADD33PS33*% +%ADD32PS32*% %AMPS18* 1,1,2.600000,0.000000,0.000000* % @@ -74,10 +70,10 @@ 1,1,1.700000,0.000000,0.000000* % %ADD19PS19*% -%AMPS25* +%AMPS24* 1,1,1.700000,0.000000,0.000000* % -%ADD25PS25*% +%ADD24PS24*% %AMPS17* 1,1,1.700000,0.000000,0.000000* % @@ -90,30 +86,30 @@ 1,1,1.700000,0.000000,0.000000* % %ADD22PS22*% -%AMPS32* +%AMPS31* 1,1,1.300000,0.000000,0.000000* % -%ADD32PS32*% -%AMPS39* +%ADD31PS31*% +%AMPS38* 1,1,0.500000,0.000000,0.000000* % -%ADD39PS39*% -%AMPS28* +%ADD38PS38*% +%AMPS27* 21,1,1.550000,1.550000,0.000000,0.000000,180.000000* % -%ADD28PS28*% +%ADD27PS27*% %AMPS13* 21,1,1.200000,1.200000,0.000000,0.000000,0.000000* % %ADD13PS13*% -%AMPS38* +%AMPS37* 21,1,1.350000,1.350000,0.000000,0.000000,90.000000* % -%ADD38PS38*% -%AMPS31* +%ADD37PS37*% +%AMPS30* 21,1,1.100000,1.100000,0.000000,0.000000,0.000000* % -%ADD31PS31*% +%ADD30PS30*% G01* %LPD*% G01* @@ -1235,19 +1231,19 @@ D23* X-44180000Y18097500D03* D23* X-42180000Y18097500D03* -D24* +D19* X22540000Y-24920000D03* -D24* +D19* X16190000Y-27460000D03* -D25* +D24* X-12382500Y36830000D03* D20* X22130000Y2080000D03* D20* X22130000Y9700000D03* -D26* +D25* X54000000Y36000000D03* -D26* +D25* X54000000Y34000000D03* D16* X-53975000Y33290000D03* @@ -1263,21 +1259,21 @@ D18* X-50150000Y11667000D03* D17* X-42000000Y4167000D03* -D27* +D26* X42190000Y-1000000D03* -D27* +D26* X49810000Y-1000000D03* D16* X-53975000Y6937500D03* D16* X-53975000Y8937500D03* -D24* +D19* X-17460000Y-24920000D03* -D24* +D19* X-23810000Y-27460000D03* -D24* +D19* X-17460000Y-4920000D03* -D24* +D19* X-23810000Y-7460000D03* D14* X-53975000Y-1587500D03* @@ -1287,9 +1283,9 @@ D21* X4000000Y38810000D03* D21* X4000000Y31190000D03* -D27* +D26* X18142500Y-682500D03* -D27* +D26* X25762500Y-682500D03* D21* X28825000Y21810000D03* @@ -1311,9 +1307,9 @@ D20* X54000000Y22760000D03* D20* X54000000Y30380000D03* -D28* +D27* X39052500Y3502500D03* -D29* +D28* X39052500Y-1597500D03* D14* X11430000Y11430000D03* @@ -1323,7 +1319,7 @@ D14* X11430000Y16510000D03* D14* X11430000Y13970000D03* -D25* +D24* X-12382500Y33972500D03* D15* X27115000Y42000000D03* @@ -1361,9 +1357,9 @@ D18* X38850000Y-8667000D03* D17* X47000000Y-16167000D03* -D26* +D25* X22130000Y17050000D03* -D26* +D25* X22130000Y15050000D03* D21* X35000000Y21810000D03* @@ -1407,39 +1403,39 @@ D20* X45000000Y6190000D03* D20* X45000000Y13810000D03* -D24* +D19* X2540000Y-24920000D03* -D24* +D19* X-3810000Y-27460000D03* D21* X19130000Y9700000D03* D21* X19130000Y2080000D03* -D25* +D24* X-12382500Y26352500D03* -D30* +D29* X-1270000Y41999999D03* -D30* +D29* X1269999Y41999999D03* -D31* -X-3810000Y41999999D03* D30* +X-3810000Y41999999D03* +D29* X3809999Y41999999D03* -D32* +D31* X29155000Y-5063750D03* -D33* +D32* X36655000Y-2523750D03* -D33* +D32* X29155000Y-7603750D03* -D33* +D32* X29155000Y-2523750D03* -D34* -X29155000Y16250D03* D33* +X29155000Y16250D03* +D32* X36655000Y-7603750D03* -D33* +D32* X36655000Y16250D03* -D33* +D32* X36655000Y-5063750D03* D17* X42000000Y-36500000D03* @@ -1451,148 +1447,148 @@ D18* X38850000Y-29000000D03* D17* X47000000Y-36500000D03* -D24* +D19* X22540000Y-4920000D03* -D24* +D19* X16190000Y-7460000D03* -D35* +D34* X29750000Y3365000D03* -D35* +D34* X32250000Y3365000D03* -D36* +D35* X-7600000Y-4150000D03* -D36* +D35* X-7600000Y28900000D03* -D37* -X7600000Y41600000D03* D36* +X7600000Y41600000D03* +D35* X-7600000Y6050000D03* -D36* +D35* X-7600000Y33950000D03* -D37* -X7600000Y18750000D03* D36* +X7600000Y18750000D03* +D35* X-7600000Y16200000D03* -D37* +D36* X7600000Y16200000D03* -D37* +D36* X7600000Y33950000D03* -D37* -X7600000Y-4150000D03* D36* +X7600000Y-4150000D03* +D35* X-7600000Y41600000D03* -D37* +D36* X7600000Y31450000D03* -D37* -X7600000Y-1600000D03* D36* +X7600000Y-1600000D03* +D35* X-7600000Y36500000D03* -D37* -X7600000Y11100000D03* D36* +X7600000Y11100000D03* +D35* X-7600000Y950000D03* -D36* +D35* X-7600000Y26350000D03* -D37* -X7600000Y8550000D03* D36* +X7600000Y8550000D03* +D35* X-7600000Y39050000D03* -D36* +D35* X-7600000Y-1600000D03* -D37* -X7600000Y28900000D03* D36* +X7600000Y28900000D03* +D35* X-7600000Y8550000D03* -D37* +D36* X7600000Y6050000D03* -D38* -X7600000Y44150000D03* D37* -X7600000Y36500000D03* +X7600000Y44150000D03* D36* +X7600000Y36500000D03* +D35* X-7600000Y3500000D03* -D36* +D35* X-7600000Y21250000D03* -D37* +D36* X7600000Y26350000D03* -D37* +D36* X7600000Y950000D03* -D37* +D36* X7600000Y21250000D03* -D37* -X7600000Y13650000D03* D36* +X7600000Y13650000D03* +D35* X-7600000Y31450000D03* -D36* +D35* X-7600000Y13650000D03* -D37* +D36* X7600000Y3500000D03* -D37* -X7600000Y39050000D03* D36* +X7600000Y39050000D03* +D35* X-7600000Y18750000D03* -D37* -X7600000Y23800000D03* D36* +X7600000Y23800000D03* +D35* X-7600000Y23800000D03* -D36* +D35* X-7600000Y44150000D03* -D36* +D35* X-7600000Y11100000D03* -D24* +D19* X2540000Y-4920000D03* -D24* +D19* X-3810000Y-7460000D03* -D39* +D38* X-53411409Y20073909D03* -D39* +D38* X-13970000Y-2857500D03* -D39* +D38* X32659Y15032659D03* -D39* +D38* X4127500Y26352500D03* -D39* +D38* X4400020Y23812500D03* -D39* +D38* X4127500Y29527500D03* -D39* +D38* X-4445000Y16510000D03* -D39* +D38* X9400000Y3400000D03* -D39* +D38* X6350000Y27622500D03* -D39* +D38* X31030000Y7000000D03* -D39* +D38* X19453730Y45475020D03* -D39* +D38* X-2151091Y17216409D03* -D39* +D38* X-11000000Y-2000000D03* -D39* +D38* X6032500Y22542500D03* -D39* +D38* X-13000000Y-4000000D03* -D39* +D38* X35560000Y8002500D03* -D39* +D38* X-50165000Y20002500D03* -D39* +D38* X-2857500Y18097500D03* -D39* +D38* X-52387500Y18097500D03* -D39* +D38* X-13017500Y-317500D03* -D39* +D38* X-12382500Y-1270000D03* -D39* +D38* X3492500Y11430000D03* -D39* +D38* X6032500Y25082500D03* -D39* +D38* X-47307500Y20002500D03* -D39* +D38* X35085000Y6190000D03* -D39* +D38* X-3563909Y15803591D03* M02* diff --git a/gerbers/daisyy.gts b/gerbers/daisyy.gts index 9d28b7951b23aa6283cd51975386248e6e9cd7f7..6775609e0aa95723ae75bf78a9a00b3f529004db 100644 --- a/gerbers/daisyy.gts +++ b/gerbers/daisyy.gts @@ -1,33 +1,29 @@ %FSLAX46Y46*% %MOMM*% -%AMPS35* +%AMPS34* 1,1,1.550000,0.000000,0.000000* % -%ADD35PS35*% -%AMPS37* +%ADD34PS34*% +%AMPS36* 1,1,1.550000,0.000000,0.000000* % -%ADD37PS37*% -%AMPS38* +%ADD36PS36*% +%AMPS37* 1,1,1.550000,0.000000,0.000000* % -%ADD38PS38*% -%AMPS23* -1,1,1.900000,0.000000,0.000000* -% -%ADD23PS23*% -%AMPS30* +%ADD37PS37*% +%AMPS29* 1,1,1.750000,0.000000,0.000000* % -%ADD30PS30*% +%ADD29PS29*% %AMPS22* 1,1,1.650000,0.000000,0.000000* % %ADD22PS22*% -%AMPS27* +%AMPS26* 1,1,1.650000,0.000000,0.000000* % -%ADD27PS27*% +%ADD26PS26*% %AMPS15* 1,1,1.650000,0.000000,0.000000* % @@ -36,14 +32,14 @@ 1,1,2.200000,0.000000,0.000000* % %ADD14PS14*% -%AMPS31* +%AMPS30* 1,1,1.500000,0.000000,0.000000* % -%ADD31PS31*% -%AMPS28* +%ADD30PS30*% +%AMPS27* 1,1,1.600000,0.000000,0.000000* % -%ADD28PS28*% +%ADD27PS27*% %AMPS20* 1,1,1.600000,0.000000,0.000000* % @@ -52,18 +48,18 @@ 1,1,1.600000,0.000000,0.000000* % %ADD19PS19*% -%AMPS36* +%AMPS35* 1,1,1.400000,0.000000,0.000000* % -%ADD36PS36*% +%ADD35PS35*% %AMPS11* 1,1,1.400000,0.000000,0.000000* % %ADD11PS11*% -%AMPS34* +%AMPS33* 1,1,1.550000,0.000000,0.000000* % -%ADD34PS34*% +%ADD33PS33*% %AMPS17* 1,1,2.800000,0.000000,0.000000* % @@ -72,10 +68,10 @@ 1,1,1.900000,0.000000,0.000000* % %ADD18PS18*% -%AMPS26* +%AMPS25* 1,1,1.900000,0.000000,0.000000* % -%ADD26PS26*% +%ADD25PS25*% %AMPS16* 1,1,1.900000,0.000000,0.000000* % @@ -88,42 +84,42 @@ 1,1,1.900000,0.000000,0.000000* % %ADD21PS21*% -%AMPS33* +%AMPS32* 1,1,1.500000,0.000000,0.000000* % -%ADD33PS33*% -%AMPS40* +%ADD32PS32*% +%AMPS39* 1,1,0.400000,0.000000,0.000000* % -%ADD40PS40*% -%AMPS24* +%ADD39PS39*% +%AMPS23* 1,1,4.200000,0.000000,0.000000* % -%ADD24PS24*% -%AMPS25* +%ADD23PS23*% +%AMPS24* 1,1,1.900000,0.000000,0.000000* % -%ADD25PS25*% +%ADD24PS24*% %AMPS10* 1,1,3.700000,0.000000,0.000000* % %ADD10PS10*% -%AMPS29* +%AMPS28* 21,1,1.750000,1.750000,0.000000,0.000000,180.000000* % -%ADD29PS29*% +%ADD28PS28*% %AMPS12* 21,1,1.400000,1.400000,0.000000,0.000000,0.000000* % %ADD12PS12*% -%AMPS39* +%AMPS38* 21,1,1.550000,1.550000,0.000000,0.000000,90.000000* % -%ADD39PS39*% -%AMPS32* +%ADD38PS38*% +%AMPS31* 21,1,1.300000,1.300000,0.000000,0.000000,0.000000* % -%ADD32PS32*% +%ADD31PS31*% G01* %LPD*% G01* @@ -225,25 +221,25 @@ D22* X-44180000Y18097500D03* D22* X-42180000Y18097500D03* -D23* +D18* X22540000Y-24920000D03* -D24* +D23* X20000000Y-30000000D03* -D25* +D24* X15000000Y-30000000D03* -D25* +D24* X25000000Y-30000000D03* -D23* +D18* X16190000Y-27460000D03* -D26* +D25* X-12382500Y36830000D03* D19* X22130000Y2080000D03* D19* X22130000Y9700000D03* -D27* +D26* X54000000Y36000000D03* -D27* +D26* X54000000Y34000000D03* D15* X-53975000Y33290000D03* @@ -259,33 +255,33 @@ D17* X-50150000Y11667000D03* D16* X-42000000Y4167000D03* -D28* +D27* X42190000Y-1000000D03* -D28* +D27* X49810000Y-1000000D03* D15* X-53975000Y6937500D03* D15* X-53975000Y8937500D03* -D23* +D18* X-17460000Y-24920000D03* -D24* +D23* X-20000000Y-30000000D03* -D25* +D24* X-25000000Y-30000000D03* -D25* +D24* X-15000000Y-30000000D03* -D23* +D18* X-23810000Y-27460000D03* -D23* +D18* X-17460000Y-4920000D03* -D24* +D23* X-20000000Y-10000000D03* -D25* +D24* X-25000000Y-10000000D03* -D25* +D24* X-15000000Y-10000000D03* -D23* +D18* X-23810000Y-7460000D03* D13* X-53975000Y-1587500D03* @@ -295,9 +291,9 @@ D20* X4000000Y38810000D03* D20* X4000000Y31190000D03* -D28* +D27* X18142500Y-682500D03* -D28* +D27* X25762500Y-682500D03* D20* X28825000Y21810000D03* @@ -319,9 +315,9 @@ D19* X54000000Y22760000D03* D19* X54000000Y30380000D03* -D29* +D28* X39052500Y3502500D03* -D30* +D29* X39052500Y-1597500D03* D13* X11430000Y11430000D03* @@ -331,7 +327,7 @@ D13* X11430000Y16510000D03* D13* X11430000Y13970000D03* -D26* +D25* X-12382500Y33972500D03* D14* X27115000Y42000000D03* @@ -369,9 +365,9 @@ D17* X38850000Y-8667000D03* D16* X47000000Y-16167000D03* -D27* +D26* X22130000Y17050000D03* -D27* +D26* X22130000Y15050000D03* D20* X35000000Y21810000D03* @@ -415,45 +411,45 @@ D19* X45000000Y6190000D03* D19* X45000000Y13810000D03* -D23* +D18* X2540000Y-24920000D03* -D24* +D23* X0Y-30000000D03* -D25* +D24* X-5000000Y-30000000D03* -D25* +D24* X5000000Y-30000000D03* -D23* +D18* X-3810000Y-27460000D03* D20* X19130000Y9700000D03* D20* X19130000Y2080000D03* -D26* +D25* X-12382500Y26352500D03* -D31* +D30* X-1270000Y41999999D03* -D31* +D30* X1269999Y41999999D03* -D32* -X-3810000Y41999999D03* D31* +X-3810000Y41999999D03* +D30* X3809999Y41999999D03* -D33* +D32* X29155000Y-5063750D03* -D34* +D33* X36655000Y-2523750D03* -D34* +D33* X29155000Y-7603750D03* -D34* +D33* X29155000Y-2523750D03* -D35* -X29155000Y16250D03* D34* +X29155000Y16250D03* +D33* X36655000Y-7603750D03* -D34* +D33* X36655000Y16250D03* -D34* +D33* X36655000Y-5063750D03* D16* X42000000Y-36500000D03* @@ -465,160 +461,160 @@ D17* X38850000Y-29000000D03* D16* X47000000Y-36500000D03* -D23* +D18* X22540000Y-4920000D03* -D24* +D23* X20000000Y-10000000D03* -D25* +D24* X15000000Y-10000000D03* -D25* +D24* X25000000Y-10000000D03* -D23* +D18* X16190000Y-7460000D03* -D36* +D35* X29750000Y3365000D03* -D36* +D35* X32250000Y3365000D03* -D37* +D36* X-7600000Y-4150000D03* -D37* +D36* X-7600000Y28900000D03* -D38* -X7600000Y41600000D03* D37* +X7600000Y41600000D03* +D36* X-7600000Y6050000D03* -D37* +D36* X-7600000Y33950000D03* -D38* -X7600000Y18750000D03* D37* +X7600000Y18750000D03* +D36* X-7600000Y16200000D03* -D38* +D37* X7600000Y16200000D03* -D38* +D37* X7600000Y33950000D03* -D38* -X7600000Y-4150000D03* D37* +X7600000Y-4150000D03* +D36* X-7600000Y41600000D03* -D38* +D37* X7600000Y31450000D03* -D38* -X7600000Y-1600000D03* D37* +X7600000Y-1600000D03* +D36* X-7600000Y36500000D03* -D38* -X7600000Y11100000D03* D37* +X7600000Y11100000D03* +D36* X-7600000Y950000D03* -D37* +D36* X-7600000Y26350000D03* -D38* -X7600000Y8550000D03* D37* +X7600000Y8550000D03* +D36* X-7600000Y39050000D03* -D37* +D36* X-7600000Y-1600000D03* -D38* -X7600000Y28900000D03* D37* +X7600000Y28900000D03* +D36* X-7600000Y8550000D03* -D38* +D37* X7600000Y6050000D03* -D39* -X7600000Y44150000D03* D38* -X7600000Y36500000D03* +X7600000Y44150000D03* D37* +X7600000Y36500000D03* +D36* X-7600000Y3500000D03* -D37* +D36* X-7600000Y21250000D03* -D38* +D37* X7600000Y26350000D03* -D38* +D37* X7600000Y950000D03* -D38* +D37* X7600000Y21250000D03* -D38* -X7600000Y13650000D03* D37* +X7600000Y13650000D03* +D36* X-7600000Y31450000D03* -D37* +D36* X-7600000Y13650000D03* -D38* +D37* X7600000Y3500000D03* -D38* -X7600000Y39050000D03* D37* +X7600000Y39050000D03* +D36* X-7600000Y18750000D03* -D38* -X7600000Y23800000D03* D37* +X7600000Y23800000D03* +D36* X-7600000Y23800000D03* -D37* +D36* X-7600000Y44150000D03* -D37* +D36* X-7600000Y11100000D03* -D23* +D18* X2540000Y-4920000D03* -D24* +D23* X0Y-10000000D03* -D25* +D24* X-5000000Y-10000000D03* -D25* +D24* X5000000Y-10000000D03* -D23* +D18* X-3810000Y-7460000D03* -D40* +D39* X-53411409Y20073909D03* -D40* +D39* X-13970000Y-2857500D03* -D40* +D39* X32659Y15032659D03* -D40* +D39* X4127500Y26352500D03* -D40* +D39* X4400020Y23812500D03* -D40* +D39* X4127500Y29527500D03* -D40* +D39* X-4445000Y16510000D03* -D40* +D39* X9400000Y3400000D03* -D40* +D39* X6350000Y27622500D03* -D40* +D39* X31030000Y7000000D03* -D40* +D39* X19453730Y45475020D03* -D40* +D39* X-2151091Y17216409D03* -D40* +D39* X-11000000Y-2000000D03* -D40* +D39* X6032500Y22542500D03* -D40* +D39* X-13000000Y-4000000D03* -D40* +D39* X35560000Y8002500D03* -D40* +D39* X-50165000Y20002500D03* -D40* +D39* X-2857500Y18097500D03* -D40* +D39* X-52387500Y18097500D03* -D40* +D39* X-13017500Y-317500D03* -D40* +D39* X-12382500Y-1270000D03* -D40* +D39* X3492500Y11430000D03* -D40* +D39* X6032500Y25082500D03* -D40* +D39* X-47307500Y20002500D03* -D40* +D39* X35085000Y6190000D03* -D40* +D39* X-3563909Y15803591D03* M02* diff --git a/gerbers/daisyy.txt b/gerbers/daisyy.txt index e6dc75310329e1998687fc9bb272d606013ef7bf..5fe94ddf244de020e7f10f1a47a7e485958cbedb 100644 --- a/gerbers/daisyy.txt +++ b/gerbers/daisyy.txt @@ -1,26 +1,25 @@ M48 FMAT,2 METRIC,TZ -T15C0.200 -T13C0.700 +T14C0.200 +T12C0.700 T5C0.750 T8C0.800 -T14C0.850 +T13C0.850 T2C0.950 T3C1.000 T6C1.100 -T12C1.200 +T11C1.200 T4C1.400 -T9C1.500 -T11C1.700 +T10C1.700 T7C2.000 T1C3.500 -T10C4.000 +T9C4.000 % G90 G05 M71 -T15 +T14 X-53.411Y20.074 X-13.970Y-2.857 X0.033Y15.033 @@ -47,7 +46,7 @@ X6.032Y25.082 X-47.307Y20.003 X35.085Y6.190 X-3.564Y15.804 -T13 +T12 X29.155Y-5.064 X29.750Y3.365 X32.250Y3.365 @@ -102,7 +101,7 @@ X45.000Y6.190 X45.000Y13.810 X19.130Y9.700 X19.130Y2.080 -T14 +T13 X29.155Y0.016 X-7.600Y-4.150 X-7.600Y28.900 @@ -165,7 +164,13 @@ X-20.637Y13.970 X-20.637Y5.397 X-20.637Y7.938 X-20.637Y10.477 +X22.540Y-24.920 +X16.190Y-27.460 X-12.383Y36.830 +X-17.460Y-24.920 +X-23.810Y-27.460 +X-17.460Y-4.920 +X-23.810Y-7.460 X-53.975Y-1.587 X-53.975Y-4.128 X11.430Y11.430 @@ -175,11 +180,17 @@ X11.430Y13.970 X-12.383Y33.972 X-29.500Y44.540 X-29.500Y42.000 +X2.540Y-24.920 +X-3.810Y-27.460 X-12.383Y26.352 X-1.270Y42.000 X1.270Y42.000 X-3.810Y42.000 X3.810Y42.000 +X22.540Y-4.920 +X16.190Y-7.460 +X2.540Y-4.920 +X-3.810Y-7.460 T6 X-47.000Y-36.500 X-44.500Y-36.500 @@ -208,7 +219,7 @@ X-42.000Y-16.167 X42.000Y-36.500 X44.500Y-36.500 X47.000Y-36.500 -T12 +T11 X39.053Y3.502 X39.053Y-1.597 T4 @@ -228,20 +239,7 @@ X27.115Y42.000 X10.885Y42.000 X27.115Y29.300 X10.885Y29.300 -T9 -X22.540Y-24.920 -X16.190Y-27.460 -X-17.460Y-24.920 -X-23.810Y-27.460 -X-17.460Y-4.920 -X-23.810Y-7.460 -X2.540Y-24.920 -X-3.810Y-27.460 -X22.540Y-4.920 -X16.190Y-7.460 -X2.540Y-4.920 -X-3.810Y-7.460 -T11 +T10 X15.000Y-30.000 X25.000Y-30.000 X-25.000Y-30.000 @@ -274,7 +272,7 @@ X38.850Y-29.000 T1 X15.250Y12.250 X-15.250Y12.250 -T10 +T9 X20.000Y-30.000 X-20.000Y-30.000 X-20.000Y-10.000 diff --git a/gerbers/daisyy.zip b/gerbers/daisyy.zip index 6a6914529a4b8b7780d4c3109d7bc2068bc6d025..17d0f41e6c19fd654ee37c8dd5a35a0e1a67d099 100644 Binary files a/gerbers/daisyy.zip and b/gerbers/daisyy.zip differ diff --git a/horizon/board.json b/horizon/board.json index 8e6c591ed38095d438ae8a9f2637e7849875b491..78602d4e54c320625ecedf0dc89a33c506c37d66 100644 --- a/horizon/board.json +++ b/horizon/board.json @@ -4594,6 +4594,7 @@ ] }, "477e5550-0a69-4e34-8129-e74221298253": { + "alternate_package": "0bb36cb0-d5ed-4b1b-91a7-d26ddcac02ac", "component": "aa457318-7dba-444b-a552-7090f2642a1f", "fixed": true, "flip": false, @@ -4739,6 +4740,7 @@ ] }, "5ccbada2-ff09-4d34-8230-0891984968d6": { + "alternate_package": "0bb36cb0-d5ed-4b1b-91a7-d26ddcac02ac", "component": "b5d143eb-f353-40ef-885b-1e6dcd5619b2", "fixed": true, "flip": false, @@ -4755,6 +4757,7 @@ "texts": [] }, "5fe9609f-d946-4ed7-ba59-5c4adc7b0cb1": { + "alternate_package": "0bb36cb0-d5ed-4b1b-91a7-d26ddcac02ac", "component": "09ccf3d5-93df-4368-b56e-1a75a2908cd1", "fixed": true, "flip": false, @@ -5259,6 +5262,7 @@ ] }, "d15445dd-59d2-41a9-ae0c-08db50921c22": { + "alternate_package": "0bb36cb0-d5ed-4b1b-91a7-d26ddcac02ac", "component": "65d22490-9d2a-48c6-b352-f9663dc2f554", "fixed": true, "flip": false, @@ -5362,6 +5366,7 @@ "texts": [] }, "ed836fc6-e884-49f2-b66f-1a1b4c567b31": { + "alternate_package": "0bb36cb0-d5ed-4b1b-91a7-d26ddcac02ac", "component": "0536d5ef-6dea-498a-a05d-b4bb03018e80", "fixed": true, "flip": false, @@ -5414,6 +5419,7 @@ ] }, "f827e7ca-d656-4a29-89f4-b6c6cc8682ef": { + "alternate_package": "0bb36cb0-d5ed-4b1b-91a7-d26ddcac02ac", "component": "d57270f3-cd07-49b8-a98b-51b491f190a2", "fixed": true, "flip": false, diff --git a/horizon/pool/packages/cache/7bfa19e9-a4c5-44ab-b1ad-ee66f68199ff-tight/package.json b/horizon/pool/packages/cache/7bfa19e9-a4c5-44ab-b1ad-ee66f68199ff-tight/package.json new file mode 100644 index 0000000000000000000000000000000000000000..fd5982c285ba36155f3e1b7fd6e8c5ed4ddfb090 --- /dev/null +++ b/horizon/pool/packages/cache/7bfa19e9-a4c5-44ab-b1ad-ee66f68199ff-tight/package.json @@ -0,0 +1,438 @@ +{ + "alternate_for": "7bfa19e9-a4c5-44ab-b1ad-ee66f68199ff", + "arcs": {}, + "default_model": "c8b3d382-ee5d-4ebd-bef1-a15d36665efe", + "dimensions": {}, + "grid_settings": { + "current": { + "mode": "square", + "name": "", + "origin": [ + 0, + 0 + ], + "spacing_rect": [ + 1000000, + 1000000 + ], + "spacing_square": 1000000 + }, + "grids": {} + }, + "junctions": { + "104bef1e-19b5-4456-a205-1d44ff405b66": { + "position": [ + 7095870, + -7100000 + ] + }, + "7e0edc80-d159-4645-9b83-ec69d62e2f68": { + "position": [ + -7095870, + -7117884 + ] + }, + "cddd3e4b-c8a4-464e-90f6-2ee07ad96111": { + "position": [ + -7095870, + 7117884 + ] + }, + "d87bcc2a-10df-4e6b-a8ad-fffc7444cccc": { + "position": [ + 7095870, + 7100000 + ] + } + }, + "keepouts": {}, + "lines": { + "413309e8-d76b-4f34-b87d-16ea5bde3623": { + "from": "7e0edc80-d159-4645-9b83-ec69d62e2f68", + "layer": 20, + "to": "cddd3e4b-c8a4-464e-90f6-2ee07ad96111", + "width": 150000 + }, + "cbc420e9-35ae-40fd-85c2-a42c70f8ebcc": { + "from": "104bef1e-19b5-4456-a205-1d44ff405b66", + "layer": 20, + "to": "7e0edc80-d159-4645-9b83-ec69d62e2f68", + "width": 150000 + }, + "d299b8d6-9671-4d5b-8ed5-3799112c7657": { + "from": "cddd3e4b-c8a4-464e-90f6-2ee07ad96111", + "layer": 20, + "to": "d87bcc2a-10df-4e6b-a8ad-fffc7444cccc", + "width": 150000 + }, + "f0efa8b4-5e11-4905-8d58-6231a5712191": { + "from": "d87bcc2a-10df-4e6b-a8ad-fffc7444cccc", + "layer": 20, + "to": "104bef1e-19b5-4456-a205-1d44ff405b66", + "width": 150000 + } + }, + "manufacturer": "Cherry", + "models": { + "c8b3d382-ee5d-4ebd-bef1-a15d36665efe": { + "filename": "3d_models/cache/6d752bc3-29b3-45df-8cf2-1e3aacefbcc6/3d_models/mechanical/switch/cherry/mx/cherry_mx.step", + "pitch": 0, + "roll": 49152, + "x": 0, + "y": -1000000, + "yaw": 0, + "z": 4700000 + } + }, + "name": "Cherry MX (PCB Mount, tight fit)", + "pads": { + "15990d90-e7d5-4ace-899d-ccc97a94fc7f": { + "name": "2", + "padstack": "296cf69b-9d53-45e4-aaab-4aedf4087d3a", + "parameter_set": { + "hole_diameter": 1000000, + "pad_diameter": 1700000 + }, + "placement": { + "angle": 0, + "mirror": false, + "shift": [ + 2540000, + 5080000 + ] + } + }, + "3403ae13-6d70-4801-bbdb-484c639ec38f": { + "name": "mech", + "padstack": "762c84c2-187d-454a-af81-d3381bec5257", + "parameter_set": { + "hole_diameter": 4000000 + }, + "placement": { + "angle": 0, + "mirror": false, + "shift": [ + 0, + 0 + ] + } + }, + "71669186-1dc3-4f5f-9dd4-4bc8e62b955a": { + "name": "mech2", + "padstack": "762c84c2-187d-454a-af81-d3381bec5257", + "parameter_set": { + "hole_diameter": 1700000 + }, + "placement": { + "angle": 0, + "mirror": false, + "shift": [ + -5000000, + 0 + ] + } + }, + "a0905fdb-73d3-4735-b2e7-d195b16e8118": { + "name": "mech3", + "padstack": "762c84c2-187d-454a-af81-d3381bec5257", + "parameter_set": { + "hole_diameter": 1700000 + }, + "placement": { + "angle": 0, + "mirror": false, + "shift": [ + 5000000, + 0 + ] + } + }, + "cfc51f89-befb-4ba5-972b-a14740794442": { + "name": "1", + "padstack": "296cf69b-9d53-45e4-aaab-4aedf4087d3a", + "parameter_set": { + "hole_diameter": 1000000, + "pad_diameter": 1700000 + }, + "placement": { + "angle": 0, + "mirror": false, + "shift": [ + -3810000, + 2540000 + ] + } + } + }, + "parameter_program": "14.000mm 14.000mm\nget-parameter [ courtyard_expansion ]\n2 * +xy\nset-polygon [ courtyard rectangle 0.000mm 0.000mm ]", + "parameter_set": { + "courtyard_expansion": 250000 + }, + "polygons": { + "9283408e-3358-4946-9d03-8ffdfa953ea5": { + "layer": 50, + "parameter_class": "", + "vertices": [ + { + "arc_center": [ + 620000, + 620000 + ], + "arc_reverse": false, + "position": [ + -7000000, + -7000000 + ], + "type": "line" + }, + { + "arc_center": [ + 620000, + -620000 + ], + "arc_reverse": false, + "position": [ + -7000000, + 7000000 + ], + "type": "line" + }, + { + "arc_center": [ + -620000, + -620000 + ], + "arc_reverse": false, + "position": [ + 7000000, + 7000000 + ], + "type": "line" + }, + { + "arc_center": [ + -620000, + 620000 + ], + "arc_reverse": false, + "position": [ + 7000000, + -7000000 + ], + "type": "line" + } + ] + }, + "95772c48-31dd-4570-9a0b-95e06f93201b": { + "layer": 40, + "parameter_class": "", + "vertices": [ + { + "arc_center": [ + -6000000, + -6000000 + ], + "arc_reverse": true, + "position": [ + -6000000, + -7000000 + ], + "type": "arc" + }, + { + "arc_center": [ + 0, + 0 + ], + "arc_reverse": false, + "position": [ + -7000000, + -6000000 + ], + "type": "line" + }, + { + "arc_center": [ + -6000000, + 6000000 + ], + "arc_reverse": true, + "position": [ + -7000000, + 6000000 + ], + "type": "arc" + }, + { + "arc_center": [ + 0, + 0 + ], + "arc_reverse": false, + "position": [ + -6000000, + 7000000 + ], + "type": "line" + }, + { + "arc_center": [ + 6000000, + 6000000 + ], + "arc_reverse": true, + "position": [ + 6000000, + 7000000 + ], + "type": "arc" + }, + { + "arc_center": [ + 0, + 0 + ], + "arc_reverse": false, + "position": [ + 7000000, + 6000000 + ], + "type": "line" + }, + { + "arc_center": [ + 6000000, + -6000000 + ], + "arc_reverse": true, + "position": [ + 7000000, + -6000000 + ], + "type": "arc" + }, + { + "arc_center": [ + 0, + 0 + ], + "arc_reverse": false, + "position": [ + 6000000, + -7000000 + ], + "type": "line" + } + ] + }, + "bd177d9b-3460-4b5f-b24a-819cdb558c60": { + "layer": 60, + "parameter_class": "courtyard", + "vertices": [ + { + "arc_center": [ + 0, + 0 + ], + "arc_reverse": false, + "position": [ + -7250000, + -7250000 + ], + "type": "line" + }, + { + "arc_center": [ + 0, + 0 + ], + "arc_reverse": false, + "position": [ + -7250000, + 7250000 + ], + "type": "line" + }, + { + "arc_center": [ + 0, + 0 + ], + "arc_reverse": false, + "position": [ + 7250000, + 7250000 + ], + "type": "line" + }, + { + "arc_center": [ + 0, + 0 + ], + "arc_reverse": false, + "position": [ + 7250000, + -7250000 + ], + "type": "line" + } + ] + } + }, + "rules": { + "clearance_package": { + "clearance_silkscreen_cu": 200000, + "clearance_silkscreen_pkg": 200000, + "enabled": true, + "order": -1 + }, + "package_checks": { + "enabled": true, + "order": -1 + } + }, + "tags": [ + "momentary", + "spst", + "switch" + ], + "texts": { + "0cb499cc-7720-406f-abc3-c4d345179553": { + "font": "simplex", + "from_smash": false, + "layer": 20, + "origin": "center", + "placement": { + "angle": 0, + "mirror": false, + "shift": [ + -7095870, + -8260884 + ] + }, + "size": 1000000, + "text": "$RD", + "width": 150000 + }, + "7ac2ae06-2ca7-4e11-87c8-44ca3e7cdf2f": { + "font": "simplex", + "from_smash": false, + "layer": 50, + "origin": "center", + "placement": { + "angle": 0, + "mirror": false, + "shift": [ + -6350000, + 5080000 + ] + }, + "size": 1500000, + "text": "$RD", + "width": 0 + } + }, + "type": "package", + "uuid": "0bb36cb0-d5ed-4b1b-91a7-d26ddcac02ac" +} \ No newline at end of file