lukas/Reflow_SMD_Solderprint
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix failed merge

Browse Source
This commit is contained in:
lukas 2023-01-13 19:37:12 +01:00
parent 45937f1e28
commit 12f4141221
2 changed files with 1 additions and 4317 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4308
smdsolder.kicad_pcb
View File

File diff suppressed because it is too large Load Diff

10
smdsolder.kicad_sch
View File

@ -1247,11 +1247,7 @@
(property "Reference" "R3" (id 0) (at 165.1 123.1899 0) (property "Reference" "R3" (id 0) (at 165.1 123.1899 0)
(effects (font (size 1.27 1.27)) (justify left)) (effects (font (size 1.27 1.27)) (justify left))
) )
<<<<<<< HEAD (property "Value" "1K" (id 1) (at 165.1 125.7299 0)
(property "Value" "10K" (id 1) (at 165.1 125.7299 0)
=======
(property "Value" "" (id 1) (at 25.4 142.2399 0)
>>>>>>> 2a8ed384f1a0999ff7758fe55edda628ebd46023
(effects (font (size 1.27 1.27)) (justify left)) (effects (font (size 1.27 1.27)) (justify left))
) )
(property "Footprint" "Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal" (id 2) (at 160.782 124.46 90) (property "Footprint" "Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal" (id 2) (at 160.782 124.46 90)
@ -1375,11 +1371,7 @@
(property "Value" "PT1000" (id 1) (at 180.34 136.2074 0) (property "Value" "PT1000" (id 1) (at 180.34 136.2074 0)
(effects (font (size 1.27 1.27)) (justify left)) (effects (font (size 1.27 1.27)) (justify left))
) )
<<<<<<< HEAD
(property "Footprint" "Package_TO_SOT_THT:TO-92-2" (id 2) (at 177.8 133.35 0) (property "Footprint" "Package_TO_SOT_THT:TO-92-2" (id 2) (at 177.8 133.35 0)
=======
(property "Footprint" "Package_TO_SOT_THT:TO-92-2_Horizontal1" (id 2) (at 38.1 166.37 0)
>>>>>>> 2a8ed384f1a0999ff7758fe55edda628ebd46023
(effects (font (size 1.27 1.27)) hide) (effects (font (size 1.27 1.27)) hide)
) )
(property "Datasheet" "https://www.heraeus.com/media/media/group/doc_group/products_1/hst/sot_to/de_15/to_92_d.pdf" (id 3) (at 177.8 133.35 0) (property "Datasheet" "https://www.heraeus.com/media/media/group/doc_group/products_1/hst/sot_to/de_15/to_92_d.pdf" (id 3) (at 177.8 133.35 0)