Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename ledmatrix.h to match .c file #7949

Merged
merged 3 commits into from
Nov 28, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion keyboards/massdrop/alt/alt.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include "matrix.h"

#include "i2c_master.h"
#include "led_matrix.h" //For led keycodes
#include "md_rgb_matrix.h" //For led keycodes
#include "usb/udi_cdc.h"
#include "usb/usb2422.h"

Expand Down
4 changes: 2 additions & 2 deletions keyboards/massdrop/alt/config_led.c
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#ifdef RGB_MATRIX_ENABLE
#include "alt.h"

#include "led_matrix.h"
#include "md_rgb_matrix.h"
#include "rgb_matrix.h"
#include "config_led.h"

Expand Down Expand Up @@ -52,7 +52,7 @@ led_config_t g_led_config = { {
#ifdef USB_LED_INDICATOR_ENABLE
void rgb_matrix_indicators_kb(void)
{
led_matrix_indicators();
md_rgb_matrix_indicators();
}
#endif // USB_LED_INDICATOR_ENABLE

Expand Down
2 changes: 1 addition & 1 deletion keyboards/massdrop/alt/keymaps/default_md/keymap.c
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
led_instruction_t led_instructions[] = {
//LEDs are normally inactive, no processing is performed on them
//Flags are used in matching criteria for an LED to be active and indicate how to color it
//Flags can be found in tmk_core/protocol/arm_atsam/led_matrix.h (prefixed with LED_FLAG_)
//Flags can be found in tmk_core/protocol/arm_atsam/md_rgb_matrix.h (prefixed with LED_FLAG_)
//LED IDs can be found in config_led.h in the keyboard's directory
//Examples are below

Expand Down
4 changes: 2 additions & 2 deletions keyboards/massdrop/alt/keymaps/reywood/rgb_matrix_user.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "quantum.h"
#include "led_matrix.h"
#include "md_rgb_matrix.h"

extern issi3733_led_t *led_cur;
extern uint8_t led_per_run;
Expand Down Expand Up @@ -76,7 +76,7 @@ void rgb_matrix_init_user(void) {
led_cur_index = 0;
}

void led_matrix_run(void) {
void md_rgb_matrix_run(void) {
uint8_t led_this_run = 0;

if (led_cur == 0) { //Denotes start of new processing cycle in the case of chunked processing
Expand Down
4 changes: 2 additions & 2 deletions keyboards/massdrop/ctrl/config_led.c
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#ifdef RGB_MATRIX_ENABLE
#include "ctrl.h"

#include "led_matrix.h"
#include "md_rgb_matrix.h"
#include "rgb_matrix.h"
#include "config_led.h"

Expand Down Expand Up @@ -75,7 +75,7 @@ led_config_t g_led_config = { {
#ifdef USB_LED_INDICATOR_ENABLE
void rgb_matrix_indicators_kb(void)
{
led_matrix_indicators();
md_rgb_matrix_indicators();
}
#endif // USB_LED_INDICATOR_ENABLE

Expand Down
2 changes: 1 addition & 1 deletion keyboards/massdrop/ctrl/ctrl.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include "matrix.h"

#include "i2c_master.h"
#include "led_matrix.h" //For led keycodes
#include "md_rgb_matrix.h" //For led keycodes
#include "usb/udi_cdc.h"
#include "usb/usb2422.h"

Expand Down
2 changes: 1 addition & 1 deletion keyboards/massdrop/ctrl/keymaps/default_md/keymap.c
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
led_instruction_t led_instructions[] = {
//LEDs are normally inactive, no processing is performed on them
//Flags are used in matching criteria for an LED to be active and indicate how to color it
//Flags can be found in tmk_core/protocol/arm_atsam/led_matrix.h (prefixed with LED_FLAG_)
//Flags can be found in tmk_core/protocol/arm_atsam/md_rgb_matrix.h (prefixed with LED_FLAG_)
//LED IDs can be found in config_led.h in the keyboard's directory
//Examples are below

Expand Down
4 changes: 2 additions & 2 deletions keyboards/massdrop/ctrl/keymaps/endgame/config_led.c
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#ifdef RGB_MATRIX_ENABLE
#include "ctrl.h"

#include "led_matrix.h"
#include "md_rgb_matrix.h"
#include "rgb_matrix.h"
#include "config_led.h"

Expand Down Expand Up @@ -75,7 +75,7 @@ led_config_t g_led_config = { {
#ifdef USB_LED_INDICATOR_ENABLE
void rgb_matrix_indicators_kb(void)
{
led_matrix_indicators();
md_rgb_matrix_indicators();
}
#endif // USB_LED_INDICATOR_ENABLE

Expand Down
6 changes: 3 additions & 3 deletions keyboards/massdrop/ctrl/keymaps/matthewrobo/config_led.c
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifdef RGB_MATRIX_ENABLE
# include "ctrl.h"

# include "led_matrix.h"
# include "md_rgb_matrix.h"
# include "rgb_matrix.h"
# include "config_led.h"
// clang-format off
Expand Down Expand Up @@ -91,7 +91,7 @@ led_config_t g_led_config = { {
// clang-format on

# ifdef USB_LED_INDICATOR_ENABLE
void rgb_matrix_indicators_kb(void) { led_matrix_indicators(); }
void rgb_matrix_indicators_kb(void) { md_rgb_matrix_indicators(); }
# endif // USB_LED_INDICATOR_ENABLE

#endif
#endif
Original file line number Diff line number Diff line change
Expand Up @@ -659,7 +659,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
led_instruction_t led_instructions[] = {
//LEDs are normally inactive, no processing is performed on them
//Flags are used in matching criteria for an LED to be active and indicate how to color it
//Flags can be found in tmk_core/protocol/arm_atsam/led_matrix.h (prefixed with LED_FLAG_)
//Flags can be found in tmk_core/protocol/arm_atsam/md_rgb_matrix.h (prefixed with LED_FLAG_)
//LED IDs can be found in config_led.h in the keyboard's directory
//Examples are below

Expand Down
2 changes: 1 addition & 1 deletion quantum/led_matrix.c
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#include <stdint.h>
#include <stdbool.h>
#include "quantum.h"
#include "ledmatrix.h"
#include "led_matrix.h"
#include "progmem.h"
#include "config.h"
#include "eeprom.h"
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion quantum/led_matrix_drivers.c
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#include <stdint.h>
#include <stdbool.h>
#include "quantum.h"
#include "ledmatrix.h"
#include "led_matrix.h"

/* Each driver needs to define a struct:
*
Expand Down
2 changes: 1 addition & 1 deletion quantum/quantum.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

#ifdef BACKLIGHT_ENABLE
# ifdef LED_MATRIX_ENABLE
# include "ledmatrix.h"
# include "led_matrix.h"
# else
# include "backlight.h"
# endif
Expand Down
2 changes: 1 addition & 1 deletion tmk_core/common/arm_atsam/suspend.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "matrix.h"
#include "i2c_master.h"
#include "led_matrix.h"
#include "md_rgb_matrix.h"
#include "suspend.h"

/** \brief Suspend idle
Expand Down
4 changes: 2 additions & 2 deletions tmk_core/protocol/arm_atsam.mk
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ SRC += $(ARM_ATSAM_DIR)/clks.c
SRC += $(ARM_ATSAM_DIR)/d51_util.c
SRC += $(ARM_ATSAM_DIR)/i2c_master.c
ifeq ($(RGB_MATRIX_ENABLE),custom)
SRC += $(ARM_ATSAM_DIR)/led_matrix_programs.c
SRC += $(ARM_ATSAM_DIR)/led_matrix.c
SRC += $(ARM_ATSAM_DIR)/md_rgb_matrix_programs.c
SRC += $(ARM_ATSAM_DIR)/md_rgb_matrix.c
endif
SRC += $(ARM_ATSAM_DIR)/main_arm_atsam.c
SRC += $(ARM_ATSAM_DIR)/spi.c
Expand Down
2 changes: 1 addition & 1 deletion tmk_core/protocol/arm_atsam/arm_atsam_protocol.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.

# include "main_arm_atsam.h"
# ifdef RGB_MATRIX_ENABLE
# include "led_matrix.h"
# include "md_rgb_matrix.h"
# include "rgb_matrix.h"
# endif
# include "issi3733_driver.h"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.

#ifdef USE_MASSDROP_CONFIGURATOR
__attribute__((weak)) led_instruction_t led_instructions[] = {{.end = 1}};
static void led_matrix_massdrop_config_override(int i);
static void md_rgb_matrix_config_override(int i);
#endif // USE_MASSDROP_CONFIGURATOR

void SERCOM1_0_Handler(void) {
Expand Down Expand Up @@ -188,7 +188,7 @@ void issi3733_prepare_arrays(void) {
}
}

void led_matrix_prepare(void) {
void md_rgb_matrix_prepare(void) {
for (uint8_t i = 0; i < ISSI3733_LED_COUNT; i++) {
*led_map[i].rgb.r = 0;
*led_map[i].rgb.g = 0;
Expand All @@ -199,7 +199,7 @@ void led_matrix_prepare(void) {
void led_set_one(int i, uint8_t r, uint8_t g, uint8_t b) {
if (i < ISSI3733_LED_COUNT) {
#ifdef USE_MASSDROP_CONFIGURATOR
led_matrix_massdrop_config_override(i);
md_rgb_matrix_config_override(i);
#else
led_buffer[i].r = r;
led_buffer[i].g = g;
Expand All @@ -219,7 +219,7 @@ void init(void) {

issi3733_prepare_arrays();

led_matrix_prepare();
md_rgb_matrix_prepare();

gcr_min_counter = 0;
v_5v_cat_hit = 0;
Expand Down Expand Up @@ -290,7 +290,7 @@ void flush(void) {
i2c_led_q_run();
}

void led_matrix_indicators(void) {
void md_rgb_matrix_indicators(void) {
uint8_t kbled = keyboard_leds();
if (kbled && rgb_matrix_config.enable) {
for (uint8_t i = 0; i < ISSI3733_LED_COUNT; i++) {
Expand Down Expand Up @@ -397,7 +397,7 @@ static void led_run_pattern(led_setup_t* f, float* ro, float* go, float* bo, flo
}
}

static void led_matrix_massdrop_config_override(int i) {
static void md_rgb_matrix_config_override(int i) {
float ro = 0;
float go = 0;
float bo = 0;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ extern uint8_t gcr_actual_last;

void gcr_compute(void);

void led_matrix_indicators(void);
void md_rgb_matrix_indicators(void);

/*------------------------- Legacy Lighting Support ------------------------*/

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.

#ifdef USE_MASSDROP_CONFIGURATOR

# include "led_matrix.h"
# include "md_rgb_matrix.h"

// Teal <-> Salmon
led_setup_t leds_teal_salmon[] = {
Expand Down