Skip to content

Commit 2101b5b

Browse files
soundanalogoussoundanalogous
committed
format configurable examples per Arduino astyle rules. Sync ServoFirmata example
1 parent 74cb070 commit 2101b5b

File tree

13 files changed

+322
-312
lines changed

13 files changed

+322
-312
lines changed

‎examples/AllInputsFirmata/AllInputsFirmata.ino‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* http://firmata.org/wiki/Download
1010
*/
1111

12-
/*
12+
/*
1313
* This firmware reads all inputs and sends them as fast as it can. It was
1414
* inspired by the ease-of-use of the Arduino2Max program.
1515
*
@@ -22,7 +22,7 @@ byte pin;
2222
int analogValue;
2323
int previousAnalogValues[TOTAL_ANALOG_PINS];
2424

25-
byte portStatus[TOTAL_PORTS]; // each bit: 1=pin is digital input, 0=other/ignore
25+
byte portStatus[TOTAL_PORTS]; // each bit: 1=pin is digital input, 0=other/ignore
2626
byte previousPINs[TOTAL_PORTS];
2727

2828
/* timer variables */
@@ -35,7 +35,7 @@ int samplingInterval = 19; // how often to run the main loop (in ms)
3535
void sendPort(byte portNumber, byte portValue)
3636
{
3737
portValue = portValue & portStatus[portNumber];
38-
if(previousPINs[portNumber] != portValue) {
38+
if (previousPINs[portNumber] != portValue) {
3939
Firmata.sendDigitalPort(portNumber, portValue);
4040
previousPINs[portNumber] = portValue;
4141
}
@@ -47,13 +47,13 @@ void setup()
4747

4848
Firmata.setFirmwareVersion(FIRMATA_MAJOR_VERSION, FIRMATA_MINOR_VERSION);
4949

50-
for(pin = 0; pin < TOTAL_PINS; pin++) {
50+
for (pin = 0; pin < TOTAL_PINS; pin++) {
5151
if IS_PIN_DIGITAL(pin) pinMode(PIN_TO_DIGITAL(pin), INPUT);
5252
}
5353

54-
for (port=0; port<TOTAL_PORTS; port++) {
54+
for (port = 0; port < TOTAL_PORTS; port++) {
5555
status = 0;
56-
for (i=0; i<8; i++) {
56+
for (i = 0; i < 8; i++) {
5757
if (IS_PIN_DIGITAL(port * 8 + i)) status |= (1 << i);
5858
}
5959
portStatus[port] = status;
@@ -66,21 +66,21 @@ void loop()
6666
{
6767
byte i;
6868

69-
for (i=0; i<TOTAL_PORTS; i++) {
70-
sendPort(i, readPort(i, 0xff));
69+
for (i = 0; i < TOTAL_PORTS; i++) {
70+
sendPort(i, readPort(i, 0xff));
7171
}
7272
/* make sure that the FTDI buffer doesn't go over 60 bytes, otherwise you
7373
get long, random delays. So only read analogs every 20ms or so */
7474
currentMillis = millis();
75-
if(currentMillis - previousMillis > samplingInterval) {
75+
if (currentMillis - previousMillis > samplingInterval) {
7676
previousMillis += samplingInterval;
77-
while(Firmata.available()) {
77+
while (Firmata.available()) {
7878
Firmata.processInput();
7979
}
80-
for(pin = 0; pin < TOTAL_ANALOG_PINS; pin++) {
80+
for (pin = 0; pin < TOTAL_ANALOG_PINS; pin++) {
8181
analogValue = analogRead(pin);
82-
if(analogValue != previousAnalogValues[pin]) {
83-
Firmata.sendAnalog(pin, analogValue);
82+
if (analogValue != previousAnalogValues[pin]) {
83+
Firmata.sendAnalog(pin, analogValue);
8484
previousAnalogValues[pin] = analogValue;
8585
}
8686
}

‎examples/AnalogFirmata/AnalogFirmata.ino‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -32,63 +32,63 @@ unsigned long previousMillis; // for comparison with currentMillis
3232

3333

3434
/*==============================================================================
35-
* FUNCTIONS
35+
* FUNCTIONS
3636
*============================================================================*/
3737

3838
void analogWriteCallback(byte pin, int value)
3939
{
40-
switch(pin) {
40+
switch (pin) {
4141
case 9: servo9.write(value); break;
4242
case 10: servo10.write(value); break;
43-
case 3:
44-
case 5:
45-
case 6:
43+
case 3:
44+
case 5:
45+
case 6:
4646
case 11: // PWM pins
47-
analogWrite(pin, value);
48-
break;
49-
}
47+
analogWrite(pin, value);
48+
break;
49+
}
5050
}
5151
// -----------------------------------------------------------------------------
5252
// sets bits in a bit array (int) to toggle the reporting of the analogIns
5353
void reportAnalogCallback(byte pin, int value)
5454
{
55-
if(value == 0) {
56-
analogInputsToReport = analogInputsToReport &~ (1 << pin);
57-
}
58-
else { // everything but 0 enables reporting of that pin
59-
analogInputsToReport = analogInputsToReport | (1 << pin);
60-
}
61-
// TODO: save status to EEPROM here, if changed
55+
if (value == 0) {
56+
analogInputsToReport = analogInputsToReport & ~ (1 << pin);
57+
}
58+
else { // everything but 0 enables reporting of that pin
59+
analogInputsToReport = analogInputsToReport | (1 << pin);
60+
}
61+
// TODO: save status to EEPROM here, if changed
6262
}
6363

6464
/*==============================================================================
6565
* SETUP()
6666
*============================================================================*/
67-
void setup()
67+
void setup()
6868
{
69-
Firmata.setFirmwareVersion(FIRMATA_MAJOR_VERSION, FIRMATA_MINOR_VERSION);
70-
Firmata.attach(ANALOG_MESSAGE, analogWriteCallback);
71-
Firmata.attach(REPORT_ANALOG, reportAnalogCallback);
69+
Firmata.setFirmwareVersion(FIRMATA_MAJOR_VERSION, FIRMATA_MINOR_VERSION);
70+
Firmata.attach(ANALOG_MESSAGE, analogWriteCallback);
71+
Firmata.attach(REPORT_ANALOG, reportAnalogCallback);
7272

73-
servo9.attach(9);
74-
servo10.attach(10);
75-
Firmata.begin(57600);
73+
servo9.attach(9);
74+
servo10.attach(10);
75+
Firmata.begin(57600);
7676
}
7777

7878
/*==============================================================================
7979
* LOOP()
8080
*============================================================================*/
81-
void loop()
81+
void loop()
8282
{
83-
while(Firmata.available())
84-
Firmata.processInput();
85-
currentMillis = millis();
86-
if(currentMillis - previousMillis > 20) {
87-
previousMillis += 20; // run this every 20ms
88-
for(analogPin=0;analogPin<TOTAL_ANALOG_PINS;analogPin++) {
89-
if( analogInputsToReport & (1 << analogPin) )
90-
Firmata.sendAnalog(analogPin, analogRead(analogPin));
91-
}
83+
while (Firmata.available())
84+
Firmata.processInput();
85+
currentMillis = millis();
86+
if (currentMillis - previousMillis > 20) {
87+
previousMillis += 20; // run this every 20ms
88+
for (analogPin = 0; analogPin < TOTAL_ANALOG_PINS; analogPin++) {
89+
if ( analogInputsToReport & (1 << analogPin) )
90+
Firmata.sendAnalog(analogPin, analogRead(analogPin));
9291
}
92+
}
9393
}
9494

‎examples/DHT11Firmata/DHT11Feature.cpp‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ boolean DHT11Feature::handlePinMode(byte pin, int mode)
3131
return false;
3232
}
3333

34-
boolean DHT11Feature::handleSysex(byte command, byte argc, byte* argv)
34+
boolean DHT11Feature::handleSysex(byte command, byte argc, byte *argv)
3535
{
3636
return false;
3737
}
@@ -43,30 +43,30 @@ void DHT11Feature::reset()
4343

4444
void DHT11Feature::report()
4545
{
46-
for (byte i=0; i<TOTAL_PINS;i++) {
47-
if (DHT11_PIN==Firmata.getPinMode(i)) {
46+
for (byte i = 0; i < TOTAL_PINS; i++) {
47+
if (DHT11_PIN == Firmata.getPinMode(i)) {
4848
int result = DHT11.read(i);
49-
switch(result) {
50-
case DHTLIB_OK:
51-
Firmata.write(START_SYSEX);
52-
Firmata.write(RESERVED_COMMAND);
53-
Firmata.write(DHT11_PIN);
54-
Firmata.write(i);
55-
Firmata.write(DHT11.temperature & 0x7F);
56-
Firmata.write(DHT11.temperature >> 7 & 0x7F);
57-
Firmata.write(DHT11.humidity & 0x7F);
58-
Firmata.write(DHT11.humidity >> 7 & 0x7F);
59-
Firmata.write(END_SYSEX);
60-
break;
61-
case DHTLIB_ERROR_CHECKSUM:
62-
Firmata.sendString("DHT11 error checksum");
63-
break;
64-
case DHTLIB_ERROR_TIMEOUT:
65-
Firmata.sendString("DHT11 error timeout");
66-
break;
67-
default:
68-
Firmata.sendString("DHT11 error unknown");
69-
break;
49+
switch (result) {
50+
case DHTLIB_OK:
51+
Firmata.write(START_SYSEX);
52+
Firmata.write(RESERVED_COMMAND);
53+
Firmata.write(DHT11_PIN);
54+
Firmata.write(i);
55+
Firmata.write(DHT11.temperature & 0x7F);
56+
Firmata.write(DHT11.temperature >> 7 & 0x7F);
57+
Firmata.write(DHT11.humidity & 0x7F);
58+
Firmata.write(DHT11.humidity >> 7 & 0x7F);
59+
Firmata.write(END_SYSEX);
60+
break;
61+
case DHTLIB_ERROR_CHECKSUM:
62+
Firmata.sendString("DHT11 error checksum");
63+
break;
64+
case DHTLIB_ERROR_TIMEOUT:
65+
Firmata.sendString("DHT11 error timeout");
66+
break;
67+
default:
68+
Firmata.sendString("DHT11 error unknown");
69+
break;
7070
}
7171
}
7272
}

‎examples/DHT11Firmata/DHT11Feature.h‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,16 @@
2424
#define RESERVED_COMMAND 0x00
2525

2626
class DHT11Feature:
27-
public FirmataFeature
27+
public FirmataFeature
2828
{
29-
public:
30-
void handleCapability(byte pin);
31-
boolean handlePinMode(byte pin, int mode);
32-
boolean handleSysex(byte command, byte argc, byte* argv);
33-
void reset();
34-
void report();
35-
private:
36-
dht11 DHT11;
29+
public:
30+
void handleCapability(byte pin);
31+
boolean handlePinMode(byte pin, int mode);
32+
boolean handleSysex(byte command, byte argc, byte *argv);
33+
void reset();
34+
void report();
35+
private:
36+
dht11 DHT11;
3737
};
3838

3939
#endif

‎examples/DHT11Firmata/DHT11Firmata.ino‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ systemResetCallback()
3131
if (IS_PIN_ANALOG(pin)) {
3232
pinMode(pin, ANALOG);
3333
digitalWrite(PIN_TO_DIGITAL(pin), LOW); // disable internal pull-ups
34-
}
34+
}
3535
else {
3636
pinMode(pin, OUTPUT);
37-
digitalWrite(pin,0); // sets the output to 0
37+
digitalWrite(pin, 0); // sets the output to 0
3838
}
3939
}
4040
firmataExt.reset();
@@ -54,9 +54,9 @@ setup()
5454
systemResetCallback(); // reset to default config
5555
}
5656

57-
void loop()
57+
void loop()
5858
{
59-
while(Firmata.available()) {
59+
while (Firmata.available()) {
6060
Firmata.processInput();
6161
}
6262
if (reporting.elapsed()) {

‎examples/DHT11Firmata/dht11.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ int dht11::read(int pin)
3333
uint8_t idx = 0;
3434

3535
// EMPTY BUFFER
36-
for (int i=0; i< 5; i++) bits[i] = 0;
36+
for (int i = 0; i < 5; i++) bits[i] = 0;
3737

3838
// REQUEST SAMPLE
3939
pinMode(pin, OUTPUT);
@@ -45,24 +45,24 @@ int dht11::read(int pin)
4545

4646
// ACKNOWLEDGE or TIMEOUT
4747
unsigned int loopCnt = 10000;
48-
while(digitalRead(pin) == LOW)
48+
while (digitalRead(pin) == LOW)
4949
if (loopCnt-- == 0) return DHTLIB_ERROR_TIMEOUT;
5050

5151
loopCnt = 10000;
52-
while(digitalRead(pin) == HIGH)
52+
while (digitalRead(pin) == HIGH)
5353
if (loopCnt-- == 0) return DHTLIB_ERROR_TIMEOUT;
5454

5555
// READ OUTPUT - 40 BITS => 5 BYTES or TIMEOUT
56-
for (int i=0; i<40; i++)
56+
for (int i = 0; i < 40; i++)
5757
{
5858
loopCnt = 10000;
59-
while(digitalRead(pin) == LOW)
59+
while (digitalRead(pin) == LOW)
6060
if (loopCnt-- == 0) return DHTLIB_ERROR_TIMEOUT;
6161

6262
unsigned long t = micros();
6363

6464
loopCnt = 10000;
65-
while(digitalRead(pin) == HIGH)
65+
while (digitalRead(pin) == HIGH)
6666
if (loopCnt-- == 0) return DHTLIB_ERROR_TIMEOUT;
6767

6868
if ((micros() - t) > 40) bits[idx] |= (1 << cnt);

‎examples/DHT11Firmata/dht11.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,16 @@
2424

2525
#define DHT11LIB_VERSION "0.4.1"
2626

27-
#define DHTLIB_OK 0
27+
#define DHTLIB_OK 0
2828
#define DHTLIB_ERROR_CHECKSUM -1
2929
#define DHTLIB_ERROR_TIMEOUT -2
3030

3131
class dht11
3232
{
33-
public:
34-
int read(int pin);
35-
int humidity;
36-
int temperature;
33+
public:
34+
int read(int pin);
35+
int humidity;
36+
int temperature;
3737
};
3838
#endif
3939
//

‎examples/EchoString/EchoString.ino‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,28 +17,26 @@
1717

1818
void stringCallback(char *myString)
1919
{
20-
Firmata.sendString(myString);
20+
Firmata.sendString(myString);
2121
}
2222

2323

24-
void sysexCallback(byte command, byte argc, byte*argv)
24+
void sysexCallback(byte command, byte argc, byte *argv)
2525
{
26-
Firmata.sendSysex(command, argc, argv);
26+
Firmata.sendSysex(command, argc, argv);
2727
}
2828

2929
void setup()
3030
{
31-
Firmata.setFirmwareVersion(FIRMATA_MAJOR_VERSION, FIRMATA_MINOR_VERSION);
32-
Firmata.attach(STRING_DATA, stringCallback);
33-
Firmata.attach(START_SYSEX, sysexCallback);
34-
Firmata.begin(57600);
31+
Firmata.setFirmwareVersion(FIRMATA_MAJOR_VERSION, FIRMATA_MINOR_VERSION);
32+
Firmata.attach(STRING_DATA, stringCallback);
33+
Firmata.attach(START_SYSEX, sysexCallback);
34+
Firmata.begin(57600);
3535
}
3636

3737
void loop()
3838
{
39-
while(Firmata.available()) {
40-
Firmata.processInput();
41-
}
39+
while (Firmata.available()) {
40+
Firmata.processInput();
41+
}
4242
}
43-
44-

0 commit comments

Comments
 (0)