Skip to content

Commit 29fef8f

Browse files
authored
Fix JLC electrolytic cap parsing (#423)
This fixes cases where there is a dot in the dimensions and allows smaller 6.3x7.7mm caps to be parsed. ... and rebaseline the reference netlists
1 parent 3dad7fd commit 29fef8f

File tree

7 files changed

+149
-148
lines changed

7 files changed

+149
-148
lines changed

edg/parts/JlcElectrolyticCapacitor.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77

88
class JlcAluminumCapacitor(PartsTableSelectorFootprint, JlcTableSelector, TableCapacitor, AluminumCapacitor):
99
DESCRIPTION_PARSERS: List[DescriptionParser] = [
10-
(re.compile(".* (\S+F).* (\S+V).* (±\S+%).*([\d\.]+x[\d\.]+)mm Aluminum Electrolytic Capacitors.*"),
10+
# the negative match prevents the dimension substring from partially eaten
11+
(re.compile(".* (\S+F).* (\S+V).* (±\S+%).*[^\d\.]([\d\.]+x[\d\.]+)mm Aluminum Electrolytic Capacitors.*"),
1112
lambda match: { # discard the HF impedance parameter
1213
TableCapacitor.NOMINAL_CAPACITANCE: PartParserUtil.parse_value(match.group(1), 'F'),
1314
TableCapacitor.CAPACITANCE: PartParserUtil.parse_abs_tolerance(

examples/IotCurtainCrawler/IotCurtainCrawler.net

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -578,14 +578,14 @@
578578
(tstamps "0b6902a7"))
579579
(comp (ref "RC14")
580580
(value "drv.vm_cap1")
581-
(footprint "Capacitor_SMD:CP_Elec_8x10")
581+
(footprint "Capacitor_SMD:CP_Elec_6.3x7.7")
582582
(property (name "Sheetname") (value "drv"))
583583
(property (name "Sheetfile") (value "edg.parts.MotorDriver_Drv8870.Drv8870"))
584584
(property (name "edg_path") (value "drv.vm_cap1.cap"))
585585
(property (name "edg_short_path") (value "drv.vm_cap1"))
586586
(property (name "edg_refdes") (value "RC14"))
587-
(property (name "edg_part") (value "VEJ470M1JTR-0810 (Lelon)"))
588-
(property (name "edg_value") (value "2000hrs@105℃ -45℃~+105℃ 47uF 10mm 63V 8mm ±20% SMD,8x10mm Aluminum Electrolytic Capacitors - SMD ROHS"))
587+
(property (name "edg_part") (value "RT1H470M0607 (ROQANG)"))
588+
(property (name "edg_value") (value "-40℃~+105℃ 2000hrs@105℃ 47uF 7.7mm 50V 6.3mm ±20% SMD,6.3x7.7mm Aluminum Electrolytic Capacitors - SMD ROHS"))
589589
(sheetpath (names "/drv/") (tstamps "/0289014d/"))
590590
(tstamps "0b6a02a8"))
591591
(comp (ref "RR11")

examples/IotCurtainCrawler/IotCurtainCrawler.svgpcb.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -232,22 +232,22 @@ const RJ5 = board.add(Molex_PicoBlade_53398_0271_1x02_1MP_P1_25mm_Vertical, {
232232
})
233233
// drv.ic
234234
const RU6 = board.add(HSOP_8_1EP_3_9x4_9mm_P1_27mm_EP2_41x3_1mm, {
235-
translate: pt(1.740, 0.492), rotate: 0,
235+
translate: pt(1.740, 0.425), rotate: 0,
236236
id: 'RU6'
237237
})
238238
// drv.vm_cap0.cap
239239
const RC13 = board.add(C_0603_1608Metric, {
240-
translate: pt(2.202, 0.415), rotate: 0,
240+
translate: pt(1.983, 0.475), rotate: 0,
241241
id: 'RC13'
242242
})
243243
// drv.vm_cap1.cap
244-
const RC14 = board.add(CP_Elec_8x10, {
245-
translate: pt(1.811, 0.173), rotate: 0,
244+
const RC14 = board.add(CP_Elec_6_3x7_7, {
245+
translate: pt(1.780, 0.140), rotate: 0,
246246
id: 'RC14'
247247
})
248248
// drv.isen_res.res
249249
const RR11 = board.add(R_1206_3216Metric, {
250-
translate: pt(2.015, 0.430), rotate: 0,
250+
translate: pt(2.015, 0.363), rotate: 0,
251251
id: 'RR11'
252252
})
253253

examples/IotRollerBlinds/IotRollerBlinds.net

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -446,14 +446,14 @@
446446
(tstamps "0b6902a7"))
447447
(comp (ref "BC10")
448448
(value "drv.vm_cap1")
449-
(footprint "Capacitor_SMD:CP_Elec_8x10")
449+
(footprint "Capacitor_SMD:CP_Elec_6.3x7.7")
450450
(property (name "Sheetname") (value "drv"))
451451
(property (name "Sheetfile") (value "edg.parts.MotorDriver_Drv8870.Drv8870"))
452452
(property (name "edg_path") (value "drv.vm_cap1.cap"))
453453
(property (name "edg_short_path") (value "drv.vm_cap1"))
454454
(property (name "edg_refdes") (value "BC10"))
455-
(property (name "edg_part") (value "VEJ470M1JTR-0810 (Lelon)"))
456-
(property (name "edg_value") (value "2000hrs@105℃ -45℃~+105℃ 47uF 10mm 63V 8mm ±20% SMD,8x10mm Aluminum Electrolytic Capacitors - SMD ROHS"))
455+
(property (name "edg_part") (value "RT1H470M0607 (ROQANG)"))
456+
(property (name "edg_value") (value "-40℃~+105℃ 2000hrs@105℃ 47uF 7.7mm 50V 6.3mm ±20% SMD,6.3x7.7mm Aluminum Electrolytic Capacitors - SMD ROHS"))
457457
(sheetpath (names "/drv/") (tstamps "/0289014d/"))
458458
(tstamps "0b6a02a8"))
459459
(comp (ref "BR10")

examples/IotRollerBlinds/IotRollerBlinds.svgpcb.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -177,22 +177,22 @@ const BJ5 = board.add(JST_SH_SM04B_SRSS_TB_1x04_1MP_P1_00mm_Horizontal, {
177177
})
178178
// drv.ic
179179
const BU3 = board.add(HSOP_8_1EP_3_9x4_9mm_P1_27mm_EP2_41x3_1mm, {
180-
translate: pt(1.740, 0.492), rotate: 0,
180+
translate: pt(1.740, 0.425), rotate: 0,
181181
id: 'BU3'
182182
})
183183
// drv.vm_cap0.cap
184184
const BC9 = board.add(C_0603_1608Metric, {
185-
translate: pt(2.202, 0.415), rotate: 0,
185+
translate: pt(1.983, 0.475), rotate: 0,
186186
id: 'BC9'
187187
})
188188
// drv.vm_cap1.cap
189-
const BC10 = board.add(CP_Elec_8x10, {
190-
translate: pt(1.811, 0.173), rotate: 0,
189+
const BC10 = board.add(CP_Elec_6_3x7_7, {
190+
translate: pt(1.780, 0.140), rotate: 0,
191191
id: 'BC10'
192192
})
193193
// drv.isen_res.res
194194
const BR10 = board.add(R_1206_3216Metric, {
195-
translate: pt(2.015, 0.430), rotate: 0,
195+
translate: pt(2.015, 0.363), rotate: 0,
196196
id: 'BR10'
197197
})
198198

examples/UsbSourceMeasure/UsbSourceMeasure.net

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,14 +74,14 @@
7474
(tstamps "12ed03cf"))
7575
(comp (ref "C1")
7676
(value "cap_vusb")
77-
(footprint "Capacitor_SMD:CP_Elec_8x10")
77+
(footprint "Capacitor_SMD:CP_Elec_6.3x7.7")
7878
(property (name "Sheetname") (value ""))
7979
(property (name "Sheetfile") (value ""))
8080
(property (name "edg_path") (value "cap_vusb.cap"))
8181
(property (name "edg_short_path") (value "cap_vusb"))
8282
(property (name "edg_refdes") (value "C1"))
83-
(property (name "edg_part") (value "VEJ101M1HTR-0810 (Lelon)"))
84-
(property (name "edg_value") (value "2000hrs@105℃ -45℃~+105℃ 100uF 10mm 50V 8mm ±20% SMD,8x10mm Aluminum Electrolytic Capacitors - SMD ROHS"))
83+
(property (name "edg_part") (value "EEEFTH101XAP (PANASONIC)"))
84+
(property (name "edg_value") (value "-45℃~+105℃ 2000hrs@105℃ 100uF 7.7mm 50V 6.3mm ±20% SMD,6.3x7.7mm Aluminum Electrolytic Capacitors - SMD ROHS"))
8585
(sheetpath (names "/") (tstamps "/"))
8686
(tstamps "0ec10354"))
8787
(comp (ref "D1")

0 commit comments

Comments
 (0)