# HG changeset patch # User Ethan Zonca # Date 2014-12-12 23:25:34 # Node ID 25efd0afc8fb0c401c3c1985a25a8130208a7484 # Parent b2b94393196b3ab4b2521eef21b38225504edbc3 Final tweaks diff --git a/CAM/zoncoffee.GBL b/CAM/zoncoffee.GBL --- a/CAM/zoncoffee.GBL +++ b/CAM/zoncoffee.GBL @@ -1366,8 +1366,8 @@ X013818Y008393D03* X012818Y008393D03* X011693Y008393D03* X010693Y008393D03* -X009943Y004831D03* -X008943Y004831D03* +X010349Y004800D03* +X011349Y004800D03* D12* X007724Y004789D03* X007724Y005045D03* @@ -1385,292 +1385,82 @@ X007724Y007860D03* X007724Y008116D03* X007724Y008372D03* D13* -X010912Y004737D03* -X011412Y004737D03* -X011912Y004737D03* -X012412Y004737D03* -X012912Y004737D03* -X013412Y004737D03* +X012162Y004737D03* +X012662Y004737D03* +X013162Y004737D03* +X013662Y004737D03* +X014162Y004737D03* +X014662Y004737D03* D14* -X013702Y004907D02* -X013702Y004966D01* -X013625Y005042D01* -X013198Y005042D01* -X013176Y005020D01* -X013164Y005032D01* -X013129Y005052D01* -X013091Y005062D01* -X012942Y005062D01* -X012942Y004767D01* -X012882Y004767D01* -X012882Y005062D01* -X012732Y005062D01* -X012694Y005052D01* -X012659Y005032D01* -X012647Y005020D01* -X012645Y005022D01* -X012662Y005062D01* -X012662Y005162D01* -X012624Y005254D01* -X012553Y005324D01* -X012461Y005362D01* -X012362Y005362D01* -X012270Y005324D01* -X012200Y005254D01* -X012162Y005162D01* -X012162Y005062D01* -X012178Y005022D01* -X012162Y005006D01* -X012145Y005022D01* -X012162Y005062D01* -X012162Y005162D01* -X012124Y005254D01* -X012053Y005324D01* -X011961Y005362D01* -X011862Y005362D01* -X011770Y005324D01* -X011700Y005254D01* -X011662Y005162D01* -X011662Y005062D01* -X011678Y005022D01* -X011662Y005006D01* -X011645Y005023D01* -X011662Y005064D01* -X011662Y005163D01* -X011624Y005255D01* -X011553Y005325D01* -X011461Y005363D01* -X011362Y005363D01* -X011270Y005325D01* -X011200Y005255D01* -X011162Y005163D01* -X011162Y005064D01* -X011178Y005023D01* -X011162Y005006D01* -X011125Y005042D01* -X010698Y005042D01* -X010622Y004966D01* -X010622Y004960D01* -X010555Y004987D01* -X010456Y004987D01* -X010373Y004953D01* -X010373Y005185D01* -X010297Y005261D01* -X009589Y005261D01* -X009513Y005185D01* -X009513Y004543D01* -X009373Y004543D01* -X009373Y005185D01* -X009297Y005261D01* -X008589Y005261D01* -X008513Y005185D01* -X008513Y004543D01* -X006236Y004543D01* -X006161Y004618D01* -X005975Y004618D01* -X005943Y004587D01* -X005911Y004618D01* -X005725Y004618D01* -X005693Y004587D01* -X005661Y004618D01* -X005475Y004618D01* -X005443Y004587D01* -X005411Y004618D01* -X005225Y004618D01* -X005193Y004587D01* -X005161Y004618D01* -X004975Y004618D01* -X004943Y004587D01* -X004911Y004618D01* -X004725Y004618D01* -X004693Y004587D01* -X004661Y004618D01* -X004593Y004618D01* -X004593Y008668D01* -X004661Y008668D01* -X004693Y008700D01* -X004725Y008668D01* -X004911Y008668D01* -X004943Y008700D01* -X004975Y008668D01* -X005161Y008668D01* -X005193Y008700D01* -X005225Y008668D01* -X005411Y008668D01* -X005443Y008700D01* -X005475Y008668D01* -X005661Y008668D01* -X005693Y008700D01* -X005725Y008668D01* -X005911Y008668D01* -X005943Y008700D01* -X005975Y008668D01* -X006161Y008668D01* -X006236Y008743D01* -X010263Y008743D01* -X010263Y008563D01* -X010060Y008563D01* -X009702Y008206D01* -X009643Y008206D01* -X009551Y008168D01* -X009481Y008097D01* -X009443Y008006D01* -X009443Y007906D01* -X009481Y007814D01* -X009551Y007744D01* -X009643Y007706D01* -X009743Y007706D01* -X009834Y007744D01* -X009905Y007814D01* -X009943Y007906D01* -X009943Y007965D01* -X010201Y008223D01* -X010263Y008223D01* -X010263Y008039D01* -X010339Y007963D01* -X011047Y007963D01* -X011123Y008039D01* -X011123Y008743D01* -X011251Y008743D01* -X011243Y008713D01* -X011243Y008443D01* -X011643Y008443D01* -X011643Y008343D01* -X011743Y008343D01* -X011743Y007943D01* -X012013Y007943D01* -X012051Y007954D01* -X012085Y007973D01* -X012113Y008001D01* -X012133Y008035D01* -X012143Y008074D01* -X012143Y008343D01* -X011743Y008343D01* -X011743Y008443D01* -X012143Y008443D01* -X012143Y008713D01* -X012135Y008743D01* -X012388Y008743D01* -X012388Y008039D01* -X012464Y007963D01* -X013172Y007963D01* -X013248Y008039D01* -X013248Y008743D01* -X013376Y008743D01* -X013368Y008713D01* -X013368Y008443D01* -X013768Y008443D01* -X013768Y008343D01* -X013368Y008343D01* -X013368Y008074D01* -X013378Y008035D01* -X013398Y008001D01* -X013426Y007973D01* -X013460Y007954D01* -X013498Y007943D01* -X013531Y007943D01* -X013505Y007881D01* -X013505Y007781D01* -X013543Y007689D01* -X013614Y007619D01* -X013706Y007581D01* -X013805Y007581D01* -X013897Y007619D01* -X013939Y007661D01* -X016410Y007661D01* -X016763Y008014D01* -X016863Y008114D01* -X016863Y008460D01* -X016905Y008502D01* -X016943Y008594D01* -X016943Y008693D01* -X016922Y008743D01* -X017964Y008743D01* -X017943Y008693D01* -X017943Y008594D01* -X017981Y008502D01* -X018051Y008431D01* -X018143Y008393D01* -X018243Y008393D01* -X018334Y008431D01* -X018376Y008473D01* -X020836Y008473D01* -X020880Y008428D01* -X020880Y008369D01* -X020918Y008277D01* -X020989Y008207D01* -X021081Y008169D01* -X021180Y008169D01* -X021272Y008207D01* -X021342Y008277D01* -X021380Y008369D01* -X021380Y008469D01* -X021342Y008561D01* -X021272Y008631D01* -X021180Y008669D01* -X021162Y008669D01* -X021193Y008700D01* -X021225Y008668D01* -X021411Y008668D01* -X021443Y008700D01* -X021475Y008668D01* -X021661Y008668D01* -X021693Y008700D01* -X021725Y008668D01* -X021911Y008668D01* -X021943Y008700D01* -X021975Y008668D01* -X022043Y008668D01* -X022043Y004618D01* -X021975Y004618D01* -X021943Y004587D01* -X021911Y004618D01* -X021725Y004618D01* -X021693Y004587D01* -X021661Y004618D01* -X021475Y004618D01* -X021443Y004587D01* -X021411Y004618D01* -X021225Y004618D01* -X021193Y004587D01* -X021161Y004618D01* -X020975Y004618D01* -X020943Y004587D01* -X020911Y004618D01* -X020725Y004618D01* -X020693Y004587D01* -X020661Y004618D01* -X020475Y004618D01* -X020400Y004543D01* -X020333Y004543D01* -X020621Y004831D01* -X020680Y004831D01* -X020772Y004869D01* -X020842Y004939D01* -X020880Y005031D01* -X020880Y005131D01* -X020842Y005222D01* -X020772Y005293D01* -X020680Y005331D01* -X020581Y005331D01* -X020489Y005293D01* -X020418Y005222D01* -X020380Y005131D01* -X020380Y005071D01* -X020060Y004751D01* -X013951Y004751D01* -X013795Y004907D01* -X013702Y004907D01* -X013702Y004962D02* -X014021Y004962D01* -X014051Y004931D02* -X014143Y004893D01* -X014243Y004893D01* -X014334Y004931D01* -X014405Y005002D01* -X014443Y005094D01* -X014443Y005098D01* +X014952Y004751D02* +X014952Y004966D01* +X014875Y005042D01* +X014448Y005042D01* +X014426Y005020D01* +X014414Y005032D01* +X014379Y005052D01* +X014341Y005062D01* +X014192Y005062D01* +X014192Y004767D01* +X014132Y004767D01* +X014132Y005062D01* +X013982Y005062D01* +X013944Y005052D01* +X013909Y005032D01* +X013897Y005020D01* +X013875Y005042D01* +X013832Y005042D01* +X013832Y005089D01* +X013732Y005188D01* +X013238Y005682D01* +X013238Y005682D01* +X013138Y005782D01* +X012603Y005782D01* +X012857Y006036D01* +X014235Y006036D01* +X014262Y005970D01* +X014332Y005900D01* +X014424Y005862D01* +X014524Y005862D01* +X014616Y005900D01* +X014686Y005970D01* +X014705Y006016D01* +X014841Y005880D01* +X015326Y005880D01* +X015496Y006050D01* +X015555Y006050D01* +X015647Y006088D01* +X015717Y006158D01* +X015755Y006250D01* +X015755Y006349D01* +X015717Y006441D01* +X015654Y006505D01* +X016310Y006505D01* +X017179Y005635D01* +X017220Y005595D01* +X014513Y005595D01* +X014443Y005665D01* +X014443Y005724D01* +X014405Y005816D01* +X014334Y005886D01* +X014243Y005925D01* +X014143Y005925D01* +X014051Y005886D01* +X013981Y005816D01* +X013943Y005724D01* +X013943Y005625D01* +X013949Y005609D01* +X013864Y005574D01* +X013793Y005504D01* +X013755Y005412D01* +X013755Y005312D01* +X013793Y005220D01* +X013864Y005150D01* +X013956Y005112D01* +X014015Y005112D01* +X014029Y005098D01* X019013Y005098D01* +X019113Y005198D01* X020058Y006143D01* X020118Y006143D01* X020209Y006181D01* @@ -1765,85 +1555,55 @@ X020711Y008206D01* X020612Y008206D01* X020520Y008168D01* X020478Y008126D01* +X017827Y008126D01* +X017767Y008133D01* +X017758Y008126D01* X017747Y008126D01* -X017122Y007501D01* -X012451Y007501D01* -X012394Y007557D01* -X012295Y007657D01* -X011564Y007657D01* -X011522Y007699D01* -X011430Y007737D01* -X011331Y007737D01* -X011239Y007699D01* -X011168Y007629D01* -X011130Y007537D01* -X011130Y007437D01* -X011168Y007345D01* -X011239Y007275D01* -X011318Y007242D01* -X011318Y007187D01* -X011356Y007095D01* -X011426Y007025D01* -X011518Y006987D01* -X011599Y006987D01* -X011599Y006982D01* -X011520Y006949D01* -X011450Y006879D01* -X011412Y006787D01* -X011412Y006687D01* -X011450Y006595D01* -X011520Y006525D01* -X011612Y006487D01* -X011711Y006487D01* -X011787Y006518D01* -X011787Y006438D01* -X011739Y006418D01* -X011668Y006347D01* -X011630Y006256D01* -X011630Y006219D01* -X011586Y006237D01* -X011487Y006237D01* -X011395Y006199D01* -X011325Y006129D01* -X011287Y006037D01* -X011287Y005937D01* -X011299Y005907D01* -X009653Y005907D01* -X009044Y006516D01* -X009061Y006533D01* -X009099Y006625D01* -X009099Y006724D01* -X009061Y006816D01* -X008991Y006886D01* -X008943Y006906D01* -X008943Y007006D01* -X008905Y007097D01* -X008834Y007168D01* -X008743Y007206D01* -X008643Y007206D01* -X008613Y007193D01* -X008613Y007479D01* -X008902Y007768D01* -X008961Y007768D01* -X009053Y007806D01* -X009124Y007877D01* -X009162Y007969D01* -X009162Y008068D01* -X009124Y008160D01* -X009053Y008230D01* -X008961Y008268D01* -X008862Y008268D01* -X008770Y008230D01* -X008700Y008160D01* -X008662Y008068D01* -X008662Y008009D01* -X008366Y007713D01* -X008366Y007727D01* -X008361Y007732D01* -X008366Y007738D01* -X008366Y007983D01* -X008361Y007988D01* -X008366Y007993D01* +X017704Y008083D01* +X017133Y007626D01* +X012263Y007626D01* +X012113Y007776D01* +X012013Y007876D01* +X011033Y007876D01* +X010991Y007918D01* +X010899Y007956D01* +X010799Y007956D01* +X010707Y007918D01* +X010637Y007847D01* +X010599Y007756D01* +X010599Y007656D01* +X010637Y007564D01* +X010707Y007494D01* +X010799Y007456D01* +X010849Y007456D01* +X010849Y007406D01* +X010887Y007314D01* +X010957Y007244D01* +X011049Y007206D01* +X011068Y007206D01* +X011068Y007156D01* +X011106Y007064D01* +X011138Y007032D01* +X009470Y007032D01* +X009428Y007074D01* +X009336Y007112D01* +X009287Y007112D01* +X009287Y007193D01* +X009249Y007285D01* +X009178Y007355D01* +X009086Y007393D01* +X008987Y007393D01* +X008895Y007355D01* +X008825Y007285D01* +X008800Y007226D01* +X008800Y007714D01* +X008724Y007790D01* +X008724Y007849D01* +X008686Y007941D01* +X008616Y008011D01* +X008524Y008050D01* +X008424Y008050D01* +X008366Y008025D01* X008366Y008239D01* X008361Y008244D01* X008366Y008249D01* @@ -1851,91 +1611,58 @@ X008366Y008495D01* X008290Y008571D01* X007159Y008571D01* X007130Y008542D01* -X006741Y008542D01* -X006709Y008574D01* -X006618Y008612D01* -X006518Y008612D01* -X006426Y008574D01* -X006356Y008504D01* -X006343Y008472D01* -X006334Y008480D01* -X006243Y008518D01* -X006143Y008518D01* -X006051Y008480D01* -X005981Y008410D01* -X005943Y008318D01* -X005943Y008219D01* -X005981Y008127D01* -X005996Y008112D01* -X005981Y008097D01* -X005943Y008006D01* -X005943Y007906D01* -X005981Y007814D01* -X005996Y007800D01* -X005981Y007785D01* -X005943Y007693D01* -X005943Y007594D01* -X005948Y007581D01* -X005893Y007581D01* -X005801Y007543D01* -X005731Y007472D01* -X005693Y007381D01* -X005693Y007281D01* -X005731Y007189D01* -X005801Y007119D01* -X005893Y007081D01* -X005993Y007081D01* -X006084Y007119D01* -X006144Y007179D01* +X006241Y008542D01* +X006209Y008574D01* +X006118Y008612D01* +X006018Y008612D01* +X005926Y008574D01* +X005856Y008504D01* +X005843Y008472D01* +X005834Y008480D01* +X005743Y008518D01* +X005643Y008518D01* +X005551Y008480D01* +X005481Y008410D01* +X005443Y008318D01* +X005443Y008219D01* +X005481Y008127D01* +X005496Y008112D01* +X005481Y008097D01* +X005443Y008006D01* +X005443Y007906D01* +X005481Y007814D01* +X005496Y007800D01* +X005481Y007785D01* +X005443Y007693D01* +X005443Y007594D01* +X005481Y007502D01* +X005496Y007487D01* +X005481Y007472D01* +X005443Y007381D01* +X005443Y007281D01* +X005481Y007189D01* +X005551Y007119D01* +X005643Y007081D01* +X005743Y007081D01* +X005834Y007119D01* +X005894Y007179D01* X007063Y007179D01* X007063Y007093D01* X007724Y007093D01* X007724Y007093D01* X007063Y007093D01* X007063Y007007D01* -X006433Y007007D01* -X006397Y007043D01* -X006305Y007081D01* -X006206Y007081D01* -X006114Y007043D01* -X006043Y006972D01* -X006005Y006881D01* -X006005Y006781D01* -X006043Y006689D01* -X006114Y006619D01* -X006206Y006581D01* -X006224Y006581D01* -X006224Y006531D01* -X006262Y006439D01* -X006332Y006369D01* -X006424Y006331D01* -X006474Y006331D01* -X006443Y006256D01* -X006443Y006156D01* -X006481Y006064D01* -X006551Y005994D01* -X006605Y005971D01* -X006568Y005881D01* -X006568Y005781D01* -X006606Y005689D01* -X006676Y005619D01* -X006755Y005586D01* -X006755Y005500D01* -X006767Y005471D01* -X006255Y005471D01* -X006255Y005506D01* -X006217Y005597D01* -X006147Y005668D01* -X006057Y005705D01* -X006113Y005760D01* -X006113Y006401D01* -X006068Y006446D01* -X006068Y006506D01* -X006030Y006597D01* -X005959Y006668D01* -X005868Y006706D01* -X005768Y006706D01* -X005676Y006668D01* +X005933Y007007D01* +X005897Y007043D01* +X005805Y007081D01* +X005706Y007081D01* +X005614Y007043D01* +X005543Y006972D01* +X005505Y006881D01* +X005505Y006781D01* +X005543Y006689D01* +X005614Y006619D01* +X005623Y006615D01* X005606Y006597D01* X005568Y006506D01* X005568Y006406D01* @@ -1964,371 +1691,266 @@ X008366Y004923D01* X008366Y005168D01* X008361Y005173D01* X008366Y005179D01* -X008366Y005424D01* -X008361Y005429D01* -X008366Y005434D01* -X008366Y005680D01* -X008361Y005685D01* -X008366Y005690D01* -X008366Y005842D01* -X008393Y005831D01* -X008493Y005831D01* -X008584Y005869D01* -X008655Y005939D01* -X008693Y006031D01* -X008693Y006131D01* -X008679Y006165D01* -X009333Y005510D01* -X009433Y005411D01* -X012263Y005411D01* -X012363Y005510D01* -X012363Y005510D01* -X012763Y005911D01* -X014255Y005911D01* -X014255Y005906D01* -X014293Y005814D01* -X014364Y005744D01* -X014456Y005706D01* -X014555Y005706D01* -X014647Y005744D01* -X014717Y005814D01* -X014755Y005906D01* -X014755Y005965D01* -X014841Y005880D01* -X015326Y005880D01* -X015496Y006050D01* -X015555Y006050D01* -X015647Y006088D01* -X015717Y006158D01* -X015755Y006250D01* -X015755Y006349D01* -X015743Y006380D01* -X016435Y006380D01* -X017179Y005635D01* -X017220Y005595D01* -X014126Y005595D01* -X014084Y005636D01* -X013993Y005675D01* -X013893Y005675D01* -X013801Y005636D01* -X013731Y005566D01* -X013693Y005474D01* -X013693Y005375D01* -X013731Y005283D01* -X013801Y005213D01* -X013893Y005175D01* -X013943Y005175D01* -X013943Y005094D01* -X013981Y005002D01* -X014051Y004931D01* -X013957Y005060D02* -X013098Y005060D01* -X012942Y005060D02* -X012882Y005060D01* -X012882Y004962D02* -X012942Y004962D01* -X012942Y004863D02* -X012882Y004863D01* -X012725Y005060D02* -X012661Y005060D01* -X012662Y005159D02* -X013943Y005159D01* -X013757Y005257D02* -X012620Y005257D01* -X012476Y005356D02* -X013701Y005356D01* -X013693Y005454D02* -X012307Y005454D01* -X012347Y005356D02* -X011976Y005356D01* -X011847Y005356D02* -X011479Y005356D01* -X011344Y005356D02* -X008366Y005356D01* -X008366Y005454D02* -X009389Y005454D01* -X009333Y005510D02* -X009333Y005510D01* -X009291Y005553D02* -X008366Y005553D01* -X008366Y005651D02* -X009192Y005651D01* -X009094Y005750D02* -X008366Y005750D01* -X008535Y005848D02* -X008995Y005848D01* -X008897Y005947D02* -X008658Y005947D01* -X008693Y006045D02* -X008798Y006045D01* -X008700Y006144D02* -X008687Y006144D01* -X009121Y006439D02* -X011787Y006439D01* -X011666Y006341D02* -X009219Y006341D01* -X009318Y006242D02* -X011630Y006242D01* -X011340Y006144D02* -X009416Y006144D01* -X009515Y006045D02* -X011290Y006045D01* -X011287Y005947D02* -X009613Y005947D01* -X009063Y006538D02* -X011507Y006538D01* -X011433Y006636D02* -X009099Y006636D01* -X009095Y006735D02* -X011412Y006735D01* -X011431Y006833D02* -X009044Y006833D01* -X008943Y006932D02* -X011503Y006932D01* -X011421Y007030D02* -X008933Y007030D01* -X008873Y007129D02* -X011342Y007129D01* -X011318Y007227D02* -X008613Y007227D01* -X008613Y007326D02* -X011188Y007326D01* -X011136Y007424D02* -X008613Y007424D01* -X008657Y007523D02* -X011130Y007523D01* -X011165Y007621D02* -X008755Y007621D01* -X008854Y007720D02* -X009609Y007720D01* -X009479Y007818D02* -X009065Y007818D01* -X009140Y007917D02* -X009443Y007917D01* -X009447Y008015D02* -X009162Y008015D01* -X009143Y008114D02* -X009497Y008114D01* -X009709Y008212D02* -X009071Y008212D01* -X008752Y008212D02* -X008366Y008212D01* -X008366Y008114D02* -X008681Y008114D01* -X008662Y008015D02* -X008366Y008015D01* -X008366Y007917D02* -X008570Y007917D01* -X008471Y007818D02* -X008366Y007818D01* -X008366Y007720D02* -X008373Y007720D01* -X008366Y008311D02* -X009807Y008311D01* -X009906Y008409D02* -X008366Y008409D01* -X008353Y008508D02* -X010004Y008508D01* -X010263Y008606D02* -X006631Y008606D01* -X006504Y008606D02* -X004593Y008606D01* -X004593Y008508D02* -X006118Y008508D01* -X006268Y008508D02* -X006360Y008508D01* -X006198Y008705D02* -X010263Y008705D01* -X011123Y008705D02* -X011243Y008705D01* -X011243Y008606D02* -X011123Y008606D01* -X011123Y008508D02* -X011243Y008508D01* -X011123Y008409D02* -X011643Y008409D01* -X011643Y008343D02* -X011243Y008343D01* -X011243Y008074D01* -X011253Y008035D01* -X011273Y008001D01* -X011301Y007973D01* -X011335Y007954D01* -X011373Y007943D01* -X011643Y007943D01* +X008366Y005292D01* +X008424Y005268D01* +X008524Y005268D01* +X008566Y005286D01* +X010679Y005286D01* +X010679Y005230D01* +X009995Y005230D01* +X009919Y005153D01* +X009919Y004543D01* +X006236Y004543D01* +X006161Y004618D01* +X005975Y004618D01* +X005943Y004587D01* +X005911Y004618D01* +X005725Y004618D01* +X005693Y004587D01* +X005661Y004618D01* +X005475Y004618D01* +X005443Y004587D01* +X005411Y004618D01* +X005225Y004618D01* +X005193Y004587D01* +X005161Y004618D01* +X004975Y004618D01* +X004943Y004587D01* +X004911Y004618D01* +X004725Y004618D01* +X004693Y004587D01* +X004661Y004618D01* +X004593Y004618D01* +X004593Y008668D01* +X004661Y008668D01* +X004693Y008700D01* +X004725Y008668D01* +X004911Y008668D01* +X004943Y008700D01* +X004975Y008668D01* +X005161Y008668D01* +X005193Y008700D01* +X005225Y008668D01* +X005411Y008668D01* +X005443Y008700D01* +X005475Y008668D01* +X005661Y008668D01* +X005693Y008700D01* +X005725Y008668D01* +X005911Y008668D01* +X005943Y008700D01* +X005975Y008668D01* +X006161Y008668D01* +X006236Y008743D01* +X010263Y008743D01* +X010263Y008563D01* +X010012Y008563D01* +X009948Y008568D01* +X009942Y008563D01* +X009935Y008563D01* +X009890Y008518D01* +X009161Y007893D01* +X009081Y007893D01* +X008989Y007855D01* +X008918Y007785D01* +X008880Y007693D01* +X008880Y007594D01* +X008918Y007502D01* +X008989Y007431D01* +X009081Y007393D01* +X009180Y007393D01* +X009272Y007431D01* +X009342Y007502D01* +X009380Y007594D01* +X009380Y007634D01* +X010068Y008223D01* +X010263Y008223D01* +X010263Y008039D01* +X010339Y007963D01* +X011047Y007963D01* +X011123Y008039D01* +X011123Y008743D01* +X011251Y008743D01* +X011243Y008713D01* +X011243Y008443D01* +X011643Y008443D01* X011643Y008343D01* -X011643Y008311D02* -X011743Y008311D01* -X011743Y008409D02* -X012388Y008409D01* -X012388Y008311D02* -X012143Y008311D01* -X012143Y008212D02* -X012388Y008212D01* -X012388Y008114D02* -X012143Y008114D01* -X012121Y008015D02* -X012412Y008015D01* -X012330Y007621D02* -X013611Y007621D01* -X013531Y007720D02* -X011472Y007720D01* -X011289Y007720D02* -X009776Y007720D01* -X009906Y007818D02* -X013505Y007818D01* -X013520Y007917D02* -X009943Y007917D01* -X009993Y008015D02* -X010287Y008015D01* -X010263Y008114D02* -X010091Y008114D01* -X010190Y008212D02* -X010263Y008212D01* -X011099Y008015D02* -X011265Y008015D01* -X011243Y008114D02* -X011123Y008114D01* -X011123Y008212D02* -X011243Y008212D01* -X011243Y008311D02* -X011123Y008311D01* -X011643Y008212D02* -X011743Y008212D01* -X011743Y008114D02* -X011643Y008114D01* -X011643Y008015D02* -X011743Y008015D01* -X012143Y008508D02* -X012388Y008508D01* -X012388Y008606D02* -X012143Y008606D01* -X012143Y008705D02* -X012388Y008705D01* -X013248Y008705D02* -X013368Y008705D01* -X013368Y008606D02* -X013248Y008606D01* -X013248Y008508D02* -X013368Y008508D01* -X013248Y008409D02* -X013768Y008409D01* -X013868Y008409D02* -X014513Y008409D01* -X014513Y008311D02* -X014268Y008311D01* -X014268Y008343D02* +X011743Y008343D01* +X011743Y007943D01* +X012013Y007943D01* +X012051Y007954D01* +X012085Y007973D01* +X012113Y008001D01* +X012133Y008035D01* +X012143Y008074D01* +X012143Y008343D01* +X011743Y008343D01* +X011743Y008443D01* +X012143Y008443D01* +X012143Y008713D01* +X012135Y008743D01* +X012388Y008743D01* +X012388Y008039D01* +X012464Y007963D01* +X013172Y007963D01* +X013248Y008039D01* +X013248Y008743D01* +X013376Y008743D01* +X013368Y008713D01* +X013368Y008443D01* +X013768Y008443D01* +X013768Y008343D01* X013868Y008343D01* -X013868Y008443D01* -X014268Y008443D01* -X014268Y008713D01* -X014260Y008743D01* -X014513Y008743D01* -X014513Y008039D01* -X014552Y008001D01* -X014237Y008001D01* -X014238Y008001D01* -X014258Y008035D01* -X014268Y008074D01* -X014268Y008343D01* -X014268Y008508D02* -X014513Y008508D01* -X014513Y008606D02* -X014268Y008606D01* -X014268Y008705D02* -X014513Y008705D01* -X014513Y008212D02* -X014268Y008212D01* -X014268Y008114D02* -X014513Y008114D01* -X014537Y008015D02* -X014246Y008015D01* -X013899Y007621D02* -X017243Y007621D01* -X017144Y007523D02* -X012429Y007523D01* -X013224Y008015D02* -X013390Y008015D01* -X013368Y008114D02* -X013248Y008114D01* -X013248Y008212D02* -X013368Y008212D01* -X013368Y008311D02* -X013248Y008311D01* -X016469Y007720D02* -X017341Y007720D01* -X017440Y007818D02* -X016567Y007818D01* -X016666Y007917D02* -X017538Y007917D01* -X017637Y008015D02* -X016764Y008015D01* -X016863Y008114D02* -X017735Y008114D01* -X018104Y008409D02* -X016863Y008409D01* -X016863Y008311D02* -X020905Y008311D01* -X020880Y008409D02* -X018281Y008409D01* -X017978Y008508D02* -X016907Y008508D01* -X016943Y008606D02* -X017943Y008606D01* -X017948Y008705D02* -X016938Y008705D01* -X016863Y008212D02* -X020983Y008212D01* -X020857Y008114D02* -X022043Y008114D01* -X022043Y008212D02* -X021277Y008212D01* -X021356Y008311D02* -X022043Y008311D01* -X022043Y008409D02* -X021380Y008409D01* -X021364Y008508D02* -X022043Y008508D01* -X022043Y008606D02* -X021296Y008606D01* -X020908Y008015D02* -X022043Y008015D01* -X022043Y007917D02* -X020912Y007917D01* -X020875Y007818D02* -X022043Y007818D01* -X022043Y007720D02* -X020745Y007720D01* -X020578Y007720D02* -X018501Y007720D01* -X018559Y007621D02* -X022043Y007621D01* -X022043Y007523D02* -X018568Y007523D01* -X018537Y007424D02* -X022043Y007424D01* -X022043Y007326D02* -X018431Y007326D01* -X018205Y007326D02* -X017922Y007326D01* -X017962Y007227D02* -X022043Y007227D01* -X022043Y007129D02* -X017962Y007129D01* -X017927Y007030D02* -X019034Y007030D01* -X019227Y007030D02* -X022043Y007030D01* -X022043Y006932D02* -X019346Y006932D01* -X019380Y006833D02* -X019661Y006833D01* -X019588Y006735D02* -X019374Y006735D01* -X019321Y006636D02* -X019568Y006636D01* -X019588Y006538D02* -X017505Y006538D01* +X013868Y007943D01* +X014138Y007943D01* +X014176Y007954D01* +X014210Y007973D01* +X014233Y007997D01* +X014224Y007974D01* +X014224Y007875D01* +X014262Y007783D01* +X014332Y007713D01* +X014424Y007675D01* +X014524Y007675D01* +X014616Y007713D01* +X014658Y007755D01* +X016503Y007755D01* +X016603Y007854D01* +X016763Y008014D01* +X016863Y008114D01* +X016863Y008460D01* +X016905Y008502D01* +X016943Y008594D01* +X016943Y008693D01* +X016922Y008743D01* +X017964Y008743D01* +X017943Y008693D01* +X017943Y008594D01* +X017981Y008502D01* +X018051Y008431D01* +X018143Y008393D01* +X018243Y008393D01* +X018334Y008431D01* +X018376Y008473D01* +X020836Y008473D01* +X020880Y008428D01* +X020880Y008369D01* +X020918Y008277D01* +X020989Y008207D01* +X021081Y008169D01* +X021180Y008169D01* +X021272Y008207D01* +X021342Y008277D01* +X021380Y008369D01* +X021380Y008469D01* +X021342Y008561D01* +X021272Y008631D01* +X021180Y008669D01* +X021162Y008669D01* +X021193Y008700D01* +X021225Y008668D01* +X021411Y008668D01* +X021443Y008700D01* +X021475Y008668D01* +X021661Y008668D01* +X021693Y008700D01* +X021725Y008668D01* +X021911Y008668D01* +X021943Y008700D01* +X021975Y008668D01* +X022043Y008668D01* +X022043Y004618D01* +X021975Y004618D01* +X021943Y004587D01* +X021911Y004618D01* +X021725Y004618D01* +X021693Y004587D01* +X021661Y004618D01* +X021475Y004618D01* +X021443Y004587D01* +X021411Y004618D01* +X021225Y004618D01* +X021193Y004587D01* +X021161Y004618D01* +X020975Y004618D01* +X020943Y004587D01* +X020911Y004618D01* +X020725Y004618D01* +X020693Y004587D01* +X020661Y004618D01* +X020475Y004618D01* +X020400Y004543D01* +X020333Y004543D01* +X020621Y004831D01* +X020680Y004831D01* +X020772Y004869D01* +X020842Y004939D01* +X020880Y005031D01* +X020880Y005131D01* +X020842Y005222D01* +X020772Y005293D01* +X020680Y005331D01* +X020581Y005331D01* +X020489Y005293D01* +X020418Y005222D01* +X020380Y005131D01* +X020380Y005071D01* +X020060Y004751D01* +X014952Y004751D01* +X014952Y004765D02* +X020074Y004765D01* +X020172Y004863D02* +X014952Y004863D01* +X014952Y004962D02* +X020271Y004962D01* +X020369Y005060D02* +X014348Y005060D01* +X014192Y005060D02* +X014132Y005060D01* +X014132Y004962D02* +X014192Y004962D01* +X014192Y004863D02* +X014132Y004863D01* +X013975Y005060D02* +X013832Y005060D01* +X013855Y005159D02* +X013762Y005159D01* +X013732Y005188D02* +X013732Y005188D01* +X013778Y005257D02* +X013663Y005257D01* +X013755Y005356D02* +X013565Y005356D01* +X013466Y005454D02* +X013773Y005454D01* +X013843Y005553D02* +X013368Y005553D01* +X013269Y005651D02* +X013943Y005651D01* +X013953Y005750D02* +X013171Y005750D01* +X012768Y005947D02* +X014286Y005947D01* +X014373Y005848D02* +X016966Y005848D01* +X017065Y005750D02* +X014432Y005750D01* +X014457Y005651D02* +X017163Y005651D01* +X016868Y005947D02* +X015393Y005947D01* +X015492Y006045D02* +X016769Y006045D01* +X016671Y006144D02* +X015703Y006144D01* +X015752Y006242D02* +X016572Y006242D01* +X016474Y006341D02* +X015755Y006341D01* +X015718Y006439D02* +X016375Y006439D01* +X017463Y006341D02* +X017561Y006341D01* X017505Y006439D02* X018574Y006439D01* X018520Y006417D02* @@ -2378,6 +2000,24 @@ X019556Y006341D02* X019000Y006341D01* X018869Y006439D02* X019648Y006439D01* +X019588Y006538D02* +X017505Y006538D01* +X017927Y007030D02* +X019034Y007030D01* +X019227Y007030D02* +X022043Y007030D01* +X022043Y006932D02* +X019346Y006932D01* +X019380Y006833D02* +X019661Y006833D01* +X019588Y006735D02* +X019374Y006735D01* +X019321Y006636D02* +X019568Y006636D01* +X019975Y006833D02* +X022043Y006833D01* +X022043Y006735D02* +X020048Y006735D01* X020134Y006636D02* X022043Y006636D01* X022043Y006538D02* @@ -2412,252 +2052,417 @@ X020392Y005159D02* X019074Y005159D01* X018867Y005651D02* X018316Y005651D01* -X017163Y005651D02* -X014049Y005651D01* -X013837Y005651D02* -X012504Y005651D01* -X012405Y005553D02* -X013725Y005553D01* -X014358Y005750D02* -X012602Y005750D01* -X012701Y005848D02* -X014279Y005848D01* -X014653Y005750D02* -X017065Y005750D01* -X016966Y005848D02* -X014731Y005848D01* -X014755Y005947D02* -X014774Y005947D01* -X015393Y005947D02* -X016868Y005947D01* -X016769Y006045D02* -X015492Y006045D01* -X015703Y006144D02* -X016671Y006144D01* -X016572Y006242D02* -X015752Y006242D01* -X015755Y006341D02* -X016474Y006341D01* -X017463Y006341D02* -X017561Y006341D01* -X019975Y006833D02* -X022043Y006833D01* -X022043Y006735D02* -X020048Y006735D01* -X020807Y005257D02* -X022043Y005257D01* -X022043Y005159D02* -X020869Y005159D01* -X020880Y005060D02* -X022043Y005060D01* -X022043Y004962D02* -X020852Y004962D01* -X020759Y004863D02* -X022043Y004863D01* -X022043Y004765D02* -X020555Y004765D01* +X020358Y004568D02* +X020424Y004568D01* X020456Y004666D02* X022043Y004666D01* -X020424Y004568D02* -X020358Y004568D01* -X020074Y004765D02* -X013937Y004765D01* -X013838Y004863D02* -X020172Y004863D01* -X020271Y004962D02* -X014365Y004962D01* -X014429Y005060D02* -X020369Y005060D01* -X012203Y005257D02* -X012120Y005257D01* -X012162Y005159D02* -X012162Y005159D01* -X012161Y005060D02* -X012162Y005060D01* -X011703Y005257D02* -X011621Y005257D01* -X011662Y005159D02* -X011662Y005159D01* -X011660Y005060D02* -X011662Y005060D01* -X011163Y005060D02* -X010373Y005060D01* -X010373Y004962D02* -X010395Y004962D01* -X010373Y005159D02* -X011162Y005159D01* -X011202Y005257D02* -X010300Y005257D01* -X010616Y004962D02* -X010622Y004962D01* -X009586Y005257D02* -X009300Y005257D01* -X009373Y005159D02* -X009513Y005159D01* -X009513Y005060D02* -X009373Y005060D01* -X009373Y004962D02* -X009513Y004962D01* -X009513Y004863D02* -X009373Y004863D01* -X009373Y004765D02* -X009513Y004765D01* -X009513Y004666D02* -X009373Y004666D01* -X009373Y004568D02* -X009513Y004568D01* -X008513Y004568D02* -X006212Y004568D01* -X005925Y004666D02* -X004593Y004666D01* -X004593Y004765D02* -X005827Y004765D01* -X005728Y004863D02* -X004593Y004863D01* -X004593Y004962D02* -X005630Y004962D01* -X005531Y005060D02* -X004593Y005060D01* -X004593Y005159D02* -X005433Y005159D01* -X005398Y005257D02* -X004593Y005257D01* -X004593Y005356D02* -X005398Y005356D01* -X005398Y005454D02* -X004593Y005454D01* -X004593Y005553D02* -X005398Y005553D01* -X005398Y005651D02* -X004593Y005651D01* -X004593Y005750D02* -X005398Y005750D01* +X022043Y004765D02* +X020555Y004765D01* +X020759Y004863D02* +X022043Y004863D01* +X022043Y004962D02* +X020852Y004962D01* +X020880Y005060D02* +X022043Y005060D01* +X022043Y005159D02* +X020869Y005159D01* +X020807Y005257D02* +X022043Y005257D01* +X022043Y007129D02* +X017962Y007129D01* +X017962Y007227D02* +X022043Y007227D01* +X022043Y007326D02* +X018431Y007326D01* +X018537Y007424D02* +X022043Y007424D01* +X022043Y007523D02* +X018568Y007523D01* +X018559Y007621D02* +X022043Y007621D01* +X022043Y007720D02* +X020745Y007720D01* +X020875Y007818D02* +X022043Y007818D01* +X022043Y007917D02* +X020912Y007917D01* +X020908Y008015D02* +X022043Y008015D01* +X022043Y008114D02* +X020857Y008114D01* +X020983Y008212D02* +X016863Y008212D01* +X016863Y008114D02* +X017735Y008114D01* +X017620Y008015D02* +X016764Y008015D01* +X016666Y007917D02* +X017497Y007917D01* +X017374Y007818D02* +X016567Y007818D01* +X017251Y007720D02* +X014623Y007720D01* +X014325Y007720D02* +X012169Y007720D01* +X012071Y007818D02* +X014248Y007818D01* +X014224Y007917D02* +X010992Y007917D01* +X011099Y008015D02* +X011265Y008015D01* +X011273Y008001D02* +X011301Y007973D01* +X011335Y007954D01* +X011373Y007943D01* +X011643Y007943D01* +X011643Y008343D01* +X011243Y008343D01* +X011243Y008074D01* +X011253Y008035D01* +X011273Y008001D01* +X011243Y008114D02* +X011123Y008114D01* +X011123Y008212D02* +X011243Y008212D01* +X011243Y008311D02* +X011123Y008311D01* +X011123Y008409D02* +X011643Y008409D01* +X011643Y008311D02* +X011743Y008311D01* +X011743Y008409D02* +X012388Y008409D01* +X012388Y008311D02* +X012143Y008311D01* +X012143Y008212D02* +X012388Y008212D01* +X012388Y008114D02* +X012143Y008114D01* +X012121Y008015D02* +X012412Y008015D01* +X011743Y008015D02* +X011643Y008015D01* +X011643Y008114D02* +X011743Y008114D01* +X011743Y008212D02* +X011643Y008212D01* +X011243Y008508D02* +X011123Y008508D01* +X011123Y008606D02* +X011243Y008606D01* +X011243Y008705D02* +X011123Y008705D01* +X010263Y008705D02* +X006198Y008705D01* +X006131Y008606D02* +X010263Y008606D01* +X009878Y008508D02* +X008353Y008508D01* +X008366Y008409D02* +X009763Y008409D01* +X009648Y008311D02* +X008366Y008311D01* +X008366Y008212D02* +X009533Y008212D01* +X009418Y008114D02* +X008366Y008114D01* +X008606Y008015D02* +X009303Y008015D01* +X009188Y007917D02* +X008696Y007917D01* +X008724Y007818D02* +X008952Y007818D01* +X008891Y007720D02* +X008794Y007720D01* +X008800Y007621D02* +X008880Y007621D01* +X008910Y007523D02* +X008800Y007523D01* +X008800Y007424D02* +X009006Y007424D01* +X008866Y007326D02* +X008800Y007326D01* +X008800Y007227D02* +X008801Y007227D01* +X008460Y007179D02* +X008460Y007001D01* +X008385Y007001D01* +X008386Y007004D01* +X008386Y007093D01* +X008386Y007179D01* +X008460Y007179D01* +X008460Y007129D02* +X008386Y007129D01* +X008386Y007093D02* +X007724Y007093D01* +X007724Y007093D01* +X008386Y007093D01* +X008386Y007030D02* +X008460Y007030D01* +X009208Y007326D02* +X010882Y007326D01* +X010849Y007424D02* +X009255Y007424D01* +X009351Y007523D02* +X010679Y007523D01* +X010613Y007621D02* +X009380Y007621D01* +X009481Y007720D02* +X010599Y007720D01* +X010625Y007818D02* +X009596Y007818D01* +X009711Y007917D02* +X010707Y007917D01* +X010287Y008015D02* +X009826Y008015D01* +X009940Y008114D02* +X010263Y008114D01* +X010263Y008212D02* +X010055Y008212D01* +X009272Y007227D02* +X010997Y007227D01* +X011079Y007129D02* +X009287Y007129D01* +X007063Y007129D02* +X005844Y007129D01* +X005909Y007030D02* +X007063Y007030D01* +X005601Y007030D02* +X004593Y007030D01* +X004593Y006932D02* +X005527Y006932D01* +X005505Y006833D02* +X004593Y006833D01* +X004593Y006735D02* +X005525Y006735D01* +X005596Y006636D02* +X004593Y006636D01* +X004593Y006538D02* +X005581Y006538D01* +X005568Y006439D02* +X004593Y006439D01* +X004593Y006341D02* +X005595Y006341D01* +X005680Y006242D02* +X004593Y006242D01* +X004593Y006144D02* +X005527Y006144D01* +X005459Y006045D02* +X004593Y006045D01* +X004593Y005947D02* +X005443Y005947D01* X005398Y005848D02* X004593Y005848D01* -X004593Y005947D02* -X005443Y005947D01* -X005459Y006045D02* -X004593Y006045D01* -X004593Y006144D02* -X005527Y006144D01* -X005680Y006242D02* -X004593Y006242D01* -X004593Y006341D02* -X005595Y006341D01* -X005568Y006439D02* -X004593Y006439D01* -X004593Y006538D02* -X005581Y006538D01* -X005645Y006636D02* -X004593Y006636D01* -X004593Y006735D02* -X006025Y006735D01* -X006005Y006833D02* -X004593Y006833D01* -X004593Y006932D02* -X006027Y006932D01* -X006101Y007030D02* -X004593Y007030D01* -X004593Y007129D02* -X005791Y007129D01* -X005715Y007227D02* -X004593Y007227D01* -X004593Y007326D02* -X005693Y007326D01* -X005711Y007424D02* -X004593Y007424D01* -X004593Y007523D02* -X005781Y007523D01* -X005943Y007621D02* -X004593Y007621D01* -X004593Y007720D02* -X005954Y007720D01* -X005979Y007818D02* -X004593Y007818D01* -X004593Y007917D02* -X005943Y007917D01* -X005947Y008015D02* -X004593Y008015D01* -X004593Y008114D02* -X005994Y008114D01* -X005945Y008212D02* -X004593Y008212D01* -X004593Y008311D02* -X005943Y008311D01* -X005981Y008409D02* -X004593Y008409D01* -X006094Y007129D02* -X007063Y007129D01* -X007063Y007030D02* -X006409Y007030D01* -X006096Y006636D02* -X005991Y006636D01* -X006054Y006538D02* -X006224Y006538D01* -X006262Y006439D02* -X006075Y006439D01* -X006113Y006341D02* -X006400Y006341D01* -X006443Y006242D02* -X006113Y006242D01* -X006113Y006144D02* -X006448Y006144D01* -X006500Y006045D02* -X006113Y006045D01* -X006113Y005947D02* -X006595Y005947D01* -X006568Y005848D02* -X006113Y005848D01* -X006102Y005750D02* -X006581Y005750D01* -X006644Y005651D02* -X006163Y005651D01* -X006236Y005553D02* -X006755Y005553D01* -X008366Y005257D02* -X008586Y005257D01* -X008513Y005159D02* -X008366Y005159D01* -X008366Y005060D02* -X008513Y005060D01* -X008513Y004962D02* -X008366Y004962D01* -X008366Y004863D02* -X008513Y004863D01* -X008513Y004765D02* -X008366Y004765D01* -X008366Y004666D02* -X008513Y004666D01* +X004593Y005750D02* +X005398Y005750D01* +X005398Y005651D02* +X004593Y005651D01* +X004593Y005553D02* +X005398Y005553D01* +X005398Y005454D02* +X004593Y005454D01* +X004593Y005356D02* +X005398Y005356D01* +X005398Y005257D02* +X004593Y005257D01* +X004593Y005159D02* +X005433Y005159D01* +X005531Y005060D02* +X004593Y005060D01* +X004593Y004962D02* +X005630Y004962D01* +X005728Y004863D02* +X004593Y004863D01* +X004593Y004765D02* +X005827Y004765D01* +X005925Y004666D02* +X004593Y004666D01* +X006212Y004568D02* +X009919Y004568D01* +X009919Y004666D02* +X008366Y004666D01* +X008366Y004765D02* +X009919Y004765D01* +X009919Y004863D02* +X008366Y004863D01* +X008366Y004962D02* +X009919Y004962D01* +X009919Y005060D02* +X008366Y005060D01* +X008366Y005159D02* +X009925Y005159D01* +X010679Y005257D02* +X008366Y005257D01* +X005541Y007129D02* +X004593Y007129D01* +X004593Y007227D02* +X005465Y007227D01* +X005443Y007326D02* +X004593Y007326D01* +X004593Y007424D02* +X005461Y007424D01* +X005472Y007523D02* +X004593Y007523D01* +X004593Y007621D02* +X005443Y007621D01* +X005454Y007720D02* +X004593Y007720D01* +X004593Y007818D02* +X005479Y007818D01* +X005443Y007917D02* +X004593Y007917D01* +X004593Y008015D02* +X005447Y008015D01* +X005494Y008114D02* +X004593Y008114D01* +X004593Y008212D02* +X005445Y008212D01* +X005443Y008311D02* +X004593Y008311D01* +X004593Y008409D02* +X005481Y008409D01* +X005618Y008508D02* +X004593Y008508D01* +X004593Y008606D02* +X006004Y008606D01* +X005860Y008508D02* +X005768Y008508D01* +X012143Y008508D02* +X012388Y008508D01* +X012388Y008606D02* +X012143Y008606D01* +X012143Y008705D02* +X012388Y008705D01* +X013248Y008705D02* +X013368Y008705D01* +X013368Y008606D02* +X013248Y008606D01* +X013248Y008508D02* +X013368Y008508D01* +X013248Y008409D02* +X013768Y008409D01* +X013768Y008343D02* +X013368Y008343D01* +X013368Y008074D01* +X013378Y008035D01* +X013398Y008001D01* +X013426Y007973D01* +X013460Y007954D01* +X013498Y007943D01* +X013768Y007943D01* +X013768Y008343D01* +X013768Y008311D02* +X013868Y008311D01* +X013868Y008343D02* +X013868Y008443D01* +X014268Y008443D01* +X014268Y008713D01* +X014260Y008743D01* +X014513Y008743D01* +X014513Y008175D01* +X014424Y008175D01* +X014332Y008136D01* +X014267Y008071D01* +X014268Y008074D01* +X014268Y008343D01* +X013868Y008343D01* +X013868Y008409D02* +X014513Y008409D01* +X014513Y008311D02* +X014268Y008311D01* +X014268Y008212D02* +X014513Y008212D01* +X014310Y008114D02* +X014268Y008114D01* +X013868Y008114D02* +X013768Y008114D01* +X013768Y008212D02* +X013868Y008212D01* +X013868Y008015D02* +X013768Y008015D01* +X013390Y008015D02* +X013224Y008015D01* +X013248Y008114D02* +X013368Y008114D01* +X013368Y008212D02* +X013248Y008212D01* +X013248Y008311D02* +X013368Y008311D01* +X014268Y008508D02* +X014513Y008508D01* +X014513Y008606D02* +X014268Y008606D01* +X014268Y008705D02* +X014513Y008705D01* +X016863Y008409D02* +X018104Y008409D01* +X017978Y008508D02* +X016907Y008508D01* +X016943Y008606D02* +X017943Y008606D01* +X017948Y008705D02* +X016938Y008705D01* +X016863Y008311D02* +X020905Y008311D01* +X020880Y008409D02* +X018281Y008409D01* +X018501Y007720D02* +X020578Y007720D01* +X021277Y008212D02* +X022043Y008212D01* +X022043Y008311D02* +X021356Y008311D01* +X021380Y008409D02* +X022043Y008409D01* +X022043Y008508D02* +X021364Y008508D01* +X021296Y008606D02* +X022043Y008606D01* +X018205Y007326D02* +X017922Y007326D01* +X014774Y005947D02* +X014662Y005947D01* +X014013Y005848D02* +X012670Y005848D01* D15* -X008443Y005237D03* -X007005Y005550D03* -X006818Y005831D03* -X007005Y006081D03* -X006693Y006206D03* -X006474Y006581D03* -X006255Y006831D03* -X005818Y006456D03* -X005693Y005956D03* +X012224Y006175D03* +X011974Y006425D03* +X011755Y006675D03* +X011505Y006925D03* +X011318Y007206D03* +X011099Y007456D03* +X010849Y007706D03* +X009630Y007643D03* +X009130Y007643D03* +X008474Y007800D03* +X009037Y007143D03* +X009287Y006862D03* +X008380Y006550D03* +X008630Y006300D03* +X009099Y006018D03* +X009412Y006143D03* +X009724Y006268D03* +X008787Y005737D03* +X008474Y005518D03* +X006162Y005737D03* X006005Y005456D03* -X004787Y005268D03* -X008443Y006081D03* -X008849Y006675D03* -X008693Y006956D03* -X010162Y006706D03* -X011380Y007487D03* -X011568Y007237D03* -X011849Y006987D03* -X011662Y006737D03* -X012037Y006487D03* -X011880Y006206D03* -X011537Y005987D03* -X011412Y005113D03* -X011912Y005112D03* -X012412Y005112D03* -X012912Y005112D03* -X013943Y005425D03* -X014193Y005143D03* -X014505Y005956D03* +X005693Y005956D03* +X006193Y006081D03* +X005818Y006456D03* +X006099Y006612D03* +X005755Y006831D03* +X005693Y007331D03* +X005693Y007643D03* +X005693Y007956D03* +X005693Y008268D03* +X006068Y008362D03* +X006349Y008643D03* +X011130Y005393D03* +X012662Y005020D03* +X013724Y005768D03* +X014193Y005675D03* +X014005Y005362D03* +X014474Y006112D03* X015005Y006300D03* X015505Y006300D03* X016005Y006300D03* @@ -2676,53 +2481,137 @@ X021130Y008419D03* X021912Y008393D03* X018193Y008643D03* X016693Y008643D03* -X013755Y007831D03* +X014474Y007925D03* X013443Y007768D03* -X009693Y007956D03* -X008912Y008018D03* -X009068Y008550D03* -X006568Y008362D03* -X006193Y008268D03* -X006193Y007956D03* -X006193Y007643D03* -X005943Y007331D03* -X010505Y004737D03* X020630Y005081D03* X021130Y005112D03* +X005380Y004893D03* +X004787Y005268D03* D16* -X020630Y005081D02* -X020130Y004581D01* -X013880Y004581D01* -X013724Y004737D01* -X013412Y004737D01* -X014193Y005143D02* -X014318Y005268D01* -X018943Y005268D01* -X020068Y006393D01* -X019818Y006362D02* -X019818Y006637D01* -X019818Y006362D02* +X005568Y005264D02* +X006043Y004789D01* +X007724Y004789D01* +X007724Y005045D02* +X006052Y005045D01* +X005755Y005342D01* +X005755Y005643D01* +X005943Y005831D01* +X005943Y006331D01* +X005818Y006456D01* +X006099Y006612D02* +X006380Y006331D01* +X007380Y006331D01* +X007386Y006325D01* +X007724Y006325D01* +X007724Y006581D02* +X008099Y006581D01* +X008380Y006550D01* +X008630Y006300D02* +X008630Y006831D01* +X008630Y007349D01* +X008630Y007643D01* +X008474Y007800D01* +X008630Y007349D02* +X007724Y007349D01* +X005711Y007349D01* +X005693Y007331D01* +X005732Y007604D02* +X007724Y007604D01* +X007724Y007860D02* +X005788Y007860D01* +X005693Y007956D01* +X005845Y008116D02* +X007724Y008116D01* +X007724Y008372D02* +X006078Y008372D01* +X006068Y008362D01* +X005845Y008116D02* +X005693Y008268D01* +X005693Y007643D02* +X005732Y007604D01* +X006443Y007093D02* +X007724Y007093D01* +X007724Y006837D02* +X007418Y006831D01* +X008630Y006831D01* +X009037Y006581D02* +X011255Y006581D01* +X012068Y005768D01* +X012349Y005768D01* +X012787Y006206D01* +X014380Y006206D01* +X014474Y006112D01* +X014599Y006362D02* +X014912Y006050D01* +X015255Y006050D01* +X015505Y006300D01* +X015005Y006300D02* +X014787Y006518D01* +X012568Y006518D01* +X012224Y006175D01* +X012287Y005925D02* +X012724Y006362D01* +X014599Y006362D01* +X014193Y005675D02* +X014443Y005425D01* X018880Y005425D01* -X013943Y005425D01* -X014505Y005956D02* -X014380Y006081D01* -X012693Y006081D01* -X012193Y005581D01* -X009503Y005581D01* -X008599Y006485D01* -X008599Y006862D01* -X008693Y006956D01* -X008443Y006831D02* -X008443Y007349D01* -X008443Y007550D01* -X008912Y008018D01* -X009693Y007956D02* -X010130Y008393D01* +X019818Y006362D01* +X019818Y006637D01* +X020068Y006393D02* +X018943Y005268D01* +X014099Y005268D01* +X014005Y005362D01* +X013662Y005018D02* +X013068Y005612D01* +X012005Y005612D01* +X011349Y006268D01* +X009724Y006268D01* +X009568Y005987D02* +X009412Y006143D01* +X009568Y005987D02* +X011412Y005987D01* +X011943Y005456D01* +X012974Y005456D01* +X013162Y005268D01* +X013162Y004737D01* +X013662Y004737D02* +X013662Y005018D01* +X014099Y004862D02* +X014162Y004737D01* +X014662Y004737D02* +X014818Y004581D01* +X020130Y004581D01* +X020630Y005081D01* +X018068Y005706D02* +X017349Y005706D01* +X016380Y006675D01* +X012224Y006675D01* +X011974Y006425D01* +X012005Y006675D02* +X011755Y006675D01* +X012005Y006675D02* +X012162Y006831D01* +X016443Y006831D01* +X017162Y006112D01* +X017662Y006112D01* +X017255Y006487D02* +X016755Y006987D01* +X012068Y006987D01* +X012005Y006925D01* +X011505Y006925D01* +X011193Y006862D02* +X009287Y006862D01* +X009037Y006581D02* +X009037Y007143D01* +X009380Y007393D02* +X009630Y007643D01* +X009130Y007643D02* +X010005Y008393D01* X010693Y008393D01* -X011380Y007487D02* -X012224Y007487D01* -X012380Y007331D01* -X017193Y007331D01* +X010849Y007706D02* +X011943Y007706D01* +X012193Y007456D01* +X017193Y007456D01* X017818Y007956D01* X020662Y007956D01* X021130Y008419D02* @@ -2730,132 +2619,70 @@ X020906Y008643D01* X018193Y008643D01* X016693Y008643D02* X016693Y008184D01* -X016339Y007831D01* -X013755Y007831D01* -X012318Y007175D02* -X012255Y007237D01* -X011568Y007237D01* -X011849Y006987D02* -X011912Y006925D01* -X012224Y006925D01* -X012318Y007018D01* -X017287Y007018D01* -X017505Y006800D01* +X016433Y007925D01* +X014474Y007925D01* +X012130Y007300D02* +X011974Y007456D01* +X011099Y007456D01* +X011318Y007206D02* +X012005Y007206D01* +X012068Y007143D01* +X016818Y007143D01* +X017162Y006800D01* X019130Y006800D01* X018318Y007550D02* -X017630Y007550D01* -X017255Y007175D01* -X012318Y007175D01* -X012380Y006862D02* -X012255Y006737D01* -X011662Y006737D01* -X012037Y006487D02* -X012224Y006487D01* -X012443Y006706D01* -X016568Y006706D01* -X017162Y006112D01* -X017662Y006112D01* -X017349Y005706D02* -X018068Y005706D01* -X017349Y005706D02* -X016505Y006550D01* -X012505Y006550D01* -X012162Y006206D01* -X011880Y006206D01* -X012130Y005956D02* -X011568Y005956D01* -X011537Y005987D01* -X012130Y005956D02* -X012568Y006393D01* -X014912Y006393D01* -X015005Y006300D01* -X014912Y006050D02* -X014724Y006237D01* -X012630Y006237D01* -X012130Y005737D01* -X009583Y005737D01* -X008849Y006471D01* -X008849Y006675D01* -X008443Y006831D02* -X007730Y006831D01* -X007724Y006837D01* -X006261Y006837D01* -X006255Y006831D01* -X006443Y007093D02* -X007724Y007093D01* -X007724Y007349D02* -X008443Y007349D01* -X007724Y007349D02* -X005961Y007349D01* -X005943Y007331D01* -X006232Y007604D02* -X007724Y007604D01* -X007724Y007860D02* -X006288Y007860D01* -X006193Y007956D01* -X006345Y008116D02* -X007724Y008116D01* -X007724Y008372D02* -X006578Y008372D01* -X006568Y008362D01* -X006345Y008116D02* -X006193Y008268D01* -X006193Y007643D02* -X006232Y007604D01* -X006474Y006581D02* -X007724Y006581D01* -X007718Y006331D02* -X007693Y006331D01* -X007699Y006325D01* -X007724Y006325D01* -X007693Y006331D02* -X006755Y006331D01* -X006693Y006268D01* -X006693Y006206D01* -X007005Y006081D02* -X007017Y006069D01* +X017599Y007550D01* +X017287Y007300D01* +X012130Y007300D01* +X011193Y006862D02* +X012130Y005925D01* +X012287Y005925D01* +X011880Y005300D02* +X011349Y005831D01* +X009287Y005831D01* +X009099Y006018D01* +X008787Y005737D02* +X008849Y005675D01* +X011068Y005675D01* +X011130Y005612D01* +X011130Y005393D01* +X010849Y005362D02* +X010755Y005456D01* +X008537Y005456D01* +X008474Y005518D01* +X008488Y005813D02* +X009037Y006362D01* +X009037Y006581D01* +X007724Y006837D02* +X005761Y006837D01* +X005755Y006831D01* +X006193Y006081D02* +X006517Y006069D01* X007724Y006069D01* +X007406Y006331D02* +X007380Y006331D01* X007724Y005813D02* -X006836Y005813D01* -X006818Y005831D01* -X007013Y005557D02* -X007005Y005550D01* -X007013Y005557D02* -X007724Y005557D01* -X007724Y005301D02* +X008488Y005813D01* +X007724Y005557D02* +X006341Y005557D01* +X006162Y005737D01* +X006005Y005456D02* X006160Y005301D01* -X006005Y005456D01* -X005755Y005342D02* -X006052Y005045D01* -X007724Y005045D01* -X007724Y004789D02* -X006043Y004789D01* -X005568Y005264D01* +X007724Y005301D01* +X005693Y005956D02* X005568Y005831D01* -X005693Y005956D01* -X005943Y005831D02* -X005943Y006331D01* -X005818Y006456D01* -X005943Y005831D02* -X005755Y005643D01* -X005755Y005342D01* -X008443Y006081D02* -X008443Y006831D01* -X011412Y005113D02* -X011412Y004737D01* -X011912Y004737D02* -X011912Y005112D01* -X012412Y005112D02* -X012412Y004737D01* -X012443Y004768D01* -X011943Y004768D02* -X011912Y004737D01* -X010912Y004737D02* -X010505Y004737D01* -X012380Y006862D02* -X016880Y006862D01* -X017255Y006487D01* -X015505Y006300D02* -X015255Y006050D01* -X014912Y006050D01* +X005568Y005264D01* +X010849Y005362D02* +X010849Y004862D01* +X010912Y004800D01* +X011349Y004800D01* +X011880Y005300D02* +X012537Y005300D01* +X012662Y005175D01* +X012662Y005020D01* +X012662Y004737D01* +X012162Y004737D02* +X012099Y004862D01* +X011287Y005675D01* +X011068Y005675D01* M02* diff --git a/CAM/zoncoffee.GBO b/CAM/zoncoffee.GBO --- a/CAM/zoncoffee.GBO +++ b/CAM/zoncoffee.GBO @@ -1628,120 +1628,46 @@ X021980Y004578D02* X021980Y004848D01* X021845Y004848D01* X021800Y004803D01* -X013662Y004785D02* -X013162Y004785D01* -X013162Y004833D02* -X013662Y004833D01* -X013662Y004882D02* -X013162Y004882D01* -X013162Y004930D02* -X013662Y004930D01* -X013662Y004979D02* -X013162Y004979D01* -X013162Y004987D02* -X013662Y004987D01* -X013662Y004487D01* -X013162Y004487D01* -X013162Y004987D01* -X013162Y004736D02* -X013662Y004736D01* -X013662Y004688D02* -X013162Y004688D01* -X013162Y004639D02* -X013662Y004639D01* -X013662Y004591D02* -X013162Y004591D01* -X013162Y004542D02* -X013662Y004542D01* -X013662Y004494D02* -X013162Y004494D01* -X013662Y004487D02* -X010662Y004487D01* -X010662Y004987D01* -X013662Y004987D01* -X013662Y004487D01* -X010518Y003847D02* -X010518Y006110D01* -X008352Y006110D01* -X008352Y003847D01* -X010518Y003847D01* -X010518Y003551D01* -X008352Y003551D01* -X008352Y003847D01* -X004894Y005387D02* -X004894Y005567D01* -X004849Y005567D01* -X004669Y005387D01* -X004624Y005387D01* -X004624Y005567D01* -X004669Y005682D02* -X004624Y005727D01* -X004624Y005817D01* -X004669Y005862D01* -X004759Y005862D01* -X004804Y005817D01* -X004804Y005727D01* -X004759Y005682D01* -X004669Y005682D01* -X004624Y005976D02* -X004804Y005976D01* -X004804Y006111D01* -X004759Y006157D01* -X004624Y006157D01* -X004669Y006271D02* -X004624Y006316D01* -X004624Y006451D01* -X004669Y006566D02* -X004624Y006611D01* -X004624Y006746D01* -X004759Y006746D01* -X004804Y006701D01* -X004804Y006611D01* -X004714Y006611D02* -X004714Y006746D01* -X004714Y006611D02* -X004669Y006566D01* -X004804Y006451D02* -X004804Y006316D01* -X004759Y006271D01* -X004669Y006271D01* -X004624Y007155D02* -X004804Y007335D01* -X004849Y007335D01* -X004894Y007290D01* -X004894Y007200D01* -X004849Y007155D01* -X004624Y007155D02* -X004624Y007335D01* -X004669Y007450D02* -X004624Y007495D01* -X004624Y007585D01* -X004669Y007630D01* -X004849Y007630D01* -X004669Y007450D01* -X004849Y007450D01* -X004894Y007495D01* -X004894Y007585D01* -X004849Y007630D01* -X004804Y007744D02* -X004894Y007834D01* -X004624Y007834D01* -X004624Y007744D02* -X004624Y007924D01* -X004759Y008039D02* -X004759Y008219D01* -X004624Y008174D02* -X004894Y008174D01* -X004759Y008039D01* -X008845Y006466D02* -X009025Y006286D01* -X009131Y006286D02* -X009176Y006331D01* -X009176Y006511D01* -X009221Y006466D02* -X009131Y006466D01* -X009025Y006466D02* -X008845Y006286D01* +X014912Y004785D02* +X014412Y004785D01* +X014412Y004833D02* +X014912Y004833D01* +X014912Y004882D02* +X014412Y004882D01* +X014412Y004930D02* +X014912Y004930D01* +X014912Y004979D02* +X014412Y004979D01* +X014412Y004987D02* +X014912Y004987D01* +X014912Y004487D01* +X014412Y004487D01* +X014412Y004987D01* +X014412Y004736D02* +X014912Y004736D01* +X014912Y004688D02* +X014412Y004688D01* +X014412Y004639D02* +X014912Y004639D01* +X014912Y004591D02* +X014412Y004591D01* +X014412Y004542D02* +X014912Y004542D01* +X014912Y004494D02* +X014412Y004494D01* +X014912Y004487D02* +X011912Y004487D01* +X011912Y004987D01* +X014912Y004987D01* +X014912Y004487D01* +X011924Y003815D02* +X011924Y006079D01* +X009759Y006079D01* +X009759Y003815D01* +X011924Y003815D01* +X011924Y003520D01* +X009759Y003520D01* +X009759Y003815D01* X009689Y006286D02* X009869Y006466D01* X009979Y006466D02* @@ -1751,6 +1677,15 @@ X010114Y006286D02* X010114Y006466D01* X009869Y006286D02* X009689Y006466D01* +X009221Y006466D02* +X009131Y006466D01* +X009176Y006511D02* +X009176Y006331D01* +X009131Y006286D01* +X009025Y006286D02* +X008845Y006466D01* +X009025Y006466D02* +X008845Y006286D01* X010343Y006796D02* X010523Y006796D01* X010433Y006706D02* @@ -1780,155 +1715,205 @@ X011370Y006719D02* X011370Y006900D01* X011687Y006827D02* X011867Y006827D01* +X004894Y007200D02* +X004849Y007155D01* +X004894Y007200D02* +X004894Y007290D01* +X004849Y007335D01* +X004804Y007335D01* +X004624Y007155D01* +X004624Y007335D01* +X004669Y007450D02* +X004624Y007495D01* +X004624Y007585D01* +X004669Y007630D01* +X004849Y007630D01* +X004669Y007450D01* +X004849Y007450D01* +X004894Y007495D01* +X004894Y007585D01* +X004849Y007630D01* +X004804Y007744D02* +X004894Y007834D01* +X004624Y007834D01* +X004624Y007744D02* +X004624Y007924D01* +X004759Y008039D02* +X004759Y008219D01* +X004624Y008174D02* +X004894Y008174D01* +X004759Y008039D01* +X004759Y006746D02* +X004624Y006746D01* +X004624Y006611D01* +X004669Y006566D01* +X004714Y006611D01* +X004714Y006746D01* +X004759Y006746D02* +X004804Y006701D01* +X004804Y006611D01* +X004804Y006451D02* +X004804Y006316D01* +X004759Y006271D01* +X004669Y006271D01* +X004624Y006316D01* +X004624Y006451D01* +X004624Y006157D02* +X004759Y006157D01* +X004804Y006111D01* +X004804Y005976D01* +X004624Y005976D01* +X004669Y005862D02* +X004624Y005817D01* +X004624Y005727D01* +X004669Y005682D01* +X004759Y005682D01* +X004804Y005727D01* +X004804Y005817D01* +X004759Y005862D01* +X004669Y005862D01* +X004624Y005567D02* +X004624Y005387D01* +X004669Y005387D01* +X004849Y005567D01* +X004894Y005567D01* +X004894Y005387D01* D12* -X013404Y005863D03* -X013404Y005743D03* -X013404Y005723D03* -X013404Y005703D03* -X013404Y005683D03* -X013404Y005663D03* -X013404Y005643D03* -X013404Y005623D03* -X013404Y005603D03* -X013404Y005583D03* -X013404Y005563D03* -X013404Y005543D03* -X013404Y005523D03* -X013404Y005503D03* -X013404Y005483D03* -X013404Y005463D03* -X013404Y005443D03* -X013404Y005423D03* -X013404Y005403D03* X013404Y005383D03* X013404Y005363D03* X013404Y005343D03* -X013924Y005443D03* -X013944Y005483D03* -X013964Y005543D03* -X013964Y005563D03* -X013964Y005583D03* -X013964Y005603D03* -X013964Y005623D03* -X013944Y005723D03* -X013944Y005743D03* -X013924Y005763D03* +X013404Y005403D03* +X013404Y005423D03* +X013404Y005443D03* +X013404Y005463D03* +X013404Y005483D03* +X013404Y005503D03* +X013404Y005523D03* +X013404Y005543D03* +X013404Y005563D03* +X013404Y005583D03* +X013404Y005603D03* +X013404Y005623D03* +X013404Y005643D03* +X013404Y005663D03* +X013404Y005683D03* +X013404Y005703D03* +X013404Y005723D03* +X013404Y005743D03* +X013404Y005863D03* X013644Y005763D03* X013644Y005743D03* X013624Y005703D03* -X014204Y005703D03* -X014204Y005683D03* -X014204Y005663D03* -X014204Y005643D03* -X014204Y005623D03* -X014204Y005603D03* -X014204Y005583D03* -X014204Y005563D03* -X014204Y005543D03* -X014204Y005523D03* -X014204Y005503D03* -X014204Y005483D03* -X014204Y005463D03* -X014204Y005443D03* +X013924Y005763D03* +X013944Y005743D03* +X013944Y005723D03* +X013964Y005623D03* +X013964Y005603D03* +X013964Y005583D03* +X013964Y005563D03* +X013964Y005543D03* +X013944Y005483D03* +X013924Y005443D03* X014184Y005403D03* X014184Y005383D03* X014184Y005363D03* +X014204Y005443D03* +X014204Y005463D03* +X014204Y005483D03* +X014204Y005503D03* +X014204Y005523D03* +X014204Y005543D03* +X014204Y005563D03* +X014204Y005583D03* +X014204Y005603D03* +X014204Y005623D03* +X014204Y005643D03* +X014204Y005663D03* +X014204Y005683D03* +X014204Y005703D03* +X014204Y005723D03* +X014204Y005743D03* +X014204Y005763D03* +X014204Y005783D03* +X014204Y005803D03* +X014204Y005823D03* +X014204Y005843D03* +X014204Y005863D03* +X014204Y005883D03* +X014204Y005903D03* +X014204Y005923D03* +X014204Y005943D03* +X014204Y005963D03* +X014204Y005983D03* +X014204Y006003D03* +X014204Y006023D03* +X014204Y006043D03* +X014204Y006063D03* +X014204Y006083D03* +X014204Y006103D03* +X014464Y006103D03* +X014464Y006083D03* +X014464Y006063D03* +X014464Y006043D03* +X014464Y006023D03* +X014464Y006003D03* +X014464Y005983D03* +X014464Y005963D03* +X014464Y005943D03* +X014464Y005923D03* +X014464Y005903D03* +X014464Y005883D03* +X014464Y005863D03* +X014464Y005843D03* +X014464Y005823D03* +X014464Y005803D03* +X014464Y005783D03* +X014464Y005763D03* +X014464Y005743D03* +X014464Y005723D03* +X014464Y005703D03* +X014464Y005683D03* +X014464Y005663D03* +X014464Y005643D03* +X014464Y005623D03* +X014464Y005603D03* +X014464Y005583D03* +X014464Y005563D03* +X014464Y005543D03* +X014464Y005523D03* +X014464Y005503D03* +X014464Y005483D03* +X014464Y005463D03* +X014464Y005443D03* +X014464Y005423D03* +X014464Y005403D03* X014444Y005363D03* X014444Y005343D03* -X014464Y005403D03* -X014464Y005423D03* -X014464Y005443D03* -X014464Y005463D03* -X014464Y005483D03* -X014464Y005503D03* -X014464Y005523D03* -X014464Y005543D03* -X014464Y005563D03* -X014464Y005583D03* -X014464Y005603D03* -X014464Y005623D03* -X014464Y005643D03* -X014464Y005663D03* -X014464Y005683D03* -X014464Y005703D03* -X014464Y005723D03* -X014464Y005743D03* -X014464Y005763D03* -X014464Y005783D03* -X014464Y005803D03* -X014464Y005823D03* -X014464Y005843D03* -X014464Y005863D03* -X014464Y005883D03* -X014464Y005903D03* -X014464Y005923D03* -X014464Y005943D03* -X014464Y005963D03* -X014464Y005983D03* -X014464Y006003D03* -X014464Y006023D03* -X014464Y006043D03* -X014464Y006063D03* -X014464Y006083D03* -X014464Y006103D03* -X014204Y006103D03* -X014204Y006083D03* -X014204Y006063D03* -X014204Y006043D03* -X014204Y006023D03* -X014204Y006003D03* -X014204Y005983D03* -X014204Y005963D03* -X014204Y005943D03* -X014204Y005923D03* -X014204Y005903D03* -X014204Y005883D03* -X014204Y005863D03* -X014204Y005843D03* -X014204Y005823D03* -X014204Y005803D03* -X014204Y005783D03* -X014204Y005763D03* -X014204Y005743D03* -X014204Y005723D03* +X014724Y005463D03* +X014724Y005483D03* +X014744Y005443D03* +X014704Y005523D03* +X014704Y005543D03* +X014704Y005563D03* +X014704Y005583D03* +X014704Y005603D03* +X014704Y005623D03* +X014704Y005643D03* +X014704Y005663D03* X014704Y005683D03* -X014704Y005663D03* -X014704Y005643D03* -X014704Y005623D03* -X014704Y005603D03* -X014704Y005583D03* -X014704Y005563D03* -X014704Y005543D03* -X014704Y005523D03* -X014724Y005483D03* -X014724Y005463D03* -X014744Y005443D03* -X015024Y005463D03* -X015024Y005483D03* -X015044Y005523D03* -X015044Y005543D03* -X015044Y005563D03* -X015044Y005583D03* -X015044Y005623D03* +X014724Y005723D03* +X014724Y005743D03* +X015024Y005743D03* +X015044Y005683D03* +X015044Y005663D03* X015044Y005643D03* -X015044Y005663D03* -X015044Y005683D03* -X015024Y005743D03* -X014724Y005743D03* -X014724Y005723D03* -X015364Y005723D03* -X015364Y005703D03* -X015364Y005683D03* -X015364Y005663D03* -X015364Y005643D03* -X015364Y005623D03* -X015364Y005603D03* -X015364Y005583D03* -X015364Y005563D03* -X015364Y005543D03* -X015364Y005523D03* -X015364Y005503D03* -X015364Y005483D03* +X015044Y005623D03* +X015044Y005583D03* +X015044Y005563D03* +X015044Y005543D03* +X015044Y005523D03* +X015024Y005483D03* +X015024Y005463D03* X015364Y005463D03* X015364Y005443D03* X015364Y005423D03* @@ -1936,132 +1921,160 @@ X015364Y005403D03* X015364Y005383D03* X015364Y005363D03* X015364Y005343D03* -X015704Y005423D03* -X015704Y005443D03* -X015704Y005463D03* -X015704Y005483D03* -X015704Y005503D03* -X015704Y005523D03* -X015704Y005543D03* -X015704Y005563D03* -X015704Y005583D03* -X015704Y005603D03* -X015704Y005623D03* -X015704Y005643D03* -X015704Y005663D03* -X015704Y005683D03* -X015704Y005703D03* -X015704Y005723D03* -X015704Y005743D03* -X015704Y005763D03* -X015704Y005783D03* -X015704Y005803D03* +X015364Y005483D03* +X015364Y005503D03* +X015364Y005523D03* +X015364Y005543D03* +X015364Y005563D03* +X015364Y005583D03* +X015364Y005603D03* +X015364Y005623D03* +X015364Y005643D03* +X015364Y005663D03* +X015364Y005683D03* +X015364Y005703D03* +X015364Y005723D03* +X015364Y005743D03* +X015364Y005763D03* +X015364Y005863D03* X015704Y005883D03* X015704Y005903D03* X015704Y005923D03* X015704Y005943D03* X015704Y005963D03* -X015364Y005863D03* -X015364Y005763D03* -X015364Y005743D03* -X015984Y005743D03* -X015984Y005723D03* -X015984Y005703D03* -X015984Y005683D03* -X015984Y005663D03* -X015984Y005643D03* -X015984Y005623D03* -X015984Y005603D03* -X015984Y005583D03* -X015984Y005563D03* -X015984Y005543D03* -X015984Y005523D03* -X015984Y005503D03* -X015984Y005483D03* -X015984Y005463D03* -X015984Y005443D03* +X015704Y005803D03* +X015704Y005783D03* +X015704Y005763D03* +X015704Y005743D03* +X015704Y005723D03* +X015704Y005703D03* +X015704Y005683D03* +X015704Y005663D03* +X015704Y005643D03* +X015704Y005623D03* +X015704Y005603D03* +X015704Y005583D03* +X015704Y005563D03* +X015704Y005543D03* +X015704Y005523D03* +X015704Y005503D03* +X015704Y005483D03* +X015704Y005463D03* +X015704Y005443D03* +X015704Y005423D03* X015984Y005423D03* X015984Y005403D03* X015984Y005383D03* X015984Y005363D03* X015984Y005343D03* -X016304Y005343D03* -X016304Y005363D03* -X016304Y005383D03* -X016304Y005403D03* -X016304Y005423D03* -X016304Y005443D03* -X016304Y005463D03* -X016304Y005483D03* -X016304Y005503D03* -X016304Y005523D03* -X016304Y005543D03* -X016304Y005563D03* -X016304Y005583D03* -X016304Y005603D03* -X016304Y005623D03* -X016304Y005643D03* -X016304Y005663D03* -X016304Y005683D03* +X015984Y005443D03* +X015984Y005463D03* +X015984Y005483D03* +X015984Y005503D03* +X015984Y005523D03* +X015984Y005543D03* +X015984Y005563D03* +X015984Y005583D03* +X015984Y005603D03* +X015984Y005623D03* +X015984Y005643D03* +X015984Y005663D03* +X015984Y005683D03* +X015984Y005703D03* +X015984Y005723D03* +X015984Y005743D03* +X015984Y005763D03* +X015984Y005783D03* +X016304Y005763D03* +X016304Y005743D03* +X016304Y005723D03* X016304Y005703D03* -X016304Y005723D03* -X016304Y005743D03* -X016304Y005763D03* -X016304Y005863D03* -X016564Y005743D03* -X016564Y005723D03* -X016544Y005683D03* -X016544Y005663D03* -X016544Y005643D03* +X016304Y005683D03* +X016304Y005663D03* +X016304Y005643D03* +X016304Y005623D03* +X016304Y005603D03* +X016304Y005583D03* +X016304Y005563D03* +X016304Y005543D03* +X016304Y005523D03* +X016304Y005503D03* +X016304Y005483D03* +X016304Y005463D03* +X016304Y005443D03* +X016304Y005423D03* +X016304Y005403D03* +X016304Y005383D03* +X016304Y005363D03* +X016304Y005343D03* +X016564Y005463D03* +X016564Y005483D03* +X016544Y005523D03* +X016544Y005543D03* +X016544Y005563D03* +X016544Y005583D03* +X016544Y005603D03* X016544Y005623D03* -X016544Y005603D03* -X016544Y005583D03* -X016544Y005563D03* -X016544Y005543D03* -X016544Y005523D03* -X016564Y005483D03* -X016564Y005463D03* -X016864Y005463D03* -X016864Y005483D03* +X016544Y005643D03* +X016544Y005663D03* +X016544Y005683D03* +X016564Y005723D03* +X016564Y005743D03* +X016304Y005863D03* +X016864Y005743D03* +X016864Y005723D03* +X016884Y005683D03* +X016884Y005663D03* +X016884Y005643D03* +X016884Y005623D03* +X016884Y005603D03* +X016884Y005583D03* +X016884Y005563D03* +X016884Y005543D03* X016884Y005523D03* -X016884Y005543D03* -X016884Y005563D03* -X016884Y005583D03* -X016884Y005603D03* -X016884Y005623D03* -X016884Y005643D03* -X016884Y005663D03* -X016884Y005683D03* -X016864Y005723D03* -X016864Y005743D03* -X017304Y005783D03* -X017324Y005763D03* -X017324Y005743D03* -X017344Y005703D03* -X017344Y005683D03* -X017344Y005663D03* -X017344Y005643D03* -X017344Y005563D03* +X016864Y005483D03* +X016864Y005463D03* +X017304Y005423D03* +X017324Y005463D03* +X017344Y005503D03* +X017344Y005523D03* X017344Y005543D03* -X017344Y005523D03* -X017344Y005503D03* -X017324Y005463D03* -X017304Y005423D03* -X017904Y005343D03* -X017924Y005383D03* -X018244Y005443D03* -X018264Y005503D03* -X018264Y005523D03* -X018264Y005543D03* -X018264Y005603D03* -X018264Y005623D03* -X018264Y005643D03* -X018264Y005663D03* -X018264Y005683D03* -X018264Y005703D03* -X018244Y005723D03* -X018244Y005743D03* -X018224Y005783D03* +X017344Y005563D03* +X017344Y005643D03* +X017344Y005663D03* +X017344Y005683D03* +X017344Y005703D03* +X017324Y005743D03* +X017324Y005763D03* +X017304Y005783D03* +X017924Y005783D03* +X017924Y005763D03* +X017924Y005743D03* +X017924Y005723D03* +X017924Y005703D03* +X017924Y005683D03* +X017924Y005663D03* +X017924Y005643D03* +X017924Y005623D03* +X017924Y005603D03* +X017924Y005583D03* +X017924Y005563D03* +X017924Y005803D03* +X017924Y005903D03* +X017924Y005923D03* +X017924Y005943D03* +X017924Y005963D03* +X017924Y005983D03* +X017924Y006003D03* +X017924Y006023D03* +X017924Y006043D03* +X017924Y006063D03* +X017924Y006083D03* +X017924Y006103D03* +X018504Y005863D03* +X018504Y005843D03* +X018504Y005823D03* +X018504Y005803D03* X018504Y005783D03* X018504Y005763D03* X018504Y005743D03* @@ -2085,48 +2098,31 @@ X018504Y005403D03* X018504Y005383D03* X018504Y005363D03* X018504Y005343D03* -X018764Y005463D03* -X018764Y005483D03* -X018764Y005503D03* -X018744Y005543D03* -X018744Y005563D03* -X018744Y005583D03* -X018744Y005603D03* -X018744Y005623D03* -X018744Y005643D03* -X018744Y005663D03* -X018744Y005683D03* +X018244Y005443D03* +X018264Y005503D03* +X018264Y005523D03* +X018264Y005543D03* +X018264Y005603D03* +X018264Y005623D03* +X018264Y005643D03* +X018264Y005663D03* +X018264Y005683D03* +X018264Y005703D03* +X018244Y005723D03* +X018244Y005743D03* +X018224Y005783D03* X018744Y005703D03* -X018764Y005743D03* -X018764Y005763D03* -X018504Y005803D03* -X018504Y005823D03* -X018504Y005843D03* -X018504Y005863D03* -X017924Y005903D03* -X017924Y005923D03* -X017924Y005943D03* -X017924Y005963D03* -X017924Y005983D03* -X017924Y006003D03* -X017924Y006023D03* -X017924Y006043D03* -X017924Y006063D03* -X017924Y006083D03* -X017924Y006103D03* -X017924Y005803D03* -X017924Y005783D03* -X017924Y005763D03* -X017924Y005743D03* -X017924Y005723D03* -X017924Y005703D03* -X017924Y005683D03* -X017924Y005663D03* -X017924Y005643D03* -X017924Y005623D03* -X017924Y005603D03* -X017924Y005583D03* -X017924Y005563D03* +X018744Y005683D03* +X018744Y005663D03* +X018744Y005643D03* +X018744Y005623D03* +X018744Y005603D03* +X018744Y005583D03* +X018744Y005563D03* +X018744Y005543D03* +X018764Y005503D03* +X018764Y005483D03* +X018764Y005463D03* X018784Y005423D03* X018984Y005383D03* X019084Y005383D03* @@ -2156,42 +2152,62 @@ X019084Y005723D03* X019084Y005743D03* X019084Y005763D03* X019084Y005863D03* -X019664Y005663D03* -X019664Y005643D03* -X019664Y005623D03* -X019664Y005603D03* -X019664Y005583D03* -X019664Y005563D03* +X018764Y005763D03* +X018764Y005743D03* +X017924Y005383D03* +X017904Y005343D03* X019664Y005543D03* -X019684Y005503D03* -X019684Y005483D03* -X019704Y005443D03* -X019964Y005423D03* -X019984Y005463D03* -X020004Y005503D03* -X020004Y005523D03* -X020004Y005543D03* -X020004Y005563D03* -X020024Y005603D03* +X019664Y005563D03* +X019664Y005583D03* +X019664Y005603D03* +X019664Y005623D03* +X019664Y005643D03* +X019664Y005663D03* +X019684Y005723D03* +X019704Y005763D03* +X019964Y005783D03* +X019984Y005743D03* +X020004Y005703D03* +X020004Y005683D03* X020004Y005663D03* -X020004Y005683D03* -X020004Y005703D03* -X019984Y005743D03* -X019964Y005783D03* -X019704Y005763D03* -X019684Y005723D03* -X020784Y005783D03* -X020804Y005763D03* +X020024Y005603D03* +X020004Y005563D03* +X020004Y005543D03* +X020004Y005523D03* +X020004Y005503D03* +X019984Y005463D03* +X019964Y005423D03* +X019704Y005443D03* +X019684Y005483D03* +X019684Y005503D03* +X020804Y005463D03* +X020824Y005503D03* +X020824Y005523D03* +X020824Y005543D03* +X020824Y005563D03* +X020824Y005643D03* +X020824Y005663D03* +X020824Y005683D03* +X020824Y005703D03* X020804Y005743D03* -X020824Y005703D03* -X020824Y005683D03* -X020824Y005663D03* -X020824Y005643D03* -X020824Y005563D03* -X020824Y005543D03* -X020824Y005523D03* -X020824Y005503D03* -X020804Y005463D03* +X020804Y005763D03* +X020784Y005783D03* +X021064Y005783D03* +X021064Y005763D03* +X021064Y005743D03* +X021064Y005723D03* +X021064Y005703D03* +X021064Y005683D03* +X021064Y005663D03* +X021064Y005643D03* +X021064Y005623D03* +X021064Y005603D03* +X021064Y005583D03* +X021064Y005563D03* +X021064Y005543D03* +X021064Y005523D03* +X021064Y005503D03* +X021064Y005483D03* X021064Y005463D03* X021064Y005443D03* X021064Y005423D03* @@ -2199,94 +2215,78 @@ X021064Y005403D03* X021064Y005383D03* X021064Y005363D03* X021064Y005343D03* -X021064Y005483D03* -X021064Y005503D03* -X021064Y005523D03* -X021064Y005543D03* -X021064Y005563D03* -X021064Y005583D03* -X021064Y005603D03* -X021064Y005623D03* -X021064Y005643D03* -X021064Y005663D03* -X021064Y005683D03* -X021064Y005703D03* -X021064Y005723D03* -X021064Y005743D03* -X021064Y005763D03* -X021064Y005783D03* +X021344Y005343D03* +X021344Y005363D03* +X021344Y005383D03* +X021344Y005403D03* +X021344Y005423D03* +X021344Y005443D03* +X021344Y005463D03* +X021344Y005483D03* +X021344Y005503D03* +X021344Y005523D03* +X021344Y005543D03* +X021344Y005563D03* +X021344Y005583D03* +X021344Y005603D03* +X021344Y005623D03* +X021344Y005643D03* +X021344Y005663D03* +X021344Y005683D03* +X021344Y005703D03* +X021344Y005723D03* +X021344Y005743D03* +X021344Y005763D03* +X021344Y005783D03* +X021344Y005803D03* X021064Y005803D03* X021064Y005823D03* X021064Y005843D03* X021064Y005863D03* -X021344Y005803D03* -X021344Y005783D03* -X021344Y005763D03* -X021344Y005743D03* -X021344Y005723D03* -X021344Y005703D03* -X021344Y005683D03* -X021344Y005663D03* -X021344Y005643D03* -X021344Y005623D03* -X021344Y005603D03* -X021344Y005583D03* -X021344Y005563D03* -X021344Y005543D03* -X021344Y005523D03* -X021344Y005503D03* -X021344Y005483D03* -X021344Y005463D03* -X021344Y005443D03* -X021344Y005423D03* -X021344Y005403D03* -X021344Y005383D03* -X021344Y005363D03* -X021344Y005343D03* -X021644Y005343D03* -X021644Y005363D03* -X021644Y005383D03* -X021644Y005403D03* -X021644Y005423D03* -X021644Y005443D03* -X021644Y005463D03* -X021644Y005483D03* -X021644Y005503D03* +X021644Y005763D03* +X021644Y005743D03* +X021644Y005723D03* +X021644Y005703D03* +X021644Y005683D03* +X021644Y005663D03* +X021644Y005643D03* +X021644Y005623D03* +X021644Y005603D03* +X021644Y005583D03* +X021644Y005563D03* +X021644Y005543D03* X021644Y005523D03* -X021644Y005543D03* -X021644Y005563D03* -X021644Y005583D03* -X021644Y005603D03* -X021644Y005623D03* -X021644Y005643D03* -X021644Y005663D03* -X021644Y005683D03* -X021644Y005703D03* -X021644Y005723D03* -X021644Y005743D03* -X021644Y005763D03* -X021944Y005763D03* -X021944Y005743D03* -X021944Y005723D03* -X021944Y005703D03* +X021644Y005503D03* +X021644Y005483D03* +X021644Y005463D03* +X021644Y005443D03* +X021644Y005423D03* +X021644Y005403D03* +X021644Y005383D03* +X021644Y005363D03* +X021644Y005343D03* +X021944Y005343D03* +X021944Y005363D03* +X021944Y005383D03* +X021944Y005403D03* +X021944Y005423D03* +X021944Y005443D03* +X021944Y005463D03* +X021944Y005483D03* +X021944Y005503D03* +X021944Y005523D03* +X021944Y005543D03* +X021944Y005563D03* +X021944Y005583D03* +X021944Y005603D03* +X021944Y005623D03* +X021944Y005643D03* +X021944Y005663D03* X021944Y005683D03* -X021944Y005663D03* -X021944Y005643D03* -X021944Y005623D03* -X021944Y005603D03* -X021944Y005583D03* -X021944Y005563D03* -X021944Y005543D03* -X021944Y005523D03* -X021944Y005503D03* -X021944Y005483D03* -X021944Y005463D03* -X021944Y005443D03* -X021944Y005423D03* -X021944Y005403D03* -X021944Y005383D03* -X021944Y005363D03* -X021944Y005343D03* +X021944Y005703D03* +X021944Y005723D03* +X021944Y005743D03* +X021944Y005763D03* X021944Y005863D03* X017584Y007343D03* X017264Y007323D03* @@ -2294,24 +2294,14 @@ X017064Y007403D03* X016984Y007503D03* X016964Y007703D03* X017084Y007703D03* -X015984Y005783D03* -X015984Y005763D03* D13* -X016004Y005823D03* -X015344Y005803D03* -X014964Y005823D03* -X014784Y005823D03* -X014764Y005403D03* -X014784Y005383D03* -X014964Y005383D03* -X015684Y005383D03* -X016624Y005383D03* -X016804Y005383D03* -X017084Y005383D03* -X017184Y005323D03* -X017264Y005383D03* +X017524Y007723D03* +X018504Y007383D03* +X018504Y006043D03* +X018504Y006023D03* +X018184Y005823D03* +X017944Y005463D03* X017944Y005443D03* -X017944Y005463D03* X018124Y005323D03* X018824Y005383D03* X018904Y005323D03* @@ -2328,20 +2318,28 @@ X020744Y005383D03* X020664Y005323D03* X020564Y005383D03* X019744Y005823D03* -X018504Y006023D03* -X018504Y006043D03* -X018184Y005823D03* X017264Y005823D03* X016804Y005823D03* X016624Y005823D03* -X018504Y007383D03* -X017524Y007723D03* -X013884Y005823D03* -X013784Y005883D03* +X016004Y005823D03* +X015344Y005803D03* +X014964Y005823D03* +X014784Y005823D03* +X014764Y005403D03* +X014784Y005383D03* +X014964Y005383D03* +X015684Y005383D03* +X016624Y005383D03* +X016804Y005383D03* +X017084Y005383D03* +X017184Y005323D03* +X017264Y005383D03* +X013904Y005403D03* +X013804Y005323D03* X013384Y005783D03* X013244Y005883D03* -X013804Y005323D03* -X013904Y005403D03* +X013784Y005883D03* +X013884Y005823D03* D14* X014474Y006283D03* X014474Y006303D03* diff --git a/CAM/zoncoffee.GBP b/CAM/zoncoffee.GBP --- a/CAM/zoncoffee.GBP +++ b/CAM/zoncoffee.GBP @@ -1372,10 +1372,10 @@ X007724Y005301D03* X007724Y005045D03* X007724Y004789D03* D12* -X010912Y004737D03* -X011412Y004737D03* -X011912Y004737D03* -X012412Y004737D03* -X012912Y004737D03* -X013412Y004737D03* +X012162Y004737D03* +X012662Y004737D03* +X013162Y004737D03* +X013662Y004737D03* +X014162Y004737D03* +X014662Y004737D03* M02* diff --git a/CAM/zoncoffee.GBS b/CAM/zoncoffee.GBS --- a/CAM/zoncoffee.GBS +++ b/CAM/zoncoffee.GBS @@ -1405,8 +1405,8 @@ X013818Y008393D03* X012818Y008393D03* X011693Y008393D03* X010693Y008393D03* -X009943Y004831D03* -X008943Y004831D03* +X010349Y004800D03* +X011349Y004800D03* D16* X007724Y004789D03* X007724Y005045D03* @@ -1424,10 +1424,10 @@ X007724Y007860D03* X007724Y008116D03* X007724Y008372D03* D17* -X010912Y004737D03* -X011412Y004737D03* -X011912Y004737D03* -X012412Y004737D03* -X012912Y004737D03* -X013412Y004737D03* +X012162Y004737D03* +X012662Y004737D03* +X013162Y004737D03* +X013662Y004737D03* +X014162Y004737D03* +X014662Y004737D03* M02* diff --git a/CAM/zoncoffee.GTL b/CAM/zoncoffee.GTL --- a/CAM/zoncoffee.GTL +++ b/CAM/zoncoffee.GTL @@ -20,10 +20,11 @@ 5,1,8,0,0,1.08239X$1,22.5* %ADD20R,0.0276X0.0197*% %ADD21R,0.0276X0.0354*% %ADD22R,0.0354X0.0276*% -%ADD23C,0.0138*% -%ADD24R,0.0276X0.0177*% -%ADD25C,0.0240*% -%ADD26C,0.0080*% +%ADD23R,0.0276X0.0177*% +%ADD24R,0.0197X0.0571*% +%ADD25R,0.0571X0.0197*% +%ADD26C,0.0240*% +%ADD27C,0.0080*% D10* X004943Y002737D02* X005693Y002737D01* @@ -1455,70 +1456,6 @@ X012569Y007030D03* X012943Y007030D03* X013317Y007030D03* D18* -X011166Y007001D02* -X011008Y007001D01* -X011008Y007198D02* -X011166Y007198D01* -X011166Y007395D02* -X011008Y007395D01* -X010851Y007552D02* -X010851Y007710D01* -X010654Y007710D02* -X010654Y007552D01* -X010457Y007552D02* -X010457Y007710D01* -X010260Y007710D02* -X010260Y007552D01* -X010063Y007552D02* -X010063Y007710D01* -X009866Y007710D02* -X009866Y007552D01* -X009669Y007552D02* -X009669Y007710D01* -X009473Y007710D02* -X009473Y007552D01* -X009315Y007395D02* -X009157Y007395D01* -X009157Y007198D02* -X009315Y007198D01* -X009315Y007001D02* -X009157Y007001D01* -X009157Y006804D02* -X009315Y006804D01* -X009315Y006607D02* -X009157Y006607D01* -X009157Y006411D02* -X009315Y006411D01* -X009315Y006214D02* -X009157Y006214D01* -X009157Y006017D02* -X009315Y006017D01* -X009473Y005860D02* -X009473Y005702D01* -X009669Y005702D02* -X009669Y005860D01* -X009866Y005860D02* -X009866Y005702D01* -X010063Y005702D02* -X010063Y005860D01* -X010260Y005860D02* -X010260Y005702D01* -X010457Y005702D02* -X010457Y005860D01* -X010654Y005860D02* -X010654Y005702D01* -X010851Y005702D02* -X010851Y005860D01* -X011008Y006017D02* -X011166Y006017D01* -X011166Y006214D02* -X011008Y006214D01* -X011008Y006411D02* -X011166Y006411D01* -X011166Y006607D02* -X011008Y006607D01* -X011008Y006804D02* -X011166Y006804D01* X019460Y008380D02* X019460Y008656D01* X019736Y008656D01* @@ -1545,8 +1482,8 @@ X013818Y008393D03* X012818Y008393D03* X011693Y008393D03* X010693Y008393D03* -X009943Y004831D03* -X008943Y004831D03* +X010349Y004800D03* +X011349Y004800D03* D20* X017207Y008643D03* X017718Y008643D03* @@ -1559,48 +1496,22 @@ X013136Y007768D03* X012624Y007768D03* X012230Y007768D03* X011718Y007768D03* -X010011Y008550D03* -X009499Y008550D03* +X012687Y005393D03* +X013199Y005393D03* +X006949Y008237D03* +X006437Y008237D03* X005324Y008268D03* X004812Y008268D03* X004812Y007643D03* X005324Y007643D03* X005324Y005643D03* X004812Y005643D03* -X007999Y005643D03* -X008511Y005643D03* -X012687Y005487D03* -X013199Y005487D03* +X005999Y004893D03* +X006511Y004893D03* D22* X013880Y006356D03* X013880Y006868D03* D23* -X009542Y007326D02* -X009542Y006086D01* -X009542Y007326D02* -X010782Y007326D01* -X010782Y006086D01* -X009542Y006086D01* -X009542Y006223D02* -X010782Y006223D01* -X010782Y006360D02* -X009542Y006360D01* -X009542Y006497D02* -X010782Y006497D01* -X010782Y006634D02* -X009542Y006634D01* -X009542Y006771D02* -X010782Y006771D01* -X010782Y006908D02* -X009542Y006908D01* -X009542Y007045D02* -X010782Y007045D01* -X010782Y007182D02* -X009542Y007182D01* -X009542Y007319D02* -X010782Y007319D01* -D24* -X005373Y007116D03* X005373Y006801D03* X005373Y006486D03* X005373Y006171D03* @@ -1608,44 +1519,82 @@ X004763Y006171D03* X004763Y006486D03* X004763Y006801D03* X004763Y007116D03* +X005373Y007116D03* +D24* +X007528Y008257D03* +X007843Y008257D03* +X008158Y008257D03* +X008473Y008257D03* +X008788Y008257D03* +X009103Y008257D03* +X009418Y008257D03* +X009733Y008257D03* +X009733Y005029D03* +X009418Y005029D03* +X009103Y005029D03* +X008788Y005029D03* +X008473Y005029D03* +X008158Y005029D03* +X007843Y005029D03* +X007528Y005029D03* D25* -X005943Y007331D03* -X006193Y007643D03* -X006193Y007956D03* -X006193Y008268D03* -X006568Y008362D03* -X008912Y008018D03* -X009693Y007956D03* -X009068Y008550D03* -X011380Y007487D03* -X011568Y007237D03* -X011849Y006987D03* -X011662Y006737D03* -X012037Y006487D03* -X011880Y006206D03* -X011537Y005987D03* -X010162Y006706D03* -X008849Y006675D03* -X008693Y006956D03* -X008443Y006081D03* -X007005Y006081D03* -X006818Y005831D03* -X007005Y005550D03* +X007016Y005541D03* +X007016Y005856D03* +X007016Y006171D03* +X007016Y006486D03* +X007016Y006801D03* +X007016Y007116D03* +X007016Y007431D03* +X007016Y007746D03* +X010245Y007746D03* +X010245Y007431D03* +X010245Y007116D03* +X010245Y006801D03* +X010245Y006486D03* +X010245Y006171D03* +X010245Y005856D03* +X010245Y005541D03* +D26* +X011130Y005393D03* +X012224Y006175D03* +X011974Y006425D03* +X011755Y006675D03* +X011505Y006925D03* +X011318Y007206D03* +X011099Y007456D03* +X010849Y007706D03* +X009630Y007643D03* +X009130Y007643D03* +X008474Y007800D03* +X009037Y007143D03* +X009287Y006862D03* +X008380Y006550D03* +X008630Y006300D03* +X009099Y006018D03* +X009412Y006143D03* +X009724Y006268D03* +X008787Y005737D03* +X008474Y005518D03* +X006162Y005737D03* X006005Y005456D03* X005693Y005956D03* +X006193Y006081D03* X005818Y006456D03* -X006474Y006581D03* -X006255Y006831D03* -X006693Y006206D03* -X008443Y005237D03* -X010505Y004737D03* -X011412Y005113D03* -X011912Y005112D03* -X012412Y005112D03* -X012912Y005112D03* -X013943Y005425D03* -X014193Y005143D03* -X014505Y005956D03* +X006099Y006612D03* +X005755Y006831D03* +X005693Y007331D03* +X005693Y007643D03* +X005693Y007956D03* +X005693Y008268D03* +X006068Y008362D03* +X006349Y008643D03* +X004787Y005268D03* +X005380Y004893D03* +X012662Y005020D03* +X013724Y005768D03* +X014193Y005675D03* +X014005Y005362D03* +X014474Y006112D03* X015005Y006300D03* X015505Y006300D03* X016005Y006300D03* @@ -1664,117 +1613,65 @@ X021130Y008419D03* X021912Y008393D03* X018193Y008643D03* X016693Y008643D03* -X013755Y007831D03* +X014474Y007925D03* X013443Y007768D03* X020630Y005081D03* X021130Y005112D03* -X004787Y005268D03* -D26* -X004787Y005669D01* -X004812Y005643D01* -X004763Y005693D01* -X004763Y006171D01* -X004763Y006801D01* -X004763Y006486D01* -X004763Y006171D01* -X004787Y005700D02* -X004787Y005669D01* -X005324Y005643D02* -X005818Y005643D01* -X006005Y005456D01* -X005693Y005956D02* -X005693Y006143D01* -X005665Y006171D01* -X005373Y006171D01* -X005373Y006486D02* -X005788Y006486D01* -X005818Y006456D01* -X006225Y006801D02* -X005373Y006801D01* -X005373Y007116D02* -X005728Y007116D01* -X005943Y007331D01* -X006193Y007643D02* -X005324Y007643D01* -X004818Y007649D02* -X004818Y007893D01* -X004880Y007956D01* -X006193Y007956D01* -X006193Y008268D02* -X005324Y008268D01* -X004818Y008274D02* -X004818Y008518D01* -X004880Y008581D01* -X006349Y008581D01* -X006568Y008362D01* -X007306Y007631D02* -X006474Y006800D01* -X006474Y006581D01* -X006225Y006801D02* -X006255Y006831D01* -X006724Y006800D02* -X006724Y006237D01* -X006693Y006206D01* -X007005Y006081D02* -X007005Y006813D01* -X007390Y007198D01* -X009236Y007198D01* -X009236Y007001D02* -X008738Y007001D01* -X008693Y006956D01* -X008367Y006956D01* -X007224Y005813D01* -X006836Y005813D01* -X006818Y005831D01* -X007005Y005550D02* -X007216Y005550D01* -X008091Y006425D01* -X008943Y006425D01* -X009126Y006607D01* -X009236Y006607D01* -X009236Y006804D02* -X008979Y006804D01* -X008849Y006675D01* -X008443Y006081D02* -X008511Y006012D01* -X008511Y005643D01* -X008636Y005518D01* -X009412Y005518D01* -X009473Y005579D01* -X009473Y005781D01* -X009866Y005781D02* -X009866Y005442D01* -X009755Y005331D01* -X009005Y005331D01* -X008943Y005268D01* -X008943Y004831D01* -X008443Y005237D02* -X008099Y005237D01* -X008005Y005331D01* -X008005Y005637D01* -X007999Y005643D01* -X009943Y005268D02* -X009943Y004831D01* -X009943Y005268D02* -X010063Y005389D01* -X010063Y005781D01* -X010260Y005781D02* -X010260Y005326D01* -X010505Y005081D01* -X010505Y004737D01* -X010505Y005081D02* -X011099Y005081D01* -X011505Y004675D01* -X013724Y004675D01* -X014193Y005143D01* -X014505Y004983D02* -X014505Y005956D01* -X015005Y006300D02* -X015005Y004983D01* -X015505Y004983D02* -X015505Y006300D01* +D27* +X021649Y005112D01* +X021693Y005069D01* +X021705Y005069D01* +X021130Y005581D02* +X020630Y005081D01* +X021130Y005581D02* +X021130Y006143D01* +X021119Y006131D01* +X020650Y006131D01* +X020650Y006387D02* +X020644Y006393D01* +X020068Y006393D01* +X019818Y006637D02* +X020643Y006637D01* +X020650Y006643D01* +X020650Y007155D02* +X020142Y007155D01* +X020130Y007143D01* +X019508Y007177D02* +X019130Y006800D01* +X018755Y007143D02* +X019118Y007506D01* +X019118Y007569D01* +X018729Y007959D02* +X018727Y007959D01* +X018318Y007550D01* +X019508Y007179D02* +X019508Y007177D01* +X020261Y007956D02* +X020199Y008018D01* +X020193Y008012D01* +X020261Y007956D02* +X020662Y007956D01* +X020755Y008362D02* +X020599Y008518D01* +X020288Y008518D01* +X019687Y008429D02* +X019598Y008518D01* +X019687Y008429D02* +X019687Y008018D01* +X021130Y008419D02* +X021130Y006143D01* +X018068Y005706D02* +X017690Y005328D01* +X017657Y005328D01* +X017627Y005328D01* +X017267Y005718D02* +X017662Y006112D01* +X017255Y006485D02* +X017255Y006487D01* +X017255Y006485D02* +X016877Y006107D01* X016005Y006300D02* -X016005Y006643D01* +X016005Y006581D01* X016005Y007109D01* X015505Y007109D02* X015505Y007731D01* @@ -1785,83 +1682,188 @@ X016693Y008643D02* X017207Y008643D01* X017718Y008643D02* X018193Y008643D01* -X018727Y007959D02* -X018318Y007550D01* -X018727Y007959D02* -X018729Y007959D01* -X019118Y007569D02* -X019118Y007506D01* -X018755Y007143D01* -X019130Y006800D02* -X019508Y007177D01* -X019508Y007179D01* -X020130Y007143D02* -X020142Y007155D01* -X020650Y007155D01* -X020650Y006643D02* -X020643Y006637D01* -X019818Y006637D01* -X020068Y006393D02* -X020644Y006393D01* -X020650Y006387D01* -X020650Y006131D02* -X021119Y006131D01* -X021130Y006143D01* -X021130Y005581D01* -X020630Y005081D01* -X021130Y005112D02* -X021649Y005112D01* -X021693Y005069D01* -X021705Y005069D01* -X021130Y006143D02* -X021130Y008419D01* -X020755Y008362D02* -X020599Y008518D01* -X020288Y008518D01* -X019687Y008429D02* -X019598Y008518D01* -X019687Y008429D02* -X019687Y008018D01* -X020193Y008012D02* -X020199Y008018D01* -X020261Y007956D01* -X020662Y007956D01* -X021693Y008218D02* -X021705Y008206D01* -X021755Y008206D01* -X021755Y008237D01* -X021912Y008393D01* -X017662Y006112D02* -X017267Y005718D01* -X017627Y005328D02* -X017657Y005328D01* -X017690Y005328D01* -X018068Y005706D01* -X017255Y006485D02* -X016877Y006107D01* -X017255Y006485D02* -X017255Y006487D01* -X016005Y006643D02* -X014443Y006643D01* -X014156Y006356D01* -X013880Y006356D01* -X013437Y006425D02* +X014999Y008337D02* +X014999Y007737D01* +X015005Y007731D01* +X015005Y007109D01* +X014505Y007109D02* +X014471Y007143D01* +X013943Y007143D01* +X013880Y007081D01* X013880Y006868D01* -X013880Y007081D01* -X013943Y007143D01* -X014471Y007143D01* -X014505Y007109D01* -X015005Y007109D02* -X015005Y007731D01* -X014999Y007737D01* -X014999Y008337D01* -X014943Y008393D01* -X013755Y007831D02* -X013755Y007287D01* -X013498Y007030D01* -X013317Y007030D01* -X013317Y006705D01* -X013255Y006643D01* +X013437Y006425D01* +X013318Y006425D01* +X012537Y006425D01* +X011724Y007237D01* +X011724Y007762D01* +X011718Y007768D01* +X011224Y007768D01* +X011037Y007956D01* +X009849Y007956D01* +X009787Y008018D01* +X009787Y008204D01* +X009733Y008257D01* +X009733Y008666D01* +X009662Y008737D01* +X008473Y008737D01* +X007099Y008737D01* +X006974Y008612D01* +X006974Y008262D01* +X006949Y008237D01* +X006437Y008237D02* +X006437Y008555D01* +X006349Y008643D01* +X006068Y008362D02* +X005849Y008581D01* +X004880Y008581D01* +X004818Y008518D01* +X004818Y008274D01* +X004812Y008268D01* +X005324Y008268D02* +X005693Y008268D01* +X005693Y007956D02* +X004880Y007956D01* +X004818Y007893D01* +X004818Y007649D01* +X004812Y007643D01* +X005324Y007643D02* +X005693Y007643D01* +X005693Y007331D02* +X005478Y007116D01* +X005373Y007116D01* +X005725Y006801D02* +X005755Y006831D01* +X005725Y006801D02* +X005373Y006801D01* +X005373Y006486D02* +X005788Y006486D01* +X005818Y006456D01* +X006099Y006612D02* +X006099Y007639D01* +X006206Y007746D01* +X007016Y007746D01* +X007528Y007746D02* +X007880Y007393D01* +X009380Y007393D01* +X009568Y007206D01* +X009568Y006737D01* +X009380Y006550D01* +X008380Y006550D01* +X008630Y006300D02* +X008031Y006300D01* +X007537Y005805D01* +X007537Y005038D01* +X007528Y005029D01* +X007528Y004902D01* +X007537Y004893D01* +X006511Y004893D01* +X006037Y004930D02* +X005999Y004893D01* +X005380Y004893D01* +X006037Y004930D02* +X006037Y005175D01* +X006403Y005541D01* +X007016Y005541D01* +X006474Y006050D02* +X006162Y005737D01* +X006005Y005456D02* +X005818Y005643D01* +X005324Y005643D01* +X004812Y005643D02* +X004787Y005669D01* +X004787Y005700D01* +X004763Y005693D02* +X004812Y005643D01* +X004787Y005669D02* +X004787Y005268D01* +X004763Y005693D02* +X004763Y006171D01* +X004763Y006801D01* +X004763Y006486D01* +X004763Y006171D01* +X005373Y006171D02* +X005665Y006171D01* +X005693Y006143D01* +X005693Y005956D01* +X006193Y006081D02* +X006318Y006206D01* +X006318Y006518D01* +X006443Y006643D01* +X006443Y007382D01* +X006492Y007431D01* +X007016Y007431D01* +X007016Y007116D02* +X008978Y007116D01* +X009037Y007143D01* +X009287Y006862D02* +X007192Y006863D01* +X007016Y006801D01* +X007016Y006486D02* +X006537Y006486D01* +X006474Y006423D01* +X006473Y006423D01* +X006474Y006112D01* +X006474Y006050D01* +X004763Y006801D02* +X004763Y007116D01* +X007528Y007746D02* +X007528Y008257D01* +X007843Y008257D02* +X007843Y007780D01* +X008073Y007550D01* +X009037Y007550D01* +X009130Y007643D01* +X009630Y007643D02* +X009733Y007746D01* +X010245Y007746D01* +X010574Y007431D02* +X010849Y007706D01* +X010943Y007456D02* +X010603Y007116D01* +X010245Y007116D01* +X010245Y007431D02* +X010574Y007431D01* +X010943Y007456D02* +X011099Y007456D01* +X011005Y007206D02* +X010600Y006801D01* +X010245Y006801D01* +X010245Y006486D02* +X010598Y006486D01* +X011037Y006925D01* +X011505Y006925D01* +X011755Y006675D02* +X011099Y006675D01* +X010595Y006171D01* +X010245Y006171D01* +X010245Y005856D02* +X010562Y005856D01* +X011130Y006425D01* +X011974Y006425D01* +X012224Y006175D02* +X011224Y006175D01* +X010590Y005541D01* +X010245Y005541D01* +X011130Y005393D02* +X011755Y005393D01* +X012474Y004675D01* +X013318Y004675D01* +X014005Y005362D01* +X013974Y005675D02* +X014193Y005675D01* +X013974Y005675D02* +X013319Y005020D01* +X012662Y005020D01* +X012687Y005393D02* +X012687Y005450D01* +X013130Y005893D01* +X013318Y005893D01* +X013297Y005914D01* +X013297Y005987D01* +X013317Y006006D01* +X013318Y006007D01* +X013318Y006425D01* +X013255Y006643D02* X012630Y006643D01* X012568Y006706D01* X012568Y007031D01* @@ -1870,127 +1872,74 @@ X012569Y007713D01* X012624Y007768D01* X012624Y008200D01* X012818Y008393D01* -X012230Y008356D02* -X012193Y008393D01* +X012230Y008277D02* +X012114Y008393D01* X011693Y008393D01* -X012230Y008356D02* +X012230Y008277D02* X012230Y007768D01* -X011724Y007762D02* -X011718Y007768D01* -X011474Y007768D01* -X011287Y007956D01* -X010851Y007956D01* -X010851Y007631D01* -X010851Y007956D02* -X010063Y007956D01* -X010063Y008206D01* -X009099Y008206D01* -X008912Y008018D01* -X009473Y007631D02* -X007306Y007631D01* -X007319Y007395D02* -X006724Y006800D01* -X007319Y007395D02* -X009236Y007395D01* -X009669Y007631D02* -X009669Y007932D01* -X009693Y007956D01* -X010063Y007956D02* -X010063Y007631D01* -X010074Y007620D01* -X010063Y008206D02* -X010063Y008498D01* -X010011Y008550D01* -X009499Y008550D02* -X009068Y008550D01* -X011087Y007395D02* -X011087Y007381D01* -X011193Y007487D01* -X011380Y007487D01* -X011568Y007237D02* -X011332Y007001D01* -X011087Y007001D01* -X011087Y007198D02* -X010654Y007198D01* -X010162Y006706D01* -X011087Y006804D02* -X011416Y006804D01* -X011599Y006987D01* -X011849Y006987D01* -X011662Y006737D02* -X011532Y006607D01* -X011087Y006607D01* -X011087Y006411D02* -X011648Y006411D01* -X011724Y006487D01* -X012037Y006487D01* -X012255Y006706D02* -X012255Y007248D01* -X012110Y007393D01* -X011787Y007393D01* -X011724Y007456D01* -X011724Y007762D01* X012943Y007331D02* X013130Y007518D01* X013130Y007762D01* X013136Y007768D01* X013443Y007768D01* -X012943Y007331D02* -X012943Y007030D01* -X012537Y006425D02* -X012255Y006706D01* -X012537Y006425D02* -X013318Y006425D01* -X013437Y006425D01* -X013318Y006425D02* -X013318Y006007D01* -X013317Y006006D01* -X013287Y005976D01* -X013287Y005612D01* -X013199Y005524D01* -X013199Y005487D01* -X012693Y005481D02* -X012687Y005487D01* -X012693Y005481D02* -X012693Y005175D01* -X012755Y005112D01* -X012912Y005112D01* -X012412Y005112D02* -X012412Y005300D01* -X012162Y005550D01* -X010912Y005550D01* -X010851Y005611D01* -X010851Y005781D01* -X010654Y005781D02* -X010654Y005432D01* -X010693Y005393D01* -X011849Y005393D01* -X011912Y005331D01* -X011912Y005112D01* -X011694Y004831D02* -X011412Y005113D01* -X011288Y005237D01* -X010599Y005237D01* -X010457Y005379D01* -X010457Y005781D01* -X011087Y006017D02* -X011507Y006017D01* -X011537Y005987D01* -X011326Y006214D02* -X011087Y006214D01* -X011326Y006214D02* -X011349Y006237D01* -X011849Y006237D01* -X011880Y006206D01* -X011832Y006254D01* -X013943Y005425D02* -X013943Y005150D01* -X013624Y004831D01* -X011694Y004831D01* -X004763Y006801D02* -X004763Y007116D01* -X004812Y007643D02* -X004818Y007649D01* -X004812Y008268D02* -X004818Y008274D01* +X013317Y007330D02* +X013912Y007925D01* +X014474Y007925D01* +X014943Y008393D02* +X014999Y008337D01* +X013317Y007330D02* +X013317Y007030D01* +X013317Y006705D01* +X013255Y006643D01* +X013880Y006356D02* +X014156Y006356D01* +X014380Y006581D01* +X016005Y006581D01* +X015505Y006300D02* +X015505Y004983D01* +X015005Y004983D02* +X015005Y006300D01* +X014474Y006112D02* +X014474Y005014D01* +X014505Y004983D01* +X013724Y005768D02* +X013349Y005393D01* +X013199Y005393D01* +X013287Y005976D02* +X013297Y005987D01* +X012943Y007030D02* +X012943Y007331D01* +X011318Y007206D02* +X011005Y007206D01* +X009724Y006268D02* +X009724Y005038D01* +X009733Y005029D01* +X009418Y005029D02* +X009412Y005035D01* +X009412Y006143D01* +X009099Y006018D02* +X009099Y005033D01* +X009103Y005029D01* +X008788Y005029D02* +X008788Y005676D01* +X008787Y005737D01* +X008474Y005518D02* +X008473Y005517D01* +X008473Y005029D01* +X008162Y005025D02* +X008158Y005029D01* +X008162Y005025D02* +X008162Y004612D01* +X008224Y004550D01* +X010099Y004550D01* +X010349Y004800D01* +X008474Y007800D02* +X008474Y008256D01* +X008473Y008257D01* +X008473Y008737D01* +X021693Y008218D02* +X021705Y008206D01* +X021755Y008206D01* +X021755Y008237D01* +X021912Y008393D01* M02* diff --git a/CAM/zoncoffee.GTO b/CAM/zoncoffee.GTO --- a/CAM/zoncoffee.GTO +++ b/CAM/zoncoffee.GTO @@ -16,23 +16,23 @@ 5,1,8,0,0,1.08239X$1,22.5* %ADD16R,0.0050X0.0305*% %ADD17C,0.0160*% %ADD18R,0.0160X0.0280*% -%ADD19R,0.0177X0.0177*% -%ADD20R,0.0100X0.0020*% -%ADD21R,0.0160X0.0020*% -%ADD22R,0.0180X0.0020*% -%ADD23R,0.0240X0.0020*% -%ADD24R,0.0140X0.0020*% -%ADD25R,0.0060X0.0020*% -%ADD26R,0.0120X0.0020*% -%ADD27R,0.0080X0.0020*% -%ADD28R,0.0300X0.0020*% -%ADD29R,0.0200X0.0020*% -%ADD30R,0.0280X0.0020*% -%ADD31R,0.0440X0.0020*% -%ADD32R,0.0220X0.0020*% -%ADD33R,0.0260X0.0020*% -%ADD34R,0.0020X0.0020*% -%ADD35R,0.0040X0.0020*% +%ADD19R,0.0100X0.0020*% +%ADD20R,0.0160X0.0020*% +%ADD21R,0.0180X0.0020*% +%ADD22R,0.0240X0.0020*% +%ADD23R,0.0140X0.0020*% +%ADD24R,0.0060X0.0020*% +%ADD25R,0.0120X0.0020*% +%ADD26R,0.0080X0.0020*% +%ADD27R,0.0300X0.0020*% +%ADD28R,0.0200X0.0020*% +%ADD29R,0.0280X0.0020*% +%ADD30R,0.0440X0.0020*% +%ADD31R,0.0220X0.0020*% +%ADD32R,0.0260X0.0020*% +%ADD33R,0.0020X0.0020*% +%ADD34R,0.0040X0.0020*% +%ADD35C,0.0060*% D10* X004943Y002737D02* X005693Y002737D01* @@ -1432,42 +1432,82 @@ X011120Y008201D01* X011255Y008201D02* X011300Y008156D01* X011300Y008021D01* -X014255Y006800D02* +X010999Y007689D02* +X010924Y007689D01* +X010849Y007614D01* +X010849Y007464D01* +X010774Y007389D01* +X010699Y007389D01* +X010623Y007464D01* +X010623Y007614D01* +X010699Y007689D01* +X010774Y007689D01* +X010849Y007614D01* +X010849Y007464D02* +X010924Y007389D01* +X010999Y007389D01* +X011074Y007464D01* +X011074Y007614D01* +X010999Y007689D01* +X010999Y007229D02* +X010924Y007229D01* +X010849Y007154D01* +X010849Y007004D01* +X010774Y006929D01* +X010699Y006929D01* +X010623Y007004D01* +X010623Y007154D01* +X010699Y007229D01* +X010548Y007079D02* +X011149Y007079D01* +X011074Y007154D02* +X010999Y007229D01* +X011074Y007154D02* +X011074Y007004D01* +X010999Y006929D01* +X010999Y006768D02* +X010623Y006768D01* +X010623Y006468D02* +X010999Y006468D01* +X011074Y006543D01* +X011074Y006693D01* +X010999Y006768D01* +X009230Y005406D02* +X009185Y005361D01* +X009005Y005361D01* +X009050Y005316D02* +X009050Y005406D01* +X009050Y005205D02* +X009050Y005160D01* +X009140Y005070D01* +X009230Y005070D02* +X009050Y005070D01* +X009095Y004956D02* +X009230Y004956D01* +X009230Y004820D01* +X009185Y004775D01* +X009140Y004820D01* +X009140Y004956D01* +X009095Y004956D02* +X009050Y004911D01* +X009050Y004820D01* +X009050Y004661D02* +X009230Y004661D01* +X009230Y004526D01* +X009185Y004481D01* +X009050Y004481D01* +X014255Y005300D02* +X014255Y006800D01* X016255Y006800D01* X016255Y005300D01* X014255Y005300D01* -X014255Y006800D01* -X009543Y005406D02* -X009498Y005361D01* -X009318Y005361D01* -X009363Y005316D02* -X009363Y005406D01* -X009363Y005205D02* -X009363Y005160D01* -X009453Y005070D01* -X009543Y005070D02* -X009363Y005070D01* -X009408Y004956D02* -X009543Y004956D01* -X009543Y004820D01* -X009498Y004775D01* -X009453Y004820D01* -X009453Y004956D01* -X009408Y004956D02* -X009363Y004911D01* -X009363Y004820D01* -X009363Y004661D02* -X009543Y004661D01* -X009543Y004526D01* -X009498Y004481D01* -X009363Y004481D01* D12* +X013049Y006199D02* +X012837Y006199D01* X012383Y006349D02* X012383Y006687D01* -X012837Y006199D02* -X013049Y006199D01* -X013503Y006349D02* -X013503Y006687D01* +X013503Y006687D02* +X013503Y006349D01* X015955Y007581D02* X015957Y007594D01* X015962Y007607D01* @@ -1984,73 +2024,60 @@ X015255Y007749D02* X015255Y007725D01* X013892Y006612D02* X013868Y006612D01* -X012943Y005499D02* -X012943Y005475D01* X012880Y007756D02* X012880Y007780D01* X011974Y007780D02* X011974Y007756D01* -X009755Y008538D02* -X009755Y008562D01* -X005068Y008280D02* -X005068Y008256D01* +X012943Y005405D02* +X012943Y005381D01* +X006693Y008225D02* +X006693Y008249D01* +X005068Y008256D02* +X005068Y008280D01* X005068Y007655D02* X005068Y007631D01* -X008255Y005655D02* -X008255Y005631D01* +X006255Y004905D02* +X006255Y004881D01* D18* X005068Y005643D03* X019943Y008018D03* D19* -X011038Y007582D03* -D20* -X018813Y004856D03* -X018813Y004836D03* -X018793Y004736D03* -X018793Y004716D03* -X018773Y004696D03* -X018773Y004676D03* -X018773Y004656D03* -X018773Y004636D03* -X018773Y004616D03* -X018753Y004596D03* -X018753Y004576D03* -X018753Y004556D03* -X018773Y004476D03* -X018953Y004496D03* -X018953Y004516D03* -X018953Y004536D03* -X018973Y004556D03* -X018973Y004576D03* -X018973Y004596D03* -X018973Y004616D03* -X018973Y004636D03* -X018993Y004656D03* +X019033Y004936D03* +X019033Y004916D03* +X019033Y004896D03* +X019033Y004876D03* +X019033Y004856D03* +X019013Y004836D03* +X019013Y004816D03* +X018993Y004716D03* +X018993Y004696D03* X018993Y004676D03* -X018993Y004696D03* -X018993Y004716D03* -X019013Y004816D03* -X019013Y004836D03* -X019033Y004856D03* -X019033Y004876D03* -X019033Y004896D03* -X019033Y004916D03* -X019033Y004936D03* -X019153Y004816D03* -X019193Y004716D03* +X018993Y004656D03* +X018973Y004636D03* +X018973Y004616D03* +X018973Y004596D03* +X018973Y004576D03* +X018973Y004556D03* +X018953Y004536D03* +X018953Y004516D03* +X018953Y004496D03* +X019133Y004496D03* +X019153Y004516D03* +X019153Y004536D03* +X019153Y004556D03* +X019153Y004576D03* +X019153Y004596D03* +X019173Y004616D03* +X019173Y004636D03* +X019173Y004656D03* +X019173Y004676D03* X019173Y004696D03* -X019173Y004676D03* -X019173Y004656D03* -X019173Y004636D03* -X019173Y004616D03* -X019153Y004596D03* -X019153Y004576D03* -X019153Y004556D03* -X019153Y004536D03* -X019153Y004516D03* -X019133Y004496D03* +X019193Y004716D03* +X019153Y004816D03* +X019353Y004716D03* +X019373Y004736D03* +X019333Y004636D03* X019313Y004596D03* -X019333Y004636D03* X019333Y004556D03* X019393Y004476D03* X019653Y004496D03* @@ -2068,8 +2095,10 @@ X019693Y004716D03* X019533Y004716D03* X019533Y004736D03* X019473Y004816D03* -X019373Y004736D03* -X019353Y004716D03* +X019913Y004716D03* +X019913Y004696D03* +X019913Y004676D03* +X019913Y004656D03* X019893Y004636D03* X019893Y004616D03* X019893Y004596D03* @@ -2078,18 +2107,14 @@ X019893Y004556D03* X019873Y004536D03* X019873Y004516D03* X019873Y004496D03* -X019913Y004656D03* -X019913Y004676D03* -X019913Y004696D03* -X019913Y004716D03* -X020073Y004636D03* +X020053Y004496D03* +X020053Y004516D03* +X020053Y004536D03* +X020073Y004556D03* +X020073Y004576D03* +X020073Y004596D03* X020073Y004616D03* -X020073Y004596D03* -X020073Y004576D03* -X020073Y004556D03* -X020053Y004536D03* -X020053Y004516D03* -X020053Y004496D03* +X020073Y004636D03* X020093Y004656D03* X020093Y004676D03* X020093Y004696D03* @@ -2108,62 +2133,75 @@ X020273Y004696D03* X020273Y004716D03* X020273Y004736D03* X020653Y004796D03* -D21* -X020243Y004796D03* +X018813Y004836D03* +X018813Y004856D03* +X018793Y004736D03* +X018793Y004716D03* +X018773Y004696D03* +X018773Y004676D03* +X018773Y004656D03* +X018773Y004636D03* +X018773Y004616D03* +X018753Y004596D03* +X018753Y004576D03* +X018753Y004556D03* +X018773Y004476D03* +D20* +X018783Y004496D03* +X018783Y004516D03* X019463Y004796D03* -X018783Y004516D03* -X018783Y004496D03* -D22* +X020243Y004796D03* +D21* +X019753Y004796D03* +X019733Y004776D03* +X019733Y004756D03* +X019733Y004736D03* +X019393Y004496D03* X018813Y004776D03* X018813Y004796D03* -X019393Y004496D03* -X019733Y004736D03* -X019733Y004756D03* -X019733Y004776D03* -X019753Y004796D03* -D23* +D22* X019403Y004536D03* X019403Y004516D03* -D24* +D23* X019013Y004736D03* X018773Y004536D03* X019933Y004736D03* X020113Y004736D03* -D25* +D24* X019813Y004816D03* X019493Y004556D03* X020453Y004796D03* X020653Y004956D03* -D26* +D25* X019523Y004756D03* X019383Y004756D03* X019323Y004576D03* X019183Y004736D03* X018803Y004816D03* -D27* +D26* X018823Y004876D03* X019043Y004956D03* X019323Y004616D03* X020083Y004816D03* X020243Y004816D03* -D28* +D27* X019433Y004696D03* X019433Y004676D03* X019433Y004656D03* -D29* +D28* X018803Y004756D03* -D30* +D29* X019103Y004756D03* X019103Y004776D03* -D31* +D30* X020103Y004776D03* X020103Y004756D03* -D32* +D31* X019453Y004776D03* -D33* +D32* X019093Y004796D03* X020013Y004796D03* -D34* +D33* X020413Y004836D03* X020413Y004856D03* X020413Y004876D03* @@ -2184,8 +2222,63 @@ X020673Y004876D03* X020693Y004896D03* X020693Y004916D03* X020693Y004936D03* -D35* +D34* X020643Y004836D03* X020483Y004936D03* X020463Y004956D03* +D35* +X009904Y005446D02* +X009827Y005370D01* +X007433Y005370D01* +X007357Y005446D01* +X007357Y007840D01* +X007433Y007917D01* +X009827Y007917D01* +X009904Y007840D01* +X009904Y005446D01* +X009376Y007576D02* +X009378Y007603D01* +X009384Y007629D01* +X009393Y007654D01* +X009406Y007677D01* +X009422Y007698D01* +X009441Y007717D01* +X009462Y007733D01* +X009485Y007746D01* +X009510Y007755D01* +X009536Y007761D01* +X009563Y007763D01* +X009590Y007761D01* +X009616Y007755D01* +X009641Y007746D01* +X009664Y007733D01* +X009685Y007717D01* +X009704Y007698D01* +X009720Y007677D01* +X009733Y007654D01* +X009742Y007629D01* +X009748Y007603D01* +X009750Y007576D01* +X009748Y007549D01* +X009742Y007523D01* +X009733Y007498D01* +X009720Y007475D01* +X009704Y007454D01* +X009685Y007435D01* +X009664Y007419D01* +X009641Y007406D01* +X009616Y007397D01* +X009590Y007391D01* +X009563Y007389D01* +X009536Y007391D01* +X009510Y007397D01* +X009485Y007406D01* +X009462Y007419D01* +X009441Y007435D01* +X009422Y007454D01* +X009406Y007475D01* +X009393Y007498D01* +X009384Y007523D01* +X009378Y007549D01* +X009376Y007576D01* M02* diff --git a/CAM/zoncoffee.GTP b/CAM/zoncoffee.GTP --- a/CAM/zoncoffee.GTP +++ b/CAM/zoncoffee.GTP @@ -19,9 +19,9 @@ 5,1,8,0,0,1.08239X$1,22.5* %ADD19R,0.0276X0.0197*% %ADD20R,0.0276X0.0354*% %ADD21R,0.0354X0.0276*% -%ADD22C,0.0089*% -%ADD23R,0.0492X0.0492*% -%ADD24R,0.0276X0.0177*% +%ADD22R,0.0276X0.0177*% +%ADD23R,0.0197X0.0571*% +%ADD24R,0.0571X0.0197*% D10* X004943Y002737D02* X005693Y002737D01* @@ -1482,100 +1482,64 @@ X013136Y007768D03* X012624Y007768D03* X012230Y007768D03* X011718Y007768D03* -X010011Y008550D03* -X009499Y008550D03* +X012687Y005393D03* +X013199Y005393D03* +X006949Y008237D03* +X006437Y008237D03* X005324Y008268D03* X004812Y008268D03* X004812Y007643D03* X005324Y007643D03* X005324Y005643D03* X004812Y005643D03* -X007999Y005643D03* -X008511Y005643D03* -X012687Y005487D03* -X013199Y005487D03* +X005999Y004893D03* +X006511Y004893D03* X019687Y008018D03* X020199Y008018D03* D21* X013880Y006868D03* X013880Y006356D03* D22* -X011166Y006411D02* -X011008Y006411D01* -X011008Y006214D02* -X011166Y006214D01* -X011166Y006017D02* -X011008Y006017D01* -X010851Y005859D02* -X010851Y005702D01* -X010654Y005702D02* -X010654Y005859D01* -X010457Y005859D02* -X010457Y005702D01* -X010260Y005702D02* -X010260Y005859D01* -X010063Y005859D02* -X010063Y005702D01* -X009866Y005702D02* -X009866Y005859D01* -X009669Y005859D02* -X009669Y005702D01* -X009473Y005702D02* -X009473Y005859D01* -X009315Y006017D02* -X009158Y006017D01* -X009158Y006214D02* -X009315Y006214D01* -X009315Y006411D02* -X009158Y006411D01* -X009158Y006607D02* -X009315Y006607D01* -X009315Y006804D02* -X009158Y006804D01* -X009158Y007001D02* -X009315Y007001D01* -X009315Y007198D02* -X009158Y007198D01* -X009158Y007395D02* -X009315Y007395D01* -X009473Y007552D02* -X009473Y007710D01* -X009669Y007710D02* -X009669Y007552D01* -X009866Y007552D02* -X009866Y007710D01* -X010063Y007710D02* -X010063Y007552D01* -X010260Y007552D02* -X010260Y007710D01* -X010457Y007710D02* -X010457Y007552D01* -X010654Y007552D02* -X010654Y007710D01* -X010851Y007710D02* -X010851Y007552D01* -X011008Y007395D02* -X011166Y007395D01* -X011166Y007198D02* -X011008Y007198D01* -X011008Y007001D02* -X011166Y007001D01* -X011166Y006804D02* -X011008Y006804D01* -X011008Y006607D02* -X011166Y006607D01* +X005373Y006486D03* +X005373Y006801D03* +X005373Y007116D03* +X004763Y007116D03* +X004763Y006801D03* +X004763Y006486D03* +X004763Y006171D03* +X005373Y006171D03* D23* -X010506Y006361D03* -X009817Y006361D03* -X009817Y007050D03* -X010506Y007050D03* +X007528Y005029D03* +X007843Y005029D03* +X008158Y005029D03* +X008473Y005029D03* +X008788Y005029D03* +X009103Y005029D03* +X009418Y005029D03* +X009733Y005029D03* +X009733Y008257D03* +X009418Y008257D03* +X009103Y008257D03* +X008788Y008257D03* +X008473Y008257D03* +X008158Y008257D03* +X007843Y008257D03* +X007528Y008257D03* D24* -X005373Y007116D03* -X005373Y006801D03* -X005373Y006486D03* -X005373Y006171D03* -X004763Y006171D03* -X004763Y006486D03* -X004763Y006801D03* -X004763Y007116D03* +X007016Y007746D03* +X007016Y007431D03* +X007016Y007116D03* +X007016Y006801D03* +X007016Y006486D03* +X007016Y006171D03* +X007016Y005856D03* +X007016Y005541D03* +X010245Y005541D03* +X010245Y005856D03* +X010245Y006171D03* +X010245Y006486D03* +X010245Y006801D03* +X010245Y007116D03* +X010245Y007431D03* +X010245Y007746D03* M02* diff --git a/CAM/zoncoffee.GTS b/CAM/zoncoffee.GTS --- a/CAM/zoncoffee.GTS +++ b/CAM/zoncoffee.GTS @@ -24,9 +24,9 @@ 5,1,8,0,0,1.08239X$1,22.5* %ADD24R,0.0316X0.0237*% %ADD25R,0.0316X0.0394*% %ADD26R,0.0394X0.0316*% -%ADD27C,0.0138*% -%ADD28C,0.0079*% -%ADD29R,0.0316X0.0217*% +%ADD27R,0.0316X0.0217*% +%ADD28R,0.0237X0.0611*% +%ADD29R,0.0611X0.0237*% D10* X004943Y002737D02* X005693Y002737D01* @@ -1522,8 +1522,8 @@ X013818Y008393D03* X012818Y008393D03* X011693Y008393D03* X010693Y008393D03* -X009943Y004831D03* -X008943Y004831D03* +X010349Y004800D03* +X011349Y004800D03* D24* X017207Y008643D03* X017718Y008643D03* @@ -1536,150 +1536,22 @@ X013136Y007768D03* X012624Y007768D03* X012230Y007768D03* X011718Y007768D03* -X010011Y008550D03* -X009499Y008550D03* +X012687Y005393D03* +X013199Y005393D03* +X006949Y008237D03* +X006437Y008237D03* X005324Y008268D03* X004812Y008268D03* X004812Y007643D03* X005324Y007643D03* X005324Y005643D03* X004812Y005643D03* -X007999Y005643D03* -X008511Y005643D03* -X012687Y005487D03* -X013199Y005487D03* +X005999Y004893D03* +X006511Y004893D03* D26* X013880Y006356D03* X013880Y006868D03* D27* -X011166Y006804D02* -X011008Y006804D01* -X011008Y006607D02* -X011166Y006607D01* -X011166Y006411D02* -X011008Y006411D01* -X011008Y006214D02* -X011166Y006214D01* -X011166Y006017D02* -X011008Y006017D01* -X010851Y005859D02* -X010851Y005702D01* -X010654Y005702D02* -X010654Y005859D01* -X010457Y005859D02* -X010457Y005702D01* -X010260Y005702D02* -X010260Y005859D01* -X010063Y005859D02* -X010063Y005702D01* -X009866Y005702D02* -X009866Y005859D01* -X009669Y005859D02* -X009669Y005702D01* -X009473Y005702D02* -X009473Y005859D01* -X009315Y006017D02* -X009158Y006017D01* -X009158Y006214D02* -X009315Y006214D01* -X009315Y006411D02* -X009158Y006411D01* -X009158Y006607D02* -X009315Y006607D01* -X009315Y006804D02* -X009158Y006804D01* -X009158Y007001D02* -X009315Y007001D01* -X009315Y007198D02* -X009158Y007198D01* -X009158Y007395D02* -X009315Y007395D01* -X009473Y007552D02* -X009473Y007710D01* -X009669Y007710D02* -X009669Y007552D01* -X009866Y007552D02* -X009866Y007710D01* -X010063Y007710D02* -X010063Y007552D01* -X010260Y007552D02* -X010260Y007710D01* -X010457Y007710D02* -X010457Y007552D01* -X010654Y007552D02* -X010654Y007710D01* -X010851Y007710D02* -X010851Y007552D01* -X011008Y007395D02* -X011166Y007395D01* -X011166Y007198D02* -X011008Y007198D01* -X011008Y007001D02* -X011166Y007001D01* -D28* -X010851Y006987D02* -X009473Y006987D01* -X009473Y006910D02* -X010851Y006910D01* -X010851Y006833D02* -X009473Y006833D01* -X009473Y006755D02* -X010851Y006755D01* -X010851Y006678D02* -X009473Y006678D01* -X009473Y006601D02* -X010851Y006601D01* -X010851Y006524D02* -X009473Y006524D01* -X009473Y006446D02* -X010851Y006446D01* -X010851Y006369D02* -X009473Y006369D01* -X009473Y006292D02* -X010851Y006292D01* -X010851Y006215D02* -X009473Y006215D01* -X009473Y006137D02* -X010851Y006137D01* -X010851Y006115D02* -X010847Y006090D01* -X010837Y006066D01* -X010822Y006046D01* -X010801Y006030D01* -X010778Y006020D01* -X010752Y006017D01* -X009571Y006017D01* -X009546Y006020D01* -X009522Y006030D01* -X009501Y006046D01* -X009486Y006066D01* -X009476Y006090D01* -X009473Y006115D01* -X009473Y007296D01* -X010752Y007296D01* -X010675Y007373D02* -X009511Y007373D01* -X009501Y007366D02* -X009522Y007382D01* -X009546Y007391D01* -X009571Y007395D01* -X010654Y007395D01* -X010851Y007198D01* -X010851Y006115D01* -X010833Y006060D02* -X009490Y006060D01* -X009473Y007064D02* -X010851Y007064D01* -X010851Y007142D02* -X009473Y007142D01* -X009473Y007219D02* -X010830Y007219D01* -X009501Y007366D02* -X009486Y007346D01* -X009476Y007322D01* -X009473Y007296D01* -D29* -X005373Y007116D03* X005373Y006801D03* X005373Y006486D03* X005373Y006171D03* @@ -1687,4 +1559,39 @@ X004763Y006171D03* X004763Y006486D03* X004763Y006801D03* X004763Y007116D03* +X005373Y007116D03* +D28* +X007528Y008257D03* +X007843Y008257D03* +X008158Y008257D03* +X008473Y008257D03* +X008788Y008257D03* +X009103Y008257D03* +X009418Y008257D03* +X009733Y008257D03* +X009733Y005029D03* +X009418Y005029D03* +X009103Y005029D03* +X008788Y005029D03* +X008473Y005029D03* +X008158Y005029D03* +X007843Y005029D03* +X007528Y005029D03* +D29* +X007016Y005541D03* +X007016Y005856D03* +X007016Y006171D03* +X007016Y006486D03* +X007016Y006801D03* +X007016Y007116D03* +X007016Y007431D03* +X007016Y007746D03* +X010245Y007746D03* +X010245Y007431D03* +X010245Y007116D03* +X010245Y006801D03* +X010245Y006486D03* +X010245Y006171D03* +X010245Y005856D03* +X010245Y005541D03* M02* diff --git a/CAM/zoncoffee.TXT b/CAM/zoncoffee.TXT --- a/CAM/zoncoffee.TXT +++ b/CAM/zoncoffee.TXT @@ -9,53 +9,48 @@ T05C0.0413 T06C0.1000 % T01 +X5380Y4893 X4787Y5268 X6005Y5456 +X6162Y5737 X5693Y5956 +X6193Y6081 X5818Y6456 -X6474Y6581 -X6255Y6831 -X5943Y7331 -X6193Y7643 -X6193Y7956 -X6193Y8268 -X6568Y8362 -X8912Y8018 -X9693Y7956 -X9068Y8550 -X11380Y7487 -X11568Y7237 -X11849Y6987 -X11662Y6737 -X12037Y6487 -X11880Y6206 -X11537Y5987 -X10162Y6706 -X8849Y6675 -X8693Y6956 -X8443Y6081 -X7005Y6081 -X6818Y5831 -X7005Y5550 -X6693Y6206 -X8443Y5237 -X10505Y4737 -X11412Y5113 -X11912Y5112 -X12412Y5112 -X12912Y5112 -X13943Y5425 -X14193Y5143 -X14505Y5956 -X15005Y6300 -X15505Y6300 -X16005Y6300 -X17255Y6487 -X17662Y6112 -X18068Y5706 +X6099Y6612 +X5755Y6831 +X5693Y7331 +X5693Y7643 +X5693Y7956 +X5693Y8268 +X6068Y8362 +X6349Y8643 +X8474Y7800 +X9130Y7643 +X9630Y7643 +X9037Y7143 +X9287Y6862 +X8380Y6550 +X8630Y6300 +X9099Y6018 +X9412Y6143 +X9724Y6268 +X8787Y5737 +X8474Y5518 +X11130Y5393 +X12224Y6175 +X11974Y6425 +X11755Y6675 +X11505Y6925 +X11318Y7206 +X11099Y7456 +X10849Y7706 +X13443Y7768 +X14474Y7925 +X16693Y8643 +X18193Y8643 +X18318Y7550 +X18755Y7143 X19130Y6800 -X18755Y7143 -X18318Y7550 X19818Y6637 X20068Y6393 X20130Y7143 @@ -63,10 +58,17 @@ X20662Y7956 X20755Y8362 X21130Y8419 X21912Y8393 -X18193Y8643 -X16693Y8643 -X13755Y7831 -X13443Y7768 +X17662Y6112 +X17255Y6487 +X18068Y5706 +X16005Y6300 +X15505Y6300 +X15005Y6300 +X14474Y6112 +X13724Y5768 +X14193Y5675 +X14005Y5362 +X12662Y5020 X20630Y5081 X21130Y5112 T02 @@ -107,8 +109,8 @@ X13818Y8393 X12818Y8393 X11693Y8393 X10693Y8393 -X9943Y4831 -X8943Y4831 +X10349Y4800 +X11349Y4800 T05 X18722Y6114 T06 diff --git a/CAM/zoncoffee.dri b/CAM/zoncoffee.dri --- a/CAM/zoncoffee.dri +++ b/CAM/zoncoffee.dri @@ -2,7 +2,7 @@ Generated by EAGLE CAM Processor 6.5.0 Drill Station Info File: /home/ethanzonca/Projects/ZonCoffeeOLED/CAM/zoncoffee.dri - Date : 19 Nov 2014 22:49:22 + Date : 12 Dec 2014 23:11:25 Drills : generated Device : Excellon drill station @@ -27,14 +27,14 @@ Drills used: Code Size used - T01 0.0120inch 60 + T01 0.0120inch 62 T02 0.0150inch 28 T03 0.0295inch 1 T04 0.0400inch 8 T05 0.0413inch 1 T06 0.1000inch 4 -Total number of drills: 102 +Total number of drills: 104 Plotfiles: diff --git a/CAM/zoncoffee.gpi b/CAM/zoncoffee.gpi --- a/CAM/zoncoffee.gpi +++ b/CAM/zoncoffee.gpi @@ -2,7 +2,7 @@ Generated by EAGLE CAM Processor 6.5.0 Photoplotter Info File: /home/ethanzonca/Projects/ZonCoffeeOLED/CAM/zoncoffee.gpi - Date : 19 Nov 2014 22:49:23 + Date : 12 Dec 2014 23:11:25 Plotfile : /home/ethanzonca/Projects/ZonCoffeeOLED/CAM/zoncoffee.GTL Apertures : generated: Device : Gerber RS-274-X photoplotter, coordinate format 2.4 inch @@ -41,13 +41,14 @@ Apertures used: D15 square 0.0748inch 2 D16 rectangle 0.0236inch x 0.0610inch 8 D17 rectangle 0.0217inch x 0.0472inch 5 - D18 draw 0.0118inch 34 + D18 draw 0.0118inch 2 D19 square 0.0600inch 8 D20 rectangle 0.0276inch x 0.0197inch 2 D21 rectangle 0.0276inch x 0.0354inch 20 D22 rectangle 0.0354inch x 0.0276inch 2 - D23 draw 0.0138inch 1 - D24 rectangle 0.0276inch x 0.0177inch 8 - D25 round 0.0240inch 60 - D26 draw 0.0080inch 234 + D23 rectangle 0.0276inch x 0.0177inch 8 + D24 rectangle 0.0197inch x 0.0571inch 16 + D25 rectangle 0.0571inch x 0.0197inch 16 + D26 round 0.0240inch 62 + D27 draw 0.0080inch 233 diff --git a/archive/eagle.epf b/archive/eagle.epf --- a/archive/eagle.epf +++ b/archive/eagle.epf @@ -390,64 +390,10 @@ UsedLibrary="/home/ethanzonca/Projects/S UsedLibrary="/home/ethanzonca/Projects/ZonCoffeeOLED/lbr/microbuilder.lbr" [Win_1] -Type="Board Editor" -Loc="0 0 625 724" -State=1 -Number=2 -File="/home/ethanzonca/Projects/ZonCoffeeOLED/zoncoffee.brd" -View="6.38367 0.806928 35.7386 16.6512" -WireWidths=" 0.3048 0.6096 0.8128 1.016 1.27 1.4224 1.6764 1.778 1.9304 2.1844 2.54 3.81 6.4516 0.4064 0 0.2032" -PadDiameters=" 0.254 0.3048 0.4064 0.6096 0.8128 1.016 1.27 1.4224 1.6764 1.778 1.9304 2.1844 2.54 3.81 6.4516 0" -PadDrills=" 0.6 0.7 0.9 1 1.1 1.2 1.3 1.4 1.5 1.6 2 2.2 2.8 3.2 0.8 0.3048" -ViaDiameters=" 0.254 0.3048 0.4064 0.6096 0.8128 1.016 1.27 1.4224 1.6764 1.778 1.9304 2.1844 2.54 3.81 6.4516 0" -ViaDrills=" 0.7 0.8 0.9 1 1.1 1.2 1.3 1.4 1.5 1.6 2 2.2 2.8 3.2 0.6 0.3048" -HoleDrills=" 0.7 0.8 0.9 1 1.1 1.2 1.3 1.4 1.5 1.6 2 2.2 2.8 3.2 0.6 0.3048" -TextSizes=" 0.254 0.3048 0.4064 0.6096 1.4224 1.6764 1.9304 2.1844 2.54 3.81 5.08 6.4516 1.778 1.016 0.8128 1.27" -PolygonSpacings=" 0.254 0.3048 0.4064 0.6096 0.8128 1.016 1.4224 1.6764 1.778 1.9304 2.1844 2.54 3.81 5.08 6.4516 1.27" -PolygonIsolates=" 0.254 0.3048 0.4064 0.6096 0.8128 1.016 1.27 1.4224 1.6764 1.778 1.9304 2.1844 2.54 3.81 6.4516 0" -MiterRadiuss=" 0.254 0.3175 0.635 1.27 2.54 1 2 2.5 5 7.5 10 0" -DimensionWidths=" 0 0.127 0.254 0.1 0.26 0.13" -DimensionExtWidths=" 0.127 0.254 0.1 0.13 0.26 0" -DimensionExtLengths=" 1.27 2.54 1 2 3 0" -DimensionExtOffsets=" 1.27 2.54 1 2 3 0" -SmdSizes=" 0.3048 0.1524 0.4064 0.2032 0.6096 0.3048 0.8128 0.4064 1.016 0.508 1.27 0.6604 1.4224 0.7112 1.6764 0.8128 1.778 0.9144 1.9304 0.9652 2.1844 1.0668 2.54 1.27 3.81 1.9304 5.08 2.54 6.4516 3.2512 1.27 0.635" -WireBend=2 -WireBendSet=0 -WireCap=1 -MiterStyle=1 -PadShape=0 -ViaShape=1 -PolygonPour=0 -PolygonRank=1 -PolygonThermals=1 -PolygonOrphans=0 -TextRatio=8 -DimensionUnit=1 -DimensionPrecision=2 -DimensionShowUnit=0 -PinDirection=3 -PinFunction=0 -PinLength=2 -PinVisible=3 -SwapLevel=0 -ArcDirection=0 -AddLevel=2 -PadsSameType=0 -Layer=1 - -[Win_2] -Type="CAM Processor" -Loc="59 25 1265 473" -State=2 -Number=1 -File="/home/ethanzonca/Projects/ZonCoffeeOLED/zoncoffee.brd" -Job="/home/ethanzonca/Projects/protofusion-hardware/cam/Elecrow_Gerber_Generater_DrillAlign.cam" - -[Win_3] Type="Schematic Editor" Loc="640 0 1265 724" -State=1 -Number=3 +State=2 +Number=5 File="/home/ethanzonca/Projects/ZonCoffeeOLED/zoncoffee.sch" View="3.0389 41.5682 295.56 236.35" WireWidths=" 0 0.3048 0.6096 0.8128 1.016 1.27 1.4224 1.6764 1.778 1.9304 2.1844 2.54 3.81 6.4516 0.4064 0.1524" @@ -491,6 +437,60 @@ Layer=91 Views=" 1: 3.0389 41.5682 295.56 236.35" Sheet=1 +[Win_2] +Type="CAM Processor" +Loc="0 0 599 448" +State=2 +Number=1 +File="/home/ethanzonca/Projects/ZonCoffeeOLED/zoncoffee.brd" +Job="/home/ethanzonca/Projects/protofusion-hardware/cam/Elecrow_Gerber_Generater_DrillAlign.cam" + +[Win_3] +Type="Board Editor" +Loc="0 0 625 724" +State=1 +Number=2 +File="/home/ethanzonca/Projects/ZonCoffeeOLED/zoncoffee.brd" +View="7.90754 3.70798 46.2451 14.7109" +WireWidths=" 0.3048 0.6096 0.8128 1.016 1.27 1.4224 1.6764 1.778 1.9304 2.1844 2.54 3.81 6.4516 0.4064 0 0.2032" +PadDiameters=" 0.254 0.3048 0.4064 0.6096 0.8128 1.016 1.27 1.4224 1.6764 1.778 1.9304 2.1844 2.54 3.81 6.4516 0" +PadDrills=" 0.6 0.7 0.9 1 1.1 1.2 1.3 1.4 1.5 1.6 2 2.2 2.8 3.2 0.8 0.3048" +ViaDiameters=" 0.254 0.3048 0.4064 0.6096 0.8128 1.016 1.27 1.4224 1.6764 1.778 1.9304 2.1844 2.54 3.81 6.4516 0" +ViaDrills=" 0.7 0.8 0.9 1 1.1 1.2 1.3 1.4 1.5 1.6 2 2.2 2.8 3.2 0.6 0.3048" +HoleDrills=" 0.7 0.8 0.9 1 1.1 1.2 1.3 1.4 1.5 1.6 2 2.2 2.8 3.2 0.6 0.3048" +TextSizes=" 0.254 0.3048 0.4064 0.6096 1.4224 1.6764 1.9304 2.1844 2.54 3.81 5.08 6.4516 1.778 1.016 0.8128 1.27" +PolygonSpacings=" 0.254 0.3048 0.4064 0.6096 0.8128 1.016 1.4224 1.6764 1.778 1.9304 2.1844 2.54 3.81 5.08 6.4516 1.27" +PolygonIsolates=" 0.254 0.3048 0.4064 0.6096 0.8128 1.016 1.27 1.4224 1.6764 1.778 1.9304 2.1844 2.54 3.81 6.4516 0" +MiterRadiuss=" 0.254 0.3175 0.635 1.27 2.54 1 2 2.5 5 7.5 10 0" +DimensionWidths=" 0 0.127 0.254 0.1 0.26 0.13" +DimensionExtWidths=" 0.127 0.254 0.1 0.13 0.26 0" +DimensionExtLengths=" 1.27 2.54 1 2 3 0" +DimensionExtOffsets=" 1.27 2.54 1 2 3 0" +SmdSizes=" 0.3048 0.1524 0.4064 0.2032 0.6096 0.3048 0.8128 0.4064 1.016 0.508 1.27 0.6604 1.4224 0.7112 1.6764 0.8128 1.778 0.9144 1.9304 0.9652 2.1844 1.0668 2.54 1.27 3.81 1.9304 5.08 2.54 6.4516 3.2512 1.27 0.635" +WireBend=1 +WireBendSet=0 +WireCap=1 +MiterStyle=1 +PadShape=0 +ViaShape=1 +PolygonPour=0 +PolygonRank=1 +PolygonThermals=1 +PolygonOrphans=0 +TextRatio=8 +DimensionUnit=1 +DimensionPrecision=2 +DimensionShowUnit=0 +PinDirection=3 +PinFunction=0 +PinLength=2 +PinVisible=3 +SwapLevel=0 +ArcDirection=0 +AddLevel=2 +PadsSameType=0 +Layer=1 + [Win_4] Type="Control Panel" Loc="585 230 1184 629" diff --git a/zoncoffee.brd b/zoncoffee.brd --- a/zoncoffee.brd +++ b/zoncoffee.brd @@ -23,7 +23,7 @@ - + @@ -1959,8 +1959,11 @@ You are welcome to use this library for ->NAME +>NAME >VALUE + + + @@ -2557,7 +2560,7 @@ design rules under a new name. - + @@ -2585,9 +2588,7 @@ design rules under a new name. - - - + @@ -2597,9 +2598,9 @@ design rules under a new name. - + - + @@ -2652,6 +2653,9 @@ design rules under a new name. + + + @@ -2897,12 +2901,11 @@ design rules under a new name. - + - - - + + @@ -2918,17 +2921,19 @@ design rules under a new name. + + - + - - + + @@ -2945,6 +2950,8 @@ design rules under a new name. + + diff --git a/zoncoffee.sch b/zoncoffee.sch --- a/zoncoffee.sch +++ b/zoncoffee.sch @@ -1,6 +1,6 @@ - + @@ -2476,8 +2476,11 @@ 5V - VREG-00823 ->NAME +>NAME >VALUE + + +