Skip to content
Snippets Groups Projects
Commit 08c4663d authored by Greg's avatar Greg
Browse files

Merge branch 'master' of ohwr.org:amc-cpu-com6 into v2 

Conflicts:
	PCB/PCB_AFC_CPU_COM_EXPRESS/AMC-SATA.SchDoc
	PCB/PCB_AFC_CPU_COM_EXPRESS/AMC_CPU_COM_EXPRESS.OutJob
	PCB/PCB_AFC_CPU_COM_EXPRESS/AMC_CPU_COM_EXPRESS.PcbDoc
	PCB/PCB_AFC_CPU_COM_EXPRESS/AMC_CPU_COM_EXPRESS.PrjPcb
	PCB/PCB_AFC_CPU_COM_EXPRESS/AMC_CPU_COM_EXPRESS.SchDoc
	PCB/PCB_AFC_CPU_COM_EXPRESS/AMC_Connector.SchDoc
	PCB/PCB_AFC_CPU_COM_EXPRESS/COM EXPRESS.SchDoc
	PCB/PCB_AFC_CPU_COM_EXPRESS/CPU.SchDoc
	PCB/PCB_AFC_CPU_COM_EXPRESS/Display_Port_OUT.SchDoc
	PCB/PCB_AFC_CPU_COM_EXPRESS/Dual_USB2.0_CON.SchDoc
	PCB/PCB_AFC_CPU_COM_EXPRESS/Dual_USB3.0_CON.SchDoc
	PCB/PCB_AFC_CPU_COM_EXPRESS/GBE_1000T_PORT.SchDoc
	PCB/PCB_AFC_CPU_COM_EXPRESS/HDMI_OUT.SchDoc
	PCB/PCB_AFC_CPU_COM_EXPRESS/IPMI.SchDoc
	PCB/PCB_AFC_CPU_COM_EXPRESS/PCIe_clocks.SchDoc
	PCB/PCB_AFC_CPU_COM_EXPRESS/PCie_GBE_SEDRES.SchDoc
	PCB/PCB_AFC_CPU_COM_EXPRESS/SUPPLY.SchDoc
	PCB/PCB_AFC_CPU_COM_EXPRESS/mPCIe.SchDoc
parents 2bf8bec4 4c3eaa68
Branches
No related merge requests found
Hide whitespace changes
Inline Side-by-side
DOC/CPU_crate.jpg 0 → 100644
+ 0
− 0
View file @ 08c4663d
DOC/CPU_crate.jpg

215 KiB

DOC/CPU_crate.png 0 → 100644
+ 0
− 0
View file @ 08c4663d
DOC/CPU_crate.png

1.12 MiB

