GitLab was upgraded during the server migration. If you cannot sign in, use "Forgot your password?" to reset it — passwords could not be carried over.

Commit b24118eb authored Dec 21, 2009 by charras

changed last layer constants XXX_LAYER_CU and XXXX_LAYER_CMP to XXX_LAYER_BACK and XXX_LAYER_FRONT

parent 703420ba

include/pcbstruct.h

+8 −8

Original line number	Diff line number	Diff line
		@@ -90,14 +90,14 @@
		#define LAYER_14 (1 << LAYER_N_14) ///< bit mask for layer 14
		#define LAYER_15 (1 << LAYER_N_15) ///< bit mask for layer 15
		#define LAYER_FRONT (1 << LAYER_N_FRONT) ///< bit mask for component layer
		#define ADHESIVE_LAYER_CU (1 << ADHESIVE_N_BACK)
		#define ADHESIVE_LAYER_CMP (1 << ADHESIVE_N_FRONT)
		#define SOLDERPASTE_LAYER_CU (1 << SOLDERPASTE_N_BACK)
		#define SOLDERPASTE_LAYER_CMP (1 << SOLDERPASTE_N_FRONT)
		#define SILKSCREEN_LAYER_CU (1 << SILKSCREEN_N_BACK)
		#define SILKSCREEN_LAYER_CMP (1 << SILKSCREEN_N_FRONT)
		#define SOLDERMASK_LAYER_CU (1 << SOLDERMASK_N_BACK)
		#define SOLDERMASK_LAYER_CMP (1 << SOLDERMASK_N_FRONT)
		#define ADHESIVE_LAYER_BACK (1 << ADHESIVE_N_BACK)
		#define ADHESIVE_LAYER_FRONT (1 << ADHESIVE_N_FRONT)
		#define SOLDERPASTE_LAYER_BACK (1 << SOLDERPASTE_N_BACK)
		#define SOLDERPASTE_LAYER_FRONT (1 << SOLDERPASTE_N_FRONT)
		#define SILKSCREEN_LAYER_BACK (1 << SILKSCREEN_N_BACK)
		#define SILKSCREEN_LAYER_FRONT (1 << SILKSCREEN_N_FRONT)
		#define SOLDERMASK_LAYER_BACK (1 << SOLDERMASK_N_BACK)
		#define SOLDERMASK_LAYER_FRONT (1 << SOLDERMASK_N_FRONT)
		#define DRAW_LAYER (1 << DRAW_N)
		#define COMMENT_LAYER (1 << COMMENT_N)
		#define ECO1_LAYER (1 << ECO1_N)

pcbnew/class_module_transform_functions.cpp

+29 −29

