From ca599b03a57629c2521e638b3e1d15e1f1ee05a7 Mon Sep 17 00:00:00 2001 From: "Salvador E. Tropea" Date: Thu, 3 Jun 2021 12:28:28 -0300 Subject: [PATCH] Adapted the KiCost tests to the current KiCost code. --- submodules/.gitignore | 2 + submodules/KiCost | 2 +- .../5_1_6/KiCost/kibom-variant_2c-bom.csv | 28 ++++---- .../KiCost/kibom-variant_2c-bom_dk_mou.csv | 26 +++---- .../kibom-variant_2c-bom_dk_mou_dnf.csv | 26 +++---- .../5_1_6/KiCost/kibom-variant_2c-bom_dnf.csv | 32 ++++----- tests/reference/5_1_6/KiCost/merge_1-bom.csv | 72 +++++++++---------- tests/reference/5_1_6/KiCost/simple.csv | 4 +- .../reference/5_1_6/KiCost/simple_default.csv | 4 +- .../5_1_6/KiCost/simple_production.csv | 6 +- tests/reference/5_1_6/KiCost/simple_test.csv | 6 +- 11 files changed, 105 insertions(+), 103 deletions(-) create mode 100644 submodules/.gitignore diff --git a/submodules/.gitignore b/submodules/.gitignore new file mode 100644 index 00000000..56c565cb --- /dev/null +++ b/submodules/.gitignore @@ -0,0 +1,2 @@ +KiCost.* +rotate.py diff --git a/submodules/KiCost b/submodules/KiCost index 1671c439..7906366a 160000 --- a/submodules/KiCost +++ b/submodules/KiCost @@ -1 +1 @@ -Subproject commit 1671c43995571312c9bab13cac4cbea2210c0729 +Subproject commit 7906366a496dc5cc3549152a16815aa403e0ea61 diff --git a/tests/reference/5_1_6/KiCost/kibom-variant_2c-bom.csv b/tests/reference/5_1_6/KiCost/kibom-variant_2c-bom.csv index c8ecbc54..383aba05 100644 --- a/tests/reference/5_1_6/KiCost/kibom-variant_2c-bom.csv +++ b/tests/reference/5_1_6/KiCost/kibom-variant_2c-bom.csv @@ -1,20 +1,20 @@ -,,,KiBot Bill of Materials,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -,,,Schematic:,kibom-variant_2c,,,,,Board Qty:,50,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -,,,Variant:,default,,,,,Unit Cost:,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -,,,Revision:,A,,,,,Total Cost:,0,,,,0,0,,,,0,0,,,,0,0,,,,0,0,,,,0,0,,,,0,0,,,,0,0,,,,0,0,,,,0,0 -,,,Date:,2021-04-06,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -,,,KiCad Version:,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +,,,KiBot Bill of Materials,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +,,,Schematic:,kibom-variant_2c,,,,,Board Qty:,50,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +,,,Variant:,default,,,,,Unit Cost:,0.002,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +,,,Revision:,A,,,,,Total Cost:,0.1,,,,,0,0 of 1 parts found,,,,,0.61,1 of 1 parts found,,,,,0.7292,1 of 1 parts found,,,,,0,0 of 1 parts found,,,,,0.5,1 of 1 parts found,,,,,0.1,1 of 1 parts found,,,,,0,0 of 1 parts found,,,,,0,0 of 1 parts found,,,,,0,0 of 1 parts found +,,,Date:,2021-04-06,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +,,,KiCad Version:,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -Global Part Info,,,,,,,,,,,Arrow,,,,,Digi-Key,,,,,Farnell,,,,,LCSC,,,,,Mouser,,,,,Newark,,,,,RS Components,,,,,TME,,,,,test,,,, -References,Value,Real value,Tolerancia,Voltage,Footprint,Manufacturer,Manufacturer P/N,Build Quantity,Unit$,Ext$,Avail,Purch,Unit$,Ext$,Cat#,Avail,Purch,Unit$,Ext$,Cat#,Avail,Purch,Unit$,Ext$,Cat#,Avail,Purch,Unit$,Ext$,Cat#,Avail,Purch,Unit$,Ext$,Cat#,Avail,Purch,Unit$,Ext$,Cat#,Avail,Purch,Unit$,Ext$,Cat#,Avail,Purch,Unit$,Ext$,Cat#,Avail,Purch,Unit$,Ext$,Cat# -R1 R2,1k,1000,1%,,,Bourns,CR0603-JW-102ELF,100,0,0,,,,,,51387,,0,0,CR0603-JW-102ELFCT-ND,55000,,0,0,2333561,,,,,,52251,,0,0,652CR0603JW102ELF,110000,,0,0,02J2284,,,,,,,,,,,,,,, +Global Part Info,,,,,,,,,,,Arrow,,,,,,Digi-Key,,,,,,Farnell,,,,,,LCSC,,,,,,Mouser,,,,,,Newark,,,,,,RS Components,,,,,,TME,,,,,,test,,,,, +References,Value,Real value,Tolerancia,Voltage,Footprint,Manufacturer,Manufacturer P/N,Build Quantity,Unit$,Ext$,Avail,Purch,Unit$,MOQ,Ext$,Cat#,Avail,Purch,Unit$,MOQ,Ext$,Cat#,Avail,Purch,Unit$,MOQ,Ext$,Cat#,Avail,Purch,Unit$,MOQ,Ext$,Cat#,Avail,Purch,Unit$,MOQ,Ext$,Cat#,Avail,Purch,Unit$,MOQ,Ext$,Cat#,Avail,Purch,Unit$,MOQ,Ext$,Cat#,Avail,Purch,Unit$,MOQ,Ext$,Cat#,Avail,Purch,Unit$,MOQ,Ext$,Cat# +R1 R2,1k,1000,1%,,,Bourns,CR0603-JW-102ELF,100,0.001,0.1,,,,,,,51387,,0.0061,1,0.61,CR0603-JW-102ELFCT-ND,55000,,0.007292,10,0.7292,2333561,,,,,,,52251,,0.005,1,0.5,652CR0603JW102ELF,110000,,0.001,1,0.1,02J2284,,,,,,,,,,,,,,,,,, -,Used currency rates:,,,,,,,,Total Purchase:,0,Buy here,,,0,,Buy here,,,0,,Buy here,,,0,,Buy here,,,0,,Buy here,,,0,,Buy here,,,0,,Buy here,,,0,,Buy here,,,0,,,,,0, -,USD($)/GBP(£):,1.375941592305018,,,,,,,Purchase description:,,,,,,,,,,,,,,,,,,"Copy this header and order to a CSV +,Used currency rates:,,,,,,,,Total Purchase:,0,Buy here,,,,0,,Buy here,,,,0,,Buy here,,,,0,,Buy here,,,,0,,Buy here,,,,0,,Buy here,,,,0,,Buy here,,,,0,,Buy here,,,,0,,,,,,0, +,USD($)/GBP(£):,1.375941592305018,,,,,,,Purchase description:,,,,,,,,,,,,,,,,,,,,,"Copy this header and order to a CSV file and use it for JLCPCB manufacturer PCB house. The multipart components that use -""#"" symbol are not allowed by JLCPCB.",,,,,,,,,,,,,,,,,,,,,,,,,,,, +""#"" symbol are not allowed by JLCPCB.",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -Created:,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -KiCost,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +Created:,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +KiCost,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, diff --git a/tests/reference/5_1_6/KiCost/kibom-variant_2c-bom_dk_mou.csv b/tests/reference/5_1_6/KiCost/kibom-variant_2c-bom_dk_mou.csv index dc7efed2..c798217d 100644 --- a/tests/reference/5_1_6/KiCost/kibom-variant_2c-bom_dk_mou.csv +++ b/tests/reference/5_1_6/KiCost/kibom-variant_2c-bom_dk_mou.csv @@ -1,15 +1,15 @@ -,,,KiBot Bill of Materials,,,,,,,,,,,,,,,,, -,,,Schematic:,kibom-variant_2c,,,,,Board Qty:,50,,,,,,,,,, -,,,Variant:,default,,,,,Unit Cost:,0,,,,,,,,,, -,,,Revision:,A,,,,,Total Cost:,0,,,,0,0,,,,0,0 -,,,Date:,2021-04-06,,,,,,,,,,,,,,,, -,,,KiCad Version:,,,,,,,,,,,,,,,,, +,,,KiBot Bill of Materials,,,,,,,,,,,,,,,,,,, +,,,Schematic:,kibom-variant_2c,,,,,Board Qty:,50,,,,,,,,,,,, +,,,Variant:,default,,,,,Unit Cost:,0.01,,,,,,,,,,,, +,,,Revision:,A,,,,,Total Cost:,0.5,,,,,0.5,1 of 1 parts found,,,,,0.61,1 of 1 parts found +,,,Date:,2021-04-06,,,,,,,,,,,,,,,,,, +,,,KiCad Version:,,,,,,,,,,,,,,,,,,, -Global Part Info,,,,,,,,,,,Mouser,,,,,Digi-Key,,,, -References,Value,Real value,Tolerancia,Voltage,Footprint,Manufacturer,Manufacturer P/N,Build Quantity,Unit$,Ext$,Avail,Purch,Unit$,Ext$,Cat#,Avail,Purch,Unit$,Ext$,Cat# -R1 R2,1k,1000,1%,,,Bourns,CR0603-JW-102ELF,100,0,0,110042,,0,0,652CR0603JW102ELF,38625,,0,0,CR0603-JW-102ELFCT-ND +Global Part Info,,,,,,,,,,,Mouser,,,,,,Digi-Key,,,,, +References,Value,Real value,Tolerancia,Voltage,Footprint,Manufacturer,Manufacturer P/N,Build Quantity,Unit$,Ext$,Avail,Purch,Unit$,MOQ,Ext$,Cat#,Avail,Purch,Unit$,MOQ,Ext$,Cat# +R1 R2,1k,1000,1%,,,Bourns,CR0603-JW-102ELF,100,0.005,0.5,110042,,0.005,1,0.5,652CR0603JW102ELF,38625,,0.0061,1,0.61,CR0603-JW-102ELFCT-ND -,,,,,,,,,Total Purchase:,0,Buy here,,,0,,Buy here,,,0, -Created:,,,,,,,,,Purchase description:,,,,,,,,,,, -KiCost,,,,,,,,,,,,,,,,,,,, -,,,,,,,,,,,,,,,,,,,, +,,,,,,,,,Total Purchase:,0,Buy here,,,,0,,Buy here,,,,0, +Created:,,,,,,,,,Purchase description:,,,,,,,,,,,,, +KiCost,,,,,,,,,,,,,,,,,,,,,, +,,,,,,,,,,,,,,,,,,,,,, diff --git a/tests/reference/5_1_6/KiCost/kibom-variant_2c-bom_dk_mou_dnf.csv b/tests/reference/5_1_6/KiCost/kibom-variant_2c-bom_dk_mou_dnf.csv index f15eb23b..8415fe95 100644 --- a/tests/reference/5_1_6/KiCost/kibom-variant_2c-bom_dk_mou_dnf.csv +++ b/tests/reference/5_1_6/KiCost/kibom-variant_2c-bom_dk_mou_dnf.csv @@ -1,15 +1,15 @@ -,,,KiBot Bill of Materials,,,,,,,,,,,,,,,,, -,,,Schematic:,kibom-variant_2c,,,,,Board Qty:,50,,,,,,,,,, -,,,Variant:,default,,,,,Unit Cost:,0,,,,,,,,,, -,,,Revision:,A,,,,,Total Cost:,0,,,,0,0,,,,0,0 -,,,Date:,2021-04-06,,,,,,,,,,,,,,,, -,,,KiCad Version:,,,,,,,,,,,,,,,,, +,,,KiBot Bill of Materials,,,,,,,,,,,,,,,,,,, +,,,Schematic:,kibom-variant_2c,,,,,Board Qty:,50,,,,,,,,,,,, +,,,Variant:,default,,,,,Unit Cost:,0.0332,,,,,,,,,,,, +,,,Revision:,A,,,,,Total Cost:,1.66,,,,,1.8,1 of 1 parts found,,,,,1.66,1 of 1 parts found +,,,Date:,2021-04-06,,,,,,,,,,,,,,,,,, +,,,KiCad Version:,,,,,,,,,,,,,,,,,,, -Global Part Info,,,,,,,,,,,Mouser,,,,,Digi-Key,,,, -References,Value,Real value,Tolerancia,Voltage,Footprint,Manufacturer,Manufacturer P/N,Build Quantity,Unit$,Ext$,Avail,Purch,Unit$,Ext$,Cat#,Avail,Purch,Unit$,Ext$,Cat# -C1 C2,1nF, 1000pF,20%,50 V 100 V,,Samsung,CL10B102KC8NNNC,100,0,0,NonStk,,0,0,187CL10B102KC8NNNC,NonStk,,0,0,1276-1131-1-ND +Global Part Info,,,,,,,,,,,Mouser,,,,,,Digi-Key,,,,, +References,Value,Real value,Tolerancia,Voltage,Footprint,Manufacturer,Manufacturer P/N,Build Quantity,Unit$,Ext$,Avail,Purch,Unit$,MOQ,Ext$,Cat#,Avail,Purch,Unit$,MOQ,Ext$,Cat# +C1 C2,1nF, 1000pF,20%,50 V 100 V,,Samsung,CL10B102KC8NNNC,100,0.0166,1.66,NonStk,,0.018,1,1.8,187CL10B102KC8NNNC,NonStk,,0.0166,1,1.66,1276-1131-1-ND -,,,,,,,,,Total Purchase:,0,Buy here,,,0,,Buy here,,,0, -Created:,,,,,,,,,Purchase description:,,,,,,,,,,, -KiCost,,,,,,,,,,,,,,,,,,,, -,,,,,,,,,,,,,,,,,,,, +,,,,,,,,,Total Purchase:,0,Buy here,,,,0,,Buy here,,,,0, +Created:,,,,,,,,,Purchase description:,,,,,,,,,,,,, +KiCost,,,,,,,,,,,,,,,,,,,,,, +,,,,,,,,,,,,,,,,,,,,,, diff --git a/tests/reference/5_1_6/KiCost/kibom-variant_2c-bom_dnf.csv b/tests/reference/5_1_6/KiCost/kibom-variant_2c-bom_dnf.csv index ecf9a449..dfa1651a 100644 --- a/tests/reference/5_1_6/KiCost/kibom-variant_2c-bom_dnf.csv +++ b/tests/reference/5_1_6/KiCost/kibom-variant_2c-bom_dnf.csv @@ -1,21 +1,21 @@ -,,,KiBot Bill of Materials,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -,,,Schematic:,kibom-variant_2c,,,,,Board Qty:,50,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -,,,Variant:,default,,,,,Unit Cost:,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -,,,Revision:,A,,,,,Total Cost:,0,,,,0,0,,,,0,0,,,,0,0,,,,0,0,,,,0,0,,,,0,0,,,,0,0,,,,0,0,,,,0,0 -,,,Date:,2021-04-06,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -,,,KiCad Version:,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +,,,KiBot Bill of Materials,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +,,,Schematic:,kibom-variant_2c,,,,,Board Qty:,50,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +,,,Variant:,default,,,,,Unit Cost:,0.0098,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +,,,Revision:,A,,,,,Total Cost:,0.49,,,,,0,0 of 1 parts found,,,,,1.66,1 of 1 parts found,,,,,2.0089,1 of 1 parts found,,,,,0.49,1 of 1 parts found,,,,,1.8,1 of 1 parts found,,,,,1.8,1 of 1 parts found,,,,,0,1 of 1 parts found,,,,,2.2725,1 of 1 parts found,,,,,0,0 of 1 parts found +,,,Date:,2021-04-06,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +,,,KiCad Version:,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -Global Part Info,,,,,,,,,,,Arrow,,,,,Digi-Key,,,,,Farnell,,,,,LCSC,,,,,Mouser,,,,,Newark,,,,,RS Components,,,,,TME,,,,,test,,,, -References,Value,Real value,Tolerancia,Voltage,Footprint,Manufacturer,Manufacturer P/N,Build Quantity,Unit$,Ext$,Avail,Purch,Unit$,Ext$,Cat#,Avail,Purch,Unit$,Ext$,Cat#,Avail,Purch,Unit$,Ext$,Cat#,Avail,Purch,Unit$,Ext$,Cat#,Avail,Purch,Unit$,Ext$,Cat#,Avail,Purch,Unit$,Ext$,Cat#,Avail,Purch,Unit$,Ext$,Cat#,Avail,Purch,Unit$,Ext$,Cat#,Avail,Purch,Unit$,Ext$,Cat# -C1 C2,1nF, 1000pF,20%,50 V 100 V,,Samsung,CL10B102KC8NNNC,100,0,0,,,,,,NonStk,,0,0,1276-1131-1-ND,3860,,0,0,3013404,542250,,0,0,C153291,NonStk,,0,0,187CL10B102KC8NNNC,19600,,0,0,82AC9311,NonStk,,0,0,7665480,5789,,0,0,CL10B102KC8NNNC,,,,, +Global Part Info,,,,,,,,,,,Arrow,,,,,,Digi-Key,,,,,,Farnell,,,,,,LCSC,,,,,,Mouser,,,,,,Newark,,,,,,RS Components,,,,,,TME,,,,,,test,,,,, +References,Value,Real value,Tolerancia,Voltage,Footprint,Manufacturer,Manufacturer P/N,Build Quantity,Unit$,Ext$,Avail,Purch,Unit$,MOQ,Ext$,Cat#,Avail,Purch,Unit$,MOQ,Ext$,Cat#,Avail,Purch,Unit$,MOQ,Ext$,Cat#,Avail,Purch,Unit$,MOQ,Ext$,Cat#,Avail,Purch,Unit$,MOQ,Ext$,Cat#,Avail,Purch,Unit$,MOQ,Ext$,Cat#,Avail,Purch,Unit$,MOQ,Ext$,Cat#,Avail,Purch,Unit$,MOQ,Ext$,Cat#,Avail,Purch,Unit$,MOQ,Ext$,Cat# +C1 C2,1nF, 1000pF,20%,50 V 100 V,,Samsung,CL10B102KC8NNNC,100,0.0049,0.49,,,,,,,NonStk,,0.0166,1,1.66,1276-1131-1-ND,3860,,0.020089,10,2.0089,3013404,542250,,0.0049,50,0.49,C153291,NonStk,,0.018,1,1.8,187CL10B102KC8NNNC,19600,,0.018,1,1.8,82AC9311,NonStk,,,4000,,7665480,5789,,0.022725,100,2.2725,CL10B102KC8NNNC,,,,,, -,Used currency rates:,,,,,,,,Total Purchase:,0,Buy here,,,0,,Buy here,,,0,,Buy here,,,0,,Buy here,,,0,,Buy here,,,0,,Buy here,,,0,,Buy here,,,0,,Buy here,,,0,,,,,0, -,USD($)/EUR(€):,1.1873,,,,,,,Purchase description:,,,,,,,,,,,,,,,,,,"Copy this header and order to a CSV +,Used currency rates:,,,,,,,,Total Purchase:,0,Buy here,,,,0,,Buy here,,,,0,,Buy here,,,,0,,Buy here,,,,0,,Buy here,,,,0,,Buy here,,,,0,,Buy here,,,,0,,Buy here,,,,0,,,,,,0, +,USD($)/EUR(€):,1.1873,,,,,,,Purchase description:,,,,,,,,,,,,,,,,,,,,,"Copy this header and order to a CSV file and use it for JLCPCB manufacturer PCB house. The multipart components that use -""#"" symbol are not allowed by JLCPCB.",,,,,,,,,,,,,,,,,,,,,,,,,,,, -,USD($)/GBP(£):,1.375941592305018,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -Created:,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -KiCost,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +""#"" symbol are not allowed by JLCPCB.",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +,USD($)/GBP(£):,1.375941592305018,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +Created:,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +KiCost,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, diff --git a/tests/reference/5_1_6/KiCost/merge_1-bom.csv b/tests/reference/5_1_6/KiCost/merge_1-bom.csv index be5b4198..294979ac 100644 --- a/tests/reference/5_1_6/KiCost/merge_1-bom.csv +++ b/tests/reference/5_1_6/KiCost/merge_1-bom.csv @@ -1,50 +1,50 @@ -,,,KiBot Bill of Materials,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -,,,Variant:,default,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -,,,KiCad Version:,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +,,,KiBot Bill of Materials,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +,,,Variant:,default,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +,,,KiCad Version:,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -,,,merge_1,,,,,Board Qty0:,50,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -,,,Schematic:,merge_1,,,,Unit Cost0:,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -,,,Revision:,,,,,Total Cost0:,0,,,,0,0,,,,0,0,,,,0,0,,,,0,0,,,,0,0,,,,0,0,,,,0,0,,,,0,0 -,,,Date:,2021-05-11_13-08-20,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -,,,Company:,Test company,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -,,,ID:,prj0:,,,,,,,,,0,0,,,,0,0,,,,0,0,,,,0,0,,,,0,0,,,,0,0,,,,0,0,,,,0,0 -,,,merge_2,,,,,Board Qty1:,20,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -,,,Schematic:,2nd project,,,,Unit Cost1:,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -,,,Revision:,,,,,Total Cost1:,0,,,,0,0,,,,0,0,,,,0,0,,,,0,0,,,,0,0,,,,0,0,,,,0,0,,,,0,0 -,,,Date:,2021-05-11_13-10-07,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -,,,ID:,prj1:,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +,,,merge_1,,,,,Board Qty0:,50,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +,,,Schematic:,merge_1,,,,Unit Cost0:,0.0452,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +,,,Revision:,,,,,Total Cost0:,2.26,,,,,0,0 of 3 parts found,,,,,3.905,3 of 3 parts found,,,,,5828.8395,3 of 3 parts found,,,,,0.505,2 of 3 parts found,,,,,3.2,3 of 3 parts found,,,,,3.6,3 of 3 parts found,,,,,5.3662,2 of 3 parts found,,,,,9.1617,3 of 3 parts found +,,,Date:,2021-05-11_13-08-20,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +,,,Company:,Test company,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +,,,ID:,prj0:,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +,,,merge_2,,,,,Board Qty1:,20,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +,,,Schematic:,2nd project,,,,Unit Cost1:,0.0542,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +,,,Revision:,,,,,Total Cost1:,1.084,,,,,0,0 of 4 parts found,,,,,1.852,4 of 4 parts found,,,,,2332.1467,4 of 4 parts found,,,,,0.202,2 of 4 parts found,,,,,1.48,4 of 4 parts found,,,,,1.62,4 of 4 parts found,,,,,2.229,3 of 4 parts found,,,,,4.22,4 of 4 parts found +,,,Date:,2021-05-11_13-10-07,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +,,,ID:,prj1:,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -,,,merge_3,,,,,Board Qty2:,30,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -,,,Schematic:,merge_3,,,,Unit Cost2:,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -,,,Revision:,,,,,Total Cost2:,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -,,,Date:,2021-05-11_13-10-48,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -,,,ID:,prj2:,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +,,,merge_3,,,,,Board Qty2:,30,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +,,,Schematic:,merge_3,,,,Unit Cost2:,0.045,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +,,,Revision:,,,,,Total Cost2:,1.35,,,,,0,0 of 2 parts found,,,,,2.175,2 of 2 parts found,,,,,4.1072,2 of 2 parts found,,,,,0,0 of 2 parts found,,,,,1.47,2 of 2 parts found,,,,,1.35,2 of 2 parts found,,,,,0.6192,2 of 2 parts found,,,,,4.43,2 of 2 parts found +,,,Date:,2021-05-11_13-10-48,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +,,,ID:,prj2:,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -,,,,,,,,Total Prjs Cost:,0,,,,0,0,,,,0,0,,,,0,0,,,,0,0,,,,0,0,,,,0,0,,,,0,0,,,,0,0 -Global Part Info,,,,,,,,,,Arrow,,,,,Digi-Key,,,,,Farnell,,,,,LCSC,,,,,Mouser,,,,,Newark,,,,,RS Components,,,,,TME,,,, -References,Value,Footprint,Manufacturer P/N,Qty.Prj0,Qty.Prj1,Qty.Prj2,Build Quantity,Unit$,Ext$,Avail,Purch,Unit$,Ext$,Cat#,Avail,Purch,Unit$,Ext$,Cat#,Avail,Purch,Unit$,Ext$,Cat#,Avail,Purch,Unit$,Ext$,Cat#,Avail,Purch,Unit$,Ext$,Cat#,Avail,Purch,Unit$,Ext$,Cat#,Avail,Purch,Unit$,Ext$,Cat#,Avail,Purch,Unit$,Ext$,Cat# +,,,,,,,,Total Prjs Cost:,4.694,,,,,0,0 of 4 parts found,,,,,7.932,4 of 4 parts found,,,,,8165.0933,4 of 4 parts found,,,,,0.546,2 of 4 parts found,,,,,6.15,4 of 4 parts found,,,,,6.57,4 of 4 parts found,,,,,6.6458,3 of 4 parts found,,,,,16.7599,4 of 4 parts found +Global Part Info,,,,,,,,,,Arrow,,,,,,Digi-Key,,,,,,Farnell,,,,,,LCSC,,,,,,Mouser,,,,,,Newark,,,,,,RS Components,,,,,,TME,,,,, +References,Value,Footprint,Manufacturer P/N,Qty.Prj0,Qty.Prj1,Qty.Prj2,Build Quantity,Unit$,Ext$,Avail,Purch,Unit$,MOQ,Ext$,Cat#,Avail,Purch,Unit$,MOQ,Ext$,Cat#,Avail,Purch,Unit$,MOQ,Ext$,Cat#,Avail,Purch,Unit$,MOQ,Ext$,Cat#,Avail,Purch,Unit$,MOQ,Ext$,Cat#,Avail,Purch,Unit$,MOQ,Ext$,Cat#,Avail,Purch,Unit$,MOQ,Ext$,Cat#,Avail,Purch,Unit$,MOQ,Ext$,Cat# "prj0:C1 -prj1:C2",1nF,,GRM1555C1H102JA01D,50,20,0,70,0,0,,,,,,3602377,,0,0,490-3244-1-ND,NonStk,,0,0,1118130,13600,,0,0,C76947,NonStk,,0,0,81GRM1555C1H102JA1D,NonStk,,0,0,38K1651,2000,,0,0,6242913,100700,,0,0,GRM1555C1H102JA01D +prj1:C2",1nF,,GRM1555C1H102JA01D,50,20,0,70,0.0078,0.546,,,,,,,3602377,,0.0242,1,1.694,490-3244-1-ND,NonStk,,116.514734,1,8156.0314,1118130,13600,,0.0078,50,0.546,C76947,NonStk,,0.026,1,1.82,81GRM1555C1H102JA1D,NonStk,,0.034,10,2.38,38K1651,2000,,0.09494,50,6.6458,6242913,100700,,0.058409,50,4.0886,GRM1555C1H102JA01D "prj1:C1 -prj0:C2",10nF,,GRM155R71E103KA01D,50,20,0,70,0,0,,,,,,2329523,,0,0,490-1312-1-ND,10000,,0,0,1118150,133200,,0,0,C77013,42743,,0,0,81GRM36X103K25,10000,,0,0,37K6460,,,,,,124600,,0,0,GRM155R71E103KA01D +prj0:C2",10nF,,GRM155R71E103KA01D,50,20,0,70,0.0104,0.728,,,,,,,2329523,,0.0104,1,0.728,490-1312-1-ND,10000,,0.017887,1,1.2521,1118150,133200,,,100,,C77013,42743,,0.011,1,0.77,81GRM36X103K25,10000,,0.011,1,0.77,37K6460,,,,,,,124600,,,100,,GRM155R71E103KA01D "prj0:R1-R3 prj1:R2-R4 -prj2:R5",1k,,RC0805JR-071KL,150,60,30,240,0,0,,,,,,512,,0,0,311-1.0KARCT-ND,47623,,0,0,1799479,,,,,,192935,,0,0,603RC0805JR071KL,1498,,0,0,68R0253,2100,,0,0,1995761,17400,,0,0,RC0805JR071K +prj2:R5",1k,,RC0805JR-071KL,150,60,30,240,0.009,2.16,,,,,,,512,,0.0145,1,3.48,311-1.0KARCT-ND,47623,,0.014723,1,3.5334,1799479,,,,,,,192935,,0.009,1,2.16,603RC0805JR071KL,1498,,0.009,1,2.16,68R0253,2100,,,5000,,1995761,17400,,0.0366,100,8.784,RC0805JR071K "prj1:R1 -prj2:R1-R4",10k,,RC0805JR-0710KL,0,20,120,140,0,0,,,,,,5497493,,0,0,311-10KARCT-ND,22848,,0,0,2131807,,,,,,2294842,,0,0,603RC0805JR0710KL,10000,,0,0,80K7383,3800,,0,0,1995759,240800,,0,0,RC0805JR0710K +prj2:R1-R4",10k,,RC0805JR-0710KL,0,20,120,140,0.009,1.26,,,,,,,5497493,,0.0145,1,2.03,311-10KARCT-ND,22848,,0.030546,1,4.2764,2131807,,,,,,,2294842,,0.01,1,1.4,603RC0805JR0710KL,10000,,0.009,1,1.26,80K7383,3800,,,5000,,1995759,240800,,0.027767,100,3.8873,RC0805JR0710K -,Used currency rates:,,,,,,,Total Purchase:,0,Buy here,,,0,,Buy here,,,0,,Buy here,,,0,,Buy here,,,0,,Buy here,,,0,,Buy here,,,0,,Buy here,,,0,,Buy here,,,0, -,USD($)/GBP(£):,1.375941592305018,,,,,,Purchase description:,,,,,,,,,,,,,,,,,,"Copy this header and order to a CSV +,Used currency rates:,,,,,,,Total Purchase:,0,Buy here,,,,0,,Buy here,,,,0,,Buy here,,,,0,,Buy here,,,,0,,Buy here,,,,0,,Buy here,,,,0,,Buy here,,,,0,,Buy here,,,,0, +,USD($)/GBP(£):,1.375941592305018,,,,,,Purchase description:,,,,,,,,,,,,,,,,,,,,,"Copy this header and order to a CSV file and use it for JLCPCB manufacturer PCB house. The multipart components that use -""#"" symbol are not allowed by JLCPCB.",,,,,,,,,,,,,,,,,,,,,,, +""#"" symbol are not allowed by JLCPCB.",,,,,,,,,,,,,,,,,,,,,,,,,,,, -Created:,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -KiCost,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +Created:,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +KiCost,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -,,,,,,,,,,,0,,,,,0,,,,,0,,,,,0,,,,,0,,,,,0,,,,,0,,,,,0,,, -,,,,,,,,,,,0,,,,,0,,,,,0,,,,,0,,,,,0,,,,,0,,,,,0,,,,,0,,, -,,,,,,,,,,,0,,,,,0,,,,,0,,,,,0,,,,,0,,,,,0,,,,,0,,,,,0,,, -,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +,,,,,,,,,,,0,,,,,,0,,,,,,0,,,,,,0,,,,,,0,,,,,,0,,,,,,0,,,,,,0,,,, +,,,,,,,,,,,0,,,,,,0,,,,,,0,,,,,,0,,,,,,0,,,,,,0,,,,,,0,,,,,,0,,,, +,,,,,,,,,,,0,,,,,,0,,,,,,0,,,,,,0,,,,,,0,,,,,,0,,,,,,0,,,,,,0,,,, +,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, diff --git a/tests/reference/5_1_6/KiCost/simple.csv b/tests/reference/5_1_6/KiCost/simple.csv index e1aada77..9655928f 100644 --- a/tests/reference/5_1_6/KiCost/simple.csv +++ b/tests/reference/5_1_6/KiCost/simple.csv @@ -4,8 +4,8 @@ Prj date:,mar 30 mar 2021 09:46:24,,,,Total Cost:,0 $ date:,,,,,, Global Part Info,,,,,, Refs,Value,Footprint,Manf#,Qty,Unit$,Ext$ -C1,1nF,,,100,,0 -R1,1k,,,100,,0 +C1,1nF,,,100,, +R1,1k,,,100,, KiCost,,,,,, diff --git a/tests/reference/5_1_6/KiCost/simple_default.csv b/tests/reference/5_1_6/KiCost/simple_default.csv index 94f4d484..8a7c20c1 100644 --- a/tests/reference/5_1_6/KiCost/simple_default.csv +++ b/tests/reference/5_1_6/KiCost/simple_default.csv @@ -4,8 +4,8 @@ Prj date:,mar 30 mar 2021 09:46:24,,,,Total Cost:,0 $ date:,,,,,, Global Part Info,,,,,, Refs,Value,Footprint,Manf#,Qty,Unit$,Ext$ -R1,1k,,,100,,0 -R2,1000,,,100,,0 +R1,1k,,,100,, +R2,1000,,,100,, KiCost,,,,,, diff --git a/tests/reference/5_1_6/KiCost/simple_production.csv b/tests/reference/5_1_6/KiCost/simple_production.csv index 8343547d..0cc05931 100644 --- a/tests/reference/5_1_6/KiCost/simple_production.csv +++ b/tests/reference/5_1_6/KiCost/simple_production.csv @@ -4,9 +4,9 @@ Prj date:,mar 30 mar 2021 09:46:24,,,,Total Cost:,0 $ date:,,,,,, Global Part Info,,,,,, Refs,Value,Footprint,Manf#,Qty,Unit$,Ext$ -C2,1000 pF,,,100,,0 -R1,1k,,,100,,0 -R2,1000,,,100,,0 +C2,1000 pF,,,100,, +R1,1k,,,100,, +R2,1000,,,100,, KiCost,,,,,, diff --git a/tests/reference/5_1_6/KiCost/simple_test.csv b/tests/reference/5_1_6/KiCost/simple_test.csv index 94b36c84..3a247636 100644 --- a/tests/reference/5_1_6/KiCost/simple_test.csv +++ b/tests/reference/5_1_6/KiCost/simple_test.csv @@ -4,9 +4,9 @@ Prj date:,mar 30 mar 2021 09:46:24,,,,Total Cost:,0 $ date:,,,,,, Global Part Info,,,,,, Refs,Value,Footprint,Manf#,Qty,Unit$,Ext$ -C1,1nF,,,100,,0 -C2,1000 pF,,,100,,0 -R1,3k3,,,100,,0 +C1,1nF,,,100,, +C2,1000 pF,,,100,, +R1,3k3,,,100,, KiCost,,,,,,