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

Repair merge errors.

This commit is contained in:
Jeff Young 2024-06-03 17:37:56 +01:00
parent 6f3b6e3ad8
commit 299495a0aa
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pcbnew/initpcb.cpp
View File

@ -35,6 +35,7 @@
#include <footprint_edit_frame.h> #include <footprint_edit_frame.h>
#include <widgets/appearance_controls.h> #include <widgets/appearance_controls.h>
#include <drc/drc_item.h>
bool PCB_EDIT_FRAME::Clear_Pcb( bool doAskAboutUnsavedChanges, bool aFinal ) bool PCB_EDIT_FRAME::Clear_Pcb( bool doAskAboutUnsavedChanges, bool aFinal )

11
pcbnew/pad.cpp
View File

@ -1777,7 +1777,7 @@ void PAD::CheckPad( UNITS_PROVIDER* aUnitsProvider,
} }
} }
if( GetLocalClearance().value_or( 0 ) < 0 ) if( GetLocalClearance() < 0 )
aErrorHandler( DRCE_PADSTACK, _( "Negative local clearance values have no effect" ) ); aErrorHandler( DRCE_PADSTACK, _( "Negative local clearance values have no effect" ) );
// Some pads need a negative solder mask clearance (mainly for BGA with small pads) // Some pads need a negative solder mask clearance (mainly for BGA with small pads)
@ -1818,8 +1818,8 @@ void PAD::CheckPad( UNITS_PROVIDER* aUnitsProvider,
// So we could ask for user to confirm the choice // So we could ask for user to confirm the choice
// For now we just check for disappearing paste // For now we just check for disappearing paste
wxSize paste_size; wxSize paste_size;
int paste_margin = GetLocalSolderPasteMargin().value_or( 0 ); int paste_margin = GetLocalSolderPasteMargin();
double paste_ratio = GetLocalSolderPasteMarginRatio().value_or( 0 ); double paste_ratio = GetLocalSolderPasteMarginRatio();
paste_size.x = pad_size.x + paste_margin + KiROUND( pad_size.x * paste_ratio ); paste_size.x = pad_size.x + paste_margin + KiROUND( pad_size.x * paste_ratio );
paste_size.y = pad_size.y + paste_margin + KiROUND( pad_size.y * paste_ratio ); paste_size.y = pad_size.y + paste_margin + KiROUND( pad_size.y * paste_ratio );
@ -1852,7 +1852,7 @@ void PAD::CheckPad( UNITS_PROVIDER* aUnitsProvider,
case PAD_ATTRIB::NPTH: // Not plated, but through hole, a hole is expected case PAD_ATTRIB::NPTH: // Not plated, but through hole, a hole is expected
case PAD_ATTRIB::PTH: // Pad through hole, a hole is also expected case PAD_ATTRIB::PTH: // Pad through hole, a hole is also expected
if( drill_size.x <= 0 if( drill_size.x <= 0
|| ( drill_size.y <= 0 && GetDrillShape() == PAD_DRILL_SHAPE::OBLONG ) ) || ( drill_size.y <= 0 && GetDrillShape() == PAD_DRILL_SHAPE_T::PAD_DRILL_SHAPE_OBLONG ) )
{ {
aErrorHandler( DRCE_PAD_TH_WITH_NO_HOLE, wxEmptyString ); aErrorHandler( DRCE_PAD_TH_WITH_NO_HOLE, wxEmptyString );
} }
@ -1930,9 +1930,6 @@ void PAD::CheckPad( UNITS_PROVIDER* aUnitsProvider,
if( GetProperty() == PAD_PROP::BGA && GetAttribute() != PAD_ATTRIB::SMD ) if( GetProperty() == PAD_PROP::BGA && GetAttribute() != PAD_ATTRIB::SMD )
aErrorHandler( DRCE_PADSTACK, _( "BGA property is for SMD pads" ) ); aErrorHandler( DRCE_PADSTACK, _( "BGA property is for SMD pads" ) );
if( GetProperty() == PAD_PROP::MECHANICAL && GetAttribute() != PAD_ATTRIB::PTH )
aErrorHandler( DRCE_PADSTACK, _( "Mechanical property is for PTH pads" ) );
if( GetShape() == PAD_SHAPE::ROUNDRECT ) if( GetShape() == PAD_SHAPE::ROUNDRECT )
{ {
if( GetRoundRectRadiusRatio() < 0.0 ) if( GetRoundRectRadiusRatio() < 0.0 )