diff --git a/configs/default.kibot.yaml b/configs/default.kibot.yaml index 80b02cc..11630b4 100644 --- a/configs/default.kibot.yaml +++ b/configs/default.kibot.yaml @@ -87,9 +87,26 @@ outputs: - name: 'bom_csv' type: bom dir: . - extends: "_bom" - disable_run_by_default: _bom options: + columns: + - field: Value + name: value + - field: Quantity Per PCB + name: qty + - field: Footprint + name: footprint + - field: Datasheet + name: datasheet + - mpn + - manf + - rev + - conn_manf + - conn_mpn + - field: References + name: refs + exclude_filter: "" + output: "%f%v_%r_%i.%x" + expand_text_vars: true csv: separator: ';' hide_pcb_info: true @@ -99,9 +116,26 @@ outputs: - name: 'bom_xlsx' type: bom dir: . - extends: '_bom' - disable_run_by_default: _bom options: + columns: + - field: Value + name: value + - field: Quantity Per PCB + name: qty + - field: Footprint + name: footprint + - field: Datasheet + name: datasheet + - mpn + - manf + - rev + - conn_manf + - conn_mpn + - field: References + name: refs + exclude_filter: "" + output: "%f%v_%r_%i.%x" + expand_text_vars: true xlsx: hide_pcb_info: true hide_stats_info: true @@ -272,7 +306,6 @@ groups: - name: pcb_main outputs: - JLCPCB_compress - - neo_position - print_pcb - stencil - interactive_bom @@ -280,7 +313,6 @@ groups: - name: panel outputs: - JLCPCB_compress - - neo_position - print_pcb - step - interactive_bom diff --git a/configs/mech.kibot.yaml b/configs/mech.kibot.yaml index d3e8086..18c0caf 100644 --- a/configs/mech.kibot.yaml +++ b/configs/mech.kibot.yaml @@ -4,6 +4,7 @@ kibot: import: - file: default.kibot.yaml + outputs: ['step'] preflight: erc: false diff --git a/configs/panel.kibot.yaml b/configs/panel.kibot.yaml index d107b67..291ba94 100644 --- a/configs/panel.kibot.yaml +++ b/configs/panel.kibot.yaml @@ -4,6 +4,7 @@ kibot: import: - file: default.kibot.yaml + outputs: [JLCPCB_compress, neo_position, print_pcb, step, interactive_bom] preflight: erc: false diff --git a/configs/pcb_dev.kibot.yaml b/configs/pcb_dev.kibot.yaml index d107b67..5a6b3ff 100644 --- a/configs/pcb_dev.kibot.yaml +++ b/configs/pcb_dev.kibot.yaml @@ -4,6 +4,7 @@ kibot: import: - file: default.kibot.yaml + outputs: [print_pcb] preflight: erc: false diff --git a/configs/pcb_main.kibot.yaml b/configs/pcb_main.kibot.yaml index d107b67..3d6e619 100644 --- a/configs/pcb_main.kibot.yaml +++ b/configs/pcb_main.kibot.yaml @@ -4,6 +4,7 @@ kibot: import: - file: default.kibot.yaml + outputs: [JLCPCB_gerbers, JLCPCB_drill, JLCPCB_compress, print_pcb, stencil] preflight: erc: false diff --git a/configs/pos.kibot.yaml b/configs/pos.kibot.yaml index d107b67..47168d4 100644 --- a/configs/pos.kibot.yaml +++ b/configs/pos.kibot.yaml @@ -4,8 +4,9 @@ kibot: import: - file: default.kibot.yaml + outputs: ['neo_position'] preflight: erc: false update_xml: false - drc: true + drc: false diff --git a/configs/sch.kibot.yaml b/configs/sch.kibot.yaml index 955573f..799fe67 100644 --- a/configs/sch.kibot.yaml +++ b/configs/sch.kibot.yaml @@ -3,6 +3,7 @@ kibot: import: - file: default.kibot.yaml + outputs: ['bom_csv','bom_xlsx', 'print_sch', 'interactive_bom'] preflight: erc: true diff --git a/kibot-ci.yml b/kibot-ci.yml index 132e05c..be6bbd9 100644 --- a/kibot-ci.yml +++ b/kibot-ci.yml @@ -90,7 +90,7 @@ image: python3 $CI_PROJECT_DIR/.gitlab/.scripts/orig.py ${dir_arr[i-1]} for CONF in $KIBOT_CONF do - kibot -e ${dir_arr[i-1]}/${sch_arr[i-1]} -c $CI_PROJECT_DIR/.gitlab/configs/$CONF.kibot.yaml -d $CI_PROJECT_DIR/Fabrication/${dir_arr[i-1]} $VARIANTS $CONF + kibot -e ${dir_arr[i-1]}/${sch_arr[i-1]} -c $CI_PROJECT_DIR/.gitlab/configs/$CONF.kibot.yaml -d $CI_PROJECT_DIR/Fabrication/${dir_arr[i-1]} $VARIANTS done mv $CI_PROJECT_DIR/Fabrication/${dir_arr[i-1]}/*.zip Fabrication/ 2> /dev/null || true done