Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: sinara-hw/sinara
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ae46b74b9360
Choose a base ref
...
head repository: sinara-hw/sinara
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: bfc2893970ac
Choose a head ref
  • 2 commits
  • 15 files changed
  • 1 contributor

Commits on Jan 18, 2018

  1. fixed cosmetic issues

    @gkasprow
    gkasprow committed Jan 18, 2018
    Copy the full SHA
    cecf4d9 View commit details

  2. Merge branch 'master' of https://github.com/m-labs/sinara

    @gkasprow
    gkasprow committed Jan 18, 2018
    Copy the full SHA
    bfc2893 View commit details
Binary file removed ARTIQ_ALTIUM/EEMs/Zotino_BNC_Adapter/3U_DAC.PDF
View file
Binary file not shown.
34 changes: 17 additions & 17 deletions ...ino_BNC_Adapter/Zotino_BNC_Adapter.OutJob → ...Zotino_BNC_Adapter/IDC_BNC_Adapter.OutJob
View file
Original file line number Diff line number Diff line change
@@ -15,13 +15,13 @@ LifeCycleDefinitionGUID=
RevisionNamingSchemeGUID=

[OutputGroup1]
Name=Zotino_BNC_Adapter.OutJob
Name=IDC_BNC_Adapter.OutJob
Description=
TargetOutputMedium=PDF
TargetOutputMedium=Folder Structure
VariantName=[No Variations]
VariantScope=1
CurrentConfigurationName=
TargetPrinter=Virtual Printer
TargetPrinter=Brother DCP-J315W Printer (Copy 1)
PrinterOptions=Record=PrinterOptions|Copies=1|Duplex=1|TrueTypeOptions=3|Collate=1|PrintJobKind=1|PrintWhat=1
OutputMedium1=Print Job
OutputMedium1_Type=Printer
@@ -38,7 +38,7 @@ OutputName1=Schematic Prints
OutputCategory1=Documentation
OutputDocumentPath1=
OutputVariantName1=
OutputEnabled1=1
OutputEnabled1=0
OutputEnabled1_OutputMedium1=0
OutputEnabled1_OutputMedium2=1
OutputEnabled1_OutputMedium3=0
@@ -52,7 +52,7 @@ OutputName2=PCB 3D Print
OutputCategory2=Documentation
OutputDocumentPath2=
OutputVariantName2=
OutputEnabled2=1
OutputEnabled2=0
OutputEnabled2_OutputMedium1=0
OutputEnabled2_OutputMedium2=2
OutputEnabled2_OutputMedium3=0
@@ -66,7 +66,7 @@ OutputName3=Copy of PCB 3D Print
OutputCategory3=Documentation
OutputDocumentPath3=
OutputVariantName3=
OutputEnabled3=1
OutputEnabled3=0
OutputEnabled3_OutputMedium1=0
OutputEnabled3_OutputMedium2=3
OutputEnabled3_OutputMedium3=0
@@ -80,7 +80,7 @@ OutputName4=PCB Prints
OutputCategory4=Documentation
OutputDocumentPath4=
OutputVariantName4=
OutputEnabled4=1
OutputEnabled4=0
OutputEnabled4_OutputMedium1=0
OutputEnabled4_OutputMedium2=4
OutputEnabled4_OutputMedium3=0
@@ -174,7 +174,7 @@ OutputName6=Generates pick and place files
OutputCategory6=Assembly
OutputDocumentPath6=
OutputVariantName6=
OutputEnabled6=0
OutputEnabled6=1
OutputEnabled6_OutputMedium1=0
OutputEnabled6_OutputMedium2=0
OutputEnabled6_OutputMedium3=4
@@ -187,7 +187,7 @@ OutputName7=Gerber Files
OutputCategory7=Fabrication
OutputDocumentPath7=
OutputVariantName7=
OutputEnabled7=0
OutputEnabled7=1
OutputEnabled7_OutputMedium1=0
OutputEnabled7_OutputMedium2=0
OutputEnabled7_OutputMedium3=3
@@ -200,7 +200,7 @@ OutputName8=NC Drill Files
OutputCategory8=Fabrication
OutputDocumentPath8=
OutputVariantName8=
OutputEnabled8=0
OutputEnabled8=1
OutputEnabled8_OutputMedium1=0
OutputEnabled8_OutputMedium2=0
OutputEnabled8_OutputMedium3=2
@@ -213,7 +213,7 @@ OutputName9=Bill of Materials
OutputCategory9=Report
OutputDocumentPath9=
OutputVariantName9=
OutputEnabled9=0
OutputEnabled9=1
OutputEnabled9_OutputMedium1=0
OutputEnabled9_OutputMedium2=0
OutputEnabled9_OutputMedium3=1
@@ -236,15 +236,15 @@ Configuration9_Name7=VisibleOrder
Configuration9_Item7=Comment=100|Description=100|Designator=100|Footprint=100|Manufacturer=100|Manufacturer Part Number=100|Manufacturer1 ComponentHeight=100|Manufacturer1 Example=100|Manufacturer1 Part Number=100|Part Description=100|Part Number=100|Quantity=100

