aboutsummaryrefslogtreecommitdiff
path: root/libraries/SPI
diff options
context:
space:
mode:
authorFederico Fissore <f.fissore@arduino.cc>2013-05-13 16:58:10 +0200
committerFederico Fissore <f.fissore@arduino.cc>2013-05-13 16:58:10 +0200
commitb70954ea256f94afdd941e2c89a086887b496c13 (patch)
treebd9fb74f61b1351a32b8b48cef8f04863d9d6df8 /libraries/SPI
parentc48c0f9e2cebe0e3ebda7aa5c4f9096b9586ed9e (diff)
parent7207108255a772474b322151cb0fd113e8030afe (diff)
Merge remote-tracking branch 'arduino/ide-1.5.x' into ide-1.5.x-discovery
Diffstat (limited to 'libraries/SPI')
-rw-r--r--libraries/SPI/examples/DigitalPotControl/DigitalPotControl.ino4
1 files changed, 2 insertions, 2 deletions
diff --git a/libraries/SPI/examples/DigitalPotControl/DigitalPotControl.ino b/libraries/SPI/examples/DigitalPotControl/DigitalPotControl.ino
index ef97dae..adf93a2 100644
--- a/libraries/SPI/examples/DigitalPotControl/DigitalPotControl.ino
+++ b/libraries/SPI/examples/DigitalPotControl/DigitalPotControl.ino
@@ -60,7 +60,7 @@ void loop() {
}
-int digitalPotWrite(int address, int value) {
+void digitalPotWrite(int address, int value) {
// take the SS pin low to select the chip:
digitalWrite(slaveSelectPin,LOW);
// send in the address and value via SPI:
@@ -68,4 +68,4 @@ int digitalPotWrite(int address, int value) {
SPI.transfer(value);
// take the SS pin high to de-select the chip:
digitalWrite(slaveSelectPin,HIGH);
-} \ No newline at end of file
+}