Skip to content

Commit 512e959

Browse files
committed
Introduce INTERRUPT_TOPIC_PREFIX macro
1 parent 9f6590e commit 512e959

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

src/Primitives/arduino.cpp

+7-5
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,13 @@ int isr_index = 0;
7878
} \
7979
}
8080

81-
/* Private macro to create an ISR for a specific pin*/
82-
#define topic(pin) "interrupt_" #pin
81+
#define INTERRUPT_TOPIC_PREFIX "interrupt_"
8382

84-
#define def_isr(pin) \
85-
void isr_##pin() { CallbackHandler::push_event(#pin, "", 0); }
83+
/* Private macro to create an ISR for a specific pin*/
84+
#define def_isr(pin) \
85+
void isr_##pin() { \
86+
CallbackHandler::push_event(INTERRUPT_TOPIC_PREFIX #pin, "", 0); \
87+
}
8688

8789
/* Common GPIO pins on ESP32 devices:*/
8890
def_isr(1);
@@ -613,7 +615,7 @@ def_prim(subscribe_interrupt, threeToNoneU32) {
613615

614616
attachInterrupt(digitalPinToInterrupt(pin), ISRs[index].ISR_callback, mode);
615617

616-
String callback_id = "interrupt_";
618+
String callback_id = INTERRUPT_TOPIC_PREFIX;
617619
callback_id += String(pin);
618620
Callback c = Callback(m, callback_id.c_str(), fidx);
619621
CallbackHandler::add_callback(c);

0 commit comments

Comments
 (0)