Simplify value strings in netlisting

electronics_abstract_parts/test_kicad_import_netlist.py

@@ -56,12 +56,12 @@ def test_netlist(self):
     ])
     self.assertEqual(net.blocks['U1'], FBlock('Package_TO_SOT_SMD:SOT-23', 'U1',
                                               # expected value is wonky because netlisting combines part and value
-                                              'Sensor_Temperature:MCP9700AT-ETT', 'Sensor_Temperature:MCP9700AT-ETT - MCP9700AT-ETT',
+                                              'Sensor_Temperature:MCP9700AT-ETT', 'MCP9700AT-ETT',
                                               ['dut', 'U1'], ['U1'],
                                               ['electronics_model.KiCadSchematicBlock.KiCadBlackbox']))
     self.assertEqual(net.blocks['SYM1'], FBlock('Symbol:Symbol_ESD-Logo_CopperTop', 'SYM1',
                                                 # expected value is wonky because netlisting combines part and value
-                                                'Graphic:SYM_ESD_Small', 'Graphic:SYM_ESD_Small - SYM_ESD_Small',
+                                                'Graphic:SYM_ESD_Small', 'SYM_ESD_Small',
                                                 ['dut', 'SYM1'], ['SYM1'],
                                                 ['electronics_model.KiCadSchematicBlock.KiCadBlackbox']))
     self.assertEqual(net.blocks['res'], FBlock('Resistor_SMD:R_0603_1608Metric', 'R1', '', '',

electronics_model/NetlistGenerator.py

@@ -143,22 +143,12 @@ def process_blocklike(self, path: TransformUtil.Path, block: Union[edgir.Link, e
         f"({mfr})" if mfr else ""
       ]
       part_str = " ".join(filter(None, part_comps))
-      value_comps = [
-        part_str,
-        value
-      ]
-      value_str = " - ".join(filter(None, value_comps))
-
+      value_str = value if value else (part if part else '')
       self.blocks[path] = kicad.Block(
         footprint_name,
         refdes,
         part_str,
-
-        # Uncomment one to set value field
-        # TODO this should be a user flag
-        value_str,  # including manufacturer
-        # lcsc_part or "",
-
+        value_str,
         list(path.blocks),
         list(self.short_paths[path].blocks),
         self.class_paths[path],

examples/CanAdapter/CanAdapter.net

@@ -1,7 +1,7 @@
 (export (version D)
 (components
 (comp (ref "usb.conn")
-  (value "COM-15111 (Sparkfun)")
+  (value "COM-15111")
   (footprint "Connector_USB:USB_C_Receptacle_XKB_U262-16XN-4BVC11")
   (property (name "Sheetname") (value "usb"))
   (property (name "Sheetfile") (value "electronics_lib.UsbPorts.UsbCReceptacle"))
@@ -34,7 +34,7 @@
   (sheetpath (names "/usb/cc_pull/") (tstamps "/02aa014b/0b4c02e3/"))
   (tstamps "022400f9"))
 (comp (ref "usb_reg.ic")
-  (value "AP2204K-3.3 (Diodes Incorporated)")
+  (value "AP2204K-3.3")
   (footprint "Package_TO_SOT_SMD:SOT-23-5")
   (property (name "Sheetname") (value "usb_reg"))
   (property (name "Sheetfile") (value "electronics_lib.LinearRegulators.Ap2204k"))
@@ -78,7 +78,7 @@
   (sheetpath (names "/mcu/") (tstamps "/02850146/"))
   (tstamps "02ae014f"))
 (comp (ref "mcu.ic")
-  (value "LPC1549JBD48 (NXP)")
+  (value "LPC1549JBD48")
   (footprint "Package_QFP:LQFP-48_7x7mm_P0.5mm")
   (property (name "Sheetname") (value "mcu"))
   (property (name "Sheetfile") (value "electronics_lib.Microcontroller_Lpc1549.Lpc1549_48"))
@@ -243,7 +243,7 @@
   (sheetpath (names "/mcu/") (tstamps "/02850146/"))
   (tstamps "1ab00431"))
 (comp (ref "mcu.crystal.package")
-  (value "X322512MSB4SI (Yangxing Tech) - 12MHz SMD Crystal Resonator 20pF ±10ppm ±30ppm -40℃~+85℃ SMD3225-4P Crystals ROHS")
+  (value "12MHz SMD Crystal Resonator 20pF ±10ppm ±30ppm -40℃~+85℃ SMD3225-4P Crystals ROHS")
   (footprint "Crystal:Crystal_SMD_3225-4Pin_3.2x2.5mm")
   (property (name "Sheetname") (value "crystal"))
   (property (name "Sheetfile") (value "electronics_abstract_parts.AbstractCrystal.OscillatorCrystal"))
@@ -276,7 +276,7 @@
   (sheetpath (names "/mcu/crystal/") (tstamps "/02850146/0c1b0303/"))
   (tstamps "05e801f6"))
 (comp (ref "usb_esd")
-  (value "TPD2E009 (Texas Instruments)")
+  (value "TPD2E009")
   (footprint "Package_TO_SOT_SMD:SOT-23")
   (property (name "Sheetname") (value ""))
   (property (name "Sheetfile") (value ""))
@@ -287,7 +287,7 @@
   (sheetpath (names "/") (tstamps "/"))
   (tstamps "0bcb02e6"))
 (comp (ref "xcvr.ic")
-  (value "ISO1050DUB (Texas Instruments)")
+  (value "ISO1050DUB")
   (footprint "Package_SO:SOP-8_6.62x9.15mm_P2.54mm")
   (property (name "Sheetname") (value "xcvr"))
   (property (name "Sheetfile") (value "electronics_lib.CanTransceiver_Iso1050.Iso1050dub"))
@@ -342,7 +342,7 @@
   (sheetpath (names "/") (tstamps "/"))
   (tstamps "08e0027c"))
 (comp (ref "lcd.device")
-  (value "FH12-8S-0.5SH (Hirose)")
+  (value "FH12-8S-0.5SH")
   (footprint "Connector_FFC-FPC:Hirose_FH12-8S-0.5SH_1x08-1MP_P0.50mm_Horizontal")
   (property (name "Sheetname") (value "lcd"))
   (property (name "Sheetfile") (value "electronics_lib.Lcd_Qt096t_if09.Qt096t_if09"))
@@ -375,7 +375,7 @@
   (sheetpath (names "/lcd/") (tstamps "/02710134/"))
   (tstamps "0b6402d2"))
 (comp (ref "rgb_usb.package")
-  (value "EAST1616RGBB2 (Everlight Electronics Co Ltd)")
+  (value "EAST1616RGBB2")
   (footprint "LED_SMD:LED_LiteOn_LTST-C19HE1WT")
   (property (name "Sheetname") (value "rgb_usb"))
   (property (name "Sheetfile") (value "electronics_abstract_parts.AbstractLed.IndicatorSinkRgbLed"))
@@ -419,7 +419,7 @@
   (sheetpath (names "/rgb_usb/") (tstamps "/0b9c02e5/"))
   (tstamps "0ed20352"))
 (comp (ref "rgb_can.package")
-  (value "EAST1616RGBB2 (Everlight Electronics Co Ltd)")
+  (value "EAST1616RGBB2")
   (footprint "LED_SMD:LED_LiteOn_LTST-C19HE1WT")
   (property (name "Sheetname") (value "rgb_can"))
   (property (name "Sheetfile") (value "electronics_abstract_parts.AbstractLed.IndicatorSinkRgbLed"))
@@ -463,7 +463,7 @@
   (sheetpath (names "/rgb_can/") (tstamps "/0b4e02cd/"))
   (tstamps "0ed20352"))
 (comp (ref "can")
-  (value "5023520500 (Molex)")
+  (value "5023520500")
   (footprint "calisco:Molex_DuraClik_502352_1x05_P2.00mm_Horizontal")
   (property (name "Sheetname") (value ""))
   (property (name "Sheetfile") (value ""))
@@ -474,7 +474,7 @@
   (sheetpath (names "/") (tstamps "/"))
   (tstamps "025c0133"))
 (comp (ref "can_reg.ic")
-  (value "AP2204K-5.0 (Diodes Incorporated)")
+  (value "AP2204K-5.0")
   (footprint "Package_TO_SOT_SMD:SOT-23-5")
   (property (name "Sheetname") (value "can_reg"))
   (property (name "Sheetfile") (value "electronics_lib.LinearRegulators.Ap2204k"))

examples/Datalogger/Datalogger.net

@@ -1,7 +1,7 @@
 (export (version D)
 (components
 (comp (ref "pwr_conn")
-  (value "5600200320 (Molex)")
+  (value "5600200320")
   (footprint "calisco:Molex_DuraClik_vert_3pin")
   (property (name "Sheetname") (value ""))
   (property (name "Sheetfile") (value ""))
@@ -12,7 +12,7 @@
   (sheetpath (names "/") (tstamps "/"))
   (tstamps "0f730367"))
 (comp (ref "usb_conn.conn")
-  (value "COM-15111 (Sparkfun)")
+  (value "COM-15111")
   (footprint "Connector_USB:USB_C_Receptacle_XKB_U262-16XN-4BVC11")
   (property (name "Sheetname") (value "usb_conn"))
   (property (name "Sheetfile") (value "electronics_lib.UsbPorts.UsbCReceptacle"))
@@ -45,7 +45,7 @@
   (sheetpath (names "/usb_conn/cc_pull/") (tstamps "/0f1f0358/0b4c02e3/"))
   (tstamps "022400f9"))
 (comp (ref "bat")
-  (value "106 (Keystone)")
+  (value "106")
   (footprint "Battery:BatteryHolder_Keystone_106_1x20mm")
   (property (name "Sheetname") (value ""))
   (property (name "Sheetfile") (value ""))
@@ -56,7 +56,7 @@
   (sheetpath (names "/") (tstamps "/"))
   (tstamps "025f0138"))
 (comp (ref "pwr_5v.ic")
-  (value "TPS561201 (Texas Instruments)")
+  (value "TPS561201")
   (footprint "Package_TO_SOT_SMD:SOT-23-6")
   (property (name "Sheetname") (value "pwr_5v"))
   (property (name "Sheetfile") (value "electronics_lib.BuckConverter_TexasInstruments.Tps561201"))
@@ -111,7 +111,7 @@
   (sheetpath (names "/pwr_5v/") (tstamps "/08be0264/"))
   (tstamps "0f330353"))
 (comp (ref "pwr_5v.power_path.inductor")
-  (value "NR5040T220M (Taiyo Yuden) - 1.4A 22uH ±20% 126mΩ SMD Power Inductors ROHS")
+  (value "1.4A 22uH ±20% 126mΩ SMD Power Inductors ROHS")
   (footprint "Inductor_SMD:L_Taiyo-Yuden_NR-50xx")
   (property (name "Sheetname") (value "power_path"))
   (property (name "Sheetfile") (value "electronics_abstract_parts.AbstractPowerConverters.BuckConverterPowerPath"))
@@ -155,7 +155,7 @@
   (sheetpath (names "/buffer/") (tstamps "/08a1027b/"))
   (tstamps "066d021f"))
 (comp (ref "buffer.fet")
-  (value "UT9435HG-AA3-R (UTC(Unisonic Tech)) - 30V 5.3A 50mΩ@10V,5.3A 2.5W 3V@250μA P Channel SOT-223 MOSFETs ROHS")
+  (value "30V 5.3A 50mΩ@10V,5.3A 2.5W 3V@250μA P Channel SOT-223 MOSFETs ROHS")
   (footprint "Package_TO_SOT_SMD:SOT-223-3_TabPin2")
   (property (name "Sheetname") (value "buffer"))
   (property (name "Sheetfile") (value "electronics_lib.PowerConditioning.BufferedSupply"))
@@ -166,7 +166,7 @@
   (sheetpath (names "/buffer/") (tstamps "/08a1027b/"))
   (tstamps "02730140"))
 (comp (ref "buffer.diode")
-  (value "B0520W (Shikues) - 20V 390mV@500mA 500mA SOD-123 Schottky Barrier Diodes (SBD) ROHS")
+  (value "20V 390mV@500mA 500mA SOD-123 Schottky Barrier Diodes (SBD) ROHS")
   (footprint "Diode_SMD:D_SOD-123")
   (property (name "Sheetname") (value "buffer"))
   (property (name "Sheetfile") (value "electronics_lib.PowerConditioning.BufferedSupply"))
@@ -199,7 +199,7 @@
   (sheetpath (names "/buffer/set/") (tstamps "/08a1027b/029a014d/"))
   (tstamps "175b043f"))
 (comp (ref "buffer.amp.ic")
-  (value "TLV9061S (Texas Instruments)")
+  (value "TLV9061S")
   (footprint "Package_TO_SOT_SMD:SOT-23-6")
   (property (name "Sheetname") (value "amp"))
   (property (name "Sheetfile") (value "electronics_lib.Opamp_Tlv9061.Tlv9061"))
@@ -232,7 +232,7 @@
   (sheetpath (names "/buffer/") (tstamps "/08a1027b/"))
   (tstamps "025e0135"))
 (comp (ref "pwr_3v3.ic")
-  (value "LDL1117S33R (STMicroelectronics)")
+  (value "LDL1117S33R")
   (footprint "Package_TO_SOT_SMD:SOT-223-3_TabPin2")
   (property (name "Sheetname") (value "pwr_3v3"))
   (property (name "Sheetfile") (value "electronics_lib.LinearRegulators.Ldl1117"))
@@ -265,7 +265,7 @@
   (sheetpath (names "/pwr_3v3/") (tstamps "/0b4f0295/"))
   (tstamps "0be902ec"))
 (comp (ref "outline")
-  (value "PN-1332-CMB (Bud Industries)")
+  (value "PN-1332-CMB")
   (footprint "calisco:Outline_150mm_70mm_PNX-91432")
   (property (name "Sheetname") (value ""))
   (property (name "Sheetfile") (value ""))
@@ -287,7 +287,7 @@
   (sheetpath (names "/") (tstamps "/"))
   (tstamps "042401a8"))
 (comp (ref "mcu.swd")
-  (value "PinHeader1.27 Shrouded 2x5 (Generic)")
+  (value "PinHeader1.27 Shrouded 2x5")
   (footprint "Connector_PinHeader_1.27mm:PinHeader_2x05_P1.27mm_Vertical_SMD")
   (property (name "Sheetname") (value "mcu"))
   (property (name "Sheetfile") (value "electronics_lib.Microcontroller_Lpc1549.Lpc1549_64"))
@@ -298,7 +298,7 @@
   (sheetpath (names "/mcu/") (tstamps "/02850146/"))
   (tstamps "02ae014f"))
 (comp (ref "mcu.ic")
-  (value "LPC1549JBD64 (NXP)")
+  (value "LPC1549JBD64")
   (footprint "Package_QFP:LQFP-64_10x10mm_P0.5mm")
   (property (name "Sheetname") (value "mcu"))
   (property (name "Sheetfile") (value "electronics_lib.Microcontroller_Lpc1549.Lpc1549_64"))
@@ -463,7 +463,7 @@
   (sheetpath (names "/mcu/") (tstamps "/02850146/"))
   (tstamps "1ab00431"))
 (comp (ref "mcu.crystal.package")
-  (value "X322512MSB4SI (Yangxing Tech) - 12MHz SMD Crystal Resonator 20pF ±10ppm ±30ppm -40℃~+85℃ SMD3225-4P Crystals ROHS")
+  (value "12MHz SMD Crystal Resonator 20pF ±10ppm ±30ppm -40℃~+85℃ SMD3225-4P Crystals ROHS")
   (footprint "Crystal:Crystal_SMD_3225-4Pin_3.2x2.5mm")
   (property (name "Sheetname") (value "crystal"))
   (property (name "Sheetfile") (value "electronics_abstract_parts.AbstractCrystal.OscillatorCrystal"))
@@ -496,7 +496,7 @@
   (sheetpath (names "/mcu/crystal/") (tstamps "/02850146/0c1b0303/"))
   (tstamps "05e801f6"))
 (comp (ref "can.conn")
-  (value "5600200520 (Molex)")
+  (value "5600200520")
   (footprint "calisco:Molex_DuraClik_vert_5pin")
   (property (name "Sheetname") (value "can"))
   (property (name "Sheetfile") (value "examples.test_high_switch.CalSolCanBlock"))
@@ -518,7 +518,7 @@
   (sheetpath (names "/can/") (tstamps "/025c0133/"))
   (tstamps "0e780345"))
 (comp (ref "can.reg.ic")
-  (value "AP2204K-5.0 (Diodes Incorporated)")
+  (value "AP2204K-5.0")
   (footprint "Package_TO_SOT_SMD:SOT-23-5")
   (property (name "Sheetname") (value "reg"))
   (property (name "Sheetfile") (value "electronics_lib.LinearRegulators.Ap2204k"))
@@ -562,7 +562,7 @@
   (sheetpath (names "/can/") (tstamps "/025c0133/"))
   (tstamps "027c013d"))
 (comp (ref "can.transceiver.ic")
-  (value "ISO1050DUB (Texas Instruments)")
+  (value "ISO1050DUB")
   (footprint "Package_SO:SOP-8_6.62x9.15mm_P2.54mm")
   (property (name "Sheetname") (value "transceiver"))
   (property (name "Sheetfile") (value "electronics_lib.CanTransceiver_Iso1050.Iso1050dub"))
@@ -595,7 +595,7 @@
   (sheetpath (names "/can/transceiver/") (tstamps "/025c0133/1c0604a7/"))
   (tstamps "0aff02c6"))
 (comp (ref "sd")
-  (value "145638009511859+ (Kyocera)")
+  (value "145638009511859+")
   (footprint "Connector_Card:SD_Kyocera_145638009511859+")
   (property (name "Sheetname") (value ""))
   (property (name "Sheetfile") (value ""))
@@ -617,7 +617,7 @@
   (sheetpath (names "/") (tstamps "/"))
   (tstamps "0b5202e4"))
 (comp (ref "xbee.ic")
-  (value "XBP9B-* (Digi International)")
+  (value "XBP9B-*")
   (footprint "Sparkfun_RF:XBEE")
   (property (name "Sheetname") (value "xbee"))
   (property (name "Sheetfile") (value "electronics_lib.RfModules.Xbee_S3b"))
@@ -672,7 +672,7 @@
   (sheetpath (names "/xbee_assoc/") (tstamps "/169c041d/"))
   (tstamps "0296014b"))
 (comp (ref "rtc.ic")
-  (value "PCF2129T (NXP)")
+  (value "PCF2129T")
   (footprint "Package_SO:SOIC-16W_7.5x10.3mm_P1.27mm")
   (property (name "Sheetname") (value "rtc"))
   (property (name "Sheetfile") (value "electronics_lib.Rtc_Pcf2129.Pcf2129"))
@@ -749,7 +749,7 @@
   (sheetpath (names "/eink/") (tstamps "/041a01a8/"))
   (tstamps "013700cd"))
 (comp (ref "eink.boost_sw")
-  (value "AO3400A (Alpha & Omega Semicon) - 30V 5.7A 26.5mΩ@10V,5.7A 1.4W 1.5V@250μA N Channel SOT-23-3L MOSFETs ROHS")
+  (value "30V 5.7A 26.5mΩ@10V,5.7A 1.4W 1.5V@250μA N Channel SOT-23-3L MOSFETs ROHS")
   (footprint "Package_TO_SOT_SMD:SOT-23")
   (property (name "Sheetname") (value "eink"))
   (property (name "Sheetfile") (value "electronics_lib.EInk_E2154fs091.E2154fs091"))
@@ -760,7 +760,7 @@
   (sheetpath (names "/eink/") (tstamps "/041a01a8/"))
   (tstamps "0f440371"))
 (comp (ref "eink.boost_ind")
-  (value "MPH201214S100MT (Sunlord) - 1A 10uH ±20% 375mΩ SMD,2.0x1.25x1.45mm Inductors (SMD) ROHS")
+  (value "1A 10uH ±20% 375mΩ SMD,2.0x1.25x1.45mm Inductors (SMD) ROHS")
   (footprint "Inductor_SMD:L_0805_2012Metric")
   (property (name "Sheetname") (value "eink"))
   (property (name "Sheetfile") (value "electronics_lib.EInk_E2154fs091.E2154fs091"))
@@ -903,7 +903,7 @@
   (sheetpath (names "/eink/") (tstamps "/041a01a8/"))
   (tstamps "0eff0349"))
 (comp (ref "eink.boost_dio")
-  (value "SS24 (DIYI Elec Tech) - 40V 500mV@2A 2A SMA(DO-214AC) Schottky Barrier Diodes (SBD) ROHS")
+  (value "40V 500mV@2A 2A SMA(DO-214AC) Schottky Barrier Diodes (SBD) ROHS")
   (footprint "Diode_SMD:D_SMA")
   (property (name "Sheetname") (value "eink"))
   (property (name "Sheetfile") (value "electronics_lib.EInk_E2154fs091.E2154fs091"))
@@ -914,7 +914,7 @@
   (sheetpath (names "/eink/") (tstamps "/041a01a8/"))
   (tstamps "12db03c3"))
 (comp (ref "eink.vgl_dio")
-  (value "SS24 (DIYI Elec Tech) - 40V 500mV@2A 2A SMA(DO-214AC) Schottky Barrier Diodes (SBD) ROHS")
+  (value "40V 500mV@2A 2A SMA(DO-214AC) Schottky Barrier Diodes (SBD) ROHS")
   (footprint "Diode_SMD:D_SMA")
   (property (name "Sheetname") (value "eink"))
   (property (name "Sheetfile") (value "electronics_lib.EInk_E2154fs091.E2154fs091"))
@@ -925,7 +925,7 @@
   (sheetpath (names "/eink/") (tstamps "/041a01a8/"))
   (tstamps "0bb002e5"))
 (comp (ref "eink.boot_dio")
-  (value "SS24 (DIYI Elec Tech) - 40V 500mV@2A 2A SMA(DO-214AC) Schottky Barrier Diodes (SBD) ROHS")
+  (value "40V 500mV@2A 2A SMA(DO-214AC) Schottky Barrier Diodes (SBD) ROHS")
   (footprint "Diode_SMD:D_SMA")
   (property (name "Sheetname") (value "eink"))
   (property (name "Sheetfile") (value "electronics_lib.EInk_E2154fs091.E2154fs091"))
@@ -936,7 +936,7 @@
   (sheetpath (names "/eink/") (tstamps "/041a01a8/"))
   (tstamps "0ee80350"))
 (comp (ref "ext")
-  (value "BlueSMiRF (Sparkfun)")
+  (value "BlueSMiRF")
   (footprint "Connector_PinHeader_2.54mm:PinHeader_1x06_P2.54mm_Vertical")
   (property (name "Sheetname") (value ""))
   (property (name "Sheetfile") (value ""))
@@ -947,7 +947,7 @@
   (sheetpath (names "/") (tstamps "/"))
   (tstamps "02960152"))
 (comp (ref "rgb1.package")
-  (value "EAST1616RGBB2 (Everlight Electronics Co Ltd)")
+  (value "EAST1616RGBB2")
   (footprint "LED_SMD:LED_LiteOn_LTST-C19HE1WT")
   (property (name "Sheetname") (value "rgb1"))
   (property (name "Sheetfile") (value "electronics_abstract_parts.AbstractLed.IndicatorSinkRgbLed"))
@@ -991,7 +991,7 @@
   (sheetpath (names "/rgb1/") (tstamps "/03f6016d/"))
   (tstamps "0ed20352"))
 (comp (ref "rgb2.package")
-  (value "EAST1616RGBB2 (Everlight Electronics Co Ltd)")
+  (value "EAST1616RGBB2")
   (footprint "LED_SMD:LED_LiteOn_LTST-C19HE1WT")
   (property (name "Sheetname") (value "rgb2"))
   (property (name "Sheetfile") (value "electronics_abstract_parts.AbstractLed.IndicatorSinkRgbLed"))
@@ -1035,7 +1035,7 @@
   (sheetpath (names "/rgb2/") (tstamps "/03f7016e/"))
   (tstamps "0ed20352"))
 (comp (ref "rgb3.package")
-  (value "EAST1616RGBB2 (Everlight Electronics Co Ltd)")
+  (value "EAST1616RGBB2")
   (footprint "LED_SMD:LED_LiteOn_LTST-C19HE1WT")
   (property (name "Sheetname") (value "rgb3"))
   (property (name "Sheetfile") (value "electronics_abstract_parts.AbstractLed.IndicatorSinkRgbLed"))