Basic matrix module for the hall effect keypad now working.
- Includes new "table pinning" setup (much easier to understand) - Matrix layouts will be split into their own dependent modules later - Changed the HID Raw view id (too many teensy devices on this computer...) - Moved the macro processing outside of the usb timer signal (this will be slower overall, but will result in more consistant behaviour)
This commit is contained in:
Jacob Alexander
parent
46916defa5
commit
6557022f20
11 changed files with 259 additions and 139 deletions
241
Scan/matrix/matrix_scan.c
Normal file
241
Scan/matrix/matrix_scan.c
Normal file
|
|
@ -0,0 +1,241 @@
|
|||
/* Copyright (C) 2011 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.
|
||||
*/
|
||||
|
||||
// ----- Includes -----
|
||||
|
||||
// AVR Includes
|
||||
#include <avr/io.h>
|
||||
|
||||
// Project Includes
|
||||
#include <print.h>
|
||||
|
||||
// Local Includes
|
||||
#include "matrix_scan.h"
|
||||
|
||||
// Matrix Configuration
|
||||
#include <matrix.h>
|
||||
|
||||
|
||||
|
||||
// ----- Macros -----
|
||||
|
||||
#define REG_SET(reg) reg |= (1 << ( matrix[row*(MAX_ROW_SIZE+1)+col] % 10 ) )
|
||||
|
||||
#define PIN_SET_COL(pin) \
|
||||
switch ( scanMode ) { \
|
||||
case scanCol: \
|
||||
case scanCol_powrRow: \
|
||||
case scanDual: \
|
||||
REG_SET(port##pin); break; \
|
||||
case scanRow_powrCol: REG_SET(ddr##pin); REG_SET(port##pin); break; \
|
||||
} \
|
||||
break
|
||||
|
||||
#define PIN_SET_ROW(pin) \
|
||||
switch ( scanMode ) { \
|
||||
case scanRow: \
|
||||
case scanRow_powrCol: \
|
||||
case scanDual: \
|
||||
REG_SET(port##pin); break; \
|
||||
case scanCol_powrRow: REG_SET(ddr##pin); REG_SET(port##pin); break; \
|
||||
} \
|
||||
break
|
||||
|
||||
#define PIN_CASE(pinLetter) \
|
||||
case pin##pinLetter##0: \
|
||||
case pin##pinLetter##1: \
|
||||
case pin##pinLetter##2: \
|
||||
case pin##pinLetter##3: \
|
||||
case pin##pinLetter##4: \
|
||||
case pin##pinLetter##5: \
|
||||
case pin##pinLetter##6: \
|
||||
case pin##pinLetter##7
|
||||
|
||||
#define PIN_TEST_COL(pin) \
|
||||
if ( !( pin & ( 1 << ( matrix[0*(MAX_ROW_SIZE+1)+col] % 10 ) ) ) ) \
|
||||
detectArray[matrix[row*(MAX_ROW_SIZE+1)+col]]++; \
|
||||
break
|
||||
|
||||
|
||||
|
||||
// ----- Variables -----
|
||||
|
||||
|
||||
|
||||
// ----- Functions -----
|
||||
|
||||
// Goes through the defined matrix and matrix mode, and sets the initial state of all of the available pins
|
||||
inline void matrix_pinSetup( uint8_t *matrix )
|
||||
{
|
||||
// Setup the variables
|
||||
uint8_t portA = 0x00;
|
||||
uint8_t portB = 0x00;
|
||||
uint8_t portC = 0x00;
|
||||
uint8_t portD = 0x00;
|
||||
uint8_t portE = 0x00;
|
||||
uint8_t portF = 0x00;
|
||||
|
||||
uint8_t ddrA = 0x00;
|
||||
uint8_t ddrB = 0x00;
|
||||
uint8_t ddrC = 0x00;
|
||||
uint8_t ddrD = 0x00;
|
||||
uint8_t ddrE = 0x00;
|
||||
uint8_t ddrF = 0x00;
|
||||
|
||||
// Loop through all the pin assignments, for the initial pin settings
|
||||
uint16_t row, col;
|
||||
|
||||
// Rows
|
||||
for ( col = 0, row = 1; row < MAX_COL_SIZE + 1; row++ )
|
||||
{
|
||||
// We can't pass 2D arrays, so just point to the first element and calculate directly
|
||||
switch ( matrix[row*(MAX_ROW_SIZE+1)+col] )
|
||||
{
|
||||
PIN_CASE(A):
|
||||
PIN_SET_ROW(A);
|
||||
PIN_CASE(B):
|
||||
PIN_SET_ROW(B);
|
||||
PIN_CASE(C):
|
||||
PIN_SET_ROW(C);
|
||||
PIN_CASE(D):
|
||||
PIN_SET_ROW(D);
|
||||
PIN_CASE(E):
|
||||
PIN_SET_ROW(E);
|
||||
PIN_CASE(F):
|
||||
PIN_SET_ROW(F);
|
||||
|
||||
default:
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
// Columns
|
||||
for ( col = 1, row = 0; col < (MAX_ROW_SIZE+1) + 1; col++ )
|
||||
{
|
||||
// We can't pass 2D arrays, so just point to the first element and calculate directly
|
||||
switch ( matrix[row*(MAX_ROW_SIZE+1)+col] )
|
||||
{
|
||||
PIN_CASE(A):
|
||||
PIN_SET_COL(A);
|
||||
PIN_CASE(B):
|
||||
PIN_SET_COL(B);
|
||||
PIN_CASE(C):
|
||||
PIN_SET_COL(C);
|
||||
PIN_CASE(D):
|
||||
PIN_SET_COL(D);
|
||||
PIN_CASE(E):
|
||||
PIN_SET_COL(E);
|
||||
PIN_CASE(F):
|
||||
PIN_SET_COL(F);
|
||||
|
||||
default:
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
// Pin Status
|
||||
char tmpStr[6];
|
||||
info_print("Initial Matrix Pin Setup");
|
||||
info_print(" ddrA ddrB ddrC ddrD ddrE ddrF");
|
||||
print(" ");
|
||||
hexToStr_op( ddrA, tmpStr, 2 ); dPrintStrs( " 0x", tmpStr );
|
||||
hexToStr_op( ddrB, tmpStr, 2 ); dPrintStrs( " 0x", tmpStr );
|
||||
hexToStr_op( ddrC, tmpStr, 2 ); dPrintStrs( " 0x", tmpStr );
|
||||
hexToStr_op( ddrD, tmpStr, 2 ); dPrintStrs( " 0x", tmpStr );
|
||||
hexToStr_op( ddrE, tmpStr, 2 ); dPrintStrs( " 0x", tmpStr );
|
||||
hexToStr_op( ddrF, tmpStr, 2 ); dPrintStrs( " 0x", tmpStr );
|
||||
print("\n");
|
||||
info_print("portA portB portC portD portE portF");
|
||||
print(" ");
|
||||
hexToStr_op( portA, tmpStr, 2 ); dPrintStrs( " 0x", tmpStr );
|
||||
hexToStr_op( portB, tmpStr, 2 ); dPrintStrs( " 0x", tmpStr );
|
||||
hexToStr_op( portC, tmpStr, 2 ); dPrintStrs( " 0x", tmpStr );
|
||||
hexToStr_op( portD, tmpStr, 2 ); dPrintStrs( " 0x", tmpStr );
|
||||
hexToStr_op( portE, tmpStr, 2 ); dPrintStrs( " 0x", tmpStr );
|
||||
hexToStr_op( portF, tmpStr, 2 ); dPrintStrs( " 0x", tmpStr );
|
||||
print("\n");
|
||||
|
||||
// Setting the pins
|
||||
#if defined(__AVR_AT90USB1286__)
|
||||
DDRA = ddrA;
|
||||
#endif
|
||||
DDRB = ddrB;
|
||||
DDRC = ddrC;
|
||||
DDRD = ddrD;
|
||||
DDRE = ddrE;
|
||||
DDRF = ddrF;
|
||||
|
||||
#if defined(__AVR_AT90USB1286__)
|
||||
PORTA = portA;
|
||||
#endif
|
||||
PORTB = portB;
|
||||
PORTC = portC;
|
||||
PORTD = portD;
|
||||
PORTE = portE;
|
||||
PORTF = portF;
|
||||
}
|
||||
|
||||
// TODO Proper matrix scanning
|
||||
inline void matrix_scan( uint8_t *matrix, uint8_t *detectArray )
|
||||
{
|
||||
// Column Scan
|
||||
#if scanMode == scanCol
|
||||
uint16_t col = 1;
|
||||
uint16_t row = 1;
|
||||
for ( ; col < (MAX_ROW_SIZE+1) + 1; col++ )
|
||||
{
|
||||
switch ( matrix[0*(MAX_ROW_SIZE+1)+col] / 10 )
|
||||
{
|
||||
#if defined(__AVR_AT90USB1286__)
|
||||
case 0: // PINA
|
||||
PIN_TEST_COL(PINA);
|
||||
#endif
|
||||
case 1: // PINB
|
||||
PIN_TEST_COL(PINB);
|
||||
case 2: // PINC
|
||||
PIN_TEST_COL(PINC);
|
||||
case 3: // PIND
|
||||
PIN_TEST_COL(PIND);
|
||||
case 4: // PINE
|
||||
PIN_TEST_COL(PINE);
|
||||
case 5: // PINF
|
||||
PIN_TEST_COL(PINF);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
// Row Scan
|
||||
#if scanMode == scanRow
|
||||
#endif
|
||||
|
||||
// Column Scan, Power Row
|
||||
#if scanMode == scanCol_powrRow
|
||||
#endif
|
||||
|
||||
// Row Scan, Power Column
|
||||
#if scanMode == scanRow_powrCol
|
||||
#endif
|
||||
|
||||
// Dual Scan
|
||||
#if scanMode == scanDual
|
||||
#endif
|
||||
}
|
||||
|
||||
Loading…
Add table
Add a link
Reference in a new issue