Original line number	Diff line number	Diff line
		@@ -80,41 +80,41 @@ static int ChangeSideMaskLayer( int masque )
		int newmasque;

		newmasque = masque & ~(LAYER_BACK \| LAYER_FRONT \|
		SILKSCREEN_LAYER_CU \| SILKSCREEN_LAYER_CMP \|
		ADHESIVE_LAYER_CU \| ADHESIVE_LAYER_CMP \|
		SOLDERMASK_LAYER_CU \| SOLDERMASK_LAYER_CMP \|
		SOLDERPASTE_LAYER_CU \| SOLDERPASTE_LAYER_CMP \|
		ADHESIVE_LAYER_CU \| ADHESIVE_LAYER_CMP);
		SILKSCREEN_LAYER_BACK \| SILKSCREEN_LAYER_FRONT \|
		ADHESIVE_LAYER_BACK \| ADHESIVE_LAYER_FRONT \|
		SOLDERMASK_LAYER_BACK \| SOLDERMASK_LAYER_FRONT \|
		SOLDERPASTE_LAYER_BACK \| SOLDERPASTE_LAYER_FRONT \|
		ADHESIVE_LAYER_BACK \| ADHESIVE_LAYER_FRONT);

		if( masque & LAYER_BACK )
		newmasque \|= LAYER_FRONT;
		if( masque & LAYER_FRONT )
		newmasque \|= LAYER_BACK;

		if( masque & SILKSCREEN_LAYER_CU )
		newmasque \|= SILKSCREEN_LAYER_CMP;
		if( masque & SILKSCREEN_LAYER_CMP )
		newmasque \|= SILKSCREEN_LAYER_CU;

		if( masque & ADHESIVE_LAYER_CU )
		newmasque \|= ADHESIVE_LAYER_CMP;
		if( masque & ADHESIVE_LAYER_CMP )
		newmasque \|= ADHESIVE_LAYER_CU;

		if( masque & SOLDERMASK_LAYER_CU )
		newmasque \|= SOLDERMASK_LAYER_CMP;
		if( masque & SOLDERMASK_LAYER_CMP )
		newmasque \|= SOLDERMASK_LAYER_CU;

		if( masque & SOLDERPASTE_LAYER_CU )
		newmasque \|= SOLDERPASTE_LAYER_CMP;
		if( masque & SOLDERPASTE_LAYER_CMP )
		newmasque \|= SOLDERPASTE_LAYER_CU;

		if( masque & ADHESIVE_LAYER_CU )
		newmasque \|= ADHESIVE_LAYER_CMP;
		if( masque & ADHESIVE_LAYER_CMP )
		newmasque \|= ADHESIVE_LAYER_CU;
		if( masque & SILKSCREEN_LAYER_BACK )
		newmasque \|= SILKSCREEN_LAYER_FRONT;
		if( masque & SILKSCREEN_LAYER_FRONT )
		newmasque \|= SILKSCREEN_LAYER_BACK;

		if( masque & ADHESIVE_LAYER_BACK )
		newmasque \|= ADHESIVE_LAYER_FRONT;
		if( masque & ADHESIVE_LAYER_FRONT )
		newmasque \|= ADHESIVE_LAYER_BACK;

		if( masque & SOLDERMASK_LAYER_BACK )
		newmasque \|= SOLDERMASK_LAYER_FRONT;
		if( masque & SOLDERMASK_LAYER_FRONT )
		newmasque \|= SOLDERMASK_LAYER_BACK;

		if( masque & SOLDERPASTE_LAYER_BACK )
		newmasque \|= SOLDERPASTE_LAYER_FRONT;
		if( masque & SOLDERPASTE_LAYER_FRONT )
		newmasque \|= SOLDERPASTE_LAYER_BACK;

		if( masque & ADHESIVE_LAYER_BACK )
		newmasque \|= ADHESIVE_LAYER_FRONT;
		if( masque & ADHESIVE_LAYER_FRONT )
		newmasque \|= ADHESIVE_LAYER_BACK;

		return newmasque;
		}

pcbnew/class_pad.cpp

+8 −8

