Replaced macros TIMER_EN/DISABLE_RECEIVE_INTR and EN/DISABLE_SEND_PWM_BY_TIMER by functions.

Author: ArminJo

.github/workflows/LibraryBuild.yml

@@ -106,12 +106,14 @@ jobs:
             sketches-exclude: IR2Keyboard
             build-properties: # the flags were put in compiler.cpp.extra_flags
               IRremoteExtensionTest: -DRAW_BUFFER_LENGTH=100 -DIR_SEND_PIN=3 -DUSE_OPEN_DRAIN_OUTPUT_FOR_SEND_PIN
+              SimpleSender: -DSEND_PWM_BY_TIMER
               All: -DUSE_OPEN_DRAIN_OUTPUT_FOR_SEND_PIN
 
           - arduino-boards-fqbn: arduino:avr:mega:cpu=atmega2560
             sketches-exclude: IR2Keyboard
             build-properties: # the flags were put in compiler.cpp.extra_flags
               IRremoteExtensionTest: -DRAW_BUFFER_LENGTH=700
+              SimpleSender: -DSEND_PWM_BY_TIMER
 
           - arduino-boards-fqbn: arduino:avr:leonardo
             build-properties: # the flags were put in compiler.cpp.extra_flags
@@ -122,6 +124,7 @@ jobs:
             sketches-exclude: MinimalReceiver,IRDispatcherDemo
             build-properties: # the flags were put in compiler.cpp.extra_flags
               IRremoteExtensionTest: -DRAW_BUFFER_LENGTH=100
+              SimpleSender: -DSEND_PWM_BY_TIMER
 
           - arduino-boards-fqbn: arduino:samd:arduino_zero_native
             sketches-exclude: MinimalReceiver,IRDispatcherDemo
@@ -131,19 +134,24 @@ jobs:
           - arduino-boards-fqbn: adafruit:samd:adafruit_metro_m4:cache=on,speed=120,opt=small,maxqspi=50,usbstack=arduino,debug=off
             platform-url: https://adafruit.github.io/arduino-board-index/package_adafruit_index.json
             sketches-exclude: MinimalReceiver,IRDispatcherDemo
+            build-properties: # the flags were put in compiler.cpp.extra_flags
+              IRremoteExtensionTest: -DRAW_BUFFER_LENGTH=100
 
           - arduino-boards-fqbn: arduino:mbed:nano33ble
             build-properties: # the flags were put in compiler.cpp.extra_flags
               IRremoteExtensionTest: -DRAW_BUFFER_LENGTH=100
+              SimpleSender: -DSEND_PWM_BY_TIMER
 
           - arduino-boards-fqbn: arduino:mbed_rp2040:pico
             build-properties: # the flags were put in compiler.cpp.extra_flags
               IRremoteExtensionTest: -DRAW_BUFFER_LENGTH=100
+              SimpleSender: -DSEND_PWM_BY_TIMER
 
           - arduino-boards-fqbn: rp2040:rp2040:arduino_nano_connect
             platform-url: https://github.com/earlephilhower/arduino-pico/releases/download/global/package_rp2040_index.json
             build-properties: # the flags were put in compiler.cpp.extra_flags
               IRremoteExtensionTest: -DRAW_BUFFER_LENGTH=100 -DSEND_PWM_BY_TIMER
+              SimpleSender: -DSEND_PWM_BY_TIMER
               All: -DRAW_BUFFER_LENGTH=700
 
           - arduino-boards-fqbn: megaTinyCore:megaavr:atxy4:chip=1604,clock=16internal
@@ -164,27 +172,36 @@ jobs:
             platform-url: https://raw.githubusercontent.com/ArminJo/DigistumpArduino/master/package_digistump_index.json
             required-libraries: ATtinySerialOut
             sketch-names: MinimalReceiver.ino,IRremoteInfo.ino,SimpleReceiver.ino,ControlRelay.ino,SimpleSender.ino,SendDemo.ino,SendRawDemo.ino,SendAndReceive.ino
+            build-properties: # the flags were put in compiler.cpp.extra_flags
+              SimpleSender: -DSEND_PWM_BY_TIMER
 
           - arduino-boards-fqbn: ATTinyCore:avr:attinyx5micr:LTO=enable,sketchclock=16pll
             platform-url: http://drazzy.com/package_drazzy.com_index.json
             required-libraries: ATtinySerialOut
             sketch-names: MinimalReceiver.ino,IRremoteInfo.ino,SimpleReceiver.ino,ReceiveDemo.ino,ControlRelay.ino,SimpleSender.ino,SendDemo.ino,SendRawDemo.ino,SendAndReceive.ino
