replace bracket with double quote for all local includes. update release.sh to build for arduino 1.0.x and arduino 1.5.x

soundanalogous · soundanalogous · commit fc82a6e95cc2 · 2014-12-28T15:39:14.000-08:00
diff --git a/release.sh b/release.sh
@@ -1,9 +1,8 @@
 #!/bin/sh
 
 # use this script to package Firmata for distribution
-# to do: make an ant script or something else that is cross platform
 
-# create distribution package for Arduino 1.0.x and Arduino 1.5.x
+# package for Arduino 1.0.x
 mkdir -p temp/Firmata
 cp -r examples temp/Firmata
 cp -r extras temp/Firmata
@@ -12,10 +11,24 @@ cp Boards.h temp/Firmata
 cp Firmata.cpp temp/Firmata
 cp Firmata.h temp/Firmata
 cp keywords.txt temp/Firmata
-cp readme.md temp/Firmata
+cp readme.md temp/Firmata/extras
+cp library.properties temp/Firmata
 cd temp
 find . -name "*.DS_Store" -type f -delete
 zip -r Firmata.zip ./Firmata/
 cd ..
 mv ./temp/Firmata.zip Firmata-2.6.0.zip
-rm -r ./temp
+
+# package for Arduino 1.5.x
+cd temp/Firmata
+mkdir src
+mv Boards.h ./src/
+mv Firmata.cpp ./src/
+mv Firmata.h ./src/
+mv utility ./src/
+cd ..
+find . -name "*.DS_Store" -type f -delete
+zip -r Firmata.zip ./Firmata/
+cd ..
+mv ./temp/Firmata.zip Arduino-1.5.x-Firmata-2.6.0.zip
+rm -r ./temp
diff --git a/utility/AnalogFirmata.cpp b/utility/AnalogFirmata.cpp
@@ -15,7 +15,7 @@
 */
 
 #include <Firmata.h>