[PublishSettings]
OutputFilePath2=D:\Dropbox\DESIGNS\MTCA_projects\SINARA\ARTIQ_ALTIUM\EEMs\Zotino_BNC_Adapter\.\3U_DAC.PDF
OutputFilePath2=.\IDC_BNC_Adapter.PDF
ReleaseManaged2=0
OutputBasePath2=.\
OutputPathMedia2=
OutputPathMediaValue2=
OutputPathOutputer2=[Output Type]
OutputPathOutputerPrefix2=
OutputPathOutputerValue2=
OutputFileName2=Zotino_BNC_Adapter
OutputFileName2=IDC_BNC_Adapter
OutputFileNameMulti2=
UseOutputNameForMulti2=0
OutputFileNameSpecial2=
@@ -263,9 +263,9 @@ ShowComponentParameters2=1
GlobalBookmarks2=0
PDFACompliance2=Disabled
PDFVersion2=Default
OutputFilePath3=D:\Dropbox\DESIGNS\MTCA_projects\SINARA\ARTIQ_ALTIUM\EEMs\Zotino_BNC_Adapter\Project Outputs for Zotino_BNC_Adapter\
OutputFilePath3=Project Outputs for IDC_BNC_Adapter\
ReleaseManaged3=0
OutputBasePath3=Project Outputs for Zotino_BNC_Adapter\
OutputBasePath3=Project Outputs for IDC_BNC_Adapter\
OutputPathMedia3=
OutputPathMediaValue3=
OutputPathOutputer3=[Output Type]
@@ -315,9 +315,9 @@ WmvVideoCodecName4=Windows Media Video V7
WmvQuality4=80

[GeneratedFilesSettings]
RelativeOutputPath2=D:\Dropbox\DESIGNS\MTCA_projects\SINARA\ARTIQ_ALTIUM\EEMs\Zotino_BNC_Adapter\.\3U_DAC.PDF
RelativeOutputPath2=.\IDC_BNC_Adapter.PDF
OpenOutputs2=1
RelativeOutputPath3=D:\Dropbox\DESIGNS\MTCA_projects\SINARA\ARTIQ_ALTIUM\EEMs\Zotino_BNC_Adapter\Project Outputs for Zotino_BNC_Adapter\
RelativeOutputPath3=Project Outputs for IDC_BNC_Adapter\
OpenOutputs3=0
AddToProject3=0
TimestampFolder3=0
Binary file renamed ...ino_BNC_Adapter/Zotino_BNC_Adapter.PCBDOC → ...Zotino_BNC_Adapter/IDC_BNC_Adapter.PCBDOC
View file
Binary file not shown.
Binary file renamed ...Zotino_BNC_Adapter/Zotino_BNC_Adapter.PDF → ...Ms/Zotino_BNC_Adapter/IDC_BNC_Adapter.PDF
View file
Binary file not shown.
8 changes: 4 additions & 4 deletions ...ino_BNC_Adapter/Zotino_BNC_Adapter.PrjPCB → ...Zotino_BNC_Adapter/IDC_BNC_Adapter.PrjPCB
View file
Original file line number Diff line number Diff line change
@@ -39,7 +39,7 @@ PrefsVaultGUID=
PrefsRevisionGUID=

