remove custom matrix support
This commit is contained in:
mechmerlin
parent
4211252117
commit
b8c5efa555
3 changed files with 8 additions and 119 deletions
|
|
@ -16,8 +16,7 @@ You should have received a copy of the GNU General Public License
|
||||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef CONFIG_H
|
#pragma once
|
||||||
#define CONFIG_H
|
|
||||||
|
|
||||||
#define VENDOR_ID 0x20A0
|
#define VENDOR_ID 0x20A0
|
||||||
#define PRODUCT_ID 0x422D
|
#define PRODUCT_ID 0x422D
|
||||||
|
|
@ -30,6 +29,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
#define MATRIX_ROWS 8
|
#define MATRIX_ROWS 8
|
||||||
#define MATRIX_COLS 15
|
#define MATRIX_COLS 15
|
||||||
|
|
||||||
|
// 0 1 2 3 4 5 6 7 8 9 A B C D E
|
||||||
|
#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5, B6, B7 }
|
||||||
|
#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, D7}
|
||||||
|
#define UNUSED_PINS
|
||||||
|
|
||||||
#define RGBLED_NUM 16
|
#define RGBLED_NUM 16
|
||||||
#define RGBLIGHT_ANIMATIONS
|
#define RGBLIGHT_ANIMATIONS
|
||||||
|
|
||||||
|
|
@ -43,4 +47,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
#define BACKLIGHT_PORT_NUM (1 << 4)
|
#define BACKLIGHT_PORT_NUM (1 << 4)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
|
||||||
|
|
@ -1,113 +0,0 @@
|
||||||
/*
|
|
||||||
Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com>
|
|
||||||
|
|
||||||
This program is free software: you can redistribute it and/or modify
|
|
||||||
it under the terms of the GNU General Public License as published by
|
|
||||||
the Free Software Foundation, either version 2 of the License, or
|
|
||||||
(at your option) any later version.
|
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
GNU General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License
|
|
||||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <avr/io.h>
|
|
||||||
#include <util/delay.h>
|
|
||||||
|
|
||||||
#include "matrix.h"
|
|
||||||
|
|
||||||
#ifndef DEBOUNCE
|
|
||||||
# define DEBOUNCE 5
|
|
||||||
#endif
|
|
||||||
|
|
||||||
static uint8_t debouncing = DEBOUNCE;
|
|
||||||
|
|
||||||
static matrix_row_t matrix[MATRIX_ROWS];
|
|
||||||
static matrix_row_t matrix_debouncing[MATRIX_ROWS];
|
|
||||||
|
|
||||||
void matrix_init(void) {
|
|
||||||
// all outputs for rows high
|
|
||||||
DDRB = 0xFF;
|
|
||||||
PORTB = 0xFF;
|
|
||||||
// all inputs for columns
|
|
||||||
DDRA = 0x00;
|
|
||||||
DDRC &= ~(0x111111<<2);
|
|
||||||
DDRD &= ~(1<<PIND7);
|
|
||||||
// all columns are pulled-up
|
|
||||||
PORTA = 0xFF;
|
|
||||||
PORTC |= (0b111111<<2);
|
|
||||||
PORTD |= (1<<PIND7);
|
|
||||||
|
|
||||||
// initialize matrix state: all keys off
|
|
||||||
for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
|
|
||||||
matrix[row] = 0x00;
|
|
||||||
matrix_debouncing[row] = 0x00;
|
|
||||||
}
|
|
||||||
|
|
||||||
// activate backlight
|
|
||||||
//PORTD |= (1 << 4);
|
|
||||||
//_SFR_IO8(0x09) |= (1 << 4); //_BV(0x94 & 0xF);
|
|
||||||
//
|
|
||||||
// this is the code that *should* be executed in quantum.c
|
|
||||||
_SFR_IO8(0x12) |= _BV(0x4);
|
|
||||||
}
|
|
||||||
|
|
||||||
void matrix_set_row_status(uint8_t row) {
|
|
||||||
DDRB = (1 << row);
|
|
||||||
PORTB = ~(1 << row);
|
|
||||||
}
|
|
||||||
|
|
||||||
uint8_t bit_reverse(uint8_t x) {
|
|
||||||
x = ((x >> 1) & 0x55) | ((x << 1) & 0xaa);
|
|
||||||
x = ((x >> 2) & 0x33) | ((x << 2) & 0xcc);
|
|
||||||
x = ((x >> 4) & 0x0f) | ((x << 4) & 0xf0);
|
|
||||||
return x;
|
|
||||||
}
|
|
||||||
|
|
||||||
uint8_t matrix_scan(void) {
|
|
||||||
for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
|
|
||||||
matrix_set_row_status(row);
|
|
||||||
_delay_us(5);
|
|
||||||
|
|
||||||
matrix_row_t cols = (
|
|
||||||
// cols 0..7, PORTA 0 -> 7
|
|
||||||
(~PINA) & 0xFF
|
|
||||||
) | (
|
|
||||||
// cols 8..13, PORTC 7 -> 0
|
|
||||||
bit_reverse((~PINC) & 0xFF) << 8
|
|
||||||
) | (
|
|
||||||
// col 14, PORTD 7
|
|
||||||
((~PIND) & (1 << PIND7)) << 7
|
|
||||||
);
|
|
||||||
|
|
||||||
if (matrix_debouncing[row] != cols) {
|
|
||||||
matrix_debouncing[row] = cols;
|
|
||||||
debouncing = DEBOUNCE;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (debouncing) {
|
|
||||||
if (--debouncing) {
|
|
||||||
_delay_ms(1);
|
|
||||||
} else {
|
|
||||||
for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
|
|
||||||
matrix[i] = matrix_debouncing[i];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
matrix_scan_user();
|
|
||||||
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
inline matrix_row_t matrix_get_row(uint8_t row) {
|
|
||||||
return matrix[row];
|
|
||||||
}
|
|
||||||
|
|
||||||
void matrix_print(void) {
|
|
||||||
}
|
|
||||||
|
|
@ -25,7 +25,7 @@ NO_SUSPEND_POWER_DOWN = yes
|
||||||
F_CPU = 12000000
|
F_CPU = 12000000
|
||||||
|
|
||||||
# build options
|
# build options
|
||||||
BOOTMAGIC_ENABLE = yes
|
BOOTMAGIC_ENABLE = no
|
||||||
MOUSEKEY_ENABLE = yes
|
MOUSEKEY_ENABLE = yes
|
||||||
EXTRAKEY_ENABLE = yes
|
EXTRAKEY_ENABLE = yes
|
||||||
CONSOLE_ENABLE = no
|
CONSOLE_ENABLE = no
|
||||||
|
|
@ -40,8 +40,7 @@ OPT_DEFS = -DDEBUG_LEVEL=0
|
||||||
OPT_DEFS += -DBOOTLOADER_SIZE=2048
|
OPT_DEFS += -DBOOTLOADER_SIZE=2048
|
||||||
|
|
||||||
# custom matrix setup
|
# custom matrix setup
|
||||||
CUSTOM_MATRIX = yes
|
SRC = i2c.c backlight_ps2avrGB.c
|
||||||
SRC = matrix.c i2c.c backlight_ps2avrGB.c
|
|
||||||
|
|
||||||
# programming options
|
# programming options
|
||||||
PROGRAM_CMD = ./util/atmega32a_program.py $(TARGET).hex
|
PROGRAM_CMD = ./util/atmega32a_program.py $(TARGET).hex
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue