diff --git a/kicad/modules/hellen1-wbo/copy_module_wbo.bat b/kicad/modules/hellen1-wbo/copy_module_wbo.bat index 524ecd6..89acc15 100644 --- a/kicad/modules/hellen1-wbo/copy_module_wbo.bat +++ b/kicad/modules/hellen1-wbo/copy_module_wbo.bat @@ -1,3 +1,3 @@ cd ..\..\.. -python ./bin/copy_from_Kicad.py "modules" "kicad/modules" "gerber" "wbo" "0.4" +python ./bin/copy_from_Kicad.py "modules" "kicad/modules" "gerber" "wbo" "0.5" diff --git a/kicad/modules/hellen1-wbo/gerber/hellen1-wbo-B_Cu.gbl b/kicad/modules/hellen1-wbo/gerber/hellen1-wbo-B_Cu.gbl index 954c9b6..e1e78ef 100644 --- a/kicad/modules/hellen1-wbo/gerber/hellen1-wbo-B_Cu.gbl +++ b/kicad/modules/hellen1-wbo/gerber/hellen1-wbo-B_Cu.gbl @@ -1,12 +1,12 @@ G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,(6.0.8)* -G04 #@! TF.CreationDate,2022-12-14T13:47:10+03:00* +G04 #@! TF.CreationDate,2023-04-03T16:58:02+03:00* G04 #@! TF.ProjectId,hellen1-wbo,68656c6c-656e-4312-9d77-626f2e6b6963,0.3* G04 #@! TF.SameCoordinates,PX4a19ba0PY5aa5910* G04 #@! TF.FileFunction,Copper,L4,Bot* G04 #@! TF.FilePolarity,Positive* %FSLAX46Y46*% G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)* -G04 Created by KiCad (PCBNEW (6.0.8)) date 2022-12-14 13:47:10* +G04 Created by KiCad (PCBNEW (6.0.8)) date 2023-04-03 16:58:02* %MOMM*% %LPD*% G01* @@ -103,11 +103,11 @@ X558800Y11300000D03* G04 #@! TO.P,M600,W2,CAN_VIO* G04 #@! TO.N,+3V3* X558800Y10300000D03* -G04 #@! TO.P,M600,W3,CANH* -G04 #@! TO.N,/CANH* -X558800Y7004000D03* -G04 #@! TO.P,M600,W4,CANL* +G04 #@! TO.P,M600,W3,CANL* G04 #@! TO.N,/CANL* +X558800Y7004000D03* +G04 #@! TO.P,M600,W4,CANH* +G04 #@! TO.N,/CANH* X558800Y8020000D03* G04 #@! TO.P,M600,W9,VDDA* G04 #@! TO.N,Net-(M600-PadW9)* @@ -2009,7 +2009,7 @@ G37* G04 #@! TD.AperFunction* G04 #@! TD* G04 #@! TO.P,R629,1* -G04 #@! TO.N,/CANH* +G04 #@! TO.N,/CANL* G04 #@! TA.AperFunction,SMDPad,CuDef* G36* G01* @@ -2037,7 +2037,7 @@ G01* G37* G04 #@! TD.AperFunction* G04 #@! TO.P,R629,2* -G04 #@! TO.N,/CANL* +G04 #@! TO.N,/CANH* G04 #@! TA.AperFunction,SMDPad,CuDef* G36* G01* @@ -2066,7 +2066,7 @@ G37* G04 #@! TD.AperFunction* G04 #@! TD* G04 #@! TO.P,D604,1,G* -G04 #@! TO.N,/CANL* +G04 #@! TO.N,/CANH* G04 #@! TA.AperFunction,SMDPad,CuDef* G36* G01* @@ -2094,7 +2094,7 @@ G01* G37* G04 #@! TD.AperFunction* G04 #@! TO.P,D604,2,D* -G04 #@! TO.N,/CANH* +G04 #@! TO.N,/CANL* G04 #@! TA.AperFunction,SMDPad,CuDef* G36* G01* @@ -2348,7 +2348,7 @@ G01* G37* G04 #@! TD.AperFunction* G04 #@! TO.P,U605,6,CANL* -G04 #@! TO.N,/CANH* +G04 #@! TO.N,/CANL* G04 #@! TA.AperFunction,SMDPad,CuDef* G36* G01* @@ -2376,7 +2376,7 @@ G01* G37* G04 #@! TD.AperFunction* G04 #@! TO.P,U605,7,CANH* -G04 #@! TO.N,/CANL* +G04 #@! TO.N,/CANH* G04 #@! TA.AperFunction,SMDPad,CuDef* G36* G01* @@ -2528,7 +2528,7 @@ X26050000Y9875000D03* X26050000Y10575000D03* X26050000Y9175000D03* X26825000Y9875000D03* -G04 #@! TO.N,/CANL* +G04 #@! TO.N,/CANH* X1291770Y1184175D03* G04 #@! TO.N,Net-(M600-PadW9)* X16487886Y11521195D03* @@ -2970,17 +2970,6 @@ X18710000Y12625000D02* X18710000Y11690000D01* D24* G04 #@! TO.N,/CANL* -X3087953Y7959628D02* -X3225000Y8096675D01* -X1619422Y8023652D02* -X3107375Y8023652D01* -X1650945Y825000D02* -X1291770Y1184175D01* -X2687500Y825000D02* -X1650945Y825000D01* -X1619422Y8023652D02* -X638222Y8023652D01* -G04 #@! TO.N,/CANH* X3162047Y6889628D02* X3225000Y6826675D01* X1619422Y7003652D02* @@ -2993,6 +2982,17 @@ X1610000Y7003652D02* X1610000Y6065000D01* X1619422Y6953652D02* X3181469Y6953652D01* +G04 #@! TO.N,/CANH* +X3087953Y7959628D02* +X3225000Y8096675D01* +X1619422Y8023652D02* +X3107375Y8023652D01* +X1650945Y825000D02* +X1291770Y1184175D01* +X2687500Y825000D02* +X1650945Y825000D01* +X1619422Y8023652D02* +X638222Y8023652D01* G04 #@! TO.N,Net-(M600-PadW9)* X15930000Y10963309D02* X15930000Y10240000D01* diff --git a/kicad/modules/hellen1-wbo/gerber/hellen1-wbo-B_Mask.gbs b/kicad/modules/hellen1-wbo/gerber/hellen1-wbo-B_Mask.gbs index 7f9abae..e84cb84 100644 --- a/kicad/modules/hellen1-wbo/gerber/hellen1-wbo-B_Mask.gbs +++ b/kicad/modules/hellen1-wbo/gerber/hellen1-wbo-B_Mask.gbs @@ -1,12 +1,12 @@ G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,(6.0.8)* -G04 #@! TF.CreationDate,2022-12-14T13:47:10+03:00* +G04 #@! TF.CreationDate,2023-04-03T16:58:02+03:00* G04 #@! TF.ProjectId,hellen1-wbo,68656c6c-656e-4312-9d77-626f2e6b6963,0.3* G04 #@! TF.SameCoordinates,PX4a19ba0PY5aa5910* G04 #@! TF.FileFunction,Soldermask,Bot* G04 #@! TF.FilePolarity,Negative* %FSLAX46Y46*% G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)* -G04 Created by KiCad (PCBNEW (6.0.8)) date 2022-12-14 13:47:10* +G04 Created by KiCad (PCBNEW (6.0.8)) date 2023-04-03 16:58:02* %MOMM*% %LPD*% G01* diff --git a/kicad/modules/hellen1-wbo/gerber/hellen1-wbo-B_Paste.gbp b/kicad/modules/hellen1-wbo/gerber/hellen1-wbo-B_Paste.gbp index 58a8677..a1e2ae2 100644 --- a/kicad/modules/hellen1-wbo/gerber/hellen1-wbo-B_Paste.gbp +++ b/kicad/modules/hellen1-wbo/gerber/hellen1-wbo-B_Paste.gbp @@ -1,12 +1,12 @@ G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,(6.0.8)* -G04 #@! TF.CreationDate,2022-12-14T13:47:10+03:00* +G04 #@! TF.CreationDate,2023-04-03T16:58:02+03:00* G04 #@! TF.ProjectId,hellen1-wbo,68656c6c-656e-4312-9d77-626f2e6b6963,0.3* G04 #@! TF.SameCoordinates,PX4a19ba0PY5aa5910* G04 #@! TF.FileFunction,Paste,Bot* G04 #@! TF.FilePolarity,Positive* %FSLAX46Y46*% G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)* -G04 Created by KiCad (PCBNEW (6.0.8)) date 2022-12-14 13:47:10* +G04 Created by KiCad (PCBNEW (6.0.8)) date 2023-04-03 16:58:02* %MOMM*% %LPD*% G01* diff --git a/kicad/modules/hellen1-wbo/gerber/hellen1-wbo-B_Silkscreen.gbo b/kicad/modules/hellen1-wbo/gerber/hellen1-wbo-B_Silkscreen.gbo index 3420e9a..75ec87d 100644 --- a/kicad/modules/hellen1-wbo/gerber/hellen1-wbo-B_Silkscreen.gbo +++ b/kicad/modules/hellen1-wbo/gerber/hellen1-wbo-B_Silkscreen.gbo @@ -1,12 +1,12 @@ G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,(6.0.8)* -G04 #@! TF.CreationDate,2022-12-14T13:47:10+03:00* +G04 #@! TF.CreationDate,2023-04-03T16:58:02+03:00* G04 #@! TF.ProjectId,hellen1-wbo,68656c6c-656e-4312-9d77-626f2e6b6963,0.3* G04 #@! TF.SameCoordinates,PX4a19ba0PY5aa5910* G04 #@! TF.FileFunction,Legend,Bot* G04 #@! TF.FilePolarity,Positive* %FSLAX46Y46*% G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)* -G04 Created by KiCad (PCBNEW (6.0.8)) date 2022-12-14 13:47:10* +G04 Created by KiCad (PCBNEW (6.0.8)) date 2023-04-03 16:58:02* %MOMM*% %LPD*% G01* @@ -234,11 +234,22 @@ X20323809Y8447620D01* X20371428Y8495239D01* X20323809Y8542858D01* X20323809Y8447620D01* -X19419047Y9114286D02* -X19419047Y8447620D01* -X19657142Y9495239D02* -X19895238Y8780953D01* -X19276190Y8780953D01* +X19371428Y9447620D02* +X19847619Y9447620D01* +X19895238Y8971429D01* +X19847619Y9019048D01* +X19752380Y9066667D01* +X19514285Y9066667D01* +X19419047Y9019048D01* +X19371428Y8971429D01* +X19323809Y8876191D01* +X19323809Y8638096D01* +X19371428Y8542858D01* +X19419047Y8495239D01* +X19514285Y8447620D01* +X19752380Y8447620D01* +X19847619Y8495239D01* +X19895238Y8542858D01* D12* G04 #@! TO.C,M600* X27600000Y14000000D02* diff --git a/kicad/modules/hellen1-wbo/gerber/hellen1-wbo-Edge_Cuts.gm1 b/kicad/modules/hellen1-wbo/gerber/hellen1-wbo-Edge_Cuts.gm1 index 25af4fa..a9977d8 100644 --- a/kicad/modules/hellen1-wbo/gerber/hellen1-wbo-Edge_Cuts.gm1 +++ b/kicad/modules/hellen1-wbo/gerber/hellen1-wbo-Edge_Cuts.gm1 @@ -1,11 +1,11 @@ G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,(6.0.8)* -G04 #@! TF.CreationDate,2022-12-14T13:47:10+03:00* +G04 #@! TF.CreationDate,2023-04-03T16:58:02+03:00* G04 #@! TF.ProjectId,hellen1-wbo,68656c6c-656e-4312-9d77-626f2e6b6963,0.3* G04 #@! TF.SameCoordinates,PX4a19ba0PY5aa5910* G04 #@! TF.FileFunction,Profile,NP* %FSLAX46Y46*% G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)* -G04 Created by KiCad (PCBNEW (6.0.8)) date 2022-12-14 13:47:10* +G04 Created by KiCad (PCBNEW (6.0.8)) date 2023-04-03 16:58:02* %MOMM*% %LPD*% G01* diff --git a/kicad/modules/hellen1-wbo/gerber/hellen1-wbo-F_Cu.gtl b/kicad/modules/hellen1-wbo/gerber/hellen1-wbo-F_Cu.gtl index c3cf534..7962374 100644 --- a/kicad/modules/hellen1-wbo/gerber/hellen1-wbo-F_Cu.gtl +++ b/kicad/modules/hellen1-wbo/gerber/hellen1-wbo-F_Cu.gtl @@ -1,12 +1,12 @@ G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,(6.0.8)* -G04 #@! TF.CreationDate,2022-12-14T13:47:10+03:00* +G04 #@! TF.CreationDate,2023-04-03T16:58:02+03:00* G04 #@! TF.ProjectId,hellen1-wbo,68656c6c-656e-4312-9d77-626f2e6b6963,0.3* G04 #@! TF.SameCoordinates,PX4a19ba0PY5aa5910* G04 #@! TF.FileFunction,Copper,L1,Top* G04 #@! TF.FilePolarity,Positive* %FSLAX46Y46*% G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)* -G04 Created by KiCad (PCBNEW (6.0.8)) date 2022-12-14 13:47:10* +G04 Created by KiCad (PCBNEW (6.0.8)) date 2023-04-03 16:58:02* %MOMM*% %LPD*% G01* @@ -2368,11 +2368,11 @@ X558800Y11300000D03* G04 #@! TO.P,M600,W2,CAN_VIO* G04 #@! TO.N,+3V3* X558800Y10300000D03* -G04 #@! TO.P,M600,W3,CANH* -G04 #@! TO.N,/CANH* -X558800Y7004000D03* -G04 #@! TO.P,M600,W4,CANL* +G04 #@! TO.P,M600,W3,CANL* G04 #@! TO.N,/CANL* +X558800Y7004000D03* +G04 #@! TO.P,M600,W4,CANH* +G04 #@! TO.N,/CANH* X558800Y8020000D03* G04 #@! TO.P,M600,W5,nReset* G04 #@! TO.N,/nRESET* @@ -2618,7 +2618,7 @@ X26050000Y9875000D03* X26050000Y10575000D03* X26050000Y9175000D03* X26825000Y9875000D03* -G04 #@! TO.N,/CANL* +G04 #@! TO.N,/CANH* X1291770Y1184175D03* G04 #@! TO.N,Net-(M600-PadW9)* X16487886Y11521195D03* diff --git a/kicad/modules/hellen1-wbo/gerber/hellen1-wbo-F_Mask.gts b/kicad/modules/hellen1-wbo/gerber/hellen1-wbo-F_Mask.gts index c5e0a20..cde06bf 100644 --- a/kicad/modules/hellen1-wbo/gerber/hellen1-wbo-F_Mask.gts +++ b/kicad/modules/hellen1-wbo/gerber/hellen1-wbo-F_Mask.gts @@ -1,12 +1,12 @@ G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,(6.0.8)* -G04 #@! TF.CreationDate,2022-12-14T13:47:10+03:00* +G04 #@! TF.CreationDate,2023-04-03T16:58:02+03:00* G04 #@! TF.ProjectId,hellen1-wbo,68656c6c-656e-4312-9d77-626f2e6b6963,0.3* G04 #@! TF.SameCoordinates,PX4a19ba0PY5aa5910* G04 #@! TF.FileFunction,Soldermask,Top* G04 #@! TF.FilePolarity,Negative* %FSLAX46Y46*% G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)* -G04 Created by KiCad (PCBNEW (6.0.8)) date 2022-12-14 13:47:10* +G04 Created by KiCad (PCBNEW (6.0.8)) date 2023-04-03 16:58:02* %MOMM*% %LPD*% G01* diff --git a/kicad/modules/hellen1-wbo/gerber/hellen1-wbo-F_Paste.gtp b/kicad/modules/hellen1-wbo/gerber/hellen1-wbo-F_Paste.gtp index 0f30643..3ee5c1a 100644 --- a/kicad/modules/hellen1-wbo/gerber/hellen1-wbo-F_Paste.gtp +++ b/kicad/modules/hellen1-wbo/gerber/hellen1-wbo-F_Paste.gtp @@ -1,12 +1,12 @@ G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,(6.0.8)* -G04 #@! TF.CreationDate,2022-12-14T13:47:10+03:00* +G04 #@! TF.CreationDate,2023-04-03T16:58:02+03:00* G04 #@! TF.ProjectId,hellen1-wbo,68656c6c-656e-4312-9d77-626f2e6b6963,0.3* G04 #@! TF.SameCoordinates,PX4a19ba0PY5aa5910* G04 #@! TF.FileFunction,Paste,Top* G04 #@! TF.FilePolarity,Positive* %FSLAX46Y46*% G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)* -G04 Created by KiCad (PCBNEW (6.0.8)) date 2022-12-14 13:47:10* +G04 Created by KiCad (PCBNEW (6.0.8)) date 2023-04-03 16:58:02* %MOMM*% %LPD*% G01* diff --git a/kicad/modules/hellen1-wbo/gerber/hellen1-wbo-F_Silkscreen.gto b/kicad/modules/hellen1-wbo/gerber/hellen1-wbo-F_Silkscreen.gto index fdf647d..59e804a 100644 --- a/kicad/modules/hellen1-wbo/gerber/hellen1-wbo-F_Silkscreen.gto +++ b/kicad/modules/hellen1-wbo/gerber/hellen1-wbo-F_Silkscreen.gto @@ -1,12 +1,12 @@ G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,(6.0.8)* -G04 #@! TF.CreationDate,2022-12-14T13:47:10+03:00* +G04 #@! TF.CreationDate,2023-04-03T16:58:02+03:00* G04 #@! TF.ProjectId,hellen1-wbo,68656c6c-656e-4312-9d77-626f2e6b6963,0.3* G04 #@! TF.SameCoordinates,PX4a19ba0PY5aa5910* G04 #@! TF.FileFunction,Legend,Top* G04 #@! TF.FilePolarity,Positive* %FSLAX46Y46*% G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)* -G04 Created by KiCad (PCBNEW (6.0.8)) date 2022-12-14 13:47:10* +G04 Created by KiCad (PCBNEW (6.0.8)) date 2023-04-03 16:58:02* %MOMM*% %LPD*% G01* diff --git a/kicad/modules/hellen1-wbo/gerber/hellen1-wbo-In1_Cu.g2 b/kicad/modules/hellen1-wbo/gerber/hellen1-wbo-In1_Cu.g2 index e3dac5c..62b1d2a 100644 --- a/kicad/modules/hellen1-wbo/gerber/hellen1-wbo-In1_Cu.g2 +++ b/kicad/modules/hellen1-wbo/gerber/hellen1-wbo-In1_Cu.g2 @@ -1,12 +1,12 @@ G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,(6.0.8)* -G04 #@! TF.CreationDate,2022-12-14T13:47:10+03:00* +G04 #@! TF.CreationDate,2023-04-03T16:58:02+03:00* G04 #@! TF.ProjectId,hellen1-wbo,68656c6c-656e-4312-9d77-626f2e6b6963,0.3* G04 #@! TF.SameCoordinates,PX4a19ba0PY5aa5910* G04 #@! TF.FileFunction,Copper,L2,Inr* G04 #@! TF.FilePolarity,Positive* %FSLAX46Y46*% G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)* -G04 Created by KiCad (PCBNEW (6.0.8)) date 2022-12-14 13:47:10* +G04 Created by KiCad (PCBNEW (6.0.8)) date 2023-04-03 16:58:02* %MOMM*% %LPD*% G01* @@ -84,9 +84,9 @@ G04 #@! TO.N,+5V* X558800Y11300000D03* G04 #@! TO.N,+3V3* X558800Y10300000D03* -G04 #@! TO.N,/CANH* -X558800Y7004000D03* G04 #@! TO.N,/CANL* +X558800Y7004000D03* +G04 #@! TO.N,/CANH* X558800Y8020000D03* G04 #@! TO.N,Net-(M600-PadW9)* X558800Y12300000D03* @@ -197,7 +197,7 @@ X26050000Y9875000D03* X26050000Y10575000D03* X26050000Y9175000D03* X26825000Y9875000D03* -G04 #@! TO.N,/CANL* +G04 #@! TO.N,/CANH* X1291770Y1184175D03* G04 #@! TO.N,Net-(M600-PadW9)* X16487886Y11521195D03* diff --git a/kicad/modules/hellen1-wbo/gerber/hellen1-wbo-In2_Cu.g3 b/kicad/modules/hellen1-wbo/gerber/hellen1-wbo-In2_Cu.g3 index 426fa26..e5cf4b7 100644 --- a/kicad/modules/hellen1-wbo/gerber/hellen1-wbo-In2_Cu.g3 +++ b/kicad/modules/hellen1-wbo/gerber/hellen1-wbo-In2_Cu.g3 @@ -1,12 +1,12 @@ G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,(6.0.8)* -G04 #@! TF.CreationDate,2022-12-14T13:47:10+03:00* +G04 #@! TF.CreationDate,2023-04-03T16:58:02+03:00* G04 #@! TF.ProjectId,hellen1-wbo,68656c6c-656e-4312-9d77-626f2e6b6963,0.3* G04 #@! TF.SameCoordinates,PX4a19ba0PY5aa5910* G04 #@! TF.FileFunction,Copper,L3,Inr* G04 #@! TF.FilePolarity,Positive* %FSLAX46Y46*% G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)* -G04 Created by KiCad (PCBNEW (6.0.8)) date 2022-12-14 13:47:10* +G04 Created by KiCad (PCBNEW (6.0.8)) date 2023-04-03 16:58:02* %MOMM*% %LPD*% G01* @@ -89,9 +89,9 @@ G04 #@! TO.N,+5V* X558800Y11300000D03* G04 #@! TO.N,+3V3* X558800Y10300000D03* -G04 #@! TO.N,/CANH* -X558800Y7004000D03* G04 #@! TO.N,/CANL* +X558800Y7004000D03* +G04 #@! TO.N,/CANH* X558800Y8020000D03* G04 #@! TO.N,Net-(M600-PadW9)* X558800Y12300000D03* @@ -202,7 +202,7 @@ X26050000Y9875000D03* X26050000Y10575000D03* X26050000Y9175000D03* X26825000Y9875000D03* -G04 #@! TO.N,/CANL* +G04 #@! TO.N,/CANH* X1291770Y1184175D03* G04 #@! TO.N,Net-(M600-PadW9)* X16487886Y11521195D03* @@ -454,7 +454,7 @@ X14550000Y9100000D02* X13514766Y9100000D01* X14775000Y8875000D02* X14550000Y9100000D01* -G04 #@! TO.N,/CANL* +G04 #@! TO.N,/CANH* X2000000Y2300000D02* X2000000Y3025000D01* X1291770Y1591770D02* diff --git a/kicad/modules/hellen1-wbo/gerber/hellen1-wbo-Module_Edge.gbr b/kicad/modules/hellen1-wbo/gerber/hellen1-wbo-Module_Edge.gbr index 3cd9c62..f96ea80 100644 --- a/kicad/modules/hellen1-wbo/gerber/hellen1-wbo-Module_Edge.gbr +++ b/kicad/modules/hellen1-wbo/gerber/hellen1-wbo-Module_Edge.gbr @@ -1,11 +1,11 @@ G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,(6.0.8)* -G04 #@! TF.CreationDate,2022-12-14T13:47:10+03:00* +G04 #@! TF.CreationDate,2023-04-03T16:58:02+03:00* G04 #@! TF.ProjectId,hellen1-wbo,68656c6c-656e-4312-9d77-626f2e6b6963,0.3* G04 #@! TF.SameCoordinates,PX4a19ba0PY5aa5910* G04 #@! TF.FileFunction,Other,User* %FSLAX46Y46*% G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)* -G04 Created by KiCad (PCBNEW (6.0.8)) date 2022-12-14 13:47:10* +G04 Created by KiCad (PCBNEW (6.0.8)) date 2023-04-03 16:58:02* %MOMM*% %LPD*% G01* diff --git a/kicad/modules/hellen1-wbo/gerber/hellen1-wbo-all-pos.csv b/kicad/modules/hellen1-wbo/gerber/hellen1-wbo-all-pos.csv index 1bf46bb..c81e725 100644 --- a/kicad/modules/hellen1-wbo/gerber/hellen1-wbo-all-pos.csv +++ b/kicad/modules/hellen1-wbo/gerber/hellen1-wbo-all-pos.csv @@ -50,7 +50,7 @@ Ref,Val,Package,PosX,PosY,Rot,Side "D601","LED-GREEN-0603","LED_0603_1608Metric",12.825000,1.400000,180.000000,top "D602","LED-BLUE-0603","LED_0603_1608Metric",9.850000,1.400000,0.000000,top "D603","LED-RED-0603","LED_0603_1608Metric",5.317550,12.230000,-90.000000,top -"M600","Module-wbo-0.4","wbo",0.000000,0.000000,0.000000,top +"M600","Module-wbo-0.5","wbo",0.000000,0.000000,0.000000,top "Q600","BTS3028","TO-252-2",21.160000,5.950000,-90.000000,top "Q601","VNP28N04-E","TO-220-3_Vertical",21.250000,12.625000,180.000000,top "R600","1k","R_0402_1005Metric",16.950000,3.775000,-90.000000,top diff --git a/kicad/modules/hellen1-wbo/gerber/hellen1-wbo.csv b/kicad/modules/hellen1-wbo/gerber/hellen1-wbo.csv index a0fb77a..ca47d15 100644 --- a/kicad/modules/hellen1-wbo/gerber/hellen1-wbo.csv +++ b/kicad/modules/hellen1-wbo/gerber/hellen1-wbo.csv @@ -23,7 +23,7 @@ "LED-BLUE-0603","D602","LED_SMD:LED_0603_1608Metric","C72041" "LED-RED-0603","D603","LED_SMD:LED_0603_1608Metric","C2286" "PESD1CAN","D604","Package_TO_SOT_SMD:SOT-23","C343993" -"Module-wbo-0.4","M600","hellen-one-wbo-0.4:wbo","" +"Module-wbo-0.5","M600","hellen-one-wbo-0.4:wbo","" "BTS3028","Q600","Package_TO_SOT_SMD:TO-252-2","C112639" "VNP28N04-E","Q601","Package_TO_SOT_THT:TO-220-3_Vertical","C263002" "1k","R600","Resistor_SMD:R_0402_1005Metric","C11702" @@ -55,7 +55,7 @@ "1k","R626","Resistor_SMD:R_0402_1005Metric","C11702" "1k","R627","Resistor_SMD:R_0402_1005Metric","C11702" "1k","R628","Resistor_SMD:R_0402_1005Metric","C11702" -"120","R629","Resistor_SMD:R_0402_1005Metric","C25079" +"DNP","R629","Resistor_SMD:R_0402_1005Metric","" "DNP","R630","Resistor_SMD:R_0402_1005Metric","" "MCP6004","U600","Package_SO:TSSOP-14_4.4x5mm_P0.65mm","C50282" "AD8628","U601","Package_TO_SOT_SMD:TSOT-23-5","C29309" diff --git a/kicad/modules/hellen1-wbo/gerber/hellen1-wbo.drl b/kicad/modules/hellen1-wbo/gerber/hellen1-wbo.drl index e8f87d7..23cb8f5 100644 --- a/kicad/modules/hellen1-wbo/gerber/hellen1-wbo.drl +++ b/kicad/modules/hellen1-wbo/gerber/hellen1-wbo.drl @@ -1,7 +1,7 @@ M48 -; DRILL file {KiCad (6.0.8)} date Wed Dec 14 13:47:16 2022 +; DRILL file {KiCad (6.0.8)} date Mon Apr 3 16:58:07 2023 ; FORMAT={2:4/ absolute / inch / suppress leading zeros} -; #@! TF.CreationDate,2022-12-14T13:47:16+03:00 +; #@! TF.CreationDate,2023-04-03T16:58:07+03:00 ; #@! TF.GenerationSoftware,Kicad,Pcbnew,(6.0.8) ; #@! TF.FileFunction,MixedPlating,1,4 FMAT,2 diff --git a/kicad/modules/hellen1-wbo/gerber/hellen1-wbo.pdf b/kicad/modules/hellen1-wbo/gerber/hellen1-wbo.pdf index 3c8c57d..dec32af 100644 Binary files a/kicad/modules/hellen1-wbo/gerber/hellen1-wbo.pdf and b/kicad/modules/hellen1-wbo/gerber/hellen1-wbo.pdf differ diff --git a/kicad/modules/hellen1-wbo/gerber/hellen1-wbo.wrl b/kicad/modules/hellen1-wbo/gerber/hellen1-wbo.wrl index cf1d7fb..b10b14a 100644 --- a/kicad/modules/hellen1-wbo/gerber/hellen1-wbo.wrl +++ b/kicad/modules/hellen1-wbo/gerber/hellen1-wbo.wrl @@ -52747,48 +52747,59 @@ DEF SHAPE_188 Shape { 1.515748 1.9486724 -0.93897638,1.4990449 1.9417535 -0.93897638, 1.492126 1.9250504 -0.93897638,1.4990449 1.9083472 -0.93897638, 1.515748 1.9014283 -0.93897638,3.0511811 1.9014283 -0.93897638, - 3.0678843 1.9083472 -0.93897638,0.80708661 3.0186193 -0.93897638, - 0.80016772 3.0353224 -0.93897638,0.78346457 3.0422413 -0.93897638, - 0.76676142 3.0353224 -0.93897638,0.75984252 3.0186193 -0.93897638, - 0.75984252 2.8976421 -0.93897638,0.76676142 2.880939 -0.93897638, - 0.78346457 2.8740201 -0.93897638,0.80016772 2.880939 -0.93897638, - 0.80708661 2.8976421 -0.93897638,0.50787402 3.0186193 -0.93897638, + 3.0678843 1.9083472 -0.93897638,0.50787402 3.0186193 -0.93897638, 0.50095512 3.0353224 -0.93897638,0.48425197 3.0422413 -0.93897638, 0.46754882 3.0353224 -0.93897638,0.46062992 3.0186193 -0.93897638, 0.46062992 2.8976421 -0.93897638,0.46754882 2.880939 -0.93897638, 0.48425197 2.8740201 -0.93897638,0.50095512 2.880939 -0.93897638, - 0.50787402 2.8976421 -0.93897638,9.998728 3.7126965 -0.93897638, - 9.9964039 3.7327602 -0.93897638,9.9817272 3.7466362 -0.93897638, - 9.9615642 3.7478315 -0.93897638,9.9453504 3.7357866 -0.93897638, - 9.9412791 3.7263748 -0.93897638,9.8746449 3.4465102 -0.93897638, - 9.8298055 3.6146575 -0.93897638,9.8282594 3.6168713 -0.93897638, - 9.8280209 3.6195602 -0.93897638,9.822613 3.6249555 -0.93897638, - 9.8182398 3.6312165 -0.93897638,9.8156335 3.6319181 -0.93897638, - 9.813722 3.6338252 -0.93897638,9.8061126 3.6344819 -0.93897638, - 9.7987366 3.6364677 -0.93897638,9.7962878 3.6353295 -0.93897638, - 9.7935984 3.6355614 -0.93897638,9.787348 3.6311736 -0.93897638, - 9.7804205 3.6279535 -0.93897638,9.7792764 3.6255079 -0.93897638, - 9.7770669 3.6239567 -0.93897638,9.7727441 3.6146575 -0.93897638, - 9.7279043 3.4465098 -0.93897638,9.6612701 3.7263748 -0.93897638, - 9.6501535 3.7432382 -0.93897638,9.6307984 3.7490114 -0.93897638, - 9.6122606 3.7409921 -0.93897638,9.6032142 3.7229335 -0.93897638, - 9.6038213 3.7126961 -0.93897638,9.6975594 3.3189953 -0.93897638, - 9.6992642 3.3164094 -0.93897638,9.6995378 3.3133236 -0.93897638, - 9.7046799 3.3081933 -0.93897638,9.708676 3.3021319 -0.93897638, - 9.7116433 3.3012469 -0.93897638,9.7138366 3.2990587 -0.93897638, - 9.721072 3.2984343 -0.93897638,9.7280311 3.2963587 -0.93897638, - 9.7308744 3.2975886 -0.93897638,9.7339602 3.2973224 -0.93897638, - 9.7399039 3.3014949 -0.93897638,9.7465689 3.304378 -0.93897638, - 9.7479563 3.3071472 -0.93897638,9.7504917 3.3089272 -0.93897638, - 9.7548146 3.3182264 -0.93897638,9.8012748 3.4924512 -0.93897638, - 9.8477346 3.3182264 -0.93897638,9.8495087 3.3156866 -0.93897638, - 9.849865 3.3126098 -0.93897638,9.8551425 3.3076201 -0.93897638, - 9.8593004 3.3016673 -0.93897638,9.8622906 3.3008622 -0.93897638, - 9.8645417 3.2987339 -0.93897638,9.8717909 3.2983043 -0.93897638, - 9.8788035 3.2964161 -0.93897638,9.881613 3.297722 -0.93897638, - 9.8847047 3.297539 -0.93897638,9.8905331 3.3018685 -0.93897638, - 9.8971197 3.3049303 -0.93897638,9.8984323 3.3077366 -0.93897638, - 9.9009185 3.3095835 -0.93897638,9.9049898 3.3189953 -0.93897638, + 0.50787402 2.8976421 -0.93897638,0.80708661 3.0186193 -0.93897638, + 0.80016772 3.0353224 -0.93897638,0.78346457 3.0422413 -0.93897638, + 0.76676142 3.0353224 -0.93897638,0.75984252 3.0186193 -0.93897638, + 0.75984252 2.8976421 -0.93897638,0.76676142 2.880939 -0.93897638, + 0.78346457 2.8740201 -0.93897638,0.80016772 2.880939 -0.93897638, + 0.80708661 2.8976421 -0.93897638,8.3785843 3.3424508 -0.93897638, + 8.3788563 3.3430343 -0.93897638,8.3841154 3.3501248 -0.93897638, + 8.402863 3.3876201 -0.93897638,8.4030228 3.3890091 -0.93897638, + 8.4050988 3.3936638 -0.93897638,8.4238465 3.4686543 -0.93897638, + 8.4237047 3.4700118 -0.93897638,8.424728 3.4758157 -0.93897638, + 8.424728 3.5695539 -0.93897638,8.424261 3.5708362 -0.93897638, + 8.4238465 3.5767154 -0.93897638,8.4050988 3.6517059 -0.93897638, + 8.4043157 3.652865 -0.93897638,8.402863 3.6577496 -0.93897638, + 8.3841154 3.6952449 -0.93897638,8.3836472 3.6956882 -0.93897638, + 8.3785843 3.7029189 -0.93897638,8.3598366 3.7216665 -0.93897638, + 8.3592531 3.7219386 -0.93897638,8.352163 3.7271976 -0.93897638, + 8.3146677 3.7459457 -0.93897638,8.3129138 3.7461476 -0.93897638, + 8.3115614 3.7472823 -0.93897638,8.3014622 3.749063 -0.93897638, + 8.2639669 3.749063 -0.93897638,8.2623079 3.7484591 -0.93897638, + 8.2605909 3.7488693 -0.93897638,8.2507618 3.7459457 -0.93897638, + 8.2132661 3.7271976 -0.93897638,8.212822 3.7267287 -0.93897638, + 8.2055925 3.7216665 -0.93897638,8.1868449 3.7029189 -0.93897638, + 8.1865728 3.7023354 -0.93897638,8.1813138 3.6952449 -0.93897638, + 8.1625661 3.6577496 -0.93897638,8.1624063 3.6563606 -0.93897638, + 8.1603303 3.6517059 -0.93897638,8.1415823 3.5767157 -0.93897638, + 8.141724 3.5753579 -0.93897638,8.1407008 3.5695539 -0.93897638, + 8.1407008 3.4794516 -0.93897638,8.1407008 3.4758157 -0.93897638, + 8.1411677 3.4745335 -0.93897638,8.1415823 3.4686539 -0.93897638, + 8.1603303 3.3936638 -0.93897638,8.1611134 3.3925043 -0.93897638, + 8.1625661 3.3876201 -0.93897638,8.1813138 3.3501248 -0.93897638, + 8.1817819 3.3496815 -0.93897638,8.1868449 3.3424508 -0.93897638, + 8.2055925 3.3237031 -0.93897638,8.206176 3.3234311 -0.93897638, + 8.2132665 3.318172 -0.93897638,8.2507618 3.2994244 -0.93897638, + 8.2525154 3.2992224 -0.93897638,8.2538677 3.2980878 -0.93897638, + 8.2639669 3.2963071 -0.93897638,8.3014622 3.2963071 -0.93897638, + 8.3031213 3.296911 -0.93897638,8.3048378 3.2965008 -0.93897638, + 8.3146673 3.2994244 -0.93897638,8.3521626 3.318172 -0.93897638, + 8.3526059 3.3186402 -0.93897638,8.3598366 3.3237031 -0.93897638, + 8.3656728 3.5659185 -0.93897638,8.3656728 3.4794512 -0.93897638, + 8.3485929 3.4111307 -0.93897638,8.3334378 3.3808209 -0.93897638, + 8.3214665 3.3688496 -0.93897638,8.2944917 3.3553622 -0.93897638, + 8.2709374 3.3553622 -0.93897638,8.2439626 3.3688496 -0.93897638, + 8.2319913 3.3808209 -0.93897638,8.2168358 3.4111319 -0.93897638, + 8.1997559 3.4794516 -0.93897638,8.1997559 3.5659181 -0.93897638, + 8.2168358 3.6342378 -0.93897638,8.2319913 3.6645488 -0.93897638, + 8.2439622 3.6765197 -0.93897638,8.2709378 3.6900079 -0.93897638, + 8.2944913 3.6900079 -0.93897638,8.3214665 3.6765201 -0.93897638, + 8.3334378 3.6645488 -0.93897638,8.3485929 3.634239 -0.93897638, 9.453037 3.5025311 -0.93897638,9.453037 3.3553622 -0.93897638, 9.3395535 3.3553622 -0.93897638,9.3125787 3.3688496 -0.93897638, 9.3006075 3.3808209 -0.93897638,9.2871201 3.4077957 -0.93897638, @@ -52833,123 +52844,85 @@ DEF SHAPE_188 Shape { 9.3313264 3.5750736 -0.93897638,9.3193551 3.5870449 -0.93897638, 9.3058677 3.6140197 -0.93897638,9.3058677 3.637574 -0.93897638, 9.3193551 3.6645488 -0.93897638,9.331326 3.6765197 -0.93897638, - 9.3583016 3.6900079 -0.93897638,9.1097429 3.3611984 -0.93897638, - 9.1109744 3.3638394 -0.93897638,9.1133327 3.3655504 -0.93897638, - 9.1175098 3.3749161 -0.93897638,9.1362575 3.4499067 -0.93897638, - 9.1361157 3.4512642 -0.93897638,9.137139 3.4570681 -0.93897638, - 9.137139 3.5883016 -0.93897638,9.136672 3.5895839 -0.93897638, - 9.1362575 3.595463 -0.93897638,9.1175098 3.6704535 -0.93897638, - 9.1158791 3.6728677 -0.93897638,9.1156252 3.6757709 -0.93897638, - 9.1097429 3.6841713 -0.93897638,9.0722476 3.7216665 -0.93897638, - 9.0716642 3.7219386 -0.93897638,9.064574 3.7271976 -0.93897638, - 9.0270787 3.7459457 -0.93897638,9.0253248 3.7461476 -0.93897638, - 9.0239724 3.7472823 -0.93897638,9.0138732 3.749063 -0.93897638, - 8.9388823 3.749063 -0.93897638,8.9372232 3.7484591 -0.93897638, - 8.9355063 3.7488693 -0.93897638,8.9256772 3.7459457 -0.93897638, - 8.8881815 3.7271976 -0.93897638,8.8877386 3.7267295 -0.93897638, - 8.8805079 3.7216665 -0.93897638,8.8430126 3.6841713 -0.93897638, - 8.8417811 3.6815303 -0.93897638,8.8394228 3.6798193 -0.93897638, - 8.8352457 3.6704535 -0.93897638,8.816498 3.595463 -0.93897638, - 8.8166398 3.5941055 -0.93897638,8.8156165 3.5883016 -0.93897638, - 8.8156165 3.4607035 -0.93897638,8.8156165 3.4570681 -0.93897638, - 8.8160835 3.4557858 -0.93897638,8.816498 3.4499067 -0.93897638, - 8.8352457 3.3749161 -0.93897638,8.8368768 3.3725012 -0.93897638, - 8.8371307 3.3695988 -0.93897638,8.8430126 3.3611984 -0.93897638, - 8.8805079 3.3237031 -0.93897638,8.8810913 3.3234311 -0.93897638, - 8.8881819 3.318172 -0.93897638,8.9256772 3.2994244 -0.93897638, - 8.9274307 3.2992224 -0.93897638,8.9287831 3.2980878 -0.93897638, - 8.9388823 3.2963071 -0.93897638,9.0138732 3.2963071 -0.93897638, - 9.0155323 3.296911 -0.93897638,9.0172488 3.2965008 -0.93897638, - 9.0270783 3.2994244 -0.93897638,9.0645736 3.318172 -0.93897638, - 9.0650169 3.3186402 -0.93897638,9.0722476 3.3237031 -0.93897638, - 9.0780839 3.5846661 -0.93897638,9.0780839 3.4607035 -0.93897638, - 9.0622012 3.3971732 -0.93897638,9.0338776 3.3688496 -0.93897638, - 9.0069028 3.3553622 -0.93897638,8.9458528 3.3553622 -0.93897638, - 8.918878 3.3688496 -0.93897638,8.8905543 3.3971732 -0.93897638, - 8.8746717 3.4607035 -0.93897638,8.8746717 3.5846661 -0.93897638, - 8.8905543 3.6481965 -0.93897638,8.9188776 3.6765197 -0.93897638, - 8.9458531 3.6900079 -0.93897638,9.0069024 3.6900079 -0.93897638, - 9.0338776 3.6765201 -0.93897638,9.0622012 3.6481965 -0.93897638, - 8.3785843 3.3424508 -0.93897638,8.3788563 3.3430343 -0.93897638, - 8.3841154 3.3501248 -0.93897638,8.402863 3.3876201 -0.93897638, - 8.4030228 3.3890091 -0.93897638,8.4050988 3.3936638 -0.93897638, - 8.4238465 3.4686543 -0.93897638,8.4237047 3.4700118 -0.93897638, - 8.424728 3.4758157 -0.93897638,8.424728 3.5695539 -0.93897638, - 8.424261 3.5708362 -0.93897638,8.4238465 3.5767154 -0.93897638, - 8.4050988 3.6517059 -0.93897638,8.4043157 3.652865 -0.93897638, - 8.402863 3.6577496 -0.93897638,8.3841154 3.6952449 -0.93897638, - 8.3836472 3.6956882 -0.93897638,8.3785843 3.7029189 -0.93897638, - 8.3598366 3.7216665 -0.93897638,8.3592531 3.7219386 -0.93897638, - 8.352163 3.7271976 -0.93897638,8.3146677 3.7459457 -0.93897638, - 8.3129138 3.7461476 -0.93897638,8.3115614 3.7472823 -0.93897638, - 8.3014622 3.749063 -0.93897638,8.2639669 3.749063 -0.93897638, - 8.2623079 3.7484591 -0.93897638,8.2605909 3.7488693 -0.93897638, - 8.2507618 3.7459457 -0.93897638,8.2132661 3.7271976 -0.93897638, - 8.212822 3.7267287 -0.93897638,8.2055925 3.7216665 -0.93897638, - 8.1868449 3.7029189 -0.93897638,8.1865728 3.7023354 -0.93897638, - 8.1813138 3.6952449 -0.93897638,8.1625661 3.6577496 -0.93897638, - 8.1624063 3.6563606 -0.93897638,8.1603303 3.6517059 -0.93897638, - 8.1415823 3.5767157 -0.93897638,8.141724 3.5753579 -0.93897638, - 8.1407008 3.5695539 -0.93897638,8.1407008 3.4794516 -0.93897638, - 8.1407008 3.4758157 -0.93897638,8.1411677 3.4745335 -0.93897638, - 8.1415823 3.4686539 -0.93897638,8.1603303 3.3936638 -0.93897638, - 8.1611134 3.3925043 -0.93897638,8.1625661 3.3876201 -0.93897638, - 8.1813138 3.3501248 -0.93897638,8.1817819 3.3496815 -0.93897638, - 8.1868449 3.3424508 -0.93897638,8.2055925 3.3237031 -0.93897638, - 8.206176 3.3234311 -0.93897638,8.2132665 3.318172 -0.93897638, - 8.2507618 3.2994244 -0.93897638,8.2525154 3.2992224 -0.93897638, - 8.2538677 3.2980878 -0.93897638,8.2639669 3.2963071 -0.93897638, - 8.3014622 3.2963071 -0.93897638,8.3031213 3.296911 -0.93897638, - 8.3048378 3.2965008 -0.93897638,8.3146673 3.2994244 -0.93897638, - 8.3521626 3.318172 -0.93897638,8.3526059 3.3186402 -0.93897638, - 8.3598366 3.3237031 -0.93897638,8.3656728 3.5659185 -0.93897638, - 8.3656728 3.4794512 -0.93897638,8.3485929 3.4111307 -0.93897638, - 8.3334378 3.3808209 -0.93897638,8.3214665 3.3688496 -0.93897638, - 8.2944917 3.3553622 -0.93897638,8.2709374 3.3553622 -0.93897638, - 8.2439626 3.3688496 -0.93897638,8.2319913 3.3808209 -0.93897638, - 8.2168358 3.4111319 -0.93897638,8.1997559 3.4794516 -0.93897638, - 8.1997559 3.5659181 -0.93897638,8.2168358 3.6342378 -0.93897638, - 8.2319913 3.6645488 -0.93897638,8.2439622 3.6765197 -0.93897638, - 8.2709378 3.6900079 -0.93897638,8.2944913 3.6900079 -0.93897638, - 8.3214665 3.6765201 -0.93897638,8.3334378 3.6645488 -0.93897638, - 8.3485929 3.634239 -0.93897638,8.0476768 3.3494189 -0.93897638, - 8.0470083 3.357061 -0.93897638,8.0447748 3.3602512 -0.93897638, - 8.044435 3.3615185 -0.93897638,8.0433602 3.3622713 -0.93897638, - 8.0411264 3.3654614 -0.93897638,8.0223787 3.3842091 -0.93897638, - 8.015426 3.3874512 -0.93897638,8.0091417 3.3918512 -0.93897638, - 8.0077972 3.3917335 -0.93897638,8.0066272 3.3924091 -0.93897638, - 8.0052965 3.3921744 -0.93897638,8.0040728 3.3927449 -0.93897638, - 7.9966626 3.3907594 -0.93897638,7.9890209 3.3900909 -0.93897638, - 7.9875197 3.3890398 -0.93897638,7.9867358 3.3889016 -0.93897638, - 7.9859004 3.3879059 -0.93897638,7.9858307 3.3878575 -0.93897638, - 7.9845634 3.3875177 -0.93897638,7.9838106 3.3864429 -0.93897638, - 7.9806205 3.3842091 -0.93897638,7.9618728 3.3654614 -0.93897638, - 7.9586315 3.3585098 -0.93897638,7.9542303 3.3522244 -0.93897638, - 7.9544626 3.3495697 -0.93897638,7.953337 3.3471555 -0.93897638, - 7.955322 3.3397461 -0.93897638,7.9559909 3.3321035 -0.93897638, - 7.9582244 3.3289134 -0.93897638,7.9585642 3.3276461 -0.93897638, - 7.959639 3.3268933 -0.93897638,7.9618728 3.3237031 -0.93897638, - 7.9806205 3.3049555 -0.93897638,7.9875724 3.3017138 -0.93897638, - 7.9938575 3.297313 -0.93897638,7.9952028 3.2974307 -0.93897638, - 7.996372 3.2967555 -0.93897638,7.9977028 3.2969902 -0.93897638, - 7.998926 3.2964197 -0.93897638,8.0063354 3.2984047 -0.93897638, - 8.0139783 3.2990736 -0.93897638,8.0154795 3.3001248 -0.93897638, - 8.0162634 3.300263 -0.93897638,8.0170988 3.3012587 -0.93897638, - 8.0171685 3.3013071 -0.93897638,8.0184358 3.3016469 -0.93897638, - 8.0191886 3.3027217 -0.93897638,8.0223787 3.3049555 -0.93897638, - 8.0411264 3.3237031 -0.93897638,8.0443685 3.3306563 -0.93897638, - 8.0487685 3.3369402 -0.93897638,8.0485362 3.3395941 -0.93897638, - 8.0496622 3.3420087 -0.93897638,0.79527559 3.7923087 -0.93897638, - 0.78835669 3.8090118 -0.93897638,0.77165354 3.8159307 -0.93897638, - 0.75495039 3.8090118 -0.93897638,0.7480315 3.7923087 -0.93897638, - 0.7480315 3.7073984 -0.93897638,0.75495039 3.6906953 -0.93897638, - 0.77165354 3.6837764 -0.93897638,0.78835669 3.6906953 -0.93897638, - 0.79527559 3.7073984 -0.93897638,0.51181102 3.7923087 -0.93897638, + 9.3583016 3.6900079 -0.93897638,9.998728 3.7126965 -0.93897638, + 9.9964039 3.7327602 -0.93897638,9.9817272 3.7466362 -0.93897638, + 9.9615642 3.7478315 -0.93897638,9.9453504 3.7357866 -0.93897638, + 9.9412791 3.7263748 -0.93897638,9.8746449 3.4465102 -0.93897638, + 9.8298055 3.6146575 -0.93897638,9.8282594 3.6168713 -0.93897638, + 9.8280209 3.6195602 -0.93897638,9.822613 3.6249555 -0.93897638, + 9.8182398 3.6312165 -0.93897638,9.8156335 3.6319181 -0.93897638, + 9.813722 3.6338252 -0.93897638,9.8061126 3.6344819 -0.93897638, + 9.7987366 3.6364677 -0.93897638,9.7962878 3.6353295 -0.93897638, + 9.7935984 3.6355614 -0.93897638,9.787348 3.6311736 -0.93897638, + 9.7804205 3.6279535 -0.93897638,9.7792764 3.6255079 -0.93897638, + 9.7770669 3.6239567 -0.93897638,9.7727441 3.6146575 -0.93897638, + 9.7279043 3.4465098 -0.93897638,9.6612701 3.7263748 -0.93897638, + 9.6501535 3.7432382 -0.93897638,9.6307984 3.7490114 -0.93897638, + 9.6122606 3.7409921 -0.93897638,9.6032142 3.7229335 -0.93897638, + 9.6038213 3.7126961 -0.93897638,9.6975594 3.3189953 -0.93897638, + 9.6992642 3.3164094 -0.93897638,9.6995378 3.3133236 -0.93897638, + 9.7046799 3.3081933 -0.93897638,9.708676 3.3021319 -0.93897638, + 9.7116433 3.3012469 -0.93897638,9.7138366 3.2990587 -0.93897638, + 9.721072 3.2984343 -0.93897638,9.7280311 3.2963587 -0.93897638, + 9.7308744 3.2975886 -0.93897638,9.7339602 3.2973224 -0.93897638, + 9.7399039 3.3014949 -0.93897638,9.7465689 3.304378 -0.93897638, + 9.7479563 3.3071472 -0.93897638,9.7504917 3.3089272 -0.93897638, + 9.7548146 3.3182264 -0.93897638,9.8012748 3.4924512 -0.93897638, + 9.8477346 3.3182264 -0.93897638,9.8495087 3.3156866 -0.93897638, + 9.849865 3.3126098 -0.93897638,9.8551425 3.3076201 -0.93897638, + 9.8593004 3.3016673 -0.93897638,9.8622906 3.3008622 -0.93897638, + 9.8645417 3.2987339 -0.93897638,9.8717909 3.2983043 -0.93897638, + 9.8788035 3.2964161 -0.93897638,9.881613 3.297722 -0.93897638, + 9.8847047 3.297539 -0.93897638,9.8905331 3.3018685 -0.93897638, + 9.8971197 3.3049303 -0.93897638,9.8984323 3.3077366 -0.93897638, + 9.9009185 3.3095835 -0.93897638,9.9049898 3.3189953 -0.93897638, + 9.1097429 3.3611984 -0.93897638,9.1109744 3.3638394 -0.93897638, + 9.1133327 3.3655504 -0.93897638,9.1175098 3.3749161 -0.93897638, + 9.1362575 3.4499067 -0.93897638,9.1361157 3.4512642 -0.93897638, + 9.137139 3.4570681 -0.93897638,9.137139 3.5883016 -0.93897638, + 9.136672 3.5895839 -0.93897638,9.1362575 3.595463 -0.93897638, + 9.1175098 3.6704535 -0.93897638,9.1158791 3.6728677 -0.93897638, + 9.1156252 3.6757709 -0.93897638,9.1097429 3.6841713 -0.93897638, + 9.0722476 3.7216665 -0.93897638,9.0716642 3.7219386 -0.93897638, + 9.064574 3.7271976 -0.93897638,9.0270787 3.7459457 -0.93897638, + 9.0253248 3.7461476 -0.93897638,9.0239724 3.7472823 -0.93897638, + 9.0138732 3.749063 -0.93897638,8.9388823 3.749063 -0.93897638, + 8.9372232 3.7484591 -0.93897638,8.9355063 3.7488693 -0.93897638, + 8.9256772 3.7459457 -0.93897638,8.8881815 3.7271976 -0.93897638, + 8.8877386 3.7267295 -0.93897638,8.8805079 3.7216665 -0.93897638, + 8.8430126 3.6841713 -0.93897638,8.8417811 3.6815303 -0.93897638, + 8.8394228 3.6798193 -0.93897638,8.8352457 3.6704535 -0.93897638, + 8.816498 3.595463 -0.93897638,8.8166398 3.5941055 -0.93897638, + 8.8156165 3.5883016 -0.93897638,8.8156165 3.4607035 -0.93897638, + 8.8156165 3.4570681 -0.93897638,8.8160835 3.4557858 -0.93897638, + 8.816498 3.4499067 -0.93897638,8.8352457 3.3749161 -0.93897638, + 8.8368768 3.3725012 -0.93897638,8.8371307 3.3695988 -0.93897638, + 8.8430126 3.3611984 -0.93897638,8.8805079 3.3237031 -0.93897638, + 8.8810913 3.3234311 -0.93897638,8.8881819 3.318172 -0.93897638, + 8.9256772 3.2994244 -0.93897638,8.9274307 3.2992224 -0.93897638, + 8.9287831 3.2980878 -0.93897638,8.9388823 3.2963071 -0.93897638, + 9.0138732 3.2963071 -0.93897638,9.0155323 3.296911 -0.93897638, + 9.0172488 3.2965008 -0.93897638,9.0270783 3.2994244 -0.93897638, + 9.0645736 3.318172 -0.93897638,9.0650169 3.3186402 -0.93897638, + 9.0722476 3.3237031 -0.93897638,9.0780839 3.5846661 -0.93897638, + 9.0780839 3.4607035 -0.93897638,9.0622012 3.3971732 -0.93897638, + 9.0338776 3.3688496 -0.93897638,9.0069028 3.3553622 -0.93897638, + 8.9458528 3.3553622 -0.93897638,8.918878 3.3688496 -0.93897638, + 8.8905543 3.3971732 -0.93897638,8.8746717 3.4607035 -0.93897638, + 8.8746717 3.5846661 -0.93897638,8.8905543 3.6481965 -0.93897638, + 8.9188776 3.6765197 -0.93897638,8.9458531 3.6900079 -0.93897638, + 9.0069024 3.6900079 -0.93897638,9.0338776 3.6765201 -0.93897638, + 9.0622012 3.6481965 -0.93897638,0.51181102 3.7923087 -0.93897638, 0.50489213 3.8090118 -0.93897638,0.48818898 3.8159307 -0.93897638, 0.47148583 3.8090118 -0.93897638,0.46456693 3.7923087 -0.93897638, 0.46456693 3.7073984 -0.93897638,0.47148583 3.6906953 -0.93897638, 0.48818898 3.6837764 -0.93897638,0.50489213 3.6906953 -0.93897638, - 0.51181102 3.7073984 -0.93897638,3.6653543 3.9407984 -0.93897638, + 0.51181102 3.7073984 -0.93897638,0.79527559 3.7923087 -0.93897638, + 0.78835669 3.8090118 -0.93897638,0.77165354 3.8159307 -0.93897638, + 0.75495039 3.8090118 -0.93897638,0.7480315 3.7923087 -0.93897638, + 0.7480315 3.7073984 -0.93897638,0.75495039 3.6906953 -0.93897638, + 0.77165354 3.6837764 -0.93897638,0.78835669 3.6906953 -0.93897638, + 0.79527559 3.7073984 -0.93897638,3.6653543 3.9407984 -0.93897638, 3.6584354 3.9575016 -0.93897638,3.6417323 3.9644205 -0.93897638, 1.515748 3.9644205 -0.93897638,1.4990449 3.9575016 -0.93897638, 1.492126 3.9407984 -0.93897638,1.4990449 3.9240953 -0.93897638, @@ -53201,6 +53174,52 @@ DEF SHAPE_188 Shape { 1.3297535 5.3710921 -0.93897638,1.3464567 5.3641732 -0.93897638, 1.5837513 5.364173 -0.93897638,1.5783646 5.3735027 -0.93897638, 1.5748031 5.3937008 -0.93897638,1.5779269 5.4114174 -0.93897638, + 7.8612752 3.5246094 -0.93897638,7.861385 3.5247705 -0.93897638, + 7.862152 3.5349969 -0.93897638,7.8434043 3.7224736 -0.93897638, + 7.8406839 3.7281236 -0.93897638,7.8395949 3.7342992 -0.93897638, + 7.8364327 3.7369528 -0.93897638,7.8346417 3.740672 -0.93897638, + 7.828926 3.7432516 -0.93897638,7.8241224 3.7472823 -0.93897638, + 7.8173476 3.7484768 -0.93897638,7.8162319 3.7489803 -0.93897638, + 7.8155614 3.7487917 -0.93897638,7.8140232 3.749063 -0.93897638, + 7.6265465 3.749063 -0.93897638,7.6075665 3.7421547 -0.93897638, + 7.5974673 3.724663 -0.93897638,7.6009748 3.7047717 -0.93897638, + 7.6164472 3.6917886 -0.93897638,7.6265465 3.6900079 -0.93897638, + 7.7873012 3.6900079 -0.93897638,7.7970724 3.5922945 -0.93897638, + 7.7897327 3.5959642 -0.93897638,7.7879791 3.5961661 -0.93897638, + 7.7866268 3.5973008 -0.93897638,7.7765276 3.5990815 -0.93897638, + 7.6827894 3.5990815 -0.93897638,7.6811303 3.5984776 -0.93897638, + 7.6794134 3.5988878 -0.93897638,7.6695843 3.5959642 -0.93897638, + 7.632089 3.5772165 -0.93897638,7.6316457 3.5767484 -0.93897638, + 7.624415 3.5716854 -0.93897638,7.6056673 3.5529378 -0.93897638, + 7.6053953 3.5523543 -0.93897638,7.6001362 3.5452638 -0.93897638, + 7.5813886 3.5077685 -0.93897638,7.5811866 3.506015 -0.93897638, + 7.580052 3.5046626 -0.93897638,7.5782713 3.4945634 -0.93897638, + 7.5782713 3.4008252 -0.93897638,7.5788752 3.3991661 -0.93897638, + 7.578465 3.3974496 -0.93897638,7.5813886 3.3876201 -0.93897638, + 7.6001362 3.3501248 -0.93897638,7.6006043 3.3496815 -0.93897638, + 7.6056673 3.3424508 -0.93897638,7.624415 3.3237031 -0.93897638, + 7.6249984 3.3234311 -0.93897638,7.632089 3.318172 -0.93897638, + 7.6695843 3.2994244 -0.93897638,7.6713378 3.2992224 -0.93897638, + 7.6726902 3.2980878 -0.93897638,7.6827894 3.2963071 -0.93897638, + 7.7765276 3.2963071 -0.93897638,7.7781858 3.2969106 -0.93897638, + 7.7799031 3.2965004 -0.93897638,7.7897327 3.2994244 -0.93897638, + 7.8272283 3.318172 -0.93897638,7.8276717 3.3186402 -0.93897638, + 7.8349024 3.3237031 -0.93897638,7.85365 3.3424508 -0.93897638, + 7.8621858 3.3607563 -0.93897638,7.8569587 3.3802661 -0.93897638, + 7.840413 3.3918512 -0.93897638,7.8202921 3.3900909 -0.93897638, + 7.8118917 3.3842091 -0.93897638,7.7965323 3.3688496 -0.93897638, + 7.7695571 3.3553622 -0.93897638,7.6897598 3.3553622 -0.93897638, + 7.662785 3.3688496 -0.93897638,7.6508138 3.3808209 -0.93897638, + 7.6373264 3.4077957 -0.93897638,7.6373264 3.4875929 -0.93897638, + 7.6508138 3.5145677 -0.93897638,7.662785 3.526539 -0.93897638, + 7.6897598 3.5400264 -0.93897638,7.7695571 3.5400264 -0.93897638, + 7.7965323 3.526539 -0.93897638,7.8118917 3.5111795 -0.93897638, + 7.8120681 3.5110972 -0.93897638,7.8121524 3.510922 -0.93897638, + 7.8212138 3.5068327 -0.93897638,7.8301972 3.5026437 -0.93897638, + 7.8303846 3.5026941 -0.93897638,7.8305622 3.5026138 -0.93897638, + 7.8401181 3.5053016 -0.93897638,7.8497071 3.5078709 -0.93897638, + 7.8498189 3.5080303 -0.93897638,7.8500059 3.5080831 -0.93897638, + 7.8556083 3.5162992 -0.93897638,7.8612921 3.5244165 -0.93897638, 6.2598425 2.2834646 -0.93897638,6.2598425 2.2244094 -0.93897638, 6.2667508 2.2054295 -0.93897638,6.2842425 2.1953303 -0.93897638, 6.3041339 2.1988378 -0.93897638,6.3171169 2.2143102 -0.93897638, @@ -53331,177 +53350,184 @@ DEF SHAPE_188 Shape { 5.9074803 4.9529513 -0.93897638,5.8882076 4.9459366 -0.93897638, 5.8818938 4.9459361 -0.93897638,5.891385 4.9404563 -0.93897638, 5.9112764 4.9439638 -0.93897638,5.9242594 4.9594362 -0.93897638, - 5.9260402 4.9695354 -0.93897638,7.8607831 3.4664055 -0.93897638, - 7.7670445 3.7476205 -0.93897638,7.754489 3.7634417 -0.93897638, - 7.7347012 3.7674913 -0.93897638,7.7169398 3.7578736 -0.93897638, - 7.7095157 3.7390898 -0.93897638,7.7110201 3.7289457 -0.93897638, - 7.7918035 3.4865957 -0.93897638,7.6748217 3.4865957 -0.93897638, - 7.6748217 3.5883016 -0.93897638,7.6679134 3.6072815 -0.93897638, - 7.6504217 3.6173807 -0.93897638,7.6305303 3.6138732 -0.93897638, - 7.6175472 3.5984008 -0.93897638,7.6157665 3.5883016 -0.93897638, - 7.6157665 3.4865957 -0.93897638,7.5890512 3.4865957 -0.93897638, - 7.5700713 3.4796874 -0.93897638,7.559972 3.4621957 -0.93897638, - 7.5634795 3.4423043 -0.93897638,7.578952 3.4293213 -0.93897638, - 7.5890512 3.4275406 -0.93897638,7.6157665 3.4275406 -0.93897638, - 7.6157665 3.3258346 -0.93897638,7.6226748 3.3068547 -0.93897638, - 7.6401665 3.2967555 -0.93897638,7.6600579 3.300263 -0.93897638, - 7.6730409 3.3157354 -0.93897638,7.6748217 3.3258346 -0.93897638, - 7.6748217 3.4275406 -0.93897638,7.8327709 3.4275406 -0.93897638, - 7.8348909 3.4283122 -0.93897638,7.837102 3.4278598 -0.93897638, - 7.8441846 3.4316949 -0.93897638,7.8517508 3.4344488 -0.93897638, - 7.8528787 3.4364028 -0.93897638,7.8548634 3.4374772 -0.93897638, - 7.8578232 3.4449665 -0.93897638,7.86185 3.4519406 -0.93897638, - 7.8614583 3.454163 -0.93897638,7.8622874 3.4562614 -0.93897638, - 5.6736724 4.3522933 -0.93897638,5.6739445 4.3528768 -0.93897638, - 5.6792035 4.3599673 -0.93897638,5.6979512 4.3974626 -0.93897638, - 5.698111 4.3988516 -0.93897638,5.700187 4.4035063 -0.93897638, - 5.7189346 4.4784969 -0.93897638,5.7187929 4.4798543 -0.93897638, - 5.7198161 4.4856583 -0.93897638,5.7198161 4.5793965 -0.93897638, - 5.7193492 4.5806787 -0.93897638,5.7189346 4.5865579 -0.93897638, - 5.700187 4.6615484 -0.93897638,5.6994039 4.6627075 -0.93897638, - 5.6979512 4.6675921 -0.93897638,5.6792035 4.7050874 -0.93897638, - 5.6787354 4.7055307 -0.93897638,5.6736724 4.7127614 -0.93897638, - 5.6549248 4.7315091 -0.93897638,5.6543413 4.7317811 -0.93897638, - 5.6472512 4.7370402 -0.93897638,5.6097559 4.7557882 -0.93897638, - 5.608002 4.7559902 -0.93897638,5.6066496 4.7571248 -0.93897638, - 5.5965504 4.7589055 -0.93897638,5.5590551 4.7589055 -0.93897638, - 5.5573969 4.758302 -0.93897638,5.5556795 4.7587122 -0.93897638, - 5.54585 4.7557882 -0.93897638,5.5083543 4.7370402 -0.93897638, - 5.507911 4.736572 -0.93897638,5.5006803 4.7315091 -0.93897638, - 5.4819327 4.7127614 -0.93897638,5.4816606 4.712178 -0.93897638, - 5.4764016 4.7050874 -0.93897638,5.4576539 4.6675921 -0.93897638, - 5.4574941 4.6662031 -0.93897638,5.4554181 4.6615484 -0.93897638, - 5.4366705 4.5865579 -0.93897638,5.4368122 4.5852004 -0.93897638, - 5.435789 4.5793965 -0.93897638,5.435789 4.4892937 -0.93897638, - 5.435789 4.4856583 -0.93897638,5.4362559 4.484376 -0.93897638, - 5.4366705 4.4784969 -0.93897638,5.4554181 4.4035063 -0.93897638, - 5.4562012 4.4023469 -0.93897638,5.4576539 4.3974626 -0.93897638, - 5.4764016 4.3599673 -0.93897638,5.4768697 4.359524 -0.93897638, - 5.4819327 4.3522933 -0.93897638,5.5006803 4.3335457 -0.93897638, - 5.5012638 4.3332736 -0.93897638,5.5083543 4.3280146 -0.93897638, - 5.54585 4.3092669 -0.93897638,5.5476035 4.309065 -0.93897638, - 5.5489559 4.3079303 -0.93897638,5.5590551 4.3061496 -0.93897638, - 5.5965504 4.3061496 -0.93897638,5.5982094 4.3067535 -0.93897638, - 5.599926 4.3063433 -0.93897638,5.6097555 4.3092669 -0.93897638, - 5.6472508 4.3280146 -0.93897638,5.6476941 4.3284827 -0.93897638, - 5.6549248 4.3335457 -0.93897638,5.660761 4.575761 -0.93897638, - 5.660761 4.4892937 -0.93897638,5.6436811 4.4209732 -0.93897638, - 5.628526 4.3906634 -0.93897638,5.6165547 4.3786921 -0.93897638, - 5.5895799 4.3652047 -0.93897638,5.5660256 4.3652047 -0.93897638, - 5.5390504 4.3786921 -0.93897638,5.5270791 4.3906634 -0.93897638, - 5.5119244 4.4209732 -0.93897638,5.4948441 4.4892937 -0.93897638, - 5.4948441 4.575761 -0.93897638,5.5119244 4.6440815 -0.93897638, - 5.5270791 4.6743913 -0.93897638,5.5390504 4.6863626 -0.93897638, - 5.566026 4.6998504 -0.93897638,5.5895795 4.6998504 -0.93897638, - 5.6165547 4.6863626 -0.93897638,5.628526 4.6743913 -0.93897638, - 5.6436811 4.6440815 -0.93897638,4.5917517 4.4365611 -0.93897638, - 4.607463 4.4497444 -0.93897638,4.6267357 4.4567591 -0.93897638, - 4.629922 4.4567584 -0.93897638,4.6299213 5.4724409 -0.93897638, - 6.4575071 5.4724402 -0.93897638,6.4719448 5.4776961 -0.93897638, - 6.4924544 5.4776961 -0.93897638,6.5068936 5.4724404 -0.93897638, - 6.8661417 5.4724409 -0.93897638,6.8661417 3.8228346 -0.93897638, - 4.6299213 3.8228346 -0.93897638,4.629922 4.3404425 -0.93897638, - 4.6267357 4.3404432 -0.93897638,4.607463 4.3474579 -0.93897638, - 4.5917517 4.3606413 -0.93897638,4.5826762 4.3763597 -0.93897638, - 4.5826772 3.8228346 -0.93897638,4.5826772 3.7992126 -0.93897638, - 4.5895961 3.7825094 -0.93897638,4.6062992 3.7755906 -0.93897638, - 6.8897638 3.7755906 -0.93897638,6.9064669 3.7825094 -0.93897638, - 6.9133858 3.7992126 -0.93897638,6.9133858 5.4724409 -0.93897638, - 10.826772 5.4724409 -0.93897638,10.826772 0.078740157 -0.93897638, - 1.7050622 0.078740157 -0.93897638,1.699774 0.091506299 -0.93897638, - 1.6830709 0.098425197 -0.93897638,0.76771654 0.098425197 -0.93897638, - 0.75101339 0.091506299 -0.93897638,0.7457252 0.078740157 -0.93897638, - 0.078740157 0.078740157 -0.93897638,0.078740157 5.4724409 -0.93897638, - 4.5826772 5.4724409 -0.93897638,4.5826763 4.4208444 -0.93897638, - 10.866142 0 -0.93897638,10.872072 0.0019267717 -0.93897638, - 10.878308 0.0019267717 -0.93897638,10.883353 0.005592126 -0.93897638, - 10.889283 0.0075188976 -0.93897638,10.892948 0.012563386 -0.93897638, - 10.897993 0.01622874 -0.93897638,10.89992 0.022159055 -0.93897638, - 10.903585 0.027203937 -0.93897638,10.903585 0.033439764 -0.93897638, - 10.905512 0.039370079 -0.93897638,10.905512 5.511811 -0.93897638, - 10.903585 5.5177413 -0.93897638,10.903585 5.5239772 -0.93897638, - 10.89992 5.529022 -0.93897638,10.897993 5.5349524 -0.93897638, - 10.892948 5.5386177 -0.93897638,10.889283 5.5436622 -0.93897638, - 10.883353 5.545589 -0.93897638,10.878308 5.5492543 -0.93897638, - 10.872072 5.5492543 -0.93897638,10.866142 5.5511811 -0.93897638, - 0.039370079 5.5511811 -0.93897638,0.033439764 5.5492543 -0.93897638, - 0.027203937 5.5492543 -0.93897638,0.022159055 5.545589 -0.93897638, - 0.01622874 5.5436622 -0.93897638,0.012563386 5.5386177 -0.93897638, - 0.0075188976 5.5349524 -0.93897638,0.005592126 5.529022 -0.93897638, - 0.0019267717 5.5239772 -0.93897638,0.0019267717 5.5177413 -0.93897638, - 0 5.511811 -0.93897638,0 0.078740157 -0.93897638, - 0 0.039370079 -0.93897638,0.0019267717 0.033439764 -0.93897638, - 0.0019267717 0.027203937 -0.93897638,0.005592126 0.022159055 -0.93897638, - 0.0075188976 0.01622874 -0.93897638,0.012563386 0.012563386 -0.93897638, - 0.01622874 0.0075188976 -0.93897638,0.022159055 0.005592126 -0.93897638, - 0.027203937 0.0019267717 -0.93897638,0.033439764 0.0019267717 -0.93897638, - 0.039370079 0 -0.93897638,4.7077476 4.3599673 -0.93897638, - 4.7082157 4.359524 -0.93897638,4.7132787 4.3522933 -0.93897638, - 4.7320264 4.3335457 -0.93897638,4.7326098 4.3332736 -0.93897638, - 4.7397004 4.3280146 -0.93897638,4.7771961 4.3092669 -0.93897638, - 4.7789496 4.309065 -0.93897638,4.780302 4.3079303 -0.93897638, - 4.7904012 4.3061496 -0.93897638,4.8936313 4.3061501 -0.93897638, - 4.8885556 4.310409 -0.93897638,4.8783008 4.3281709 -0.93897638, - 4.8747394 4.3483689 -0.93897638,4.877708 4.3652047 -0.93897638, - 4.7973717 4.3652047 -0.93897638,4.7703965 4.3786921 -0.93897638, - 4.7584252 4.3906634 -0.93897638,4.7449378 4.4176382 -0.93897638, - 4.7449378 4.4974354 -0.93897638,4.7584252 4.5244102 -0.93897638, - 4.7703965 4.5363815 -0.93897638,4.7973717 4.5498689 -0.93897638, - 4.8466441 4.5498689 -0.93897638,4.8541244 4.5525917 -0.93897638, - 4.8619339 4.5541358 -0.93897638,4.8634106 4.5559717 -0.93897638, - 4.865624 4.5567772 -0.93897638,4.8696047 4.5636713 -0.93897638, - 4.8745941 4.569874 -0.93897638,4.8745453 4.5722287 -0.93897638, - 4.8757232 4.5742689 -0.93897638,4.8743409 4.5821091 -0.93897638, - 4.874176 4.5900677 -0.93897638,4.8724283 4.5929551 -0.93897638, - 4.8722157 4.5941602 -0.93897638,4.871165 4.5950417 -0.93897638, - 4.8688657 4.5988406 -0.93897638,4.7804823 4.6998504 -0.93897638, - 4.9591299 4.6998504 -0.93897638,4.9781098 4.7067587 -0.93897638, - 4.9882091 4.7242504 -0.93897638,4.9847016 4.7441417 -0.93897638, - 4.9692291 4.7571248 -0.93897638,4.9591299 4.7589055 -0.93897638, - 4.7154102 4.7589055 -0.93897638,4.7079299 4.7561827 -0.93897638, - 4.7001205 4.7546386 -0.93897638,4.6986437 4.7528028 -0.93897638, - 4.6964303 4.7519972 -0.93897638,4.6924496 4.7451031 -0.93897638, - 4.6874602 4.7389004 -0.93897638,4.6875091 4.7365457 -0.93897638, - 4.6863311 4.7345055 -0.93897638,4.6877134 4.7266654 -0.93897638, - 4.6878783 4.7187071 -0.93897638,4.689626 4.7158197 -0.93897638, - 4.6898386 4.7146142 -0.93897638,4.6908894 4.7137323 -0.93897638, - 4.6931886 4.7099339 -0.93897638,4.7828331 4.6074831 -0.93897638, - 4.7771961 4.6058067 -0.93897638,4.7397004 4.5870591 -0.93897638, - 4.7392571 4.5865909 -0.93897638,4.7320264 4.581528 -0.93897638, - 4.7132787 4.5627803 -0.93897638,4.7130067 4.5621969 -0.93897638, - 4.7077476 4.5551063 -0.93897638,4.689 4.517611 -0.93897638, - 4.688798 4.5158575 -0.93897638,4.6876634 4.5145051 -0.93897638, - 4.6858827 4.5044059 -0.93897638,4.6858822 4.4302339 -0.93897638, - 4.6924842 4.4187992 -0.93897638,4.6960457 4.3986012 -0.93897638, - 4.6940604 4.3873419 -0.93897638,6.7824481 5.2475726 -0.93897638, - 6.771824 5.2585539 -0.93897638,6.7517346 5.2606461 -0.93897638, - 6.7490131 5.2588061 -0.93897638,6.7581473 5.2588064 -0.93897638, - 6.7774201 5.2517917 -0.93897638,5.2755906 2.3031496 -0.93897638, - 5.279152 2.3233476 -0.93897638,5.2894068 2.3411095 -0.93897638, - 5.2910879 2.3425192 -0.93897638,4.4586614 2.3425197 -0.93897638, - 4.4514531 2.3398961 -0.93897638,4.4438976 2.3385638 -0.93897638, - 4.442185 2.3365224 -0.93897638,4.4396815 2.3356114 -0.93897638, - 4.4358461 2.3289681 -0.93897638,4.4309146 2.3230913 -0.93897638, - 4.4302382 2.3192559 -0.93897638,4.4295823 2.3181197 -0.93897638, - 4.4298102 2.3168276 -0.93897638,4.4291339 2.3129921 -0.93897638, - 4.4291339 2.2244094 -0.93897638,4.4360421 2.2054295 -0.93897638, - 4.4535339 2.1953303 -0.93897638,4.4734252 2.1988378 -0.93897638, - 4.4864083 2.2143102 -0.93897638,4.488189 2.2244094 -0.93897638, - 4.488189 2.2834646 -0.93897638,4.7896118 2.2834644 -0.93897638, - 4.789702 2.2839776 -0.93897638,4.7999568 2.3017394 -0.93897638, - 4.8156681 2.3149228 -0.93897638,4.8349409 2.3219375 -0.93897638, - 4.8554505 2.3219375 -0.93897638,4.8747232 2.3149228 -0.93897638, - 4.8904345 2.3017394 -0.93897638,4.9006893 2.2839776 -0.93897638, - 4.9007793 2.2834651 -0.93897638,5.2790616 2.2834646 -0.93897638] } + 5.9260402 4.9695354 -0.93897638,8.0476768 3.3494189 -0.93897638, + 8.0470083 3.357061 -0.93897638,8.0447748 3.3602512 -0.93897638, + 8.044435 3.3615185 -0.93897638,8.0433602 3.3622713 -0.93897638, + 8.0411264 3.3654614 -0.93897638,8.0223787 3.3842091 -0.93897638, + 8.015426 3.3874512 -0.93897638,8.0091417 3.3918512 -0.93897638, + 8.0077972 3.3917335 -0.93897638,8.0066272 3.3924091 -0.93897638, + 8.0052965 3.3921744 -0.93897638,8.0040728 3.3927449 -0.93897638, + 7.9966626 3.3907594 -0.93897638,7.9890209 3.3900909 -0.93897638, + 7.9875197 3.3890398 -0.93897638,7.9867358 3.3889016 -0.93897638, + 7.9859004 3.3879059 -0.93897638,7.9858307 3.3878575 -0.93897638, + 7.9845634 3.3875177 -0.93897638,7.9838106 3.3864429 -0.93897638, + 7.9806205 3.3842091 -0.93897638,7.9618728 3.3654614 -0.93897638, + 7.9586315 3.3585098 -0.93897638,7.9542303 3.3522244 -0.93897638, + 7.9544626 3.3495697 -0.93897638,7.953337 3.3471555 -0.93897638, + 7.955322 3.3397461 -0.93897638,7.9559909 3.3321035 -0.93897638, + 7.9582244 3.3289134 -0.93897638,7.9585642 3.3276461 -0.93897638, + 7.959639 3.3268933 -0.93897638,7.9618728 3.3237031 -0.93897638, + 7.9806205 3.3049555 -0.93897638,7.9875724 3.3017138 -0.93897638, + 7.9938575 3.297313 -0.93897638,7.9952028 3.2974307 -0.93897638, + 7.996372 3.2967555 -0.93897638,7.9977028 3.2969902 -0.93897638, + 7.998926 3.2964197 -0.93897638,8.0063354 3.2984047 -0.93897638, + 8.0139783 3.2990736 -0.93897638,8.0154795 3.3001248 -0.93897638, + 8.0162634 3.300263 -0.93897638,8.0170988 3.3012587 -0.93897638, + 8.0171685 3.3013071 -0.93897638,8.0184358 3.3016469 -0.93897638, + 8.0191886 3.3027217 -0.93897638,8.0223787 3.3049555 -0.93897638, + 8.0411264 3.3237031 -0.93897638,8.0443685 3.3306563 -0.93897638, + 8.0487685 3.3369402 -0.93897638,8.0485362 3.3395941 -0.93897638, + 8.0496622 3.3420087 -0.93897638,5.6736724 4.3522933 -0.93897638, + 5.6739445 4.3528768 -0.93897638,5.6792035 4.3599673 -0.93897638, + 5.6979512 4.3974626 -0.93897638,5.698111 4.3988516 -0.93897638, + 5.700187 4.4035063 -0.93897638,5.7189346 4.4784969 -0.93897638, + 5.7187929 4.4798543 -0.93897638,5.7198161 4.4856583 -0.93897638, + 5.7198161 4.5793965 -0.93897638,5.7193492 4.5806787 -0.93897638, + 5.7189346 4.5865579 -0.93897638,5.700187 4.6615484 -0.93897638, + 5.6994039 4.6627075 -0.93897638,5.6979512 4.6675921 -0.93897638, + 5.6792035 4.7050874 -0.93897638,5.6787354 4.7055307 -0.93897638, + 5.6736724 4.7127614 -0.93897638,5.6549248 4.7315091 -0.93897638, + 5.6543413 4.7317811 -0.93897638,5.6472512 4.7370402 -0.93897638, + 5.6097559 4.7557882 -0.93897638,5.608002 4.7559902 -0.93897638, + 5.6066496 4.7571248 -0.93897638,5.5965504 4.7589055 -0.93897638, + 5.5590551 4.7589055 -0.93897638,5.5573969 4.758302 -0.93897638, + 5.5556795 4.7587122 -0.93897638,5.54585 4.7557882 -0.93897638, + 5.5083543 4.7370402 -0.93897638,5.507911 4.736572 -0.93897638, + 5.5006803 4.7315091 -0.93897638,5.4819327 4.7127614 -0.93897638, + 5.4816606 4.712178 -0.93897638,5.4764016 4.7050874 -0.93897638, + 5.4576539 4.6675921 -0.93897638,5.4574941 4.6662031 -0.93897638, + 5.4554181 4.6615484 -0.93897638,5.4366705 4.5865579 -0.93897638, + 5.4368122 4.5852004 -0.93897638,5.435789 4.5793965 -0.93897638, + 5.435789 4.4892937 -0.93897638,5.435789 4.4856583 -0.93897638, + 5.4362559 4.484376 -0.93897638,5.4366705 4.4784969 -0.93897638, + 5.4554181 4.4035063 -0.93897638,5.4562012 4.4023469 -0.93897638, + 5.4576539 4.3974626 -0.93897638,5.4764016 4.3599673 -0.93897638, + 5.4768697 4.359524 -0.93897638,5.4819327 4.3522933 -0.93897638, + 5.5006803 4.3335457 -0.93897638,5.5012638 4.3332736 -0.93897638, + 5.5083543 4.3280146 -0.93897638,5.54585 4.3092669 -0.93897638, + 5.5476035 4.309065 -0.93897638,5.5489559 4.3079303 -0.93897638, + 5.5590551 4.3061496 -0.93897638,5.5965504 4.3061496 -0.93897638, + 5.5982094 4.3067535 -0.93897638,5.599926 4.3063433 -0.93897638, + 5.6097555 4.3092669 -0.93897638,5.6472508 4.3280146 -0.93897638, + 5.6476941 4.3284827 -0.93897638,5.6549248 4.3335457 -0.93897638, + 5.660761 4.575761 -0.93897638,5.660761 4.4892937 -0.93897638, + 5.6436811 4.4209732 -0.93897638,5.628526 4.3906634 -0.93897638, + 5.6165547 4.3786921 -0.93897638,5.5895799 4.3652047 -0.93897638, + 5.5660256 4.3652047 -0.93897638,5.5390504 4.3786921 -0.93897638, + 5.5270791 4.3906634 -0.93897638,5.5119244 4.4209732 -0.93897638, + 5.4948441 4.4892937 -0.93897638,5.4948441 4.575761 -0.93897638, + 5.5119244 4.6440815 -0.93897638,5.5270791 4.6743913 -0.93897638, + 5.5390504 4.6863626 -0.93897638,5.566026 4.6998504 -0.93897638, + 5.5895795 4.6998504 -0.93897638,5.6165547 4.6863626 -0.93897638, + 5.628526 4.6743913 -0.93897638,5.6436811 4.6440815 -0.93897638, + 4.5917517 4.4365611 -0.93897638,4.607463 4.4497444 -0.93897638, + 4.6267357 4.4567591 -0.93897638,4.629922 4.4567584 -0.93897638, + 4.6299213 5.4724409 -0.93897638,6.4575071 5.4724402 -0.93897638, + 6.4719448 5.4776961 -0.93897638,6.4924544 5.4776961 -0.93897638, + 6.5068936 5.4724404 -0.93897638,6.8661417 5.4724409 -0.93897638, + 6.8661417 3.8228346 -0.93897638,4.6299213 3.8228346 -0.93897638, + 4.629922 4.3404425 -0.93897638,4.6267357 4.3404432 -0.93897638, + 4.607463 4.3474579 -0.93897638,4.5917517 4.3606413 -0.93897638, + 4.5826762 4.3763597 -0.93897638,4.5826772 3.8228346 -0.93897638, + 4.5826772 3.7992126 -0.93897638,4.5895961 3.7825094 -0.93897638, + 4.6062992 3.7755906 -0.93897638,6.8897638 3.7755906 -0.93897638, + 6.9064669 3.7825094 -0.93897638,6.9133858 3.7992126 -0.93897638, + 6.9133858 5.4724409 -0.93897638,10.826772 5.4724409 -0.93897638, + 10.826772 0.078740157 -0.93897638,1.7050622 0.078740157 -0.93897638, + 1.699774 0.091506299 -0.93897638,1.6830709 0.098425197 -0.93897638, + 0.76771654 0.098425197 -0.93897638,0.75101339 0.091506299 -0.93897638, + 0.7457252 0.078740157 -0.93897638,0.078740157 0.078740157 -0.93897638, + 0.078740157 5.4724409 -0.93897638,4.5826772 5.4724409 -0.93897638, + 4.5826763 4.4208444 -0.93897638,10.866142 0 -0.93897638, + 10.872072 0.0019267717 -0.93897638,10.878308 0.0019267717 -0.93897638, + 10.883353 0.005592126 -0.93897638,10.889283 0.0075188976 -0.93897638, + 10.892948 0.012563386 -0.93897638,10.897993 0.01622874 -0.93897638, + 10.89992 0.022159055 -0.93897638,10.903585 0.027203937 -0.93897638, + 10.903585 0.033439764 -0.93897638,10.905512 0.039370079 -0.93897638, + 10.905512 5.511811 -0.93897638,10.903585 5.5177413 -0.93897638, + 10.903585 5.5239772 -0.93897638,10.89992 5.529022 -0.93897638, + 10.897993 5.5349524 -0.93897638,10.892948 5.5386177 -0.93897638, + 10.889283 5.5436622 -0.93897638,10.883353 5.545589 -0.93897638, + 10.878308 5.5492543 -0.93897638,10.872072 5.5492543 -0.93897638, + 10.866142 5.5511811 -0.93897638,0.039370079 5.5511811 -0.93897638, + 0.033439764 5.5492543 -0.93897638,0.027203937 5.5492543 -0.93897638, + 0.022159055 5.545589 -0.93897638,0.01622874 5.5436622 -0.93897638, + 0.012563386 5.5386177 -0.93897638,0.0075188976 5.5349524 -0.93897638, + 0.005592126 5.529022 -0.93897638,0.0019267717 5.5239772 -0.93897638, + 0.0019267717 5.5177413 -0.93897638,0 5.511811 -0.93897638, + 0 0.078740157 -0.93897638,0 0.039370079 -0.93897638, + 0.0019267717 0.033439764 -0.93897638,0.0019267717 0.027203937 -0.93897638, + 0.005592126 0.022159055 -0.93897638,0.0075188976 0.01622874 -0.93897638, + 0.012563386 0.012563386 -0.93897638,0.01622874 0.0075188976 -0.93897638, + 0.022159055 0.005592126 -0.93897638,0.027203937 0.0019267717 -0.93897638, + 0.033439764 0.0019267717 -0.93897638,0.039370079 0 -0.93897638, + 4.7077476 4.3599673 -0.93897638,4.7082157 4.359524 -0.93897638, + 4.7132787 4.3522933 -0.93897638,4.7320264 4.3335457 -0.93897638, + 4.7326098 4.3332736 -0.93897638,4.7397004 4.3280146 -0.93897638, + 4.7771961 4.3092669 -0.93897638,4.7789496 4.309065 -0.93897638, + 4.780302 4.3079303 -0.93897638,4.7904012 4.3061496 -0.93897638, + 4.8936313 4.3061501 -0.93897638,4.8885556 4.310409 -0.93897638, + 4.8783008 4.3281709 -0.93897638,4.8747394 4.3483689 -0.93897638, + 4.877708 4.3652047 -0.93897638,4.7973717 4.3652047 -0.93897638, + 4.7703965 4.3786921 -0.93897638,4.7584252 4.3906634 -0.93897638, + 4.7449378 4.4176382 -0.93897638,4.7449378 4.4974354 -0.93897638, + 4.7584252 4.5244102 -0.93897638,4.7703965 4.5363815 -0.93897638, + 4.7973717 4.5498689 -0.93897638,4.8466441 4.5498689 -0.93897638, + 4.8541244 4.5525917 -0.93897638,4.8619339 4.5541358 -0.93897638, + 4.8634106 4.5559717 -0.93897638,4.865624 4.5567772 -0.93897638, + 4.8696047 4.5636713 -0.93897638,4.8745941 4.569874 -0.93897638, + 4.8745453 4.5722287 -0.93897638,4.8757232 4.5742689 -0.93897638, + 4.8743409 4.5821091 -0.93897638,4.874176 4.5900677 -0.93897638, + 4.8724283 4.5929551 -0.93897638,4.8722157 4.5941602 -0.93897638, + 4.871165 4.5950417 -0.93897638,4.8688657 4.5988406 -0.93897638, + 4.7804823 4.6998504 -0.93897638,4.9591299 4.6998504 -0.93897638, + 4.9781098 4.7067587 -0.93897638,4.9882091 4.7242504 -0.93897638, + 4.9847016 4.7441417 -0.93897638,4.9692291 4.7571248 -0.93897638, + 4.9591299 4.7589055 -0.93897638,4.7154102 4.7589055 -0.93897638, + 4.7079299 4.7561827 -0.93897638,4.7001205 4.7546386 -0.93897638, + 4.6986437 4.7528028 -0.93897638,4.6964303 4.7519972 -0.93897638, + 4.6924496 4.7451031 -0.93897638,4.6874602 4.7389004 -0.93897638, + 4.6875091 4.7365457 -0.93897638,4.6863311 4.7345055 -0.93897638, + 4.6877134 4.7266654 -0.93897638,4.6878783 4.7187071 -0.93897638, + 4.689626 4.7158197 -0.93897638,4.6898386 4.7146142 -0.93897638, + 4.6908894 4.7137323 -0.93897638,4.6931886 4.7099339 -0.93897638, + 4.7828331 4.6074831 -0.93897638,4.7771961 4.6058067 -0.93897638, + 4.7397004 4.5870591 -0.93897638,4.7392571 4.5865909 -0.93897638, + 4.7320264 4.581528 -0.93897638,4.7132787 4.5627803 -0.93897638, + 4.7130067 4.5621969 -0.93897638,4.7077476 4.5551063 -0.93897638, + 4.689 4.517611 -0.93897638,4.688798 4.5158575 -0.93897638, + 4.6876634 4.5145051 -0.93897638,4.6858827 4.5044059 -0.93897638, + 4.6858822 4.4302339 -0.93897638,4.6924842 4.4187992 -0.93897638, + 4.6960457 4.3986012 -0.93897638,4.6940604 4.3873419 -0.93897638, + 6.7824481 5.2475726 -0.93897638,6.771824 5.2585539 -0.93897638, + 6.7517346 5.2606461 -0.93897638,6.7490131 5.2588061 -0.93897638, + 6.7581473 5.2588064 -0.93897638,6.7774201 5.2517917 -0.93897638, + 5.2755906 2.3031496 -0.93897638,5.279152 2.3233476 -0.93897638, + 5.2894068 2.3411095 -0.93897638,5.2910879 2.3425192 -0.93897638, + 4.4586614 2.3425197 -0.93897638,4.4514531 2.3398961 -0.93897638, + 4.4438976 2.3385638 -0.93897638,4.442185 2.3365224 -0.93897638, + 4.4396815 2.3356114 -0.93897638,4.4358461 2.3289681 -0.93897638, + 4.4309146 2.3230913 -0.93897638,4.4302382 2.3192559 -0.93897638, + 4.4295823 2.3181197 -0.93897638,4.4298102 2.3168276 -0.93897638, + 4.4291339 2.3129921 -0.93897638,4.4291339 2.2244094 -0.93897638, + 4.4360421 2.2054295 -0.93897638,4.4535339 2.1953303 -0.93897638, + 4.4734252 2.1988378 -0.93897638,4.4864083 2.2143102 -0.93897638, + 4.488189 2.2244094 -0.93897638,4.488189 2.2834646 -0.93897638, + 4.7896118 2.2834644 -0.93897638,4.789702 2.2839776 -0.93897638, + 4.7999568 2.3017394 -0.93897638,4.8156681 2.3149228 -0.93897638, + 4.8349409 2.3219375 -0.93897638,4.8554505 2.3219375 -0.93897638, + 4.8747232 2.3149228 -0.93897638,4.8904345 2.3017394 -0.93897638, + 4.9006893 2.2839776 -0.93897638,4.9007793 2.2834651 -0.93897638, + 5.2790616 2.2834646 -0.93897638] } coordIndex [ 6,5,4,-1,6,4,7,-1,7,4,3,-1,7,3,8,-1,8,3,2,-1,8,2,9,-1,9,2,1,-1,9,1,0,-1, - 74,73,10,-1,10,73,66,-1,66,73,67,-1,67,73,72,-1,1583,1582,1589,-1,1583,1589,1584,-1,1584,1589,1586,-1,1584,1586,1585,-1, - 1605,1604,1573,-1,1573,1604,1574,-1,1574,1604,1575,-1,1575,1604,1576,-1,1576,1604,1603,-1,1577,1576,1599,-1,1599,1576,1600,-1,1600,1576,1601,-1, - 1601,1576,1602,-1,1602,1576,1603,-1,1595,1594,1596,-1,1596,1594,1597,-1,1597,1594,1598,-1,1598,1594,1599,-1,1599,1594,1577,-1,1577,1594,1591,-1, - 1591,1594,1592,-1,1592,1594,1593,-1,1591,1590,1577,-1,1577,1590,1578,-1,1578,1590,1579,-1,1579,1590,1580,-1,1580,1590,1581,-1,1581,1590,1589,-1, - 1588,1587,1589,-1,1589,1587,1586,-1,1028,1027,1029,-1,1029,1027,1030,-1,1030,1027,1031,-1,1031,1027,1032,-1,1032,1027,1033,-1,1033,1027,1034,-1, - 1034,1027,1026,-1,1034,1026,1035,-1,1035,1026,1036,-1,1036,1026,1037,-1,1037,1026,1038,-1,1038,1026,1039,-1,1039,1026,1025,-1,1040,1039,1041,-1, - 1041,1039,1042,-1,1042,1039,1043,-1,1043,1039,1022,-1,1022,1039,1024,-1,1024,1039,1025,-1,56,55,57,-1,57,55,58,-1,58,55,59,-1, + 74,73,10,-1,10,73,66,-1,66,73,67,-1,67,73,72,-1,1634,1633,1640,-1,1634,1640,1635,-1,1635,1640,1637,-1,1635,1637,1636,-1, + 1656,1655,1624,-1,1624,1655,1625,-1,1625,1655,1626,-1,1626,1655,1627,-1,1627,1655,1654,-1,1628,1627,1650,-1,1650,1627,1651,-1,1651,1627,1652,-1, + 1652,1627,1653,-1,1653,1627,1654,-1,1646,1645,1647,-1,1647,1645,1648,-1,1648,1645,1649,-1,1649,1645,1650,-1,1650,1645,1628,-1,1628,1645,1642,-1, + 1642,1645,1643,-1,1643,1645,1644,-1,1642,1641,1628,-1,1628,1641,1629,-1,1629,1641,1630,-1,1630,1641,1631,-1,1631,1641,1632,-1,1632,1641,1640,-1, + 1639,1638,1640,-1,1640,1638,1637,-1,1066,1065,1067,-1,1067,1065,1068,-1,1068,1065,1069,-1,1069,1065,1070,-1,1070,1065,1071,-1,1071,1065,1072,-1, + 1072,1065,1064,-1,1072,1064,1073,-1,1073,1064,1074,-1,1074,1064,1075,-1,1075,1064,1076,-1,1076,1064,1077,-1,1077,1064,1063,-1,1078,1077,1079,-1, + 1079,1077,1080,-1,1080,1077,1081,-1,1081,1077,1060,-1,1060,1077,1062,-1,1062,1077,1063,-1,56,55,57,-1,57,55,58,-1,58,55,59,-1, 59,55,60,-1,60,55,61,-1,61,55,62,-1,62,55,63,-1,63,55,64,-1,64,55,65,-1,65,55,66,-1,66,55,19,-1, 19,55,20,-1,20,55,21,-1,21,55,22,-1,22,55,23,-1,23,55,24,-1,24,55,54,-1,49,48,42,-1,42,48,43,-1, 43,48,44,-1,44,48,46,-1,46,48,47,-1,50,49,37,-1,37,49,38,-1,38,49,39,-1,39,49,40,-1,40,49,41,-1, @@ -53509,183 +53535,189 @@ DEF SHAPE_188 Shape { 35,53,52,-1,30,29,31,-1,31,29,32,-1,32,29,33,-1,33,29,54,-1,54,29,28,-1,24,54,25,-1,25,54,26,-1, 26,54,27,-1,27,54,28,-1,10,66,11,-1,11,66,12,-1,12,66,13,-1,13,66,14,-1,14,66,15,-1,15,66,16,-1, 16,66,17,-1,17,66,18,-1,18,66,19,-1,70,69,68,-1,70,68,71,-1,71,68,67,-1,71,67,72,-1,81,80,79,-1, - 81,79,82,-1,82,79,78,-1,82,78,83,-1,83,78,77,-1,83,77,84,-1,84,77,76,-1,84,76,75,-1,1422,1421,1420,-1, - 1422,1420,1423,-1,1423,1420,1429,-1,1423,1429,1424,-1,1424,1429,1428,-1,1424,1428,1426,-1,1426,1428,1427,-1,1532,1531,1533,-1,1533,1531,1534,-1, - 1534,1531,1535,-1,1535,1531,1530,-1,1535,1530,1529,-1,1535,1529,1536,-1,1536,1529,1551,-1,1536,1551,1537,-1,1537,1551,1538,-1,1522,1521,1523,-1, - 1523,1521,1524,-1,1524,1521,1525,-1,1525,1521,1520,-1,1507,1506,1497,-1,1497,1506,1498,-1,1498,1506,1499,-1,1499,1506,1500,-1,1500,1506,1501,-1, - 1501,1506,1502,-1,1502,1506,1503,-1,1503,1506,1504,-1,1504,1506,1505,-1,1508,1507,1497,-1,1508,1497,1509,-1,1509,1497,1496,-1,1509,1496,1553,-1, - 1553,1496,1554,-1,1554,1496,1495,-1,1554,1495,1555,-1,1555,1495,1494,-1,1555,1494,1556,-1,1556,1494,1493,-1,1556,1493,1557,-1,1557,1493,1492,-1, - 1557,1492,1558,-1,1558,1492,1491,-1,1558,1491,1565,-1,1565,1491,1566,-1,1565,1564,1558,-1,1558,1564,1559,-1,1559,1564,1560,-1,1560,1564,1561,-1, - 1561,1564,1562,-1,1562,1564,1563,-1,1518,1517,1528,-1,1518,1528,1519,-1,1519,1528,1527,-1,1519,1527,1520,-1,1520,1527,1526,-1,1520,1526,1525,-1, - 1529,1528,1551,-1,1551,1528,1513,-1,1513,1528,1514,-1,1514,1528,1515,-1,1515,1528,1516,-1,1516,1528,1517,-1,1549,1548,1541,-1,1549,1541,1550,-1, - 1550,1541,1540,-1,1550,1540,1551,-1,1551,1540,1539,-1,1551,1539,1538,-1,1542,1541,1543,-1,1543,1541,1545,-1,1545,1541,1546,-1,1546,1541,1547,-1, - 1547,1541,1548,-1,1553,1552,1510,-1,1510,1552,1511,-1,1511,1552,1512,-1,1512,1552,1513,-1,1513,1552,1551,-1,1446,1434,1467,-1,1446,1467,1447,-1, - 1447,1467,1466,-1,1447,1466,1448,-1,1448,1466,1465,-1,1448,1465,1449,-1,1449,1465,1464,-1,1449,1464,1450,-1,1450,1464,1463,-1,1450,1463,1451,-1, - 1451,1463,1462,-1,1451,1462,1452,-1,1452,1462,1461,-1,1452,1461,1453,-1,1453,1461,1460,-1,1453,1460,1454,-1,1454,1460,1459,-1,1454,1459,1455,-1, - 1455,1459,1458,-1,1455,1458,1456,-1,1456,1458,1457,-1,1468,1467,1443,-1,1443,1467,1444,-1,1444,1467,1413,-1,1413,1467,1415,-1,1415,1467,1416,-1, - 1416,1467,1417,-1,1417,1467,1418,-1,1418,1467,1433,-1,1433,1467,1434,-1,1418,1433,1430,-1,1430,1433,1431,-1,1431,1433,1432,-1,1444,1413,1409,-1, - 1409,1413,1410,-1,1410,1413,1411,-1,1411,1413,1412,-1,1483,1476,1475,-1,1483,1475,1484,-1,1484,1475,1474,-1,1484,1474,1485,-1,1485,1474,1473,-1, - 1485,1473,1486,-1,1486,1473,1472,-1,1486,1472,1487,-1,1487,1472,1471,-1,1487,1471,1488,-1,1488,1471,1470,-1,1488,1470,1489,-1,1489,1470,1469,-1, - 1489,1469,1490,-1,1490,1469,1468,-1,1490,1468,1442,-1,1442,1468,1443,-1,1434,1446,1435,-1,1435,1446,1436,-1,1436,1446,1441,-1,1441,1446,1442,-1, - 1442,1446,1490,-1,1437,1436,1438,-1,1438,1436,1439,-1,1439,1436,1440,-1,1440,1436,1441,-1,1478,1477,1481,-1,1481,1477,1483,-1,1483,1477,1476,-1, - 1418,1430,1419,-1,1419,1430,1420,-1,1420,1430,1429,-1,91,90,89,-1,91,89,92,-1,92,89,88,-1,92,88,93,-1,93,88,87,-1, + 81,79,82,-1,82,79,78,-1,82,78,83,-1,83,78,77,-1,83,77,84,-1,84,77,76,-1,84,76,75,-1,1473,1472,1471,-1, + 1473,1471,1474,-1,1474,1471,1480,-1,1474,1480,1475,-1,1475,1480,1479,-1,1475,1479,1477,-1,1477,1479,1478,-1,1583,1582,1584,-1,1584,1582,1585,-1, + 1585,1582,1586,-1,1586,1582,1581,-1,1586,1581,1580,-1,1586,1580,1587,-1,1587,1580,1602,-1,1587,1602,1588,-1,1588,1602,1589,-1,1573,1572,1574,-1, + 1574,1572,1575,-1,1575,1572,1576,-1,1576,1572,1571,-1,1558,1557,1548,-1,1548,1557,1549,-1,1549,1557,1550,-1,1550,1557,1551,-1,1551,1557,1552,-1, + 1552,1557,1553,-1,1553,1557,1554,-1,1554,1557,1555,-1,1555,1557,1556,-1,1559,1558,1548,-1,1559,1548,1560,-1,1560,1548,1547,-1,1560,1547,1604,-1, + 1604,1547,1605,-1,1605,1547,1546,-1,1605,1546,1606,-1,1606,1546,1545,-1,1606,1545,1607,-1,1607,1545,1544,-1,1607,1544,1608,-1,1608,1544,1543,-1, + 1608,1543,1609,-1,1609,1543,1542,-1,1609,1542,1616,-1,1616,1542,1617,-1,1616,1615,1609,-1,1609,1615,1610,-1,1610,1615,1611,-1,1611,1615,1612,-1, + 1612,1615,1613,-1,1613,1615,1614,-1,1569,1568,1579,-1,1569,1579,1570,-1,1570,1579,1578,-1,1570,1578,1571,-1,1571,1578,1577,-1,1571,1577,1576,-1, + 1580,1579,1602,-1,1602,1579,1564,-1,1564,1579,1565,-1,1565,1579,1566,-1,1566,1579,1567,-1,1567,1579,1568,-1,1600,1599,1592,-1,1600,1592,1601,-1, + 1601,1592,1591,-1,1601,1591,1602,-1,1602,1591,1590,-1,1602,1590,1589,-1,1593,1592,1594,-1,1594,1592,1596,-1,1596,1592,1597,-1,1597,1592,1598,-1, + 1598,1592,1599,-1,1604,1603,1561,-1,1561,1603,1562,-1,1562,1603,1563,-1,1563,1603,1564,-1,1564,1603,1602,-1,1497,1485,1518,-1,1497,1518,1498,-1, + 1498,1518,1517,-1,1498,1517,1499,-1,1499,1517,1516,-1,1499,1516,1500,-1,1500,1516,1515,-1,1500,1515,1501,-1,1501,1515,1514,-1,1501,1514,1502,-1, + 1502,1514,1513,-1,1502,1513,1503,-1,1503,1513,1512,-1,1503,1512,1504,-1,1504,1512,1511,-1,1504,1511,1505,-1,1505,1511,1510,-1,1505,1510,1506,-1, + 1506,1510,1509,-1,1506,1509,1507,-1,1507,1509,1508,-1,1519,1518,1494,-1,1494,1518,1495,-1,1495,1518,1464,-1,1464,1518,1466,-1,1466,1518,1467,-1, + 1467,1518,1468,-1,1468,1518,1469,-1,1469,1518,1484,-1,1484,1518,1485,-1,1469,1484,1481,-1,1481,1484,1482,-1,1482,1484,1483,-1,1495,1464,1460,-1, + 1460,1464,1461,-1,1461,1464,1462,-1,1462,1464,1463,-1,1534,1527,1526,-1,1534,1526,1535,-1,1535,1526,1525,-1,1535,1525,1536,-1,1536,1525,1524,-1, + 1536,1524,1537,-1,1537,1524,1523,-1,1537,1523,1538,-1,1538,1523,1522,-1,1538,1522,1539,-1,1539,1522,1521,-1,1539,1521,1540,-1,1540,1521,1520,-1, + 1540,1520,1541,-1,1541,1520,1519,-1,1541,1519,1493,-1,1493,1519,1494,-1,1485,1497,1486,-1,1486,1497,1487,-1,1487,1497,1492,-1,1492,1497,1493,-1, + 1493,1497,1541,-1,1488,1487,1489,-1,1489,1487,1490,-1,1490,1487,1491,-1,1491,1487,1492,-1,1529,1528,1532,-1,1532,1528,1534,-1,1534,1528,1527,-1, + 1469,1481,1470,-1,1470,1481,1471,-1,1471,1481,1480,-1,91,90,89,-1,91,89,92,-1,92,89,88,-1,92,88,93,-1,93,88,87,-1, 93,87,94,-1,94,87,86,-1,94,86,85,-1,101,100,99,-1,101,99,102,-1,102,99,98,-1,102,98,103,-1,103,98,97,-1, 103,97,104,-1,104,97,96,-1,104,96,95,-1,111,110,109,-1,111,109,112,-1,112,109,108,-1,112,108,113,-1,113,108,107,-1, 113,107,114,-1,114,107,106,-1,114,106,105,-1,121,119,118,-1,121,118,122,-1,122,118,117,-1,122,117,123,-1,123,117,116,-1, 123,116,124,-1,124,116,115,-1,131,129,128,-1,131,128,132,-1,132,128,127,-1,132,127,133,-1,133,127,126,-1,133,126,134,-1, - 134,126,125,-1,207,280,279,-1,207,279,198,-1,198,279,278,-1,198,278,208,-1,208,278,277,-1,208,277,229,-1,229,277,286,-1, - 229,286,230,-1,230,286,231,-1,233,284,283,-1,233,283,234,-1,234,283,282,-1,234,282,206,-1,206,282,281,-1,206,281,207,-1, - 207,281,280,-1,206,205,234,-1,234,205,235,-1,235,205,236,-1,236,205,204,-1,253,252,203,-1,203,252,204,-1,204,252,236,-1, - 236,252,237,-1,237,252,251,-1,248,241,240,-1,248,240,249,-1,249,240,239,-1,249,239,250,-1,250,239,238,-1,250,238,251,-1, - 251,238,237,-1,243,242,246,-1,246,242,248,-1,248,242,241,-1,220,219,214,-1,214,219,215,-1,215,219,217,-1,217,219,218,-1, - 212,211,223,-1,212,223,213,-1,213,223,222,-1,213,222,214,-1,214,222,221,-1,214,221,220,-1,209,226,225,-1,209,225,210,-1, - 210,225,224,-1,210,224,211,-1,211,224,223,-1,226,209,227,-1,227,209,228,-1,228,209,229,-1,229,209,208,-1,285,284,233,-1, - 285,233,286,-1,286,233,232,-1,286,232,231,-1,276,275,200,-1,276,200,208,-1,208,200,199,-1,208,199,198,-1,201,200,273,-1, - 273,200,274,-1,274,200,275,-1,202,201,273,-1,202,273,203,-1,203,273,272,-1,203,272,253,-1,253,272,271,-1,253,271,254,-1, - 254,271,270,-1,254,270,255,-1,255,270,269,-1,255,269,256,-1,256,269,268,-1,256,268,257,-1,257,268,267,-1,257,267,258,-1, - 258,267,266,-1,258,266,259,-1,259,266,260,-1,265,264,266,-1,266,264,260,-1,260,264,261,-1,261,264,262,-1,262,264,263,-1, - 345,344,287,-1,287,344,300,-1,300,344,301,-1,301,344,302,-1,302,344,303,-1,303,344,359,-1,346,345,341,-1,341,345,342,-1, - 342,345,343,-1,343,345,287,-1,348,347,337,-1,337,347,338,-1,338,347,339,-1,339,347,340,-1,340,347,341,-1,341,347,346,-1, - 350,349,333,-1,333,349,334,-1,334,349,335,-1,335,349,336,-1,336,349,337,-1,337,349,348,-1,352,351,330,-1,330,351,331,-1, - 331,351,332,-1,332,351,333,-1,333,351,350,-1,313,312,354,-1,313,354,314,-1,314,354,353,-1,314,353,315,-1,315,353,352,-1, - 315,352,330,-1,330,329,315,-1,315,329,316,-1,316,329,317,-1,317,329,328,-1,325,324,320,-1,325,320,326,-1,326,320,318,-1, - 326,318,327,-1,327,318,317,-1,327,317,328,-1,370,369,368,-1,370,368,371,-1,371,368,367,-1,371,367,372,-1,372,367,365,-1, - 372,365,373,-1,373,365,364,-1,373,364,374,-1,374,364,363,-1,374,363,375,-1,375,363,362,-1,375,362,376,-1,376,362,361,-1, - 376,361,377,-1,377,361,360,-1,377,360,425,-1,425,360,426,-1,427,426,422,-1,422,426,423,-1,423,426,424,-1,424,426,360,-1, - 421,420,429,-1,421,429,422,-1,422,429,428,-1,422,428,427,-1,430,429,418,-1,418,429,419,-1,419,429,420,-1,432,431,414,-1, - 414,431,415,-1,415,431,416,-1,416,431,417,-1,417,431,418,-1,418,431,430,-1,413,412,434,-1,413,434,414,-1,414,434,433,-1, - 414,433,432,-1,390,389,437,-1,390,437,391,-1,391,437,436,-1,391,436,392,-1,392,436,435,-1,392,435,411,-1,411,435,434,-1, - 411,434,412,-1,404,403,399,-1,404,399,405,-1,405,399,397,-1,405,397,406,-1,406,397,396,-1,406,396,407,-1,407,396,395,-1, - 407,395,408,-1,408,395,394,-1,408,394,409,-1,409,394,393,-1,409,393,410,-1,410,393,392,-1,410,392,411,-1,445,498,497,-1, - 445,497,447,-1,447,497,496,-1,447,496,448,-1,448,496,495,-1,448,495,449,-1,449,495,450,-1,295,294,293,-1,295,293,296,-1, - 296,293,292,-1,296,292,297,-1,297,292,290,-1,297,290,298,-1,298,290,299,-1,136,135,137,-1,137,135,138,-1,138,135,139,-1, - 139,135,140,-1,140,135,197,-1,141,140,190,-1,190,140,191,-1,191,140,192,-1,192,140,193,-1,193,140,194,-1,194,140,195,-1, - 195,140,196,-1,196,140,197,-1,142,141,182,-1,182,141,183,-1,183,141,184,-1,184,141,185,-1,185,141,186,-1,186,141,187,-1, - 187,141,188,-1,188,141,189,-1,189,141,190,-1,142,182,143,-1,143,182,144,-1,144,182,145,-1,145,182,146,-1,146,182,147,-1, - 147,182,148,-1,148,182,149,-1,149,182,181,-1,149,181,150,-1,150,181,151,-1,151,181,152,-1,152,181,153,-1,153,181,154,-1, - 154,181,155,-1,155,181,156,-1,156,181,157,-1,157,181,180,-1,158,157,173,-1,173,157,174,-1,174,157,175,-1,175,157,176,-1, - 176,157,177,-1,177,157,178,-1,178,157,179,-1,179,157,180,-1,159,158,165,-1,165,158,166,-1,166,158,167,-1,167,158,168,-1, - 168,158,169,-1,169,158,170,-1,170,158,171,-1,171,158,172,-1,172,158,173,-1,159,165,160,-1,160,165,161,-1,161,165,162,-1, - 162,165,164,-1,245,244,246,-1,246,244,243,-1,300,299,288,-1,288,299,289,-1,289,299,290,-1,359,358,303,-1,303,358,304,-1, - 304,358,305,-1,305,358,306,-1,306,358,307,-1,307,358,357,-1,357,356,307,-1,307,356,308,-1,308,356,309,-1,309,356,310,-1, - 310,356,311,-1,311,356,355,-1,312,311,354,-1,354,311,355,-1,320,324,321,-1,321,324,322,-1,322,324,323,-1,377,425,378,-1, - 378,425,379,-1,379,425,380,-1,380,425,444,-1,381,380,442,-1,442,380,443,-1,443,380,444,-1,381,442,382,-1,382,442,383,-1, - 383,442,384,-1,384,442,441,-1,441,440,384,-1,384,440,385,-1,385,440,386,-1,386,440,387,-1,387,440,388,-1,388,440,439,-1, - 389,388,437,-1,437,388,438,-1,438,388,439,-1,399,403,400,-1,400,403,401,-1,401,403,402,-1,493,492,451,-1,493,451,494,-1, - 494,451,450,-1,494,450,495,-1,452,451,487,-1,487,451,488,-1,488,451,489,-1,489,451,490,-1,490,451,491,-1,491,451,492,-1, - 487,486,452,-1,452,486,453,-1,453,486,454,-1,454,486,455,-1,455,486,485,-1,484,483,457,-1,484,457,485,-1,485,457,456,-1, - 485,456,455,-1,459,458,480,-1,480,458,481,-1,481,458,482,-1,482,458,483,-1,483,458,457,-1,480,479,459,-1,459,479,460,-1, - 460,479,461,-1,461,479,462,-1,462,479,463,-1,463,479,464,-1,464,479,465,-1,465,479,466,-1,466,479,478,-1,468,467,476,-1, - 476,467,477,-1,477,467,478,-1,478,467,466,-1,469,468,470,-1,470,468,472,-1,472,468,473,-1,473,468,474,-1,474,468,475,-1, - 475,468,476,-1,505,503,502,-1,505,502,506,-1,506,502,501,-1,506,501,507,-1,507,501,500,-1,507,500,508,-1,508,500,499,-1, - 515,513,512,-1,515,512,516,-1,516,512,511,-1,516,511,517,-1,517,511,510,-1,517,510,518,-1,518,510,509,-1,525,524,523,-1, - 525,523,526,-1,526,523,522,-1,526,522,527,-1,527,522,521,-1,527,521,528,-1,528,521,520,-1,528,520,519,-1,535,534,533,-1, - 535,533,536,-1,536,533,532,-1,536,532,537,-1,537,532,531,-1,537,531,538,-1,538,531,530,-1,538,530,529,-1,545,544,543,-1, - 545,543,546,-1,546,543,542,-1,546,542,547,-1,547,542,541,-1,547,541,548,-1,548,541,540,-1,548,540,539,-1,564,563,562,-1, - 564,562,565,-1,565,562,561,-1,565,561,566,-1,566,561,560,-1,566,560,567,-1,567,560,559,-1,567,559,558,-1,574,573,572,-1, - 574,572,575,-1,575,572,571,-1,575,571,576,-1,576,571,570,-1,576,570,577,-1,577,570,569,-1,577,569,568,-1,588,587,584,-1, - 588,584,589,-1,589,584,583,-1,589,583,590,-1,590,583,582,-1,590,582,578,-1,578,582,581,-1,578,581,579,-1,579,581,580,-1, - 592,591,596,-1,592,596,593,-1,593,596,595,-1,593,595,594,-1,591,590,596,-1,596,590,597,-1,597,590,578,-1,585,584,586,-1, - 586,584,587,-1,600,599,601,-1,601,599,602,-1,602,599,603,-1,603,599,598,-1,604,603,605,-1,605,603,606,-1,606,603,607,-1, - 607,603,608,-1,608,603,598,-1,1209,1206,1205,-1,1209,1205,1257,-1,1257,1205,1273,-1,1257,1273,1258,-1,1258,1273,1272,-1,1258,1272,1259,-1, - 1259,1272,1260,-1,1208,1207,1209,-1,1209,1207,1206,-1,1266,1265,1267,-1,1267,1265,1268,-1,1268,1265,1269,-1,1269,1265,1264,-1,1262,1261,1272,-1, - 1262,1272,1263,-1,1263,1272,1271,-1,1263,1271,1264,-1,1264,1271,1270,-1,1264,1270,1269,-1,1211,1210,1254,-1,1254,1210,1255,-1,1255,1210,1256,-1, - 1256,1210,1257,-1,1257,1210,1209,-1,1224,1218,1217,-1,1224,1217,1225,-1,1225,1217,1216,-1,1225,1216,1226,-1,1226,1216,1215,-1,1226,1215,1227,-1, - 1227,1215,1214,-1,1227,1214,1228,-1,1228,1214,1213,-1,1228,1213,1229,-1,1229,1213,1212,-1,1229,1212,1230,-1,1230,1212,1211,-1,1230,1211,1253,-1, - 1253,1211,1254,-1,1241,1240,1245,-1,1241,1245,1242,-1,1242,1245,1244,-1,1242,1244,1243,-1,1240,1239,1245,-1,1245,1239,1246,-1,1246,1239,1247,-1, - 1247,1239,1248,-1,1248,1239,1238,-1,1249,1248,1235,-1,1235,1248,1236,-1,1236,1248,1237,-1,1237,1248,1238,-1,1251,1250,1231,-1,1231,1250,1232,-1, - 1232,1250,1233,-1,1233,1250,1234,-1,1234,1250,1235,-1,1235,1250,1249,-1,1251,1231,1252,-1,1252,1231,1253,-1,1253,1231,1230,-1,1220,1219,1222,-1, - 1222,1219,1224,-1,1224,1219,1218,-1,616,615,617,-1,617,615,618,-1,618,615,619,-1,619,615,614,-1,619,614,620,-1,620,614,621,-1, - 621,614,622,-1,622,614,613,-1,623,622,624,-1,624,622,610,-1,610,622,611,-1,611,622,612,-1,612,622,613,-1,659,658,660,-1, - 660,658,654,-1,654,658,655,-1,655,658,656,-1,656,658,657,-1,673,672,675,-1,675,672,676,-1,676,672,677,-1,677,672,678,-1, - 678,672,679,-1,679,672,684,-1,684,672,671,-1,685,684,669,-1,669,684,670,-1,670,684,671,-1,646,645,688,-1,646,688,668,-1, - 668,688,687,-1,668,687,669,-1,669,687,686,-1,669,686,685,-1,680,679,683,-1,680,683,626,-1,626,683,682,-1,626,682,641,-1, - 641,682,691,-1,641,691,642,-1,642,691,643,-1,630,629,631,-1,631,629,632,-1,632,629,633,-1,633,629,634,-1,634,629,635,-1, - 635,629,636,-1,636,629,628,-1,636,628,637,-1,637,628,638,-1,638,628,639,-1,639,628,640,-1,640,628,641,-1,641,628,627,-1, - 690,689,645,-1,690,645,691,-1,691,645,644,-1,691,644,643,-1,664,663,650,-1,664,650,665,-1,665,650,649,-1,665,649,666,-1, - 666,649,648,-1,666,648,667,-1,667,648,647,-1,667,647,668,-1,668,647,646,-1,652,651,661,-1,661,651,662,-1,662,651,663,-1, - 663,651,650,-1,661,660,652,-1,652,660,653,-1,653,660,654,-1,721,720,716,-1,721,716,722,-1,722,716,715,-1,722,715,692,-1, - 692,715,714,-1,692,714,707,-1,707,714,708,-1,718,717,719,-1,719,717,720,-1,720,717,716,-1,696,695,697,-1,697,695,698,-1, - 698,695,699,-1,699,695,700,-1,700,695,701,-1,701,695,702,-1,702,695,694,-1,702,694,703,-1,703,694,704,-1,704,694,705,-1, - 705,694,706,-1,706,694,707,-1,707,694,693,-1,711,710,709,-1,711,709,712,-1,712,709,708,-1,712,708,713,-1,713,708,714,-1, - 735,732,731,-1,735,731,737,-1,737,731,730,-1,737,730,738,-1,738,730,729,-1,738,729,739,-1,739,729,728,-1,739,728,740,-1, - 740,728,727,-1,740,727,741,-1,741,727,726,-1,741,726,742,-1,742,726,725,-1,742,725,743,-1,743,725,724,-1,743,724,781,-1, - 781,724,782,-1,744,743,795,-1,795,743,796,-1,796,743,781,-1,744,795,745,-1,745,795,746,-1,746,795,747,-1,747,795,794,-1, - 794,793,747,-1,747,793,748,-1,748,793,749,-1,749,793,750,-1,750,793,751,-1,751,793,792,-1,789,772,752,-1,789,752,790,-1, - 790,752,751,-1,790,751,791,-1,791,751,792,-1,732,735,733,-1,733,735,734,-1,780,779,784,-1,780,784,724,-1,724,784,783,-1, - 724,783,782,-1,785,784,777,-1,777,784,778,-1,778,784,779,-1,787,786,773,-1,773,786,774,-1,774,786,775,-1,775,786,776,-1, - 776,786,777,-1,777,786,785,-1,787,773,788,-1,788,773,789,-1,789,773,772,-1,766,759,758,-1,766,758,767,-1,767,758,757,-1, - 767,757,768,-1,768,757,756,-1,768,756,769,-1,769,756,755,-1,769,755,770,-1,770,755,754,-1,770,754,771,-1,771,754,753,-1, - 771,753,772,-1,772,753,752,-1,761,760,764,-1,764,760,766,-1,766,760,759,-1,801,800,799,-1,801,799,802,-1,802,799,798,-1, - 802,798,803,-1,803,798,797,-1,846,845,825,-1,846,825,804,-1,804,825,811,-1,804,811,805,-1,805,811,810,-1,805,810,809,-1, - 807,806,808,-1,808,806,809,-1,809,806,805,-1,838,837,835,-1,838,835,839,-1,839,835,834,-1,839,834,840,-1,840,834,833,-1, - 840,833,841,-1,841,833,832,-1,841,832,831,-1,827,826,843,-1,827,843,828,-1,828,843,842,-1,828,842,829,-1,829,842,841,-1, - 829,841,830,-1,830,841,831,-1,826,825,843,-1,843,825,844,-1,844,825,845,-1,824,823,813,-1,824,813,825,-1,825,813,812,-1, - 825,812,811,-1,814,813,821,-1,821,813,822,-1,822,813,823,-1,816,815,819,-1,819,815,820,-1,820,815,821,-1,821,815,814,-1, - 817,816,818,-1,818,816,819,-1,848,847,858,-1,848,858,849,-1,849,858,857,-1,849,857,850,-1,850,857,856,-1,850,856,851,-1, - 851,856,855,-1,851,855,852,-1,852,855,853,-1,1061,1060,1062,-1,1062,1060,1063,-1,1063,1060,1064,-1,1064,1060,1059,-1,763,762,764,-1, - 764,762,761,-1,1334,1333,1332,-1,1334,1332,1335,-1,1335,1332,1331,-1,1335,1331,1336,-1,1336,1331,1329,-1,1336,1329,1337,-1,1337,1329,1328,-1, - 1337,1328,1338,-1,1338,1328,1327,-1,1338,1327,1339,-1,1339,1327,1326,-1,1339,1326,1340,-1,1340,1326,1325,-1,1340,1325,1341,-1,1341,1325,1324,-1, - 1341,1324,1389,-1,1389,1324,1390,-1,1341,1389,1342,-1,1342,1389,1343,-1,1343,1389,1344,-1,1344,1389,1408,-1,1345,1344,1406,-1,1406,1344,1407,-1, - 1407,1344,1408,-1,1345,1406,1346,-1,1346,1406,1347,-1,1347,1406,1348,-1,1348,1406,1405,-1,1405,1404,1348,-1,1348,1404,1349,-1,1349,1404,1350,-1, - 1350,1404,1351,-1,1351,1404,1352,-1,1352,1404,1403,-1,1353,1352,1401,-1,1401,1352,1402,-1,1402,1352,1403,-1,1354,1353,1401,-1,1354,1401,1355,-1, - 1355,1401,1400,-1,1355,1400,1356,-1,1356,1400,1399,-1,1356,1399,1375,-1,1375,1399,1398,-1,1375,1398,1376,-1,1376,1398,1377,-1,1057,1056,1067,-1, - 1057,1067,1058,-1,1058,1067,1066,-1,1058,1066,1059,-1,1059,1066,1065,-1,1059,1065,1064,-1,1068,1067,1090,-1,1090,1067,1052,-1,1052,1067,1053,-1, - 1053,1067,1054,-1,1054,1067,1055,-1,1055,1067,1056,-1,1068,1090,1075,-1,1075,1090,1076,-1,1076,1090,1077,-1,1077,1090,1078,-1,1078,1090,1079,-1, - 1079,1090,1089,-1,1081,1080,1082,-1,1082,1080,1084,-1,1084,1080,1085,-1,1085,1080,1086,-1,1086,1080,1087,-1,1087,1080,1088,-1,1088,1080,1089,-1, - 1089,1080,1079,-1,876,875,871,-1,871,875,872,-1,872,875,873,-1,873,875,874,-1,869,868,877,-1,869,877,870,-1,870,877,876,-1, - 870,876,871,-1,868,867,877,-1,877,867,878,-1,878,867,879,-1,879,867,880,-1,880,867,881,-1,881,867,882,-1,882,867,866,-1, - 883,882,863,-1,863,882,864,-1,864,882,865,-1,865,882,866,-1,885,884,859,-1,859,884,860,-1,860,884,861,-1,861,884,862,-1, - 862,884,863,-1,863,884,883,-1,858,847,859,-1,859,847,885,-1,1000,999,947,-1,947,999,948,-1,948,999,949,-1,949,999,998,-1, - 916,915,917,-1,917,915,918,-1,918,915,919,-1,919,915,914,-1,912,911,920,-1,912,920,913,-1,913,920,919,-1,913,919,914,-1, - 921,920,907,-1,907,920,908,-1,908,920,909,-1,909,920,910,-1,910,920,911,-1,922,921,900,-1,900,921,901,-1,901,921,902,-1, - 902,921,903,-1,903,921,904,-1,904,921,905,-1,905,921,906,-1,906,921,907,-1,922,900,923,-1,923,900,924,-1,924,900,925,-1, - 925,900,926,-1,926,900,927,-1,927,900,899,-1,927,899,928,-1,928,899,929,-1,929,899,930,-1,930,899,931,-1,931,899,932,-1, - 932,899,933,-1,933,899,934,-1,934,899,935,-1,935,899,936,-1,936,899,898,-1,937,936,894,-1,894,936,895,-1,895,936,896,-1, - 896,936,897,-1,897,936,898,-1,938,937,944,-1,944,937,945,-1,945,937,886,-1,886,937,887,-1,887,937,888,-1,888,937,889,-1, - 889,937,890,-1,890,937,891,-1,891,937,892,-1,892,937,893,-1,893,937,894,-1,938,944,939,-1,939,944,940,-1,940,944,941,-1, - 941,944,943,-1,951,950,997,-1,997,950,998,-1,998,950,949,-1,995,994,953,-1,995,953,996,-1,996,953,952,-1,996,952,997,-1, - 997,952,951,-1,954,953,989,-1,989,953,990,-1,990,953,991,-1,991,953,992,-1,992,953,993,-1,993,953,994,-1,989,988,954,-1, - 954,988,955,-1,955,988,956,-1,956,988,957,-1,957,988,987,-1,986,985,959,-1,986,959,987,-1,987,959,958,-1,987,958,957,-1, - 961,960,982,-1,982,960,983,-1,983,960,984,-1,984,960,985,-1,985,960,959,-1,982,981,961,-1,961,981,962,-1,962,981,963,-1, - 963,981,964,-1,964,981,965,-1,965,981,966,-1,966,981,967,-1,967,981,980,-1,977,976,970,-1,977,970,978,-1,978,970,969,-1, - 978,969,979,-1,979,969,968,-1,979,968,980,-1,980,968,967,-1,971,970,972,-1,972,970,974,-1,974,970,975,-1,975,970,976,-1, - 1001,1012,1011,-1,1001,1011,1002,-1,1002,1011,1010,-1,1002,1010,1003,-1,1003,1010,1009,-1,1003,1009,1004,-1,1004,1009,1008,-1,1004,1008,1005,-1, - 1005,1008,1006,-1,1014,1013,1017,-1,1017,1013,1018,-1,1018,1013,1019,-1,1019,1013,1020,-1,1020,1013,1021,-1,552,551,550,-1,552,550,553,-1, - 553,550,549,-1,553,549,555,-1,555,549,556,-1,1015,1014,1016,-1,1016,1014,1017,-1,1071,1070,1072,-1,1072,1070,1073,-1,1073,1070,1074,-1, - 1074,1070,1069,-1,1075,1074,1068,-1,1068,1074,1069,-1,1046,1045,1112,-1,1112,1045,1113,-1,1113,1045,1114,-1,1114,1045,1115,-1,1115,1045,1118,-1, - 1118,1045,1119,-1,1119,1045,1120,-1,1118,1117,1115,-1,1115,1117,1116,-1,1047,1046,1112,-1,1047,1112,1048,-1,1048,1112,1111,-1,1048,1111,1092,-1, - 1092,1111,1093,-1,1093,1111,1110,-1,1093,1110,1094,-1,1094,1110,1109,-1,1094,1109,1095,-1,1095,1109,1108,-1,1095,1108,1096,-1,1096,1108,1107,-1, - 1096,1107,1097,-1,1097,1107,1106,-1,1097,1106,1098,-1,1098,1106,1105,-1,1098,1105,1099,-1,1099,1105,1100,-1,1104,1103,1105,-1,1105,1103,1100,-1, - 1100,1103,1101,-1,1101,1103,1102,-1,1092,1091,1049,-1,1049,1091,1050,-1,1050,1091,1051,-1,1051,1091,1052,-1,1052,1091,1090,-1,1149,1148,1121,-1, - 1121,1148,1122,-1,1122,1148,1123,-1,1123,1148,1124,-1,1124,1148,1125,-1,1125,1148,1147,-1,1147,1146,1125,-1,1125,1146,1126,-1,1126,1146,1127,-1, - 1127,1146,1128,-1,1128,1146,1129,-1,1129,1146,1145,-1,1145,1144,1129,-1,1129,1144,1130,-1,1130,1144,1141,-1,1141,1144,1142,-1,1142,1144,1143,-1, - 1131,1130,1141,-1,1131,1141,1132,-1,1132,1141,1140,-1,1132,1140,1133,-1,1133,1140,1139,-1,1133,1139,1134,-1,1134,1139,1135,-1,1135,1139,1136,-1, - 1136,1139,1137,-1,1137,1139,1138,-1,1156,1155,1154,-1,1156,1154,1157,-1,1157,1154,1153,-1,1157,1153,1158,-1,1158,1153,1152,-1,1158,1152,1159,-1, - 1159,1152,1160,-1,1152,1151,1160,-1,1160,1151,1161,-1,1161,1151,1121,-1,1121,1151,1149,-1,1149,1151,1150,-1,1204,1203,1183,-1,1204,1183,1162,-1, - 1162,1183,1169,-1,1162,1169,1163,-1,1163,1169,1168,-1,1163,1168,1167,-1,1165,1164,1166,-1,1166,1164,1167,-1,1167,1164,1163,-1,1196,1195,1193,-1, - 1196,1193,1197,-1,1197,1193,1192,-1,1197,1192,1198,-1,1198,1192,1191,-1,1198,1191,1199,-1,1199,1191,1190,-1,1199,1190,1189,-1,1185,1184,1201,-1, - 1185,1201,1186,-1,1186,1201,1200,-1,1186,1200,1187,-1,1187,1200,1199,-1,1187,1199,1188,-1,1188,1199,1189,-1,1184,1183,1201,-1,1201,1183,1202,-1, - 1202,1183,1203,-1,1182,1181,1171,-1,1182,1171,1183,-1,1183,1171,1170,-1,1183,1170,1169,-1,1172,1171,1179,-1,1179,1171,1180,-1,1180,1171,1181,-1, - 1174,1173,1177,-1,1177,1173,1178,-1,1178,1173,1179,-1,1179,1173,1172,-1,1175,1174,1176,-1,1176,1174,1177,-1,1274,1282,1281,-1,1274,1281,1275,-1, - 1275,1281,1280,-1,1275,1280,1276,-1,1276,1280,1279,-1,1276,1279,1277,-1,1277,1279,1278,-1,1284,1283,1290,-1,1290,1283,1313,-1,1313,1283,1314,-1, - 1314,1283,1315,-1,1315,1283,1316,-1,1316,1283,1317,-1,1317,1283,1318,-1,1318,1283,1319,-1,1319,1283,1320,-1,1320,1283,1322,-1,1322,1283,1323,-1, - 1284,1290,1285,-1,1285,1290,1286,-1,1286,1290,1287,-1,1287,1290,1289,-1,1311,1310,1292,-1,1311,1292,1312,-1,1312,1292,1291,-1,1312,1291,1313,-1, - 1313,1291,1290,-1,1297,1296,1307,-1,1297,1307,1298,-1,1298,1307,1305,-1,1298,1305,1299,-1,1299,1305,1304,-1,1299,1304,1303,-1,1301,1300,1302,-1, - 1302,1300,1303,-1,1303,1300,1299,-1,1307,1296,1295,-1,1307,1295,1308,-1,1308,1295,1294,-1,1308,1294,1309,-1,1309,1294,1293,-1,1309,1293,1310,-1, - 1310,1293,1292,-1,1368,1367,1363,-1,1368,1363,1369,-1,1369,1363,1361,-1,1369,1361,1370,-1,1370,1361,1360,-1,1370,1360,1371,-1,1371,1360,1359,-1, - 1371,1359,1372,-1,1372,1359,1358,-1,1372,1358,1373,-1,1373,1358,1357,-1,1373,1357,1374,-1,1374,1357,1356,-1,1374,1356,1375,-1,1363,1367,1364,-1, - 1364,1367,1365,-1,1365,1367,1366,-1,1391,1390,1386,-1,1386,1390,1387,-1,1387,1390,1388,-1,1388,1390,1324,-1,1385,1384,1393,-1,1385,1393,1386,-1, - 1386,1393,1392,-1,1386,1392,1391,-1,1394,1393,1382,-1,1382,1393,1383,-1,1383,1393,1384,-1,1396,1395,1378,-1,1378,1395,1379,-1,1379,1395,1380,-1, - 1380,1395,1381,-1,1381,1395,1382,-1,1382,1395,1394,-1,1396,1378,1397,-1,1397,1378,1398,-1,1398,1378,1377,-1,1480,1479,1481,-1,1481,1479,1478,-1, - 1569,1568,1571,-1,1571,1568,1572,-1,1572,1568,1567,-1,1569,1571,1570,-1,1444,1409,1445,-1,1361,1363,1362,-1,1305,1307,1306,-1,1287,1289,1288,-1, - 1320,1322,1321,-1,1220,1222,1221,-1,1193,1195,1194,-1,972,974,973,-1,1082,1084,1083,-1,1092,1049,1048,-1,556,549,557,-1,553,555,554,-1, - 1006,1008,1007,-1,945,886,946,-1,941,943,942,-1,1329,1331,1330,-1,853,855,854,-1,835,837,836,-1,764,766,765,-1,735,737,736,-1, - 722,692,723,-1,692,707,693,-1,680,626,681,-1,688,645,689,-1,626,641,627,-1,673,675,674,-1,679,684,683,-1,624,610,625,-1, - 1222,1224,1223,-1,1260,1272,1261,-1,608,598,609,-1,513,515,514,-1,503,505,504,-1,470,472,471,-1,445,447,446,-1,365,367,366,-1, - 287,300,288,-1,290,292,291,-1,162,164,163,-1,397,399,398,-1,318,320,319,-1,217,216,215,-1,246,248,247,-1,129,131,130,-1, - 119,121,120,-1,1424,1426,1425,-1,1481,1483,1482,-1,1413,1415,1414,-1,1543,1545,1544,-1,1553,1510,1509,-1,46,45,44,-1,1043,1022,1044,-1, - 1022,1024,1023,-1,1589,1582,1581,-1] + 134,126,125,-1,145,144,143,-1,145,143,146,-1,146,143,142,-1,146,142,147,-1,147,142,140,-1,147,140,148,-1,148,140,139,-1, + 148,139,149,-1,149,139,138,-1,149,138,150,-1,150,138,137,-1,150,137,151,-1,151,137,136,-1,151,136,152,-1,152,136,135,-1, + 152,135,200,-1,200,135,201,-1,202,201,197,-1,197,201,198,-1,198,201,199,-1,199,201,135,-1,196,195,204,-1,196,204,197,-1, + 197,204,203,-1,197,203,202,-1,205,204,193,-1,193,204,194,-1,194,204,195,-1,207,206,189,-1,189,206,190,-1,190,206,191,-1, + 191,206,192,-1,192,206,193,-1,193,206,205,-1,188,187,209,-1,188,209,189,-1,189,209,208,-1,189,208,207,-1,165,164,212,-1, + 165,212,166,-1,166,212,211,-1,166,211,167,-1,167,211,210,-1,167,210,186,-1,186,210,209,-1,186,209,187,-1,179,178,174,-1, + 179,174,180,-1,180,174,172,-1,180,172,181,-1,181,172,171,-1,181,171,182,-1,182,171,170,-1,182,170,183,-1,183,170,169,-1, + 183,169,184,-1,184,169,168,-1,184,168,185,-1,185,168,167,-1,185,167,186,-1,229,302,301,-1,229,301,220,-1,220,301,300,-1, + 220,300,230,-1,230,300,299,-1,230,299,251,-1,251,299,308,-1,251,308,252,-1,252,308,253,-1,255,306,305,-1,255,305,256,-1, + 256,305,304,-1,256,304,228,-1,228,304,303,-1,228,303,229,-1,229,303,302,-1,228,227,256,-1,256,227,257,-1,257,227,258,-1, + 258,227,226,-1,275,274,225,-1,225,274,226,-1,226,274,258,-1,258,274,259,-1,259,274,273,-1,270,263,262,-1,270,262,271,-1, + 271,262,261,-1,271,261,272,-1,272,261,260,-1,272,260,273,-1,273,260,259,-1,265,264,268,-1,268,264,270,-1,270,264,263,-1, + 242,241,236,-1,236,241,237,-1,237,241,239,-1,239,241,240,-1,234,233,245,-1,234,245,235,-1,235,245,244,-1,235,244,236,-1, + 236,244,243,-1,236,243,242,-1,231,248,247,-1,231,247,232,-1,232,247,246,-1,232,246,233,-1,233,246,245,-1,248,231,249,-1, + 249,231,250,-1,250,231,251,-1,251,231,230,-1,307,306,255,-1,307,255,308,-1,308,255,254,-1,308,254,253,-1,298,297,222,-1, + 298,222,230,-1,230,222,221,-1,230,221,220,-1,223,222,295,-1,295,222,296,-1,296,222,297,-1,224,223,295,-1,224,295,225,-1, + 225,295,294,-1,225,294,275,-1,275,294,293,-1,275,293,276,-1,276,293,292,-1,276,292,277,-1,277,292,291,-1,277,291,278,-1, + 278,291,290,-1,278,290,279,-1,279,290,289,-1,279,289,280,-1,280,289,288,-1,280,288,281,-1,281,288,282,-1,287,286,288,-1, + 288,286,282,-1,282,286,283,-1,283,286,284,-1,284,286,285,-1,430,429,372,-1,372,429,385,-1,385,429,386,-1,386,429,387,-1, + 387,429,388,-1,388,429,444,-1,431,430,426,-1,426,430,427,-1,427,430,428,-1,428,430,372,-1,433,432,422,-1,422,432,423,-1, + 423,432,424,-1,424,432,425,-1,425,432,426,-1,426,432,431,-1,435,434,418,-1,418,434,419,-1,419,434,420,-1,420,434,421,-1, + 421,434,422,-1,422,434,433,-1,437,436,415,-1,415,436,416,-1,416,436,417,-1,417,436,418,-1,418,436,435,-1,398,397,439,-1, + 398,439,399,-1,399,439,438,-1,399,438,400,-1,400,438,437,-1,400,437,415,-1,415,414,400,-1,400,414,401,-1,401,414,402,-1, + 402,414,413,-1,410,409,405,-1,410,405,411,-1,411,405,403,-1,411,403,412,-1,412,403,402,-1,412,402,413,-1,451,449,448,-1, + 451,448,452,-1,452,448,447,-1,452,447,453,-1,453,447,446,-1,453,446,454,-1,454,446,445,-1,461,459,458,-1,461,458,462,-1, + 462,458,457,-1,462,457,463,-1,463,457,456,-1,463,456,464,-1,464,456,455,-1,471,470,469,-1,471,469,472,-1,472,469,468,-1, + 472,468,473,-1,473,468,467,-1,473,467,474,-1,474,467,466,-1,474,466,465,-1,481,480,479,-1,481,479,482,-1,482,479,478,-1, + 482,478,483,-1,483,478,477,-1,483,477,484,-1,484,477,476,-1,484,476,475,-1,491,490,489,-1,491,489,492,-1,492,489,488,-1, + 492,488,493,-1,493,488,487,-1,493,487,494,-1,494,487,486,-1,494,486,485,-1,510,509,508,-1,510,508,511,-1,511,508,507,-1, + 511,507,512,-1,512,507,506,-1,512,506,513,-1,513,506,505,-1,513,505,504,-1,520,519,518,-1,520,518,521,-1,521,518,517,-1, + 521,517,522,-1,522,517,516,-1,522,516,523,-1,523,516,515,-1,523,515,514,-1,534,533,530,-1,534,530,535,-1,535,530,529,-1, + 535,529,536,-1,536,529,528,-1,536,528,524,-1,524,528,527,-1,524,527,525,-1,525,527,526,-1,538,537,542,-1,538,542,539,-1, + 539,542,541,-1,539,541,540,-1,537,536,542,-1,542,536,543,-1,543,536,524,-1,531,530,532,-1,532,530,533,-1,546,545,547,-1, + 547,545,548,-1,548,545,549,-1,549,545,544,-1,550,549,551,-1,551,549,552,-1,552,549,553,-1,553,549,554,-1,554,549,544,-1, + 1247,1244,1243,-1,1247,1243,1295,-1,1295,1243,1311,-1,1295,1311,1296,-1,1296,1311,1310,-1,1296,1310,1297,-1,1297,1310,1298,-1,1246,1245,1247,-1, + 1247,1245,1244,-1,1304,1303,1305,-1,1305,1303,1306,-1,1306,1303,1307,-1,1307,1303,1302,-1,1300,1299,1310,-1,1300,1310,1301,-1,1301,1310,1309,-1, + 1301,1309,1302,-1,1302,1309,1308,-1,1302,1308,1307,-1,1249,1248,1292,-1,1292,1248,1293,-1,1293,1248,1294,-1,1294,1248,1295,-1,1295,1248,1247,-1, + 1262,1256,1255,-1,1262,1255,1263,-1,1263,1255,1254,-1,1263,1254,1264,-1,1264,1254,1253,-1,1264,1253,1265,-1,1265,1253,1252,-1,1265,1252,1266,-1, + 1266,1252,1251,-1,1266,1251,1267,-1,1267,1251,1250,-1,1267,1250,1268,-1,1268,1250,1249,-1,1268,1249,1291,-1,1291,1249,1292,-1,1279,1278,1283,-1, + 1279,1283,1280,-1,1280,1283,1282,-1,1280,1282,1281,-1,1278,1277,1283,-1,1283,1277,1284,-1,1284,1277,1285,-1,1285,1277,1286,-1,1286,1277,1276,-1, + 1287,1286,1273,-1,1273,1286,1274,-1,1274,1286,1275,-1,1275,1286,1276,-1,1289,1288,1269,-1,1269,1288,1270,-1,1270,1288,1271,-1,1271,1288,1272,-1, + 1272,1288,1273,-1,1273,1288,1287,-1,1289,1269,1290,-1,1290,1269,1291,-1,1291,1269,1268,-1,1258,1257,1260,-1,1260,1257,1262,-1,1262,1257,1256,-1, + 562,561,563,-1,563,561,564,-1,564,561,565,-1,565,561,560,-1,565,560,566,-1,566,560,567,-1,567,560,568,-1,568,560,559,-1, + 569,568,570,-1,570,568,556,-1,556,568,557,-1,557,568,558,-1,558,568,559,-1,605,604,606,-1,606,604,600,-1,600,604,601,-1, + 601,604,602,-1,602,604,603,-1,619,618,621,-1,621,618,622,-1,622,618,623,-1,623,618,624,-1,624,618,625,-1,625,618,630,-1, + 630,618,617,-1,631,630,615,-1,615,630,616,-1,616,630,617,-1,592,591,634,-1,592,634,614,-1,614,634,633,-1,614,633,615,-1, + 615,633,632,-1,615,632,631,-1,626,625,629,-1,626,629,572,-1,572,629,628,-1,572,628,587,-1,587,628,637,-1,587,637,588,-1, + 588,637,589,-1,576,575,577,-1,577,575,578,-1,578,575,579,-1,579,575,580,-1,580,575,581,-1,581,575,582,-1,582,575,574,-1, + 582,574,583,-1,583,574,584,-1,584,574,585,-1,585,574,586,-1,586,574,587,-1,587,574,573,-1,636,635,591,-1,636,591,637,-1, + 637,591,590,-1,637,590,589,-1,610,609,596,-1,610,596,611,-1,611,596,595,-1,611,595,612,-1,612,595,594,-1,612,594,613,-1, + 613,594,593,-1,613,593,614,-1,614,593,592,-1,598,597,607,-1,607,597,608,-1,608,597,609,-1,609,597,596,-1,607,606,598,-1, + 598,606,599,-1,599,606,600,-1,667,666,662,-1,667,662,668,-1,668,662,661,-1,668,661,638,-1,638,661,660,-1,638,660,653,-1, + 653,660,654,-1,664,663,665,-1,665,663,666,-1,666,663,662,-1,642,641,643,-1,643,641,644,-1,644,641,645,-1,645,641,646,-1, + 646,641,647,-1,647,641,648,-1,648,641,640,-1,648,640,649,-1,649,640,650,-1,650,640,651,-1,651,640,652,-1,652,640,653,-1, + 653,640,639,-1,657,656,655,-1,657,655,658,-1,658,655,654,-1,658,654,659,-1,659,654,660,-1,681,678,677,-1,681,677,683,-1, + 683,677,676,-1,683,676,684,-1,684,676,675,-1,684,675,685,-1,685,675,674,-1,685,674,686,-1,686,674,673,-1,686,673,687,-1, + 687,673,672,-1,687,672,688,-1,688,672,671,-1,688,671,689,-1,689,671,670,-1,689,670,727,-1,727,670,728,-1,690,689,741,-1, + 741,689,742,-1,742,689,727,-1,690,741,691,-1,691,741,692,-1,692,741,693,-1,693,741,740,-1,740,739,693,-1,693,739,694,-1, + 694,739,695,-1,695,739,696,-1,696,739,697,-1,697,739,738,-1,735,718,698,-1,735,698,736,-1,736,698,697,-1,736,697,737,-1, + 737,697,738,-1,678,681,679,-1,679,681,680,-1,726,725,730,-1,726,730,670,-1,670,730,729,-1,670,729,728,-1,731,730,723,-1, + 723,730,724,-1,724,730,725,-1,733,732,719,-1,719,732,720,-1,720,732,721,-1,721,732,722,-1,722,732,723,-1,723,732,731,-1, + 733,719,734,-1,734,719,735,-1,735,719,718,-1,712,705,704,-1,712,704,713,-1,713,704,703,-1,713,703,714,-1,714,703,702,-1, + 714,702,715,-1,715,702,701,-1,715,701,716,-1,716,701,700,-1,716,700,717,-1,717,700,699,-1,717,699,718,-1,718,699,698,-1, + 707,706,710,-1,710,706,712,-1,712,706,705,-1,747,746,745,-1,747,745,748,-1,748,745,744,-1,748,744,749,-1,749,744,743,-1, + 792,791,771,-1,792,771,750,-1,750,771,757,-1,750,757,751,-1,751,757,756,-1,751,756,755,-1,753,752,754,-1,754,752,755,-1, + 755,752,751,-1,784,783,781,-1,784,781,785,-1,785,781,780,-1,785,780,786,-1,786,780,779,-1,786,779,787,-1,787,779,778,-1, + 787,778,777,-1,773,772,789,-1,773,789,774,-1,774,789,788,-1,774,788,775,-1,775,788,787,-1,775,787,776,-1,776,787,777,-1, + 772,771,789,-1,789,771,790,-1,790,771,791,-1,770,769,759,-1,770,759,771,-1,771,759,758,-1,771,758,757,-1,760,759,767,-1, + 767,759,768,-1,768,759,769,-1,762,761,765,-1,765,761,766,-1,766,761,767,-1,767,761,760,-1,763,762,764,-1,764,762,765,-1, + 794,793,804,-1,794,804,795,-1,795,804,803,-1,795,803,796,-1,796,803,802,-1,796,802,797,-1,797,802,801,-1,797,801,798,-1, + 798,801,799,-1,1099,1098,1100,-1,1100,1098,1101,-1,1101,1098,1102,-1,1102,1098,1097,-1,709,708,710,-1,710,708,707,-1,1385,1384,1383,-1, + 1385,1383,1386,-1,1386,1383,1382,-1,1386,1382,1387,-1,1387,1382,1380,-1,1387,1380,1388,-1,1388,1380,1379,-1,1388,1379,1389,-1,1389,1379,1378,-1, + 1389,1378,1390,-1,1390,1378,1377,-1,1390,1377,1391,-1,1391,1377,1376,-1,1391,1376,1392,-1,1392,1376,1375,-1,1392,1375,1440,-1,1440,1375,1441,-1, + 1392,1440,1393,-1,1393,1440,1394,-1,1394,1440,1395,-1,1395,1440,1459,-1,1396,1395,1457,-1,1457,1395,1458,-1,1458,1395,1459,-1,1396,1457,1397,-1, + 1397,1457,1398,-1,1398,1457,1399,-1,1399,1457,1456,-1,1456,1455,1399,-1,1399,1455,1400,-1,1400,1455,1401,-1,1401,1455,1402,-1,1402,1455,1403,-1, + 1403,1455,1454,-1,1404,1403,1452,-1,1452,1403,1453,-1,1453,1403,1454,-1,1405,1404,1452,-1,1405,1452,1406,-1,1406,1452,1451,-1,1406,1451,1407,-1, + 1407,1451,1450,-1,1407,1450,1426,-1,1426,1450,1449,-1,1426,1449,1427,-1,1427,1449,1428,-1,1095,1094,1105,-1,1095,1105,1096,-1,1096,1105,1104,-1, + 1096,1104,1097,-1,1097,1104,1103,-1,1097,1103,1102,-1,1106,1105,1128,-1,1128,1105,1090,-1,1090,1105,1091,-1,1091,1105,1092,-1,1092,1105,1093,-1, + 1093,1105,1094,-1,1106,1128,1113,-1,1113,1128,1114,-1,1114,1128,1115,-1,1115,1128,1116,-1,1116,1128,1117,-1,1117,1128,1127,-1,1119,1118,1120,-1, + 1120,1118,1122,-1,1122,1118,1123,-1,1123,1118,1124,-1,1124,1118,1125,-1,1125,1118,1126,-1,1126,1118,1127,-1,1127,1118,1117,-1,822,821,817,-1, + 817,821,818,-1,818,821,819,-1,819,821,820,-1,815,814,823,-1,815,823,816,-1,816,823,822,-1,816,822,817,-1,814,813,823,-1, + 823,813,824,-1,824,813,825,-1,825,813,826,-1,826,813,827,-1,827,813,828,-1,828,813,812,-1,829,828,809,-1,809,828,810,-1, + 810,828,811,-1,811,828,812,-1,831,830,805,-1,805,830,806,-1,806,830,807,-1,807,830,808,-1,808,830,809,-1,809,830,829,-1, + 804,793,805,-1,805,793,831,-1,946,945,893,-1,893,945,894,-1,894,945,895,-1,895,945,944,-1,862,861,863,-1,863,861,864,-1, + 864,861,865,-1,865,861,860,-1,858,857,866,-1,858,866,859,-1,859,866,865,-1,859,865,860,-1,867,866,853,-1,853,866,854,-1, + 854,866,855,-1,855,866,856,-1,856,866,857,-1,868,867,846,-1,846,867,847,-1,847,867,848,-1,848,867,849,-1,849,867,850,-1, + 850,867,851,-1,851,867,852,-1,852,867,853,-1,868,846,869,-1,869,846,870,-1,870,846,871,-1,871,846,872,-1,872,846,873,-1, + 873,846,845,-1,873,845,874,-1,874,845,875,-1,875,845,876,-1,876,845,877,-1,877,845,878,-1,878,845,879,-1,879,845,880,-1, + 880,845,881,-1,881,845,882,-1,882,845,844,-1,883,882,840,-1,840,882,841,-1,841,882,842,-1,842,882,843,-1,843,882,844,-1, + 884,883,890,-1,890,883,891,-1,891,883,832,-1,832,883,833,-1,833,883,834,-1,834,883,835,-1,835,883,836,-1,836,883,837,-1, + 837,883,838,-1,838,883,839,-1,839,883,840,-1,884,890,885,-1,885,890,886,-1,886,890,887,-1,887,890,889,-1,897,896,943,-1, + 943,896,944,-1,944,896,895,-1,941,940,899,-1,941,899,942,-1,942,899,898,-1,942,898,943,-1,943,898,897,-1,900,899,935,-1, + 935,899,936,-1,936,899,937,-1,937,899,938,-1,938,899,939,-1,939,899,940,-1,935,934,900,-1,900,934,901,-1,901,934,902,-1, + 902,934,903,-1,903,934,933,-1,932,931,905,-1,932,905,933,-1,933,905,904,-1,933,904,903,-1,907,906,928,-1,928,906,929,-1, + 929,906,930,-1,930,906,931,-1,931,906,905,-1,928,927,907,-1,907,927,908,-1,908,927,909,-1,909,927,910,-1,910,927,911,-1, + 911,927,912,-1,912,927,913,-1,913,927,926,-1,923,922,916,-1,923,916,924,-1,924,916,915,-1,924,915,925,-1,925,915,914,-1, + 925,914,926,-1,926,914,913,-1,917,916,918,-1,918,916,920,-1,920,916,921,-1,921,916,922,-1,947,958,957,-1,947,957,948,-1, + 948,957,956,-1,948,956,949,-1,949,956,955,-1,949,955,950,-1,950,955,954,-1,950,954,951,-1,951,954,952,-1,960,959,963,-1, + 963,959,964,-1,964,959,965,-1,965,959,966,-1,966,959,967,-1,498,497,496,-1,498,496,499,-1,499,496,495,-1,499,495,501,-1, + 501,495,502,-1,961,960,962,-1,962,960,963,-1,971,970,1055,-1,1055,970,1056,-1,1056,970,1057,-1,1057,970,1058,-1,1058,970,968,-1, + 968,970,969,-1,973,972,1054,-1,1054,972,1055,-1,1055,972,971,-1,1053,1052,975,-1,1053,975,1054,-1,1054,975,974,-1,1054,974,973,-1, + 1052,1051,975,-1,975,1051,976,-1,976,1051,977,-1,977,1051,1050,-1,977,1050,978,-1,978,1050,979,-1,979,1050,980,-1,980,1050,981,-1, + 981,1050,1049,-1,982,981,988,-1,988,981,989,-1,989,981,1047,-1,1047,981,1048,-1,1048,981,1049,-1,985,984,983,-1,985,983,986,-1, + 986,983,982,-1,986,982,987,-1,987,982,988,-1,1321,1374,1373,-1,1321,1373,1323,-1,1323,1373,1372,-1,1323,1372,1324,-1,1324,1372,1371,-1, + 1324,1371,1325,-1,1325,1371,1326,-1,380,379,378,-1,380,378,381,-1,381,378,377,-1,381,377,382,-1,382,377,375,-1,382,375,383,-1, + 383,375,384,-1,310,309,311,-1,311,309,312,-1,312,309,313,-1,313,309,314,-1,314,309,371,-1,315,314,364,-1,364,314,365,-1, + 365,314,366,-1,366,314,367,-1,367,314,368,-1,368,314,369,-1,369,314,370,-1,370,314,371,-1,316,315,356,-1,356,315,357,-1, + 357,315,358,-1,358,315,359,-1,359,315,360,-1,360,315,361,-1,361,315,362,-1,362,315,363,-1,363,315,364,-1,316,356,317,-1, + 317,356,318,-1,318,356,319,-1,319,356,320,-1,320,356,321,-1,321,356,322,-1,322,356,323,-1,323,356,355,-1,323,355,324,-1, + 324,355,325,-1,325,355,326,-1,326,355,327,-1,327,355,328,-1,328,355,329,-1,329,355,330,-1,330,355,331,-1,331,355,354,-1, + 332,331,347,-1,347,331,348,-1,348,331,349,-1,349,331,350,-1,350,331,351,-1,351,331,352,-1,352,331,353,-1,353,331,354,-1, + 333,332,339,-1,339,332,340,-1,340,332,341,-1,341,332,342,-1,342,332,343,-1,343,332,344,-1,344,332,345,-1,345,332,346,-1, + 346,332,347,-1,333,339,334,-1,334,339,335,-1,335,339,336,-1,336,339,338,-1,267,266,268,-1,268,266,265,-1,385,384,373,-1, + 373,384,374,-1,374,384,375,-1,444,443,388,-1,388,443,389,-1,389,443,390,-1,390,443,391,-1,391,443,392,-1,392,443,442,-1, + 442,441,392,-1,392,441,393,-1,393,441,394,-1,394,441,395,-1,395,441,396,-1,396,441,440,-1,397,396,439,-1,439,396,440,-1, + 405,409,406,-1,406,409,407,-1,407,409,408,-1,152,200,153,-1,153,200,154,-1,154,200,155,-1,155,200,219,-1,156,155,217,-1, + 217,155,218,-1,218,155,219,-1,156,217,157,-1,157,217,158,-1,158,217,159,-1,159,217,216,-1,216,215,159,-1,159,215,160,-1, + 160,215,161,-1,161,215,162,-1,162,215,163,-1,163,215,214,-1,164,163,212,-1,212,163,213,-1,213,163,214,-1,174,178,175,-1, + 175,178,176,-1,176,178,177,-1,1369,1368,1327,-1,1369,1327,1370,-1,1370,1327,1326,-1,1370,1326,1371,-1,1328,1327,1363,-1,1363,1327,1364,-1, + 1364,1327,1365,-1,1365,1327,1366,-1,1366,1327,1367,-1,1367,1327,1368,-1,1363,1362,1328,-1,1328,1362,1329,-1,1329,1362,1330,-1,1330,1362,1331,-1, + 1331,1362,1361,-1,1360,1359,1333,-1,1360,1333,1361,-1,1361,1333,1332,-1,1361,1332,1331,-1,1335,1334,1356,-1,1356,1334,1357,-1,1357,1334,1358,-1, + 1358,1334,1359,-1,1359,1334,1333,-1,1356,1355,1335,-1,1335,1355,1336,-1,1336,1355,1337,-1,1337,1355,1338,-1,1338,1355,1339,-1,1339,1355,1340,-1, + 1340,1355,1341,-1,1341,1355,1342,-1,1342,1355,1354,-1,1344,1343,1352,-1,1352,1343,1353,-1,1353,1343,1354,-1,1354,1343,1342,-1,1345,1344,1346,-1, + 1346,1344,1348,-1,1348,1344,1349,-1,1349,1344,1350,-1,1350,1344,1351,-1,1351,1344,1352,-1,1047,1046,989,-1,989,1046,990,-1,990,1046,991,-1, + 991,1046,992,-1,992,1046,993,-1,993,1046,1045,-1,1045,1044,993,-1,993,1044,994,-1,994,1044,995,-1,995,1044,996,-1,996,1044,997,-1, + 997,1044,1043,-1,1040,1017,998,-1,1040,998,1041,-1,1041,998,997,-1,1041,997,1042,-1,1042,997,1043,-1,1028,1027,1032,-1,1028,1032,1029,-1, + 1029,1032,1031,-1,1029,1031,1030,-1,1027,1026,1032,-1,1032,1026,1033,-1,1033,1026,1034,-1,1034,1026,1035,-1,1035,1026,1025,-1,1036,1035,1022,-1, + 1022,1035,1023,-1,1023,1035,1024,-1,1024,1035,1025,-1,1038,1037,1018,-1,1018,1037,1019,-1,1019,1037,1020,-1,1020,1037,1021,-1,1021,1037,1022,-1, + 1022,1037,1036,-1,1038,1018,1039,-1,1039,1018,1040,-1,1040,1018,1017,-1,1011,1005,1004,-1,1011,1004,1012,-1,1012,1004,1003,-1,1012,1003,1013,-1, + 1013,1003,1002,-1,1013,1002,1014,-1,1014,1002,1001,-1,1014,1001,1015,-1,1015,1001,1000,-1,1015,1000,1016,-1,1016,1000,999,-1,1016,999,1017,-1, + 1017,999,998,-1,1007,1006,1009,-1,1009,1006,1011,-1,1011,1006,1005,-1,1109,1108,1110,-1,1110,1108,1111,-1,1111,1108,1112,-1,1112,1108,1107,-1, + 1113,1112,1106,-1,1106,1112,1107,-1,1084,1083,1150,-1,1150,1083,1151,-1,1151,1083,1152,-1,1152,1083,1153,-1,1153,1083,1156,-1,1156,1083,1157,-1, + 1157,1083,1158,-1,1156,1155,1153,-1,1153,1155,1154,-1,1085,1084,1150,-1,1085,1150,1086,-1,1086,1150,1149,-1,1086,1149,1130,-1,1130,1149,1131,-1, + 1131,1149,1148,-1,1131,1148,1132,-1,1132,1148,1147,-1,1132,1147,1133,-1,1133,1147,1146,-1,1133,1146,1134,-1,1134,1146,1145,-1,1134,1145,1135,-1, + 1135,1145,1144,-1,1135,1144,1136,-1,1136,1144,1143,-1,1136,1143,1137,-1,1137,1143,1138,-1,1142,1141,1143,-1,1143,1141,1138,-1,1138,1141,1139,-1, + 1139,1141,1140,-1,1130,1129,1087,-1,1087,1129,1088,-1,1088,1129,1089,-1,1089,1129,1090,-1,1090,1129,1128,-1,1187,1186,1159,-1,1159,1186,1160,-1, + 1160,1186,1161,-1,1161,1186,1162,-1,1162,1186,1163,-1,1163,1186,1185,-1,1185,1184,1163,-1,1163,1184,1164,-1,1164,1184,1165,-1,1165,1184,1166,-1, + 1166,1184,1167,-1,1167,1184,1183,-1,1183,1182,1167,-1,1167,1182,1168,-1,1168,1182,1179,-1,1179,1182,1180,-1,1180,1182,1181,-1,1169,1168,1179,-1, + 1169,1179,1170,-1,1170,1179,1178,-1,1170,1178,1171,-1,1171,1178,1177,-1,1171,1177,1172,-1,1172,1177,1173,-1,1173,1177,1174,-1,1174,1177,1175,-1, + 1175,1177,1176,-1,1194,1193,1192,-1,1194,1192,1195,-1,1195,1192,1191,-1,1195,1191,1196,-1,1196,1191,1190,-1,1196,1190,1197,-1,1197,1190,1198,-1, + 1190,1189,1198,-1,1198,1189,1199,-1,1199,1189,1159,-1,1159,1189,1187,-1,1187,1189,1188,-1,1242,1241,1221,-1,1242,1221,1200,-1,1200,1221,1207,-1, + 1200,1207,1201,-1,1201,1207,1206,-1,1201,1206,1205,-1,1203,1202,1204,-1,1204,1202,1205,-1,1205,1202,1201,-1,1234,1233,1231,-1,1234,1231,1235,-1, + 1235,1231,1230,-1,1235,1230,1236,-1,1236,1230,1229,-1,1236,1229,1237,-1,1237,1229,1228,-1,1237,1228,1227,-1,1223,1222,1239,-1,1223,1239,1224,-1, + 1224,1239,1238,-1,1224,1238,1225,-1,1225,1238,1237,-1,1225,1237,1226,-1,1226,1237,1227,-1,1222,1221,1239,-1,1239,1221,1240,-1,1240,1221,1241,-1, + 1220,1219,1209,-1,1220,1209,1221,-1,1221,1209,1208,-1,1221,1208,1207,-1,1210,1209,1217,-1,1217,1209,1218,-1,1218,1209,1219,-1,1212,1211,1215,-1, + 1215,1211,1216,-1,1216,1211,1217,-1,1217,1211,1210,-1,1213,1212,1214,-1,1214,1212,1215,-1,1312,1320,1319,-1,1312,1319,1313,-1,1313,1319,1318,-1, + 1313,1318,1314,-1,1314,1318,1317,-1,1314,1317,1315,-1,1315,1317,1316,-1,1419,1418,1414,-1,1419,1414,1420,-1,1420,1414,1412,-1,1420,1412,1421,-1, + 1421,1412,1411,-1,1421,1411,1422,-1,1422,1411,1410,-1,1422,1410,1423,-1,1423,1410,1409,-1,1423,1409,1424,-1,1424,1409,1408,-1,1424,1408,1425,-1, + 1425,1408,1407,-1,1425,1407,1426,-1,1414,1418,1415,-1,1415,1418,1416,-1,1416,1418,1417,-1,1442,1441,1437,-1,1437,1441,1438,-1,1438,1441,1439,-1, + 1439,1441,1375,-1,1436,1435,1444,-1,1436,1444,1437,-1,1437,1444,1443,-1,1437,1443,1442,-1,1445,1444,1433,-1,1433,1444,1434,-1,1434,1444,1435,-1, + 1447,1446,1429,-1,1429,1446,1430,-1,1430,1446,1431,-1,1431,1446,1432,-1,1432,1446,1433,-1,1433,1446,1445,-1,1447,1429,1448,-1,1448,1429,1449,-1, + 1449,1429,1428,-1,1531,1530,1532,-1,1532,1530,1529,-1,1620,1619,1622,-1,1622,1619,1623,-1,1623,1619,1618,-1,1620,1622,1621,-1,1495,1460,1496,-1, + 1412,1414,1413,-1,1258,1260,1259,-1,1231,1233,1232,-1,918,920,919,-1,1120,1122,1121,-1,1130,1087,1086,-1,1007,1009,1008,-1,1009,1011,1010,-1, + 968,1059,1058,-1,1346,1348,1347,-1,1321,1323,1322,-1,140,142,141,-1,372,385,373,-1,375,377,376,-1,336,338,337,-1,502,495,503,-1, + 499,501,500,-1,952,954,953,-1,891,832,892,-1,887,889,888,-1,1380,1382,1381,-1,799,801,800,-1,781,783,782,-1,710,712,711,-1, + 681,683,682,-1,668,638,669,-1,638,653,639,-1,626,572,627,-1,634,591,635,-1,572,587,573,-1,619,621,620,-1,625,630,629,-1, + 570,556,571,-1,1260,1262,1261,-1,1298,1310,1299,-1,554,544,555,-1,459,461,460,-1,449,451,450,-1,403,405,404,-1,239,238,237,-1, + 268,270,269,-1,172,174,173,-1,129,131,130,-1,119,121,120,-1,1475,1477,1476,-1,1532,1534,1533,-1,1464,1466,1465,-1,1594,1596,1595,-1, + 1604,1561,1560,-1,46,45,44,-1,1081,1060,1082,-1,1060,1062,1061,-1,1640,1633,1632,-1] normalPerVertex TRUE normal DEF NORM_188 Normal { vector [ 0 0 -1,0 0 -1, @@ -54490,7 +54522,33 @@ DEF SHAPE_188 Shape { 0 0 -1,0 0 -1, 0 0 -1,0 0 -1, 0 0 -1,0 0 -1, - 0 0 -1,0 0 -1] } + 0 0 -1,0 0 -1, + 0 0 -1,0 0 -1, + 0 0 -1,0 0 -1, + 0 0 -1,0 0 -1, + 0 0 -1,0 0 -1, + 0 0 -1,0 0 -1, + 0 0 -1,0 0 -1, + 0 0 -1,0 0 -1, + 0 0 -1,0 0 -1, + 0 0 -1,0 0 -1, + 0 0 -1,0 0 -1, + 0 0 -1,0 0 -1, + 0 0 -1,0 0 -1, + 0 0 -1,0 0 -1, + 0 0 -1,0 0 -1, + 0 0 -1,0 0 -1, + 0 0 -1,0 0 -1, + 0 0 -1,0 0 -1, + 0 0 -1,0 0 -1, + 0 0 -1,0 0 -1, + 0 0 -1,0 0 -1, + 0 0 -1,0 0 -1, + 0 0 -1,0 0 -1, + 0 0 -1,0 0 -1, + 0 0 -1,0 0 -1, + 0 0 -1,0 0 -1, + 0 0 -1] } } } ] } diff --git a/kicad/modules/hellen1-wbo/hellen1-wbo.kicad_pcb b/kicad/modules/hellen1-wbo/hellen1-wbo.kicad_pcb index 65b073c..babe8ae 100644 --- a/kicad/modules/hellen1-wbo/hellen1-wbo.kicad_pcb +++ b/kicad/modules/hellen1-wbo/hellen1-wbo.kicad_pcb @@ -1296,7 +1296,7 @@ (effects (font (size 1 1) (thickness 0.15))) (tstamp 0969bcc9-45dc-4e6f-8dca-3ea7baa4a089) ) - (fp_text value "Module-wbo-0.4" (at 9.02 -16 unlocked) (layer "F.Fab") hide + (fp_text value "Module-wbo-0.5" (at 9.02 -16 unlocked) (layer "F.Fab") hide (effects (font (size 1 1) (thickness 0.15))) (tstamp 19113a45-dabf-4386-9492-86a09771fd70) ) @@ -1393,9 +1393,9 @@ (pad "W2" thru_hole circle (at 0.5588 -10.3 90) (size 0.7 0.7) (drill 0.3) (layers *.Cu) (net 7 "+3V3") (pinfunction "CAN_VIO") (pintype "passive") (zone_connect 2) (tstamp 8a7d9268-6d5f-423c-a157-f217117fb5c6)) (pad "W3" thru_hole circle (at 0.5588 -7.004 90) (size 0.7 0.7) (drill 0.3) (layers *.Cu) - (net 55 "/CANH") (pinfunction "CANH") (pintype "passive") (zone_connect 2) (tstamp 378b7f94-ab76-4960-8288-bd1c312ec67f)) + (net 54 "/CANL") (pinfunction "CANL") (pintype "passive") (zone_connect 2) (tstamp 378b7f94-ab76-4960-8288-bd1c312ec67f)) (pad "W4" thru_hole circle (at 0.5588 -8.02 90) (size 0.7 0.7) (drill 0.3) (layers *.Cu) - (net 54 "/CANL") (pinfunction "CANL") (pintype "passive") (zone_connect 2) (tstamp 77c27566-5dd7-4a3d-969f-8855d01f52c7)) + (net 55 "/CANH") (pinfunction "CANH") (pintype "passive") (zone_connect 2) (tstamp 77c27566-5dd7-4a3d-969f-8855d01f52c7)) (pad "W5" smd roundrect (at 0.3 -5) (size 0.5 0.25) (layers "F.Cu") (roundrect_rratio 0.5) (net 8 "/nRESET") (pinfunction "nReset") (pintype "passive") (zone_connect 2) (tstamp 98ad3ee6-398f-471e-97cc-d4c727a5c087)) (pad "W6" smd roundrect (at 0.3 -4.5) (size 0.5 0.25) (layers "F.Cu") (roundrect_rratio 0.5) @@ -2986,9 +2986,9 @@ (fp_line (start -0.525 0.27) (end 0.525 0.27) (layer "B.Fab") (width 0.1) (tstamp a497c819-bb62-4603-8931-d9ec00a7cc62)) (fp_line (start 0.525 0.27) (end 0.525 -0.27) (layer "B.Fab") (width 0.1) (tstamp ff2dc5d1-250e-47ae-86a5-fa1ebd4d864b)) (pad "1" smd roundrect (at -0.51 0 90) (size 0.54 0.64) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25) - (net 55 "/CANH") (pintype "passive") (tstamp 732a37c5-ed27-40be-b3dc-ccc65532cd52)) + (net 54 "/CANL") (pintype "passive") (tstamp 732a37c5-ed27-40be-b3dc-ccc65532cd52)) (pad "2" smd roundrect (at 0.51 0 90) (size 0.54 0.64) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25) - (net 54 "/CANL") (pintype "passive") (tstamp 623eee25-592e-499b-85b5-56e17ecb0155)) + (net 55 "/CANH") (pintype "passive") (tstamp 623eee25-592e-499b-85b5-56e17ecb0155)) (model "${KICAD6_3DMODEL_DIR}/Resistor_SMD.3dshapes/R_0402_1005Metric.wrl" (offset (xyz 0 0 0)) (scale (xyz 1 1 1)) @@ -3032,9 +3032,9 @@ (fp_line (start -0.325 1.45) (end 0.65 1.45) (layer "B.Fab") (width 0.1) (tstamp 81634d17-e4c3-4096-8bf3-e90ac689f325)) (fp_line (start 0.65 -1.45) (end -0.65 -1.45) (layer "B.Fab") (width 0.1) (tstamp e8b0f9d2-f302-4431-bb14-221703920e94)) (pad "1" smd roundrect (at -0.9375 0.95) (size 1.475 0.6) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25) - (net 54 "/CANL") (pinfunction "G") (pintype "input") (tstamp 9332d8cb-357c-46ba-899a-f5601165559d)) + (net 55 "/CANH") (pinfunction "G") (pintype "input") (tstamp 9332d8cb-357c-46ba-899a-f5601165559d)) (pad "2" smd roundrect (at -0.9375 -0.95) (size 1.475 0.6) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25) - (net 55 "/CANH") (pinfunction "D") (pintype "input") (tstamp 9b4382f2-7936-4ce2-853f-65b68e2dc0e7)) + (net 54 "/CANL") (pinfunction "D") (pintype "input") (tstamp 9b4382f2-7936-4ce2-853f-65b68e2dc0e7)) (pad "3" smd roundrect (at 0.9375 0) (size 1.475 0.6) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25) (net 1 "GND") (pinfunction "S") (pintype "power_in") (tstamp 2cf3947b-b437-4b77-afda-d1d6dae22d3e)) (model "${KICAD6_3DMODEL_DIR}/Package_TO_SOT_SMD.3dshapes/SOT-23.wrl" @@ -3133,9 +3133,9 @@ (pad "5" smd roundrect (at 2.575 -1.905 180) (size 1.75 0.6) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25) (net 7 "+3V3") (pinfunction "VIO") (pintype "power_in") (tstamp 683aff6b-c030-42d2-a4c6-e55dc34b20ae)) (pad "6" smd roundrect (at 2.575 -0.635 180) (size 1.75 0.6) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25) - (net 55 "/CANH") (pinfunction "CANL") (pintype "output") (tstamp a934a71e-7034-49e3-89f6-a3bf14f345ab)) + (net 54 "/CANL") (pinfunction "CANL") (pintype "output") (tstamp a934a71e-7034-49e3-89f6-a3bf14f345ab)) (pad "7" smd roundrect (at 2.575 0.635 180) (size 1.75 0.6) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25) - (net 54 "/CANL") (pinfunction "CANH") (pintype "output") (tstamp b4fdee7e-39b3-4ed1-9ff6-9c716d70248f)) + (net 55 "/CANH") (pinfunction "CANH") (pintype "output") (tstamp b4fdee7e-39b3-4ed1-9ff6-9c716d70248f)) (pad "8" smd roundrect (at 2.575 1.905 180) (size 1.75 0.6) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25) (net 1 "GND") (pinfunction "S") (pintype "input") (tstamp 8d14cf73-23ac-4cb6-a727-16e769c796fd)) (model "${KICAD6_3DMODEL_DIR}/Package_SO.3dshapes/SO-8_3.9x4.9mm_P1.27mm.wrl" @@ -3153,7 +3153,7 @@ (gr_text "without\nRF3033" (at 92.32 82.78) (layer "B.SilkS") (tstamp 95474f2c-a5ae-4d9b-a5de-2cbed89c7663) (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) ) - (gr_text "WBO 0.4" (at 100 86.15) (layer "B.SilkS") (tstamp cce62c68-35f9-4600-8f5e-04506f2cff46) + (gr_text "WBO 0.5" (at 100 86.15) (layer "B.SilkS") (tstamp cce62c68-35f9-4600-8f5e-04506f2cff46) (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) ) @@ -3669,26 +3669,26 @@ (segment (start 96.41 83.36) (end 98.9 85.85) (width 2) (layer "B.Cu") (net 42) (tstamp 5f261d5c-1542-4b92-8709-28ffa71d3120)) (segment (start 98.9 85.85) (end 103.25 85.85) (width 2) (layer "B.Cu") (net 42) (tstamp bb25a18b-7c56-48ea-aa04-d4aca596afa7)) (segment (start 96.41 82.425) (end 96.41 83.36) (width 2) (layer "B.Cu") (net 42) (tstamp de9dbfa6-fd79-4d35-a382-c905a0dc499c)) - (via (at 78.99177 93.865825) (size 0.6) (drill 0.3) (layers "F.Cu" "B.Cu") (net 54) (tstamp 17c4bf95-6f5d-4f24-b2f7-c340f979172e)) - (segment (start 79.7 92.75) (end 79.7 92.025) (width 0.25) (layer "In2.Cu") (net 54) (tstamp 0468401b-17b2-4f56-883a-f6ca3e3ace6f)) - (segment (start 78.99177 93.45823) (end 79.7 92.75) (width 0.25) (layer "In2.Cu") (net 54) (tstamp 21e278ba-f8a6-46f9-a181-fa770cddbaa4)) - (segment (start 79.05 87.8212) (end 78.2588 87.03) (width 0.25) (layer "In2.Cu") (net 54) (tstamp 22b8748c-d20f-4bf3-9e44-9c720d613234)) - (segment (start 78.99177 93.865825) (end 78.99177 93.45823) (width 0.25) (layer "In2.Cu") (net 54) (tstamp 9f1d8cb2-3320-4e56-be28-bca7e809de8d)) - (segment (start 78.544189 89.455811) (end 79.05 88.95) (width 0.25) (layer "In2.Cu") (net 54) (tstamp b34a9c40-ab5b-49a4-97f9-014e0deecfdd)) - (segment (start 79.7 92.025) (end 78.544189 90.869189) (width 0.25) (layer "In2.Cu") (net 54) (tstamp d70d1d31-544b-4c48-b135-83de7eaeec18)) - (segment (start 78.544189 90.869189) (end 78.544189 89.455811) (width 0.25) (layer "In2.Cu") (net 54) (tstamp e763c90e-e0fd-44b2-b7cb-edb5e8080522)) - (segment (start 79.05 88.95) (end 79.05 87.8212) (width 0.25) (layer "In2.Cu") (net 54) (tstamp ee0da0b9-e944-4b2c-806d-9febc8409fdf)) - (segment (start 80.787953 87.090372) (end 80.925 86.953325) (width 0.25) (layer "B.Cu") (net 54) (tstamp 0c59fafe-5f8f-40b7-a96a-f181def18825)) - (segment (start 79.319422 87.026348) (end 80.807375 87.026348) (width 0.25) (layer "B.Cu") (net 54) (tstamp 64e15bb0-7f13-4ca7-bf8b-293800eda58e)) - (segment (start 79.350945 94.225) (end 78.99177 93.865825) (width 0.25) (layer "B.Cu") (net 54) (tstamp 89e396ca-900e-4f74-a4b8-972ec43e348f)) - (segment (start 80.3875 94.225) (end 79.350945 94.225) (width 0.25) (layer "B.Cu") (net 54) (tstamp 9fa7fc54-98be-4385-a972-4d889fc867ed)) - (segment (start 79.319422 87.026348) (end 78.338222 87.026348) (width 0.25) (layer "B.Cu") (net 54) (tstamp cc6b33cd-96a7-4a78-8fab-a68e118c6383)) - (segment (start 80.862047 88.160372) (end 80.925 88.223325) (width 0.25) (layer "B.Cu") (net 55) (tstamp 24870bdb-c2ee-4a8c-acc4-02ef70394ac0)) - (segment (start 79.319422 88.046348) (end 78.342222 88.046348) (width 0.25) (layer "B.Cu") (net 55) (tstamp 3da9e0dd-4ccf-4dc0-b600-43225af1ff0b)) - (segment (start 79.31 88.985) (end 79.75 89.425) (width 0.25) (layer "B.Cu") (net 55) (tstamp 3e56dc15-63e2-4ebf-aa7a-a8229a15cc2a)) - (segment (start 79.75 89.425) (end 79.75 92.375) (width 0.25) (layer "B.Cu") (net 55) (tstamp 488c28bd-7815-4593-ab7a-6968b85ea79d)) - (segment (start 79.31 88.046348) (end 79.31 88.985) (width 0.25) (layer "B.Cu") (net 55) (tstamp 771107f2-72b9-42e4-8280-fbdf911e9f9e)) - (segment (start 79.319422 88.096348) (end 80.881469 88.096348) (width 0.25) (layer "B.Cu") (net 55) (tstamp 96f9f9dd-87e9-4fa1-884c-ce21aa53d1ac)) + (segment (start 80.862047 88.160372) (end 80.925 88.223325) (width 0.25) (layer "B.Cu") (net 54) (tstamp 24870bdb-c2ee-4a8c-acc4-02ef70394ac0)) + (segment (start 79.319422 88.046348) (end 78.342222 88.046348) (width 0.25) (layer "B.Cu") (net 54) (tstamp 3da9e0dd-4ccf-4dc0-b600-43225af1ff0b)) + (segment (start 79.31 88.985) (end 79.75 89.425) (width 0.25) (layer "B.Cu") (net 54) (tstamp 3e56dc15-63e2-4ebf-aa7a-a8229a15cc2a)) + (segment (start 79.75 89.425) (end 79.75 92.375) (width 0.25) (layer "B.Cu") (net 54) (tstamp 488c28bd-7815-4593-ab7a-6968b85ea79d)) + (segment (start 79.31 88.046348) (end 79.31 88.985) (width 0.25) (layer "B.Cu") (net 54) (tstamp 771107f2-72b9-42e4-8280-fbdf911e9f9e)) + (segment (start 79.319422 88.096348) (end 80.881469 88.096348) (width 0.25) (layer "B.Cu") (net 54) (tstamp 96f9f9dd-87e9-4fa1-884c-ce21aa53d1ac)) + (via (at 78.99177 93.865825) (size 0.6) (drill 0.3) (layers "F.Cu" "B.Cu") (net 55) (tstamp 17c4bf95-6f5d-4f24-b2f7-c340f979172e)) + (segment (start 79.7 92.75) (end 79.7 92.025) (width 0.25) (layer "In2.Cu") (net 55) (tstamp 0468401b-17b2-4f56-883a-f6ca3e3ace6f)) + (segment (start 78.99177 93.45823) (end 79.7 92.75) (width 0.25) (layer "In2.Cu") (net 55) (tstamp 21e278ba-f8a6-46f9-a181-fa770cddbaa4)) + (segment (start 79.05 87.8212) (end 78.2588 87.03) (width 0.25) (layer "In2.Cu") (net 55) (tstamp 22b8748c-d20f-4bf3-9e44-9c720d613234)) + (segment (start 78.99177 93.865825) (end 78.99177 93.45823) (width 0.25) (layer "In2.Cu") (net 55) (tstamp 9f1d8cb2-3320-4e56-be28-bca7e809de8d)) + (segment (start 78.544189 89.455811) (end 79.05 88.95) (width 0.25) (layer "In2.Cu") (net 55) (tstamp b34a9c40-ab5b-49a4-97f9-014e0deecfdd)) + (segment (start 79.7 92.025) (end 78.544189 90.869189) (width 0.25) (layer "In2.Cu") (net 55) (tstamp d70d1d31-544b-4c48-b135-83de7eaeec18)) + (segment (start 78.544189 90.869189) (end 78.544189 89.455811) (width 0.25) (layer "In2.Cu") (net 55) (tstamp e763c90e-e0fd-44b2-b7cb-edb5e8080522)) + (segment (start 79.05 88.95) (end 79.05 87.8212) (width 0.25) (layer "In2.Cu") (net 55) (tstamp ee0da0b9-e944-4b2c-806d-9febc8409fdf)) + (segment (start 80.787953 87.090372) (end 80.925 86.953325) (width 0.25) (layer "B.Cu") (net 55) (tstamp 0c59fafe-5f8f-40b7-a96a-f181def18825)) + (segment (start 79.319422 87.026348) (end 80.807375 87.026348) (width 0.25) (layer "B.Cu") (net 55) (tstamp 64e15bb0-7f13-4ca7-bf8b-293800eda58e)) + (segment (start 79.350945 94.225) (end 78.99177 93.865825) (width 0.25) (layer "B.Cu") (net 55) (tstamp 89e396ca-900e-4f74-a4b8-972ec43e348f)) + (segment (start 80.3875 94.225) (end 79.350945 94.225) (width 0.25) (layer "B.Cu") (net 55) (tstamp 9fa7fc54-98be-4385-a972-4d889fc867ed)) + (segment (start 79.319422 87.026348) (end 78.338222 87.026348) (width 0.25) (layer "B.Cu") (net 55) (tstamp cc6b33cd-96a7-4a78-8fab-a68e118c6383)) (via (at 94.187886 83.528805) (size 0.6) (drill 0.3) (layers "F.Cu" "B.Cu") (free) (net 56) (tstamp 0565c309-27d6-417f-95be-9affbcffc6c0)) (segment (start 78.79 82.23) (end 78.2901 82.7299) (width 0.25) (layer "In2.Cu") (net 56) (tstamp 1ebb28a2-ddb5-4d72-8555-8ad7e43b7fa2)) (segment (start 80.91 82.26) (end 80.1901 81.5401) (width 0.25) (layer "In2.Cu") (net 56) (tstamp 32e1a57f-8435-4b51-a661-5a6d43e3d29c)) diff --git a/kicad/modules/hellen1-wbo/hellen1-wbo.kicad_prl b/kicad/modules/hellen1-wbo/hellen1-wbo.kicad_prl index a0c5936..342902a 100644 --- a/kicad/modules/hellen1-wbo/hellen1-wbo.kicad_prl +++ b/kicad/modules/hellen1-wbo/hellen1-wbo.kicad_prl @@ -1,6 +1,6 @@ { "board": { - "active_layer": 31, + "active_layer": 36, "active_layer_preset": "", "auto_track_width": false, "hidden_nets": [], diff --git a/kicad/modules/hellen1-wbo/hellen1-wbo.kicad_pro b/kicad/modules/hellen1-wbo/hellen1-wbo.kicad_pro index 8e4f94a..189d98e 100644 --- a/kicad/modules/hellen1-wbo/hellen1-wbo.kicad_pro +++ b/kicad/modules/hellen1-wbo/hellen1-wbo.kicad_pro @@ -391,7 +391,7 @@ "netlist": "", "specctra_dsn": "", "step": "", - "vrml": "../../../modules/wbo/0.4/wbo-vrml.wrl" + "vrml": "../../../modules/wbo/0.5/wbo-vrml.wrl" }, "page_layout_descr_file": "" }, diff --git a/kicad/modules/hellen1-wbo/hellen1-wbo.kicad_sch b/kicad/modules/hellen1-wbo/hellen1-wbo.kicad_sch index 0954037..9c61fe4 100644 --- a/kicad/modules/hellen1-wbo/hellen1-wbo.kicad_sch +++ b/kicad/modules/hellen1-wbo/hellen1-wbo.kicad_sch @@ -7,7 +7,7 @@ (title_block (title "WBO") (date "2021-09-28") - (rev "0.3") + (rev "0.5") (company "rusefi.com") ) @@ -303,20 +303,31 @@ ) ) ) - (symbol "hellen-one-wbo-0.4:Module-wbo-0.4" (in_bom yes) (on_board yes) + (symbol "hellen-one-wbo-0.5:Module-wbo-0.5" (in_bom yes) (on_board yes) (property "Reference" "M" (id 0) (at 1.27 1.27 0) (effects (font (size 1.27 1.27))) ) - (property "Value" "Module-wbo-0.4" (id 1) (at 8.89 -40.64 0) + (property "Value" "Module-wbo-0.5" (id 1) (at 8.89 -40.64 0) (effects (font (size 1.27 1.27))) ) - (property "Footprint" "hellen-one-wbo-0.4:wbo" (id 2) (at 25.4 1.27 0) + (property "Footprint" "hellen-one-wbo-0.5:wbo" (id 2) (at 25.4 1.27 0) (effects (font (size 1.27 1.27)) hide) ) (property "Datasheet" "" (id 3) (at 0 0 0) (effects (font (size 1.27 1.27)) hide) ) - (symbol "Module-wbo-0.4_1_0" + (symbol "Module-wbo-0.5_0_0" + (text "Analog/digital" (at 20.32 -20.32 0) + (effects (font (size 1.27 1.27))) + ) + (text "Heater negative" (at 16.51 -7.62 0) + (effects (font (size 1.27 1.27))) + ) + (text "Power GND" (at 19.05 -5.08 0) + (effects (font (size 1.27 1.27))) + ) + ) + (symbol "Module-wbo-0.5_1_0" (rectangle (start 0 0) (end 33.02 -39.37) (stroke (width 0) (type default) (color 0 0 0 0)) (fill (type background)) @@ -382,11 +393,11 @@ (number "W2" (effects (font (size 1.27 1.27)))) ) (pin passive line (at -7.62 -5.08 0) (length 7.62) - (name "CANH" (effects (font (size 1.27 1.27)))) + (name "CANL" (effects (font (size 1.27 1.27)))) (number "W3" (effects (font (size 1.27 1.27)))) ) (pin passive line (at -7.62 -7.62 0) (length 7.62) - (name "CANL" (effects (font (size 1.27 1.27)))) + (name "CANH" (effects (font (size 1.27 1.27)))) (number "W4" (effects (font (size 1.27 1.27)))) ) (pin passive line (at -7.62 -20.32 0) (length 7.62) @@ -2412,7 +2423,7 @@ (effects (font (size 1.27 1.27)) (justify left bottom)) (uuid 1693e077-75f1-4046-9350-73926740d3cf) ) - (label "CANH" (at 72.39 114.3 180) + (label "CANH" (at 72.39 111.76 180) (effects (font (size 1.27 1.27)) (justify right bottom)) (uuid 19ab5e00-917f-429c-a94f-11ccdb3ee337) ) @@ -2496,7 +2507,7 @@ (effects (font (size 1.27 1.27)) (justify right bottom)) (uuid 69808edd-a727-4b73-bbe4-a119980770e2) ) - (label "CANH" (at 28.575 96.52 0) + (label "CANH" (at 27.94 93.98 0) (effects (font (size 1.27 1.27)) (justify left bottom)) (uuid 6f0437bc-56a9-483e-9bfc-97807d453e62) ) @@ -2512,7 +2523,7 @@ (effects (font (size 1.27 1.27)) (justify left bottom)) (uuid 86c5bbff-cadc-4c84-9070-52c8256100ac) ) - (label "CANL" (at 28.575 93.98 0) + (label "CANL" (at 27.94 96.52 0) (effects (font (size 1.27 1.27)) (justify left bottom)) (uuid 89c7468a-fca5-43a0-a8bd-743d306959d5) ) @@ -2568,11 +2579,11 @@ (effects (font (size 1.27 1.27)) (justify right bottom)) (uuid b88ee2bf-fd4d-4b19-8615-b6bd28c1011b) ) - (label "CANH" (at 156.21 127 180) + (label "CANH" (at 156.21 129.54 180) (effects (font (size 1.27 1.27)) (justify right bottom)) (uuid c08a0822-171a-4fb5-83c2-ccd49f032a78) ) - (label "CANL" (at 72.39 111.76 180) + (label "CANL" (at 72.39 114.3 180) (effects (font (size 1.27 1.27)) (justify right bottom)) (uuid c7a41a53-9f27-4254-a572-d67abb20f095) ) @@ -2580,7 +2591,7 @@ (effects (font (size 1.27 1.27)) (justify left bottom)) (uuid c8f165a0-85be-4240-95fd-fda71f376d7b) ) - (label "CANL" (at 156.21 129.54 180) + (label "CANL" (at 156.21 127 180) (effects (font (size 1.27 1.27)) (justify right bottom)) (uuid ca78e621-868d-4caf-8dd0-e88be1d64617) ) @@ -5020,11 +5031,11 @@ (pin "1" (uuid 64b276b6-106a-485d-84a0-5bdf806763b3)) ) - (symbol (lib_id "hellen-one-wbo-0.4:Module-wbo-0.4") (at 168.91 121.92 0) (unit 1) - (in_bom yes) (on_board yes) (fields_autoplaced) + (symbol (lib_id "hellen-one-wbo-0.5:Module-wbo-0.5") (at 168.91 121.92 0) (unit 1) + (in_bom yes) (on_board yes) (uuid b31bd6a2-d597-4ef3-ad7d-f0d5e79bcc1c) (property "Reference" "M600" (id 0) (at 185.42 118.0804 0)) - (property "Value" "Module-wbo-0.4" (id 1) (at 185.42 120.8555 0)) + (property "Value" "Module-wbo-0.5" (id 1) (at 186.055 120.015 0)) (property "Footprint" "hellen-one-wbo-0.4:wbo" (id 2) (at 194.31 120.65 0) (effects (font (size 1.27 1.27)) hide) ) @@ -5077,7 +5088,7 @@ (property "Reference" "R629" (id 0) (at 71.12 118.11 0) (effects (font (size 1.27 1.27)) (justify left)) ) - (property "Value" "120" (id 1) (at 71.12 120.65 0) + (property "Value" "DNP" (id 1) (at 71.12 120.65 0) (effects (font (size 1.27 1.27)) (justify left)) ) (property "Footprint" "Resistor_SMD:R_0402_1005Metric" (id 2) (at 66.802 119.38 90) @@ -5086,7 +5097,7 @@ (property "Datasheet" "~" (id 3) (at 68.58 119.38 0) (effects (font (size 1.27 1.27)) hide) ) - (property "LCSC" "C25079" (id 4) (at 68.58 119.38 0) + (property "LCSC" "" (id 4) (at 68.58 119.38 0) (effects (font (size 1.27 1.27)) hide) ) (pin "1" (uuid 74d1ad36-8d4d-4e75-ab6d-7f940801ca22)) @@ -5477,7 +5488,7 @@ (reference "J600") (unit 1) (value "Conn_02x03_Odd_Even") (footprint "Connector:Tag-Connect_TC2030-IDC-NL_2x03_P1.27mm_Vertical") ) (path "/b31bd6a2-d597-4ef3-ad7d-f0d5e79bcc1c" - (reference "M600") (unit 1) (value "Module-wbo-0.4") (footprint "hellen-one-wbo-0.4:wbo") + (reference "M600") (unit 1) (value "Module-wbo-0.5") (footprint "hellen-one-wbo-0.4:wbo") ) (path "/00000000-0000-0000-0000-0000600e1a2d" (reference "Q600") (unit 1) (value "BTS3028") (footprint "Package_TO_SOT_SMD:TO-252-2") @@ -5573,7 +5584,7 @@ (reference "R628") (unit 1) (value "1k") (footprint "Resistor_SMD:R_0402_1005Metric") ) (path "/b9ed5c9f-08c2-46c3-9f49-260a5ce30362" - (reference "R629") (unit 1) (value "120") (footprint "Resistor_SMD:R_0402_1005Metric") + (reference "R629") (unit 1) (value "DNP") (footprint "Resistor_SMD:R_0402_1005Metric") ) (path "/8719995c-7a59-4520-a953-b0d876dea9a1" (reference "R630") (unit 1) (value "DNP") (footprint "Resistor_SMD:R_0402_1005Metric") diff --git a/kicad/modules/hellen1-wbo/sym-lib-table b/kicad/modules/hellen1-wbo/sym-lib-table index 45879c2..dad1141 100644 --- a/kicad/modules/hellen1-wbo/sym-lib-table +++ b/kicad/modules/hellen1-wbo/sym-lib-table @@ -1,6 +1,5 @@ (sym_lib_table (lib (name "hellen1-wbo-rescue")(type "Legacy")(uri "${KIPRJMOD}/hellen1-wbo-rescue.lib")(options "")(descr "")) - (lib (name "hellen-one-common")(type "KiCad")(uri "${KIPRJMOD}/../../hellen-one-common.kicad_sym")(options "")(descr "")) (lib (name "hellen-one-wbo-0.2")(type "KiCad")(uri "${KIPRJMOD}/../../../modules/wbo/0.2/wbo.kicad_sym")(options "")(descr "")) - (lib (name "hellen-one-wbo-0.4")(type "KiCad")(uri "${KIPRJMOD}/../../../modules/wbo/0.4/wbo.kicad_sym")(options "")(descr "")) + (lib (name "hellen-one-wbo-0.5")(type "KiCad")(uri "${KIPRJMOD}/../../../modules/wbo/0.5/wbo.kicad_sym")(options "")(descr "")) )