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

Fix incorrect gerber job file syntax, when a board has inner layers.

This commit is contained in:
jean-pierre charras 2018-05-03 18:27:02 +02:00
parent 0f5eb421b3
commit 5b44e80355
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pcbnew/exporters/gerber_jobfile_writer.cpp
View File

@ -541,19 +541,17 @@ void GERBER_JOBFILE_WRITER::addJSONDesignRules()
minclearanceOuter*m_conversionUnits ) ); minclearanceOuter*m_conversionUnits ) );
removeJSONSepararator(); // remove the last separator removeJSONSepararator(); // remove the last separator
closeBlock();
if( !hasInnerLayers )
closeBlock();
else
closeBlockWithSep();
if( hasInnerLayers ) if( hasInnerLayers )
{ {
closeBlockWithSep();
openBlock(); openBlock();
addJSONObject( "\"Layers\": \"Inner\",\n" ); addJSONObject( "\"Layers\": \"Inner\",\n" );
addJSONObject( "\"Values\":\n" );
openBlock();
addJSONObject( wxString::Format( "\"PadToPad\": %.3f,\n", minPadClearanceInner*m_conversionUnits ) ); addJSONObject( wxString::Format( "\"PadToPad\": %.3f,\n", minPadClearanceInner*m_conversionUnits ) );
addJSONObject( wxString::Format( "\"PadToTrack\": %.3f,\n", minPadClearanceInner*m_conversionUnits ) ); addJSONObject( wxString::Format( "\"PadToTrack\": %.3f,\n", minPadClearanceInner*m_conversionUnits ) );
addJSONObject( wxString::Format( "\"TrackToTrack\": %.3f,\n", minclearance_track2track*m_conversionUnits ) ); addJSONObject( wxString::Format( "\"TrackToTrack\": %.3f,\n", minclearance_track2track*m_conversionUnits ) );