Adding INPUT_PULLUP option pinMode(). (Paul Stoffregen).
This also changes pinMode(pin, INPUT); to explicitly disable the pull-up resistor, even if it was previously set. http://code.google.com/p/arduino/issues/detail?id=246
This commit is contained in:
parent
3b962be273
commit
6c00397e22
|
@ -20,6 +20,7 @@ extern "C"{
|
||||||
|
|
||||||
#define INPUT 0x0
|
#define INPUT 0x0
|
||||||
#define OUTPUT 0x1
|
#define OUTPUT 0x1
|
||||||
|
#define INPUT_PULLUP 0x2
|
||||||
|
|
||||||
#define true 0x1
|
#define true 0x1
|
||||||
#define false 0x0
|
#define false 0x0
|
||||||
|
|
|
@ -32,17 +32,25 @@ void pinMode(uint8_t pin, uint8_t mode)
|
||||||
{
|
{
|
||||||
uint8_t bit = digitalPinToBitMask(pin);
|
uint8_t bit = digitalPinToBitMask(pin);
|
||||||
uint8_t port = digitalPinToPort(pin);
|
uint8_t port = digitalPinToPort(pin);
|
||||||
volatile uint8_t *reg;
|
volatile uint8_t *reg, *out;
|
||||||
|
|
||||||
if (port == NOT_A_PIN) return;
|
if (port == NOT_A_PIN) return;
|
||||||
|
|
||||||
// JWS: can I let the optimizer do this?
|
// JWS: can I let the optimizer do this?
|
||||||
reg = portModeRegister(port);
|
reg = portModeRegister(port);
|
||||||
|
out = portOutputRegister(port);
|
||||||
|
|
||||||
if (mode == INPUT) {
|
if (mode == INPUT) {
|
||||||
uint8_t oldSREG = SREG;
|
uint8_t oldSREG = SREG;
|
||||||
cli();
|
cli();
|
||||||
*reg &= ~bit;
|
*reg &= ~bit;
|
||||||
|
*out &= ~bit;
|
||||||
|
SREG = oldSREG;
|
||||||
|
} else if (mode == INPUT_PULLUP) {
|
||||||
|
uint8_t oldSREG = SREG;
|
||||||
|
cli();
|
||||||
|
*reg &= ~bit;
|
||||||
|
*out |= bit;
|
||||||
SREG = oldSREG;
|
SREG = oldSREG;
|
||||||
} else {
|
} else {
|
||||||
uint8_t oldSREG = SREG;
|
uint8_t oldSREG = SREG;
|
||||||
|
|
Loading…
Reference in New Issue