gitbot/qmk_firmware
0
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2025-07-16 12:51:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

ducky: clang-format matrix and one2mini.c

Browse Source
This commit is contained in:
Reza Jelveh 2020-12-03 17:35:34 +08:00
parent a6d25a2bbe
commit fa02980874
2 changed files with 78 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

113
keyboards/ducky/one2mini/matrix.c
View File

@ -43,7 +43,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#endif #endif
#ifdef MATRIX_MASKED #ifdef MATRIX_MASKED
extern const matrix_row_t matrix_mask[]; extern const matrix_row_t matrix_mask[];
#endif #endif
#if (DIODE_DIRECTION == ROW2COL) || (DIODE_DIRECTION == COL2ROW) #if (DIODE_DIRECTION == ROW2COL) || (DIODE_DIRECTION == COL2ROW)
@ -52,68 +52,45 @@ static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
#endif #endif
/* matrix state(1:on, 0:off) */ /* matrix state(1:on, 0:off) */
static matrix_row_t raw_matrix[MATRIX_ROWS]; //raw values static matrix_row_t raw_matrix[MATRIX_ROWS]; // raw values
static matrix_row_t matrix[MATRIX_ROWS]; //debounced values static matrix_row_t matrix[MATRIX_ROWS]; // debounced values
#if (DIODE_DIRECTION == COL2ROW) #if (DIODE_DIRECTION == COL2ROW)
static void init_cols(void); static void init_cols(void);
static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row); static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row);
static void unselect_rows(void); static void unselect_rows(void);
static void select_row(uint8_t row); static void select_row(uint8_t row);
static void unselect_row(uint8_t row); static void unselect_row(uint8_t row);
#elif (DIODE_DIRECTION == ROW2COL) #elif (DIODE_DIRECTION == ROW2COL)
static void init_rows(void); static void init_rows(void);
static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col); static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col);
static void unselect_cols(void); static void unselect_cols(void);
static void unselect_col(uint8_t col); static void unselect_col(uint8_t col);
static void select_col(uint8_t col); static void select_col(uint8_t col);
#endif #endif
__attribute__ ((weak)) __attribute__((weak)) void matrix_init_quantum(void) { matrix_init_kb(); }
void matrix_init_quantum(void) {
matrix_init_kb();
}
__attribute__ ((weak)) __attribute__((weak)) void matrix_scan_quantum(void) { matrix_scan_kb(); }
void matrix_scan_quantum(void) {
matrix_scan_kb();
}
__attribute__ ((weak)) __attribute__((weak)) void matrix_init_kb(void) { matrix_init_user(); }
void matrix_init_kb(void) {
matrix_init_user();
}
__attribute__ ((weak)) __attribute__((weak)) void matrix_scan_kb(void) { matrix_scan_user(); }
void matrix_scan_kb(void) {
matrix_scan_user();
}
__attribute__ ((weak)) __attribute__((weak)) void matrix_init_user(void) {}
void matrix_init_user(void) {
}
__attribute__ ((weak)) __attribute__((weak)) void matrix_scan_user(void) {}
void matrix_scan_user(void) {
}
inline inline uint8_t matrix_rows(void) { return MATRIX_ROWS; }
uint8_t matrix_rows(void) {
return MATRIX_ROWS;
}
inline inline uint8_t matrix_cols(void) { return MATRIX_COLS; }
uint8_t matrix_cols(void) {
return MATRIX_COLS;
}
void matrix_init(void) { void matrix_init(void) {
unselect_rows(); unselect_rows();
init_cols(); init_cols();
// initialize matrix state: all keys off // initialize matrix state: all keys off
for (uint8_t i=0; i < MATRIX_ROWS; i++) { for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
raw_matrix[i] = 0; raw_matrix[i] = 0;
matrix[i] = 0; matrix[i] = 0;
} }
@ -122,8 +99,7 @@ void matrix_init(void) {
matrix_init_quantum(); matrix_init_quantum();
} }
uint8_t matrix_scan(void) uint8_t matrix_scan(void) {
{
bool changed = false; bool changed = false;
// Set row, read cols // Set row, read cols
@ -137,15 +113,9 @@ uint8_t matrix_scan(void)
return (uint8_t)changed; return (uint8_t)changed;
} }
inline inline bool matrix_is_on(uint8_t row, uint8_t col) { return (matrix[row] & ((matrix_row_t)1 << col)); }
bool matrix_is_on(uint8_t row, uint8_t col)
{
return (matrix[row] & ((matrix_row_t)1<<col));
}
inline inline matrix_row_t matrix_get_row(uint8_t row) {
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 // 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. // switch blocker installed and the switch is always pressed.
#ifdef MATRIX_MASKED #ifdef MATRIX_MASKED
@ -155,19 +125,18 @@ matrix_row_t matrix_get_row(uint8_t row)
#endif #endif
} }
void matrix_print(void) void matrix_print(void) {
{
print_matrix_header(); print_matrix_header();
for (uint8_t row = 0; row < MATRIX_ROWS; row++) { for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
phex(row); print(": "); phex(row);
print(": ");
print_matrix_row(row); print_matrix_row(row);
print("\n"); print("\n");
} }
} }
uint8_t matrix_key_count(void) uint8_t matrix_key_count(void) {
{
uint8_t count = 0; uint8_t count = 0;
for (uint8_t i = 0; i < MATRIX_ROWS; i++) { for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
count += matrix_bitpop(i); count += matrix_bitpop(i);
@ -175,15 +144,13 @@ uint8_t matrix_key_count(void)
return count; return count;
} }
static void init_cols(void) static void init_cols(void) {
{ for (uint8_t x = 0; x < MATRIX_COLS; x++) {
for(uint8_t x = 0; x < MATRIX_COLS; x++) {
setPinInputHigh(col_pins[x]); setPinInputHigh(col_pins[x]);
} }
} }
static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) {
{
// Store last value of row prior to reading // Store last value of row prior to reading
matrix_row_t last_row_value = current_matrix[current_row]; matrix_row_t last_row_value = current_matrix[current_row];
@ -195,8 +162,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row)
wait_us(30); wait_us(30);
// For each col... // For each col...
for(uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) { for (uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) {
// Select the col pin to read (active low) // Select the col pin to read (active low)
uint8_t pin_state = readPin(col_pins[col_index]); uint8_t pin_state = readPin(col_pins[col_index]);
@ -210,20 +176,15 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row)
return (last_row_value != current_matrix[current_row]); return (last_row_value != current_matrix[current_row]);
} }
static void select_row(uint8_t row) static void select_row(uint8_t row) {
{
setPinOutput(row_pins[row]); setPinOutput(row_pins[row]);
writePinLow(row_pins[row]); writePinLow(row_pins[row]);
} }
static void unselect_row(uint8_t row) static void unselect_row(uint8_t row) { writePinHigh(row_pins[row]); }
{
writePinHigh(row_pins[row]);
}
static void unselect_rows(void) static void unselect_rows(void) {
{ for (uint8_t x = 0; x < MATRIX_ROWS; x++) {
for(uint8_t x = 0; x < MATRIX_ROWS; x++) {
writePinHigh(row_pins[x]); writePinHigh(row_pins[x]);
} }
} }

