Renamed hardware specific macro and function names.

Author: ArminJo

changelog.md

@@ -1,5 +1,6 @@
 ## 2.6.2 2020/08
 - Added ATmega328PB support.
+- Renamed hardware specific macro and function names.
 
 ## 2.6.1 2020/08
 - Adjusted JVC and LG timing.

src/IRremote.cpp

@@ -127,7 +127,7 @@ int MATCH_SPACE(int measured_ticks, int desired_us) {
 //   Gap width is recorded; Ready is cleared; New logging starts
 //
 ISR (TIMER_INTR_NAME) {
-    TIMER_RESET; // reset timer interrupt flag if required (currently only for Teensy and ATmega4809)
+    TIMER_RESET_INTR_PENDING; // reset timer interrupt flag if required (currently only for Teensy and ATmega4809)
 
     // Read if IR Receiver -> SPACE [xmt LED off] or a MARK [xmt LED on]
     // digitalRead() is very slow. Optimisation is possible, but makes the code unportable

src/irRecv.cpp

@@ -168,20 +168,19 @@ IRrecv::IRrecv(int recvpin, int blinkpin) {
 #ifdef USE_DEFAULT_ENABLE_IR_IN
 void IRrecv::enableIRIn() {
 // Interrupt Service Routine - Fires every 50uS
-    cli();
+    noInterrupts();
     // Setup pulse clock timer interrupt
     // Prescale /8 (16M/8 = 0.5 microseconds per tick)
     // Therefore, the timer interval can range from 0.5 to 128 microseconds
     // Depending on the reset value (255 to 0)
-    timerConfigNormal();
+    timerConfigForReceive();
 
     // Timer2 Overflow Interrupt Enable
-    TIMER_ENABLE_INTR;
+    TIMER_ENABLE_RECEIVE_INTR;
 
-    TIMER_RESET;
+    TIMER_RESET_INTR_PENDING;
 
-    sei();
-    // enable interrupts
+    interrupts();
 
     // Initialize state machine variables
     irparams.rcvstate = IR_REC_STATE_IDLE;
@@ -192,10 +191,7 @@ void IRrecv::enableIRIn() {
 }
 
 void IRrecv::disableIRIn() {
-    cli();
-    TIMER_DISABLE_INTR;
-    sei();
-    // enable interrupts
+    TIMER_DISABLE_RECEIVE_INTR;
 }
 
 #endif // USE_DEFAULT_ENABLE_IR_IN

src/irSend.cpp

@@ -88,7 +88,7 @@ void IRsend::mark(unsigned int time) {
 #elif defined(USE_NO_CARRIER)
     digitalWrite(sendPin, LOW); // Set output to active low.
 #else
-    TIMER_ENABLE_PWM; // Enable pin 3 PWM output
+    TIMER_ENABLE_SEND_PWM; // Enable pin 3 PWM output
 #endif
     if (time > 0) {
         custom_delay_usec(time);
@@ -104,7 +104,7 @@ void IRsend::space(unsigned int time) {
 #if defined(USE_NO_CARRIER)
     digitalWrite(sendPin, HIGH); // Set output to inactive high.
 #else
-    TIMER_DISABLE_PWM; // Disable pin 3 PWM output
+    TIMER_DISABLE_SEND_PWM; // Disable pin 3 PWM output
 #endif
     if (time > 0) {
         IRsend::custom_delay_usec(time);
@@ -135,13 +135,13 @@ void IRsend::enableIROut(int khz) {
     digitalWrite(sendPin, HIGH); // Set output to inactive high.
 #else
     // Disable the Timer2 Interrupt (which is used for receiving IR)
-    TIMER_DISABLE_INTR; //Timer2 Overflow Interrupt
+    TIMER_DISABLE_RECEIVE_INTR; //Timer2 Overflow Interrupt
 
     pinMode(sendPin, OUTPUT);
 
     SENDPIN_OFF(sendPin); // When not sending, we want it low
 
-    timerConfigkHz(khz);
+    timerConfigForSend(khz);
 #endif
 }
 #endif