Fix KiBot Syntax Issues

kibot/yaml/kibot_grp_renders.yaml

@@ -37,7 +37,7 @@ import:
   # PCBA 3D Renders (Populated Board; Blender) -------------------------------
   - file: outputs/kibot_out_blender.yaml
     definitions:
-      NAME: @NAME_BLENDER_3D_TOP@
+      NAME: @NAME_BLENDER_3D_TOP_OUTPUT@
       COMMENT: High Quality 3D Render (Top)
       DIR: @DIR@
       VIEW: top
@@ -57,7 +57,7 @@ import:
 
   - file: outputs/kibot_out_blender.yaml
     definitions:
-      NAME: @NAME_BLENDER_3D_BOT@
+      NAME: @NAME_BLENDER_3D_BOT_OUTPUT@
       COMMENT: High Quality 3D Render (Bottom)
       DIR: @DIR@
       VIEW: bottom
@@ -77,7 +77,7 @@ import:
 
   - file: outputs/kibot_out_blender.yaml
     definitions:
-      NAME: @NAME_BLENDER_3D_ANGLED_TOP@
+      NAME: @NAME_BLENDER_3D_ANGLED_TOP_OUTPUT@
       COMMENT: High Quality 3D Render (Angled Top)
       DIR: @DIR@
       VIEW: top
@@ -97,7 +97,7 @@ import:
 
   - file: outputs/kibot_out_blender.yaml
     definitions:
-      NAME: @NAME_BLENDER_3D_ANGLED_BOT@
+      NAME: @NAME_BLENDER_3D_ANGLED_BOT_OUTPUT@
       COMMENT: High Quality 3D Render (Angled Bottom)
       DIR: @DIR@
       VIEW: bottom
@@ -123,10 +123,10 @@ definitions:
   # Output Names
   NAME_PCBDRAW_2D_TOP_PCB_OUTPUT: pcbdraw_top
   NAME_PCBDRAW_2D_BOT_PCB_OUTPUT: pcbdraw_bottom
-  NAME_BLENDER_3D_TOP: blender_3d_top
-  NAME_BLENDER_3D_BOT: blender_3d_bottom
-  NAME_BLENDER_3D_ANGLED_TOP: blender_3d_angled_top
-  NAME_BLENDER_3D_ANGLED_BOT: blender_3d_angled_bottom
+  NAME_BLENDER_3D_TOP_OUTPUT: blender_3d_top
+  NAME_BLENDER_3D_BOT_OUTPUT: blender_3d_bottom
+  NAME_BLENDER_3D_ANGLED_TOP_OUTPUT: blender_3d_angled_top
+  NAME_BLENDER_3D_ANGLED_BOT_OUTPUT: blender_3d_angled_bottom
 
   # Blender Configuration
   BLENDER_DNF_FILTER: _kibom_dnf_Config

kibot/yaml/kibot_main.yaml

@@ -93,38 +93,38 @@ import:
 
   # Filters ==================================================================
   
-  - file: kibot_filt_field_rename.yaml
+  - file: filters/kibot_filt_field_rename.yaml
     definitions:
       NAME: @FILT_FIELD_RENAME@
       COMMENT: Rename fields
       MPN_FIELD: @MPN_FIELD@
       MAN_FIELD: @MAN_FIELD@
 
-  - file: kibot_filt_testpoints.yaml
+  - file: filters/kibot_filt_testpoints.yaml
     definitions:
       NAME: @FILT_TP_ONLY@
       COMMENT: Include only testpoints
 
-  - file: kibot_filt_exclude_testpoints.yaml
+  - file: filters/kibot_filt_exclude_testpoints.yaml
     definitions:
       NAME: @FILT_TP_EXCLUDE@
       COMMENT: Exclude only testpoints
     
-  - file: kibot_filt_testpoints.yaml
+  - file: filters/kibot_filt_testpoints.yaml
     definitions:
       NAME: @FILT_TP_TOP_ONLY@
       COMMENT: Select only top testpoints
       EXCLUDE_BOTTOM: true
       EXCLUDE_REFS: "@TP_EXCLUDE_REFS@"
 
-  - file: kibot_filt_testpoints.yaml
+  - file: filters/kibot_filt_testpoints.yaml
     definitions:
       NAME: @FILT_TP_BOTTOM_ONLY@
       COMMENT: Select only bottom testpoints
       EXCLUDE_TOP: true
       EXCLUDE_REFS: "@TP_EXCLUDE_REFS@"
 
-  - file: kibot_filt_lcsc_parts.yaml
+  - file: filters/kibot_filt_lcsc_parts.yaml
     definitions:
       NAME: @FILT_LCSC_PARTS@
       COMMENT: Only parts with LCSC Part Number
@@ -385,10 +385,10 @@ import:
 
       NAME_PCBDRAW_2D_TOP_PCB_OUTPUT: @PCBDRAW_2D_TOP_PCB_OUTPUT@
       NAME_PCBDRAW_2D_BOT_PCB_OUTPUT: @PCBDRAW_2D_BOT_PCB_OUTPUT@
-      NAME_BLENDER_3D_TOP: @BLENDER_3D_TOP_OUTPUT@
-      NAME_BLENDER_3D_BOT: @BLENDER_3D_BOT_OUTPUT@
-      NAME_BLENDER_3D_ANGLED_TOP: @BLENDER_3D_ANGLED_TOP_OUTPUT@
-      NAME_BLENDER_3D_ANGLED_BOT: @BLENDER_3D_ANGLED_BOT_OUTPUT@
+      NAME_BLENDER_3D_TOP_OUTPUT: @BLENDER_3D_TOP_OUTPUT@
+      NAME_BLENDER_3D_BOT_OUTPUT: @BLENDER_3D_BOT_OUTPUT@
+      NAME_BLENDER_3D_ANGLED_TOP_OUTPUT: @BLENDER_3D_ANGLED_TOP_OUTPUT@
+      NAME_BLENDER_3D_ANGLED_BOT_OUTPUT: @BLENDER_3D_ANGLED_BOT_OUTPUT@
 
       BLENDER_DNF_FILTER: @BLENDER_DNF_FILTER@
       BLENDER_SAMPLES: @BLENDER_SAMPLES@