dkuznets
/
ad_libs
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'master' of https://git.dk4777.ru/dkuznets/ad_libs 

# Conflicts:
#	Capacitor.SchLib
#	Connector.SchLib
#	CustomCase.PcbLib
#	CustomCase2.PcbLib
#	Diode.SchLib
#	Electromechanics.SchLib
#	Inductor.SchLib
#	Modules.SchLib
#	Oscilator.SchLib
#	Pad_Via_Hole.PvLib
#	Resistor.SchLib
#	StandardCase.PcbLib
#	Transistor.SchLib
#	cleardir.bat
#	dk.LibPkg
#	ИМС.SchLib
master
Denis Kuznetsov 1 month ago
parent
91403dc149 4d616cbad7
commit
2e1efb390c
10 changed files with 43 additions and 0 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 0
      Connector.SchLib.BASE.SchLib
  2. BIN
      Connector.SchLib.LOCAL.SchLib
  3. BIN
      Connector.SchLib.REMOTE.SchLib
  4. BIN
      MEANWELL.jpg
  5. BIN
      MEANWELL2.jpg
  6. BIN
      MEANWELL3.jpg
  7. BIN
      MEANWELL4.jpg
  8. BIN
      Project Outputs for dk/dk.IntLib
  9. 4
      cleardir.bat
  10. 39
      dk.LibPkg

0
Connector.SchLib.BASE.SchLib
Unescape View File

BIN
Connector.SchLib.LOCAL.SchLib
View File

Binary file not shown.

BIN
Connector.SchLib.REMOTE.SchLib
View File

Binary file not shown.

BIN
MEANWELL.jpg
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

BIN
MEANWELL2.jpg
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

BIN
MEANWELL3.jpg
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
MEANWELL4.jpg
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.3 KiB

BIN
Project Outputs for dk/dk.IntLib
View File

Binary file not shown.

4
cleardir.bat
Unescape View File

@ -1 +1,5 @@ @@ -1 +1,5 @@
<<<<<<< HEAD
c:\work\utils\cleardir.exe
=======
d:\work\utils\cleardir.exe
>>>>>>> 4d616cbad7f48a6a18a7580d5ff57f76a451415c

39
dk.LibPkg
Unescape View File