Original line number	Diff line number	Diff line
		@@ -584,35 +584,35 @@ void D_PAD::DisplayInfo( WinEDA_DrawFrame* frame )
		{
		switch( m_Masque_Layer & ~ALL_CU_LAYERS )
		{
		case ADHESIVE_LAYER_CU:
		case ADHESIVE_LAYER_BACK:
		layerInfo = board->GetLayerName( ADHESIVE_N_BACK );
		break;

		case ADHESIVE_LAYER_CMP:
		case ADHESIVE_LAYER_FRONT:
		layerInfo = board->GetLayerName( ADHESIVE_N_FRONT );
		break;

		case SOLDERPASTE_LAYER_CU:
		case SOLDERPASTE_LAYER_BACK:
		layerInfo = board->GetLayerName( SOLDERPASTE_N_BACK );
		break;

		case SOLDERPASTE_LAYER_CMP:
		case SOLDERPASTE_LAYER_FRONT:
		layerInfo = board->GetLayerName( SOLDERPASTE_N_FRONT );
		break;

		case SILKSCREEN_LAYER_CU:
		case SILKSCREEN_LAYER_BACK:
		layerInfo = board->GetLayerName( SILKSCREEN_N_BACK );
		break;

		case SILKSCREEN_LAYER_CMP:
		case SILKSCREEN_LAYER_FRONT:
		layerInfo = board->GetLayerName( SILKSCREEN_N_FRONT );
		break;

		case SOLDERMASK_LAYER_CU:
		case SOLDERMASK_LAYER_BACK:
		layerInfo = board->GetLayerName( SOLDERMASK_N_BACK );
		break;

		case SOLDERMASK_LAYER_CMP:
		case SOLDERMASK_LAYER_FRONT:
		layerInfo = board->GetLayerName( SOLDERMASK_N_FRONT );
		break;

pcbnew/class_pad.h

+6 −6

Original line number	Diff line number	Diff line
		@@ -12,18 +12,18 @@ class Pcb3D_GLCanvas;
		*/

		// PAD_STANDARD:
		#define PAD_STANDARD_DEFAULT_LAYERS ALL_CU_LAYERS \| SILKSCREEN_LAYER_CMP \| SOLDERMASK_LAYER_CU \| \
		SOLDERMASK_LAYER_CMP
		#define PAD_STANDARD_DEFAULT_LAYERS ALL_CU_LAYERS \| SILKSCREEN_LAYER_FRONT \| SOLDERMASK_LAYER_BACK \| \
		SOLDERMASK_LAYER_FRONT

		// PAD_CONN:
		#define PAD_CONN_DEFAULT_LAYERS LAYER_FRONT \| SOLDERPASTE_LAYER_CMP \| SOLDERMASK_LAYER_CMP
		#define PAD_CONN_DEFAULT_LAYERS LAYER_FRONT \| SOLDERPASTE_LAYER_FRONT \| SOLDERMASK_LAYER_FRONT

		// PAD_SMD:
		#define PAD_SMD_DEFAULT_LAYERS LAYER_FRONT \| SOLDERMASK_LAYER_CMP
		#define PAD_SMD_DEFAULT_LAYERS LAYER_FRONT \| SOLDERMASK_LAYER_FRONT

		//PAD_HOLE_NOT_PLATED:
		#define PAD_HOLE_NOT_PLATED_DEFAULT_LAYERS LAYER_BACK \| SILKSCREEN_LAYER_CMP \| \
		SOLDERMASK_LAYER_CU \| SOLDERMASK_LAYER_CMP
		#define PAD_HOLE_NOT_PLATED_DEFAULT_LAYERS LAYER_BACK \| SILKSCREEN_LAYER_FRONT \| \
		SOLDERMASK_LAYER_BACK \| SOLDERMASK_LAYER_FRONT


		class D_PAD : public BOARD_CONNECTED_ITEM

pcbnew/class_pad_draw_functions.cpp

+8 −8

Original line number	Diff line number	Diff line
		@@ -60,35 +60,35 @@ void D_PAD::Draw( WinEDA_DrawPanel* panel, wxDC* DC, int draw_mode,
		// else use DARKGRAY
		switch( m_Masque_Layer & ~ALL_CU_LAYERS )
		{
		case ADHESIVE_LAYER_CU:
		case ADHESIVE_LAYER_BACK:
		color = g_DesignSettings.m_LayerColor[ADHESIVE_N_BACK];
		break;

		case ADHESIVE_LAYER_CMP:
		case ADHESIVE_LAYER_FRONT:
		color = g_DesignSettings.m_LayerColor[ADHESIVE_N_FRONT];
		break;

		case SOLDERPASTE_LAYER_CU:
		case SOLDERPASTE_LAYER_BACK:
		color = g_DesignSettings.m_LayerColor[SOLDERPASTE_N_BACK];
		break;

		case SOLDERPASTE_LAYER_CMP:
		case SOLDERPASTE_LAYER_FRONT:
		color = g_DesignSettings.m_LayerColor[SOLDERPASTE_N_FRONT];
		break;

		case SILKSCREEN_LAYER_CU:
		case SILKSCREEN_LAYER_BACK:
		color = g_DesignSettings.m_LayerColor[SILKSCREEN_N_BACK];
		break;

		case SILKSCREEN_LAYER_CMP:
		case SILKSCREEN_LAYER_FRONT:
		color = g_DesignSettings.m_LayerColor[SILKSCREEN_N_FRONT];
		break;

		case SOLDERMASK_LAYER_CU:
		case SOLDERMASK_LAYER_BACK:
		color = g_DesignSettings.m_LayerColor[SOLDERMASK_N_BACK];
		break;

		case SOLDERMASK_LAYER_CMP:
		case SOLDERMASK_LAYER_FRONT:
		color = g_DesignSettings.m_LayerColor[SOLDERMASK_N_FRONT];
		break;