11
keyboards/ducky/one2mini/one2mini.c
View File

@ -1,4 +1,5 @@
/* Copyright 2019 /u/KeepItUnder /* Copyright 2019 /u/KeepItUnder
* Copyright 2020 Reza Jelveh
* *
* This program is free software: you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -24,23 +25,21 @@
*/ */
void bootmagic_lite(void) { void bootmagic_lite(void) {
matrix_scan(); matrix_scan();
wait_ms(DEBOUNCE*2); wait_ms(DEBOUNCE * 2);
matrix_scan(); matrix_scan();
uint8_t valMatrixRow = 0U; uint8_t valMatrixRow = 0U;
valMatrixRow = matrix_get_row(2); valMatrixRow = matrix_get_row(2);
if ( ( valMatrixRow & (1<<3) ) && if ((valMatrixRow & (1 << 3)) && (valMatrixRow & (1 << 9))) {
( valMatrixRow & (1<<9) ) ) {
// Jump to bootloader. // Jump to bootloader.
bootloader_jump(); bootloader_jump();
} }
valMatrixRow = matrix_get_row(3); valMatrixRow = matrix_get_row(3);
if ( ( valMatrixRow & (1<<2) ) && if ((valMatrixRow & (1 << 2)) && (valMatrixRow & (1 << 3))) {
( valMatrixRow & (1<<3) ) ) {
// Jump to bootloader. // Jump to bootloader.
bootloader_jump(); bootloader_jump();
} }
@ -55,7 +54,7 @@ void bootmagic_lite(void) {
void matrix_init_kb(void) { void matrix_init_kb(void) {
// put your keyboard start-up code here // put your keyboard start-up code here
// runs once when the firmware starts up // runs once when the firmware starts up
//bootmagic_lite(); // bootmagic_lite();
matrix_init_user(); matrix_init_user();
} }