[Document1]
DocumentPath=Zotino_BNC_Adapter.OutJob
DocumentPath=IDC_BNC_Adapter.OutJob
AnnotationEnabled=1
AnnotateStartValue=1
AnnotationIndexControlEnabled=0
@@ -56,7 +56,7 @@ GenerateClassCluster=0
DocumentUniqueId=

[Document2]
DocumentPath=Zotino_BNC_Adapter.PCBDOC
DocumentPath=IDC_BNC_Adapter.PCBDOC
AnnotationEnabled=1
AnnotateStartValue=1
AnnotationIndexControlEnabled=0
@@ -70,10 +70,10 @@ ClassGenCCAutoRoomEnabled=1
ClassGenNCAutoScope=None
DItemRevisionGUID=
GenerateClassCluster=0
DocumentUniqueId=
DocumentUniqueId=SHIXJERX

[Document3]
DocumentPath=Zotino_BNC_Adapter.SchDoc
DocumentPath=IDC_BNC_Adapter.SchDoc
AnnotationEnabled=1
AnnotateStartValue=1
AnnotationIndexControlEnabled=0
Binary file added ARTIQ_ALTIUM/EEMs/Zotino_BNC_Adapter/IDC_BNC_Adapter.SchDoc
View file
Binary file not shown.
Binary file added ...NC_Adapter/Project Outputs for IDC_BNC_Adapter/BOM/Bill of Materials-IDC_BNC_Adapter.xlsx
View file
Binary file not shown.
Binary file removed ARTIQ_ALTIUM/EEMs/Zotino_BNC_Adapter/Zotino_BNC_Adapter.SchDoc
View file
Binary file not shown.
34 changes: 17 additions & 17 deletions ...o_HD68_Adapter/Zotino_HD68_Adapter.OutJob → ...tino_HD68_Adapter/IDC_HD68_Adapter.OutJob
View file
Original file line number Diff line number Diff line change
@@ -15,13 +15,13 @@ LifeCycleDefinitionGUID=
RevisionNamingSchemeGUID=

