|
|
@@ -19,7 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
#include "wait.h"
|
|
|
#include "util.h"
|
|
|
#include "matrix.h"
|
|
|
-#include "debounce.h"
|
|
|
#include "quantum.h"
|
|
|
|
|
|
// Encoder things
|
|
|
@@ -27,65 +26,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
#define SWITCH_2 D7
|
|
|
static bool read_encoder_switches(matrix_row_t current_matrix[], uint8_t current_row);
|
|
|
|
|
|
-#ifdef MATRIX_MASKED
|
|
|
-extern const matrix_row_t matrix_mask[];
|
|
|
-#endif
|
|
|
-
|
|
|
-#ifdef DIRECT_PINS
|
|
|
-static pin_t direct_pins[MATRIX_ROWS][MATRIX_COLS] = DIRECT_PINS;
|
|
|
-#elif (DIODE_DIRECTION == ROW2COL) || (DIODE_DIRECTION == COL2ROW)
|
|
|
static const pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
|
|
|
static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
|
|
|
-#endif
|
|
|
|
|
|
/* matrix state(1:on, 0:off) */
|
|
|
-static matrix_row_t raw_matrix[MATRIX_ROWS]; // raw values
|
|
|
-static matrix_row_t matrix[MATRIX_ROWS]; // debounced values
|
|
|
-
|
|
|
-// helper functions
|
|
|
-
|
|
|
-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) {
|
|
|
- // Matrix mask lets you disable switches in the returned matrix data. For example, if you have a
|
|
|
- // switch blocker installed and the switch is always pressed.
|
|
|
-#ifdef MATRIX_MASKED
|
|
|
- return matrix[row] & matrix_mask[row];
|
|
|
-#else
|
|
|
- return matrix[row];
|
|
|
-#endif
|
|
|
-}
|
|
|
-
|
|
|
-// matrix code
|
|
|
-
|
|
|
-#ifdef DIRECT_PINS
|
|
|
-
|
|
|
-static void init_pins(void) {
|
|
|
- for (int row = 0; row < MATRIX_ROWS; row++) {
|
|
|
- for (int col = 0; col < MATRIX_COLS; col++) {
|
|
|
- pin_t pin = direct_pins[row][col];
|
|
|
- if (pin != NO_PIN) {
|
|
|
- setPinInputHigh(pin);
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
-}
|
|
|
-
|
|
|
-static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) {
|
|
|
- matrix_row_t last_row_value = current_matrix[current_row];
|
|
|
- current_matrix[current_row] = 0;
|
|
|
-
|
|
|
- for (uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) {
|
|
|
- pin_t pin = direct_pins[current_row][col_index];
|
|
|
- if (pin != NO_PIN) {
|
|
|
- current_matrix[current_row] |= readPin(pin) ? 0 : (MATRIX_ROW_SHIFTER << col_index);
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- return (last_row_value != current_matrix[current_row]);
|
|
|
-}
|
|
|
-
|
|
|
-#elif (DIODE_DIRECTION == COL2ROW)
|
|
|
+extern matrix_row_t raw_matrix[MATRIX_ROWS]; // raw values
|
|
|
+extern matrix_row_t matrix[MATRIX_ROWS]; // debounced values
|
|
|
|
|
|
static void select_row(uint8_t row) {
|
|
|
setPinOutput(row_pins[row]);
|
|
|
@@ -133,112 +79,28 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row)
|
|
|
return (last_row_value != current_matrix[current_row]);
|
|
|
}
|
|
|
|
|
|
-#elif (DIODE_DIRECTION == ROW2COL)
|
|
|
-
|
|
|
-static void select_col(uint8_t col) {
|
|
|
- setPinOutput(col_pins[col]);
|
|
|
- writePinLow(col_pins[col]);
|
|
|
-}
|
|
|
-
|
|
|
-static void unselect_col(uint8_t col) { setPinInputHigh(col_pins[col]); }
|
|
|
-
|
|
|
-static void unselect_cols(void) {
|
|
|
- for (uint8_t x = 0; x < MATRIX_COLS; x++) {
|
|
|
- setPinInputHigh(col_pins[x]);
|
|
|
- }
|
|
|
-}
|
|
|
-
|
|
|
-static void init_pins(void) {
|
|
|
- unselect_cols();
|
|
|
- for (uint8_t x = 0; x < MATRIX_ROWS; x++) {
|
|
|
- setPinInputHigh(row_pins[x]);
|
|
|
- }
|
|
|
-}
|
|
|
-
|
|
|
-static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) {
|
|
|
- bool matrix_changed = false;
|
|
|
-
|
|
|
- // Select col and wait for col selecton to stabilize
|
|
|
- select_col(current_col);
|
|
|
- wait_us(30);
|
|
|
-
|
|
|
- // For each row...
|
|
|
- for (uint8_t row_index = 0; row_index < MATRIX_ROWS; row_index++) {
|
|
|
- // Store last value of row prior to reading
|
|
|
- matrix_row_t last_row_value = current_matrix[row_index];
|
|
|
-
|
|
|
- // Check row pin state
|
|
|
- if (readPin(row_pins[row_index]) == 0) {
|
|
|
- // Pin LO, set col bit
|
|
|
- current_matrix[row_index] |= (MATRIX_ROW_SHIFTER << current_col);
|
|
|
- } else {
|
|
|
- // Pin HI, clear col bit
|
|
|
- current_matrix[row_index] &= ~(MATRIX_ROW_SHIFTER << current_col);
|
|
|
- }
|
|
|
-
|
|
|
- // Determine if the matrix changed state
|
|
|
- if ((last_row_value != current_matrix[row_index]) && !(matrix_changed)) {
|
|
|
- matrix_changed = true;
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- // Unselect col
|
|
|
- unselect_col(current_col);
|
|
|
-
|
|
|
- return matrix_changed;
|
|
|
-}
|
|
|
-
|
|
|
-#endif
|
|
|
|
|
|
-void matrix_init(void) {
|
|
|
+void matrix_init_custom(void) {
|
|
|
// initialize key pins
|
|
|
+ setPinInput(SWITCH_1);
|
|
|
+ setPinInput(SWITCH_2);
|
|
|
init_pins();
|
|
|
-
|
|
|
- // initialize matrix state: all keys off
|
|
|
- for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
|
|
|
- raw_matrix[i] = 0;
|
|
|
- matrix[i] = 0;
|
|
|
- }
|
|
|
-
|
|
|
- debounce_init(MATRIX_ROWS);
|
|
|
-
|
|
|
- matrix_init_quantum();
|
|
|
}
|
|
|
|
|
|
-uint8_t matrix_scan(void) {
|
|
|
+bool matrix_scan_custom(void) {
|
|
|
bool changed = false;
|
|
|
|
|
|
-#if defined(DIRECT_PINS) || (DIODE_DIRECTION == COL2ROW)
|
|
|
// Set row, read cols
|
|
|
for (uint8_t current_row = 0; current_row < MATRIX_ROWS; current_row++) {
|
|
|
changed |= read_cols_on_row(raw_matrix, current_row);
|
|
|
}
|
|
|
-#elif (DIODE_DIRECTION == ROW2COL)
|
|
|
- // Set col, read rows
|
|
|
- for (uint8_t current_col = 0; current_col < MATRIX_COLS; current_col++) {
|
|
|
- changed |= read_rows_on_col(raw_matrix, current_col);
|
|
|
- }
|
|
|
-#endif
|
|
|
-
|
|
|
- debounce(raw_matrix, matrix, MATRIX_ROWS, changed);
|
|
|
|
|
|
// Read encoder switches, already debounced
|
|
|
changed |= read_encoder_switches(matrix, 4);
|
|
|
|
|
|
- matrix_scan_quantum();
|
|
|
- return (uint8_t)changed;
|
|
|
+ return changed;
|
|
|
}
|
|
|
|
|
|
-// Customisations for the encoders
|
|
|
-void matrix_init_kb(void) {
|
|
|
- setPinInput(SWITCH_1);
|
|
|
- setPinInput(SWITCH_2);
|
|
|
-}
|
|
|
-
|
|
|
-void matrix_scan_kb(void) {}
|
|
|
-
|
|
|
-void matrix_print(void) {}
|
|
|
-
|
|
|
static bool read_encoder_switches(matrix_row_t current_matrix[], uint8_t current_row) {
|
|
|
// Store last value of row prior to reading
|
|
|
matrix_row_t last_row_value = current_matrix[current_row];
|
|
|
@@ -249,18 +111,18 @@ static bool read_encoder_switches(matrix_row_t current_matrix[], uint8_t current
|
|
|
// Debounce the encoder buttons using a shift register
|
|
|
static uint8_t btn_1_array;
|
|
|
static uint8_t btn_2_array;
|
|
|
- bool btn_1_pressed = 0;
|
|
|
- bool btn_2_pressed = 0;
|
|
|
+ bool btn_1_rise = 0;
|
|
|
+ bool btn_2_rise = 0;
|
|
|
btn_1_array <<= 1;
|
|
|
btn_2_array <<= 1;
|
|
|
btn_1_array |= readPin(SWITCH_1);
|
|
|
btn_2_array |= readPin(SWITCH_2);
|
|
|
- (btn_1_array == 0b11111111) ? (btn_1_pressed = 1) : (btn_1_pressed = 0);
|
|
|
- (btn_2_array == 0b11111111) ? (btn_2_pressed = 1) : (btn_2_pressed = 0);
|
|
|
+ (btn_1_array == 0b01111111) ? (btn_1_rise = 1) : (btn_1_rise = 0);
|
|
|
+ (btn_2_array == 0b01111111) ? (btn_2_rise = 1) : (btn_2_rise = 0);
|
|
|
|
|
|
// Populate the matrix row with the state of the encoder
|
|
|
- current_matrix[current_row] |= btn_1_pressed ? (1 << 0) : 0;
|
|
|
- current_matrix[current_row] |= btn_2_pressed ? (1 << 1) : 0;
|
|
|
+ current_matrix[current_row] |= btn_1_rise ? (1 << 0) : 0;
|
|
|
+ current_matrix[current_row] |= btn_2_rise ? (1 << 1) : 0;
|
|
|
|
|
|
return (last_row_value != current_matrix[current_row]);
|
|
|
-}
|
|
|
+}
|
Josh Johnson