diff --git a/Notizen.md b/Notizen.md
index b77920c21f1de26df567cb5836bfa33463e0aca9..c29547dc25c75c5bb3c22a39c28f52232c3377e6 100644
--- a/Notizen.md
+++ b/Notizen.md
@@ -482,13 +482,13 @@
- DRC läuft in einen Timeout.
- "Really small OAR detected". Das heißt vermutlich "Outer Annular Ring" und 0.05 mm ist für JLC ok.
- Es steht 0.1 mm bzw. 0.127 mm fix im Source. Ja toll.
+ - KiBot tut erstmal nur die Bauteile mit LCSC Code in den BOM, aber ich habe bei einigen mich einfach darauf verlassen, dass JLC schon das Basic Part dazu selbst finden wird:
+ https://github.com/INTI-CMNB/KiBot/blob/master/kibot/resources/config_templates/JLCPCB.kibot.yaml#L103
+
TODO und weitere Gedanken:
- LDO für 3.3V ist nicht mehr verfügbar.
-- KiBot tut erstmal nur die Bauteile mit LCSC Code in den BOM, aber ich habe bei einigen mich einfach darauf verlassen, dass JLC schon das Basic Part dazu selbst finden wird:
- https://github.com/INTI-CMNB/KiBot/blob/master/kibot/resources/config_templates/JLCPCB.kibot.yaml#L103
-
- Gerber vom Main Board noch mal. Ich hab Polygons noch geändert.
- Subraum-Logos?
diff --git a/c3pb-heizung/c3pb-heizung.kibot.yaml b/c3pb-heizung/c3pb-heizung.kibot.yaml
index 6b5eac3abd8fafa24e857aa4966f75beda49aaf3..35b359a5d81e7a20ef08809e8bfac9d0211d6597 100644
--- a/c3pb-heizung/c3pb-heizung.kibot.yaml
+++ b/c3pb-heizung/c3pb-heizung.kibot.yaml
@@ -27,6 +27,33 @@ preflight:
check_zone_fills: true
ignore_unconnected: false
+filters:
+ - name: only_pcba
+ comment: 'Only parts that do not have a DNP field and do not have a copper-only footprint'
+ type: generic
+ exclude_any:
+ - column: DNP
+ regex: '^1|PCBA$'
+ - column: Part
+ regex: '^SolderJumper_'
+ - column: Part
+ regex: '^NetTie_'
+ - column: Part
+ regex: '^MountingHole_'
+ # Testpoints can be copper-only or an actual part to be placed
+ # so we better handle this with "in_bom no" or DNP to avoid
+ # future surprises.
+ #- column: Part
+ # regex: '^TestPoint_'
+ - name: non_pcba
+ comment: 'Parts that are not placed in PCBA, i.e. maybe order separately'
+ type: generic
+ include_only:
+ - column: DNP
+ # We also match DNP=1 here because we may want to order them anyway just in case.
+ # (There was some reason to include the footprint, after all.)
+ regex: '^1|PCBA$'
+
outputs:
- name: ibom
comment: Generate Bill of Materials in interactive HTML format
@@ -164,6 +191,27 @@ outputs:
dir: Manufacturers/JLCPCB
extends: _JLCPCB_bom
disable_run_by_default: true
+ options:
+ exclude_filter: 'only_pcba'
+- name: LCSC_bom
+ comment: BoM for LCSC, i.e. no PCBA parts
+ type: bom
+ dir: Manufacturers/JLCPCB
+ extends: _JLCPCB_bom
+ disable_run_by_default: true
+ options:
+ output: '%f_%i_lcsc_non_pcba.%x'
+ exclude_filter: 'non_pcba'
+ columns:
+ - field: Value
+ name: Comment
+ - field: References
+ name: Designator
+ - Footprint
+ - field: _field_lcsc_part
+ name: 'LCSC Part #'
+ - field: DNP
+ name: "DNP reason"
- name: JLCPCB
comment: ZIP file for JLCPCB
type: compress
diff --git a/c3pb-heizung/generated/Manufacturers/JLCPCB/c3pb-heizung_bom_jlc.csv b/c3pb-heizung/generated/Manufacturers/JLCPCB/c3pb-heizung_bom_jlc.csv
index 7291f4711a1e2b7346b15e51183224222c23305e..2c7357276ea50faf29faadded322d8e84757996d 100644
--- a/c3pb-heizung/generated/Manufacturers/JLCPCB/c3pb-heizung_bom_jlc.csv
+++ b/c3pb-heizung/generated/Manufacturers/JLCPCB/c3pb-heizung_bom_jlc.csv
@@ -1,6 +1,8 @@
"Comment","Designator","Footprint","LCSC Part #"
-"PS1240P02BT","BZ1","Buzzer_TDK_PS1240P02BT_D12.2mm_H6.5mm","C76871"
+"22p","C29,C30","C_0402_1005Metric",""
"27p","C2,C3","C_0402_1005Metric","C1557"
+"470p","C12,C28","C_0402_1005Metric",""
+"1n","C26,C27","C_0402_1005Metric",""
"100n","C9,C10,C11,C13,C15,C16,C17,C18,C19,C20,C21,C23,C24,C25,C31,C32,C33","C_0402_1005Metric","C1525"
"2u2, 6.3V","C1,C5,C6,C7,C14,C22","C_0402_1005Metric","C12530"
"2u2, 16V","C4","C_0603_1608Metric","C23630"
@@ -17,15 +19,19 @@
"JK-SMD0603-010, 15V, 100mA","F2","Fuse_0603_1608Metric","C369142"
"Conn_01x03","J3,J5","PinHeader_1x03_P2.54mm_Vertical","C49257"
"Conn_02x05_Counter_Clockwise","J4","IDC-Header_2x05_P2.54mm_Vertical","C429962"
-"Conn_02x13_Counter_Clockwise","J1","KF250T-5.0-2*13P","C976547"
"USB_C_Receptacle_USB2.0","J2","USB_C_Receptacle_HRO_TYPE-C-31-M-12","C165948"
"AO3400A / CJ2310","Q1,Q2,Q3,Q4,Q5,Q6,Q7","SOT-23","C75882"
"1R","R32","R_0402_1005Metric","C25086"
+"27","R16,R18,R40,R41,R43,R44","R_0402_1005Metric",""
"200","R25","R_0402_1005Metric","C25087"
+"1k","R6,R9,R10,R12,R13,R14,R19,R20,R21,R22,R28,R29,R30,R31,R55,R56,R60","R_0402_1005Metric",""
"2.0k","R47,R48","R_1206_3216Metric","C17944"
+"2.0k","R64","R_0603_1608Metric",""
"2.2k, 1%","R23","R_0402_1005Metric","C25879"
-"5.1k","R15","R_0402_1005Metric","C25905"
-"10k, 1%","R24","R_0402_1005Metric","C25890"
+"5.1k","R2,R3,R15,R17,R26,R34,R35,R38,R42,R45,R46,R51,R61","R_0402_1005Metric","C25905"
+"10k","R1,R4,R7,R24,R33,R37,R52,R59,R63","R_0402_1005Metric","C25890"
+"56k","R53,R54,R57,R58","R_0402_1005Metric",""
+"100k","R27,R36","R_0402_1005Metric",""
"0R1, 0.5A","R5,R8","R_1206_3216Metric","C25334"
"30V, SDV1608H300C100NPTF","RV1,RV2","R_0603_1608Metric","C2757915"
"TS-1187A-B-A-B","SW1,SW2,SW3","SW_SPST_TS_1187A-B-A-B","C318884"
diff --git a/c3pb-heizung/generated/Manufacturers/JLCPCB/c3pb-heizung_bom_lcsc_non_pcba.csv b/c3pb-heizung/generated/Manufacturers/JLCPCB/c3pb-heizung_bom_lcsc_non_pcba.csv
new file mode 100644
index 0000000000000000000000000000000000000000..e6af9760177e9f64cff31bb5fb19694083e399ad
--- /dev/null
+++ b/c3pb-heizung/generated/Manufacturers/JLCPCB/c3pb-heizung_bom_lcsc_non_pcba.csv
@@ -0,0 +1,6 @@
+"Comment","Designator","Footprint","LCSC Part #","DNP reason"
+"PS1240P02BT","BZ1","Buzzer_TDK_PS1240P02BT_D12.2mm_H6.5mm","C76871","PCBA"
+"Conn_01x01","J6,J7","PinHeader_1x01_P2.54mm_Vertical","","PCBA"
+"Conn_02x13_Counter_Clockwise","J1","KF250T-5.0-2*13P","C976547","PCBA"
+"DNP / 0R","R39","R_0603_1608Metric","","1"
+"DNP / 1k","R49,R50","R_0402_1005Metric","","1"
diff --git a/c3pb-heizung/generated/c3pb-heizung-erc.txt b/c3pb-heizung/generated/c3pb-heizung-erc.txt
index 80def83478c50933b8892f894fbf3c4a9ffc5c63..cb1481113b8411894031f51a58917a5fa376a9ee 100644
--- a/c3pb-heizung/generated/c3pb-heizung-erc.txt
+++ b/c3pb-heizung/generated/c3pb-heizung-erc.txt
@@ -1,4 +1,4 @@
-ERC report (Fri 21 Apr 2023 05:29:44 AM CEST, Encoding UTF8)
+ERC report (Fri 21 Apr 2023 06:01:44 AM CEST, Encoding UTF8)
***** Sheet /
[label_dangling]: Label not connected to anything
diff --git a/c3pb-heizung/power.kicad_sch b/c3pb-heizung/power.kicad_sch
index 67abf671e3986abc689acc5960df44ae5b3421ae..fda6358d78a8f719f3f2df11450f4f5b341ed25d 100644
--- a/c3pb-heizung/power.kicad_sch
+++ b/c3pb-heizung/power.kicad_sch
@@ -2296,8 +2296,8 @@
(pin "1" (uuid 65ef3c57-636e-4c96-b6d2-2061f20637c5))
(pin "2" (uuid 1aff68c1-fd69-4dc2-8352-f9bdfd856403))
(pin "3" (uuid a980ad92-36da-4774-962b-1789cf9d3f4d))
- (pin "5" (uuid 7c5428af-ba6a-4a8a-9be2-8262cdd251d6))
- (pin "5" (uuid 7c5428af-ba6a-4a8a-9be2-8262cdd251d6))
+ (pin "5" (uuid 7c5428af-ba6a-4a8a-9be2-8262cdd251d7))
+ (pin "5" (uuid 7c5428af-ba6a-4a8a-9be2-8262cdd251d7))
)
(symbol (lib_id "Mechanical:MountingHole_Pad") (at 189.23 132.08 0) (unit 1)
diff --git a/c3pb-heizung/protection.kicad_sch b/c3pb-heizung/protection.kicad_sch
index 8cbfc8c5a2c6ea680d6967577b9cdecbe8ed4d4d..354ea083bcd10f19c28fb08d6dfff4bd79692e7f 100644
--- a/c3pb-heizung/protection.kicad_sch
+++ b/c3pb-heizung/protection.kicad_sch
@@ -3910,7 +3910,7 @@
(property "Datasheet" "~" (id 3) (at 111.76 92.71 0)
(effects (font (size 1.27 1.27)) hide)
)
- (property "DNP" "PCBA" (id 4) (at 111.76 92.71 90)
+ (property "DNP" "1" (id 4) (at 111.76 92.71 90)
(effects (font (size 1.27 1.27)) hide)
)
(pin "1" (uuid d3ca1f10-fc3e-434e-89e0-b731138c00c5))