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

2021-02-07 23:16:47 +00:00
parent b8031a1613 99bffc2a21
commit 3a98bd75c8
14 changed files with 22 additions and 50 deletions
--- a/tmk_core/protocol/arm_atsam/md_rgb_matrix.c
+++ b/tmk_core/protocol/arm_atsam/md_rgb_matrix.c
@@ -16,7 +16,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

 #include "arm_atsam_protocol.h"
-#include "tmk_core/common/led.h"
+#include "led.h"
 #include "rgb_matrix.h"
 #include <string.h>
 #include <math.h>