haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Gerber job file: remove info "core/prepreg" in "Notes" and "Name". 

They were intended to be just a comment.
However they can generate not wanted constraints for board fabrication.
This commit is contained in:
jean-pierre charras 2019-11-10 13:07:04 +01:00
parent 65e5adcd19
commit 80df7a7443
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pcbnew/exporters/gerber_jobfile_writer.cpp
View File

@ -643,8 +643,10 @@ void GERBER_JOBFILE_WRITER::addJSONMaterialStackup()
case BS_ITEM_TYPE_DIELECTRIC: case BS_ITEM_TYPE_DIELECTRIC:
layer_type = "Dielectric"; layer_type = "Dielectric";
layer_name = formatStringFromUTF32( wxString::Format( "dielectric layer %d (%s)", // The option core or prepreg is not added here, as it creates constraints
item->m_DielectricLayerId, item->m_TypeName ) ); // in build process, not necessary wanted.
layer_name = formatStringFromUTF32( wxString::Format( "dielectric layer %d",
item->m_DielectricLayerId ) );
break; break;
default: default:
@ -704,8 +706,7 @@ void GERBER_JOBFILE_WRITER::addJSONMaterialStackup()
next_copper_layer = B_Cu; next_copper_layer = B_Cu;
addJSONObject( wxString::Format( "\"Name\": \"%s %s/%s\",\n", addJSONObject( wxString::Format( "\"Name\": \"%s/%s\",\n",
formatStringFromUTF32( item->m_TypeName ), // core or prepreg
formatStringFromUTF32( m_pcb->GetLayerName( last_copper_layer ) ), formatStringFromUTF32( m_pcb->GetLayerName( last_copper_layer ) ),
formatStringFromUTF32( m_pcb->GetLayerName( next_copper_layer ) ) ) formatStringFromUTF32( m_pcb->GetLayerName( next_copper_layer ) ) )
); );
@ -713,10 +714,7 @@ void GERBER_JOBFILE_WRITER::addJSONMaterialStackup()
// Add a comment ("Notes"): // Add a comment ("Notes"):
wxString note = "\"Notes\": "; wxString note = "\"Notes\": ";
if( uptodate ) // We can add the dielectric variant ("core" "prepreg" ...):
note << wxString::Format( " \"Type: %s", layer_name.c_str() ); note << wxString::Format( " \"Type: %s", layer_name.c_str() );
else
note << "\"";
note << wxString::Format( " (from %s to %s)\"\n", note << wxString::Format( " (from %s to %s)\"\n",
formatStringFromUTF32( m_pcb->GetLayerName( last_copper_layer ) ), formatStringFromUTF32( m_pcb->GetLayerName( last_copper_layer ) ),