Add header file trampoline to allow library build with Arduino IDE.

mikaelpatel · Apr 12, 2015 · 825937b · 825937b
1 parent 14e0541
commit 825937b
Show file tree

Hide file tree

Showing 11 changed files with 98 additions and 7 deletions.
diff --git a/build/Arduino-Makefile/Arduino.mk b/build/Arduino-Makefile/Arduino.mk
@@ -780,8 +780,11 @@ endif
 
 ifndef ARDUINO_LIBS
   # automatically determine included libraries
+  ARDUINO_LIBS += $(filter $(notdir $(wildcard $(ARDUINO_LIB_PATH)/*)), $(shell sed -ne "s/^ *\# *include *[<\"]\(.*\)\.h[>\"]/\1/p" $(LOCAL_SRCS)))
   ARDUINO_LIBS += $(filter $(notdir $(wildcard $(ARDUINO_LIB_PATH)/*)), $(shell sed -ne "s/^ *\# *include *[<\"]\(.*\)\.hh[>\"]/\1/p" $(LOCAL_SRCS)))
+  ARDUINO_LIBS += $(filter $(notdir $(wildcard $(ARDUINO_SKETCHBOOK)/libraries/*)), $(shell sed -ne "s/^ *\# *include *[<\"]\(.*\)\.h[>\"]/\1/p" $(LOCAL_SRCS)))
   ARDUINO_LIBS += $(filter $(notdir $(wildcard $(ARDUINO_SKETCHBOOK)/libraries/*)), $(shell sed -ne "s/^ *\# *include *[<\"]\(.*\)\.hh[>\"]/\1/p" $(LOCAL_SRCS)))
+  ARDUINO_LIBS += $(filter $(notdir $(wildcard $(USER_LIB_PATH)/*)), $(shell sed -ne "s/^ *\# *include *[<\"]\(.*\)\.h[>\"]/\1/p" $(LOCAL_SRCS)))
   ARDUINO_LIBS += $(filter $(notdir $(wildcard $(USER_LIB_PATH)/*)), $(shell sed -ne "s/^ *\# *include *[<\"]\(.*\)\.hh[>\"]/\1/p" $(LOCAL_SRCS)))
 endif
 

diff --git a/libraries/Library/Library.h b/libraries/Library/Library.h
@@ -0,0 +1,30 @@
+/**
+ * @file Library.h
+ * @version 1.0
+ *
+ * @section License
+ * Copyright (C) 2014-2015, Mikael Patel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * @section Description
+ * Library main class header file template. Trampoline for Arduino
+ * library handling.
+ *
+ * This file is part of the Arduino Che Cosa project.
+ */
+
+#ifndef LIBRARY_H
+#define LIBRARY_H
+
+#include "Library.hh"
+
+#endif
diff --git a/libraries/Library/examples/CosaLibrary/CosaLibrary.ino b/libraries/Library/examples/CosaLibrary/CosaLibrary.ino
@@ -25,7 +25,7 @@
  * This file is part of the Arduino Che Cosa project.
  */
 
-#include "Library.hh"
+#include <Library.h>
 #include "Cosa/Trace.hh"
 #include "Cosa/Watchdog.hh"
 #include "Cosa/IOStream.hh"

diff --git a/libraries/MQTT/MQTT.h b/libraries/MQTT/MQTT.h
@@ -0,0 +1,29 @@
+/**
+ * @file MQTT.h
+ * @version 1.0
+ *
+ * @section License
+ * Copyright (C) 2014-2015, Mikael Patel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * @section Description
+ * Trampoline for Arduino library handling.
+ *
+ * This file is part of the Arduino Che Cosa project.
+ */
+
+#ifndef COSA_IOT_MQTT_H
+#define COSA_IOT_MQTT_H
+
+#include "MQTT.hh"
+
+#endif
diff --git a/libraries/MQTT/examples/CosaMQTTclient/CosaMQTTclient.ino b/libraries/MQTT/examples/CosaMQTTclient/CosaMQTTclient.ino
@@ -33,7 +33,7 @@
  * This file is part of the Arduino Che Cosa project.
  */
 
-#include "MQTT.hh"
+#include <MQTT.h>
 #include "Cosa/Watchdog.hh"
 #include "Cosa/Trace.hh"
 #include "Cosa/IOStream/Driver/UART.hh"

diff --git a/libraries/MQTT/examples/CosaMQTThumidity/CosaMQTThumidity.ino b/libraries/MQTT/examples/CosaMQTThumidity/CosaMQTThumidity.ino
@@ -42,7 +42,7 @@
  * This file is part of the Arduino Che Cosa project.
  */
 
-#include "MQTT.hh"
+#include <MQTT.h>
 #include "Cosa/RTC.hh"
 #include "Cosa/Watchdog.hh"
 #include "Cosa/IOBuffer.hh"

diff --git a/libraries/MQTT/examples/CosaMQTTtemperature/CosaMQTTtemperature.ino b/libraries/MQTT/examples/CosaMQTTtemperature/CosaMQTTtemperature.ino
@@ -43,7 +43,7 @@
  * This file is part of the Arduino Che Cosa project.
  */
 
-#include "MQTT.hh"
+#include <MQTT.h>
 #include "Cosa/Board.hh"
 #include "Cosa/Watchdog.hh"
 #include "Cosa/IOBuffer.hh"

diff --git a/libraries/ThingSpeak/ThingSpeak.h b/libraries/ThingSpeak/ThingSpeak.h
@@ -0,0 +1,29 @@
+/**
+ * @file ThingSpeak.h
+ * @version 1.0
+ *
+ * @section License
+ * Copyright (C) 2014, Mikael Patel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * @section Description
+ * Trampoline for Arduino library handling.
+ *
+ * This file is part of the Arduino Che Cosa project.
+ */
+
+#ifndef COSA_IOT_THINGSPEAK_H
+#define COSA_IOT_THINGSPEAK_H
+
+#include "ThingSpeak.hh"
+
+#endif
diff --git a/libraries/ThingSpeak/examples/CosaThingSpeakChannel/CosaThingSpeakChannel.ino b/libraries/ThingSpeak/examples/CosaThingSpeakChannel/CosaThingSpeakChannel.ino
@@ -45,7 +45,7 @@
 // Uncomment to remove debug output
 // #define NDEBUG
 
-#include "ThingSpeak.hh"
+#include <ThingSpeak.h>
 #include "Cosa/RTC.hh"
 #include "Cosa/Watchdog.hh"
 #include "Cosa/Driver/DHT.hh"

diff --git a/libraries/ThingSpeak/examples/CosaThingSpeakClient/CosaThingSpeakClient.ino b/libraries/ThingSpeak/examples/CosaThingSpeakClient/CosaThingSpeakClient.ino
@@ -54,7 +54,7 @@
  * This file is part of the Arduino Che Cosa project.
  */
 
-#include "ThingSpeak.hh"
+#include <ThingSpeak.h>
 #include "Cosa/RTC.hh"
 #include "Cosa/Event.hh"
 #include "Cosa/Watchdog.hh"

diff --git a/libraries/ThingSpeak/examples/CosaThingSpeakTalkBack/CosaThingSpeakTalkBack.ino b/libraries/ThingSpeak/examples/CosaThingSpeakTalkBack/CosaThingSpeakTalkBack.ino
@@ -38,7 +38,7 @@
  * This file is part of the Arduino Che Cosa project.
  */
 
-#include "ThingSpeak.hh"
+#include <ThingSpeak.h>
 #include "Cosa/Watchdog.hh"
 #include "Cosa/Socket/Driver/W5100.hh"