diff --git a/.gitignore b/.gitignore index be7e8ae..cfbb5a1 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ /History/ /Project Logs for DisysCNC/ /Project Outputs for DisysCNC/ +/DisysCNC_PCB.html +/DisysCNC_PCB.txt diff --git a/DisysCNC.PrjPcb b/DisysCNC.PrjPcb index 29e8bb0..f29e2ff 100644 --- a/DisysCNC.PrjPcb +++ b/DisysCNC.PrjPcb @@ -1,4 +1,4 @@ -п»ї[Design] +[Design] Version=1.0 HierarchyMode=0 ChannelRoomNamingStyle=0 @@ -241,8 +241,77 @@ DItemRevisionGUID= GenerateClassCluster=0 DocumentUniqueId= +[Document13] +DocumentPath=README.md +AnnotationEnabled=1 +AnnotateStartValue=1 +AnnotationIndexControlEnabled=0 +AnnotateSuffix= +AnnotateScope=All +AnnotateOrder=-1 +DoLibraryUpdate=1 +DoDatabaseUpdate=1 +ClassGenCCAutoEnabled=1 +ClassGenCCAutoRoomEnabled=1 +ClassGenNCAutoScope=None +DItemRevisionGUID= +GenerateClassCluster=0 +DocumentUniqueId= + [GeneratedDocument1] -DocumentPath=Project Outputs for DisysCNC\Design Rule Check - DisysCNC_PCB.html +DocumentPath=Project Outputs for DisysCNC\BOM\Bill of Materials-DisysCNC.xlsx +DItemRevisionGUID= + +[GeneratedDocument2] +DocumentPath=Project Outputs for DisysCNC\NC Drill\DisysCNC_PCB.DRR +DItemRevisionGUID= + +[GeneratedDocument3] +DocumentPath=Project Outputs for DisysCNC\Gerber\DisysCNC_PCB.EXTREP +DItemRevisionGUID= + +[GeneratedDocument4] +DocumentPath=Project Outputs for DisysCNC\Gerber\DisysCNC_PCB.GBL +DItemRevisionGUID= + +[GeneratedDocument5] +DocumentPath=Project Outputs for DisysCNC\Gerber\DisysCNC_PCB.GBO +DItemRevisionGUID= + +[GeneratedDocument6] +DocumentPath=Project Outputs for DisysCNC\Gerber\DisysCNC_PCB.GBS +DItemRevisionGUID= + +[GeneratedDocument7] +DocumentPath=Project Outputs for DisysCNC\Gerber\DisysCNC_PCB.GKO +DItemRevisionGUID= + +[GeneratedDocument8] +DocumentPath=Project Outputs for DisysCNC\Gerber\DisysCNC_PCB.GTL +DItemRevisionGUID= + +[GeneratedDocument9] +DocumentPath=Project Outputs for DisysCNC\Gerber\DisysCNC_PCB.GTO +DItemRevisionGUID= + +[GeneratedDocument10] +DocumentPath=Project Outputs for DisysCNC\Gerber\DisysCNC_PCB.GTS +DItemRevisionGUID= + +[GeneratedDocument11] +DocumentPath=Project Outputs for DisysCNC\NC Drill\DisysCNC_PCB.LDP +DItemRevisionGUID= + +[GeneratedDocument12] +DocumentPath=Project Outputs for DisysCNC\Gerber\DisysCNC_PCB.REP +DItemRevisionGUID= + +[GeneratedDocument13] +DocumentPath=Project Outputs for DisysCNC\Gerber\DisysCNC_PCB.RUL +DItemRevisionGUID= + +[GeneratedDocument14] +DocumentPath=Project Outputs for DisysCNC\NC Drill\DisysCNC_PCB.TXT DItemRevisionGUID= [Configuration1] @@ -258,7 +327,7 @@ ConfigurationType=Source [OutputGroup1] Name=Netlist Outputs Description= -TargetPrinter=HP LaserJet CP 1025 +TargetPrinter=PDFCreator PrinterOptions=Record=PrinterOptions|Copies=1|Duplex=1|TrueTypeOptions=3|Collate=1|PrintJobKind=1|PrintWhat=1 OutputType1=CadnetixNetlist OutputName1=Cadnetix Netlist @@ -360,12 +429,42 @@ OutputName20=WireList Netlist OutputDocumentPath20= OutputVariantName20= OutputDefault20=0 +OutputType21=SIMetrixNetlist +OutputName21=SIMetrix +OutputDocumentPath21= +OutputVariantName21= +OutputDefault21=0 +OutputType22=SIMPLISNetlist +OutputName22=SIMPLIS +OutputDocumentPath22= +OutputVariantName22= +OutputDefault22=0 +OutputType23=XSpiceNetlist +OutputName23=XSpice Netlist +OutputDocumentPath23= +OutputVariantName23= +OutputDefault23=0 [OutputGroup2] Name=Simulator Outputs Description= -TargetPrinter=HP LaserJet CP 1025 +TargetPrinter=PDFCreator PrinterOptions=Record=PrinterOptions|Copies=1|Duplex=1|TrueTypeOptions=3|Collate=1|PrintJobKind=1|PrintWhat=1 +OutputType1=AdvSimNetlist +OutputName1=Mixed Sim +OutputDocumentPath1= +OutputVariantName1= +OutputDefault1=0 +OutputType2=SIMetrixSimulation +OutputName2=SIMetrix +OutputDocumentPath2= +OutputVariantName2= +OutputDefault2=0 +OutputType3=SIMPLISSimulation +OutputName3=SIMPLIS +OutputDocumentPath3= +OutputVariantName3= +OutputDefault3=0 [OutputGroup3] Name=Documentation Outputs @@ -444,7 +543,7 @@ PageOptions11=Record=PageOptions|CenterHorizontal=True|CenterVertical=True|Print [OutputGroup4] Name=Assembly Outputs Description= -TargetPrinter=HP LaserJet CP 1025 +TargetPrinter=PDFCreator PrinterOptions=Record=PrinterOptions|Copies=1|Duplex=1|TrueTypeOptions=3|Collate=1|PrintJobKind=1|PrintWhat=1 OutputType1=Assembly OutputName1=Assembly Drawings @@ -466,7 +565,7 @@ OutputDefault3=0 [OutputGroup5] Name=Fabrication Outputs Description= -TargetPrinter=HP LaserJet CP 1025 +TargetPrinter=PDFCreator PrinterOptions=Record=PrinterOptions|Copies=1|Duplex=1|TrueTypeOptions=3|Collate=1|PrintJobKind=1|PrintWhat=1 OutputType1=Board Stack Report OutputName1=Report Board Stack @@ -538,7 +637,7 @@ OutputDefault12=0 [OutputGroup6] Name=Report Outputs Description= -TargetPrinter=HP LaserJet CP 1025 +TargetPrinter=PDFCreator PrinterOptions=Record=PrinterOptions|Copies=1|Duplex=1|TrueTypeOptions=3|Collate=1|PrintJobKind=1|PrintWhat=1 OutputType1=BOM_PartType OutputName1=Bill of Materials @@ -575,7 +674,7 @@ OutputDefault6=0 [OutputGroup7] Name=Other Outputs Description= -TargetPrinter=HP LaserJet CP 1025 +TargetPrinter=PDFCreator PrinterOptions=Record=PrinterOptions|Copies=1|Duplex=1|TrueTypeOptions=3|Collate=1|PrintJobKind=1|PrintWhat=1 OutputType1=Text Print OutputName1=Text Print @@ -755,7 +854,7 @@ PageOptions29=Record=PageOptions|CenterHorizontal=True|CenterVertical=True|Print [OutputGroup8] Name=Validation Outputs Description= -TargetPrinter=HP LaserJet CP 1025 +TargetPrinter=PDFCreator PrinterOptions=Record=PrinterOptions|Copies=1|Duplex=1|TrueTypeOptions=3|Collate=1|PrintJobKind=1|PrintWhat=1 OutputType1=BOM_Violations OutputName1=BOM Checks Report @@ -799,7 +898,7 @@ OutputDefault7=0 [OutputGroup9] Name=Export Outputs Description= -TargetPrinter=HP LaserJet CP 1025 +TargetPrinter=PDFCreator PrinterOptions=Record=PrinterOptions|Copies=1|Duplex=1|TrueTypeOptions=3|Collate=1|PrintJobKind=1|PrintWhat=1 OutputType1=AutoCAD dwg/dxf PCB OutputName1=AutoCAD dwg/dxf File PCB @@ -860,7 +959,7 @@ OutputDefault11=0 [OutputGroup10] Name=PostProcess Outputs Description= -TargetPrinter=HP LaserJet CP 1025 +TargetPrinter=PDFCreator PrinterOptions=Record=PrinterOptions|Copies=1|Duplex=1|TrueTypeOptions=3|Collate=1|PrintJobKind=1|PrintWhat=1 OutputType1=Copy Files OutputName1=Copy Files diff --git a/DisysCNC_PCB.PcbDoc b/DisysCNC_PCB.PcbDoc index 72bdf46..ab5d032 100644 Binary files a/DisysCNC_PCB.PcbDoc and b/DisysCNC_PCB.PcbDoc differ diff --git a/Job1.OutJob b/Job1.OutJob index da8e973..302aad8 100644 --- a/Job1.OutJob +++ b/Job1.OutJob @@ -21,7 +21,7 @@ TargetOutputMedium=Folder Structure VariantName=[No Variations] VariantScope=1 CurrentConfigurationName= -TargetPrinter=HP LaserJet CP 1025 +TargetPrinter=PDFCreator PrinterOptions=Record=PrinterOptions|Copies=1|Duplex=1|TrueTypeOptions=3|Collate=1|PrintJobKind=1|PrintWhat=1 OutputMedium1=Print Job OutputMedium1_Type=Printer @@ -59,17 +59,41 @@ OutputEnabled2_OutputMedium4=0 OutputDefault2=0 Configuration2_Name1=OutputConfigurationParameter1 Configuration2_Item1=BoardEdgeRoutToolDia=2000000|GenerateBoardEdgeRout=False|GenerateDrilledSlotsG85=False|GenerateEIADrillFile=False|GenerateSeparatePlatedNonPlatedFiles=False|NumberOfDecimals=4|NumberOfUnits=4|OptimizeChangeLocationCommands=True|OriginPosition=Relative|Record=DrillView|Units=Metric|ZeroesMode=SuppressTrailingZeroes +OutputType3=BOM_PartType +OutputName3=Bill of Materials +OutputCategory3=Report +OutputDocumentPath3= +OutputVariantName3= +OutputEnabled3=1 +OutputEnabled3_OutputMedium1=0 +OutputEnabled3_OutputMedium2=0 +OutputEnabled3_OutputMedium3=3 +OutputEnabled3_OutputMedium4=0 +OutputDefault3=0 +PageOptions3=Record=PageOptions|CenterHorizontal=True|CenterVertical=True|PrintScale=1.00|XCorrection=1.00|YCorrection=1.00|PrintKind=1|BorderSize=5000000|LeftOffset=0|BottomOffset=0|Orientation=2|PaperLength=1000|PaperWidth=1000|Scale=100|PaperSource=7|PrintQuality=-3|MediaType=1|DitherType=10|PrintScaleMode=1|PaperKind=A4|PaperIndex=9 +Configuration3_Name1=ColumnNameFormat +Configuration3_Item1=CaptionAsName +Configuration3_Name2=General +Configuration3_Item2=OpenExported=False|AddToProject=False|ReportBOMViolationsInMessages=False|ForceFit=False|NotFitted=False|Database=False|DatabasePriority=False|IncludePcbData=False|IncludeVaultData=False|IncludeCloudData=False|IncludeDocumentData=True|IncludeAlternatives=False|ShowExportOptions=True|TemplateFilename=|TemplateVaultGuid=|TemplateRevisionGuid=|BatchMode=5|FormWidth=1200|FormHeight=710|SupplierProdQty=1|SupplierAutoQty=False|SupplierUseCachedPricing=False|SupplierCurrency=USD|SolutionsPerItem=1|SuppliersPerSolution=1|ViewType=1|UseDirectApi=False|BomSetName= +Configuration3_Name3=GroupOrder +Configuration3_Item3=Comment=True|Footprint=True +Configuration3_Name4=SortOrder +Configuration3_Item4=Designator=Up +Configuration3_Name5=VisibleOrder +Configuration3_Item5=Designator=129|Quantity=56|Comment=151|Description=189|Footprint=161|Supplier=100 +Configuration3_Name6=VisibleOrder_Flat +Configuration3_Item6=Designator=129|Quantity=56|Comment=151|Description=189|Footprint=161|Supplier=100 [PublishSettings] OutputFilePath2= ReleaseManaged2=1 -OutputBasePath2= +OutputBasePath2=Project Outputs for DisysCNC OutputPathMedia2= OutputPathMediaValue2= OutputPathOutputer2=[Output Type] OutputPathOutputerPrefix2= OutputPathOutputerValue2= -OutputFileName2= +OutputFileName2=Job1.PDF OutputFileNameMulti2= UseOutputNameForMulti2=1 OutputFileNameSpecial2= @@ -88,9 +112,9 @@ ShowComponentParameters2=1 GlobalBookmarks2=0 PDFACompliance2=Disabled PDFVersion2=Default -OutputFilePath3=Project Outputs for Free Documents\ +OutputFilePath3=C:\Users\iTXS\source\repos\disyscnc_pcb\Project Outputs for DisysCNC\ ReleaseManaged3=1 -OutputBasePath3=Project Outputs for Free Documents +OutputBasePath3=Project Outputs for DisysCNC OutputPathMedia3= OutputPathMediaValue3= OutputPathOutputer3=[Output Type] @@ -103,7 +127,7 @@ OutputFileNameSpecial3= OpenOutput3=1 OutputFilePath4= ReleaseManaged4=1 -OutputBasePath4= +OutputBasePath4=Project Outputs for DisysCNC OutputPathMedia4= OutputPathMediaValue4= OutputPathOutputer4=[Output Type] @@ -142,7 +166,7 @@ WmvQuality4=80 [GeneratedFilesSettings] RelativeOutputPath2= OpenOutputs2=1 -RelativeOutputPath3=Project Outputs for Free Documents\ +RelativeOutputPath3=C:\Users\iTXS\source\repos\disyscnc_pcb\Project Outputs for DisysCNC\ OpenOutputs3=1 AddToProject3=1 TimestampFolder3=0 diff --git a/README.md b/README.md index 444933b..e23c88a 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,8 @@ # DisysCNC +TODO: +1) Добавить по 0.1uF конденсатору к питанию 3.3В ОУ и к питанию 3.3в логических микросхем +2) Добавить предохранитель на главные 24В питания, на 0.5А +3) Увеличить толщину 5В шины выходящей на питание логики внешних драйверов ШД/шпинделя до 0.8мм +4) Поменять местами линейки ESTOP_LVL и UART для исправления перекрестия в разводке, + также 3 логических микросхемы передвинуть вниз к их оптопаре, во избежание перекрестий разводки