Generate PCBA image, and fixup uploads of images to inventree

This commit is contained in:
andrewc
2025-07-29 10:42:57 +10:00
parent 218ec0f190
commit f916bbead6
2 changed files with 11 additions and 10 deletions

View File

@@ -4,7 +4,7 @@ kibot:
import: import:
- file: default.kibot.yaml - file: default.kibot.yaml
outputs: ['step', 'pcb_render'] outputs: ['step', 'pcb_render', 'pcba_render']
preflight: preflight:
erc: false erc: false

View File

@@ -158,15 +158,16 @@ image:
do do
echo $f echo $f
fab_path=$CI_PROJECT_DIR/Fabrication/$(dirname $f | cut -c3-) fab_path=$CI_PROJECT_DIR/Fabrication/$(dirname $f | cut -c3-)
name_n_rev=$(echo $f | cut -c3- | rev | cut -d'/' -f1 | cut -c9- | rev) full_name=$(echo $f | cut -c3- | rev | cut -d'/' -f1 | cut -c9- | rev)
echo "name: $name_n_rev" echo "name: $full_name"
assembly_rev=$(echo $name_n_rev | cut -d'_' -f2) name_n_rev=$(echo $full_name | cut -d'_' -f1,2)
name=$(echo $name_n_rev | cut -d'-' -f1)A$(echo ${name_n_rev//$assembly_rev/.} | cut -d'.' -f2) assembly_rev=$(echo $full_name | cut -d'_' -f2)
pcb_rev=$(echo $assembly_rev | cut -d'_' -f1,2 | cut -d'.' -f1,2) name=$(echo $full_name | cut -d'-' -f1)A$(echo ${full_name//$assembly_rev/.} | cut -d'.' -f2)
pcb_im=$fab_path/PCB_$name_n_rev.png pcb_rev=$(echo ${assembly_rev} | cut -d'_' -f1,2 | cut -d'.' -f1,2)
pcba_im=$fab_path/PCBA_$name_n_rev.png pcb_im=${fab_path}/PCB_${name_n_rev}.png
pcb_attach=$(echo "['$fab_path/${name_n_rev}_PCB.pdf', '$CI_PROJECT_DIR/Fabrication/${name_n_rev}_JLC.zip']") pcba_im=${fab_path}/PCBA_${name_n_rev}.png
pcba_attach=$(echo "['$fab_path/${name_n_rev}_schematic.pdf', '$fab_path/${name_n_rev}_bom.csv', '$fab_path/${name_n_rev}-neo-pos_top.csv', '$fab_path/${name_n_rev}-neo-pos_bot.csv', '$fab_path/${name_n_rev}_ibom.html']") pcb_attach=$(echo "['${fab_path}/${name_n_rev}_PCB.pdf', '$CI_PROJECT_DIR/Fabrication/${name_n_rev}_JLC.zip']")
pcba_attach=$(echo "['${fab_path}/${full_name}_schematic.pdf', '${fab_path}/${full_name}_bom.csv', '${fab_path}/${full_name}-neo-pos_top.csv', '${fab_path}/${full_name}-neo-pos_bot.csv', '${fab_path}/${full_name}_ibom.html']")
DRY="--dry assemblies" DRY="--dry assemblies"
if [[ $CI_COMMIT_BRANCH == "main" ]]; then if [[ $CI_COMMIT_BRANCH == "main" ]]; then