# HG changeset patch # User Jacob Alexander # Date 1419175971 28800 # Node ID 3caf3217b604a05e81540c8a9576b4559ee584be # Parent 98d1981f4dd39d1f553d1382c91edf2c8aa9ebee Moving MatrixARM header macros to separate file diff -r 98d1981f4dd3 -r 3caf3217b604 Scan/MD1/matrix.h --- a/Scan/MD1/matrix.h Sun Nov 30 19:36:19 2014 -0800 +++ b/Scan/MD1/matrix.h Sun Dec 21 07:32:51 2014 -0800 @@ -22,13 +22,10 @@ #ifndef __MATRIX_H #define __MATRIX_H -// ----- Macros ----- +// ----- Includes ----- -// Convenience Macros -#define gpio( port, pin ) { Port_##port, Pin_##pin } -#define Matrix_colsNum sizeof( Matrix_cols ) / sizeof( GPIO_Pin ) -#define Matrix_rowsNum sizeof( Matrix_rows ) / sizeof( GPIO_Pin ) -#define Matrix_maxKeys sizeof( Matrix_scanArray ) / sizeof( KeyState ) +// Project Includes +#include diff -r 98d1981f4dd3 -r 3caf3217b604 Scan/MatrixARM/matrix_setup.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Scan/MatrixARM/matrix_setup.h Sun Dec 21 07:32:51 2014 -0800 @@ -0,0 +1,35 @@ +/* Copyright (C) 2014 by Jacob Alexander + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#ifndef __MATRIX_SETUP_H +#define __MATRIX_SETUP_H + +// ----- Macros ----- + +// Convenience Macros +#define gpio( port, pin ) { Port_##port, Pin_##pin } +#define Matrix_colsNum sizeof( Matrix_cols ) / sizeof( GPIO_Pin ) +#define Matrix_rowsNum sizeof( Matrix_rows ) / sizeof( GPIO_Pin ) +#define Matrix_maxKeys sizeof( Matrix_scanArray ) / sizeof( KeyState ) + + +#endif // __MATRIX_SETUP_H +