From 1b2a278de95467160c899bf29581dc25f15a487d Mon Sep 17 00:00:00 2001
From: Jeff Young <jeff@rokeby.ie>
Date: Fri, 10 Dec 2021 23:00:21 +0000
Subject: [PATCH] Don't put "exclude from board" symbols in CvPCB netlist.
Fixes https://gitlab.com/kicad/code/kicad/issues/9939
---
cvpcb/cvpcb_mainframe.cpp | 6 +++---
eeschema/netlist_exporters/netlist_exporter_xml.h | 2 +-
eeschema/netlist_exporters/netlist_generator.cpp | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/cvpcb/cvpcb_mainframe.cpp b/cvpcb/cvpcb_mainframe.cpp
index 2d1df621ba..c63d760c69 100644
--- a/cvpcb/cvpcb_mainframe.cpp
+++ b/cvpcb/cvpcb_mainframe.cpp
@@ -865,14 +865,14 @@ void CVPCB_MAINFRAME::SendMessageToEESCHEMA( bool aClearHighligntOnly )
int CVPCB_MAINFRAME::ReadSchematicNetlist( const std::string& aNetlist )
{
- STRING_LINE_READER* strrdr = new STRING_LINE_READER( aNetlist, "Eeschema via Kiway" );
- KICAD_NETLIST_READER netrdr( strrdr, &m_netlist );
+ STRING_LINE_READER* stringReader = new STRING_LINE_READER( aNetlist, "Eeschema via Kiway" );
+ KICAD_NETLIST_READER netlistReader( stringReader, &m_netlist );
m_netlist.Clear();
try
{
- netrdr.LoadNetlist();
+ netlistReader.LoadNetlist();
}
catch( const IO_ERROR& ioe )
{
diff --git a/eeschema/netlist_exporters/netlist_exporter_xml.h b/eeschema/netlist_exporters/netlist_exporter_xml.h
index bb7be6d582..c7321c0cf0 100644
--- a/eeschema/netlist_exporters/netlist_exporter_xml.h
+++ b/eeschema/netlist_exporters/netlist_exporter_xml.h
@@ -44,7 +44,7 @@ class XNODE;
enum GNL_T
{
GNL_LIBRARIES = 1 << 0,
- GNL_SYMBOLS = 1 << 1,
+ GNL_SYMBOLS = 1 << 1,
GNL_PARTS = 1 << 2,
GNL_HEADER = 1 << 3,
GNL_NETS = 1 << 4,
diff --git a/eeschema/netlist_exporters/netlist_generator.cpp b/eeschema/netlist_exporters/netlist_generator.cpp
index b13f7bc569..3fb6ab8d14 100644
--- a/eeschema/netlist_exporters/netlist_generator.cpp
+++ b/eeschema/netlist_exporters/netlist_generator.cpp
@@ -191,7 +191,7 @@ void SCH_EDIT_FRAME::sendNetlistToCvpcb()
STRING_FORMATTER formatter;
// @todo : trim GNL_ALL down to minimum for CVPCB
- exporter.Format( &formatter, GNL_ALL );
+ exporter.Format( &formatter, GNL_ALL | GNL_OPT_KICAD );
packet = formatter.GetString(); // an abbreviated "kicad" (s-expr) netlist