Skip to content

Commit b352e9b

Browse files
committed
Moved ZPUino libraries to the ZPUino 1.0 hardware type
This prevents the ZPUino libraries showing up for the AVR8 Hardware type.
1 parent 081fa9e commit b352e9b

40 files changed

+4489
-4489
lines changed
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

libraries/SD/utility/FatStructs.h renamed to hardware/zpuino/zpu/libraries/SD/utility/FatStructs.h

+421-421
Large diffs are not rendered by default.

libraries/SD/utility/Sd2Card.cpp renamed to hardware/zpuino/zpu/libraries/SD/utility/Sd2Card.cpp

+771-771
Large diffs are not rendered by default.

libraries/SD/utility/Sd2Card.h renamed to hardware/zpuino/zpu/libraries/SD/utility/Sd2Card.h

+250-250
Large diffs are not rendered by default.

libraries/SD/utility/Sd2PinMap.h renamed to hardware/zpuino/zpu/libraries/SD/utility/Sd2PinMap.h

+376-376
Large diffs are not rendered by default.

libraries/SD/utility/SdFat.h renamed to hardware/zpuino/zpu/libraries/SD/utility/SdFat.h

+551-551
Large diffs are not rendered by default.
Original file line numberDiff line numberDiff line change
@@ -1,76 +1,76 @@
1-
/* Arduino SdFat Library
2-
* Copyright (C) 2008 by William Greiman
3-
*
4-
* This file is part of the Arduino SdFat Library
5-
*
6-
* This Library is free software: you can redistribute it and/or modify
7-
* it under the terms of the GNU General Public License as published by
8-
* the Free Software Foundation, either version 3 of the License, or
9-
* (at your option) any later version.
10-
*
11-
* This Library is distributed in the hope that it will be useful,
12-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
13-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14-
* GNU General Public License for more details.
15-
16-
* You should have received a copy of the GNU General Public License
17-
* along with the Arduino SdFat Library. If not, see
18-
* <http://www.gnu.org/licenses/>.
19-
*/
20-
#ifndef SdFatUtil_h
21-
#define SdFatUtil_h
22-
/**
23-
* \file
24-
* Useful utility functions.
25-
*/
26-
#include <Arduino.h>
27-
#ifdef __AVR__
28-
#include <avr/pgmspace.h>
29-
30-
/** Store and print a string in flash memory.*/
31-
#define PgmPrint(x) SerialPrint_P(PSTR(x))
32-
/** Store and print a string in flash memory followed by a CR/LF.*/
33-
#define PgmPrintln(x) SerialPrintln_P(PSTR(x))
34-
/** Defined so doxygen works for function definitions. */
35-
#endif
36-
#define NOINLINE __attribute__((noinline,unused))
37-
#define UNUSEDOK __attribute__((unused))
38-
//------------------------------------------------------------------------------
39-
/** Return the number of bytes currently free in RAM. */
40-
static UNUSEDOK int FreeRam(void) {
41-
extern int __bss_end;
42-
extern int* __brkval;
43-
int free_memory;
44-
if (reinterpret_cast<int>(__brkval) == 0) {
45-
// if no heap use from end of bss section
46-
free_memory = reinterpret_cast<int>(&free_memory)
47-
- reinterpret_cast<int>(&__bss_end);
48-
} else {
49-
// use from top of stack to heap
50-
free_memory = reinterpret_cast<int>(&free_memory)
51-
- reinterpret_cast<int>(__brkval);
52-
}
53-
return free_memory;
54-
}
55-
#ifdef __AVR__
56-
//------------------------------------------------------------------------------
57-
/**
58-
* %Print a string in flash memory to the serial port.
59-
*
60-
* \param[in] str Pointer to string stored in flash memory.
61-
*/
62-
static NOINLINE void SerialPrint_P(PGM_P str) {
63-
for (uint8_t c; (c = pgm_read_byte(str)); str++) Serial.write(c);
64-
}
65-
//------------------------------------------------------------------------------
66-
/**
67-
* %Print a string in flash memory followed by a CR/LF.
68-
*
69-
* \param[in] str Pointer to string stored in flash memory.
70-
*/
71-
static NOINLINE void SerialPrintln_P(PGM_P str) {
72-
SerialPrint_P(str);
73-
Serial.println();
74-
}
75-
#endif // __AVR__
76-
#endif // #define SdFatUtil_h
1+
/* Arduino SdFat Library
2+
* Copyright (C) 2008 by William Greiman
3+
*
4+
* This file is part of the Arduino SdFat Library
5+
*
6+
* This Library is free software: you can redistribute it and/or modify
7+
* it under the terms of the GNU General Public License as published by
8+
* the Free Software Foundation, either version 3 of the License, or
9+
* (at your option) any later version.
10+
*
11+
* This Library is distributed in the hope that it will be useful,
12+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
13+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14+
* GNU General Public License for more details.
15+
16+
* You should have received a copy of the GNU General Public License
17+
* along with the Arduino SdFat Library. If not, see
18+
* <http://www.gnu.org/licenses/>.
19+
*/
20+
#ifndef SdFatUtil_h
21+
#define SdFatUtil_h
22+
/**
23+
* \file
24+
* Useful utility functions.
25+
*/
26+
#include <Arduino.h>
27+
#ifdef __AVR__
28+
#include <avr/pgmspace.h>
29+
30+
/** Store and print a string in flash memory.*/
31+
#define PgmPrint(x) SerialPrint_P(PSTR(x))
32+
/** Store and print a string in flash memory followed by a CR/LF.*/
33+
#define PgmPrintln(x) SerialPrintln_P(PSTR(x))
34+
/** Defined so doxygen works for function definitions. */
35+
#endif
36+
#define NOINLINE __attribute__((noinline,unused))
37+
#define UNUSEDOK __attribute__((unused))
38+
//------------------------------------------------------------------------------
39+
/** Return the number of bytes currently free in RAM. */
40+
static UNUSEDOK int FreeRam(void) {
41+
extern int __bss_end;
42+
extern int* __brkval;
43+
int free_memory;
44+
if (reinterpret_cast<int>(__brkval) == 0) {
45+
// if no heap use from end of bss section
46+
free_memory = reinterpret_cast<int>(&free_memory)
47+
- reinterpret_cast<int>(&__bss_end);
48+
} else {
49+
// use from top of stack to heap
50+
free_memory = reinterpret_cast<int>(&free_memory)
51+
- reinterpret_cast<int>(__brkval);
52+
}
53+
return free_memory;
54+
}
55+
#ifdef __AVR__
56+
//------------------------------------------------------------------------------
57+
/**
58+
* %Print a string in flash memory to the serial port.
59+
*
60+
* \param[in] str Pointer to string stored in flash memory.
61+
*/
62+
static NOINLINE void SerialPrint_P(PGM_P str) {
63+
for (uint8_t c; (c = pgm_read_byte(str)); str++) Serial.write(c);
64+
}
65+
//------------------------------------------------------------------------------
66+
/**
67+
* %Print a string in flash memory followed by a CR/LF.
68+
*
69+
* \param[in] str Pointer to string stored in flash memory.
70+
*/
71+
static NOINLINE void SerialPrintln_P(PGM_P str) {
72+
SerialPrint_P(str);
73+
Serial.println();
74+
}
75+
#endif // __AVR__
76+
#endif // #define SdFatUtil_h

0 commit comments

Comments
 (0)