+            build-properties: # the flags were put in compiler.cpp.extra_flags
+              SimpleSender: -DSEND_PWM_BY_TIMER
 
           - arduino-boards-fqbn: ATTinyCore:avr:attinyx7micr:LTO=enable,sketchclock=16external,pinmapping=new,millis=enabled
             platform-url: http://drazzy.com/package_drazzy.com_index.json
             required-libraries: ATtinySerialOut
             sketch-names: MinimalReceiver.ino,IRremoteInfo.ino,SimpleReceiver.ino,ReceiveDemo.ino,ControlRelay.ino,SimpleSender.ino,SendDemo.ino,SendRawDemo.ino,SendAndReceive.ino
+            build-properties: # the flags were put in compiler.cpp.extra_flags
+              SimpleSender: -DSEND_PWM_BY_TIMER
 
           - arduino-boards-fqbn: ATTinyCore:avr:attinyx8micr:LTO=enable,sketchclock=16external,pinmapping=mhtiny,millis=enabled  # ATtiny88 China clone board @16 MHz
             platform-url: http://drazzy.com/package_drazzy.com_index.json
             required-libraries: ATtinySerialOut
             sketch-names: MinimalReceiver.ino,IRremoteInfo.ino,SimpleReceiver.ino,ReceiveDemo.ino,ControlRelay.ino,SimpleSender.ino,SendDemo.ino,SendRawDemo.ino,SendAndReceive.ino
+            build-properties: # the flags were put in compiler.cpp.extra_flags
+              SimpleSender: -DSEND_PWM_BY_TIMER
 
           - arduino-boards-fqbn: MegaCore:avr:128:bootloader=no_bootloader,eeprom=keep,BOD=2v7,LTO=Os_flto,clock=8MHz_internal
             platform-url: https://mcudude.github.io/MegaCore/package_MCUdude_MegaCore_index.json
             arduino-platform: arduino:avr,MegaCore:avr # gcc is taken from arduino:avr
             build-properties: # the flags were put in compiler.cpp.extra_flags
               IRremoteExtensionTest: -DRAW_BUFFER_LENGTH=300
+              SimpleSender: -DSEND_PWM_BY_TIMER
               All: -DRAW_BUFFER_LENGTH=700
 
           - arduino-boards-fqbn: esp8266:esp8266:d1_mini:eesz=4M3M,xtal=80
@@ -197,7 +214,7 @@ jobs:
           - arduino-boards-fqbn: esp32:esp32:featheresp32:FlashFreq=80
             platform-url: https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_index.json
             sketches-exclude: MinimalReceiver # undefined reference to `TwoWire::onReceive(void (*)(int))'
-            build-properties: # the flags were put in compiler.cpp.extra_flags
+            build-properties: # the flags were put in compiler.cpp.extra_flags. SEND_PWM_BY_TIMER is always enabled!
               IRremoteExtensionTest: -DRAW_BUFFER_LENGTH=500 -Wno-error=maybe-uninitialized
               All: -DRAW_BUFFER_LENGTH=300 -Wno-error=maybe-uninitialized # https://github.com/espressif/arduino-esp32/issues/7024
 
@@ -225,7 +242,7 @@ jobs:
           - arduino-boards-fqbn: SparkFun:avr:promicro
             arduino-platform: arduino:avr,SparkFun:avr
             platform-url: https://raw.githubusercontent.com/sparkfun/Arduino_Boards/master/IDE_Board_Manager/package_sparkfun_index.json # Arduino URL is not required here
-            build-properties: # the flags were put in compiler.cpp.extra_flags
+            build-properties: # the flags were put in compiler.cpp.extra_flags. SEND_PWM_BY_TIMER is always enabled!
               IRremoteExtensionTest: -DRAW_BUFFER_LENGTH=700
               All: -DRAW_BUFFER_LENGTH=300
 

changelog.md

@@ -32,6 +32,7 @@ See also the commit log at github: https://github.com/Arduino-IRremote/Arduino-I
 - Added support for attiny1614 by Joe Ostrander.
 - Fixed SEND_PWM_BY_TIMER for ATtiny167 thanks to freskpe.
 - Improved SHARP repeat decoding.
