Skip to content

Merged Namespaced api #135

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 5 commits into
base: master
Choose a base branch
from
Open

Merged Namespaced api #135

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
69eb474
UART: use arduino namespace
facchinm Jan 4, 2019
a39f0d3
SPI: port to ArduinoAPI
facchinm Jan 4, 2019
ebd14de
Port attachInterruptParams
facchinm Sep 18, 2019
256ab78
Move analog_pin_to_channel to main Arduino.h
facchinm Sep 18, 2019
d99ada8
SPI: transactions are required for ArduinoCore-api compliance
facchinm Sep 18, 2019
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
Prev Previous commit
Next Next commit
Port attachInterruptParams
  • Loading branch information
@facchinm
facchinm committed Sep 18, 2019
commit ebd14ded5a31191fcb75b51fbfdcc276400fa41d
24 changes: 16 additions & 8 deletions cores/arduino/WInterrupts.c → cores/arduino/WInterrupts.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,10 @@

#include "wiring_private.h"

static volatile voidFuncPtr intFunc[EXTERNAL_NUM_INTERRUPTS];
static volatile voidFuncPtrParam intFunc[EXTERNAL_NUM_INTERRUPTS];
static void* args[EXTERNAL_NUM_INTERRUPTS];

void attachInterrupt(uint8_t pin, void (*userFunc)(void), PinStatus mode) {
void attachInterruptParam(pin_size_t pin, void (*userFunc)(void*), PinStatus mode, void* params) {

/* Get bit position and check pin validity */
uint8_t bit_pos = digitalPinToBitPosition(pin);
Expand All @@ -46,24 +47,27 @@ void attachInterrupt(uint8_t pin, void (*userFunc)(void), PinStatus mode) {
/* Check interrupt number and apply function pointer to correct array index */
if(interruptNum < EXTERNAL_NUM_INTERRUPTS) {
intFunc[interruptNum] = userFunc;
args[interruptNum] = params;

// Configure the interrupt mode (trigger on low input, any change, rising
// edge, or falling edge). The mode constants were chosen to correspond
// to the configuration bits in the hardware register, so we simply apply
// the setting in the pin control register

int isc_mode;

switch (mode) {
case CHANGE:
mode = PORT_ISC_BOTHEDGES_gc;
isc_mode = PORT_ISC_BOTHEDGES_gc;
break;
case FALLING:
mode = PORT_ISC_FALLING_gc;
isc_mode = PORT_ISC_FALLING_gc;
break;
case RISING:
mode = PORT_ISC_RISING_gc;
isc_mode = PORT_ISC_RISING_gc;
break;
case LOW:
mode = PORT_ISC_LEVEL_gc;
isc_mode = PORT_ISC_LEVEL_gc;
break;
default:
// AVR doesn't support level triggered interrupts
Expand All @@ -80,10 +84,14 @@ void attachInterrupt(uint8_t pin, void (*userFunc)(void), PinStatus mode) {
*pin_ctrl_reg &= ~(PORT_ISC_gm);

/* Apply ISC setting */
*pin_ctrl_reg |= mode;
*pin_ctrl_reg |= isc_mode;
}
}

void attachInterrupt(uint8_t pin, void (*userFunc)(void), PinStatus mode) {
attachInterruptParam(pin, (voidFuncPtrParam)userFunc, mode, NULL);
}

void detachInterrupt(uint8_t pin) {
/* Get bit position and check pin validity */
uint8_t bit_pos = digitalPinToBitPosition(pin);
Expand Down Expand Up @@ -127,7 +135,7 @@ static void port_interrupt_handler(uint8_t port) {
if(intFunc[interrupt_num] != 0){

/* Call function */
intFunc[interrupt_num]();
intFunc[interrupt_num](args[interrupt_num]);
}
}
bit_pos++;
Expand Down