PCB/PCB_AFC_CPU_COM_EXPRESS/AMC_CPU_COM_EXPRESS.OutJob
+ 14
− 6
View file @ 08c4663d
......@@ -4,11 +4,11 @@ Version=1.0
[OutputGroup1]
Name=AMC_CPU_COM_EXPRESS.OutJob
Description=
TargetOutputMedium=Schematic
TargetOutputMedium=Folder Structure
VariantName=mini
VariantScope=1
CurrentConfigurationName=
TargetPrinter=Brother DCP-J315W Printer
TargetPrinter=Xerox WorkCentre Recepcja Nowa
PrinterOptions=Record=PrinterOptions|Copies=1|Duplex=1|TrueTypeOptions=3|Collate=1|PrintWhat=0
OutputMedium1=Print Job
OutputMedium1_Type=Printer
......@@ -27,7 +27,7 @@ OutputName1=Gerber Files
OutputCategory1=Fabrication
OutputDocumentPath1=
OutputVariantName1=
OutputEnabled1=0
OutputEnabled1=1
OutputEnabled1_OutputMedium1=0
OutputEnabled1_OutputMedium2=0
OutputEnabled1_OutputMedium3=0
......@@ -41,7 +41,7 @@ OutputName2=NC Drill Files
OutputCategory2=Fabrication
OutputDocumentPath2=
OutputVariantName2=
OutputEnabled2=0
OutputEnabled2=1
OutputEnabled2_OutputMedium1=0
OutputEnabled2_OutputMedium2=0
OutputEnabled2_OutputMedium3=0
......@@ -129,7 +129,7 @@ OutputName7=Schematic Prints
OutputCategory7=Documentation
OutputDocumentPath7=[Project Physical Documents]
OutputVariantName7=
OutputEnabled7=1
OutputEnabled7=0
OutputEnabled7_OutputMedium1=0
OutputEnabled7_OutputMedium2=1
OutputEnabled7_OutputMedium3=0
......@@ -202,7 +202,11 @@ Configuration10_Name9=OutputConfigurationParameter9
Configuration10_Item9=CArc=Full|CFill=Full|Comment=Full|Coordinate=Full|CPad=Full|CRegion=Full|CText=Full|CTrack=Full|CVia=Full|DDSymbolKind=0|DDSymbolSize=500000|DDSymbolSortKind=0|Designator=Full|Dimension=Full|DLayer1=TopLayer|DLayer2=BottomLayer|FArc=Full|FFill=Full|FPad=Full|FRegion=Full|FText=Full|FTrack=Full|FVia=Full|Layer=Mechanical1|Polygon=Full|PrintOutIndex=1|Record=PcbPrintLayer
[PublishSettings]
<<<<<<< HEAD
OutputFilePath2=C:\Users\Greg\Documents\DESIGNS\AMC_CPU_COM_EXPRESS\PCB\PCB_AFC_CPU_COM_EXPRESS\Project Outputs for AMC_CPU_COM_EXPRESS\Schematic\AMC_PCIe_Adapter.pdf
=======
OutputFilePath2=D:\Dropbox\Work\PW ISE\AMC_CPU\PCB_AFC_CPU_COM_EXPRESS\Project Outputs for AMC_PCIe_Adapter\Schematic\AMC_PCIe_Adapter.pdf
>>>>>>> 4c3eaa680c5cd95e64380f7073f2835598ccf107
ReleaseManaged2=0
OutputBasePath2=Project Outputs for AMC_CPU_COM_EXPRESS\
OutputPathMedia2=[Media Name]
......@@ -244,7 +248,7 @@ OutputFileName4=
OpenOutput4=0
OutputFilePath5=D:\Dropbox\Work\PW ISE\AMC_CPU\PCB_AFC_CPU_COM_EXPRESS\Project Outputs for AMC_CPU_COM_EXPRESS\
ReleaseManaged5=1
OutputBasePath5=
OutputBasePath5=Project Outputs for AMC_CPU_COM_EXPRESS
OutputPathMedia5=
OutputPathOutputer5=[Output Type]
OutputFileName5=
......@@ -275,7 +279,11 @@ WmvVideoCodecName5=Windows Media Video V7
WmvQuality5=80
[GeneratedFilesSettings]
<<<<<<< HEAD
RelativeOutputPath2=C:\Users\Greg\Documents\DESIGNS\AMC_CPU_COM_EXPRESS\PCB\PCB_AFC_CPU_COM_EXPRESS\Project Outputs for AMC_CPU_COM_EXPRESS\Schematic\AMC_PCIe_Adapter.pdf
=======
RelativeOutputPath2=D:\Dropbox\Work\PW ISE\AMC_CPU\PCB_AFC_CPU_COM_EXPRESS\Project Outputs for AMC_PCIe_Adapter\Schematic\AMC_PCIe_Adapter.pdf
>>>>>>> 4c3eaa680c5cd95e64380f7073f2835598ccf107
OpenOutputs2=1
RelativeOutputPath3=D:\Dropbox\Work\PW ISE\AMC_CPU\PCB_AFC_CPU_COM_EXPRESS\Project Outputs for AMC_PCIe_Adapter\Assembly\AMC_PCIe_Adapter.pdf
OpenOutputs3=1
......
PCB/PCB_AFC_CPU_COM_EXPRESS/AMC_CPU_COM_EXPRESS.PrjPcb
+ 68
− 0
View file @ 08c4663d
......@@ -887,7 +887,11 @@ Variation6=Designator=J12B|UniqueId=\XUQUDVSX\TXPQTSJR|Kind=1|AlternatePart=
ParamVariationCount=0
[GeneratedDocument1]
<<<<<<< HEAD
DocumentPath=amc_cpu_com_express.pcbdoc.htm
=======
DocumentPath=AMC_CPU_COM_EXPRESS.PcbDoc.htm
>>>>>>> 4c3eaa680c5cd95e64380f7073f2835598ccf107
DItemRevisionGUID=
[Configuration1]
......@@ -1051,9 +1055,12 @@ StimStartTime=1E-8
StimStopTime=6E-8
StimPeriodTime=1E-7
<<<<<<< HEAD
[Generic_EDE]
OutputDir=
=======
>>>>>>> 4c3eaa680c5cd95e64380f7073f2835598ccf107
[OutputGroup1]
Name=Netlist Outputs
Description=
......@@ -1271,48 +1278,92 @@ OutputDocumentPath10=
OutputVariantName10=
OutputDefault10=0
PageOptions10=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=-4|MediaType=1|DitherType=10|PaperKind=A4|PrintScaleMode=1
<<<<<<< HEAD
OutputType11=Report Print
OutputName11=Report Prints
=======
OutputType11=PCBLIB Print
OutputName11=PCBLIB Prints
>>>>>>> 4c3eaa680c5cd95e64380f7073f2835598ccf107
OutputDocumentPath11=
OutputVariantName11=
OutputDefault11=0
PageOptions11=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=-4|MediaType=1|DitherType=10|PaperKind=A4|PrintScaleMode=1
<<<<<<< HEAD
OutputType12=Schematic Print
OutputName12=Schematic Prints
=======
OutputType12=Report Print
OutputName12=Report Prints
>>>>>>> 4c3eaa680c5cd95e64380f7073f2835598ccf107
OutputDocumentPath12=
OutputVariantName12=
OutputDefault12=0
PageOptions12=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=-4|MediaType=1|DitherType=10|PaperKind=A4|PrintScaleMode=1
<<<<<<< HEAD
OutputType13=SimView Print
OutputName13=SimView Prints
=======
OutputType13=Schematic Print
OutputName13=Schematic Prints
>>>>>>> 4c3eaa680c5cd95e64380f7073f2835598ccf107
OutputDocumentPath13=
OutputVariantName13=
OutputDefault13=0
PageOptions13=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=-4|MediaType=1|DitherType=10|PaperKind=A4|PrintScaleMode=1
<<<<<<< HEAD
OutputType14=Software Platform Print
OutputName14=Software Platform Prints
=======
OutputType14=SimView Print
OutputName14=SimView Prints
>>>>>>> 4c3eaa680c5cd95e64380f7073f2835598ccf107
OutputDocumentPath14=
OutputVariantName14=
OutputDefault14=0
PageOptions14=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=-4|MediaType=1|DitherType=10|PaperKind=A4|PrintScaleMode=1
<<<<<<< HEAD
OutputType15=VHDL Print
OutputName15=VHDL Prints
=======
OutputType15=Software Platform Print
OutputName15=Software Platform Prints
>>>>>>> 4c3eaa680c5cd95e64380f7073f2835598ccf107
OutputDocumentPath15=
OutputVariantName15=
OutputDefault15=0
PageOptions15=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=-4|MediaType=1|DitherType=10|PaperKind=A4|PrintScaleMode=1
<<<<<<< HEAD
OutputType16=Wave Print
OutputName16=Wave Prints
=======
OutputType16=VHDL Print
OutputName16=VHDL Prints
>>>>>>> 4c3eaa680c5cd95e64380f7073f2835598ccf107
OutputDocumentPath16=
OutputVariantName16=
OutputDefault16=0
PageOptions16=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=-4|MediaType=1|DitherType=10|PaperKind=A4|PrintScaleMode=1
<<<<<<< HEAD
OutputType17=WaveSim Print
OutputName17=WaveSim Prints
=======
OutputType17=Wave Print
OutputName17=Wave Prints
>>>>>>> 4c3eaa680c5cd95e64380f7073f2835598ccf107
OutputDocumentPath17=
OutputVariantName17=
OutputDefault17=0
PageOptions17=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=-4|MediaType=1|DitherType=10|PaperKind=A4|PrintScaleMode=1
<<<<<<< HEAD
=======
OutputType18=WaveSim Print
OutputName18=WaveSim Prints
OutputDocumentPath18=
OutputVariantName18=
OutputDefault18=0
PageOptions18=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=-4|MediaType=1|DitherType=10|PaperKind=A4|PrintScaleMode=1
>>>>>>> 4c3eaa680c5cd95e64380f7073f2835598ccf107
[OutputGroup4]
Name=Assembly Outputs
......@@ -1660,6 +1711,19 @@ OutputName1=Export STEP
OutputDocumentPath1=
OutputVariantName1=[No Variations]
OutputDefault1=0
<<<<<<< HEAD
=======
OutputType2=AutoCAD dwg/dxf PCB
OutputName2=AutoCAD dwg/dxf File PCB
OutputDocumentPath2=
OutputVariantName2=
OutputDefault2=0
OutputType3=AutoCAD dwg/dxf Schematic
OutputName3=AutoCAD dwg/dxf File Schematic
OutputDocumentPath3=
OutputVariantName3=
OutputDefault3=0
>>>>>>> 4c3eaa680c5cd95e64380f7073f2835598ccf107
[Modification Levels]
Type1=1
......@@ -1940,7 +2004,11 @@ PartTypes=0
[Comparison Options]
ComparisonOptions0=Kind=Net|MinPercent=75|MinMatch=3|ShowMatch=-1|Confirm=0|UseName=-1|InclAllRules=0
ComparisonOptions1=Kind=Net Class|MinPercent=75|MinMatch=3|ShowMatch=0|Confirm=0|UseName=-1|InclAllRules=0
<<<<<<< HEAD
ComparisonOptions2=Kind=Component Class|MinPercent=75|MinMatch=3|ShowMatch=-1|Confirm=0|UseName=-1|InclAllRules=0
=======
ComparisonOptions2=Kind=Component Class|MinPercent=75|MinMatch=3|ShowMatch=-1|Confirm=-1|UseName=-1|InclAllRules=0
>>>>>>> 4c3eaa680c5cd95e64380f7073f2835598ccf107
ComparisonOptions3=Kind=Rule|MinPercent=75|MinMatch=3|ShowMatch=-1|Confirm=-1|UseName=-1|InclAllRules=0
ComparisonOptions4=Kind=Differential Pair|MinPercent=50|MinMatch=1|ShowMatch=0|Confirm=0|UseName=0|InclAllRules=0
ComparisonOptions5=Kind=Structure Class|MinPercent=75|MinMatch=3|ShowMatch=-1|Confirm=-1|UseName=-1|InclAllRules=0
......
PCB/PCB_AMC_CPU_COM_EXPRESS v2/AMC_CPU_COM_EXPRESS.PcbDoc
+ 0
− 0
View file @ 08c4663d
No preview for this file type
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment