From 49bbfe75054972866b9b06faea118f890ce6bc26 Mon Sep 17 00:00:00 2001 From: William Wilgus Date: Wed, 28 Aug 2024 21:19:12 -0400 Subject: Fix red fbc8b2156f lcd_scroll is include in a weird manner and includes need to go in scroll_engine.c instead and still be blocked from bootloaders Change-Id: Ic99d123f7d428d511380c7064a9453de56218a17 --- firmware/drivers/lcd-scroll.c | 2 -- firmware/scroll_engine.c | 4 ++++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/firmware/drivers/lcd-scroll.c b/firmware/drivers/lcd-scroll.c index 8ab91ef642..2a58d6ff21 100644 --- a/firmware/drivers/lcd-scroll.c +++ b/firmware/drivers/lcd-scroll.c @@ -24,8 +24,6 @@ /* This file is meant to be #included by scroll_engine.c (twice if a remote * is present) */ -#include "misc.h" -#include "settings.h" #ifndef LCDFN /* Not compiling for remote - define macros for main LCD. */ #define LCDFN(fn) lcd_ ## fn #define LCDM(ma) LCD_ ## ma diff --git a/firmware/scroll_engine.c b/firmware/scroll_engine.c index c32f4632e2..74c08c1da5 100644 --- a/firmware/scroll_engine.c +++ b/firmware/scroll_engine.c @@ -32,6 +32,10 @@ #include "usb.h" #include "lcd.h" #include "font.h" +#if !defined(BOOTLOADER) +#include "misc.h" +#include "settings.h" +#endif #ifdef HAVE_REMOTE_LCD #include "lcd-remote.h" #endif -- cgit v1.2.3