Skip to content

Commit b9c7147

Browse files
committed
Revert "VIDOR: let library tweak digital* to allow virtual pins"
This reverts commit e41aa63. This reverts commit 1c1d59b. This reverts commit 68c7334.
1 parent a18b101 commit b9c7147

File tree

2 files changed

+4
-36
lines changed

2 files changed

+4
-36
lines changed

cores/arduino/wiring_analog.c

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@
2323
extern "C" {
2424
#endif
2525

26-
void analogWriteExtended( uint32_t pin, uint32_t value ) __attribute__((weak));
27-
2826
static int _readResolution = 10;
2927
static int _ADCResolution = 10;
3028
static int _writeResolution = 8;
@@ -191,14 +189,6 @@ uint32_t analogRead(uint32_t pin)
191189
// to digital output.
192190
void analogWrite(uint32_t pin, uint32_t value)
193191
{
194-
195-
// Handle the case the pin isn't usable as PIO
196-
if ( pin > PINS_COUNT || g_APinDescription[pin].ulPinType == PIO_NOT_A_PIN )
197-
{
198-
analogWriteExtended(pin, value);
199-
return ;
200-
}
201-
202192
PinDescription pinDesc = g_APinDescription[pin];
203193
uint32_t attr = pinDesc.ulPinAttribute;
204194

cores/arduino/wiring_digital.c

Lines changed: 4 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -22,31 +22,11 @@
2222
extern "C" {
2323
#endif
2424

25-
/* These functions can be overriden by a library or a variant to allow operations on virtual pins */
26-
void pinModeExtended( uint32_t ulPin, uint32_t ulMode ) __attribute__((weak));
27-
void digitalWriteExtended( uint32_t ulPin, uint32_t ulVal ) __attribute__((weak));
28-
int digitalReadExtended( uint32_t ulPin ) __attribute__((weak));
29-
30-
void pinModeExtended( uint32_t ulPin, uint32_t ulMode ) {
31-
(void)ulPin;
32-
(void)ulMode;
33-
}
34-
void digitalWriteExtended( uint32_t ulPin, uint32_t ulVal ) {
35-
(void)ulPin;
36-
(void)ulVal;
37-
}
38-
int digitalReadExtended( uint32_t ulPin ) {
39-
(void)ulPin;
40-
return LOW;
41-
}
42-
4325
void pinMode( uint32_t ulPin, uint32_t ulMode )
4426
{
45-
4627
// Handle the case the pin isn't usable as PIO
47-
if ( ulPin > PINS_COUNT || g_APinDescription[ulPin].ulPinType == PIO_NOT_A_PIN )
28+
if ( g_APinDescription[ulPin].ulPinType == PIO_NOT_A_PIN )
4829
{
49-
pinModeExtended(ulPin, ulMode);
5030
return ;
5131
}
5232

@@ -93,11 +73,9 @@ void pinMode( uint32_t ulPin, uint32_t ulMode )
9373

9474
void digitalWrite( uint32_t ulPin, uint32_t ulVal )
9575
{
96-
9776
// Handle the case the pin isn't usable as PIO
98-
if ( ulPin > PINS_COUNT || g_APinDescription[ulPin].ulPinType == PIO_NOT_A_PIN )
77+
if ( g_APinDescription[ulPin].ulPinType == PIO_NOT_A_PIN )
9978
{
100-
digitalWriteExtended( ulPin, ulVal);
10179
return ;
10280
}
10381

@@ -127,9 +105,9 @@ void digitalWrite( uint32_t ulPin, uint32_t ulVal )
127105
int digitalRead( uint32_t ulPin )
128106
{
129107
// Handle the case the pin isn't usable as PIO
130-
if ( ulPin > PINS_COUNT || g_APinDescription[ulPin].ulPinType == PIO_NOT_A_PIN )
108+
if ( g_APinDescription[ulPin].ulPinType == PIO_NOT_A_PIN )
131109
{
132-
return digitalReadExtended( ulPin );
110+
return LOW ;
133111
}
134112

135113
if ( (PORT->Group[g_APinDescription[ulPin].ulPort].IN.reg & (1ul << g_APinDescription[ulPin].ulPin)) != 0 )

0 commit comments

Comments
 (0)