Skip to content

eliminate Firmata related compiler warnings #255

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 21, 2015
Merged

eliminate Firmata related compiler warnings #255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion examples/StandardFirmata/StandardFirmata.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

See file LICENSE.txt for further informations on licensing terms.

Last updated by Jeff Hoefs: December 9th, 2015
Last updated by Jeff Hoefs: December 20th, 2015
*/

#include <Servo.h>
Expand Down Expand Up @@ -517,6 +517,7 @@ void sysexCallback(byte command, byte argc, byte *argv)
if (queryIndex <= 0) {
queryIndex = -1;
} else {
queryIndexToSkip = 0;
// 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
Expand Down
3 changes: 2 additions & 1 deletion examples/StandardFirmataChipKIT/StandardFirmataChipKIT.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

See file LICENSE.txt for further informations on licensing terms.

Last updated by Jeff Hoefs: December 9th, 2015
Last updated by Jeff Hoefs: December 20th, 2015
*/

#include <SoftPWMServo.h> // Gives us PWM and Servo on every pin
Expand Down Expand Up @@ -528,6 +528,7 @@ void sysexCallback(byte command, byte argc, byte *argv)
if (queryIndex <= 0) {
queryIndex = -1;
} else {
queryIndexToSkip = 0;
// 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
Expand Down
3 changes: 2 additions & 1 deletion examples/StandardFirmataEthernet/StandardFirmataEthernet.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

See file LICENSE.txt for further informations on licensing terms.

Last updated by Jeff Hoefs: December 9th, 2015
Last updated by Jeff Hoefs: December 20th, 2015
*/

/*
Expand Down Expand Up @@ -635,6 +635,7 @@ void sysexCallback(byte command, byte argc, byte *argv)
if (queryIndex <= 0) {
queryIndex = -1;
} else {
queryIndexToSkip = 0;
// 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
Expand Down
18 changes: 11 additions & 7 deletions examples/StandardFirmataEthernetPlus/StandardFirmataEthernetPlus.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

See file LICENSE.txt for further informations on licensing terms.

Last updated by Jeff Hoefs: December 19th, 2015
Last updated by Jeff Hoefs: December 20th, 2015
*/

/*
Expand Down Expand Up @@ -723,6 +723,7 @@ void sysexCallback(byte command, byte argc, byte *argv)
if (queryIndex <= 0) {
queryIndex = -1;
} else {
queryIndexToSkip = 0;
// 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
Expand Down Expand Up @@ -862,11 +863,6 @@ void sysexCallback(byte command, byte argc, byte *argv)
byte swTxPin, swRxPin;
serial_pins pins;

if (portId > 7 && argc > 4) {
swRxPin = argv[4];
swTxPin = argv[5];
}

if (portId < 8) {
serialPort = getPortFromId(portId);
if (serialPort != NULL) {
Expand All @@ -882,6 +878,14 @@ void sysexCallback(byte command, byte argc, byte *argv)
}
} else {
#if defined(SoftwareSerial_h)
if (argc > 4) {
swRxPin = argv[4];
swTxPin = argv[5];
} else {
// RX and TX pins must be specified when using SW serial
Firmata.sendString("Specify serial RX and TX pins");
return;
}
switch (portId) {
case SW_SERIAL0:
if (swSerial0 == NULL) {
Expand Down Expand Up @@ -943,7 +947,7 @@ void sysexCallback(byte command, byte argc, byte *argv)
serialIndex++;
reportSerial[serialIndex] = portId;
} else if (argv[1] == SERIAL_STOP_READING) {
byte serialIndexToSkip;
byte serialIndexToSkip = 0;
if (serialIndex <= 0) {
serialIndex = -1;
} else {
Expand Down
18 changes: 11 additions & 7 deletions examples/StandardFirmataPlus/StandardFirmataPlus.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

See file LICENSE.txt for further informations on licensing terms.

Last updated by Jeff Hoefs: December 19th, 2015
Last updated by Jeff Hoefs: December 20th, 2015
*/

/*
Expand Down Expand Up @@ -655,6 +655,7 @@ void sysexCallback(byte command, byte argc, byte *argv)
if (queryIndex <= 0) {
queryIndex = -1;
} else {
queryIndexToSkip = 0;
// 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
Expand Down Expand Up @@ -798,11 +799,6 @@ void sysexCallback(byte command, byte argc, byte *argv)
byte swTxPin, swRxPin;
serial_pins pins;

if (portId > 7 && argc > 4) {
swRxPin = argv[4];
swTxPin = argv[5];
}

if (portId < 8) {
serialPort = getPortFromId(portId);
if (serialPort != NULL) {
Expand All @@ -818,6 +814,14 @@ void sysexCallback(byte command, byte argc, byte *argv)
}
} else {
#if defined(SoftwareSerial_h)
if (argc > 4) {
swRxPin = argv[4];
swTxPin = argv[5];
} else {
// RX and TX pins must be specified when using SW serial
Firmata.sendString("Specify serial RX and TX pins");
return;
}
switch (portId) {
case SW_SERIAL0:
if (swSerial0 == NULL) {
Expand Down Expand Up @@ -879,7 +883,7 @@ void sysexCallback(byte command, byte argc, byte *argv)
serialIndex++;
reportSerial[serialIndex] = portId;
} else if (argv[1] == SERIAL_STOP_READING) {
byte serialIndexToSkip;
byte serialIndexToSkip = 0;
if (serialIndex <= 0) {
serialIndex = -1;
} else {
Expand Down
2 changes: 1 addition & 1 deletion readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ The second and more common model is to load a general purpose sketch called Stan
##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
* processing
* [https://github.com/firmata/processing]
* [http://funnel.cc]
* python
Expand Down
8 changes: 4 additions & 4 deletions utility/EthernetClientStream.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@
#define MILLIS_RECONNECT 5000

EthernetClientStream::EthernetClientStream(Client &client, IPAddress localip, IPAddress ip, const char* host, uint16_t port)
: ip(ip),
: client(client),
localip(localip),
ip(ip),
host(host),
port(port),
connected(false),
client(client),
localip(localip)
connected(false)
{
}

Expand Down
2 changes: 1 addition & 1 deletion utility/EthernetClientStream.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@ class EthernetClientStream : public Stream
void maintain(IPAddress localip);

private:
Client &client;
IPAddress localip;
IPAddress ip;
const char* host;
uint16_t port;
Client &client;
bool connected;
uint32_t time_connect;
bool maintain();
Expand Down