diff options
| author | Dimitris Mantzouranis <d3xter93@gmail.com> | 2022-01-04 21:49:29 +0200 |
|---|---|---|
| committer | Dimitris Mantzouranis <d3xter93@gmail.com> | 2022-01-04 21:49:29 +0200 |
| commit | 60e32e45d536081481b6cb8c3f0651907d0804e7 (patch) | |
| tree | cde0a2167676a8202dfd9d668600499cc898294a | |
| parent | 7be782f9478e136b186b4ce39c867acb876cb2df (diff) | |
fix merge issues
| -rw-r--r-- | drivers/led/sn32/rgb_matrix_sn32f24xb.c | 2 | ||||
| -rw-r--r-- | platforms/chibios/eeprom_sn32_defs.h | 1 | ||||
| -rw-r--r-- | quantum/rgb_matrix/rgb_matrix_drivers.c | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/drivers/led/sn32/rgb_matrix_sn32f24xb.c b/drivers/led/sn32/rgb_matrix_sn32f24xb.c index c3f951e2f..800e4fb90 100644 --- a/drivers/led/sn32/rgb_matrix_sn32f24xb.c +++ b/drivers/led/sn32/rgb_matrix_sn32f24xb.c @@ -1,5 +1,5 @@ #include "rgb_matrix.h" -#include "rgb_matrix_sn32f24xx.h" +#include "sn32f24xb.h" #if !defined(RGB_MATRIX_HUE_STEP) # define RGB_MATRIX_HUE_STEP 8 diff --git a/platforms/chibios/eeprom_sn32_defs.h b/platforms/chibios/eeprom_sn32_defs.h index e8b7f2e53..080ded435 100644 --- a/platforms/chibios/eeprom_sn32_defs.h +++ b/platforms/chibios/eeprom_sn32_defs.h @@ -55,4 +55,5 @@ # ifndef FEE_PAGE_BASE_ADDRESS # define FEE_PAGE_BASE_ADDRESS ((uint32_t)(FEE_PAGE_SIZE * FEE_TOTAL_PAGES - ((FEE_DENSITY_PAGES + 1) * FEE_PAGE_SIZE))) // Guard the last page # endif +# endif #endif diff --git a/quantum/rgb_matrix/rgb_matrix_drivers.c b/quantum/rgb_matrix/rgb_matrix_drivers.c index 9e5c2155e..c2f628c65 100644 --- a/quantum/rgb_matrix/rgb_matrix_drivers.c +++ b/quantum/rgb_matrix/rgb_matrix_drivers.c @@ -325,7 +325,6 @@ const rgb_matrix_driver_t rgb_matrix_driver = { .set_color = setled, .set_color_all = setled_all, }; -#endif #elif defined(SN32F24xB) static void flush(void) {} // Due to the way we do PWM, every cycle is a flush @@ -335,7 +334,6 @@ const rgb_matrix_driver_t rgb_matrix_driver = { .set_color = SN32F24xB_set_color, .set_color_all = SN32F24xB_set_color_all, }; -#endif #elif defined(SN32F26x) static void init(void) { // NOP |