[OutputGroup1]
Name=Zotino_HD68_Adapter.OutJob
Name=IDC_HD68_Adapter.OutJob
Description=
TargetOutputMedium=PDF
TargetOutputMedium=Folder Structure
VariantName=[No Variations]
VariantScope=1
CurrentConfigurationName=
TargetPrinter=Virtual Printer
TargetPrinter=Brother DCP-J315W Printer (Copy 1)
PrinterOptions=Record=PrinterOptions|Copies=1|Duplex=1|TrueTypeOptions=3|Collate=1|PrintJobKind=1|PrintWhat=1
OutputMedium1=Print Job
OutputMedium1_Type=Printer
@@ -38,7 +38,7 @@ OutputName1=Schematic Prints
OutputCategory1=Documentation
OutputDocumentPath1=
OutputVariantName1=
OutputEnabled1=1
OutputEnabled1=0
OutputEnabled1_OutputMedium1=0
OutputEnabled1_OutputMedium2=1
OutputEnabled1_OutputMedium3=0
@@ -52,7 +52,7 @@ OutputName2=PCB 3D Print
OutputCategory2=Documentation
OutputDocumentPath2=
OutputVariantName2=
OutputEnabled2=1
OutputEnabled2=0
OutputEnabled2_OutputMedium1=0
OutputEnabled2_OutputMedium2=2
OutputEnabled2_OutputMedium3=0
@@ -66,7 +66,7 @@ OutputName3=Copy of PCB 3D Print
OutputCategory3=Documentation
OutputDocumentPath3=
OutputVariantName3=
OutputEnabled3=1
OutputEnabled3=0
OutputEnabled3_OutputMedium1=0
OutputEnabled3_OutputMedium2=3
OutputEnabled3_OutputMedium3=0
@@ -80,7 +80,7 @@ OutputName4=PCB Prints
OutputCategory4=Documentation
OutputDocumentPath4=
OutputVariantName4=
OutputEnabled4=1
OutputEnabled4=0
OutputEnabled4_OutputMedium1=0
OutputEnabled4_OutputMedium2=4
OutputEnabled4_OutputMedium3=0
@@ -174,7 +174,7 @@ OutputName6=Generates pick and place files
OutputCategory6=Assembly
OutputDocumentPath6=
OutputVariantName6=
OutputEnabled6=0
OutputEnabled6=1
OutputEnabled6_OutputMedium1=0
OutputEnabled6_OutputMedium2=0
OutputEnabled6_OutputMedium3=4
@@ -187,7 +187,7 @@ OutputName7=Gerber Files
OutputCategory7=Fabrication
OutputDocumentPath7=
OutputVariantName7=
OutputEnabled7=0
OutputEnabled7=1
OutputEnabled7_OutputMedium1=0
OutputEnabled7_OutputMedium2=0
OutputEnabled7_OutputMedium3=3
@@ -200,7 +200,7 @@ OutputName8=NC Drill Files
OutputCategory8=Fabrication
OutputDocumentPath8=
OutputVariantName8=
OutputEnabled8=0
OutputEnabled8=1
OutputEnabled8_OutputMedium1=0
OutputEnabled8_OutputMedium2=0
OutputEnabled8_OutputMedium3=2
@@ -213,7 +213,7 @@ OutputName9=Bill of Materials
OutputCategory9=Report
OutputDocumentPath9=
OutputVariantName9=
OutputEnabled9=0
OutputEnabled9=1
OutputEnabled9_OutputMedium1=0
OutputEnabled9_OutputMedium2=0
OutputEnabled9_OutputMedium3=1
@@ -236,15 +236,15 @@ Configuration9_Name7=VisibleOrder
Configuration9_Item7=Comment=100|Description=100|Designator=100|Footprint=100|Manufacturer=100|Manufacturer Part Number=100|Manufacturer1 ComponentHeight=100|Manufacturer1 Example=100|Manufacturer1 Part Number=100|Part Description=100|Part Number=100|Quantity=100

[PublishSettings]
OutputFilePath2=D:\Dropbox\DESIGNS\MTCA_projects\SINARA\ARTIQ_ALTIUM\EEMs\Zotino_HD68_Adapter\.\3U_DAC.PDF
OutputFilePath2=D:\Dropbox\DESIGNS\MTCA_projects\SINARA\ARTIQ_ALTIUM\EEMs\Zotino_HD68_Adapter\.\Zotino_HD68_Adapter.PDF
ReleaseManaged2=0
OutputBasePath2=.\
OutputPathMedia2=
OutputPathMediaValue2=
OutputPathOutputer2=[Output Type]
OutputPathOutputerPrefix2=
OutputPathOutputerValue2=
OutputFileName2=Zotino_HD68_Adapter
OutputFileName2=IDC_HD68_Adapter
OutputFileNameMulti2=
UseOutputNameForMulti2=0
OutputFileNameSpecial2=
@@ -263,9 +263,9 @@ ShowComponentParameters2=1
GlobalBookmarks2=0
PDFACompliance2=Disabled
PDFVersion2=Default
OutputFilePath3=D:\Dropbox\DESIGNS\MTCA_projects\SINARA\ARTIQ_ALTIUM\EEMs\Zotino_HD68_Adapter\Project Outputs for Zotino_HD68_Adapter\
OutputFilePath3=D:\Dropbox\DESIGNS\MTCA_projects\SINARA\ARTIQ_ALTIUM\EEMs\Zotino_HD68_Adapter\Project Outputs for IDC_HD68_Adapter\
ReleaseManaged3=0
OutputBasePath3=Project Outputs for Zotino_HD68_Adapter\
OutputBasePath3=Project Outputs for IDC_HD68_Adapter\
OutputPathMedia3=
OutputPathMediaValue3=
OutputPathOutputer3=[Output Type]
@@ -315,9 +315,9 @@ WmvVideoCodecName4=Windows Media Video V7
WmvQuality4=80

