Skip to content

Enable digitalRead on output pins, only enable pull-up in digitalWrite if pin is not output #101

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 5 commits into from
Jul 8, 2016
Merged

Enable digitalRead on output pins, only enable pull-up in digitalWrite if pin is not output #101

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e431bf7
Enable input on pinMode OUTPUT to support reading back current value …
sandeepmistry Jan 21, 2016
ba0488d
Disable pull-ups on pinMode OUTPUT
sandeepmistry Jan 21, 2016
0f3f80a
Only update pull-up value in digitalWrite if pin direction is not output
sandeepmistry Jan 21, 2016
bf454d8
Clean up port, pin, and pin mask duplication in digitalWrite
sandeepmistry Jan 21, 2016
a08cb3f
Make assigning PULLEN value in digitalWrite a bit clearer
sandeepmistry Jan 21, 2016
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
21 changes: 16 additions & 5 deletions cores/arduino/wiring_digital.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,13 @@ void pinMode( uint32_t ulPin, uint32_t ulMode )
break ;

case OUTPUT:
// enable input, to support reading back values
PORT->Group[g_APinDescription[ulPin].ulPort].PINCFG[g_APinDescription[ulPin].ulPin].bit.INEN = 1 ;

// disable pullups
PORT->Group[g_APinDescription[ulPin].ulPort].PINCFG[g_APinDescription[ulPin].ulPin].bit.PULLEN = 0 ;

// Set pin to output mode
PORT->Group[g_APinDescription[ulPin].ulPort].PINCFG[g_APinDescription[ulPin].ulPin].reg&=~(uint8_t)(PORT_PINCFG_INEN) ;
PORT->Group[g_APinDescription[ulPin].ulPort].DIRSET.reg = (uint32_t)(1<<g_APinDescription[ulPin].ulPin) ;
break ;

Expand All @@ -77,17 +82,23 @@ void digitalWrite( uint32_t ulPin, uint32_t ulVal )
return ;
}

// Enable pull-up resistor
PORT->Group[g_APinDescription[ulPin].ulPort].PINCFG[g_APinDescription[ulPin].ulPin].reg=(uint8_t)(PORT_PINCFG_PULLEN) ;
EPortType port = g_APinDescription[ulPin].ulPort;
uint32_t pin = g_APinDescription[ulPin].ulPin;
uint32_t pinMask = (1ul << pin);

if ( (PORT->Group[port].DIRSET.reg & pinMask) == 0 ) {
// the pin is not an output, disable pull-up if val is LOW, otherwise enable pull-up
PORT->Group[port].PINCFG[pin].bit.PULLEN = ((ulVal == LOW) ? 0 : 1) ;
}

switch ( ulVal )
{
case LOW:
PORT->Group[g_APinDescription[ulPin].ulPort].OUTCLR.reg = (1ul << g_APinDescription[ulPin].ulPin) ;
PORT->Group[port].OUTCLR.reg = pinMask;
break ;

default:
PORT->Group[g_APinDescription[ulPin].ulPort].OUTSET.reg = (1ul << g_APinDescription[ulPin].ulPin) ;
PORT->Group[port].OUTSET.reg = pinMask;
break ;
}

Expand Down