Skip to content

Load <avr/pgmspace.h> for Teensy3 #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 20, 2015
Merged

Load <avr/pgmspace.h> for Teensy3 #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/SFE_MicroOLED.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
******************************************************************************/
#include <Arduino.h>
#ifdef __AVR__
#if defined(__AVR__) || defined(__arm__)
#include <avr/pgmspace.h>
#else
#include <pgmspace.h>
Expand Down
2 changes: 1 addition & 1 deletion src/SFE_MicroOLED.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <stdio.h>
#include <Arduino.h>

#ifdef __AVR__
#if defined(__AVR__) || defined(__arm__)
#include <avr/pgmspace.h>
#else
#include <pgmspace.h>
Expand Down
2 changes: 1 addition & 1 deletion src/util/7segment.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ July 27, 2015
#ifndef FONT7SEGMENT_H
#define FONT7SEGMENT_H

#ifdef __AVR__
#if defined(__AVR__) || defined(__arm__)
#include <avr/pgmspace.h>
#else
#include <pgmspace.h>
Expand Down
2 changes: 1 addition & 1 deletion src/util/font5x7.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ July 27, 2015
#ifndef FONT5X7_H
#define FONT5X7_H

#ifdef __AVR__
#if defined(__AVR__) || defined(__arm__)
#include <avr/pgmspace.h>
#else
#include <pgmspace.h>
Expand Down
2 changes: 1 addition & 1 deletion src/util/font8x16.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ July 27, 2015
#ifndef FONT8X16_H
#define FONT8X16_H

#ifdef __AVR__
#if defined(__AVR__) || defined(__arm__)
#include <avr/pgmspace.h>
#else
#include <pgmspace.h>
Expand Down
6 changes: 5 additions & 1 deletion src/util/fontlargeletter31x48.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,11 @@ August 13, 2015

#ifndef FONTLARGELETTER31X48_H
#define FONTLARGELETTER31X48_H
#include <avr/pgmspace.h>
#if defined(__AVR__) || defined(__arm__)
#include <avr/pgmspace.h>
#else
#include <pgmspace.h>
#endif
static const unsigned char fontlargeletter31x48 [] PROGMEM = {
// first row defines - FONTWIDTH, FONTHEIGHT, ASCII START CHAR, TOTAL CHARACTERS, FONT MAP WIDTH HIGH, FONT MAP WIDTH LOW (2,56 meaning 256)
31,48,65,58,0,62,
Expand Down
2 changes: 1 addition & 1 deletion src/util/fontlargenumber.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ July 27, 2015
#ifndef FONTLARGENUMBER_H
#define FONTLARGENUMBER_H

#ifdef __AVR__
#if defined(__AVR__) || defined(__arm__)
#include <avr/pgmspace.h>
#else
#include <pgmspace.h>
Expand Down