From 958194bd2a0aae7e0d394a3f9404bc502d383e9b Mon Sep 17 00:00:00 2001 From: CommanderRedYT Date: Thu, 23 Sep 2021 21:03:43 +0200 Subject: [PATCH 1/2] Added optional fix for heaplargesttext --- config_comred.cmake | 1 + main/displays/menus/aboutmenu.h | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/config_comred.cmake b/config_comred.cmake index 42905ed..a9e0d1f 100644 --- a/config_comred.cmake +++ b/config_comred.cmake @@ -87,4 +87,5 @@ set(BOBBYCAR_BUILDFLAGS -DFEATURE_LEDSTRIP -DPINS_LEDSTRIP=33 -DLEDSTRIP_LENGTH=121 + -DHEAP_LRGST_CRASH ) diff --git a/main/displays/menus/aboutmenu.h b/main/displays/menus/aboutmenu.h index 78b6b77..faacd5f 100644 --- a/main/displays/menus/aboutmenu.h +++ b/main/displays/menus/aboutmenu.h @@ -31,11 +31,15 @@ public: constructMenuItem, DisabledColor, DummyAction>>(); constructMenuItem, DisabledColor, DummyAction>>(); constructMenuItem, DisabledColor, DummyAction>>(); + #ifndef HEAP_LRGST_CRASH constructMenuItem, DisabledColor, DummyAction>>(); +#endif constructMenuItem, DisabledColor, DummyAction>>(); constructMenuItem, DisabledColor, DummyAction>>(); constructMenuItem, DisabledColor, DummyAction>>(); + #ifndef HEAP_LRGST_CRASH constructMenuItem, DisabledColor, DummyAction>>(); +#endif constructMenuItem, DisabledColor, DummyAction>>(); constructMenuItem, DisabledColor, DummyAction>>(); constructMenuItem, DisabledColor, DummyAction>>(); From c2e7d8edbf33365fe1b85873ce620a62f340585e Mon Sep 17 00:00:00 2001 From: CommanderRedYT Date: Thu, 23 Sep 2021 21:18:12 +0200 Subject: [PATCH 2/2] Fixed indents and rename --- config_comred.cmake | 2 +- main/displays/menus/aboutmenu.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config_comred.cmake b/config_comred.cmake index a9e0d1f..8b47ba7 100644 --- a/config_comred.cmake +++ b/config_comred.cmake @@ -87,5 +87,5 @@ set(BOBBYCAR_BUILDFLAGS -DFEATURE_LEDSTRIP -DPINS_LEDSTRIP=33 -DLEDSTRIP_LENGTH=121 - -DHEAP_LRGST_CRASH + -DHEAP_LRGST_CRASH_TEXT_FIX ) diff --git a/main/displays/menus/aboutmenu.h b/main/displays/menus/aboutmenu.h index faacd5f..3f14ae1 100644 --- a/main/displays/menus/aboutmenu.h +++ b/main/displays/menus/aboutmenu.h @@ -31,13 +31,13 @@ public: constructMenuItem, DisabledColor, DummyAction>>(); constructMenuItem, DisabledColor, DummyAction>>(); constructMenuItem, DisabledColor, DummyAction>>(); - #ifndef HEAP_LRGST_CRASH +#ifndef HEAP_LRGST_CRASH_TEXT_FIX constructMenuItem, DisabledColor, DummyAction>>(); #endif constructMenuItem, DisabledColor, DummyAction>>(); constructMenuItem, DisabledColor, DummyAction>>(); constructMenuItem, DisabledColor, DummyAction>>(); - #ifndef HEAP_LRGST_CRASH +#ifndef HEAP_LRGST_CRASH_TEXT_FIX constructMenuItem, DisabledColor, DummyAction>>(); #endif constructMenuItem, DisabledColor, DummyAction>>();