From 6fa1748ea41e3097f84a7461ee981c342cd56802 Mon Sep 17 00:00:00 2001 From: Rotem Yaari Date: Sat, 9 Jan 2021 17:44:41 +0200 Subject: [PATCH] Fix for gg 10 (https://github.com/qmk/qmk_firmware/pull/9485/) --- keyboards/massdrop/carina/keymaps/vmalloc/keymap.c | 2 +- keyboards/massdrop/carina/keymaps/vmalloc/rules.mk | 1 - tmk_core/protocol/arm_atsam/i2c_master.c | 3 +++ tmk_core/protocol/arm_atsam/i2c_master.h | 6 ++++-- tmk_core/protocol/arm_atsam/led_matrix.c | 2 +- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/keyboards/massdrop/carina/keymaps/vmalloc/keymap.c b/keyboards/massdrop/carina/keymaps/vmalloc/keymap.c index 957668830f99..6a01f89fd5df 100644 --- a/keyboards/massdrop/carina/keymaps/vmalloc/keymap.c +++ b/keyboards/massdrop/carina/keymaps/vmalloc/keymap.c @@ -11,7 +11,7 @@ enum ctrl_keycodes { #define TG_NKRO MAGIC_TOGGLE_NKRO // Toggle 6KRO / NKRO mode -keymap_config_t keymap_config; +//keymap_config_t keymap_config; // clang-format off const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { diff --git a/keyboards/massdrop/carina/keymaps/vmalloc/rules.mk b/keyboards/massdrop/carina/keymaps/vmalloc/rules.mk index a1aac16062ab..1162cefc9960 100644 --- a/keyboards/massdrop/carina/keymaps/vmalloc/rules.mk +++ b/keyboards/massdrop/carina/keymaps/vmalloc/rules.mk @@ -1,2 +1 @@ -OPT_DEFS += -DRGB_MATRIX_STARTUP_MODE=RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE OPT_DEFS += -DRGB_MATRIX_FRAMEBUFFER_EFFECTS diff --git a/tmk_core/protocol/arm_atsam/i2c_master.c b/tmk_core/protocol/arm_atsam/i2c_master.c index aa68bbd1f096..3843a267773e 100644 --- a/tmk_core/protocol/arm_atsam/i2c_master.c +++ b/tmk_core/protocol/arm_atsam/i2c_master.c @@ -28,6 +28,9 @@ along with this program. If not, see . #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 diff --git a/tmk_core/protocol/arm_atsam/i2c_master.h b/tmk_core/protocol/arm_atsam/i2c_master.h index 36922922da6d..4979426fd2a4 100644 --- a/tmk_core/protocol/arm_atsam/i2c_master.h +++ b/tmk_core/protocol/arm_atsam/i2c_master.h @@ -24,9 +24,11 @@ along with this program. If not, see . #include "issi3733_driver.h" #include "config.h" -__attribute__((__aligned__(16))) + + +extern __attribute__((__aligned__(16))) DmacDescriptor dmac_desc; -__attribute__((__aligned__(16))) +extern __attribute__((__aligned__(16))) DmacDescriptor dmac_desc_wb; uint8_t I2C3733_Init_Control(void); diff --git a/tmk_core/protocol/arm_atsam/led_matrix.c b/tmk_core/protocol/arm_atsam/led_matrix.c index 368bca3e141f..042554117489 100644 --- a/tmk_core/protocol/arm_atsam/led_matrix.c +++ b/tmk_core/protocol/arm_atsam/led_matrix.c @@ -86,7 +86,7 @@ uint32_t power_sum_last; //Sum of RGB values for previous LED pat int8_t gcr_change_counter; //GCR increase and decrease calls are counted here and acted upon when a count limit is hit uint16_t v_5v_cat_hit; //Flag for when 5v catastrophic level has been reached, and timer for recovery period -uint64_t v_5v_low_timer; //Timer for disabling USB extra device after causing a low voltage situation for an amount of time (-1 indicates timer not active) +extern uint64_t v_5v_low_timer; //Timer for disabling USB extra device after causing a low voltage situation for an amount of time (-1 indicates timer not active) uint8_t led_mfg_test_mode = LED_MFG_TEST_MODE_OFF;