From f916bbead6487fe6224fbfe1beae54d81fa9428f Mon Sep 17 00:00:00 2001
From: andrewc <andrew@micromelon.com.au>
Date: Tue, 29 Jul 2025 10:42:57 +1000
Subject: [PATCH] Generate PCBA image, and fixup uploads of images to inventree

---
 configs/mech.kibot.yaml |  2 +-
 kibot-ci.yml            | 19 ++++++++++---------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/configs/mech.kibot.yaml b/configs/mech.kibot.yaml
index 3fec3f5..0ab63cc 100644
--- a/configs/mech.kibot.yaml
+++ b/configs/mech.kibot.yaml
@@ -4,7 +4,7 @@ kibot:
 
 import:
   - file: default.kibot.yaml
-    outputs: ['step', 'pcb_render']
+    outputs: ['step', 'pcb_render', 'pcba_render']
 
 preflight:
   erc: false
diff --git a/kibot-ci.yml b/kibot-ci.yml
index edacb6a..30f66ac 100644
--- a/kibot-ci.yml
+++ b/kibot-ci.yml
@@ -158,15 +158,16 @@ image:
         do
           echo $f
           fab_path=$CI_PROJECT_DIR/Fabrication/$(dirname $f | cut -c3-)
-          name_n_rev=$(echo $f | cut -c3- | rev | cut -d'/' -f1 | cut -c9- | rev)
-          echo "name: $name_n_rev"
-          assembly_rev=$(echo $name_n_rev | cut -d'_' -f2)
-          name=$(echo $name_n_rev | cut -d'-' -f1)A$(echo ${name_n_rev//$assembly_rev/.} | cut -d'.' -f2)
-          pcb_rev=$(echo $assembly_rev | cut -d'_' -f1,2 | cut -d'.' -f1,2)
-          pcb_im=$fab_path/PCB_$name_n_rev.png
-          pcba_im=$fab_path/PCBA_$name_n_rev.png
-          pcb_attach=$(echo "['$fab_path/${name_n_rev}_PCB.pdf', '$CI_PROJECT_DIR/Fabrication/${name_n_rev}_JLC.zip']")
-          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']")
+          full_name=$(echo $f | cut -c3- | rev | cut -d'/' -f1 | cut -c9- | rev)
+          echo "name: $full_name"
+          name_n_rev=$(echo $full_name | cut -d'_' -f1,2)
+          assembly_rev=$(echo $full_name | cut -d'_' -f2)
+          name=$(echo $full_name | cut -d'-' -f1)A$(echo ${full_name//$assembly_rev/.} | cut -d'.' -f2)
+          pcb_rev=$(echo ${assembly_rev} | cut -d'_' -f1,2 | cut -d'.' -f1,2)
+          pcb_im=${fab_path}/PCB_${name_n_rev}.png
+          pcba_im=${fab_path}/PCBA_${name_n_rev}.png
+          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"
           if [[ $CI_COMMIT_BRANCH == "main" ]]; then