From 57e2c152f1575a5eb420cd12dbf464bf1ad06f74 Mon Sep 17 00:00:00 2001 From: "David A. Mellis" Date: Wed, 11 Aug 2010 22:59:00 +0000 Subject: [PATCH] Adding shiftIn() from Wiring (no count or delaytime though). --- build/shared/lib/keywords.txt | 1 + hardware/arduino/cores/arduino/wiring.h | 3 ++- hardware/arduino/cores/arduino/wiring_shift.c | 19 +++++++++++++++++-- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/build/shared/lib/keywords.txt b/build/shared/lib/keywords.txt index 64a89f794..ad53668b2 100644 --- a/build/shared/lib/keywords.txt +++ b/build/shared/lib/keywords.txt @@ -157,6 +157,7 @@ noInterrupts KEYWORD2 NoInterrupts noTone KEYWORD2 NoTone pinMode KEYWORD2 PinMode pulseIn KEYWORD2 PulseIn +shiftIn KEYWORD2 ShiftIn shiftOut KEYWORD2 ShiftOut tone KEYWORD2 Tone diff --git a/hardware/arduino/cores/arduino/wiring.h b/hardware/arduino/cores/arduino/wiring.h index d0ce1c314..6f6129332 100755 --- a/hardware/arduino/cores/arduino/wiring.h +++ b/hardware/arduino/cores/arduino/wiring.h @@ -117,7 +117,8 @@ void delay(unsigned long); void delayMicroseconds(unsigned int us); unsigned long pulseIn(uint8_t pin, uint8_t state, unsigned long timeout); -void shiftOut(uint8_t dataPin, uint8_t clockPin, uint8_t bitOrder, byte val); +void shiftOut(uint8_t dataPin, uint8_t clockPin, uint8_t bitOrder, uint8_t val); +uint8_t shiftIn(uint8_t dataPin, uint8_t clockPin, uint8_t bitOrder); void attachInterrupt(uint8_t, void (*)(void), int mode); void detachInterrupt(uint8_t); diff --git a/hardware/arduino/cores/arduino/wiring_shift.c b/hardware/arduino/cores/arduino/wiring_shift.c index 956f86429..cfe786758 100755 --- a/hardware/arduino/cores/arduino/wiring_shift.c +++ b/hardware/arduino/cores/arduino/wiring_shift.c @@ -24,9 +24,24 @@ #include "wiring_private.h" -void shiftOut(uint8_t dataPin, uint8_t clockPin, uint8_t bitOrder, byte val) +uint8_t shiftIn(uint8_t dataPin, uint8_t clockPin, uint8_t bitOrder) { + uint8_t value = 0; + uint8_t i; + + for (i = 0; i < 8; ++i) { + digitalWrite(clockPin, HIGH); + if (bitOrder == LSBFIRST) + value |= digitalRead(dataPin) << i; + else + value |= digitalRead(dataPin) << (7 - i); + digitalWrite(clockPin, LOW); + } + return value; +} + +void shiftOut(uint8_t dataPin, uint8_t clockPin, uint8_t bitOrder, uint8_t val) { - int i; + uint8_t i; for (i = 0; i < 8; i++) { if (bitOrder == LSBFIRST)