2 changes: 0 additions & 2 deletions keyboards/massdrop/alt/keymaps/abishalom/keymap.c
View file
Expand Up @@ -12,8 +12,6 @@ enum alt_keycodes {

#define TG_NKRO MAGIC_TOGGLE_NKRO //Toggle 6KRO / NKRO mode

keymap_config_t keymap_config;

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT(
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, \
Expand Down
2 changes: 0 additions & 2 deletions keyboards/massdrop/alt/keymaps/bonta/keymap.c
View file
Expand Up @@ -14,8 +14,6 @@ enum alt_keycodes {
#define RGB_BRU RGB_VAI
#define RGB_BRD RGB_VAD

keymap_config_t keymap_config;

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT(
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, \
Expand Down
2 changes: 0 additions & 2 deletions keyboards/massdrop/alt/keymaps/favorable-mutation/keymap.c
View file
Expand Up @@ -28,8 +28,6 @@ enum alt_keycodes {
//
//TODO tap/toggle for layers

keymap_config_t keymap_config;

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT(
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_SPOT,
Expand Down
2 changes: 0 additions & 2 deletions keyboards/massdrop/alt/keymaps/reywood/keymap.c
View file
Expand Up @@ -26,8 +26,6 @@ enum alt_keycodes {
#define TG_NKRO MAGIC_TOGGLE_NKRO //Toggle 6KRO / NKRO mode
#define ______ KC_TRNS

keymap_config_t keymap_config;

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT(
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, \
Expand Down
2 changes: 0 additions & 2 deletions keyboards/massdrop/ctrl/keymaps/default/keymap.c
View file
Expand Up @@ -10,8 +10,6 @@ enum ctrl_keycodes {
MD_BOOT, //Restart into bootloader after hold timeout
};

keymap_config_t keymap_config;

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT(
KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, \
Expand Down
2 changes: 0 additions & 2 deletions keyboards/massdrop/ctrl/keymaps/responsive_pattern/keymap.c
View file
Expand Up @@ -44,8 +44,6 @@ enum ctrl_keycodes {
S_RESET // reset all parameters
};

keymap_config_t keymap_config;

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT(
KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, \
Expand Down
25 changes: 14 additions & 11 deletions keyboards/massdrop/ctrl/matrix.c
View file
Expand Up @@ -21,6 +21,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "debug.h"
#include "clks.h"
#include <string.h>
#include "debounce.h"

matrix_row_t mlatest[MATRIX_ROWS];
matrix_row_t mlast[MATRIX_ROWS];
Expand Down Expand Up @@ -119,17 +120,19 @@ uint8_t matrix_scan(void)
mlast[row] = mlatest[row];
}

if (!mchanged)
{
for (row = 0; row < MATRIX_ROWS; row++)
mdebounced[row] = mlatest[row];
mdebouncing = 0;
}
else
{
//Begin or extend debounce on change
mdebouncing = timer_read64() + DEBOUNCE;
}
debounce(mlatest, mdebounced, MATRIX_ROWS, mchanged);

// if (!mchanged)
// {
// for (row = 0; row < MATRIX_ROWS; row++)
// mdebounced[row] = mlatest[row];
// mdebouncing = 0;
// }
// else
// {
// //Begin or extend debounce on change
// mdebouncing = timer_read64() + DEBOUNCE;
// }

matrix_scan_quantum();

Expand Down
2 changes: 1 addition & 1 deletion lib/chibios
Submodule chibios updated 4671 files
2 changes: 1 addition & 1 deletion lib/chibios-contrib
Submodule chibios-contrib updated 758 files
2 changes: 1 addition & 1 deletion lib/ugfx
Submodule ugfx updated 986 files
3 changes: 3 additions & 0 deletions tmk_core/protocol/arm_atsam/i2c_master.c
View file
Expand Up @@ -28,6 +28,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.

# define I2C_LED_USE_DMA 1 // Set 1 to use background DMA transfers for leds, Set 0 to use inline software transfers

DmacDescriptor dmac_desc;
DmacDescriptor dmac_desc_wb;

static uint8_t i2c_led_q[I2C_Q_SIZE]; // I2C queue circular buffer
static uint8_t i2c_led_q_s; // Start of circular buffer
static uint8_t i2c_led_q_e; // End of circular buffer
Expand Down
4 changes: 2 additions & 2 deletions tmk_core/protocol/arm_atsam/i2c_master.h
View file
Expand Up @@ -24,8 +24,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
# include "issi3733_driver.h"
# include "config.h"

__attribute__((__aligned__(16))) DmacDescriptor dmac_desc;
__attribute__((__aligned__(16))) DmacDescriptor dmac_desc_wb;
extern __attribute__((__aligned__(16))) DmacDescriptor dmac_desc;
extern __attribute__((__aligned__(16))) DmacDescriptor dmac_desc_wb;

uint8_t I2C3733_Init_Control(void);
uint8_t I2C3733_Init_Drivers(void);
Expand Down