[GeneratedFilesSettings]
RelativeOutputPath2=D:\Dropbox\DESIGNS\MTCA_projects\SINARA\ARTIQ_ALTIUM\EEMs\Zotino_HD68_Adapter\.\3U_DAC.PDF
RelativeOutputPath2=D:\Dropbox\DESIGNS\MTCA_projects\SINARA\ARTIQ_ALTIUM\EEMs\Zotino_HD68_Adapter\.\Zotino_HD68_Adapter.PDF
OpenOutputs2=1
RelativeOutputPath3=D:\Dropbox\DESIGNS\MTCA_projects\SINARA\ARTIQ_ALTIUM\EEMs\Zotino_HD68_Adapter\Project Outputs for Zotino_HD68_Adapter\
RelativeOutputPath3=D:\Dropbox\DESIGNS\MTCA_projects\SINARA\ARTIQ_ALTIUM\EEMs\Zotino_HD68_Adapter\Project Outputs for IDC_HD68_Adapter\
OpenOutputs3=0
AddToProject3=0
TimestampFolder3=0
Binary file renamed ...o_HD68_Adapter/Zotino_HD68_Adapter.PCBDOC → ...tino_HD68_Adapter/IDC_HD68_Adapter.PCBDOC
View file
Binary file not shown.
Binary file renamed ...tino_HD68_Adapter/Zotino_HD68_Adapter.PDF → .../Zotino_HD68_Adapter/IDC_HD68_Adapter.PDF
View file
Binary file not shown.
8 changes: 4 additions & 4 deletions ...o_HD68_Adapter/Zotino_HD68_Adapter.PrjPCB → ...tino_HD68_Adapter/IDC_HD68_Adapter.PrjPCB
View file
Original file line number Diff line number Diff line change
@@ -39,7 +39,7 @@ PrefsVaultGUID=
PrefsRevisionGUID=

[Document1]
DocumentPath=Zotino_BNC_Adapter.OutJob
DocumentPath=IDC_HD68_Adapter.OutJob
AnnotationEnabled=1
AnnotateStartValue=1
AnnotationIndexControlEnabled=0
@@ -56,7 +56,7 @@ GenerateClassCluster=0
DocumentUniqueId=

[Document2]
DocumentPath=Zotino_BNC_Adapter.PCBDOC
DocumentPath=IDC_HD68_Adapter.PCBDOC
AnnotationEnabled=1
AnnotateStartValue=1
AnnotationIndexControlEnabled=0
@@ -70,10 +70,10 @@ ClassGenCCAutoRoomEnabled=1
ClassGenNCAutoScope=None
DItemRevisionGUID=
GenerateClassCluster=0
DocumentUniqueId=
DocumentUniqueId=SHIXJERX

[Document3]
DocumentPath=Zotino_BNC_Adapter.SchDoc
DocumentPath=IDC_HD68_Adapter.SchDoc
AnnotationEnabled=1
AnnotateStartValue=1
AnnotationIndexControlEnabled=0
Binary file added ARTIQ_ALTIUM/EEMs/Zotino_HD68_Adapter/IDC_HD68_Adapter.SchDoc
View file
Binary file not shown.
Binary file added ..._Adapter/Project Outputs for IDC_HD68_Adapter/BOM/Bill of Materials-IDC_HD68_Adapter.xlsx
View file
Binary file not shown.
Binary file removed ARTIQ_ALTIUM/EEMs/Zotino_HD68_Adapter/Zotino_HD68_Adapter.SchDoc
View file
Binary file not shown.