bugfix to include external libraries: reworked include paths + moved Arduino.h + updated SPI lib

Author: stevstrong

STM32F4/cores/maple/Arduino.h

@@ -17,8 +17,9 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#ifndef client_h
-#define client_h
+#ifndef _CLIENT_H_
+#define _CLIENT_H_
+
 #include "Print.h"
 #include "Stream.h"
 #include "IPAddress.h"

STM32F4/cores/maple/Client.h

@@ -33,7 +33,7 @@
 
 // TODO [0.1.0] Remove deprecated pieces, pick a better API
 
-#include "timer.h"
+#include <libmaple/timer.h>
 
 /** Timer mode. */
 typedef timer_mode TimerMode;

STM32F4/cores/maple/HardwareTimer.h

@@ -17,8 +17,8 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#ifndef IPAddress_h
-#define IPAddress_h
+#ifndef _IPAddress_h_
+#define _IPAddress_h_
 
 #include <stdint.h>
 #include <WString.h>

STM32F4/cores/maple/IPAddress.h

@@ -17,8 +17,8 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#ifndef server_h
-#define server_h
+#ifndef _SERVER_H_
+#define _SERVER_H_
 
 #include "Print.h"
 

STM32F4/cores/maple/Server.h

@@ -19,8 +19,8 @@
   parsing functions based on TextFinder library by Michael Margolis
 */
 
-#ifndef Stream_h
-#define Stream_h
+#ifndef _STREAM_H_
+#define _STREAM_H_
 
 #include <inttypes.h>
 #include "Print.h"

STM32F4/cores/maple/Stream.h

@@ -32,8 +32,8 @@
  * bjoern@cs.stanford.edu 12/30/2008
  */
 
-#ifndef udp_h
-#define udp_h
+#ifndef _UDP_H_
+#define _UDP_H_
 
 #include <Stream.h>
 #include <IPAddress.h>

STM32F4/cores/maple/Udp.h

@@ -24,7 +24,12 @@
  * SOFTWARE.
  *****************************************************************************/
 
-#include "wirish.h"
+#ifndef _WPROGRAM_H_
+#define _WPROGRAM_H_
+
+#include <wirish.h>
 
 void setup();
 void loop();
+
+#endif

STM32F4/cores/maple/WProgram.h

@@ -19,8 +19,9 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#ifndef String_class_h
-#define String_class_h
+#ifndef _WSTRING_H_
+#define _WSTRING_H_
+
 #ifdef __cplusplus
 
 #include <stdlib.h>
@@ -225,4 +226,4 @@ class StringSumHelper : public String
 };
 
 #endif  // __cplusplus
-#endif  // String_class_h
+#endif  // _WSTRING_H_

STM32F4/cores/maple/WString.h

@@ -27,4 +27,9 @@
 /* Note: Use of this header file is deprecated.  Use bit_constants.h
    instead. */
 
+#ifndef _BITS_H_
+#define _BITS_H_
+
 #include "bit_constants.h"
+
+#endif