From 2cc5c6fd451d3ef3b82c82a527ec5d7fd90f54ff Mon Sep 17 00:00:00 2001 From: Jon Evans Date: Thu, 8 Mar 2018 20:52:03 -0500 Subject: [PATCH] Add ERC check in component editor for conflicting multi-unit pins Fixes: lp:1680638 * https://bugs.launchpad.net/kicad/+bug/1680638 --- eeschema/pinedit.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/eeschema/pinedit.cpp b/eeschema/pinedit.cpp index aeeee62791..ff39bcff22 100644 --- a/eeschema/pinedit.cpp +++ b/eeschema/pinedit.cpp @@ -722,8 +722,7 @@ void LIB_EDIT_FRAME::OnCheckComponent( wxCommandEvent& event ) LIB_PIN* pin = pinList[ii - 1]; if( pin->GetNumber() != curr_pin->GetNumber() - || pin->GetConvert() != curr_pin->GetConvert() - || pin->GetUnit() != curr_pin->GetUnit() ) + || pin->GetConvert() != curr_pin->GetConvert() ) continue; dup_error++; @@ -746,7 +745,9 @@ void LIB_EDIT_FRAME::OnCheckComponent( wxCommandEvent& event ) if( part->GetUnitCount() > 1 ) { - msg += wxString::Format( _( " in symbol %c" ), 'A' + curr_pin->GetUnit() - 1 ); + msg += wxString::Format( _( " in units %c and %c" ), + 'A' + curr_pin->GetUnit() - 1, + 'A' + pin->GetUnit() - 1 ); } if( m_showDeMorgan )