ahoneybun/qmk_firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/master' into develop

Browse source
This commit is contained in:
QMK Bot 2021-07-22 22:01:53 +00:00
commit 490fa5a9e3
11 changed files with 255 additions and 174 deletions
Download patch file Download diff file Expand all files Collapse all files

18
keyboards/massdrop/ctrl/config.h
View file

@ -32,18 +32,20 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MATRIX_ROWS 11
#define MATRIX_COLS 8
#define MATRIX_ROW_PINS { B04, B05, B06, B07, B08, B09, A10, A11, B10, B11, B12 }
#define MATRIX_COL_PINS { A00, A01, A02, A03, A04, A05, A06, A07 }
#define UNUSED_PINS
/* COL2ROW, ROW2COL */
#define DIODE_DIRECTION COL2ROW
/* Temporary solution for matrix delay */
#define IGNORE_ATOMIC_BLOCK
/* MCU Port name definitions */
#define PA 0
#define PB 1
/* Port and Pin definition of key row hardware configuration */
#define MATRIX_ROW_PORTS PB, PB, PB, PB, PB, PB, PA, PA, PB, PB, PB
#define MATRIX_ROW_PINS 4, 5, 6, 7, 8, 9, 10, 11, 10, 11, 12
/* Port and Pin definition of key column hardware configuration */
#define MATRIX_COL_PORTS PA, PA, PA, PA, PA, PA, PA, PA
#define MATRIX_COL_PINS 0, 1, 2, 3, 4, 5, 6, 7
/* This Shift Register expands available hardware output lines to control additional peripherals */
/* It uses four lines from the MCU to provide 16 output lines */
/* Shift Register Clock configuration (MCU to ShiftRegister.RCLK) */

21
keyboards/massdrop/ctrl/ctrl.c Normal file
View file

@ -0,0 +1,21 @@
/*
Copyright 2021 Massdrop Inc.
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 "ctrl.h"
/* Temporary solution for matrix delay */
void matrix_output_select_delay(void) { matrix_io_delay(); }
void matrix_output_unselect_delay(void) { }

76
keyboards/massdrop/ctrl/matrix.c
View file

@ -1,76 +0,0 @@
/*
Copyright 2018 Massdrop Inc.
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 "ctrl.h"
#include "d51_util.h"
const uint8_t row_ports[] = {MATRIX_ROW_PORTS};
const uint8_t row_pins[] = {MATRIX_ROW_PINS};
const uint8_t col_ports[] = {MATRIX_COL_PORTS};
const uint8_t col_pins[] = {MATRIX_COL_PINS};
uint32_t row_masks[2]; // NOTE: If more than PA PB used in the future, adjust code to accommodate
void matrix_init_custom(void) {
row_masks[PA] = 0;
row_masks[PB] = 0;
for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
PORT->Group[row_ports[row]].DIRCLR.reg = 1 << row_pins[row]; // Input
PORT->Group[row_ports[row]].OUTCLR.reg = 1 << row_pins[row]; // Low
PORT->Group[row_ports[row]].PINCFG[row_pins[row]].bit.INEN = 1; // Input Enable,
PORT->Group[row_ports[row]].PINCFG[row_pins[row]].bit.PULLEN = 1; // Pull Enable
row_masks[row_ports[row]] |= 1 << row_pins[row]; // Add pin to proper row mask
}
for (uint8_t col = 0; col < MATRIX_COLS; col++) {
PORT->Group[col_ports[col]].DIRSET.reg = 1 << col_pins[col]; // Output
PORT->Group[col_ports[col]].OUTCLR.reg = 1 << col_pins[col]; // Low
}
}
bool matrix_scan_custom(matrix_row_t current_matrix[]) {
matrix_row_t raw[MATRIX_ROWS] = {0};
uint32_t scans[2]; // PA PB
for (uint8_t col = 0; col < MATRIX_COLS; col++) {
PORT->Group[col_ports[col]].OUTSET.reg = 1 << col_pins[col]; // Set col output
matrix_io_delay(); // Delay for output
scans[PA] = PORT->Group[PA].IN.reg & row_masks[PA]; // Read PA row pins data
scans[PB] = PORT->Group[PB].IN.reg & row_masks[PB]; // Read PB row pins data
PORT->Group[col_ports[col]].OUTCLR.reg = 1 << col_pins[col]; // Clear col output
for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
// Move scan bits from scans array into proper row bit locations
if (scans[row_ports[row]] & (1 << row_pins[row])) {
raw[row] |= 1 << col;
}
}
}
bool changed = false;
for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
if (current_matrix[row] != raw[row]) {
current_matrix[row] = raw[row];
changed = true;
}
}
return changed;
}

3
keyboards/massdrop/ctrl/rules.mk
View file

@ -1,13 +1,10 @@
# project specific files
SRC = matrix.c
SRC += config_led.c
#For platform and packs
ARM_ATSAM = SAMD51J18A
MCU = cortex-m4
CUSTOM_MATRIX = lite
# Build Options
# comment out to disable the options.
#