Unverified Commit d7525456 authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

framebuffer, pixelfont: use HAVE_PROGMEM rather than hardcoding arch checks

parent 11533e77

include/lib/pixelfont/pixeloperator.h

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
 * SPDX-License-Identifier: CC0-1.0

 */



#ifdef MULTIPASS_ARCH_arduino_nano

#ifdef HAVE_PROGMEM

#include <avr/pgmspace.h>

#define GLYPH_ATTR PROGMEM

#else

include/lib/pixelfont/pixeloperator_mirrored.h

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
 * SPDX-License-Identifier: CC0-1.0

 */



#ifdef MULTIPASS_ARCH_arduino_nano

#ifdef HAVE_PROGMEM

#include <avr/pgmspace.h>

#define GLYPH_ATTR PROGMEM

#else

include/lib/pixelfont/terminus16.h

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
 * SPDX-License-Identifier: OFL-1.1

 */



#ifdef MULTIPASS_ARCH_arduino_nano

#ifdef HAVE_PROGMEM

#include <avr/pgmspace.h>

#define GLYPH_ATTR PROGMEM

#else

include/lib/pixelfont/terminus24.h

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
 * SPDX-License-Identifier: OFL-1.1

 */



#ifdef MULTIPASS_ARCH_arduino_nano

#ifdef HAVE_PROGMEM

#include <avr/pgmspace.h>

#define GLYPH_ATTR PROGMEM

#else

src/arch/arduino-nano/Makefile.inc

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ cpu_freq ?= 16000000 
COMMON_FLAGS += -Werror=overflow

COMMON_FLAGS += -mmcu=${MCU} -DMULTIPASS_ARCH_arduino_nano

COMMON_FLAGS += -DF_CPU=${cpu_freq}UL

COMMON_FLAGS += -DHAVE_PROGMEM



ifeq (${stack_usage}, )

	COMMON_FLAGS += -flto