@ -362,6 +362,7 @@ DItemRevisionGUID= @@ -362,6 +362,7 @@ DItemRevisionGUID=
GenerateClassCluster=0
DocumentUniqueId=ACMAPUKJ
<<<<<<< HEAD
[Document20]
DocumentPath=Conn2.SchLib
AnnotationEnabled=1
@ -447,6 +448,8 @@ DItemRevisionGUID= @@ -447,6 +448,8 @@ DItemRevisionGUID=
GenerateClassCluster=0
DocumentUniqueId=
=======
>>>>>>> 4d616cbad7f48a6a18a7580d5ff57f76a451415c
[SearchPath1]
Path=D:\DK\Work\AD\Library\Project Outputs for dk\dk\*.*
IncludeSubFolders=1
@ -454,7 +457,11 @@ IncludeSubFolders=1 @@ -454,7 +457,11 @@ IncludeSubFolders=1
[OutputGroup1]
Name=Netlist Outputs
Description=
<<<<<<< HEAD
TargetPrinter=RICOH M C2000 (a27792)
=======
TargetPrinter=KONICA MINOLTA C360iSeriesPCL
>>>>>>> 4d616cbad7f48a6a18a7580d5ff57f76a451415c
PrinterOptions=Record=PrinterOptions|Copies=1|Duplex=1|TrueTypeOptions=3|Collate=1|PrintJobKind=1|PrintWhat=1
OutputType1=PADSNetlist
OutputName1=PADS ASCII Netlist
@ -560,7 +567,11 @@ OutputDefault20=0 @@ -560,7 +567,11 @@ OutputDefault20=0
[OutputGroup2]
Name=Simulator Outputs
Description=
<<<<<<< HEAD
TargetPrinter=pdfFactory Pro (7.x)
=======
TargetPrinter=KONICA MINOLTA C360iSeriesPCL
>>>>>>> 4d616cbad7f48a6a18a7580d5ff57f76a451415c
PrinterOptions=Record=PrinterOptions|Copies=1|Duplex=1|TrueTypeOptions=3|Collate=1|PrintJobKind=1|PrintWhat=1
[OutputGroup3]
@ -656,7 +667,11 @@ PageOptions11=Record=PageOptions|CenterHorizontal=True|CenterVertical=True|Print @@ -656,7 +667,11 @@ PageOptions11=Record=PageOptions|CenterHorizontal=True|CenterVertical=True|Print
[OutputGroup4]
Name=Assembly Outputs
Description=
<<<<<<< HEAD
TargetPrinter=RICOH M C2000 (a27792)
=======
TargetPrinter=KONICA MINOLTA C360iSeriesPCL
>>>>>>> 4d616cbad7f48a6a18a7580d5ff57f76a451415c
PrinterOptions=Record=PrinterOptions|Copies=1|Duplex=1|TrueTypeOptions=3|Collate=1|PrintJobKind=1|PrintWhat=1
OutputType1=Assembly
OutputName1=Assembly Drawings
@ -678,7 +693,11 @@ OutputDefault3=0 @@ -678,7 +693,11 @@ OutputDefault3=0
[OutputGroup5]
Name=Fabrication Outputs
Description=
<<<<<<< HEAD
TargetPrinter=RICOH M C2000 (a27792)
=======
TargetPrinter=KONICA MINOLTA C360iSeriesPCL
>>>>>>> 4d616cbad7f48a6a18a7580d5ff57f76a451415c
PrinterOptions=Record=PrinterOptions|Copies=1|Duplex=1|TrueTypeOptions=3|Collate=1|PrintJobKind=1|PrintWhat=1
OutputType1=Board Stack Report
OutputName1=Report Board Stack
@ -750,7 +769,11 @@ OutputDefault12=0 @@ -750,7 +769,11 @@ OutputDefault12=0
[OutputGroup6]
Name=Report Outputs
Description=
<<<<<<< HEAD
TargetPrinter=RICOH M C2000 (a27792)
=======
TargetPrinter=KONICA MINOLTA C360iSeriesPCL
>>>>>>> 4d616cbad7f48a6a18a7580d5ff57f76a451415c
PrinterOptions=Record=PrinterOptions|Copies=1|Duplex=1|TrueTypeOptions=3|Collate=1|PrintJobKind=1|PrintWhat=1
OutputType1=BOM_PartType
OutputName1=Bill of Materials
@ -792,7 +815,11 @@ OutputDefault7=0 @@ -792,7 +815,11 @@ OutputDefault7=0
[OutputGroup7]
Name=Other Outputs
Description=
<<<<<<< HEAD
TargetPrinter=RICOH M C2000 (a27792)
=======
TargetPrinter=KONICA MINOLTA C360iSeriesPCL
>>>>>>> 4d616cbad7f48a6a18a7580d5ff57f76a451415c
PrinterOptions=Record=PrinterOptions|Copies=1|Duplex=1|TrueTypeOptions=3|Collate=1|PrintJobKind=1|PrintWhat=1
OutputType1=Text Print
OutputName1=Text Print
@ -900,7 +927,11 @@ PageOptions17=Record=PageOptions|CenterHorizontal=True|CenterVertical=True|Print @@ -900,7 +927,11 @@ PageOptions17=Record=PageOptions|CenterHorizontal=True|CenterVertical=True|Print
[OutputGroup8]
Name=Validation Outputs
Description=
<<<<<<< HEAD
TargetPrinter=RICOH M C2000 (a27792)
=======
TargetPrinter=KONICA MINOLTA C360iSeriesPCL
>>>>>>> 4d616cbad7f48a6a18a7580d5ff57f76a451415c
PrinterOptions=Record=PrinterOptions|Copies=1|Duplex=1|TrueTypeOptions=3|Collate=1|PrintJobKind=1|PrintWhat=1
OutputType1=BOM_Violations
OutputName1=BOM Checks Report
@ -944,7 +975,11 @@ OutputDefault7=0 @@ -944,7 +975,11 @@ OutputDefault7=0
[OutputGroup9]
Name=Export Outputs
Description=
<<<<<<< HEAD
TargetPrinter=RICOH M C2000 (a27792)
=======
TargetPrinter=KONICA MINOLTA C360iSeriesPCL
>>>>>>> 4d616cbad7f48a6a18a7580d5ff57f76a451415c
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
@ -1005,7 +1040,11 @@ OutputDefault11=0 @@ -1005,7 +1040,11 @@ OutputDefault11=0
[OutputGroup10]
Name=PostProcess Outputs
Description=
<<<<<<< HEAD
TargetPrinter=RICOH M C2000 (a27792)
=======
TargetPrinter=KONICA MINOLTA C360iSeriesPCL
>>>>>>> 4d616cbad7f48a6a18a7580d5ff57f76a451415c
PrinterOptions=Record=PrinterOptions|Copies=1|Duplex=1|TrueTypeOptions=3|Collate=1|PrintJobKind=1|PrintWhat=1
OutputType1=Copy Files
OutputName1=Copy Files

Write Preview
Loading…
Cancel
Save