Skip to content

Commit 0f5a525

Browse files
committed
Added avr/pgmspace.h compatibility layer for Due Boards
Fixes #1317
1 parent a1d63c2 commit 0f5a525

File tree

4 files changed

+50
-0
lines changed

4 files changed

+50
-0
lines changed

build/shared/revisions.txt

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ ARDUINO 1.5.3 BETA
1010
[arduino core]
1111
* sam: Fixed delayMicrosecond() when interrupts are disabled
1212
* sam: Upgraded libsam, and added missing modules (CAN, ETH, etc.) (Thibaut Viard)
13+
* sam: Added compatibility for avr/pgmspace.h (Paul Stoffregen)
1314

1415
[libraries]
1516
* sam: Added CAN library (still in early stage of development) (Palliser)

hardware/arduino/sam/cores/arduino/Arduino.h

+6
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,12 @@
2424
#include <string.h>
2525
#include <math.h>
2626

27+
// some libraries and sketches depend on this
28+
// AVR stuff, assuming Arduino.h or WProgram.h
29+
// automatically includes it...
30+
#include <avr/pgmspace.h>
31+
#include <avr/interrupt.h>
32+
2733
#include "binary.h"
2834

2935
#ifdef __cplusplus

hardware/arduino/sam/cores/arduino/avr/interrupt.h

Whitespace-only changes.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
#ifndef __PGMSPACE_H_
2+
#define __PGMSPACE_H_ 1
3+
4+
#include <inttypes.h>
5+
6+
#define PROGMEM
7+
#define PGM_P const char *
8+
#define PSTR(str) (str)
9+
10+
#define _SFR_BYTE(n) (n)
11+
12+
typedef void prog_void;
13+
typedef char prog_char;
14+
typedef unsigned char prog_uchar;
15+
typedef int8_t prog_int8_t;
16+
typedef uint8_t prog_uint8_t;
17+
typedef int16_t prog_int16_t;
18+
typedef uint16_t prog_uint16_t;
19+
typedef int32_t prog_int32_t;
20+
typedef uint32_t prog_uint32_t;
21+
22+
#define memcpy_P(dest, src, num) memcpy((dest), (src), (num))
23+
#define strcpy_P(dest, src) strcpy((dest), (src))
24+
#define strcat_P(dest, src) strcat((dest), (src))
25+
#define strcmp_P(a, b) strcmp((a), (b))
26+
#define strstr_P(a, b) strstr((a), (b))
27+
#define sprintf_P(s, f, ...) sprintf((s), (f), __VA_ARGS__)
28+
29+
#define pgm_read_byte(addr) (*(const unsigned char *)(addr))
30+
#define pgm_read_word(addr) (*(const unsigned short *)(addr))
31+
#define pgm_read_dword(addr) (*(const unsigned long *)(addr))
32+
#define pgm_read_float(addr) (*(const float *)(addr))
33+
34+
#define pgm_read_byte_near(addr) pgm_read_byte(addr)
35+
#define pgm_read_word_near(addr) pgm_read_word(addr)
36+
#define pgm_read_dword_near(addr) pgm_read_dword(addr)
37+
#define pgm_read_float_near(addr) pgm_read_float(addr)
38+
#define pgm_read_byte_far(addr) pgm_read_byte(addr)
39+
#define pgm_read_word_far(addr) pgm_read_word(addr)
40+
#define pgm_read_dword_far(addr) pgm_read_dword(addr)
41+
#define pgm_read_float_far(addr) pgm_read_float(addr)
42+
43+
#endif

0 commit comments

Comments
 (0)