summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--keyboards/handwired/xealous/config.h12
-rw-r--r--keyboards/handwired/xealous/debounce.c63
-rw-r--r--keyboards/handwired/xealous/matrix.c329
-rw-r--r--keyboards/handwired/xealous/rules.mk6
4 files changed, 12 insertions, 398 deletions
diff --git a/keyboards/handwired/xealous/config.h b/keyboards/handwired/xealous/config.h
index 7bce502c15..251e85d4c1 100644
--- a/keyboards/handwired/xealous/config.h
+++ b/keyboards/handwired/xealous/config.h
@@ -20,20 +20,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"
/* Use I2C or Serial, not both */
-
#define USE_I2C
-#define SCL_CLOCK 400000UL
-
-// #define USE_SERIAL
-/* serial.c configuration for split keyboard */
-// #define SOFT_SERIAL_PIN D0
+#define SCL_CLOCK 800000UL
/* Select hand configuration */
-
#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
//#define DEBUG_MATRIX_SCAN_RATE //Use this to determine scan-rate.
#define FORCE_NKRO
@@ -41,6 +32,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define QMK_KEYS_PER_SCAN 4 //if we press four keys simultaneously, lets process them simultaneously...
#define DIODE_DIRECTION COL2ROW
+
#ifdef AUDIO_ENABLE
#define C6_AUDIO
#define STARTUP_SONG SONG(STARTUP_SOUND)
diff --git a/keyboards/handwired/xealous/debounce.c b/keyboards/handwired/xealous/debounce.c
deleted file mode 100644
index 65a99f27f2..0000000000
--- a/keyboards/handwired/xealous/debounce.c
+++ /dev/null
@@ -1,63 +0,0 @@
-#include <string.h>
-#include "config.h"
-#include "matrix.h"
-#include "timer.h"
-#include "quantum.h"
-
-#ifndef DEBOUNCING_DELAY
-# define DEBOUNCING_DELAY 5
-#endif
-
-//Debouncing counters
-typedef uint8_t debounce_counter_t;
-#define DEBOUNCE_COUNTER_MODULO 250
-#define DEBOUNCE_COUNTER_INACTIVE 251
-
-static debounce_counter_t *debounce_counters;
-
-void debounce_init(uint8_t num_rows)
-{
- debounce_counters = malloc(num_rows*MATRIX_COLS);
- memset(debounce_counters, DEBOUNCE_COUNTER_INACTIVE, num_rows*MATRIX_COLS);
-}
-
-void update_debounce_counters(uint8_t num_rows, uint8_t current_time)
-{
- for (uint8_t row = 0; row < num_rows; row++)
- {
- for (uint8_t col = 0; col < MATRIX_COLS; col++)
- {
- if (debounce_counters[row*MATRIX_COLS + col] != DEBOUNCE_COUNTER_INACTIVE)
- {
- if (TIMER_DIFF(current_time, debounce_counters[row*MATRIX_COLS + col], DEBOUNCE_COUNTER_MODULO) >= DEBOUNCING_DELAY) {
- debounce_counters[row*MATRIX_COLS + col] = DEBOUNCE_COUNTER_INACTIVE;
- }
- }
- }
- }
-}
-
-void transfer_matrix_values(matrix_row_t raw[], matrix_row_t cooked[], uint8_t num_rows, uint8_t current_time)
-{
- for (uint8_t row = 0; row < num_rows; row++)
- {
- matrix_row_t delta = raw[row] ^ cooked[row];
-
- for (uint8_t col = 0; col < MATRIX_COLS; col++)
- {
- if (debounce_counters[row*MATRIX_COLS + col] == DEBOUNCE_COUNTER_INACTIVE && (delta & (1<<col)))
- {
- debounce_counters[row*MATRIX_COLS + col] = current_time;
- cooked[row] ^= (1 << col);
- }
- }
- }
-}
-
-void debounce(matrix_row_t raw[], matrix_row_t cooked[], uint8_t num_rows, bool changed)
-{
- uint8_t current_time = timer_read() % DEBOUNCE_COUNTER_MODULO;
-
- update_debounce_counters(num_rows, current_time);
- transfer_matrix_values(raw, cooked, num_rows, current_time);
-} \ No newline at end of file
diff --git a/keyboards/handwired/xealous/matrix.c b/keyboards/handwired/xealous/matrix.c
index 27fad00083..e2d2199391 100644
--- a/keyboards/handwired/xealous/matrix.c
+++ b/keyboards/handwired/xealous/matrix.c
@@ -34,311 +34,21 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "matrix_scanrate.h"
#endif
-
-
-#ifdef USE_I2C
-# include "i2c.h"
-#else // USE_SERIAL
-# error "only i2c supported"
-#endif
-
-#ifndef DEBOUNCING_DELAY
-# define DEBOUNCING_DELAY 5
-#endif
-
-
-#if (MATRIX_COLS <= 8)
-# define print_matrix_header() print("\nr/c 01234567\n")
-# define print_matrix_row(row) print_bin_reverse8(matrix_get_row(row))
-# define matrix_bitpop(i) bitpop(matrix[i])
-# define ROW_SHIFTER ((uint8_t)1)
-#else
-# error "Currently only supports 8 COLS"
-#endif
-
-#define ERROR_DISCONNECT_COUNT 5
-
-#define ROWS_PER_HAND (MATRIX_ROWS/2)
-
-static uint8_t error_count = 0;
-
-static const uint8_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
-static const uint8_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
-
-/* matrix state(1:on, 0:off) */
-static matrix_row_t matrix[MATRIX_ROWS];
-static matrix_row_t matrix_debouncing[MATRIX_ROWS];
-static matrix_row_t* debouncing_matrix_hand_offsetted; //pointer to matrix_debouncing for our hand
-static matrix_row_t* matrix_hand_offsetted; // pointer to matrix for our hand
-
-//Debouncing counters
-typedef uint8_t debounce_counter_t;
-#define DEBOUNCE_COUNTER_MODULO 250
-#define DEBOUNCE_COUNTER_INACTIVE 251
-static debounce_counter_t debounce_counters[MATRIX_ROWS * MATRIX_COLS];
-static debounce_counter_t *debounce_counters_hand_offsetted;
-
-
-#if (DIODE_DIRECTION == ROW2COL)
- error "Only Col2Row supported";
-#endif
-static void init_cols(void);
-static void unselect_rows(void);
-static void select_row(uint8_t row);
-static void unselect_row(uint8_t row);
-static matrix_row_t optimized_col_reader(void);
-
-__attribute__ ((weak))
-void matrix_init_kb(void) {
- matrix_init_user();
-}
-
-__attribute__ ((weak))
-void matrix_scan_kb(void) {
- matrix_scan_user();
-}
-
-__attribute__ ((weak))
-void matrix_init_user(void) {
-}
-
-__attribute__ ((weak))
-void matrix_scan_user(void) {
-}
-
-__attribute__ ((weak))
-void matrix_slave_scan_user(void) {
-}
-
-inline
-uint8_t matrix_rows(void)
-{
- return MATRIX_ROWS;
-}
-
-inline
-uint8_t matrix_cols(void)
-{
- return MATRIX_COLS;
-}
-
-void matrix_init(void)
-{
-#ifdef DISABLE_JTAG
- // JTAG disable for PORT F. write JTD bit twice within four cycles.
- MCUCR |= (1<<JTD);
- MCUCR |= (1<<JTD);
-#endif
-
- debug_enable = true;
- debug_matrix = false;
- debug_mouse = false;
- // initialize row and col
- unselect_rows();
- init_cols();
-
- TX_RX_LED_INIT;
-
- // initialize matrix state: all keys off
- for (uint8_t i=0; i < MATRIX_ROWS; i++) {
- matrix[i] = 0;
- matrix_debouncing[i] = 0;
- }
- int my_hand_offset = isLeftHand ? 0 : (ROWS_PER_HAND);
- debouncing_matrix_hand_offsetted = matrix_debouncing + my_hand_offset;
- matrix_hand_offsetted = matrix + my_hand_offset;
- debounce_counters_hand_offsetted = debounce_counters + my_hand_offset;
-
- for (uint8_t i = 0; i < MATRIX_ROWS * MATRIX_COLS; i++) {
- debounce_counters[i] = DEBOUNCE_COUNTER_INACTIVE;
- }
-
- matrix_init_quantum();
-
-}
-
-//#define TIMER_DIFF(a, b, max) ((a) >= (b) ? (a) - (b) : (max) - (b) + (a))
-void update_debounce_counters(uint8_t current_time)
-{
- debounce_counter_t *debounce_pointer = debounce_counters_hand_offsetted;
- for (uint8_t row = 0; row < ROWS_PER_HAND; row++)
- {
- for (uint8_t col = 0; col < MATRIX_COLS; col++)
- {
- if (*debounce_pointer != DEBOUNCE_COUNTER_INACTIVE)
- {
- if (TIMER_DIFF(current_time, *debounce_pointer, DEBOUNCE_COUNTER_MODULO) >=
- DEBOUNCING_DELAY) {
- *debounce_pointer = DEBOUNCE_COUNTER_INACTIVE;
- }
- }
- debounce_pointer++;
- }
- }
-}
-
-void transfer_matrix_values(uint8_t current_time)
-{
- //upload from debounce_matrix to final matrix;
- debounce_counter_t *debounce_pointer = debounce_counters_hand_offsetted;
- for (uint8_t row = 0; row < ROWS_PER_HAND; row++)
- {
- matrix_row_t row_value = matrix_hand_offsetted[row];
- matrix_row_t debounce_value = debouncing_matrix_hand_offsetted[row];
-
- for (uint8_t col = 0; col < MATRIX_COLS; col++)
- {
- bool final_value = debounce_value & (1 << col);
- bool current_value = row_value & (1 << col);
- if (*debounce_pointer == DEBOUNCE_COUNTER_INACTIVE
- && (current_value != final_value))
- {
- *debounce_pointer = current_time;
- row_value ^= (1 << col);
- }
- debounce_pointer++;
- }
- matrix_hand_offsetted[row] = row_value;
- }
-}
-
-uint8_t _matrix_scan(void)
-{
- uint8_t current_time = timer_read() % DEBOUNCE_COUNTER_MODULO;
-
- // Set row, read cols
- for (uint8_t current_row = 0; current_row < ROWS_PER_HAND; current_row++) {
- select_row(current_row);
- asm volatile ("nop"); asm volatile("nop");
-
- debouncing_matrix_hand_offsetted[current_row] = optimized_col_reader();
- // Unselect row
- unselect_row(current_row);
- }
-
- update_debounce_counters(current_time);
- transfer_matrix_values(current_time);
-
- return 1;
-}
-
-
-// Get rows from other half over i2c
-int i2c_transaction(void) {
- int slaveOffset = (isLeftHand) ? (ROWS_PER_HAND) : 0;
-
- int err = i2c_master_start(SLAVE_I2C_ADDRESS + I2C_WRITE);
- if (err) goto i2c_error;
-
- // start of matrix stored at 0x00
- err = i2c_master_write(I2C_KEYMAP_START);
- if (err) goto i2c_error;
-
- // Start read
- err = i2c_master_start(SLAVE_I2C_ADDRESS + I2C_READ);
- if (err) goto i2c_error;
-
- if (!err) {
- int i;
- for (i = 0; i < ROWS_PER_HAND-1; ++i) {
- matrix[slaveOffset+i] = i2c_master_read(I2C_ACK);
- }
- matrix[slaveOffset+i] = i2c_master_read(I2C_NACK);
- i2c_master_stop();
- } else {
-i2c_error: // the cable is disconnceted, or something else went wrong
- i2c_reset_state();
- return err;
- }
-
- return 0;
-}
-
-uint8_t matrix_scan(void)
+void matrix_scan_user(void)
{
#ifdef DEBUG_MATRIX_SCAN_RATE
matrix_check_scan_rate();
matrix_time_between_scans();
#endif
- uint8_t ret = _matrix_scan();
-
- if( i2c_transaction() ) {
- // turn on the indicator led when halves are disconnected
- TXLED1;
-
- error_count++;
-
- if (error_count > ERROR_DISCONNECT_COUNT) {
- // reset other half if disconnected
- int slaveOffset = (isLeftHand) ? (ROWS_PER_HAND) : 0;
- for (int i = 0; i < ROWS_PER_HAND; ++i) {
- matrix[slaveOffset+i] = 0;
- }
- }
- } else {
- // turn off the indicator led on no error
- TXLED0;
- error_count = 0;
- }
- matrix_scan_quantum();
- return ret;
-}
-
-void matrix_slave_scan(void) {
- _matrix_scan();
-
- int offset = (isLeftHand) ? 0 : ROWS_PER_HAND;
-
- for (int i = 0; i < ROWS_PER_HAND; ++i) {
- i2c_slave_buffer[I2C_KEYMAP_START+i] = matrix[offset+i];
- }
-
- matrix_slave_scan_user();
-}
-
-inline
-bool matrix_is_on(uint8_t row, uint8_t col)
-{
- return (matrix[row] & ((matrix_row_t)1<<col));
-}
-
-
-inline
-matrix_row_t matrix_get_row(uint8_t row)
-{
- return matrix[row];
-}
-
-void matrix_print(void)
-{
- print("\nr/c 0123456789ABCDEF\n");
- for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
- phex(row); print(": ");
- pbin_reverse16(matrix_get_row(row));
- print("\n");
- }
-}
-
-uint8_t matrix_key_count(void)
-{
- uint8_t count = 0;
- for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
- count += bitpop16(matrix[i]);
- }
- return count;
-}
-
-static void init_cols(void)
-{
- for(uint8_t x = 0; x < MATRIX_COLS; x++) {
- uint8_t pin = col_pins[x];
- _SFR_IO8((pin >> 4) + 1) &= ~_BV(pin & 0xF); // IN
- _SFR_IO8((pin >> 4) + 2) |= _BV(pin & 0xF); // HI
- }
+
}
-inline
-static matrix_row_t optimized_col_reader(void) {
+// Copy this code to split_common/matrix.c,
+// and call it instead of the unoptimized col_reader. Scan-rate jumps from 1200->1920
+// Also remove the sleep_us(30), not necessary for this keyboard.
+// In usb_descriptor.c, set .PollingIntervalMS = 0x01
+#define ROW_SHIFTER ((uint8_t)1)
+inline static matrix_row_t optimized_col_reader(void) {
//MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, F5, F4 }
return (PINB & (1 << 6) ? 0 : (ROW_SHIFTER << 0)) |
(PINB & (1 << 2) ? 0 : (ROW_SHIFTER << 1)) |
@@ -351,26 +61,3 @@ static matrix_row_t optimized_col_reader(void) {
}
-static void select_row(uint8_t row)
-{
- uint8_t pin = row_pins[row];
- _SFR_IO8((pin >> 4) + 1) |= _BV(pin & 0xF); // OUT
- _SFR_IO8((pin >> 4) + 2) &= ~_BV(pin & 0xF); // LOW
-}
-
-static void unselect_row(uint8_t row)
-{
- uint8_t pin = row_pins[row];
- _SFR_IO8((pin >> 4) + 1) &= ~_BV(pin & 0xF); // IN
- _SFR_IO8((pin >> 4) + 2) |= _BV(pin & 0xF); // HI
-}
-
-static void unselect_rows(void)
-{
- for(uint8_t x = 0; x < ROWS_PER_HAND; x++) {
- uint8_t pin = row_pins[x];
- _SFR_IO8((pin >> 4) + 1) &= ~_BV(pin & 0xF); // IN
- _SFR_IO8((pin >> 4) + 2) |= _BV(pin & 0xF); // HI
- }
-}
-
diff --git a/keyboards/handwired/xealous/rules.mk b/keyboards/handwired/xealous/rules.mk
index 7d07c9aa5f..ef3357982e 100644
--- a/keyboards/handwired/xealous/rules.mk
+++ b/keyboards/handwired/xealous/rules.mk
@@ -1,5 +1,4 @@
-#SRC += matrix_scanrate.c matrix.c
-SRC += debounce.c
+SRC += matrix_scanrate.c matrix.c
# MCU name
MCU = atmega32u4
@@ -67,8 +66,7 @@ SUBPROJECT_rev1 = yes
# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
-CUSTOM_MATRIX = no
-DEBOUNCE_TYPE = custom
+DEBOUNCE_TYPE = eager_pk
LAYOUTS = split60