-#include <AnalogFirmata.h>
+#include "AnalogFirmata.h"
 
 boolean handleAnalogFirmataSysex(byte command, byte argc, byte* argv)
 {
diff --git a/utility/AnalogInputFirmata.cpp b/utility/AnalogInputFirmata.cpp
@@ -15,8 +15,8 @@
 */
 
 #include <Firmata.h>
-#include <AnalogFirmata.h>
-#include <AnalogInputFirmata.h>
+#include "AnalogFirmata.h"
+#include "AnalogInputFirmata.h"
 
 AnalogInputFirmata *AnalogInputFirmataInstance;
 
diff --git a/utility/AnalogInputFirmata.h b/utility/AnalogInputFirmata.h
@@ -18,8 +18,8 @@
 #define AnalogInputFirmata_h
 
 #include <Firmata.h>
-#include <utility/FirmataFeature.h>
-#include <utility/FirmataReporting.h>
+#include "FirmataFeature.h"
+#include "FirmataReporting.h"
 
 void reportAnalogInputCallback(byte analogPin, int value);
 
diff --git a/utility/AnalogOutputFirmata.cpp b/utility/AnalogOutputFirmata.cpp
@@ -15,8 +15,8 @@
 */
 
 #include <Firmata.h>
-#include <AnalogFirmata.h>
-#include <AnalogOutputFirmata.h>
+#include "AnalogFirmata.h"
+#include "AnalogOutputFirmata.h"
 
 //AnalogOutputFirmata::AnalogOutputFirmata()
 //{
diff --git a/utility/AnalogOutputFirmata.h b/utility/AnalogOutputFirmata.h
@@ -18,7 +18,7 @@
 #define AnalogOutputFirmata_h
 
 #include <Firmata.h>
-#include <utility/FirmataFeature.h>
+#include "FirmataFeature.h"
 
 class AnalogOutputFirmata:public FirmataFeature
 {
diff --git a/utility/DigitalInputFirmata.cpp b/utility/DigitalInputFirmata.cpp
@@ -15,7 +15,7 @@
 */
 
 #include <Firmata.h>
-#include <DigitalInputFirmata.h>
+#include "DigitalInputFirmata.h"
 
 DigitalInputFirmata *DigitalInputFirmataInstance;
 
diff --git a/utility/DigitalInputFirmata.h b/utility/DigitalInputFirmata.h
@@ -18,7 +18,7 @@
 #define DigitalInputFirmata_h
 
 #include <Firmata.h>
-#include <utility/FirmataFeature.h>
+#include "FirmataFeature.h"
 
 void reportDigitalInputCallback(byte port, int value);
 
diff --git a/utility/DigitalOutputFirmata.cpp b/utility/DigitalOutputFirmata.cpp
@@ -15,7 +15,7 @@
 */
 
 #include <Firmata.h>
-#include <DigitalOutputFirmata.h>
+#include "DigitalOutputFirmata.h"
 
 DigitalOutputFirmata *DigitalOutputFirmataInstance;
 
diff --git a/utility/DigitalOutputFirmata.h b/utility/DigitalOutputFirmata.h
@@ -18,7 +18,7 @@
 #define DigitalOutputFirmata_h
 
 #include <Firmata.h>
-#include <utility/FirmataFeature.h>
+#include "FirmataFeature.h"
 
 void digitalOutputWriteCallback(byte port, int value);
 
diff --git a/utility/FirmataExt.cpp b/utility/FirmataExt.cpp
@@ -15,7 +15,7 @@
 */
 
 #include <Firmata.h>
-#include <FirmataExt.h>
+#include "FirmataExt.h"
 
 FirmataExt *FirmataExtInstance;
 
diff --git a/utility/FirmataExt.h b/utility/FirmataExt.h
@@ -18,7 +18,7 @@
 #define FirmataExt_h
 
 #include <Firmata.h>
-#include <utility/FirmataFeature.h>
+#include "FirmataFeature.h"
 
 #define MAX_FEATURES TOTAL_PIN_MODES+1
 
diff --git a/utility/FirmataReporting.cpp b/utility/FirmataReporting.cpp
@@ -15,8 +15,8 @@
 */
 
 #include <Firmata.h>
-#include <utility/FirmataFeature.h>
-#include <FirmataReporting.h>
+#include "FirmataFeature.h"
+#include "FirmataReporting.h"
 
 void FirmataReporting::setSamplingInterval(int interval)
 {
diff --git a/utility/FirmataReporting.h b/utility/FirmataReporting.h
@@ -18,7 +18,7 @@
 #define FirmataReporting_h
 
 #include <Firmata.h>
-#include <utility/FirmataFeature.h>
+#include "FirmataFeature.h"
 
 #define MINIMUM_SAMPLING_INTERVAL 10
 
diff --git a/utility/FirmataScheduler.cpp b/utility/FirmataScheduler.cpp
@@ -11,10 +11,10 @@
 */
 
 #include <Firmata.h>
-#include <utility/FirmataFeature.h>
-#include <Encoder7Bit.h>
-#include <FirmataScheduler.h>
-#include <FirmataExt.h>
+#include "FirmataFeature.h"
+#include "Encoder7Bit.h"
+#include "FirmataScheduler.h"
+#include "FirmataExt.h"
 
 FirmataScheduler *FirmataSchedulerInstance;
 
diff --git a/utility/FirmataScheduler.h b/utility/FirmataScheduler.h
@@ -14,8 +14,8 @@
 #define FirmataScheduler_h
 
 #include <Firmata.h>
-#include <utility/FirmataFeature.h>
-#include <utility/Encoder7Bit.h>
+#include "FirmataFeature.h"
+#include "Encoder7Bit.h"
 
 //subcommands
 #define CREATE_FIRMATA_TASK     0
diff --git a/utility/I2CFirmata.cpp b/utility/I2CFirmata.cpp
@@ -16,7 +16,7 @@
 
 #include <Firmata.h>
 #include <Wire.h>
-#include <I2CFirmata.h>
+#include "I2CFirmata.h"
 
 I2CFirmata::I2CFirmata()
 {
diff --git a/utility/I2CFirmata.h b/utility/I2CFirmata.h
@@ -18,8 +18,8 @@
 #define I2CFirmata_h
 
 #include <Firmata.h>
-#include <utility/FirmataFeature.h>
-#include <utility/FirmataReporting.h>
+#include "FirmataFeature.h"
+#include "FirmataReporting.h"
 
 // move the following defines to Firmata.h?
 #define I2C_WRITE B00000000
diff --git a/utility/OneWireFirmata.cpp b/utility/OneWireFirmata.cpp
@@ -11,8 +11,8 @@
 */
 
 #include <Firmata.h>
-#include <OneWireFirmata.h>
-#include <Encoder7Bit.h>
+#include "OneWireFirmata.h"
+#include "Encoder7Bit.h"
 
 boolean OneWireFirmata::handlePinMode(byte pin, int mode)
 {
diff --git a/utility/OneWireFirmata.h b/utility/OneWireFirmata.h
@@ -15,7 +15,7 @@
 
 #include "OneWire.h"
 #include <Firmata.h>
-#include <utility/FirmataFeature.h>
+#include "FirmataFeature.h"
 
 //subcommands:
 #define ONEWIRE_SEARCH_REQUEST 0x40
diff --git a/utility/ServoFirmata.cpp b/utility/ServoFirmata.cpp
@@ -16,7 +16,7 @@
 
 #include <Servo.h>
 #include <Firmata.h>
-#include <ServoFirmata.h>
+#include "ServoFirmata.h"
 
 ServoFirmata *ServoInstance;
 
diff --git a/utility/ServoFirmata.h b/utility/ServoFirmata.h
@@ -19,7 +19,7 @@
 
 #include <Servo.h>
 #include <Firmata.h>
-#include <utility/FirmataFeature.h>
+#include "FirmataFeature.h"
 
 void servoAnalogWrite(byte pin, int value);
 
diff --git a/utility/StepperFirmata.cpp b/utility/StepperFirmata.cpp
@@ -30,8 +30,8 @@
  * TODO: use Program Control to load stored profiles from EEPROM
  */
 
-#include <StepperFirmata.h>
-#include <FirmataStepper.h>
+#include "StepperFirmata.h"
+#include "FirmataStepper.h"
 #include <Firmata.h>
 
 boolean StepperFirmata::handlePinMode(byte pin, int mode)
diff --git a/utility/StepperFirmata.h b/utility/StepperFirmata.h
@@ -35,7 +35,7 @@
 
 #include "FirmataStepper.h"
 #include <Firmata.h>
-#include <utility/FirmataFeature.h>
+#include "FirmataFeature.h"
 
 #define MAX_STEPPERS 6 // arbitrary value... may need to adjust
 #define STEPPER_CONFIG 0

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`*/`
`16`	`16`
`17`	`17`	`#include <Firmata.h>`
`18`		`-#include <AnalogFirmata.h>`
	`18`	`+#include "AnalogFirmata.h"`
`19`	`19`
`20`	`20`	`boolean handleAnalogFirmataSysex(byte command, byte argc, byte* argv)`
`21`	`21`	`{`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`#define AnalogOutputFirmata_h`
`19`	`19`
`20`	`20`	`#include <Firmata.h>`
`21`		`-#include <utility/FirmataFeature.h>`
	`21`	`+#include "FirmataFeature.h"`
`22`	`22`
`23`	`23`	`class AnalogOutputFirmata:public FirmataFeature`
`24`	`24`	`{`