-
-// move the following defines to Firmata.h?
-#define I2C_WRITE B00000000
-#define I2C_READ B00001000
-#define I2C_READ_CONTINUOUSLY B00010000
-#define I2C_STOP_READING B00011000
-#define I2C_READ_WRITE_MODE_MASK B00011000
-#define I2C_10BIT_ADDRESS_MODE_MASK B00100000
-
-#define MAX_QUERIES 8
-#define MINIMUM_SAMPLING_INTERVAL 10
-
-#define REGISTER_NOT_SPECIFIED -1
-
-/*==============================================================================
- * GLOBAL VARIABLES
- *============================================================================*/
-
-/* analog inputs */
-int analogInputsToReport = 0; // bitwise array to store pin reporting
-
-/* digital input ports */
-byte reportPINs[TOTAL_PORTS]; // 1 = report this port, 0 = silence
-byte previousPINs[TOTAL_PORTS]; // previous 8 bits sent
-
-/* pins configuration */
-byte pinConfig[TOTAL_PINS]; // configuration of every pin
-byte portConfigInputs[TOTAL_PORTS]; // each bit: 1 = pin in INPUT, 0 = anything else
-int pinState[TOTAL_PINS]; // any value that has been written
-
-/* timer variables */
-unsigned long currentMillis; // store the current value from millis()
-unsigned long previousMillis; // for comparison with currentMillis
-int samplingInterval = 19; // how often to run the main loop (in ms)
-
-/* i2c data */
-struct i2c_device_info {
- byte addr;
- byte reg;
- byte bytes;
-};
-
-/* for i2c read continuous more */
-i2c_device_info query[MAX_QUERIES];
-
-byte i2cRxData[32];
-boolean isI2CEnabled = false;
-signed char queryIndex = -1;
-unsigned int i2cReadDelayTime = 0; // default delay time between i2c read request and Wire.requestFrom()
-
-Servo servos[MAX_SERVOS];
-/*==============================================================================
- * FUNCTIONS
- *============================================================================*/
-
-void readAndReportData(byte address, int theRegister, byte numBytes) {
- // allow I2C requests that don't require a register read
- // for example, some devices using an interrupt pin to signify new data available
- // do not always require the register read so upon interrupt you call Wire.requestFrom()
- if (theRegister != REGISTER_NOT_SPECIFIED) {
- Wire.beginTransmission(address);
-#if ARDUINO >= 100
- Wire.write((byte)theRegister);
-#else
- Wire.send((byte)theRegister);
-#endif
- Wire.endTransmission();
- // do not set a value of 0
- if (i2cReadDelayTime > 0) {
- // delay is necessary for some devices such as WiiNunchuck
- delayMicroseconds(i2cReadDelayTime);
- }
- } else {
- theRegister = 0; // fill the register with a dummy value
- }
-
- Wire.requestFrom(address, numBytes); // all bytes are returned in requestFrom
-
- // check to be sure correct number of bytes were returned by slave
- if (numBytes == Wire.available()) {
- i2cRxData[0] = address;
- i2cRxData[1] = theRegister;
- for (int i = 0; i < numBytes; i++) {
-#if ARDUINO >= 100
- i2cRxData[2 + i] = Wire.read();
-#else
- i2cRxData[2 + i] = Wire.receive();
-#endif
- }
- }
- else {
- if (numBytes > Wire.available()) {
- Firmata.sendString("I2C Read Error: Too many bytes received");
- } else {
- Firmata.sendString("I2C Read Error: Too few bytes received");
- }
- }
-
- // send slave address, register and received bytes
- Firmata.sendSysex(SYSEX_I2C_REPLY, numBytes + 2, i2cRxData);
-}
-
-void outputPort(byte portNumber, byte portValue, byte forceSend)
-{
- // pins not configured as INPUT are cleared to zeros
- portValue = portValue & portConfigInputs[portNumber];
- // only send if the value is different than previously sent
- if (forceSend || previousPINs[portNumber] != portValue) {
- Firmata.sendDigitalPort(portNumber, portValue);
- previousPINs[portNumber] = portValue;
- }
-}
-
-/* -----------------------------------------------------------------------------
- * check all the active digital inputs for change of state, then add any events
- * to the Serial output queue using Serial.print() */
-void checkDigitalInputs(void)
-{
- /* Using non-looping code allows constants to be given to readPort().
- * The compiler will apply substantial optimizations if the inputs
- * to readPort() are compile-time constants. */
- if (TOTAL_PORTS > 0 && reportPINs[0]) outputPort(0, readPort(0, portConfigInputs[0]), false);
- if (TOTAL_PORTS > 1 && reportPINs[1]) outputPort(1, readPort(1, portConfigInputs[1]), false);
- if (TOTAL_PORTS > 2 && reportPINs[2]) outputPort(2, readPort(2, portConfigInputs[2]), false);
- if (TOTAL_PORTS > 3 && reportPINs[3]) outputPort(3, readPort(3, portConfigInputs[3]), false);
- if (TOTAL_PORTS > 4 && reportPINs[4]) outputPort(4, readPort(4, portConfigInputs[4]), false);
- if (TOTAL_PORTS > 5 && reportPINs[5]) outputPort(5, readPort(5, portConfigInputs[5]), false);
- if (TOTAL_PORTS > 6 && reportPINs[6]) outputPort(6, readPort(6, portConfigInputs[6]), false);
- if (TOTAL_PORTS > 7 && reportPINs[7]) outputPort(7, readPort(7, portConfigInputs[7]), false);
- if (TOTAL_PORTS > 8 && reportPINs[8]) outputPort(8, readPort(8, portConfigInputs[8]), false);
- if (TOTAL_PORTS > 9 && reportPINs[9]) outputPort(9, readPort(9, portConfigInputs[9]), false);
- if (TOTAL_PORTS > 10 && reportPINs[10]) outputPort(10, readPort(10, portConfigInputs[10]), false);
- if (TOTAL_PORTS > 11 && reportPINs[11]) outputPort(11, readPort(11, portConfigInputs[11]), false);
- if (TOTAL_PORTS > 12 && reportPINs[12]) outputPort(12, readPort(12, portConfigInputs[12]), false);
- if (TOTAL_PORTS > 13 && reportPINs[13]) outputPort(13, readPort(13, portConfigInputs[13]), false);
- if (TOTAL_PORTS > 14 && reportPINs[14]) outputPort(14, readPort(14, portConfigInputs[14]), false);
- if (TOTAL_PORTS > 15 && reportPINs[15]) outputPort(15, readPort(15, portConfigInputs[15]), false);
-}
-
-// -----------------------------------------------------------------------------
-/* sets the pin mode to the correct state and sets the relevant bits in the
- * two bit-arrays that track Digital I/O and PWM status
- */
-void setPinModeCallback(byte pin, int mode)
-{
- if (pinConfig[pin] == I2C && isI2CEnabled && mode != I2C) {
- // disable i2c so pins can be used for other functions
- // the following if statements should reconfigure the pins properly
- disableI2CPins();
- }
- if (IS_PIN_SERVO(pin) && mode != SERVO && servos[PIN_TO_SERVO(pin)].attached()) {
- servos[PIN_TO_SERVO(pin)].detach();
- }
- if (IS_PIN_ANALOG(pin)) {
- reportAnalogCallback(PIN_TO_ANALOG(pin), mode == ANALOG ? 1 : 0); // turn on/off reporting
- }
- if (IS_PIN_DIGITAL(pin)) {
- if (mode == INPUT) {
- portConfigInputs[pin / 8] |= (1 << (pin & 7));
- } else {
- portConfigInputs[pin / 8] &= ~(1 << (pin & 7));
- }
- }
- pinState[pin] = 0;
- switch (mode) {
- case ANALOG:
- if (IS_PIN_ANALOG(pin)) {
- if (IS_PIN_DIGITAL(pin)) {
- pinMode(PIN_TO_DIGITAL(pin), INPUT); // disable output driver
- digitalWrite(PIN_TO_DIGITAL(pin), LOW); // disable internal pull-ups
- }
- pinConfig[pin] = ANALOG;
- }
- break;
- case INPUT:
- if (IS_PIN_DIGITAL(pin)) {
- pinMode(PIN_TO_DIGITAL(pin), INPUT); // disable output driver
- digitalWrite(PIN_TO_DIGITAL(pin), LOW); // disable internal pull-ups
- pinConfig[pin] = INPUT;
- }
- break;
- case OUTPUT:
- if (IS_PIN_DIGITAL(pin)) {
- digitalWrite(PIN_TO_DIGITAL(pin), LOW); // disable PWM
- pinMode(PIN_TO_DIGITAL(pin), OUTPUT);
- pinConfig[pin] = OUTPUT;
- }
- break;
- case PWM:
- if (IS_PIN_PWM(pin)) {
- pinMode(PIN_TO_PWM(pin), OUTPUT);
- analogWrite(PIN_TO_PWM(pin), 0);
- pinConfig[pin] = PWM;
- }
- break;
- case SERVO:
- if (IS_PIN_SERVO(pin)) {
- pinConfig[pin] = SERVO;
- if (!servos[PIN_TO_SERVO(pin)].attached()) {
- servos[PIN_TO_SERVO(pin)].attach(PIN_TO_DIGITAL(pin));
- }
- }
- break;
- case I2C:
- if (IS_PIN_I2C(pin)) {
- // mark the pin as i2c
- // the user must call I2C_CONFIG to enable I2C for a device
- pinConfig[pin] = I2C;
- }
- break;
- default:
- Firmata.sendString("Unknown pin mode"); // TODO: put error msgs in EEPROM
- }
- // TODO: save status to EEPROM here, if changed
-}
-
-void analogWriteCallback(byte pin, int value)
-{
- if (pin < TOTAL_PINS) {
- switch (pinConfig[pin]) {
- case SERVO:
- if (IS_PIN_SERVO(pin))
- servos[PIN_TO_SERVO(pin)].write(value);
- pinState[pin] = value;
- break;
- case PWM:
- if (IS_PIN_PWM(pin))
- analogWrite(PIN_TO_PWM(pin), value);
- pinState[pin] = value;
- break;
- }
- }
-}
-
-void digitalWriteCallback(byte port, int value)
-{
- byte pin, lastPin, mask = 1, pinWriteMask = 0;
-
- if (port < TOTAL_PORTS) {
- // create a mask of the pins on this port that are writable.
- lastPin = port * 8 + 8;
- if (lastPin > TOTAL_PINS) lastPin = TOTAL_PINS;
- for (pin = port * 8; pin < lastPin; pin++) {
- // do not disturb non-digital pins (eg, Rx & Tx)
- if (IS_PIN_DIGITAL(pin)) {
- // only write to OUTPUT and INPUT (enables pullup)
- // do not touch pins in PWM, ANALOG, SERVO or other modes
- if (pinConfig[pin] == OUTPUT || pinConfig[pin] == INPUT) {
- pinWriteMask |= mask;
- pinState[pin] = ((byte)value & mask) ? 1 : 0;
- }
- }
- mask = mask << 1;
- }
- writePort(port, (byte)value, pinWriteMask);
- }
-}
-
-
-// -----------------------------------------------------------------------------
-/* sets bits in a bit array (int) to toggle the reporting of the analogIns
- */
-//void FirmataClass::setAnalogPinReporting(byte pin, byte state) {
-//}
-void reportAnalogCallback(byte analogPin, int value)
-{
- if (analogPin < TOTAL_ANALOG_PINS) {
- if (value == 0) {
- analogInputsToReport = analogInputsToReport &~ (1 << analogPin);
- } else {
- analogInputsToReport = analogInputsToReport | (1 << analogPin);
- }
- }
- // TODO: save status to EEPROM here, if changed
-}
-
-void reportDigitalCallback(byte port, int value)
-{
- if (port < TOTAL_PORTS) {
- reportPINs[port] = (byte)value;
- }
- // do not disable analog reporting on these 8 pins, to allow some
- // pins used for digital, others analog. Instead, allow both types
- // of reporting to be enabled, but check if the pin is configured
- // as analog when sampling the analog inputs. Likewise, while
- // scanning digital pins, portConfigInputs will mask off values from any
- // pins configured as analog
-}
-
-/*==============================================================================
- * SYSEX-BASED commands
- *============================================================================*/
-
-void sysexCallback(byte command, byte argc, byte *argv)
-{
- byte mode;
- byte slaveAddress;
- byte slaveRegister;
- byte data;
- unsigned int delayTime;
-
- switch (command) {
- case I2C_REQUEST:
- mode = argv[1] & I2C_READ_WRITE_MODE_MASK;
- if (argv[1] & I2C_10BIT_ADDRESS_MODE_MASK) {
- Firmata.sendString("10-bit addressing mode is not yet supported");
- return;
- }
- else {
- slaveAddress = argv[0];
- }
-
- switch (mode) {
- case I2C_WRITE:
- Wire.beginTransmission(slaveAddress);
- for (byte i = 2; i < argc; i += 2) {
- data = argv[i] + (argv[i + 1] << 7);
-#if ARDUINO >= 100
- Wire.write(data);
-#else
- Wire.send(data);
-#endif
- }
- Wire.endTransmission();
- delayMicroseconds(70);
- break;
- case I2C_READ:
- if (argc == 6) {
- // a slave register is specified
- slaveRegister = argv[2] + (argv[3] << 7);
- data = argv[4] + (argv[5] << 7); // bytes to read
- readAndReportData(slaveAddress, (int)slaveRegister, data);
- }
- else {
- // a slave register is NOT specified
- data = argv[2] + (argv[3] << 7); // bytes to read
- readAndReportData(slaveAddress, (int)REGISTER_NOT_SPECIFIED, data);
- }
- break;
- case I2C_READ_CONTINUOUSLY:
- if ((queryIndex + 1) >= MAX_QUERIES) {
- // too many queries, just ignore
- Firmata.sendString("too many queries");
- break;
- }
- queryIndex++;
- query[queryIndex].addr = slaveAddress;
- query[queryIndex].reg = argv[2] + (argv[3] << 7);
- query[queryIndex].bytes = argv[4] + (argv[5] << 7);
- break;
- case I2C_STOP_READING:
- byte queryIndexToSkip;
- // if read continuous mode is enabled for only 1 i2c device, disable
- // read continuous reporting for that device
- if (queryIndex <= 0) {
- queryIndex = -1;
- } else {
- // if read continuous mode is enabled for multiple devices,
- // determine which device to stop reading and remove it's data from
- // the array, shifiting other array data to fill the space
- for (byte i = 0; i < queryIndex + 1; i++) {
- if (query[i].addr = slaveAddress) {
- queryIndexToSkip = i;
- break;
- }
- }
-
- for (byte i = queryIndexToSkip; i < queryIndex + 1; i++) {
- if (i < MAX_QUERIES) {
- query[i].addr = query[i + 1].addr;
- query[i].reg = query[i + 1].addr;
- query[i].bytes = query[i + 1].bytes;
- }
- }
- queryIndex--;
- }
- break;
- default:
- break;
- }
- break;
- case I2C_CONFIG:
- delayTime = (argv[0] + (argv[1] << 7));
-
- if (delayTime > 0) {
- i2cReadDelayTime = delayTime;
- }
-
- if (!isI2CEnabled) {
- enableI2CPins();
- }
-
- break;
- case SERVO_CONFIG:
- if (argc > 4) {
- // these vars are here for clarity, they'll optimized away by the compiler
- byte pin = argv[0];
- int minPulse = argv[1] + (argv[2] << 7);
- int maxPulse = argv[3] + (argv[4] << 7);
-
- if (IS_PIN_SERVO(pin)) {
- if (servos[PIN_TO_SERVO(pin)].attached())
- servos[PIN_TO_SERVO(pin)].detach();
- servos[PIN_TO_SERVO(pin)].attach(PIN_TO_DIGITAL(pin), minPulse, maxPulse);
- setPinModeCallback(pin, SERVO);
- }
- }
- break;
- case SAMPLING_INTERVAL:
- if (argc > 1) {
- samplingInterval = argv[0] + (argv[1] << 7);
- if (samplingInterval < MINIMUM_SAMPLING_INTERVAL) {
- samplingInterval = MINIMUM_SAMPLING_INTERVAL;
- }
- } else {
- //Firmata.sendString("Not enough data");
- }
- break;
- case EXTENDED_ANALOG:
- if (argc > 1) {
- int val = argv[1];
- if (argc > 2) val |= (argv[2] << 7);
- if (argc > 3) val |= (argv[3] << 14);
- analogWriteCallback(argv[0], val);
- }
- break;
- case CAPABILITY_QUERY:
- Firmata.write(START_SYSEX);
- Firmata.write(CAPABILITY_RESPONSE);
- for (byte pin = 0; pin < TOTAL_PINS; pin++) {
- if (IS_PIN_DIGITAL(pin)) {
- Firmata.write((byte)INPUT);
- Firmata.write(1);
- Firmata.write((byte)OUTPUT);
- Firmata.write(1);
- }
- if (IS_PIN_ANALOG(pin)) {
- Firmata.write(ANALOG);
- Firmata.write(10);
- }
- if (IS_PIN_PWM(pin)) {
- Firmata.write(PWM);
- Firmata.write(8);
- }
- if (IS_PIN_SERVO(pin)) {
- Firmata.write(SERVO);
- Firmata.write(14);
- }
- if (IS_PIN_I2C(pin)) {
- Firmata.write(I2C);
- Firmata.write(1); // to do: determine appropriate value
- }
- Firmata.write(127);
- }
- Firmata.write(END_SYSEX);
- break;
- case PIN_STATE_QUERY:
- if (argc > 0) {
- byte pin = argv[0];
- Firmata.write(START_SYSEX);
- Firmata.write(PIN_STATE_RESPONSE);
- Firmata.write(pin);
- if (pin < TOTAL_PINS) {
- Firmata.write((byte)pinConfig[pin]);
- Firmata.write((byte)pinState[pin] & 0x7F);
- if (pinState[pin] & 0xFF80) Firmata.write((byte)(pinState[pin] >> 7) & 0x7F);
- if (pinState[pin] & 0xC000) Firmata.write((byte)(pinState[pin] >> 14) & 0x7F);
- }
- Firmata.write(END_SYSEX);
- }
- break;
- case ANALOG_MAPPING_QUERY:
- Firmata.write(START_SYSEX);
- Firmata.write(ANALOG_MAPPING_RESPONSE);
- for (byte pin = 0; pin < TOTAL_PINS; pin++) {
- Firmata.write(IS_PIN_ANALOG(pin) ? PIN_TO_ANALOG(pin) : 127);
- }
- Firmata.write(END_SYSEX);
- break;
- }
-}
-
-void enableI2CPins()
-{
- byte i;
- // is there a faster way to do this? would probaby require importing
- // Arduino.h to get SCL and SDA pins
- for (i = 0; i < TOTAL_PINS; i++) {
- if (IS_PIN_I2C(i)) {
- // mark pins as i2c so they are ignore in non i2c data requests
- setPinModeCallback(i, I2C);
- }
- }
-
- isI2CEnabled = true;
-
- // is there enough time before the first I2C request to call this here?
- Wire.begin();
-}
-
-/* disable the i2c pins so they can be used for other functions */
-void disableI2CPins() {
- isI2CEnabled = false;
- // disable read continuous mode for all devices
- queryIndex = -1;
- // uncomment the following if or when the end() method is added to Wire library
- // Wire.end();
-}
-
-/*==============================================================================
- * SETUP()
- *============================================================================*/
-
-void systemResetCallback()
-{
- // initialize a defalt state
- // TODO: option to load config from EEPROM instead of default
- if (isI2CEnabled) {
- disableI2CPins();
- }
- for (byte i = 0; i < TOTAL_PORTS; i++) {
- reportPINs[i] = false; // by default, reporting off
- portConfigInputs[i] = 0; // until activated
- previousPINs[i] = 0;
- }
- // pins with analog capability default to analog input
- // otherwise, pins default to digital output
- for (byte i = 0; i < TOTAL_PINS; i++) {
- if (IS_PIN_ANALOG(i)) {
- // turns off pullup, configures everything
- setPinModeCallback(i, ANALOG);
- } else {
- // sets the output to 0, configures portConfigInputs
- setPinModeCallback(i, OUTPUT);
- }
- }
- // by default, do not report any analog inputs
- analogInputsToReport = 0;
-
- /* send digital inputs to set the initial state on the host computer,
- * since once in the loop(), this firmware will only send on change */
- /*
- TODO: this can never execute, since no pins default to digital input
- but it will be needed when/if we support EEPROM stored config
- for (byte i=0; i < TOTAL_PORTS; i++) {
- outputPort(i, readPort(i, portConfigInputs[i]), true);
- }
- */
-}
-
-void setup()
-{
- Firmata.setFirmwareVersion(FIRMATA_MAJOR_VERSION, FIRMATA_MINOR_VERSION);
-
- Firmata.attach(ANALOG_MESSAGE, analogWriteCallback);
- Firmata.attach(DIGITAL_MESSAGE, digitalWriteCallback);
- Firmata.attach(REPORT_ANALOG, reportAnalogCallback);
- Firmata.attach(REPORT_DIGITAL, reportDigitalCallback);
- Firmata.attach(SET_PIN_MODE, setPinModeCallback);
- Firmata.attach(START_SYSEX, sysexCallback);
- Firmata.attach(SYSTEM_RESET, systemResetCallback);
-
- Firmata.begin(57600);
- systemResetCallback(); // reset to default config
-}
-
-/*==============================================================================
- * LOOP()
- *============================================================================*/
-void loop()
-{
- byte pin, analogPin;
-
- /* DIGITALREAD - as fast as possible, check for changes and output them to the
- * FTDI buffer using Serial.print() */
- checkDigitalInputs();
-
- /* SERIALREAD - processing incoming messagse as soon as possible, while still
- * checking digital inputs. */
- while (Firmata.available())
- Firmata.processInput();
-
- /* SEND FTDI WRITE BUFFER - make sure that the FTDI buffer doesn't go over
- * 60 bytes. use a timer to sending an event character every 4 ms to
- * trigger the buffer to dump. */
-
- currentMillis = millis();
- if (currentMillis - previousMillis > samplingInterval) {
- previousMillis += samplingInterval;
- /* ANALOGREAD - do all analogReads() at the configured sampling interval */
- for (pin = 0; pin < TOTAL_PINS; pin++) {
- if (IS_PIN_ANALOG(pin) && pinConfig[pin] == ANALOG) {
- analogPin = PIN_TO_ANALOG(pin);
- if (analogInputsToReport & (1 << analogPin)) {
- Firmata.sendAnalog(analogPin, analogRead(analogPin));
- }
- }
- }
- // report i2c data for all device with read continuous mode enabled
- if (queryIndex > -1) {
- for (byte i = 0; i < queryIndex + 1; i++) {
- readAndReportData(query[i].addr, query[i].reg, query[i].bytes);
- }
- }
- }
-}
diff --git a/libraries/Firmata/extras/LICENSE.txt b/libraries/Firmata/extras/LICENSE.txt
deleted file mode 100644
index 77cec6dd1..000000000
--- a/libraries/Firmata/extras/LICENSE.txt
+++ /dev/null
@@ -1,458 +0,0 @@
-
- GNU LESSER GENERAL PUBLIC LICENSE
- Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL. It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
- This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it. You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
- When we speak of free software, we are referring to freedom of use,
-not price. Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
- To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights. These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
- For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you. You must make sure that they, too, receive or can get the source
-code. If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it. And you must show them these terms so they know their rights.
-
- We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
- To protect each distributor, we want to make it very clear that
-there is no warranty for the free library. Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
- Finally, software patents pose a constant threat to the existence of
-any free program. We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder. Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
- Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License. This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License. We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
- When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library. The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom. The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
- We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License. It also provides other free software developers Less
-of an advantage over competing non-free programs. These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries. However, the Lesser license provides advantages in certain
-special circumstances.
-
- For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard. To achieve this, non-free programs must be
-allowed to use the library. A more frequent case is that a free
-library does the same job as widely used non-free libraries. In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
- In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software. For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
- Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
- The precise terms and conditions for copying, distribution and
-modification follow. Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library". The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
- GNU LESSER GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
- A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
- The "Library", below, refers to any such software library or work
-which has been distributed under these terms. A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language. (Hereinafter, translation is
-included without limitation in the term "modification".)
-
- "Source code" for a work means the preferred form of the work for
-making modifications to it. For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
- Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it). Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
- 1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
- You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
- 2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) The modified work must itself be a software library.
-
- b) You must cause the files modified to carry prominent notices
- stating that you changed the files and the date of any change.
-
- c) You must cause the whole of the work to be licensed at no
- charge to all third parties under the terms of this License.
-
- d) If a facility in the modified Library refers to a function or a
- table of data to be supplied by an application program that uses
- the facility, other than as an argument passed when the facility
- is invoked, then you must make a good faith effort to ensure that,
- in the event an application does not supply such function or
- table, the facility still operates, and performs whatever part of
- its purpose remains meaningful.
-
- (For example, a function in a library to compute square roots has
- a purpose that is entirely well-defined independent of the
- application. Therefore, Subsection 2d requires that any
- application-supplied function or table used by this function must
- be optional: if the application does not supply it, the square
- root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library. To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License. (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.) Do not make any other change in
-these notices.
-
- Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
- This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
- 4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
- If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library". Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
- However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library". The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
- When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library. The
-threshold for this to be true is not precisely defined by law.
-
- If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work. (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
- Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
- 6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
- You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License. You must supply a copy of this License. If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License. Also, you must do one
-of these things:
-
- a) Accompany the work with the complete corresponding
- machine-readable source code for the Library including whatever
- changes were used in the work (which must be distributed under
- Sections 1 and 2 above); and, if the work is an executable linked
- with the Library, with the complete machine-readable "work that
- uses the Library", as object code and/or source code, so that the
- user can modify the Library and then relink to produce a modified
- executable containing the modified Library. (It is understood
- that the user who changes the contents of definitions files in the
- Library will not necessarily be able to recompile the application
- to use the modified definitions.)
-
- b) Use a suitable shared library mechanism for linking with the
- Library. A suitable mechanism is one that (1) uses at run time a
- copy of the library already present on the user's computer system,
- rather than copying library functions into the executable, and (2)
- will operate properly with a modified version of the library, if
- the user installs one, as long as the modified version is
- interface-compatible with the version that the work was made with.
-
- c) Accompany the work with a written offer, valid for at
- least three years, to give the same user the materials
- specified in Subsection 6a, above, for a charge no more
- than the cost of performing this distribution.
-
- d) If distribution of the work is made by offering access to copy
- from a designated place, offer equivalent access to copy the above
- specified materials from the same place.
-
- e) Verify that the user has already received a copy of these
- materials or that you have already sent this user a copy.
-
- For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it. However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
- It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system. Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
- 7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
- a) Accompany the combined library with a copy of the same work
- based on the Library, uncombined with any other library
- facilities. This must be distributed under the terms of the
- Sections above.
-
- b) Give prominent notice with the combined library of the fact
- that part of it is a work based on the Library, and explaining
- where to find the accompanying uncombined form of the same work.
-
- 8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License. Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License. However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
- 9. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Library or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
- 10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
- 11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all. For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded. In such case, this License incorporates the limitation as if
-written in the body of this License.
-
- 13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation. If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
- 14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission. For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this. Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
- NO WARRANTY
-
- 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
- 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
diff --git a/libraries/Firmata/extras/readme.md b/libraries/Firmata/extras/readme.md
deleted file mode 100644
index 498a231b9..000000000
--- a/libraries/Firmata/extras/readme.md
+++ /dev/null
@@ -1,71 +0,0 @@
-#Firmata
-
-Firmata is a protocol for communicating with microcontrollers from software on a host computer. The [protocol](http://firmata.org/wiki/Protocol) can be implemented in firmware on any microcontroller architecture as well as software on any host computer software package. The arduino repository described here is a Firmata library for Arduino and Arduino-compatible devices. See the [firmata wiki](http://firmata.org/wiki/Main_Page) for additional informataion. If you would like to contribute to Firmata, please see the [Contributing](#contributing) section below.
-
-##Usage
-
-There are two main models of usage of Firmata. In one model, the author of the Arduino sketch uses the various methods provided by the Firmata library to selectively send and receive data between the Arduino device and the software running on the host computer. For example, a user can send analog data to the host using ``` Firmata.sendAnalog(analogPin, analogRead(analogPin)) ``` or send data packed in a string using ``` Firmata.sendString(stringToSend) ```. See File -> Examples -> Firmata -> AnalogFirmata & EchoString respectively for examples.
-
-The second and more common model is to load a general purpose sketch called StandardFirmata on the Arduino board and then use the host computer exclusively to interact with the Arduino board. StandardFirmata is located in the Arduino IDE in File -> Examples -> Firmata.
-
-##Firmata Client Libraries
-Most of the time you will be interacting with arduino with a client library on the host computers. Several Firmata client libraries have been implemented in a variety of popular programming languages:
-
-* procesing
- * [https://github.com/firmata/processing]
- * [http://funnel.cc]
-* python
- * [https://github.com/firmata/pyduino]
- * [https://github.com/lupeke/python-firmata]
- * [https://github.com/tino/pyFirmata]
-* perl
- * [https://github.com/ntruchsess/perl-firmata]
- * [https://github.com/rcaputo/rx-firmata]
-* ruby
- * [https://github.com/hardbap/firmata]
- * [https://github.com/PlasticLizard/rufinol]
- * [http://funnel.cc]
-* clojure
- * [https://github.com/nakkaya/clodiuno]
-* javascript
- * [https://github.com/jgautier/firmata]
- * [http://breakoutjs.com]
- * [https://github.com/rwldrn/johnny-five]
-* java
- * [https://github.com/4ntoine/Firmata]
- * [https://github.com/shigeodayo/Javarduino]
-* .NET
- * [http://www.imagitronics.org/projects/firmatanet/]
-* Flash/AS3
- * [http://funnel.cc]
- * [http://code.google.com/p/as3glue/]
-* PHP
- * [https://bitbucket.org/ThomasWeinert/carica-firmata]
-
-Note: The above libraries may support various versions of the Firmata protocol and therefore may not support all features of the latest Firmata spec nor all arduino and arduino-compatible boards. Refer to the respective projects for details.
-
-
-
-##Contributing
-
-If you discover a bug or would like to propose a new feature, please open a new [issue](https://github.com/firmata/arduino/issues?sort=created&state=open). Due to the limited memory of standard Arduino boards we cannot add every requested feature to StandardFirmata. Requests to add new features to StandardFirmata will be evaluated by the Firmata developers. However it is still possible to add new features to other Firmata implementations (Firmata is a protocol whereas StandardFirmata is just one of many possible implementations).
-
-To contribute, fork this respository and create a new topic branch for the bug, feature or other existing issue you are addressing. Submit the pull request against the *dev* branch.
-
-If you would like to contribute but don't have a specific bugfix or new feature to contribute, you can take on an existing issue, see issues labeled "pull-request-encouraged". Add a comment to the issue to express your intent to begin work and/or to get any additional information about the issue.
-
-You must thorougly test your contributed code. In your pull request, describe tests performed to ensure that no existing code is broken and that any changes maintain backwards compatibility with the existing api. Test on multiple Arduino board variants if possible. We hope to enable some form of automated (or at least semi-automated) testing in the future, but for now any tests will need to be executed manually by the contributor and reviewsers.
-
-Maintain the existing code style:
-
-- Indentation is 2 spaces
-- Use spaces instead of tabs
-- Use camel case for both private and public properties and methods
-- Document functions (specific doc style is TBD... for now just be sure to document)
-- Insert first block bracket on line following the function definition:
-
-void someFunction()
-{
- // do something
-}
-
diff --git a/libraries/Firmata/keywords.txt b/libraries/Firmata/keywords.txt
deleted file mode 100644
index ca4522c3d..000000000
--- a/libraries/Firmata/keywords.txt
+++ /dev/null
@@ -1,62 +0,0 @@
-#######################################
-# Syntax Coloring Map For Firmata
-#######################################
-
-#######################################
-# Datatypes (KEYWORD1)
-#######################################
-
-Firmata KEYWORD1 Firmata
-callbackFunction KEYWORD1
-systemResetCallbackFunction KEYWORD1
-stringCallbackFunction KEYWORD1
-sysexCallbackFunction KEYWORD1
-
-#######################################
-# Methods and Functions (KEYWORD2)
-#######################################
-
-begin KEYWORD2
-begin KEYWORD2
-printVersion KEYWORD2
-blinkVersion KEYWORD2
-printFirmwareVersion KEYWORD2
-setFirmwareVersion KEYWORD2
-setFirmwareNameAndVersion KEYWORD2
-available KEYWORD2
-processInput KEYWORD2
-sendAnalog KEYWORD2
-sendDigital KEYWORD2
-sendDigitalPortPair KEYWORD2
-sendDigitalPort KEYWORD2
-sendString KEYWORD2
-sendString KEYWORD2
-sendSysex KEYWORD2
-attach KEYWORD2
-detach KEYWORD2
-flush KEYWORD2
-
-
-#######################################
-# Constants (LITERAL1)
-#######################################
-
-MAX_DATA_BYTES LITERAL1
-
-DIGITAL_MESSAGE LITERAL1
-ANALOG_MESSAGE LITERAL1
-REPORT_ANALOG LITERAL1
-REPORT_DIGITAL LITERAL1
-REPORT_VERSION LITERAL1
-SET_PIN_MODE LITERAL1
-SYSTEM_RESET LITERAL1
-
-START_SYSEX LITERAL1
-END_SYSEX LITERAL1
-
-PWM LITERAL1
-
-TOTAL_ANALOG_PINS LITERAL1
-TOTAL_DIGITAL_PINS LITERAL1
-TOTAL_PORTS LITERAL1
-ANALOG_PORT LITERAL1
diff --git a/libraries/Firmata/library.properties b/libraries/Firmata/library.properties
deleted file mode 100644
index 4b508d57c..000000000
--- a/libraries/Firmata/library.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-name=Firmata
-version=2.3.8
-author=Firmata Developers
-maintainer=Firmata Developers
-sentence=Enables the communication with computer apps using a standard serial protocol. For all Arduino boards.
-paragraph=The Firmata library implements the Firmata protocol for communicating with software on the host computer. This allows you to write custom firmware without having to create your own protocol and objects for the programming environment that you are using.
-category=Device Control
-url=http://firmata.org
-architectures=*
diff --git a/libraries/Firmata/src/Boards.h b/libraries/Firmata/src/Boards.h
deleted file mode 100644
index 67cae11a8..000000000
--- a/libraries/Firmata/src/Boards.h
+++ /dev/null
@@ -1,425 +0,0 @@
-/* Boards.h - Hardware Abstraction Layer for Firmata library */
-
-#ifndef Firmata_Boards_h
-#define Firmata_Boards_h
-
-#include
-
-#if defined(ARDUINO) && ARDUINO >= 100
-#include "Arduino.h" // for digitalRead, digitalWrite, etc
-#else
-#include "WProgram.h"
-#endif
-
-// Normally Servo.h must be included before Firmata.h (which then includes
-// this file). If Servo.h wasn't included, this allows the code to still
-// compile, but without support for any Servos. Hopefully that's what the
-// user intended by not including Servo.h
-#ifndef MAX_SERVOS
-#define MAX_SERVOS 0
-#endif
-
-/*
- Firmata Hardware Abstraction Layer
-
-Firmata is built on top of the hardware abstraction functions of Arduino,
-specifically digitalWrite, digitalRead, analogWrite, analogRead, and
-pinMode. While these functions offer simple integer pin numbers, Firmata
-needs more information than is provided by Arduino. This file provides
-all other hardware specific details. To make Firmata support a new board,
-only this file should require editing.
-
-The key concept is every "pin" implemented by Firmata may be mapped to
-any pin as implemented by Arduino. Usually a simple 1-to-1 mapping is
-best, but such mapping should not be assumed. This hardware abstraction
-layer allows Firmata to implement any number of pins which map onto the
-Arduino implemented pins in almost any arbitrary way.
-
-
-General Constants:
-
-These constants provide basic information Firmata requires.
-
-TOTAL_PINS: The total number of pins Firmata implemented by Firmata.
- Usually this will match the number of pins the Arduino functions
- implement, including any pins pins capable of analog or digital.
- However, Firmata may implement any number of pins. For example,
- on Arduino Mini with 8 analog inputs, 6 of these may be used
- for digital functions, and 2 are analog only. On such boards,
- Firmata can implement more pins than Arduino's pinMode()
- function, in order to accommodate those special pins. The
- Firmata protocol supports a maximum of 128 pins, so this
- constant must not exceed 128.
-
-TOTAL_ANALOG_PINS: The total number of analog input pins implemented.
- The Firmata protocol allows up to 16 analog inputs, accessed
- using offsets 0 to 15. Because Firmata presents the analog
- inputs using different offsets than the actual pin numbers
- (a legacy of Arduino's analogRead function, and the way the
- analog input capable pins are physically labeled on all
- Arduino boards), the total number of analog input signals
- must be specified. 16 is the maximum.
-
-VERSION_BLINK_PIN: When Firmata starts up, it will blink the version
- number. This constant is the Arduino pin number where a
- LED is connected.
-
-
-Pin Mapping Macros:
-
-These macros provide the mapping between pins as implemented by
-Firmata protocol and the actual pin numbers used by the Arduino
-functions. Even though such mappings are often simple, pin
-numbers received by Firmata protocol should always be used as
-input to these macros, and the result of the macro should be
-used with with any Arduino function.
-
-When Firmata is extended to support a new pin mode or feature,
-a pair of macros should be added and used for all hardware
-access. For simple 1:1 mapping, these macros add no actual
-overhead, yet their consistent use allows source code which
-uses them consistently to be easily adapted to all other boards
-with different requirements.
-
-IS_PIN_XXXX(pin): The IS_PIN macros resolve to true or non-zero
- if a pin as implemented by Firmata corresponds to a pin
- that actually implements the named feature.
-
-PIN_TO_XXXX(pin): The PIN_TO macros translate pin numbers as
- implemented by Firmata to the pin numbers needed as inputs
- to the Arduino functions. The corresponding IS_PIN macro
- should always be tested before using a PIN_TO macro, so
- these macros only need to handle valid Firmata pin
- numbers for the named feature.
-
-
-Port Access Inline Funtions:
-
-For efficiency, Firmata protocol provides access to digital
-input and output pins grouped by 8 bit ports. When these
-groups of 8 correspond to actual 8 bit ports as implemented
-by the hardware, these inline functions can provide high
-speed direct port access. Otherwise, a default implementation
-using 8 calls to digitalWrite or digitalRead is used.
-
-When porting Firmata to a new board, it is recommended to
-use the default functions first and focus only on the constants
-and macros above. When those are working, if optimized port
-access is desired, these inline functions may be extended.
-The recommended approach defines a symbol indicating which
-optimization to use, and then conditional complication is
-used within these functions.
-
-readPort(port, bitmask): Read an 8 bit port, returning the value.
- port: The port number, Firmata pins port*8 to port*8+7
- bitmask: The actual pins to read, indicated by 1 bits.
-
-writePort(port, value, bitmask): Write an 8 bit port.
- port: The port number, Firmata pins port*8 to port*8+7
- value: The 8 bit value to write
- bitmask: The actual pins to write, indicated by 1 bits.
-*/
-
-/*==============================================================================
- * Board Specific Configuration
- *============================================================================*/
-
-#ifndef digitalPinHasPWM
-#define digitalPinHasPWM(p) IS_PIN_DIGITAL(p)
-#endif
-
-// Arduino Duemilanove, Diecimila, and NG
-#if defined(__AVR_ATmega168__) || defined(__AVR_ATmega328P__)
-#if defined(NUM_ANALOG_INPUTS) && NUM_ANALOG_INPUTS == 6
-#define TOTAL_ANALOG_PINS 6
-#define TOTAL_PINS 20 // 14 digital + 6 analog
-#else
-#define TOTAL_ANALOG_PINS 8
-#define TOTAL_PINS 22 // 14 digital + 8 analog
-#endif
-#define VERSION_BLINK_PIN 13
-#define IS_PIN_DIGITAL(p) ((p) >= 2 && (p) <= 19)
-#define IS_PIN_ANALOG(p) ((p) >= 14 && (p) < 14 + TOTAL_ANALOG_PINS)
-#define IS_PIN_PWM(p) digitalPinHasPWM(p)
-#define IS_PIN_SERVO(p) (IS_PIN_DIGITAL(p) && (p) - 2 < MAX_SERVOS)
-#define IS_PIN_I2C(p) ((p) == 18 || (p) == 19)
-#define IS_PIN_SPI(p) ((p) == SS || (p) == MOSI || (p) == MISO || (p) == SCK)
-#define PIN_TO_DIGITAL(p) (p)
-#define PIN_TO_ANALOG(p) ((p) - 14)
-#define PIN_TO_PWM(p) PIN_TO_DIGITAL(p)
-#define PIN_TO_SERVO(p) ((p) - 2)
-#define ARDUINO_PINOUT_OPTIMIZE 1
-
-
-// Wiring (and board)
-#elif defined(WIRING)
-#define VERSION_BLINK_PIN WLED
-#define IS_PIN_DIGITAL(p) ((p) >= 0 && (p) < TOTAL_PINS)
-#define IS_PIN_ANALOG(p) ((p) >= FIRST_ANALOG_PIN && (p) < (FIRST_ANALOG_PIN+TOTAL_ANALOG_PINS))
-#define IS_PIN_PWM(p) digitalPinHasPWM(p)
-#define IS_PIN_SERVO(p) ((p) >= 0 && (p) < MAX_SERVOS)
-#define IS_PIN_I2C(p) ((p) == SDA || (p) == SCL)
-#define IS_PIN_SPI(p) ((p) == SS || (p) == MOSI || (p) == MISO || (p) == SCK)
-#define PIN_TO_DIGITAL(p) (p)
-#define PIN_TO_ANALOG(p) ((p) - FIRST_ANALOG_PIN)
-#define PIN_TO_PWM(p) PIN_TO_DIGITAL(p)
-#define PIN_TO_SERVO(p) (p)
-
-
-// old Arduinos
-#elif defined(__AVR_ATmega8__)
-#define TOTAL_ANALOG_PINS 6
-#define TOTAL_PINS 20 // 14 digital + 6 analog
-#define VERSION_BLINK_PIN 13
-#define IS_PIN_DIGITAL(p) ((p) >= 2 && (p) <= 19)
-#define IS_PIN_ANALOG(p) ((p) >= 14 && (p) <= 19)
-#define IS_PIN_PWM(p) digitalPinHasPWM(p)
-#define IS_PIN_SERVO(p) (IS_PIN_DIGITAL(p) && (p) - 2 < MAX_SERVOS)
-#define IS_PIN_I2C(p) ((p) == 18 || (p) == 19)
-#define PIN_TO_DIGITAL(p) (p)
-#define PIN_TO_ANALOG(p) ((p) - 14)
-#define PIN_TO_PWM(p) PIN_TO_DIGITAL(p)
-#define PIN_TO_SERVO(p) ((p) - 2)
-#define ARDUINO_PINOUT_OPTIMIZE 1
-
-
-// Arduino Mega
-#elif defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
-#define TOTAL_ANALOG_PINS 16
-#define TOTAL_PINS 70 // 54 digital + 16 analog
-#define VERSION_BLINK_PIN 13
-#define IS_PIN_DIGITAL(p) ((p) >= 2 && (p) < TOTAL_PINS)
-#define IS_PIN_ANALOG(p) ((p) >= 54 && (p) < TOTAL_PINS)
-#define IS_PIN_PWM(p) digitalPinHasPWM(p)
-#define IS_PIN_SERVO(p) ((p) >= 2 && (p) - 2 < MAX_SERVOS)
-#define IS_PIN_I2C(p) ((p) == 20 || (p) == 21)
-#define IS_PIN_SPI(p) ((p) == SS || (p) == MOSI || (p) == MISO || (p) == SCK)
-#define PIN_TO_DIGITAL(p) (p)
-#define PIN_TO_ANALOG(p) ((p) - 54)
-#define PIN_TO_PWM(p) PIN_TO_DIGITAL(p)
-#define PIN_TO_SERVO(p) ((p) - 2)
-
-
-// Arduino DUE
-#elif defined(__SAM3X8E__)
-#define TOTAL_ANALOG_PINS 12
-#define TOTAL_PINS 66 // 54 digital + 12 analog
-#define VERSION_BLINK_PIN 13
-#define IS_PIN_DIGITAL(p) ((p) >= 2 && (p) < TOTAL_PINS)
-#define IS_PIN_ANALOG(p) ((p) >= 54 && (p) < TOTAL_PINS)
-#define IS_PIN_PWM(p) digitalPinHasPWM(p)
-#define IS_PIN_SERVO(p) ((p) >= 2 && (p) - 2 < MAX_SERVOS)
-#define IS_PIN_I2C(p) ((p) == 20 || (p) == 21) // 70 71
-#define PIN_TO_DIGITAL(p) (p)
-#define PIN_TO_ANALOG(p) ((p) - 54)
-#define PIN_TO_PWM(p) PIN_TO_DIGITAL(p)
-#define PIN_TO_SERVO(p) ((p) - 2)
-
-
-// Teensy 1.0
-#elif defined(__AVR_AT90USB162__)
-#define TOTAL_ANALOG_PINS 0
-#define TOTAL_PINS 21 // 21 digital + no analog
-#define VERSION_BLINK_PIN 6
-#define IS_PIN_DIGITAL(p) ((p) >= 0 && (p) < TOTAL_PINS)
-#define IS_PIN_ANALOG(p) (0)
-#define IS_PIN_PWM(p) digitalPinHasPWM(p)
-#define IS_PIN_SERVO(p) ((p) >= 0 && (p) < MAX_SERVOS)
-#define IS_PIN_I2C(p) (0)
-#define IS_PIN_SPI(p) ((p) == SS || (p) == MOSI || (p) == MISO || (p) == SCK)
-#define PIN_TO_DIGITAL(p) (p)
-#define PIN_TO_ANALOG(p) (0)
-#define PIN_TO_PWM(p) PIN_TO_DIGITAL(p)
-#define PIN_TO_SERVO(p) (p)
-
-
-// Teensy 2.0
-#elif defined(__AVR_ATmega32U4__) && defined(CORE_TEENSY)
-#define TOTAL_ANALOG_PINS 12
-#define TOTAL_PINS 25 // 11 digital + 12 analog
-#define VERSION_BLINK_PIN 11
-#define IS_PIN_DIGITAL(p) ((p) >= 0 && (p) < TOTAL_PINS)
-#define IS_PIN_ANALOG(p) ((p) >= 11 && (p) <= 22)
-#define IS_PIN_PWM(p) digitalPinHasPWM(p)
-#define IS_PIN_SERVO(p) ((p) >= 0 && (p) < MAX_SERVOS)
-#define IS_PIN_I2C(p) ((p) == 5 || (p) == 6)
-#define IS_PIN_SPI(p) ((p) == SS || (p) == MOSI || (p) == MISO || (p) == SCK)
-#define PIN_TO_DIGITAL(p) (p)
-#define PIN_TO_ANALOG(p) (((p)<22)?21-(p):11)
-#define PIN_TO_PWM(p) PIN_TO_DIGITAL(p)
-#define PIN_TO_SERVO(p) (p)
-
-
-// Teensy 3.0
-#elif defined(__MK20DX128__)
-#define TOTAL_ANALOG_PINS 14
-#define TOTAL_PINS 38 // 24 digital + 10 analog-digital + 4 analog
-#define VERSION_BLINK_PIN 13
-#define IS_PIN_DIGITAL(p) ((p) >= 0 && (p) <= 34)
-#define IS_PIN_ANALOG(p) (((p) >= 14 && (p) <= 23) || ((p) >= 34 && (p) <= 38))
-#define IS_PIN_PWM(p) digitalPinHasPWM(p)
-#define IS_PIN_SERVO(p) ((p) >= 0 && (p) < MAX_SERVOS)
-#define IS_PIN_I2C(p) ((p) == 18 || (p) == 19)
-#define PIN_TO_DIGITAL(p) (p)
-#define PIN_TO_ANALOG(p) (((p)<=23)?(p)-14:(p)-24)
-#define PIN_TO_PWM(p) PIN_TO_DIGITAL(p)
-#define PIN_TO_SERVO(p) (p)
-
-
-// Teensy++ 1.0 and 2.0
-#elif defined(__AVR_AT90USB646__) || defined(__AVR_AT90USB1286__)
-#define TOTAL_ANALOG_PINS 8
-#define TOTAL_PINS 46 // 38 digital + 8 analog
-#define VERSION_BLINK_PIN 6
-#define IS_PIN_DIGITAL(p) ((p) >= 0 && (p) < TOTAL_PINS)
-#define IS_PIN_ANALOG(p) ((p) >= 38 && (p) < TOTAL_PINS)
-#define IS_PIN_PWM(p) digitalPinHasPWM(p)
-#define IS_PIN_SERVO(p) ((p) >= 0 && (p) < MAX_SERVOS)
-#define IS_PIN_I2C(p) ((p) == 0 || (p) == 1)
-#define IS_PIN_SPI(p) ((p) == SS || (p) == MOSI || (p) == MISO || (p) == SCK)
-#define PIN_TO_DIGITAL(p) (p)
-#define PIN_TO_ANALOG(p) ((p) - 38)
-#define PIN_TO_PWM(p) PIN_TO_DIGITAL(p)
-#define PIN_TO_SERVO(p) (p)
-
-
-// Leonardo
-#elif defined(__AVR_ATmega32U4__)
-#define TOTAL_ANALOG_PINS 12
-#define TOTAL_PINS 30 // 14 digital + 12 analog + 4 SPI (D14-D17 on ISP header)
-#define VERSION_BLINK_PIN 13
-#define IS_PIN_DIGITAL(p) ((p) >= 0 && (p) < TOTAL_PINS)
-#define IS_PIN_ANALOG(p) ((p) >= 18 && (p) < TOTAL_PINS)
-#define IS_PIN_PWM(p) ((p) == 3 || (p) == 5 || (p) == 6 || (p) == 9 || (p) == 10 || (p) == 11 || (p) == 13)
-#define IS_PIN_SERVO(p) ((p) >= 0 && (p) < MAX_SERVOS)
-#define IS_PIN_I2C(p) ((p) == 2 || (p) == 3)
-#define IS_PIN_SPI(p) ((p) == SS || (p) == MOSI || (p) == MISO || (p) == SCK)
-#define PIN_TO_DIGITAL(p) (p)
-#define PIN_TO_ANALOG(p) (p) - 18
-#define PIN_TO_PWM(p) PIN_TO_DIGITAL(p)
-#define PIN_TO_SERVO(p) (p)
-
-
-// Sanguino
-#elif defined(__AVR_ATmega644P__) || defined(__AVR_ATmega644__)
-#define TOTAL_ANALOG_PINS 8
-#define TOTAL_PINS 32 // 24 digital + 8 analog
-#define VERSION_BLINK_PIN 0
-#define IS_PIN_DIGITAL(p) ((p) >= 2 && (p) < TOTAL_PINS)
-#define IS_PIN_ANALOG(p) ((p) >= 24 && (p) < TOTAL_PINS)
-#define IS_PIN_PWM(p) digitalPinHasPWM(p)
-#define IS_PIN_SERVO(p) ((p) >= 0 && (p) < MAX_SERVOS)
-#define IS_PIN_I2C(p) ((p) == 16 || (p) == 17)
-#define PIN_TO_DIGITAL(p) (p)
-#define PIN_TO_ANALOG(p) ((p) - 24)
-#define PIN_TO_PWM(p) PIN_TO_DIGITAL(p)
-#define PIN_TO_SERVO(p) ((p) - 2)
-
-
-// Illuminato
-#elif defined(__AVR_ATmega645__)
-#define TOTAL_ANALOG_PINS 6
-#define TOTAL_PINS 42 // 36 digital + 6 analog
-#define VERSION_BLINK_PIN 13
-#define IS_PIN_DIGITAL(p) ((p) >= 2 && (p) < TOTAL_PINS)
-#define IS_PIN_ANALOG(p) ((p) >= 36 && (p) < TOTAL_PINS)
-#define IS_PIN_PWM(p) digitalPinHasPWM(p)
-#define IS_PIN_SERVO(p) ((p) >= 0 && (p) < MAX_SERVOS)
-#define IS_PIN_I2C(p) ((p) == 4 || (p) == 5)
-#define PIN_TO_DIGITAL(p) (p)
-#define PIN_TO_ANALOG(p) ((p) - 36)
-#define PIN_TO_PWM(p) PIN_TO_DIGITAL(p)
-#define PIN_TO_SERVO(p) ((p) - 2)
-
-
-// anything else
-#else
-#error "Please edit Boards.h with a hardware abstraction for this board"
-#endif
-
-// as long this is not defined for all boards:
-#ifndef IS_PIN_SPI(p)
-#define IS_PIN_SPI(p) 0
-#endif
-
-/*==============================================================================
- * readPort() - Read an 8 bit port
- *============================================================================*/
-
-static inline unsigned char readPort(byte, byte) __attribute__((always_inline, unused));
-static inline unsigned char readPort(byte port, byte bitmask)
-{
-#if defined(ARDUINO_PINOUT_OPTIMIZE)
- if (port == 0) return (PIND & 0xFC) & bitmask; // ignore Rx/Tx 0/1
- if (port == 1) return ((PINB & 0x3F) | ((PINC & 0x03) << 6)) & bitmask;
- if (port == 2) return ((PINC & 0x3C) >> 2) & bitmask;
- return 0;
-#else
- unsigned char out=0, pin=port*8;
- if (IS_PIN_DIGITAL(pin+0) && (bitmask & 0x01) && digitalRead(PIN_TO_DIGITAL(pin+0))) out |= 0x01;
- if (IS_PIN_DIGITAL(pin+1) && (bitmask & 0x02) && digitalRead(PIN_TO_DIGITAL(pin+1))) out |= 0x02;
- if (IS_PIN_DIGITAL(pin+2) && (bitmask & 0x04) && digitalRead(PIN_TO_DIGITAL(pin+2))) out |= 0x04;
- if (IS_PIN_DIGITAL(pin+3) && (bitmask & 0x08) && digitalRead(PIN_TO_DIGITAL(pin+3))) out |= 0x08;
- if (IS_PIN_DIGITAL(pin+4) && (bitmask & 0x10) && digitalRead(PIN_TO_DIGITAL(pin+4))) out |= 0x10;
- if (IS_PIN_DIGITAL(pin+5) && (bitmask & 0x20) && digitalRead(PIN_TO_DIGITAL(pin+5))) out |= 0x20;
- if (IS_PIN_DIGITAL(pin+6) && (bitmask & 0x40) && digitalRead(PIN_TO_DIGITAL(pin+6))) out |= 0x40;
- if (IS_PIN_DIGITAL(pin+7) && (bitmask & 0x80) && digitalRead(PIN_TO_DIGITAL(pin+7))) out |= 0x80;
- return out;
-#endif
-}
-
-/*==============================================================================
- * writePort() - Write an 8 bit port, only touch pins specified by a bitmask
- *============================================================================*/
-
-static inline unsigned char writePort(byte, byte, byte) __attribute__((always_inline, unused));
-static inline unsigned char writePort(byte port, byte value, byte bitmask)
-{
-#if defined(ARDUINO_PINOUT_OPTIMIZE)
- if (port == 0) {
- bitmask = bitmask & 0xFC; // do not touch Tx & Rx pins
- byte valD = value & bitmask;
- byte maskD = ~bitmask;
- cli();
- PORTD = (PORTD & maskD) | valD;
- sei();
- } else if (port == 1) {
- byte valB = (value & bitmask) & 0x3F;
- byte valC = (value & bitmask) >> 6;
- byte maskB = ~(bitmask & 0x3F);
- byte maskC = ~((bitmask & 0xC0) >> 6);
- cli();
- PORTB = (PORTB & maskB) | valB;
- PORTC = (PORTC & maskC) | valC;
- sei();
- } else if (port == 2) {
- bitmask = bitmask & 0x0F;
- byte valC = (value & bitmask) << 2;
- byte maskC = ~(bitmask << 2);
- cli();
- PORTC = (PORTC & maskC) | valC;
- sei();
- }
-#else
- byte pin=port*8;
- if ((bitmask & 0x01)) digitalWrite(PIN_TO_DIGITAL(pin+0), (value & 0x01));
- if ((bitmask & 0x02)) digitalWrite(PIN_TO_DIGITAL(pin+1), (value & 0x02));
- if ((bitmask & 0x04)) digitalWrite(PIN_TO_DIGITAL(pin+2), (value & 0x04));
- if ((bitmask & 0x08)) digitalWrite(PIN_TO_DIGITAL(pin+3), (value & 0x08));
- if ((bitmask & 0x10)) digitalWrite(PIN_TO_DIGITAL(pin+4), (value & 0x10));
- if ((bitmask & 0x20)) digitalWrite(PIN_TO_DIGITAL(pin+5), (value & 0x20));
- if ((bitmask & 0x40)) digitalWrite(PIN_TO_DIGITAL(pin+6), (value & 0x40));
- if ((bitmask & 0x80)) digitalWrite(PIN_TO_DIGITAL(pin+7), (value & 0x80));
-#endif
-}
-
-
-
-
-#ifndef TOTAL_PORTS
-#define TOTAL_PORTS ((TOTAL_PINS + 7) / 8)
-#endif
-
-
-#endif /* Firmata_Boards_h */
-
diff --git a/libraries/Firmata/src/Firmata.cpp b/libraries/Firmata/src/Firmata.cpp
deleted file mode 100644
index 7dddfd465..000000000
--- a/libraries/Firmata/src/Firmata.cpp
+++ /dev/null
@@ -1,463 +0,0 @@
-/*
- Firmata.cpp - Firmata library
- Copyright (C) 2006-2008 Hans-Christoph Steiner. All rights reserved.
-
- 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.
-
- See file LICENSE.txt for further informations on licensing terms.
-*/
-
-//******************************************************************************
-//* Includes
-//******************************************************************************
-
-#include "Firmata.h"
-#include "HardwareSerial.h"
-
-extern "C" {
-#include
-#include
-}
-
-//******************************************************************************
-//* Support Functions
-//******************************************************************************
-
-void FirmataClass::sendValueAsTwo7bitBytes(int value)
-{
- FirmataSerial->write(value & B01111111); // LSB
- FirmataSerial->write(value >> 7 & B01111111); // MSB
-}
-
-void FirmataClass::startSysex(void)
-{
- FirmataSerial->write(START_SYSEX);
-}
-
-void FirmataClass::endSysex(void)
-{
- FirmataSerial->write(END_SYSEX);
-}
-
-//******************************************************************************
-//* Constructors
-//******************************************************************************
-
-FirmataClass::FirmataClass()
-{
- firmwareVersionCount = 0;
- firmwareVersionVector = 0;
- systemReset();
-}
-
-//******************************************************************************
-//* Public Methods
-//******************************************************************************
-
-/* begin method with default serial bitrate */
-void FirmataClass::begin(void)
-{
- begin(57600);
-}
-
-/* begin method for overriding default serial bitrate */
-void FirmataClass::begin(long speed)
-{
- Serial.begin(speed);
- FirmataSerial = &Serial;
- blinkVersion();
- printVersion();
- printFirmwareVersion();
-}
-
-/* begin method for overriding default stream */
-void FirmataClass::begin(Stream &s)
-{
- FirmataSerial = &s;
- // do not call blinkVersion() here because some hardware such as the
- // Ethernet shield use pin 13
- printVersion();
- printFirmwareVersion();
-}
-
-// output the protocol version message to the serial port
-void FirmataClass::printVersion(void) {
- FirmataSerial->write(REPORT_VERSION);
- FirmataSerial->write(FIRMATA_MAJOR_VERSION);
- FirmataSerial->write(FIRMATA_MINOR_VERSION);
-}
-
-void FirmataClass::blinkVersion(void)
-{
- // flash the pin with the protocol version
- pinMode(VERSION_BLINK_PIN,OUTPUT);
- strobeBlinkPin(FIRMATA_MAJOR_VERSION, 40, 210);
- delay(250);
- strobeBlinkPin(FIRMATA_MINOR_VERSION, 40, 210);
- delay(125);
-}
-
-void FirmataClass::printFirmwareVersion(void)
-{
- byte i;
-
- if(firmwareVersionCount) { // make sure that the name has been set before reporting
- startSysex();
- FirmataSerial->write(REPORT_FIRMWARE);
- FirmataSerial->write(firmwareVersionVector[0]); // major version number
- FirmataSerial->write(firmwareVersionVector[1]); // minor version number
- for(i=2; iavailable();
-}
-
-
-void FirmataClass::processSysexMessage(void)
-{
- switch(storedInputData[0]) { //first byte in buffer is command
- case REPORT_FIRMWARE:
- printFirmwareVersion();
- break;
- case STRING_DATA:
- if(currentStringCallback) {
- byte bufferLength = (sysexBytesRead - 1) / 2;
- char *buffer = (char*)malloc(bufferLength * sizeof(char));
- byte i = 1;
- byte j = 0;
- while(j < bufferLength) {
- buffer[j] = (char)storedInputData[i];
- i++;
- buffer[j] += (char)(storedInputData[i] << 7);
- i++;
- j++;
- }
- (*currentStringCallback)(buffer);
- }
- break;
- default:
- if(currentSysexCallback)
- (*currentSysexCallback)(storedInputData[0], sysexBytesRead - 1, storedInputData + 1);
- }
-}
-
-void FirmataClass::processInput(void)
-{
- int inputData = FirmataSerial->read(); // this is 'int' to handle -1 when no data
- int command;
-
- // TODO make sure it handles -1 properly
-
- if (parsingSysex) {
- if(inputData == END_SYSEX) {
- //stop sysex byte
- parsingSysex = false;
- //fire off handler function
- processSysexMessage();
- } else {
- //normal data byte - add to buffer
- storedInputData[sysexBytesRead] = inputData;
- sysexBytesRead++;
- }
- } else if( (waitForData > 0) && (inputData < 128) ) {
- waitForData--;
- storedInputData[waitForData] = inputData;
- if( (waitForData==0) && executeMultiByteCommand ) { // got the whole message
- switch(executeMultiByteCommand) {
- case ANALOG_MESSAGE:
- if(currentAnalogCallback) {
- (*currentAnalogCallback)(multiByteChannel,
- (storedInputData[0] << 7)
- + storedInputData[1]);
- }
- break;
- case DIGITAL_MESSAGE:
- if(currentDigitalCallback) {
- (*currentDigitalCallback)(multiByteChannel,
- (storedInputData[0] << 7)
- + storedInputData[1]);
- }
- break;
- case SET_PIN_MODE:
- if(currentPinModeCallback)
- (*currentPinModeCallback)(storedInputData[1], storedInputData[0]);
- break;
- case REPORT_ANALOG:
- if(currentReportAnalogCallback)
- (*currentReportAnalogCallback)(multiByteChannel,storedInputData[0]);
- break;
- case REPORT_DIGITAL:
- if(currentReportDigitalCallback)
- (*currentReportDigitalCallback)(multiByteChannel,storedInputData[0]);
- break;
- }
- executeMultiByteCommand = 0;
- }
- } else {
- // remove channel info from command byte if less than 0xF0
- if(inputData < 0xF0) {
- command = inputData & 0xF0;
- multiByteChannel = inputData & 0x0F;
- } else {
- command = inputData;
- // commands in the 0xF* range don't use channel data
- }
- switch (command) {
- case ANALOG_MESSAGE:
- case DIGITAL_MESSAGE:
- case SET_PIN_MODE:
- waitForData = 2; // two data bytes needed
- executeMultiByteCommand = command;
- break;
- case REPORT_ANALOG:
- case REPORT_DIGITAL:
- waitForData = 1; // two data bytes needed
- executeMultiByteCommand = command;
- break;
- case START_SYSEX:
- parsingSysex = true;
- sysexBytesRead = 0;
- break;
- case SYSTEM_RESET:
- systemReset();
- break;
- case REPORT_VERSION:
- Firmata.printVersion();
- break;
- }
- }
-}
-
-//------------------------------------------------------------------------------
-// Serial Send Handling
-
-// send an analog message
-void FirmataClass::sendAnalog(byte pin, int value)
-{
- // pin can only be 0-15, so chop higher bits
- FirmataSerial->write(ANALOG_MESSAGE | (pin & 0xF));
- sendValueAsTwo7bitBytes(value);
-}
-
-// send a single digital pin in a digital message
-void FirmataClass::sendDigital(byte pin, int value)
-{
- /* TODO add single pin digital messages to the protocol, this needs to
- * track the last digital data sent so that it can be sure to change just
- * one bit in the packet. This is complicated by the fact that the
- * numbering of the pins will probably differ on Arduino, Wiring, and
- * other boards. The DIGITAL_MESSAGE sends 14 bits at a time, but it is
- * probably easier to send 8 bit ports for any board with more than 14
- * digital pins.
- */
-
- // TODO: the digital message should not be sent on the serial port every
- // time sendDigital() is called. Instead, it should add it to an int
- // which will be sent on a schedule. If a pin changes more than once
- // before the digital message is sent on the serial port, it should send a
- // digital message for each change.
-
- // if(value == 0)
- // sendDigitalPortPair();
-}
-
-
-// send 14-bits in a single digital message (protocol v1)
-// send an 8-bit port in a single digital message (protocol v2)
-void FirmataClass::sendDigitalPort(byte portNumber, int portData)
-{
- FirmataSerial->write(DIGITAL_MESSAGE | (portNumber & 0xF));
- FirmataSerial->write((byte)portData % 128); // Tx bits 0-6
- FirmataSerial->write(portData >> 7); // Tx bits 7-13
-}
-
-
-void FirmataClass::sendSysex(byte command, byte bytec, byte* bytev)
-{
- byte i;
- startSysex();
- FirmataSerial->write(command);
- for(i=0; iwrite(c);
-}
-
-
-// Internal Actions/////////////////////////////////////////////////////////////
-
-// generic callbacks
-void FirmataClass::attach(byte command, callbackFunction newFunction)
-{
- switch(command) {
- case ANALOG_MESSAGE: currentAnalogCallback = newFunction; break;
- case DIGITAL_MESSAGE: currentDigitalCallback = newFunction; break;
- case REPORT_ANALOG: currentReportAnalogCallback = newFunction; break;
- case REPORT_DIGITAL: currentReportDigitalCallback = newFunction; break;
- case SET_PIN_MODE: currentPinModeCallback = newFunction; break;
- }
-}
-
-void FirmataClass::attach(byte command, systemResetCallbackFunction newFunction)
-{
- switch(command) {
- case SYSTEM_RESET: currentSystemResetCallback = newFunction; break;
- }
-}
-
-void FirmataClass::attach(byte command, stringCallbackFunction newFunction)
-{
- switch(command) {
- case STRING_DATA: currentStringCallback = newFunction; break;
- }
-}
-
-void FirmataClass::attach(byte command, sysexCallbackFunction newFunction)
-{
- currentSysexCallback = newFunction;
-}
-
-void FirmataClass::detach(byte command)
-{
- switch(command) {
- case SYSTEM_RESET: currentSystemResetCallback = NULL; break;
- case STRING_DATA: currentStringCallback = NULL; break;
- case START_SYSEX: currentSysexCallback = NULL; break;
- default:
- attach(command, (callbackFunction)NULL);
- }
-}
-
-// sysex callbacks
-/*
- * this is too complicated for analogReceive, but maybe for Sysex?
- void FirmataClass::attachSysex(sysexFunction newFunction)
- {
- byte i;
- byte tmpCount = analogReceiveFunctionCount;
- analogReceiveFunction* tmpArray = analogReceiveFunctionArray;
- analogReceiveFunctionCount++;
- analogReceiveFunctionArray = (analogReceiveFunction*) calloc(analogReceiveFunctionCount, sizeof(analogReceiveFunction));
- for(i = 0; i < tmpCount; i++) {
- analogReceiveFunctionArray[i] = tmpArray[i];
- }
- analogReceiveFunctionArray[tmpCount] = newFunction;
- free(tmpArray);
- }
-*/
-
-//******************************************************************************
-//* Private Methods
-//******************************************************************************
-
-
-
-// resets the system state upon a SYSTEM_RESET message from the host software
-void FirmataClass::systemReset(void)
-{
- byte i;
-
- waitForData = 0; // this flag says the next serial input will be data
- executeMultiByteCommand = 0; // execute this after getting multi-byte data
- multiByteChannel = 0; // channel data for multiByteCommands
-
- for(i=0; i
-sentence=This library enables calls to Temboo, a platform that connects Arduino boards to 100+ APIs, databases, code utilities and more.
-paragraph=Use this library to connect your Arduino board to Temboo, making it simple to interact with a vast array of web-based resources and services.
-category=Communication
-url=http://www.temboo.com/arduino
-architectures=*
-version=1.1.2
-core-dependencies=arduino (>=1.5.0)
diff --git a/libraries/Temboo/src/Temboo.cpp b/libraries/Temboo/src/Temboo.cpp
deleted file mode 100644
index f4eb85e7f..000000000
--- a/libraries/Temboo/src/Temboo.cpp
+++ /dev/null
@@ -1,406 +0,0 @@
-/*
-###############################################################################
-#
-# Temboo Arduino library
-#
-# Copyright 2015, Temboo Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
-# either express or implied. See the License for the specific
-# language governing permissions and limitations under the License.
-#
-###############################################################################
-*/
-
-
-#if defined (ARDUINO_AVR_YUN) || defined (ARDUINO_AVR_TRE)
-
-///////////////////////////////////////////////////////
-// BEGIN ARDUINO YUN AND TRE SUPPORT
-///////////////////////////////////////////////////////
-
-#include
-
-void TembooChoreo::begin() {
- Process::begin("temboo");
-}
-
-void TembooChoreo::setAccountName(const String& accountName) {
- addParameter("-a" + accountName);
-}
-
-void TembooChoreo::setAppKeyName(const String& appKeyName) {
- addParameter("-u" + appKeyName);
-}
-
-void TembooChoreo::setAppKey(const String& appKey) {
- addParameter("-p" + appKey);
-}
-
-void TembooChoreo::setChoreo(const String& choreo) {
- addParameter("-c" + choreo);
-}
-
-void TembooChoreo::setCredential(const String& credentialName) {
- addParameter("-e" + credentialName);
-}
-
-void TembooChoreo::setSavedInputs(const String& savedInputsName) {
- addParameter("-e" + savedInputsName);
-}
-
-void TembooChoreo::setProfile(const String& profileName) {
- addParameter("-e" + profileName);
-}
-
-void TembooChoreo::addInput(const String& inputName, const String& inputValue) {
- addParameter("-i" + inputName + ":" + inputValue);
-}
-
-void TembooChoreo::addOutputFilter(const String& outputName, const String& filterPath, const String& variableName) {
- addParameter("-o" + outputName + ":" + filterPath + ":" + variableName);
-}
-
-void TembooChoreo::setSettingsFileToWrite(const String& filePath) {
- addParameter("-w" + filePath);
-}
-
-void TembooChoreo::setSettingsFileToRead(const String& filePath) {
- addParameter("-r" + filePath);
-}
-
-
-#else //ARDUINO_AVR_YUN
-
-///////////////////////////////////////////////////////
-// BEGIN ARDUINO NON-YUN SUPPORT
-///////////////////////////////////////////////////////
-
-#include
-#include
-#include
-#include
-#include "utility/TembooGlobal.h"
-#include "utility/TembooSession.h"
-
-static const char HTTP_CODE[] PROGMEM = "HTTP_CODE\x0A\x1F";
-static char HTTP_EOL[] = "\r\n";
-static char HTTP_EOH[] = "\r\n\r\n";
-
-TembooChoreo::TembooChoreo(Client& client) : m_client(client) {
- m_accountName = NULL;
- m_appKeyName = NULL;
- m_appKeyValue = NULL;
- m_path = NULL;
- m_nextChar = NULL;
- m_nextState = END;
-}
-
-void TembooChoreo::setAccountName(const String& accountName) {
- m_accountName = accountName.c_str();
-}
-
-
-void TembooChoreo::setAccountName(const char* accountName) {
- m_accountName = accountName;
-}
-
-
-void TembooChoreo::setAppKeyName(const String& appKeyName) {
- m_appKeyName = appKeyName.c_str();
-}
-
-
-void TembooChoreo::setAppKeyName(const char* appKeyName) {
- m_appKeyName = appKeyName;
-}
-
-
-void TembooChoreo::setAppKey(const String& appKeyValue) {
- m_appKeyValue = appKeyValue.c_str();
-}
-
-
-void TembooChoreo::setAppKey(const char* appKeyValue) {
- m_appKeyValue = appKeyValue;
-}
-
-
-void TembooChoreo::setChoreo(const String& path) {
- m_path = path.c_str();
-}
-
-
-void TembooChoreo::setChoreo(const char* path) {
- m_path = path;
-}
-
-
-void TembooChoreo::setSavedInputs(const String& savedInputsName) {
- m_preset.put(savedInputsName.c_str());
-}
-
-
-void TembooChoreo::setSavedInputs(const char* savedInputsName) {
- m_preset.put(savedInputsName);
-}
-
-
-void TembooChoreo::setCredential(const String& credentialName) {
- m_preset.put(credentialName.c_str());
-}
-
-
-void TembooChoreo::setCredential(const char* credentialName) {
- m_preset.put(credentialName);
-}
-
-void TembooChoreo::setProfile(const String& profileName) {
- m_preset.put(profileName.c_str());
-}
-
-
-void TembooChoreo::setProfile(const char* profileName) {
- m_preset.put(profileName);
-}
-
-
-void TembooChoreo::addInput(const String& inputName, const String& inputValue) {
- m_inputs.put(inputName.c_str(), inputValue.c_str());
-}
-
-
-void TembooChoreo::addInput(const char* inputName, const char* inputValue) {
- m_inputs.put(inputName, inputValue);
-}
-
-
-void TembooChoreo::addInput(const char* inputName, const String& inputValue) {
- m_inputs.put(inputName, inputValue.c_str());
-}
-
-
-void TembooChoreo::addInput(const String& inputName, const char* inputValue) {
- m_inputs.put(inputName.c_str(), inputValue);
-}
-
-
-void TembooChoreo::addOutputFilter(const char* outputName, const char* filterPath, const char* variableName) {
- m_outputs.put(outputName, filterPath, variableName);
-}
-
-
-void TembooChoreo::addOutputFilter(const String& outputName, const char* filterPath, const char* variableName) {
- m_outputs.put(outputName.c_str(), filterPath, variableName);
-}
-
-
-void TembooChoreo::addOutputFilter(const char* outputName, const String& filterPath, const char* variableName) {
- m_outputs.put(outputName, filterPath.c_str(), variableName);
-}
-
-
-void TembooChoreo::addOutputFilter(const String& outputName, const String& filterPath, const char* variableName) {
- m_outputs.put(outputName.c_str(), filterPath.c_str(), variableName);
-}
-
-
-void TembooChoreo::addOutputFilter(const char* outputName, const char* filterPath, const String& variableName) {
- m_outputs.put(outputName, filterPath, variableName.c_str());
-}
-
-
-void TembooChoreo::addOutputFilter(const String& outputName, const char* filterPath, const String& variableName) {
- m_outputs.put(outputName.c_str(), filterPath, variableName.c_str());
-}
-
-
-void TembooChoreo::addOutputFilter(const char* outputName, const String& filterPath, const String& variableName) {
- m_outputs.put(outputName, filterPath.c_str(), variableName.c_str());
-}
-
-
-void TembooChoreo::addOutputFilter(const String& outputName, const String& filterPath, const String& variableName) {
- m_outputs.put(outputName.c_str(), filterPath.c_str(), variableName.c_str());
-}
-
-
-int TembooChoreo::run() {
- return run(INADDR_NONE, 80, TEMBOO_CHOREO_DEFAULT_TIMEOUT_SECS);
-}
-
-int TembooChoreo::run(uint16_t timeoutSecs) {
- return run(INADDR_NONE, 80, timeoutSecs);
-}
-
-int TembooChoreo::run(IPAddress addr, uint16_t port, uint16_t timeoutSecs) {
-
- m_nextChar = NULL;
-
- if (m_accountName == NULL || *m_accountName == '\0') {
- return TEMBOO_ERROR_ACCOUNT_MISSING;
- }
-
- if (m_path == NULL || *m_path == '\0') {
- return TEMBOO_ERROR_CHOREO_MISSING;
- }
-
- if (m_appKeyName == NULL || *m_appKeyName == '\0') {
- return TEMBOO_ERROR_APPKEY_NAME_MISSING;
- }
-
- if (m_appKeyValue == NULL || *m_appKeyValue == '\0') {
- return TEMBOO_ERROR_APPKEY_MISSING;
- }
-
- TembooSession session(m_client, addr, port);
- uint16_t httpCode = 0;
-
- for (int i = 0; i < 2; i++) {
- unsigned long timeoutBeginSecs = session.getTime();
- if (0 != session.executeChoreo(m_accountName, m_appKeyName, m_appKeyValue, m_path, m_inputs, m_outputs, m_preset)) {
- httpCode = 0;
- break;
- }
-
- while(!m_client.available()) {
- if((session.getTime() - timeoutBeginSecs) >= timeoutSecs) {
- TEMBOO_TRACELN("Receive time out");
- m_client.stop();
- return TEMBOO_ERROR_STREAM_TIMEOUT;
- }
- if (!m_client.connected()) {
- TEMBOO_TRACELN("Disconnected");
- return TEMBOO_ERROR_HTTP_ERROR;
- }
- delay(10);
- }
- if (!m_client.findUntil("HTTP/1.", HTTP_EOL)) {
- TEMBOO_TRACELN("No HTTP");
- return TEMBOO_ERROR_HTTP_ERROR;
- }
- //Don't care if the next byte is a '1' or a '0'
- m_client.read();
-
- //Read the HTTP status code
- httpCode = (uint16_t)m_client.parseInt();
-
- // We expect HTTP response codes to be <= 599, but
- // we need to be prepared for anything.
- if (httpCode >= 600) {
- TEMBOO_TRACELN("Invalid HTTP");
- httpCode = 0;
- }
-
- // if we get an auth error AND there was an x-temboo-time header,
- // update the session timeOffset
- if ((httpCode == 401) && (i == 0)) {
- if (m_client.findUntil("x-temboo-time:", HTTP_EOH)) {
- TembooSession::setTime((unsigned long)m_client.parseInt());
- while(m_client.available()) {
- m_client.read();
- }
- m_client.stop();
- }
- } else {
- break;
- }
- }
-
- uint16toa(httpCode, m_httpCodeStr);
- strcat_P(m_httpCodeStr, PSTR("\x0A\x1E"));
- m_nextState = START;
- m_nextChar = HTTP_CODE;
-
- if (httpCode < 200 || httpCode >= 300) {
- return TEMBOO_ERROR_HTTP_ERROR;
- }
-
- if (!m_client.find(HTTP_EOH)) {
- return TEMBOO_ERROR_HTTP_ERROR;
- }
-
- return TEMBOO_ERROR_OK;
-}
-
-void TembooChoreo::close() {
- m_client.stop();
-}
-
-int TembooChoreo::available() {
- // If we're still sending the HTTP response code,
- // report at least one character available.
- if (m_nextChar != NULL) {
- return m_client.available() + 1;
- }
-
- // Otherwise, return however many characters the client has.
- return m_client.available();
-}
-
-
-int TembooChoreo::peek() {
- // If we're still sending the HTTP response code,
- // return the next character in that sequence.
- if (m_nextChar != NULL) {
- return (int)*m_nextChar;
- }
-
- // Otherwise, return whatever is in the client buffer.
- return m_client.peek();
-}
-
-
-int TembooChoreo::read() {
-
- int c = 0;
- switch(m_nextState) {
- case START:
- m_nextChar = HTTP_CODE;
- c = (int)pgm_read_byte(m_nextChar++);
- m_nextState = HTTP_CODE_TAG;
- break;
-
- case HTTP_CODE_TAG:
- c = (int)pgm_read_byte(m_nextChar++);
- if (pgm_read_byte(m_nextChar) == '\0') {
- m_nextState = HTTP_CODE_VALUE;
- m_nextChar = m_httpCodeStr;
- }
- break;
-
- case HTTP_CODE_VALUE:
- c = (int)(*m_nextChar++);
- if (*m_nextChar == '\0') {
- m_nextState = END;
- m_nextChar = NULL;
- }
- break;
-
- default:
- c = m_client.read();
- }
- return c;
-}
-
-
-size_t TembooChoreo::write(uint8_t data) {
- return m_client.write(data);
-}
-
-
-void TembooChoreo::flush() {
- m_nextChar = NULL;
- m_nextState = END;
- m_client.flush();
-}
-
-#endif //ARDUINO_AVR_YUN
diff --git a/libraries/Temboo/src/Temboo.h b/libraries/Temboo/src/Temboo.h
deleted file mode 100644
index 881fe484a..000000000
--- a/libraries/Temboo/src/Temboo.h
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
-###############################################################################
-#
-# Temboo Arduino library
-#
-# Copyright 2015, Temboo Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
-# either express or implied. See the License for the specific
-# language governing permissions and limitations under the License.
-#
-###############################################################################
-*/
-
-#ifndef TEMBOO_H_
-#define TEMBOO_H_
-
-#include
-
-#if defined (ARDUINO_AVR_YUN) || defined (ARDUINO_AVR_TRE)
-///////////////////////////////////////////////////////
-// BEGIN ARDUINO YUN AND TRE SUPPORT
-///////////////////////////////////////////////////////
-
-#include
-
-class TembooChoreo : public Process {
-
- public:
- void begin();
- void setAccountName(const String& accountName);
- void setAppKeyName(const String& appKeyName);
- void setAppKey(const String& appKey);
- void setChoreo(const String& choreo);
- void setCredential(const String& credentialName);
- void setSavedInputs(const String& saveInputsName);
- void setProfile(const String& profileName);
- void addInput(const String& inputName, const String& inputValue);
- void addOutputFilter(const String& filterName, const String& filterPath, const String& variableName);
- void setSettingsFileToWrite(const String& filePath);
- void setSettingsFileToRead(const String& filePath);
-
-};
-
-#else //ARDUINO_AVR_YUN
-
-///////////////////////////////////////////////////////
-// BEGIN ARDUINO NON-YUN SUPPORT
-///////////////////////////////////////////////////////
-
-#include
-#include
-#include
-#include "utility/ChoreoInputSet.h"
-#include "utility/ChoreoOutputSet.h"
-#include "utility/ChoreoPreset.h"
-
-#define TEMBOO_ERROR_OK (0)
-#define TEMBOO_ERROR_ACCOUNT_MISSING (201)
-#define TEMBOO_ERROR_CHOREO_MISSING (203)
-#define TEMBOO_ERROR_APPKEY_NAME_MISSING (205)
-#define TEMBOO_ERROR_APPKEY_MISSING (207)
-#define TEMBOO_ERROR_HTTP_ERROR (223)
-#define TEMBOO_ERROR_STREAM_TIMEOUT (225)
-#define TEMBOO_CHOREO_DEFAULT_TIMEOUT_SECS (901) //15 minutes and 1 second
-
-class TembooChoreo : public Stream {
- public:
-
- // Constructor.
- // client - an instance of an Arduino Client, usually an EthernetClient
- // or a WiFiClient. Used to communicate with Temboo.
- TembooChoreo(Client& client);
-
- // Does nothing. Just for source compatibility with Yun code.
- void begin() {};
-
- // Sets the account name to use when communicating with Temboo.
- // (required)
- void setAccountName(const String& accountName);
- void setAccountName(const char* accountName);
-
- // Sets the application key name to use with choreo execution requests.
- // (required)
- void setAppKeyName(const String& appKeyName);
- void setAppKeyName(const char* appKeyName);
-
- // Sets the application key value to use with choreo execution requests
- // (required)
- void setAppKey(const String& appKey);
- void setAppKey(const char* appKey);
-
- // sets the name of the choreo to be executed.
- // (required)
- void setChoreo(const String& choreoPath);
- void setChoreo(const char* choreoPath);
-
- // sets the name of the saved inputs to use when executing the choreo
- // (optional)
- void setSavedInputs(const String& savedInputsName);
- void setSavedInputs(const char* savedInputsName);
-
- void setCredential(const String& credentialName);
- void setCredential(const char* credentialName);
-
- void setProfile(const String& profileName);
- void setProfile(const char* profileName);
-
- // sets an input to be used when executing a choreo.
- // (optional or required, depending on the choreo being executed.)
- void addInput(const String& inputName, const String& inputValue);
- void addInput(const char* inputName, const char* inputValue);
- void addInput(const char* inputName, const String& inputValue);
- void addInput(const String& inputName, const char* inputValue);
-
- // sets an output filter to be used to process the choreo output
- // (optional)
- void addOutputFilter(const char* filterName, const char* filterPath, const char* variableName);
- void addOutputFilter(const String& filterName, const char* filterPath, const char* variableName);
- void addOutputFilter(const char* filterName, const String& filterPath, const char* variableName);
- void addOutputFilter(const String& filterName, const String& filterPath, const char* variableName);
- void addOutputFilter(const char* filterName, const char* filterPath, const String& variableName);
- void addOutputFilter(const String& filterName, const char* filterPath, const String& variableName);
- void addOutputFilter(const char* filterName, const String& filterPath, const String& variableName);
- void addOutputFilter(const String& filterName, const String& filterPath, const String& variableName);
-
- // run the choreo using the current input info
- int run();
-
- // run the choreo on the Temboo server at the given IP address and port
- // (used only when instructed by Temboo customer support.)
- int run(uint16_t timeoutSecs);
- int run(IPAddress addr, uint16_t port, uint16_t timeoutSecs);
-
- void close();
-
- // Stream interface - see the Arduino library documentation.
- int available();
- int read();
- int peek();
- void flush();
-
- //Print interface - see the Arduino library documentation
- size_t write(uint8_t data);
-
-
- protected:
- ChoreoInputSet m_inputs;
- ChoreoOutputSet m_outputs;
- ChoreoPreset m_preset;
-
- const char* m_accountName;
- const char* m_appKeyValue;
- const char* m_appKeyName;
- const char* m_path;
- Client& m_client;
- char m_httpCodeStr[6];
- const char* m_nextChar;
- enum State {START, HTTP_CODE_TAG, HTTP_CODE_VALUE, END};
- State m_nextState;
-
-};
-
-#endif //ARDUINO_AVR_YUN
-
-#endif //TEMBOO_H_
diff --git a/libraries/Temboo/src/utility/BaseFormatter.cpp b/libraries/Temboo/src/utility/BaseFormatter.cpp
deleted file mode 100644
index 1e575e217..000000000
--- a/libraries/Temboo/src/utility/BaseFormatter.cpp
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
-###############################################################################
-#
-# Temboo Arduino library
-#
-# Copyright 2015, Temboo Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
-# either express or implied. See the License for the specific
-# language governing permissions and limitations under the License.
-#
-###############################################################################
-*/
-
-#include "BaseFormatter.h"
-
-char BaseFormatter::escape(char c) {
- char outChar = c;
- switch(c) {
- case '\\':
- case '"':
- outChar = '\\';
- m_escapedChar = c;
- break;
- case '\b':
- outChar = '\\';
- m_escapedChar = 'b';
- break;
- case '\f':
- outChar = '\\';
- m_escapedChar = 'f';
- break;
- case '\n':
- outChar = '\\';
- m_escapedChar = 'n';
- break;
- case '\r':
- outChar = '\\';
- m_escapedChar = 'r';
- break;
- case '\t':
- outChar = '\\';
- m_escapedChar = 't';
- break;
- default:
- m_escapedChar = '\0';
- }
- return outChar;
-}
-
-char BaseFormatter::finishEscape() {
- char c = m_escapedChar;
- m_escapedChar = '\0';
- return c;
-}
-
-char BaseFormatter::readTagChar(int nextState) {
- char c = pgm_read_byte(m_nextChar++);
- if (pgm_read_byte(m_nextChar) == '\0') {
- m_nextState = nextState;
- }
- return c;
-}
-
-char BaseFormatter::readValueChar(int nextState) {
- char c;
- if (isEscaping()) {
- c = finishEscape();
- if (*m_nextChar == '\0') {
- m_nextState = nextState;
- }
- } else {
- c = escape(*m_nextChar++);
- if (!isEscaping()) {
- if(*m_nextChar == '\0') {
- m_nextState = nextState;
- }
- }
- }
- return c;
-}
-
-char BaseFormatter::readStartTagChar(const char* tag, int nextState) {
- m_nextChar = tag;
- char c = pgm_read_byte(m_nextChar++);
- m_nextState = nextState;
- return c;
-}
diff --git a/libraries/Temboo/src/utility/BaseFormatter.h b/libraries/Temboo/src/utility/BaseFormatter.h
deleted file mode 100644
index 3d4443124..000000000
--- a/libraries/Temboo/src/utility/BaseFormatter.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
-###############################################################################
-#
-# Temboo Arduino library
-#
-# Copyright 2015, Temboo Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
-# either express or implied. See the License for the specific
-# language governing permissions and limitations under the License.
-#
-###############################################################################
-*/
-
-#ifndef BASEFORMATTER_H_
-#define BASEFORMATTER_H_
-#include "TembooGlobal.h"
-
-class BaseFormatter {
- public:
- BaseFormatter() {m_escapedChar = '\0';}
-
- protected:
- const char* m_nextChar;
- int m_nextState;
- char m_escapedChar;
-
- char escape(char c);
- bool isEscaping() {return m_escapedChar != '\0';}
- char finishEscape();
-
- char readTagChar(int nextState);
- char readValueChar(int nextState);
- char readStartTagChar(const char* tag, int nextState);
-
-};
-
-#endif
diff --git a/libraries/Temboo/src/utility/ChoreoInput.cpp b/libraries/Temboo/src/utility/ChoreoInput.cpp
deleted file mode 100644
index faf921d89..000000000
--- a/libraries/Temboo/src/utility/ChoreoInput.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-###############################################################################
-#
-# Temboo Arduino library
-#
-# Copyright 2015, Temboo Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
-# either express or implied. See the License for the specific
-# language governing permissions and limitations under the License.
-#
-###############################################################################
-*/
-
-#include
-#include "ChoreoInput.h"
-
-ChoreoInput::ChoreoInput(ChoreoInput* prev, const char* name, const char* value) {
- if (prev != NULL) {
- prev->m_next = this;
- }
- m_next = NULL;
- m_name = name;
- m_value = value;
-}
-
diff --git a/libraries/Temboo/src/utility/ChoreoInput.h b/libraries/Temboo/src/utility/ChoreoInput.h
deleted file mode 100644
index a23ca700c..000000000
--- a/libraries/Temboo/src/utility/ChoreoInput.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-###############################################################################
-#
-# Temboo Arduino library
-#
-# Copyright 2015, Temboo Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
-# either express or implied. See the License for the specific
-# language governing permissions and limitations under the License.
-#
-###############################################################################
-*/
-
-#ifndef CHOREOINPUT_H_
-#define CHOREOINPUT_H_
-#include "TembooGlobal.h"
-class ChoreoInput {
- public:
- ChoreoInput(ChoreoInput* prev, const char* name, const char* value);
- const char* getName() const {return m_name;}
- const char* getValue() const {return m_value;}
- void setValue(const char* value) {m_value = value;}
- ChoreoInput* getNext() const {return m_next;}
-
- private:
- ChoreoInput* m_next;
- const char* m_name;
- const char* m_value;
-};
-
-#endif
-
diff --git a/libraries/Temboo/src/utility/ChoreoInputFormatter.cpp b/libraries/Temboo/src/utility/ChoreoInputFormatter.cpp
deleted file mode 100644
index a54c55375..000000000
--- a/libraries/Temboo/src/utility/ChoreoInputFormatter.cpp
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
-###############################################################################
-#
-# Temboo Arduino library
-#
-# Copyright 2015, Temboo Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
-# either express or implied. See the License for the specific
-# language governing permissions and limitations under the License.
-#
-###############################################################################
-*/
-
-#include
-#include
-#include "ChoreoInputFormatter.h"
-#include "ChoreoInputSet.h"
-
-static const char TAG_INPUTS_START[] PROGMEM = "\"inputs\":{";
-
-ChoreoInputFormatter::ChoreoInputFormatter(const ChoreoInputSet* inputSet) {
- m_inputSet = inputSet;
- reset();
-}
-
-void ChoreoInputFormatter::reset() {
- m_currentInput = NULL;
- m_nextChar = NULL;
- if (m_inputSet == NULL || m_inputSet->isEmpty()) {
- m_nextState = END;
- } else {
- m_nextState = START;
- }
-}
-
-bool ChoreoInputFormatter::hasNext() {
- return m_nextState != END;
-}
-
-char ChoreoInputFormatter::next() {
- char c;
- switch(m_nextState) {
- case START:
- c = readStartTagChar(TAG_INPUTS_START, INPUTS_TAG);
- break;
-
- case INPUTS_TAG:
- c = readTagChar(NAME_START);
- if (m_nextState == NAME_START) {
- m_currentInput= m_inputSet->getFirstInput();
- }
- break;
-
- case NAME_START:
- c = '"';
- m_nextChar = m_currentInput->getName();
- if ((NULL == m_nextChar) || ('\0' == *m_nextChar)) {
- m_nextState = NAME_END;
- } else {
- m_nextState = NAME;
- }
- break;
-
- case NAME:
- c = readValueChar(NAME_END);
- break;
-
- case NAME_END:
- c = '"';
- m_nextState = NAME_VALUE_SEPARATOR;
- break;
-
- case NAME_VALUE_SEPARATOR:
- c = ':';
- m_nextState = VALUE_START;
- break;
-
- case VALUE_START:
- c = '"';
- m_nextChar = m_currentInput->getValue();
- if ((NULL == m_nextChar) || ('\0' == *m_nextChar)) {
- m_nextState = VALUE_END;
- } else {
- m_nextState = VALUE;
- }
- break;
-
- case VALUE:
- c = readValueChar(VALUE_END);
- break;
-
- case VALUE_END:
- c = '"';
- m_currentInput = m_currentInput->getNext();
- if (m_currentInput != NULL) {
- m_nextState = NEXT_INPUT;
- } else {
- m_nextState = INPUTS_END;
- }
- break;
- case NEXT_INPUT:
- c = ',';
- m_nextChar = m_currentInput->getName();
- m_nextState = NAME_START;
- break;
-
- case INPUTS_END:
- c = '}';
- m_nextState = END;
- break;
- case END:
- default:
- c = '\0';
- }
- return c;
-}
diff --git a/libraries/Temboo/src/utility/ChoreoInputFormatter.h b/libraries/Temboo/src/utility/ChoreoInputFormatter.h
deleted file mode 100644
index 8946c5d10..000000000
--- a/libraries/Temboo/src/utility/ChoreoInputFormatter.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
-###############################################################################
-#
-# Temboo Arduino library
-#
-# Copyright 2015, Temboo Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
-# either express or implied. See the License for the specific
-# language governing permissions and limitations under the License.
-#
-###############################################################################
-*/
-
-#ifndef CHOREOINPUTFORMATTER_H_
-#define CHOREOINPUTFORMATTER_H_
-#include "TembooGlobal.h"
-#include "BaseFormatter.h"
-#include "ChoreoInputSet.h"
-
-class ChoreoInputFormatter : public BaseFormatter {
-
- public:
- ChoreoInputFormatter(const ChoreoInputSet* inputSet);
- bool hasNext();
- char next();
- void reset();
-
- protected:
- const ChoreoInputSet* m_inputSet;
- const ChoreoInput* m_currentInput;
-
-
- enum State {
- START,
- INPUTS_TAG,
- NAME_START,
- NAME,
- NAME_END,
- NAME_VALUE_SEPARATOR,
- VALUE_START,
- VALUE,
- VALUE_END,
- NEXT_INPUT,
- INPUTS_END,
- END
- };
-};
-
-#endif
diff --git a/libraries/Temboo/src/utility/ChoreoInputSet.cpp b/libraries/Temboo/src/utility/ChoreoInputSet.cpp
deleted file mode 100644
index 09a9f1aac..000000000
--- a/libraries/Temboo/src/utility/ChoreoInputSet.cpp
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
-###############################################################################
-#
-# Temboo Arduino library
-#
-# Copyright 2015, Temboo Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
-# either express or implied. See the License for the specific
-# language governing permissions and limitations under the License.
-#
-###############################################################################
-*/
-
-#include
-#include "ChoreoInputSet.h"
-
-ChoreoInputSet::ChoreoInputSet() {
- m_first = NULL;
-}
-
-ChoreoInputSet::~ChoreoInputSet() {
- ChoreoInput* i = m_first;
- ChoreoInput* next = NULL;
- while (i != NULL) {
- next = i->getNext();
- delete i;
- i = next;
- }
-}
-
-void ChoreoInputSet::put(const char* name, const char* value) {
-
- // Haven't set ANY inputs yet?
- // Just create a new one.
- if (m_first == NULL) {
- m_first = new ChoreoInput(NULL, name, value);
- } else {
- // Some inputs already set.
- // See if we already have this input.
- ChoreoInput* last = NULL;
- ChoreoInput* i = m_first;
- while(i != NULL) {
- if (strcmp(i->getName(), name) == 0) {
- // We already have an input with this name.
- // Just update the value.
- i->setValue(value);
- break;
- }
- last = i;
- i = i->getNext();
- }
-
- // We don't have an input with this name
- // So we need to create a new one.
- if (i == NULL) {
- new ChoreoInput(last, name, value);
- }
- }
-}
-
-const char* ChoreoInputSet::get(const char* name) const {
- ChoreoInput* i = m_first;
- while(i != NULL) {
- if (strcmp(i->getName(), name) == 0) {
- return i->getValue();
- }
- i = i->getNext();
- }
- return NULL;
-}
-
diff --git a/libraries/Temboo/src/utility/ChoreoInputSet.h b/libraries/Temboo/src/utility/ChoreoInputSet.h
deleted file mode 100644
index 123a38a23..000000000
--- a/libraries/Temboo/src/utility/ChoreoInputSet.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
-###############################################################################
-#
-# Temboo Arduino library
-#
-# Copyright 2015, Temboo Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
-# either express or implied. See the License for the specific
-# language governing permissions and limitations under the License.
-#
-###############################################################################
-*/
-
-#ifndef CHOREOINPUTSET_H_
-#define CHOREOINPUTSET_H_
-#include
-#include "TembooGlobal.h"
-#include "ChoreoInput.h"
-
-class ChoreoInputSet {
-
- public:
- ChoreoInputSet();
- ~ChoreoInputSet();
- void put(const char* name, const char* value);
- const char* get(const char* name) const;
- bool isEmpty() const {return m_first == NULL;}
- const ChoreoInput* getFirstInput() const {return m_first;}
-
- protected:
- ChoreoInput* m_first;
-};
-
-#endif
diff --git a/libraries/Temboo/src/utility/ChoreoOutput.cpp b/libraries/Temboo/src/utility/ChoreoOutput.cpp
deleted file mode 100644
index 63cdc5fda..000000000
--- a/libraries/Temboo/src/utility/ChoreoOutput.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-###############################################################################
-#
-# Temboo Arduino library
-#
-# Copyright 2015, Temboo Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
-# either express or implied. See the License for the specific
-# language governing permissions and limitations under the License.
-#
-###############################################################################
-*/
-
-#include
-#include "ChoreoOutput.h"
-
-
-ChoreoOutput::ChoreoOutput(ChoreoOutput* prev, const char* name, const char* path, const char* var) {
- if (prev != NULL) {
- prev->m_next = this;
- }
- m_next = NULL;
- m_name = name;
- m_path = path;
- m_var = var;
-}
-
-
diff --git a/libraries/Temboo/src/utility/ChoreoOutput.h b/libraries/Temboo/src/utility/ChoreoOutput.h
deleted file mode 100644
index 844e8b5fb..000000000
--- a/libraries/Temboo/src/utility/ChoreoOutput.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
-###############################################################################
-#
-# Temboo Arduino library
-#
-# Copyright 2015, Temboo Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
-# either express or implied. See the License for the specific
-# language governing permissions and limitations under the License.
-#
-###############################################################################
-*/
-
-#ifndef CHOREOOUTPUT_H_
-#define CHOREOOUTPUT_H_
-#include "TembooGlobal.h"
-
-class ChoreoOutput {
- public:
- ChoreoOutput(ChoreoOutput* prev, const char* name, const char* path, const char* var);
- const char* getName() const {return m_name;}
- const char* getPath() const {return m_path;}
- const char* getVariable() const {return m_var;}
- void setPath(const char* path) {m_path = path;}
- void setVariable(const char* variable) {m_var = variable;}
- ChoreoOutput* getNext() const {return m_next;}
-
- private:
- ChoreoOutput* m_next;
- const char* m_name;
- const char* m_path;
- const char* m_var;
-};
-
-#endif
diff --git a/libraries/Temboo/src/utility/ChoreoOutputFormatter.cpp b/libraries/Temboo/src/utility/ChoreoOutputFormatter.cpp
deleted file mode 100644
index 53561ccd8..000000000
--- a/libraries/Temboo/src/utility/ChoreoOutputFormatter.cpp
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
-###############################################################################
-#
-# Temboo Arduino library
-#
-# Copyright 2015, Temboo Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
-# either express or implied. See the License for the specific
-# language governing permissions and limitations under the License.
-#
-###############################################################################
-*/
-
-#include
-#include
-#include "ChoreoOutputFormatter.h"
-#include "ChoreoOutputSet.h"
-
-static const char TAG_OUTPUTS_START[] PROGMEM = "\"outputs\":[";
-static const char TAG_NAME[] PROGMEM = "\"name\":";
-static const char TAG_PATH[] PROGMEM = "\"path\":";
-static const char TAG_VAR[] PROGMEM = "\"variable\":";
-
-
-ChoreoOutputFormatter::ChoreoOutputFormatter(const ChoreoOutputSet* outputSet) {
- m_outputSet = outputSet;
- reset();
-}
-
-void ChoreoOutputFormatter::reset() {
- m_currentOutput = NULL;
- m_nextChar = NULL;
- if (m_outputSet == NULL || m_outputSet->isEmpty()) {
- m_nextState = END;
- } else {
- m_nextState = START;
- }
-}
-
-bool ChoreoOutputFormatter::hasNext() {
- return m_nextState != END;
-}
-
-char ChoreoOutputFormatter::next() {
- char c = '\0';
- switch(m_nextState) {
- case START:
- c = readStartTagChar(TAG_OUTPUTS_START, OUTPUTS_TAG);
- break;
-
- case OUTPUTS_TAG:
- c = readTagChar(OUTPUT_START);
- if (m_nextState == OUTPUT_START) {
- m_currentOutput = m_outputSet->getFirstOutput();
- }
- break;
-
- case OUTPUT_START:
- c = '{';
- m_nextChar = TAG_NAME;
- m_nextState = NAME_TAG;
- break;
-
- case NAME_TAG:
- c = readTagChar(NAME_START);
- break;
-
- case NAME_START:
- c = '"';
- m_nextChar = m_currentOutput->getName();
- if ((NULL == m_nextChar) || ('\0' == *m_nextChar)) {
- m_nextState = NAME_END;
- } else {
- m_nextState = NAME;
- }
- break;
-
- case NAME:
- c = readValueChar(NAME_END);
- break;
-
- case NAME_END:
- c = '"';
- m_nextState = NAME_PATH_SEPARATOR;
- break;
-
- case NAME_PATH_SEPARATOR:
- c = ',';
- m_nextState = PATH_TAG;
- m_nextChar = TAG_PATH;
- break;
-
- case PATH_TAG:
- c = readTagChar(PATH_START);
- break;
-
- case PATH_START:
- c = '"';
- m_nextChar = m_currentOutput->getPath();
- if ((NULL == m_nextChar) || ('\0' == *m_nextChar)) {
- m_nextState = PATH_END;
- } else {
- m_nextState = PATH;
- }
- break;
-
- case PATH:
- c = readValueChar(PATH_END);
- break;
-
- case PATH_END:
- c = '"';
- m_nextState = PATH_VAR_SEPARATOR;
- break;
-
- case PATH_VAR_SEPARATOR:
- c = ',';
- m_nextState = VAR_TAG;
- m_nextChar = TAG_VAR;
- break;
-
- case VAR_TAG:
- c = readTagChar(VAR_START);
- break;
-
- case VAR_START:
- c = '"';
- m_nextChar = m_currentOutput->getVariable();
- if ((NULL == m_nextChar) || ('\0' == *m_nextChar)) {
- m_nextState = VAR_END;
- } else {
- m_nextState = VAR;
- }
- break;
-
- case VAR:
- c = readValueChar(VAR_END);
- break;
-
- case VAR_END:
- c = '"';
- m_nextState = OUTPUT_END;
- break;
-
- case OUTPUT_END:
- c = '}';
- m_currentOutput = m_currentOutput->getNext();
- if (m_currentOutput != NULL) {
- m_nextState = NEXT_OUTPUT;
- } else {
- m_nextState = OUTPUTS_END;
- }
- break;
-
- case NEXT_OUTPUT:
- c = ',';
- m_nextChar = m_currentOutput->getName();
- m_nextState = OUTPUT_START;
- break;
-
- case OUTPUTS_END:
- c = ']';
- m_nextState = END;
- break;
- case END:
- default:
- c = '\0';
- }
-
- return c;
-}
-
diff --git a/libraries/Temboo/src/utility/ChoreoOutputFormatter.h b/libraries/Temboo/src/utility/ChoreoOutputFormatter.h
deleted file mode 100644
index 52874a6ca..000000000
--- a/libraries/Temboo/src/utility/ChoreoOutputFormatter.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
-###############################################################################
-#
-# Temboo Arduino library
-#
-# Copyright 2015, Temboo Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
-# either express or implied. See the License for the specific
-# language governing permissions and limitations under the License.
-#
-###############################################################################
-*/
-
-#ifndef CHOREOOUTPUTFORMATTER_H_
-#define CHOREOOUTPUTFORMATTER_H_
-#include "TembooGlobal.h"
-#include "BaseFormatter.h"
-#include "ChoreoOutputSet.h"
-
-class ChoreoOutputFormatter : public BaseFormatter {
-
- public:
- ChoreoOutputFormatter(const ChoreoOutputSet* outputSet);
- bool hasNext();
- char next();
- void reset();
-
- protected:
- const ChoreoOutputSet* m_outputSet;
- const ChoreoOutput* m_currentOutput;
-
- enum State {
- START,
- OUTPUTS_TAG,
- OUTPUT_START,
- NAME_TAG,
- NAME_START,
- NAME,
- NAME_END,
- NAME_PATH_SEPARATOR,
- PATH_TAG,
- PATH_START,
- PATH,
- PATH_END,
- PATH_VAR_SEPARATOR,
- VAR_TAG,
- VAR_START,
- VAR,
- VAR_END,
- OUTPUT_END,
- NEXT_OUTPUT,
- OUTPUTS_END,
- END
- };
-};
-
-#endif
diff --git a/libraries/Temboo/src/utility/ChoreoOutputSet.cpp b/libraries/Temboo/src/utility/ChoreoOutputSet.cpp
deleted file mode 100644
index 084fe625b..000000000
--- a/libraries/Temboo/src/utility/ChoreoOutputSet.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
-###############################################################################
-#
-# Temboo Arduino library
-#
-# Copyright 2015, Temboo Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
-# either express or implied. See the License for the specific
-# language governing permissions and limitations under the License.
-#
-###############################################################################
-*/
-
-#include
-#include
-#include "ChoreoOutputSet.h"
-
-
-ChoreoOutputSet::ChoreoOutputSet() {
- m_first = NULL;
-}
-
-ChoreoOutputSet::~ChoreoOutputSet() {
- ChoreoOutput* i = m_first;
- ChoreoOutput* next = NULL;
- while(i != NULL) {
- next = i->getNext();
- delete i;
- i = next;
- }
-}
-
-void ChoreoOutputSet::put(const char* name, const char* path, const char* variable) {
- if (m_first == NULL) {
- m_first = new ChoreoOutput(NULL, name, path, variable);
- } else {
- ChoreoOutput* last = NULL;
- ChoreoOutput* i = m_first;
- while(i != NULL) {
- if (strcmp(i->getName(), name) == 0) {
- i->setPath(path);
- i->setVariable(variable);
- break;
- }
- last = i;
- i = i->getNext();
- }
-
- if (i == NULL) {
- new ChoreoOutput(last, name, path, variable);
- }
- }
-}
-
-const ChoreoOutput* ChoreoOutputSet::get(const char* name) const {
- ChoreoOutput* i = m_first;
- while(i != NULL) {
- if (strcmp(i->getName(), name) == 0) {
- return i;
- }
- i = i->getNext();
- }
- return NULL;
-}
diff --git a/libraries/Temboo/src/utility/ChoreoOutputSet.h b/libraries/Temboo/src/utility/ChoreoOutputSet.h
deleted file mode 100644
index 2c0fc4b9c..000000000
--- a/libraries/Temboo/src/utility/ChoreoOutputSet.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
-###############################################################################
-#
-# Temboo Arduino library
-#
-# Copyright 2015, Temboo Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
-# either express or implied. See the License for the specific
-# language governing permissions and limitations under the License.
-#
-###############################################################################
-*/
-
-#ifndef CHOREOOUTPUTSET_H_
-#define CHOREOOUTPUTSET_H_
-#include
-#include "TembooGlobal.h"
-#include "ChoreoOutput.h"
-
-class ChoreoOutputSet {
-
- public:
- ChoreoOutputSet();
- ~ChoreoOutputSet();
- void put(const char* name, const char* path, const char* variable);
- const ChoreoOutput* get(const char* name) const;
- bool isEmpty() const {return m_first == NULL;}
- const ChoreoOutput* getFirstOutput() const {return m_first;}
-
- protected:
- ChoreoOutput* m_first;
-};
-
-#endif
diff --git a/libraries/Temboo/src/utility/ChoreoPreset.cpp b/libraries/Temboo/src/utility/ChoreoPreset.cpp
deleted file mode 100644
index 61a785026..000000000
--- a/libraries/Temboo/src/utility/ChoreoPreset.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-###############################################################################
-#
-# Temboo Arduino library
-#
-# Copyright 2015, Temboo Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
-# either express or implied. See the License for the specific
-# language governing permissions and limitations under the License.
-#
-###############################################################################
-*/
-
-#include "ChoreoPreset.h"
diff --git a/libraries/Temboo/src/utility/ChoreoPreset.h b/libraries/Temboo/src/utility/ChoreoPreset.h
deleted file mode 100644
index 2ba457b6d..000000000
--- a/libraries/Temboo/src/utility/ChoreoPreset.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-###############################################################################
-#
-# Temboo Arduino library
-#
-# Copyright 2015, Temboo Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
-# either express or implied. See the License for the specific
-# language governing permissions and limitations under the License.
-#
-###############################################################################
-*/
-
-#ifndef CHOREOPRESET_H_
-#define CHOREOPRESET_H_
-#include
-#include "TembooGlobal.h"
-
-class ChoreoPreset {
- public:
- ChoreoPreset() {m_name = NULL;}
- ChoreoPreset(const char* name) {put(name);}
- const char* getName() const {return m_name;}
- void put(const char* name) {m_name = name;}
- bool isEmpty() const {return m_name == NULL || *m_name == '\0';}
-
- private:
- const char* m_name;
-};
-
-#endif
diff --git a/libraries/Temboo/src/utility/ChoreoPresetFormatter.cpp b/libraries/Temboo/src/utility/ChoreoPresetFormatter.cpp
deleted file mode 100644
index f34d181a5..000000000
--- a/libraries/Temboo/src/utility/ChoreoPresetFormatter.cpp
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
-###############################################################################
-#
-# Temboo Arduino library
-#
-# Copyright 2015, Temboo Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
-# either express or implied. See the License for the specific
-# language governing permissions and limitations under the License.
-#
-###############################################################################
-*/
-
-#include
-#include
-#include "ChoreoPresetFormatter.h"
-#include "ChoreoPreset.h"
-
-static const char TAG_PRESET[] PROGMEM = "\"preset\":";
-
-ChoreoPresetFormatter::ChoreoPresetFormatter(const ChoreoPreset* preset) {
- m_preset = preset;
- reset();
-}
-
-void ChoreoPresetFormatter::reset() {
- m_nextChar = NULL;
- if (m_preset == NULL || m_preset->isEmpty()) {
- m_nextState = END;
- } else {
- m_nextState = START;
- }
-}
-
-bool ChoreoPresetFormatter::hasNext() {
- return m_nextState != END;
-}
-
-char ChoreoPresetFormatter::next() {
- char c = '\0';
- switch(m_nextState) {
- case START:
- c = readStartTagChar(TAG_PRESET, PRESET_TAG);
- break;
-
- case PRESET_TAG:
- c = readTagChar(NAME_START);
- break;
-
- case NAME_START:
- c = '"';
- m_nextChar = m_preset->getName();
- if ((NULL == m_nextChar) || ('\0' == *m_nextChar)) {
- m_nextState = NAME_END;
- } else {
- m_nextState = NAME;
- }
- break;
-
- case NAME:
- c = readValueChar(NAME_END);
- break;
-
- case NAME_END:
- c = '"';
- m_nextState = END;
- break;
-
- case END:
- default:
- c = '\0';
- }
- return c;
-}
-
diff --git a/libraries/Temboo/src/utility/ChoreoPresetFormatter.h b/libraries/Temboo/src/utility/ChoreoPresetFormatter.h
deleted file mode 100644
index 30e4a9b1f..000000000
--- a/libraries/Temboo/src/utility/ChoreoPresetFormatter.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
-###############################################################################
-#
-# Temboo Arduino library
-#
-# Copyright 2015, Temboo Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
-# either express or implied. See the License for the specific
-# language governing permissions and limitations under the License.
-#
-###############################################################################
-*/
-
-#ifndef CHOREOPROFILEFORMATTER_H_
-#define CHOREOPROFILEFORMATTER_H_
-#include "TembooGlobal.h"
-#include "BaseFormatter.h"
-#include "ChoreoPreset.h"
-
-class ChoreoPresetFormatter : public BaseFormatter {
-
- public:
- ChoreoPresetFormatter(const ChoreoPreset* preset);
- bool hasNext();
- char next();
- void reset();
-
- protected:
- const ChoreoPreset* m_preset;
-
- enum State {
- START,
- PRESET_TAG,
- NAME_START,
- NAME,
- NAME_END,
- END
- };
-};
-
-#endif
diff --git a/libraries/Temboo/src/utility/DataFormatter.cpp b/libraries/Temboo/src/utility/DataFormatter.cpp
deleted file mode 100644
index f5cdf989b..000000000
--- a/libraries/Temboo/src/utility/DataFormatter.cpp
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
-###############################################################################
-#
-# Temboo Arduino library
-#
-# Copyright 2015, Temboo Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
-# either express or implied. See the License for the specific
-# language governing permissions and limitations under the License.
-#
-###############################################################################
-*/
-
-#include "DataFormatter.h"
-
-
-DataFormatter::DataFormatter(
- const ChoreoInputSet* inputSet,
- const ChoreoOutputSet* outputSet,
- const ChoreoPreset* preset) :
- m_inputFormatter(inputSet),
- m_outputFormatter(outputSet),
- m_presetFormatter(preset) {
-
- m_inputSet = inputSet;
- m_outputSet = outputSet;
- m_preset = preset;
-
- reset();
-}
-
-void DataFormatter::reset() {
- m_nextState = DATA_START;
- m_inputFormatter.reset();
- m_outputFormatter.reset();
- m_presetFormatter.reset();
-}
-
-bool DataFormatter::hasNext() {
- return m_nextState != DATA_END;
-}
-
-char DataFormatter::next() {
- char c;
- switch(m_nextState) {
- case DATA_START:
- c = '{';
- if (m_inputFormatter.hasNext()) {
- m_nextState = FORMATTING_INPUTS;
- } else if (m_outputFormatter.hasNext()) {
- m_nextState = FORMATTING_OUTPUTS;
- } else if (m_presetFormatter.hasNext()) {
- m_nextState = FORMATTING_PRESET;
- } else {
- m_nextState = FORMATTING_EMPTY;
- }
- break;
- case FORMATTING_INPUTS:
- if (m_inputFormatter.hasNext()) {
- c = m_inputFormatter.next();
- } else if (m_outputFormatter.hasNext()) {
- c = ',';
- m_nextState = FORMATTING_OUTPUTS;
- } else if (m_presetFormatter.hasNext()) {
- c = ',';
- m_nextState = FORMATTING_PRESET;
- } else {
- c = '}';
- m_nextState = DATA_END;
- }
- break;
- case FORMATTING_OUTPUTS:
- if (m_outputFormatter.hasNext()) {
- c = m_outputFormatter.next();
- } else if (m_presetFormatter.hasNext()) {
- c = ',';
- m_nextState = FORMATTING_PRESET;
- } else {
- c = '}';
- m_nextState = DATA_END;
- }
- break;
-
- case FORMATTING_PRESET:
- if (m_presetFormatter.hasNext()) {
- c = m_presetFormatter.next();
- } else {
- c = '}';
- m_nextState = DATA_END;
- }
- break;
-
- case FORMATTING_EMPTY:
- c = '}';
- m_nextState = DATA_END;
- break;
-
- case DATA_END:
- default:
- c = '\0';
- break;
- }
- return c;
-}
-
diff --git a/libraries/Temboo/src/utility/DataFormatter.h b/libraries/Temboo/src/utility/DataFormatter.h
deleted file mode 100644
index 542c821d1..000000000
--- a/libraries/Temboo/src/utility/DataFormatter.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
-###############################################################################
-#
-# Temboo Arduino library
-#
-# Copyright 2015, Temboo Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
-# either express or implied. See the License for the specific
-# language governing permissions and limitations under the License.
-#
-###############################################################################
-*/
-
-#ifndef DATAFORMATTER_H_
-#define DATAFORMATTER_H_
-#include "TembooGlobal.h"
-#include "ChoreoInputSet.h"
-#include "ChoreoOutputSet.h"
-#include "ChoreoPreset.h"
-#include "ChoreoInputFormatter.h"
-#include "ChoreoOutputFormatter.h"
-#include "ChoreoPresetFormatter.h"
-
-
-class DataFormatter {
-
- public:
- DataFormatter(const ChoreoInputSet* inputSet, const ChoreoOutputSet* outputSet, const ChoreoPreset* preset);
- bool hasNext();
- char next();
- void reset();
-
- private:
- const ChoreoInputSet* m_inputSet;
- const ChoreoOutputSet* m_outputSet;
- const ChoreoPreset* m_preset;
-
- ChoreoInputFormatter m_inputFormatter;
- ChoreoOutputFormatter m_outputFormatter;
- ChoreoPresetFormatter m_presetFormatter;
-
- enum State {
- DATA_START,
- FORMATTING_INPUTS,
- FORMATTING_OUTPUTS,
- FORMATTING_PRESET,
- FORMATTING_EMPTY,
- DATA_END
- };
-
- State m_nextState;
-
-};
-#endif
diff --git a/libraries/Temboo/src/utility/TembooGlobal.c b/libraries/Temboo/src/utility/TembooGlobal.c
deleted file mode 100644
index 63163c1af..000000000
--- a/libraries/Temboo/src/utility/TembooGlobal.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
-###############################################################################
-#
-# Temboo Arduino library
-#
-# Copyright 2015, Temboo Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
-# either express or implied. See the License for the specific
-# language governing permissions and limitations under the License.
-#
-###############################################################################
-*/
-
-#include "TembooGlobal.h"
-
-char* uint16toa(uint16_t value, char* dest) {
- return uint32toa(value, dest);
-}
-
-char* uint32toa(uint32_t value, char* dest) {
- char* end = dest;
- do {
- *end++ = (value % 10) + '0';
- } while (value /= 10);
- *end = '\0';
- end--;
-
- char c;
- char* begin = dest;
- while(end > begin) {
- c = *end;
- *end = *begin;
- *begin = c;
- end--;
- begin++;
- }
-
- return dest;
-}
diff --git a/libraries/Temboo/src/utility/TembooGlobal.h b/libraries/Temboo/src/utility/TembooGlobal.h
deleted file mode 100644
index acb89437b..000000000
--- a/libraries/Temboo/src/utility/TembooGlobal.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
-###############################################################################
-#
-# Temboo Arduino library
-#
-# Copyright 2015, Temboo Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
-# either express or implied. See the License for the specific
-# language governing permissions and limitations under the License.
-#
-###############################################################################
-*/
-
-#ifndef TEMBOOGLOBAL_H_
-#define TEMBOOGLOBAL_H_
-
-#include
-
-//#define TEMBOO_VERBOSE
-
-#ifdef TEMBOO_VERBOSE
- #define TEMBOO_TRACE(x) Serial.print(x)
- #define TEMBOO_TRACE_BYTES(x,c) Serial.write((const uint8_t*)x,c)
- #define TEMBOO_TRACELN(x) Serial.println(x)
-#else
- #define TEMBOO_TRACE(x)
- #define TEMBOO_TRACE_BYTES(x,c)
- #define TEMBOO_TRACELN(x)
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-char* uint16toa(uint16_t value, char* dest);
-char* uint32toa(uint32_t value, char* dest);
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif
-
diff --git a/libraries/Temboo/src/utility/TembooSession.cpp b/libraries/Temboo/src/utility/TembooSession.cpp
deleted file mode 100644
index 70dbb9e9e..000000000
--- a/libraries/Temboo/src/utility/TembooSession.cpp
+++ /dev/null
@@ -1,266 +0,0 @@
-/*
-###############################################################################
-#
-# Temboo Arduino library
-#
-# Copyright 2015, Temboo Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
-# either express or implied. See the License for the specific
-# language governing permissions and limitations under the License.
-#
-###############################################################################
-*/
-
-#include
-#include
-#include
-#include "TembooSession.h"
-#include "tmbhmac.h"
-#include "DataFormatter.h"
-
-static const char EOL[] PROGMEM = "\r\n";
-static const char POST[] PROGMEM = "POST ";
-static const char POSTAMBLE[] PROGMEM = " HTTP/1.0"; // Prevent host from using chunked encoding in response.
-static const char HEADER_HOST[] PROGMEM = "Host: ";
-static const char HEADER_ACCEPT[] PROGMEM = "Accept: application/xml";
-static const char HEADER_ORG[] PROGMEM = "x-temboo-domain: /";
-static const char HEADER_DOM[] PROGMEM = "/master";
-static const char HEADER_CONTENT_LENGTH[] PROGMEM = "Content-Length: ";
-static const char HEADER_TIME[] PROGMEM = "x-temboo-time: ";
-static const char BASE_CHOREO_URI[] PROGMEM = "/arcturus-web/api-1.0/ar";
-static const char HEADER_AUTH[] PROGMEM = "x-temboo-authentication: ";
-static const char HEADER_CONTENT_TYPE[] PROGMEM = "Content-Type: text/plain";
-static const char TEMBOO_DOMAIN[] PROGMEM = ".temboolive.com";
-static const char SDK_ID[] PROGMEM = "?source_id=arduinoSDK1";
-
-unsigned long TembooSession::s_timeOffset = 0;
-
-TembooSession::TembooSession(Client& client,
- IPAddress serverAddr,
- uint16_t port) : m_client(client) {
- m_addr = serverAddr;
- m_port = port;
- m_sendQueueDepth = 0;
-}
-
-
-void TembooSession::setTime(unsigned long currentTime) {
- s_timeOffset = currentTime - (millis()/1000);
-}
-
-
-unsigned long TembooSession::getTime() {
- return s_timeOffset + (millis()/1000);
-}
-
-
-
-int TembooSession::executeChoreo(
- const char* accountName,
- const char* appKeyName,
- const char* appKeyValue,
- const char* path,
- const ChoreoInputSet& inputSet,
- const ChoreoOutputSet& outputSet,
- const ChoreoPreset& preset) {
-
- DataFormatter fmt(&inputSet, &outputSet, &preset);
- char auth[HMAC_HEX_SIZE_BYTES + 1];
- char buffer[11];
-
- // We use the current time-of-day as salt on the app key.
- // We keep track of time-of-day by getting the current time
- // from the server and applying an offset (the length of time
- // we've been running.)
- uint32toa((uint32_t)TembooSession::getTime(), buffer);
-
- uint16_t contentLength = getAuth(fmt, appKeyValue, buffer, auth);
-
- m_client.stop();
- m_client.flush();
-
- int connected = 0;
- TEMBOO_TRACE("Connecting: ");
-
- // reserve space for the "host" string sufficient to hold either the
- // (dotted-quad) IP address + port, or the default .temboolive.com
- // host string.
- int hostLen = (m_addr == INADDR_NONE ? (strlen_P(TEMBOO_DOMAIN) + strlen(accountName) + 1):21);
- char host[hostLen];
-
- // If no explicit IP address was specified (the normal case), construct
- // the "host" string from the account name and the temboo domain name.
- if (m_addr == INADDR_NONE) {
- strcpy(host, accountName);
- strcat_P(host, TEMBOO_DOMAIN);
- TEMBOO_TRACELN(host);
- connected = m_client.connect(host, m_port);
- } else {
-
- // If an IP address was explicitly specified (presumably for testing purposes),
- // convert it to a dotted-quad text string.
- host[0] = '\0';
- for(int i = 0; i < 4; i++) {
- uint16toa(m_addr[i], &host[strlen(host)]);
- strcat(host, ".");
- }
-
- // replace the last '.' with ':'
- host[strlen(host)-1] = ':';
-
- // append the port number
- uint16toa(m_port, &host[strlen(host)]);
-
- TEMBOO_TRACELN(host);
- connected = m_client.connect(m_addr, m_port);
- }
-
- if (connected) {
-
- TEMBOO_TRACELN("OK. req:");
- qsendProgmem(POST);
- qsendProgmem(BASE_CHOREO_URI);
- qsend(path);
- qsendProgmem(SDK_ID);
- qsendlnProgmem(POSTAMBLE);
-
- // Send our custom authentication header
- // (app-key-name:hmac)
- qsendProgmem(HEADER_AUTH);
- qsend(appKeyName);
- qsend(":");
- qsendln(auth);
-
- // send the standard host header
- qsendProgmem(HEADER_HOST);
- qsendln(host);
-
- // send the standard accept header
- qsendlnProgmem(HEADER_ACCEPT);
-
- // send our custom account name neader
- qsendProgmem(HEADER_ORG);
- qsend(accountName);
- qsendlnProgmem(HEADER_DOM);
-
- // send the standard content type header
- qsendlnProgmem(HEADER_CONTENT_TYPE);
-
- // send our custom client time header
- qsendProgmem(HEADER_TIME);
- qsendln(buffer);
-
- // send the standard content length header
- qsendProgmem(HEADER_CONTENT_LENGTH);
- qsendln(uint16toa(contentLength, buffer));
-
- qsendProgmem(EOL);
-
- // Format and send the body of the request
- fmt.reset();
- while(fmt.hasNext()) {
- qsend(fmt.next());
- }
-
- qsendProgmem(EOL);
- qflush();
- return 0;
- } else {
- TEMBOO_TRACELN("FAIL");
- return 1;
- }
-}
-
-
-uint16_t TembooSession::getAuth(DataFormatter& fmt, const char* appKeyValue, const char* salt, char* result) const {
-
- // We need the length of the data for other things, and
- // this method is a convenient place to calculate it.
- uint16_t len = 0;
-
- HMAC hmac;
-
- //combine the salt and the key and give it to the HMAC calculator
- size_t keyLength = strlen(appKeyValue) + strlen(salt);
- char key[keyLength + 1];
- strcpy(key, salt);
- strcat(key, appKeyValue);
- hmac.init((uint8_t*)key, keyLength);
-
- // process the data a block at a time.
- uint8_t buffer[HMAC_BLOCK_SIZE_BYTES];
- int blockCount = 0;
- fmt.reset();
- while(fmt.hasNext()) {
- uint8_t c = fmt.next();
- len++;
- buffer[blockCount++] = c;
- if (blockCount == HMAC_BLOCK_SIZE_BYTES) {
- hmac.process(buffer, blockCount);
- blockCount = 0;
- }
- }
- hmac.process(buffer, blockCount);
-
- // Finalize the HMAC calculation and store the (ASCII HEX) value in *result.
- hmac.finishHex(result);
-
- // Return the number of characters processed.
- return len;
-}
-
-
-void TembooSession::qsend(const char* s) {
- char c = *s++;
- while(c != '\0') {
- qsend(c);
- c = *s++;
- }
-}
-
-
-void TembooSession::qsendProgmem(const char* s) {
- char c = pgm_read_byte(s++);
- while(c != '\0') {
- qsend(c);
- c = pgm_read_byte(s++);
- }
-}
-
-
-void TembooSession::qsend(char c) {
- m_sendQueue[m_sendQueueDepth++] = c;
- if (m_sendQueueDepth >= TEMBOO_SEND_QUEUE_SIZE) {
- qflush();
- }
-}
-
-
-void TembooSession::qflush() {
- m_client.write((const uint8_t*)m_sendQueue, m_sendQueueDepth);
- TEMBOO_TRACE_BYTES(m_sendQueue, m_sendQueueDepth);
- m_sendQueueDepth = 0;
-}
-
-
-void TembooSession::qsendln(const char* s) {
- qsend(s);
- qsendProgmem(EOL);
-}
-
-
-void TembooSession::qsendlnProgmem(const char* s) {
- qsendProgmem(s);
- qsendProgmem(EOL);
-}
-
-
diff --git a/libraries/Temboo/src/utility/TembooSession.h b/libraries/Temboo/src/utility/TembooSession.h
deleted file mode 100644
index 635467f6b..000000000
--- a/libraries/Temboo/src/utility/TembooSession.h
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
-###############################################################################
-#
-# Temboo Arduino library
-#
-# Copyright 2015, Temboo Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
-# either express or implied. See the License for the specific
-# language governing permissions and limitations under the License.
-#
-###############################################################################
-*/
-
-#ifndef TEMBOOSESSIONCLASS_H_
-#define TEMBOOSESSIONCLASS_H_
-
-#include
-#include
-#include
-#include
-#include "TembooGlobal.h"
-
-#ifndef TEMBOO_SEND_QUEUE_SIZE
-
-// Some network interfaces (i.e. ethernet or WiFi shields) can only accept
-// a limited amount of data. If you try to send more than the limit, the excess
-// is just lost. However, sending one character at a time is very inefficient.
-// To deal with this situation, we queue up TEMBOO_SEND_QUEUE_SIZE bytes to send
-// to the network device at one time. This is a compromise between RAM usage
-// and performance.
-#define TEMBOO_SEND_QUEUE_SIZE (32)
-#endif
-
-class ChoreoInputSet;
-class ChoreoOutputSet;
-class ChoreoPreset;
-class DataFormatter;
-
-class TembooSession {
- public:
-
- //TembooSession constructor
- //client: REQUIRED TCP/IP client object. Usually either an EthernetClient or a WiFiClient
- //IPAddress: OPTIONAL IP address of the server to connect to. Usually only used for testing.
- //port: OPTIONAL port number to use with the IPAddress. Usually only used for testing.
- TembooSession(Client& client, IPAddress serverAddr=INADDR_NONE, uint16_t port=80);
-
- //executeChoreo sends a choreo execution request to the Temboo system.
- // Does not wait for a response (that's a job for whoever owns the Client.)
- //accountName: the name of the user's account at Temboo.
- //appKeyName: the name of an application key in the user's account to use
- // for this execution (analogous to a user name).
- //appKeyValue: the value of the application key named in appKeyName.
- // Used to authenticate the user (analogous to a password)
- //path: The full path to the choreo to be executed (relative to the root of the
- // user's account.)
- //inputSet: the set of inputs needed by the choreo.
- // May be an empty ChoreoInputSet.
- //outputSet: the set of output filters to be applied to the choreo results.
- // May be an empty ChoreoOutputSet
- //preset: the ChoreoPreset to be used with the choreo execution.
- // May be an empty ChoreoPreset.
- int executeChoreo(const char* accountName,
- const char* appKeyName,
- const char* appKeyValue,
- const char* path,
- const ChoreoInputSet& inputSet,
- const ChoreoOutputSet& outputSet,
- const ChoreoPreset& preset);
-
- // setTime sets the current time in Unix timestamp format. Needed for execution request authentication.
- // NOTE: This method is usually called by TembooChoreo.run() with the current time returned by
- // an error response from the Temboo system, thus automatically setting the time. However, it
- // MAY be called from user code if the particular board has a way of determining the current
- // time in the proper format.
- // currentTime: the number of seconds since 1970-01-01 00:00:00 UTC.
- static void setTime(unsigned long currentTime);
-
- //getTime returns the current time in Unix timestamp format (seconds since 1970-01-01 00:00:00 UTC).
- // Only valid after setTime has been called.
- static unsigned long getTime();
-
- private:
- static unsigned long s_timeOffset;
-
- IPAddress m_addr;
- uint16_t m_port;
-
- Client& m_client;
- char m_sendQueue[TEMBOO_SEND_QUEUE_SIZE];
- size_t m_sendQueueDepth;
-
- // calculate the authentication code value of the formatted request body
- // using the salted application key value as the key.
- // Returns the number of characters processed (i.e. the length of the request body)
- uint16_t getAuth(DataFormatter& fmt, const char* appKeyValue, const char* salt, char* hexAuth) const;
-
-
- // queue an entire nul-terminated char array
- // from RAM followed by a newline.
- void qsendln(const char* str);
-
- // queue an entire nul-terminated char array
- // from flash memory (PROGMEM) one byte at a time,
- // followed by a newline.
- void qsendlnProgmem(const char* str);
-
- // queue an entire nul-terminated char array
- // from RAM one byte at a time.
- void qsend(const char*);
-
- // queue an entire nul-terminated char array
- // from flash memory (PROGMEM) one byte at a time.
- void qsendProgmem(const char*);
-
- // queue a single character to be sent when the queue is full.
- void qsend(char);
-
- // send the current contents of the send queue to the client.
- void qflush();
-
-};
-
-#endif
-
diff --git a/libraries/Temboo/src/utility/tmbhmac.cpp b/libraries/Temboo/src/utility/tmbhmac.cpp
deleted file mode 100644
index 9e23763aa..000000000
--- a/libraries/Temboo/src/utility/tmbhmac.cpp
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
-###############################################################################
-#
-# Temboo Arduino library
-#
-# Copyright 2015, Temboo Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
-# either express or implied. See the License for the specific
-# language governing permissions and limitations under the License.
-#
-###############################################################################
-*/
-
-#include
-#include
-#include "tmbhmac.h"
-
-HMAC::HMAC() {
-}
-
-HMAC::HMAC(const uint8_t* key, uint32_t keyLength) {
- init(key, keyLength);
-}
-
-void HMAC::init(const uint8_t* key, uint32_t keyLength) {
-
- m_key = key;
- m_keyLength = keyLength;
-
- uint8_t iKeyPad[HMAC_BLOCK_SIZE_BYTES];
-
- constructKeyPad(iKeyPad, key, keyLength, (uint8_t)0x36);
-
- m_md5.init();
- m_md5.process(iKeyPad, HMAC_BLOCK_SIZE_BYTES);
-}
-
-void HMAC::process(const uint8_t* msg, uint32_t msgLength) {
- // hmac = hash(o_key_pad + hash(i_key_pad + message))
- // continue hashing the message
- m_md5.process(msg, msgLength);
-}
-
-void HMAC::finish(uint8_t* dest) {
- //hmac = hash(o_key_pad + hash(i_key_pad + message))
- //
- // Construct the o_key_pad
- uint8_t finalBlock[HMAC_BLOCK_SIZE_BYTES + HMAC_HASH_SIZE_BYTES];
- constructKeyPad(finalBlock, m_key, m_keyLength, (uint8_t)0x5C);
- m_md5.finish(finalBlock + HMAC_BLOCK_SIZE_BYTES);
-
- m_md5.init();
- m_md5.process(finalBlock, HMAC_BLOCK_SIZE_BYTES + HMAC_HASH_SIZE_BYTES);
- m_md5.finish(dest);
-}
-
-void HMAC::finishHex(char* dest) {
- uint8_t binDest[HMAC_HASH_SIZE_BYTES];
- finish(binDest);
- toHex(binDest, dest);
-}
-
-void HMAC::toHex(uint8_t* hmac, char* dest) {
- static const char hex[17] PROGMEM = "0123456789abcdef";
- uint16_t i;
- for (i = 0; i < HMAC_HASH_SIZE_BYTES; i++) {
- dest[i*2] = pgm_read_byte(&hex[hmac[i] >> 4]);
- dest[(i*2) + 1] = pgm_read_byte(&hex[hmac[i] & 0x0F]);
- }
- dest[HMAC_HASH_SIZE_BYTES * 2] = '\0';
-}
-
-/*
- * dest MUST be big enough to hold HMAC_BLOCK_SIZE_BYTES
- */
-void HMAC::constructKeyPad(uint8_t* dest, const uint8_t* key, uint32_t keyLength, uint8_t padByte) {
-
- if (keyLength > HMAC_BLOCK_SIZE_BYTES) {
- // If the key is bigger than 1 block,
- // replace the key with the hash of the key.
- MD5 md5;
- md5.process(key, keyLength);
- md5.finish(dest);
- keyLength = HMAC_HASH_SIZE_BYTES;
- } else {
- // If the key length is <= to the HMAC block length,
- // just use the key as-is.
- memcpy(dest, key, keyLength);
- }
- // pad the remaining space with 0s
- if (keyLength < HMAC_BLOCK_SIZE_BYTES) {
- memset(dest + keyLength, 0, HMAC_BLOCK_SIZE_BYTES-keyLength);
- }
-
- for (int i = 0; i < HMAC_BLOCK_SIZE_BYTES; i++) {
- dest[i] ^= padByte;
- }
-}
diff --git a/libraries/Temboo/src/utility/tmbhmac.h b/libraries/Temboo/src/utility/tmbhmac.h
deleted file mode 100644
index 028b2bd97..000000000
--- a/libraries/Temboo/src/utility/tmbhmac.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
-###############################################################################
-#
-# Temboo Arduino library
-#
-# Copyright 2015, Temboo Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
-# either express or implied. See the License for the specific
-# language governing permissions and limitations under the License.
-#
-###############################################################################
-*/
-
-#ifndef TMBHMAC_H_
-#define TMBHMAC_H_
-#include "tmbmd5.h"
-#include "TembooGlobal.h"
-
-#define HMAC_HASH_SIZE_BYTES (MD5_HASH_SIZE_BYTES)
-#define HMAC_BLOCK_SIZE_BYTES (MD5_BLOCK_SIZE_BYTES)
-
-#define HMAC_HEX_SIZE_BYTES (HMAC_HASH_SIZE_BYTES * 2)
-
-class HMAC
-{
- public:
- HMAC();
- HMAC(const uint8_t* key, uint32_t keyLength);
- void init(const uint8_t* key, uint32_t keyLength);
- void process(const uint8_t* msg, uint32_t msgLength);
- void finish(uint8_t* dest);
- void finishHex(char* dest);
- enum {
- HMAC_OK = 0,
- HMAC_ERROR,
- HMAC_FAIL_TESTVECTOR
- };
-
- private:
- MD5 m_md5;
- const uint8_t* m_key;
- uint32_t m_keyLength;
-
- void constructKeyPad(uint8_t* dest, const uint8_t* key, uint32_t keyLength, uint8_t padByte);
- void toHex(uint8_t* hmac, char* dest);
-};
-#endif
-
diff --git a/libraries/Temboo/src/utility/tmbmd5.cpp b/libraries/Temboo/src/utility/tmbmd5.cpp
deleted file mode 100644
index fe8d7a9d3..000000000
--- a/libraries/Temboo/src/utility/tmbmd5.cpp
+++ /dev/null
@@ -1,213 +0,0 @@
-/*
-###############################################################################
-#
-# Temboo Arduino library
-#
-# Copyright 2015, Temboo Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
-# either express or implied. See the License for the specific
-# language governing permissions and limitations under the License.
-#
-###############################################################################
-*/
-
-
-#include
-#include
-#include "tmbmd5.h"
-
-
-static const uint8_t Worder[64] PROGMEM = {
- 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,
- 1,6,11,0,5,10,15,4,9,14,3,8,13,2,7,12,
- 5,8,11,14,1,4,7,10,13,0,3,6,9,12,15,2,
- 0,7,14,5,12,3,10,1,8,15,6,13,4,11,2,9
-};
-
-static const uint8_t Rorder[64] PROGMEM = {
- 7,12,17,22,7,12,17,22,7,12,17,22,7,12,17,22,
- 5,9,14,20,5,9,14,20,5,9,14,20,5,9,14,20,
- 4,11,16,23,4,11,16,23,4,11,16,23,4,11,16,23,
- 6,10,15,21,6,10,15,21,6,10,15,21,6,10,15,21
-};
-
-static const uint32_t Korder[64] PROGMEM = {
-0xd76aa478UL, 0xe8c7b756UL, 0x242070dbUL, 0xc1bdceeeUL, 0xf57c0fafUL, 0x4787c62aUL, 0xa8304613UL, 0xfd469501UL,
-0x698098d8UL, 0x8b44f7afUL, 0xffff5bb1UL, 0x895cd7beUL, 0x6b901122UL, 0xfd987193UL, 0xa679438eUL, 0x49b40821UL,
-0xf61e2562UL, 0xc040b340UL, 0x265e5a51UL, 0xe9b6c7aaUL, 0xd62f105dUL, 0x02441453UL, 0xd8a1e681UL, 0xe7d3fbc8UL,
-0x21e1cde6UL, 0xc33707d6UL, 0xf4d50d87UL, 0x455a14edUL, 0xa9e3e905UL, 0xfcefa3f8UL, 0x676f02d9UL, 0x8d2a4c8aUL,
-0xfffa3942UL, 0x8771f681UL, 0x6d9d6122UL, 0xfde5380cUL, 0xa4beea44UL, 0x4bdecfa9UL, 0xf6bb4b60UL, 0xbebfbc70UL,
-0x289b7ec6UL, 0xeaa127faUL, 0xd4ef3085UL, 0x04881d05UL, 0xd9d4d039UL, 0xe6db99e5UL, 0x1fa27cf8UL, 0xc4ac5665UL,
-0xf4292244UL, 0x432aff97UL, 0xab9423a7UL, 0xfc93a039UL, 0x655b59c3UL, 0x8f0ccc92UL, 0xffeff47dUL, 0x85845dd1UL,
-0x6fa87e4fUL, 0xfe2ce6e0UL, 0xa3014314UL, 0x4e0811a1UL, 0xf7537e82UL, 0xbd3af235UL, 0x2ad7d2bbUL, 0xeb86d391UL
-};
-
-
-MD5::MD5() {
- init();
-}
-
-void MD5::init() {
- m_state[0] = 0x67452301UL;
- m_state[1] = 0xefcdab89UL;
- m_state[2] = 0x98badcfeUL;
- m_state[3] = 0x10325476UL;
- m_bufLength = 0;
- m_msgLengthBits = 0;
-}
-
-int MD5::compress(const uint8_t* buf) {
- uint32_t a;
- uint32_t b;
- uint32_t c;
- uint32_t d;
- uint32_t i;
- uint32_t W[16];
- uint32_t t;
-
- // Copy data into W[0..15] in an endian-agnostic way
- for (i = 0; i < 16; i++) {
- W[i] = ((uint32_t)(buf[3])) << 24
- | ((uint32_t)(buf[2])) << 16
- | ((uint32_t)(buf[1])) << 8
- | ((uint32_t)(buf[0]));
- buf += 4;
- }
-
- // copy current state
- a = m_state[0];
- b = m_state[1];
- c = m_state[2];
- d = m_state[3];
-
- for (i = 0; i < 16; ++i) {
- FF(&a,b,c,d,W[pgm_read_byte(&Worder[i])],pgm_read_byte(&Rorder[i]),pgm_read_dword(&Korder[i]));
- t = d; d = c; c = b; b = a; a = t;
- }
-
- for (; i < 32; ++i) {
- GG(&a,b,c,d,W[pgm_read_byte(&Worder[i])],pgm_read_byte(&Rorder[i]),pgm_read_dword(&Korder[i]));
- t = d; d = c; c = b; b = a; a = t;
- }
-
- for (; i < 48; ++i) {
- HH(&a,b,c,d,W[pgm_read_byte(&Worder[i])],pgm_read_byte(&Rorder[i]),pgm_read_dword(&Korder[i]));
- t = d; d = c; c = b; b = a; a = t;
- }
-
- for (; i < 64; ++i) {
- II(&a,b,c,d,W[pgm_read_byte(&Worder[i])],pgm_read_byte(&Rorder[i]),pgm_read_dword(&Korder[i]));
- t = d; d = c; c = b; b = a; a = t;
- }
-
- m_state[0] = m_state[0] + a;
- m_state[1] = m_state[1] + b;
- m_state[2] = m_state[2] + c;
- m_state[3] = m_state[3] + d;
-
- return MD5::MD5_OK;
-}
-
-int MD5::process (const uint8_t* msg, uint32_t msgLengthBytes) {
- uint32_t n;
- int err;
-
- if (m_bufLength >= sizeof(m_buf)) {
- return MD5::MD5_INVALID_ARG;
- }
-
- while (msgLengthBytes > 0) {
-
- // Process the input msg in 64 byte chunks
- if (m_bufLength == 0 && msgLengthBytes >= 64) {
- err = compress (msg);
- if (err != MD5::MD5_OK) {
- return err;
- }
- m_msgLengthBits += 64 * 8;
- msg += 64;
- msgLengthBytes -= 64;
- } else {
- n = 64 - m_bufLength;
- if (msgLengthBytes < n) {
- n = msgLengthBytes;
- }
- memcpy(m_buf + m_bufLength, msg, (size_t)n);
- m_bufLength += n;
- msg += n;
- msgLengthBytes -= n;
- if (m_bufLength == 64) {
- err = compress (m_buf);
- if (err != MD5::MD5_OK) {
- return err;
- }
- m_msgLengthBits += 64 * 8;
- m_bufLength = 0;
- }
- }
- }
- return MD5::MD5_OK;
-}
-
-
-int MD5::finish(uint8_t* out) {
- int i;
-
- if (m_bufLength >= sizeof(m_buf)) {
- return MD5::MD5_INVALID_ARG;
- }
-
- m_msgLengthBits += m_bufLength * 8;
-
- // append a '1' bit (right-padded with zeros)
- m_buf[m_bufLength++] = (uint8_t)0x80;
-
- // if the bufLength is > 56 bytes, pad with zeros then compress.
- // Then fall back to padding with zeros and length encoding like normal.
- if (m_bufLength > 56) {
- while (m_bufLength < 64) {
- m_buf[m_bufLength++] = (uint8_t)0;
- }
- compress(m_buf);
- m_bufLength = 0;
- }
-
- // pad with zeroes up to 56 bytes.
- // (Why 56? because we store the 8-byte length at the end.)
- // (What if bufLength == 56? Perfect! No padding prior to 8-byte length needed.)
- while (m_bufLength < 56) {
- m_buf[m_bufLength++] = (uint8_t)0;
- }
-
- // add the length in an endian-agnostic way
- m_buf[56] = (uint8_t)((m_msgLengthBits ) & 255);
- m_buf[57] = (uint8_t)((m_msgLengthBits >> 8) & 255);
- m_buf[58] = (uint8_t)((m_msgLengthBits >> 16) & 255);
- m_buf[59] = (uint8_t)((m_msgLengthBits >> 24) & 255);
- m_buf[60] = (uint8_t)((m_msgLengthBits >> 32) & 255);
- m_buf[61] = (uint8_t)((m_msgLengthBits >> 40) & 255);
- m_buf[62] = (uint8_t)((m_msgLengthBits >> 48) & 255);
- m_buf[63] = (uint8_t)((m_msgLengthBits >> 56) & 255);
-
- compress(m_buf);
-
- // copy the state to the output in an endian-agnostic way
- for (i = 0; i < 4; i++) {
- out[0] = m_state[i] & 255;
- out[1] = (m_state[i] >> 8) & 255;
- out[2] = (m_state[i] >> 16) & 255;
- out[3] = (m_state[i] >> 24) & 255;
- out += 4;
- }
- return MD5::MD5_OK;
-}
-
diff --git a/libraries/Temboo/src/utility/tmbmd5.h b/libraries/Temboo/src/utility/tmbmd5.h
deleted file mode 100644
index 9c22c4376..000000000
--- a/libraries/Temboo/src/utility/tmbmd5.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
-###############################################################################
-#
-# Temboo Arduino library
-#
-# Copyright 2015, Temboo Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
-# either express or implied. See the License for the specific
-# language governing permissions and limitations under the License.
-#
-###############################################################################
-*/
-
-#ifndef TMBMD5_H_
-#define TMBMD5_H_
-
-#include
-#include "TembooGlobal.h"
-
-#define MD5_HASH_SIZE_BITS (128)
-#define MD5_HASH_SIZE_BYTES (MD5_HASH_SIZE_BITS/8)
-
-#define MD5_BLOCK_SIZE_BITS (512)
-#define MD5_BLOCK_SIZE_BYTES (MD5_BLOCK_SIZE_BITS/8)
-
-
-#define ROL(x, y) ( (((uint32_t)(x)<<(uint32_t)((y)&31)) | (((uint32_t)(x)&0xFFFFFFFFUL)>>(uint32_t)(32-((y)&31)))) & 0xFFFFFFFFUL)
-class MD5 {
-
-public:
- MD5();
- void init();
- int process(const uint8_t* in, uint32_t inlen);
- int finish(uint8_t* hash);
- enum {
- MD5_OK = 0,
- MD5_ERROR,
- MD5_INVALID_ARG,
- MD5_FAIL_TESTVECTOR
- };
-
-private:
- uint64_t m_msgLengthBits;
- uint32_t m_state[4];
- uint32_t m_bufLength;
- uint8_t m_buf[64];
-
- int compress(const uint8_t* buf);
-
- inline uint32_t F_(uint32_t x, uint32_t y, uint32_t z) { return (z ^ (x & (y ^ z))); }
- inline uint32_t G_(uint32_t x, uint32_t y, uint32_t z) { return (y ^ (z & (y ^ x))); }
- inline uint32_t H_(uint32_t x, uint32_t y, uint32_t z) { return (x^y^z); }
- inline uint32_t I_(uint32_t x, uint32_t y, uint32_t z) { return (y^(x|(~z))); }
-
-
- inline void FF(uint32_t* a, uint32_t b, uint32_t c, uint32_t d, uint32_t M, uint32_t s, uint32_t t) { *a = (*a + F_(b,c,d) + M + t); *a = ROL(*a, s) + b; }
- inline void GG(uint32_t* a, uint32_t b, uint32_t c, uint32_t d, uint32_t M, uint32_t s, uint32_t t) { *a = (*a + G_(b,c,d) + M + t); *a = ROL(*a, s) + b; }
- inline void HH(uint32_t* a, uint32_t b, uint32_t c, uint32_t d, uint32_t M, uint32_t s, uint32_t t) { *a = (*a + H_(b,c,d) + M + t); *a = ROL(*a, s) + b; }
- inline void II(uint32_t* a, uint32_t b, uint32_t c, uint32_t d, uint32_t M, uint32_t s, uint32_t t) { *a = (*a + I_(b,c,d) + M + t); *a = ROL(*a, s) + b; }
-
-};
-
-#endif