Renamed USE_SOFT_CARRIER and USE_NO_CARRIER macros to USE_SOFT_SEND_PWM and USE_NO_SEND_PWM.

Author: ArminJo

README.md

@@ -57,7 +57,7 @@ The timer and the pin usage can be adjusted in [IRremoteBoardDefs.h](src/private
 | Board/CPU                                                                | IR-Receive Pin      | Timers            |
 |--------------------------------------------------------------------------|---------------------|-------------------|
 | [ATtiny84](https://github.com/SpenceKonde/ATTinyCore)                    | **6**               | **1**             |
-| [ATtiny85](https://github.com/SpenceKonde/ATTinyCore)                    | **1**               | **TINY0**         |
+| [ATtiny85](https://github.com/SpenceKonde/ATTinyCore)                    | **1**               | **0**         |
 | [ATmega8](https://github.com/MCUdude/MiniCore)                           | **9**               | **1**             |
 | [ATmega48, ATmega88, ATmega168, ATmega328](https://github.com/MCUdude/MiniCore) | **3**, 9     | 1, **2**          |
 | [ATmega1284](https://github.com/MCUdude/MightyCore)                      | 13, 14, 6           | 1, **2**, 3       |
@@ -68,6 +68,7 @@ The timer and the pin usage can be adjusted in [IRremoteBoardDefs.h](src/private
 | ATmega1280, ATmega2560                                                   | 5, 6, **9**, 11, 46 | 1, **2**, 3, 4, 5 |
 | ATmega4809                                                               | 5, 6, **9**, 11, 46 | **TCB0**          |
 | Leonardo (Atmega32u4)                                                    | 5, **9**, 13        | 1, 3, **4_HS**    |
+| Zero (SAMD)                                                              | \*, **9**           | **TC3**           |
 | [ESP32](http://esp32.net/)                                               | **4**, all pins     | **1**             |
 | [Sparkfun Pro Micro](https://www.sparkfun.com/products/12640)            | **5**, 9, 13        | 1, **3**, 4_HS    |
 | [Teensy 1.0](https://www.pjrc.com/teensy/)                               | **17**              | **1**             |

src/IRremote.h

@@ -339,7 +339,7 @@ class IRrecv {
  */
 class IRsend {
 public:
-#if defined(USE_SOFT_CARRIER) || defined(USE_NO_CARRIER)
+#if defined(USE_SOFT_SEND_PWM) || defined(USE_NO_SEND_PWM)
     IRsend(int pin = IR_SEND_PIN) {
       sendPin = pin;
     }
@@ -470,11 +470,11 @@ class IRsend {
     void sendPronto(const __FlashStringHelper *str, unsigned int times = 1U);
 #endif
 
-#if defined(USE_SOFT_CARRIER) || defined(USE_NO_CARRIER)
+#if defined(USE_SOFT_SEND_PWM) || defined(USE_NO_SEND_PWM)
   private:
     int sendPin;
 
-#  if defined(USE_SOFT_CARRIER)
+#  if defined(USE_SOFT_SEND_PWM)
     unsigned int periodTime;
     unsigned int periodOnTime;
 

src/irSend.cpp

@@ -37,7 +37,7 @@ void IRsend::sendRaw_P(const unsigned int buf[], unsigned int len, unsigned int
 
 }
 
-#ifdef USE_SOFT_CARRIER
+#ifdef USE_SOFT_SEND_PWM
 void inline IRsend::sleepMicros(unsigned long us) {
 #ifdef USE_SPIN_WAIT
     sleepUntilMicros(micros() + us);
@@ -59,15 +59,15 @@ void inline IRsend::sleepUntilMicros(unsigned long targetTime) {
     }
 #endif
 }
-#endif // USE_SOFT_CARRIER
+#endif // USE_SOFT_SEND_PWM
 
 //+=============================================================================
 // Sends an IR mark for the specified number of microseconds.
 // The mark output is modulated at the PWM frequency.
 //
 
 void IRsend::mark(unsigned int time) {
-#ifdef USE_SOFT_CARRIER
+#ifdef USE_SOFT_SEND_PWM
     unsigned long start = micros();
     unsigned long stop = start + time;
     if (stop + periodTime < start) {
@@ -85,7 +85,7 @@ void IRsend::mark(unsigned int time) {
         sleepUntilMicros(nextPeriodEnding);
         now = micros();
     }
-#elif defined(USE_NO_CARRIER)
+#elif defined(USE_NO_SEND_PWM)
     digitalWrite(sendPin, LOW); // Set output to active low.
 #else
     TIMER_ENABLE_SEND_PWM; // Enable pin 3 PWM output
@@ -101,7 +101,7 @@ void IRsend::mark(unsigned int time) {
 // A space is no output, so the PWM output is disabled.
 //
 void IRsend::space(unsigned int time) {
-#if defined(USE_NO_CARRIER)
+#if defined(USE_NO_SEND_PWM)
     digitalWrite(sendPin, HIGH); // Set output to inactive high.
 #else
     TIMER_DISABLE_SEND_PWM; // Disable pin 3 PWM output
@@ -125,12 +125,12 @@ void IRsend::space(unsigned int time) {
 // See my Secrets of Arduino PWM at http://arcfn.com/2009/07/secrets-of-arduino-pwm.html for details.
 //
 void IRsend::enableIROut(int khz) {
-#ifdef USE_SOFT_CARRIER
+#ifdef USE_SOFT_SEND_PWM
     periodTime = (1000U + khz / 2) / khz; // = 1000/khz + 1/2 = round(1000.0/khz)
     periodOnTime = periodTime * DUTY_CYCLE / 100U - PULSE_CORRECTION;
 #endif
 
-#if defined(USE_NO_CARRIER)
+#if defined(USE_NO_SEND_PWM)
     pinMode(sendPin, OUTPUT);
     digitalWrite(sendPin, HIGH); // Set output to inactive high.
 #else

src/private/IRremoteBoardDefs.h

@@ -52,7 +52,7 @@
 #endif
 
 /**
- * If USE_SOFT_CARRIER or USE_NO_CARRIER, this amount (in micro seconds) is subtracted from the
+ * If USE_SOFT_SEND_PWM or USE_NO_SEND_PWM, this amount (in micro seconds) is subtracted from the
  * on-time of the pulses.
  */
 #define PULSE_CORRECTION 3
@@ -82,15 +82,15 @@
 /**
  * Define to use no carrier PWM, just simulate a receiver signal.
  */
-#define USE_NO_CARRIER
+#define USE_NO_SEND_PWM
 
 /**
- * Define to use carrier generation in software, instead of hardware PWM.
+ * Define to use carrier PWM generation in software, instead of hardware PWM.
  */
-#define USE_SOFT_CARRIER
+#define USE_SOFT_SEND_PWM
 
 /**
- * Define to use spin wait instead of delayMicros() for USE_SOFT_CARRIER.
+ * Define to use spin wait instead of delayMicros() for USE_SOFT_SEND_PWM.
  */
 #define USE_SPIN_WAIT
 
@@ -131,7 +131,7 @@
 #define BLINKLED_ON()   (digitalWrite(LED_BUILTIN, HIGH))
 #define BLINKLED_OFF()  (digitalWrite(LED_BUILTIN, LOW))
 
-#define USE_SOFT_CARRIER
+#define USE_SOFT_SEND_PWM
 // Define to use spin wait instead of delayMicros()
 //#define USE_SPIN_WAIT
 // Supply own enableIRIn()