Skip to content

Virtual pins handlers #2

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Virtual pins handlers #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 10 additions & 2 deletions cores/arduino/Arduino.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ void yield(void);
#define INTERNAL INTERNAL1V1
#define INTERNAL2V56 9
#define INTERNAL2V56_EXTCAP 13
#else
#else
#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__) || defined(__AVR_ATmega1284__) || defined(__AVR_ATmega1284P__) || defined(__AVR_ATmega644__) || defined(__AVR_ATmega644A__) || defined(__AVR_ATmega644P__) || defined(__AVR_ATmega644PA__)
#define INTERNAL1V1 2
#define INTERNAL2V56 3
Expand Down Expand Up @@ -171,7 +171,7 @@ extern const uint8_t PROGMEM digital_pin_to_timer_PGM[];

// Get the bit location within the hardware port of the given virtual pin.
// This comes from the pins_*.c file for the active board configuration.
//
//
// These perform slightly better as macros compared to inline functions
//
#define digitalPinToPort(P) ( pgm_read_byte( digital_pin_to_port_PGM + (P) ) )
Expand Down Expand Up @@ -256,4 +256,12 @@ long map(long, long, long, long, long);

#include "pins_arduino.h"

// #define VIRTUAL_PINS
// #define VPINS_TRIGGER
#if defined(VIRTUAL_PINS)
extern void (*virtual_pinMode_handler)(uint8_t pin, uint8_t mode);
extern void (*virtual_digitalWrite_handler)(uint8_t pin, uint8_t val);
extern int (*virtual_digitalRead_handler)(uint8_t pin);
#endif

#endif
36 changes: 27 additions & 9 deletions cores/arduino/wiring_digital.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@

void pinMode(uint8_t pin, uint8_t mode)
{
#if defined(VIRTUAL_PINS) && defined(VPINS_TRIGGER)
if (pin>=NUM_DIGITAL_PINS) return (*virtual_pinMode_handler)(pin,mode);
#endif

uint8_t bit = digitalPinToBitMask(pin);
uint8_t port = digitalPinToPort(pin);
volatile uint8_t *reg, *out;
Expand All @@ -38,7 +42,7 @@ void pinMode(uint8_t pin, uint8_t mode)
reg = portModeRegister(port);
out = portOutputRegister(port);

if (mode == INPUT) {
if (mode == INPUT) {
uint8_t oldSREG = SREG;
cli();
*reg &= ~bit;
Expand Down Expand Up @@ -85,15 +89,15 @@ static void turnOffPWM(uint8_t timer)
#if defined(TCCR1A) && defined(COM1C1)
case TIMER1C: cbi(TCCR1A, COM1C1); break;
#endif

#if defined(TCCR2) && defined(COM21)
case TIMER2: cbi(TCCR2, COM21); break;
#endif

#if defined(TCCR0A) && defined(COM0A1)
case TIMER0A: cbi(TCCR0A, COM0A1); break;
#endif

#if defined(TCCR0A) && defined(COM0B1)
case TIMER0B: cbi(TCCR0A, COM0B1); break;
#endif
Expand All @@ -103,7 +107,7 @@ static void turnOffPWM(uint8_t timer)
#if defined(TCCR2A) && defined(COM2B1)
case TIMER2B: cbi(TCCR2A, COM2B1); break;
#endif

#if defined(TCCR3A) && defined(COM3A1)
case TIMER3A: cbi(TCCR3A, COM3A1); break;
#endif
Expand All @@ -116,17 +120,17 @@ static void turnOffPWM(uint8_t timer)

#if defined(TCCR4A) && defined(COM4A1)
case TIMER4A: cbi(TCCR4A, COM4A1); break;
#endif
#endif
#if defined(TCCR4A) && defined(COM4B1)
case TIMER4B: cbi(TCCR4A, COM4B1); break;
#endif
#if defined(TCCR4A) && defined(COM4C1)
case TIMER4C: cbi(TCCR4A, COM4C1); break;
#endif
#endif
#if defined(TCCR4C) && defined(COM4D1)
case TIMER4D: cbi(TCCR4C, COM4D1); break;
#endif
#endif

#if defined(TCCR5A)
case TIMER5A: cbi(TCCR5A, COM5A1); break;
case TIMER5B: cbi(TCCR5A, COM5B1); break;
Expand All @@ -137,6 +141,9 @@ static void turnOffPWM(uint8_t timer)

void digitalWrite(uint8_t pin, uint8_t val)
{
#if defined(VIRTUAL_PINS) && defined(VPINS_TRIGGER)
if (pin>=NUM_DIGITAL_PINS) return (*virtual_digitalWrite_handler)(pin,val);
#endif
uint8_t timer = digitalPinToTimer(pin);
uint8_t bit = digitalPinToBitMask(pin);
uint8_t port = digitalPinToPort(pin);
Expand Down Expand Up @@ -164,6 +171,9 @@ void digitalWrite(uint8_t pin, uint8_t val)

int digitalRead(uint8_t pin)
{
#if defined(VIRTUAL_PINS) && defined(VPINS_TRIGGER)
if (pin>=NUM_DIGITAL_PINS) return (*virtual_digitalRead_handler)(pin);
#endif
uint8_t timer = digitalPinToTimer(pin);
uint8_t bit = digitalPinToBitMask(pin);
uint8_t port = digitalPinToPort(pin);
Expand All @@ -177,3 +187,11 @@ int digitalRead(uint8_t pin)
if (*portInputRegister(port) & bit) return HIGH;
return LOW;
}

#if defined(VIRTUAL_PINS)
void virtual_defaultHandler(uint8_t pin, uint8_t val) {}
int virtual_defaultRead_handler(uint8_t pin) {return LOW;}
void (*virtual_pinMode_handler)(uint8_t pin, uint8_t mode)=virtual_defaultHandler;
void (*virtual_digitalWrite_handler)(uint8_t pin, uint8_t val)=virtual_defaultHandler;
int (*virtual_digitalRead_handler)(uint8_t pin)=virtual_defaultRead_handler;
#endif