+- Replaced macros TIMER_EN/DISABLE_RECEIVE_INTR and EN/DISABLE_SEND_PWM_BY_TIMER by functions.
 
 ## 3.9.0
 - Improved documentation with the help of [ElectronicsArchiver}(https://github.com/ElectronicsArchiver).

library.properties

@@ -6,5 +6,5 @@ sentence=Send and receive infrared signals with multiple protocols
 paragraph=Currently included protocols: Denon / Sharp, JVC, LG / LG2,  NEC / Onkyo / Apple, Panasonic / Kaseikyo, RC5, RC6, Samsung, Sony, (Pronto), BangOlufsen, BoseWave, Lego, Whynter, MagiQuest.<br/><br/><b>New: </b>Introduced common structure PulseDistanceWidthProtocolConstants. Improved Magiquest protocol.<br/><a href="https://github.com/Arduino-IRremote/Arduino-IRremote/blob/master/changelog.md">Release notes</a><br/>
 category=Communication
 url=https://github.com/Arduino-IRremote/Arduino-IRremote
-architectures=avr,megaavr,samd,esp8266,esp32,stm32,STM32F1,mbed,mbed_nano,rp2040
+architectures=avr,megaavr,samd,esp8266,esp32,stm32,STM32F1,mbed,mbed_nano,rp2040,mbed_rp2040
 includes=IRremote.hpp

src/IRReceive.hpp

@@ -119,7 +119,7 @@ IRrecv::IRrecv(uint_fast8_t aReceivePin, uint_fast8_t aFeedbackLEDPin) {
 //#define _IR_MEASURE_TIMING
 //#define _IR_TIMING_TEST_PIN 10 // "pinModeFast(_IR_TIMING_TEST_PIN, OUTPUT);" is executed at start()
 #if defined(TIMER_INTR_NAME)
-    ISR (TIMER_INTR_NAME) // for ISR definitions
+ISR (TIMER_INTR_NAME) // for ISR definitions
 #else
 ISR()
 // for functions definitions which are called by separate (board specific) ISR
@@ -130,7 +130,9 @@ ISR()
 #endif
 // 7 - 8.5 us for ISR body (without pushes and pops) for ATmega328 @16MHz
 
-    TIMER_RESET_INTR_PENDING;// reset TickCounterForISR interrupt flag if required (currently only for Teensy and ATmega4809)
+#if defined(TIMER_REQUIRES_RESET_INTR_PENDING)
+    timerResetInterruptPending(); // reset TickCounterForISR interrupt flag if required (currently only for Teensy and ATmega4809)
+#endif
 
 // Read if IR Receiver -> SPACE [xmt LED off] or a MARK [xmt LED on]
 #if defined(__AVR__)
@@ -310,7 +312,7 @@ void IRrecv::start() {
     resume();
 
     // Timer interrupt is enabled after state machine reset
-    TIMER_ENABLE_RECEIVE_INTR;
+    timerEnableReceiveInterrupt();
 #ifdef _IR_MEASURE_TIMING
     pinModeFast(_IR_TIMING_TEST_PIN, OUTPUT);
 #endif
@@ -349,7 +351,7 @@ void IRrecv::restartAfterSend() {
  * Disables the timer for IR reception.
  */
 void IRrecv::stop() {
-    TIMER_DISABLE_RECEIVE_INTR;
+    timerDisableReceiveInterrupt();
 }
 /**
  * Alias for stop().

src/IRSend.hpp

@@ -755,7 +755,7 @@ void IRsend::mark(unsigned int aMarkMicros) {
     /*
      * Generate hardware PWM signal
      */
-    ENABLE_SEND_PWM_BY_TIMER; // Enable timer or ledcWrite() generated PWM output
+    enableSendPWMByTimer(); // Enable timer or ledcWrite() generated PWM output
     customDelayMicroseconds(aMarkMicros);
     IRLedOff();// disables hardware PWM and manages feedback LED
     return;
@@ -880,20 +880,20 @@ void IRsend::mark(unsigned int aMarkMicros) {
  */
 void IRsend::IRLedOff() {
 #if defined(SEND_PWM_BY_TIMER)
-        DISABLE_SEND_PWM_BY_TIMER; // Disable PWM output
+    disableSendPWMByTimer(); // Disable PWM output
 #elif defined(USE_NO_SEND_PWM)
 #  if defined(USE_OPEN_DRAIN_OUTPUT_FOR_SEND_PIN) && !defined(OUTPUT_OPEN_DRAIN)
-        digitalWriteFast(sendPin, LOW); // prepare for all next active states.
-        pinModeFast(sendPin, INPUT);// inactive state for open drain
+    digitalWriteFast(sendPin, LOW); // prepare for all next active states.
+    pinModeFast(sendPin, INPUT);// inactive state for open drain
 #  else
-        digitalWriteFast(sendPin, HIGH); // Set output to inactive high.
+    digitalWriteFast(sendPin, HIGH); // Set output to inactive high.
 #  endif
 #else
 #  if defined(USE_OPEN_DRAIN_OUTPUT_FOR_SEND_PIN)
 #    if defined(OUTPUT_OPEN_DRAIN)
-        digitalWriteFast(sendPin, HIGH); // Set output to inactive high.
+    digitalWriteFast(sendPin, HIGH); // Set output to inactive high.
 #    else
-        pinModeFast(sendPin, INPUT); // inactive state to mimic open drain
+    pinModeFast(sendPin, INPUT); // inactive state to mimic open drain
 #    endif
 #  else
     digitalWriteFast(sendPin, LOW);