From 2674a2a294a99c87662d4f654f732135fe9938aa Mon Sep 17 00:00:00 2001
From: Jon Evans <jon@craftyjon.com>
Date: Wed, 6 Dec 2023 16:53:32 -0500
Subject: [PATCH] IPC-2581: Make sure non-physical layers aren't exported

---
 pcbnew/plugins/ipc2581/ipc2581_plugin.cpp | 11 ++++++++++-
 pcbnew/plugins/ipc2581/ipc2581_plugin.h   |  2 ++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/pcbnew/plugins/ipc2581/ipc2581_plugin.cpp b/pcbnew/plugins/ipc2581/ipc2581_plugin.cpp
index 4e3fe03673..37f3d05b3d 100644
--- a/pcbnew/plugins/ipc2581/ipc2581_plugin.cpp
+++ b/pcbnew/plugins/ipc2581/ipc2581_plugin.cpp
@@ -1295,6 +1295,12 @@ void IPC2581_PLUGIN::addCadHeader( wxXmlNode* aEcadNode )
 }
 
 
+bool IPC2581_PLUGIN::isValidLayerFor2581( PCB_LAYER_ID aLayer )
+{
+    return ( aLayer >= F_Cu && aLayer <= User_9 ) || aLayer == UNDEFINED_LAYER;
+}
+
+
 void IPC2581_PLUGIN::addLayerAttributes( wxXmlNode* aNode, PCB_LAYER_ID aLayer )
 {
     switch( aLayer )
@@ -1389,6 +1395,9 @@ void IPC2581_PLUGIN::generateCadLayers( wxXmlNode* aCadLayerNode )
     {
         BOARD_STACKUP_ITEM* stackup_item = layers.at( i );
 
+        if( !isValidLayerFor2581( stackup_item->GetBrdLayerId() ) )
+            continue;
+
         for( int sublayer_id = 0; sublayer_id < stackup_item->GetSublayersCount(); sublayer_id++ )
         {
             wxXmlNode* cadLayerNode = appendNode( aCadLayerNode, "Layer" );
@@ -1432,7 +1441,7 @@ void IPC2581_PLUGIN::generateCadLayers( wxXmlNode* aCadLayerNode )
 
     for( PCB_LAYER_ID layer : layer_seq )
     {
-        if( added_layers.find( layer ) != added_layers.end() )
+        if( added_layers.find( layer ) != added_layers.end() || !isValidLayerFor2581( layer ) )
             continue;
 
         wxString ly_name = genString( m_board->GetLayerName( layer ), "LAYER" );
diff --git a/pcbnew/plugins/ipc2581/ipc2581_plugin.h b/pcbnew/plugins/ipc2581/ipc2581_plugin.h
index 03b894a5cb..7dfd8692f4 100644
--- a/pcbnew/plugins/ipc2581/ipc2581_plugin.h
+++ b/pcbnew/plugins/ipc2581/ipc2581_plugin.h
@@ -276,6 +276,8 @@ private:
     void insertNodeAfter( wxXmlNode* aPrev, wxXmlNode* aNode );
 
     void addLayerAttributes( wxXmlNode* aNode, PCB_LAYER_ID aLayer );
+
+    bool isValidLayerFor2581( PCB_LAYER_ID aLayer );
 private:
     LAYER_MAPPING_HANDLER   m_layerMappingHandler;
     bool                    m_show_layer_mapping_warnings;