Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
replace bracket with double quote for all local includes. update rele…
…ase.sh to build for arduino 1.0.x and arduino 1.5.x
  • Loading branch information
soundanalogous committed Dec 28, 2014
commit fc82a6e95cc2343f76c6c4b98ee64707de210b56
21 changes: 17 additions & 4 deletions release.sh
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
2 changes: 1 addition & 1 deletion utility/AnalogFirmata.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

#include <Firmata.h>
#include <AnalogFirmata.h>
#include "AnalogFirmata.h"

boolean handleAnalogFirmataSysex(byte command, byte argc, byte* argv)
{
Expand Down
4 changes: 2 additions & 2 deletions utility/AnalogInputFirmata.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
*/

#include <Firmata.h>
#include <AnalogFirmata.h>
#include <AnalogInputFirmata.h>
#include "AnalogFirmata.h"
#include "AnalogInputFirmata.h"

AnalogInputFirmata *AnalogInputFirmataInstance;

Expand Down
4 changes: 2 additions & 2 deletions utility/AnalogInputFirmata.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
4 changes: 2 additions & 2 deletions utility/AnalogOutputFirmata.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
*/

#include <Firmata.h>
#include <AnalogFirmata.h>
#include <AnalogOutputFirmata.h>
#include "AnalogFirmata.h"
#include "AnalogOutputFirmata.h"

//AnalogOutputFirmata::AnalogOutputFirmata()
//{
Expand Down
2 changes: 1 addition & 1 deletion utility/AnalogOutputFirmata.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#define AnalogOutputFirmata_h

#include <Firmata.h>
#include <utility/FirmataFeature.h>
#include "FirmataFeature.h"

class AnalogOutputFirmata:public FirmataFeature
{
Expand Down
2 changes: 1 addition & 1 deletion utility/DigitalInputFirmata.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

#include <Firmata.h>
#include <DigitalInputFirmata.h>
#include "DigitalInputFirmata.h"

DigitalInputFirmata *DigitalInputFirmataInstance;

Expand Down
2 changes: 1 addition & 1 deletion utility/DigitalInputFirmata.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#define DigitalInputFirmata_h

#include <Firmata.h>
#include <utility/FirmataFeature.h>
#include "FirmataFeature.h"

void reportDigitalInputCallback(byte port, int value);

Expand Down
2 changes: 1 addition & 1 deletion utility/DigitalOutputFirmata.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

#include <Firmata.h>
#include <DigitalOutputFirmata.h>
#include "DigitalOutputFirmata.h"

DigitalOutputFirmata *DigitalOutputFirmataInstance;

Expand Down
2 changes: 1 addition & 1 deletion utility/DigitalOutputFirmata.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#define DigitalOutputFirmata_h

#include <Firmata.h>
#include <utility/FirmataFeature.h>
#include "FirmataFeature.h"

void digitalOutputWriteCallback(byte port, int value);

Expand Down
2 changes: 1 addition & 1 deletion utility/FirmataExt.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

#include <Firmata.h>
#include <FirmataExt.h>
#include "FirmataExt.h"

FirmataExt *FirmataExtInstance;

Expand Down
2 changes: 1 addition & 1 deletion utility/FirmataExt.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#define FirmataExt_h

#include <Firmata.h>
#include <utility/FirmataFeature.h>
#include "FirmataFeature.h"

#define MAX_FEATURES TOTAL_PIN_MODES+1

Expand Down
4 changes: 2 additions & 2 deletions utility/FirmataReporting.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
2 changes: 1 addition & 1 deletion utility/FirmataReporting.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#define FirmataReporting_h

#include <Firmata.h>
#include <utility/FirmataFeature.h>
#include "FirmataFeature.h"

#define MINIMUM_SAMPLING_INTERVAL 10

Expand Down
8 changes: 4 additions & 4 deletions utility/FirmataScheduler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions utility/FirmataScheduler.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion utility/I2CFirmata.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

#include <Firmata.h>
#include <Wire.h>
#include <I2CFirmata.h>
#include "I2CFirmata.h"

I2CFirmata::I2CFirmata()
{
Expand Down
4 changes: 2 additions & 2 deletions utility/I2CFirmata.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions utility/OneWireFirmata.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
2 changes: 1 addition & 1 deletion utility/OneWireFirmata.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

#include "OneWire.h"
#include <Firmata.h>
#include <utility/FirmataFeature.h>
#include "FirmataFeature.h"

//subcommands:
#define ONEWIRE_SEARCH_REQUEST 0x40
Expand Down
2 changes: 1 addition & 1 deletion utility/ServoFirmata.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

#include <Servo.h>
#include <Firmata.h>
#include <ServoFirmata.h>
#include "ServoFirmata.h"

ServoFirmata *ServoInstance;

Expand Down
2 changes: 1 addition & 1 deletion utility/ServoFirmata.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

#include <Servo.h>
#include <Firmata.h>
#include <utility/FirmataFeature.h>
#include "FirmataFeature.h"

void servoAnalogWrite(byte pin, int value);

Expand Down
4 changes: 2 additions & 2 deletions utility/StepperFirmata.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion utility/StepperFirmata.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down