diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index eb97d831..56e71e9f 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -14,11 +14,12 @@ body: - type: input id: Board_FQBN attributes: - label: Please specify **FQBN** (Fully Qualified Board Name). + label: Please specify "FQBN" (Fully Qualified Board Name). It is the first line in the compiler output in the Arduino IDE 2.x. + E.g. "esp32:esp32:featheresp32:FlashFreq=80". The FQBN starts with the core name, which is essential for bugfixing. For example, at least two prominent cores are available for the Bluepill board, namely STMicroelectronics and STM32duino. - **Without the FQBN we are most likely not able to fix the the issue.** + Without the FQBN we are most likely not able to fix the the issue. validations: required: true @@ -26,7 +27,6 @@ body: id: Exotic_core_URL attributes: label: The board manager URL used for exotic cores. - value: "https://" validations: required: false @@ -104,7 +104,7 @@ body: id: Failed_examples attributes: label: Example(s) to reproduce the issue. - description: Select only the examples which shows your error. + description: Select only the examples which shows your error! options: - label: SimpleReceiver - label: ReceiveDemo @@ -202,6 +202,6 @@ body: - type: markdown attributes: value: | - ** We will start to close or delete issues that do not follow these guidelines - as it doesn't help the contributors who spend time trying to solve issues if the community ignores guidelines!** + We will start to close or delete issues that do not follow these guidelines + as it doesn't help the contributors who spend time trying to solve issues if the community ignores guidelines! diff --git a/.github/workflows/LibraryBuild.yml b/.github/workflows/LibraryBuild.yml index d15cf90a..eacec58e 100644 --- a/.github/workflows/LibraryBuild.yml +++ b/.github/workflows/LibraryBuild.yml @@ -72,6 +72,7 @@ jobs: - esp8266:esp8266:d1_mini:eesz=4M3M,xtal=80 - esp32:esp32:featheresp32:FlashFreq=80 - esp32:esp32:esp32c3 + - esp32:esp32:lolin_s2_mini - STMicroelectronics:stm32:GenF1:pnum=BLUEPILL_F103C8 - STMicroelectronics:stm32:GenL0:pnum=THUNDERPACK_L072 - stm32duino:STM32F1:genericSTM32F103C @@ -84,14 +85,15 @@ jobs: include: - arduino-boards-fqbn: arduino:avr:uno build-properties: # the flags were put in compiler.cpp.extra_flags + ReceiveDemo: -DUSE_STRICT_DECODER -DDEBUG -DIR_REMOTE_DISABLE_RECEIVE_COMPLETE_CALLBACK SimpleSender: -DUSE_ACTIVE_LOW_OUTPUT_FOR_SEND_PIN - ReceiveDemo: -DIR_REMOTE_DISABLE_RECEIVE_COMPLETE_CALLBACK IRremoteExtensionTest: -DRAW_BUFFER_LENGTH=1200 -DIR_SEND_PIN=3 - arduino-boards-fqbn: arduino:avr:uno|DEBUG_TRACE build-properties: # the flags were put in compiler.cpp.extra_flags - IRremoteExtensionTest: -DIR_SEND_PIN=3 - TinyReceiver: -DUSE_CALLBACK_FOR_TINY_RECEIVER + ReceiveDemo: -DUSE_THRESHOLD_DECODER -DEBUG -DTRACE + IRremoteExtensionTest: -DIR_SEND_PIN=3 -DEBUG -DTRACE + TinyReceiver: -DUSE_CALLBACK_FOR_TINY_RECEIVER -DEBUG -DTRACE All: -DEBUG -DTRACE - arduino-boards-fqbn: arduino:avr:uno|USE_NO_SEND_PWM @@ -244,15 +246,19 @@ jobs: platform-url: https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_index.json sketches-exclude: TinyReceiver # undefined reference to `TwoWire::onReceive(void (*)(int))' build-properties: # the flags were put in compiler.cpp.extra_flags. SEND_PWM_BY_TIMER is always enabled! - IRremoteExtensionTest: -MMD -c # see https://github.com/espressif/arduino-esp32/issues/8815 - All: -DRAW_BUFFER_LENGTH=750 -MMD -c + All: -DRAW_BUFFER_LENGTH=1500 - arduino-boards-fqbn: esp32:esp32:esp32c3 platform-url: https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_index.json sketches-exclude: TinyReceiver # undefined reference to `TwoWire::onReceive(void (*)(int))' build-properties: # the flags were put in compiler.cpp.extra_flags. SEND_PWM_BY_TIMER is always enabled! - IRremoteExtensionTest: -MMD -c # see https://github.com/espressif/arduino-esp32/issues/8815 - All: -DRAW_BUFFER_LENGTH=750 -MMD -c + All: -DRAW_BUFFER_LENGTH=1500 + + - arduino-boards-fqbn: esp32:esp32:lolin_s2_mini + platform-url: https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_index.json + sketches-exclude: TinyReceiver # undefined reference to `TwoWire::onReceive(void (*)(int))' + build-properties: # the flags were put in compiler.cpp.extra_flags. SEND_PWM_BY_TIMER is always enabled! + All: -DRAW_BUFFER_LENGTH=1500 # # STM diff --git a/Contributors.md b/Contributors.md index f016310a..9df2e50a 100644 --- a/Contributors.md +++ b/Contributors.md @@ -33,5 +33,6 @@ These are the active contributors of this project that you may contact if there - [Buzzerb](https://github.com/Buzzerb) Added Extended NEC protocol to TinyIR and making it more consistent. - [akellai](https://github.com/akellai) Added ESP 3.0 support. - [Hayden McAfee](https://github.com/haydenmc) Help with UnoR4 support. +- [Yonghwan SO](https://github.com/sio4) Fixed bug in ReceiveDemo.cpp if DEBUG_BUTTON_PIN is not defined. #1306. Note: Please let [ArminJo](https://github.com/ArminJo) know if you have been missed. diff --git a/README.md b/README.md index 10289a46..e3661e52 100644 --- a/README.md +++ b/README.md @@ -34,6 +34,7 @@ Available as [Arduino library "IRremote"](https://www.arduinolibraries.info/libr - [Supported IR Protocols](https://github.com/Arduino-IRremote/Arduino-IRremote?tab=readme-ov-file#supported-ir-protocols) - [Common problem with IRremote](https://github.com/Arduino-IRremote/Arduino-IRremote?tab=readme-ov-file#common-problem-with-irremote) - [Using the new library version for old examples](https://github.com/Arduino-IRremote/Arduino-IRremote?tab=readme-ov-file#using-the-new-library-version-for-old-examples) + * [New features of version 4.5](https://github.com/Arduino-IRremote/Arduino-IRremote?tab=readme-ov-file#new-features-of-version-45) * [New features of version 4.x](https://github.com/Arduino-IRremote/Arduino-IRremote?tab=readme-ov-file#new-features-of-version-4x) * [New features of version 3.x](https://github.com/Arduino-IRremote/Arduino-IRremote?tab=readme-ov-file#new-features-of-version-3x) * [Converting your 2.x program to the 4.x version](https://github.com/Arduino-IRremote/Arduino-IRremote?tab=readme-ov-file#converting-your-2x-program-to-the-4x-version) @@ -67,7 +68,8 @@ Available as [Arduino library "IRremote"](https://www.arduinolibraries.info/libr * [Receiving sets overflow flag](https://github.com/Arduino-IRremote/Arduino-IRremote?tab=readme-ov-file#receiving-sets-overflow-flag) * [Problems with Neopixels, FastLed etc.](https://github.com/Arduino-IRremote/Arduino-IRremote?tab=readme-ov-file#problems-with-neopixels-fastled-etc) * [Does not work/compile with another library](https://github.com/Arduino-IRremote/Arduino-IRremote?tab=readme-ov-file#does-not-workcompile-with-another-library) - * [Multiple IR receiver and sender instances](https://github.com/Arduino-IRremote/Arduino-IRremote?tab=readme-ov-file#multiple-ir-receiver-and-sender-instances) + * [Multiple IR receivers](https://github.com/Arduino-IRremote/Arduino-IRremote?tab=readme-ov-file#multiple-ir-receivers) + * [Multiple IR sender instances](https://github.com/Arduino-IRremote/Arduino-IRremote?tab=readme-ov-file#multiple-ir-sender-instances) * [Increase strength of sent output signal](https://github.com/Arduino-IRremote/Arduino-IRremote?tab=readme-ov-file#increase-strength-of-sent-output-signal) * [Minimal CPU clock frequency](https://github.com/Arduino-IRremote/Arduino-IRremote?tab=readme-ov-file#minimal-cpu-clock-frequency) * [Bang & Olufsen protocol](https://github.com/Arduino-IRremote/Arduino-IRremote?tab=readme-ov-file#bang--olufsen-protocol) @@ -103,7 +105,7 @@ Available as [Arduino library "IRremote"](https://www.arduinolibraries.info/libr ` Hash `     ` Pronto ` -` BoseWave `     ` Bang & Olufsen `     ` Lego `     ` FAST `     ` Whynter `     ` MagiQuest ` +` BoseWave `     ` Bang & Olufsen `     ` Lego `     ` FAST `     ` Whynter `     ` MagiQuest `     ` Velux ` Protocols can be switched off and on by defining macros before the line `#include ` like [here](https://github.com/Arduino-IRremote/Arduino-IRremote/blob/master/examples/SimpleReceiver/SimpleReceiver.ino#L33): @@ -122,8 +124,16 @@ See [this table](https://github.com/Arduino-IRremote/Arduino-IRremote?tab=readme # Using the new library version for old examples This library has been refactored, breaking backward compatibility with the old version, on which many examples on the Internet are based. +## New features of version 4.5 +- Support for **multiple receiver instances**.
+`irparams_struct irparams` is now member of `IRrecv`. Thus `rawDataPtr` (pointer to irparams) was removed from `IrReceiver.decodedIRData`.
+Old `IrReceiver.decodedIRData.rawDataPtr->rawbuf` is now `IrReceiver.irparams.rawbuf`, the same holds for `IrReceiver.irparams.rawlen`. +- LED feedback is always enabled for sending. It can only be disabled by using `#define NO_LED_SEND_FEEDBACK_CODE` or `#define NO_LED_FEEDBACK_CODE`. +- The second parameter of the function `IrSender.begin(uint_fast8_t aSendPin, bool aEnableLEDFeedback)` has changed to `uint_fast8_t aFeedbackLEDPin`. Therefore this function call no longer works as expected because it uses the old boolean value of e.g. `ENABLE_LED_FEEDBACK` which evaluates to true or 1 as pin number of the LED feedback pin number. +- New experimental Velux send function. + ## New features of version 4.x -- **Since 4.3 `IrSender.begin(DISABLE_LED_FEEDBACK)` will no longer work**, use `IrSender.begin(DISABLE_LED_FEEDBACK, 0)` instead. +- **Since 4.3 `IrSender.begin(DISABLE_LED_FEEDBACK)` will no longer work**, use `#define NO_LED_SEND_FEEDBACK_CODE` instead. - New universal **Pulse Distance / Pulse Width / Pulse Distance Width decoder** added, which covers many previous unknown protocols. - Printout of code how to send received command by `IrReceiver.printIRSendUsage(&Serial)`. - RawData type is now 64 bit for 32 bit platforms and therefore `decodedIRData.decodedRawData` can contain complete frame information for more protocols than with 32 bit as before. @@ -162,21 +172,19 @@ if you get false error messages regarding begin() during compilation. - **IRreceiver** and **IRsender** object have been added and can be used without defining them, like the well known Arduino **Serial** object. - Just remove the line `IRrecv IrReceiver(IR_RECEIVE_PIN);` and/or `IRsend IrSender;` in your program and replace all occurrences of `IRrecv.` or `irrecv.` with `IrReceiver` and replace all `IRsend` or `irsend` with `IrSender`. -- Since the decoded values are now in `IrReceiver.decodedIRData` and not in `results` any more, remove the line `decode_results results` or similar. - Like for the Serial object, call [`IrReceiver.begin(IR_RECEIVE_PIN, ENABLE_LED_FEEDBACK)`](https://github.com/Arduino-IRremote/Arduino-IRremote/blob/master/examples/ReceiveDemo/ReceiveDemo.ino#L106) or `IrReceiver.begin(IR_RECEIVE_PIN, DISABLE_LED_FEEDBACK)` instead of the `IrReceiver.enableIRIn()` or `irrecv.enableIRIn()` in setup().
-For sending, call `IrSender.begin();` in setup().
-If IR_SEND_PIN is not defined (before the line `#include `) you must use e.g. `IrSender.begin(3, ENABLE_LED_FEEDBACK, USE_DEFAULT_FEEDBACK_LED_PIN);` +If IR_SEND_PIN is not defined (before the line `#include `) you must use e.g. `IrSender.begin(3);` - Old `decode(decode_results *aResults)` function is replaced by simple `decode()`. So if you have a statement `if(irrecv.decode(&results))` replace it with `if (IrReceiver.decode())`. - The decoded result is now in in `IrReceiver.decodedIRData` and not in `results` any more, therefore replace any occurrences of `results.value` and `results.decode_type` (and similar) to `IrReceiver.decodedIRData.decodedRawData` and `IrReceiver.decodedIRData.protocol`. - Overflow, Repeat and other flags are now in [`IrReceiver.receivedIRData.flags`](https://github.com/Arduino-IRremote/Arduino-IRremote/blob/master/src/IRProtocol.h#L90-L101). -- Seldom used: `results.rawbuf` and `results.rawlen` must be replaced by `IrReceiver.decodedIRData.rawDataPtr->rawbuf` and `IrReceiver.decodedIRData.rawDataPtr->rawlen`. +- Seldom used: `results.rawbuf` and `results.rawlen` must be replaced by `IrReceiver.irparams.rawbuf` and `IrReceiver.decodedIRData.rawlen`. - The 5 protocols **NEC, Panasonic, Sony, Samsung and JVC** have been converted to LSB first. Send functions for sending old MSB data were renamed to `sendNECMSB`, `sendSamsungMSB()`, `sendSonyMSB()` and `sendJVCMSB()`. The old `sendSAMSUNG()` and `sendSony()` MSB functions are still available. The old MSB version of `sendPanasonic()` function was deleted, since it had bugs nobody recognized and therefore was assumed to be never used.
-For converting MSB codes to LSB see [below](https://github.com/Arduino-IRremote/Arduino-IRremote?tab=readme-ov-file#how-to-convert-old-msb-first-32-bit-ir-data-codes-to-new-lsb-first-32-bit-ir-data-codes). +For converting MSB codes to LSB see [below](https://github.com/Arduino-IRremote/Arduino-IRremote?tab=readme-ov-file#how-to-convert-old-msb-first-32-bit-ir-data-codes-to-new-lsb-first-32-bit-ir-data-codes) or use the new functions `bitreverseOneByte()` or `bitreverse32Bit()` for reversing. ### Example #### Old 2.x program: @@ -244,7 +252,8 @@ Send with: IrSender.sendKaseikyo_Denon(0xFF1, 0x76, ); ## How to convert old MSB first 32 bit IR data codes to new LSB first 32 bit IR data codes For the new decoders for **NEC, Panasonic, Sony, Samsung and JVC**, the result `IrReceiver.decodedIRData.decodedRawData` is now **LSB-first**, as the definition of these protocols suggests!

-To convert one into the other, you must reverse the nibble (4 bit / Hex numbers) positions and then reverse all bit positions of each nibble or write it as one binary string and reverse/mirror it. +To convert one into the other, you must reverse the nibble (4 bit / Hex numbers) positions and then reverse all bit positions of each nibble or write it as one binary string and reverse/mirror it.
+This can be done by using the new functions `bitreverseOneByte()` or `bitreverse32Bit()`. ### Nibble reverse `0xCB 34 01 02` MSB value
@@ -264,9 +273,6 @@ If you **read the first binary sequence backwards** (right to left), you get the `0xCB340102` is binary `1100 1011 0011 0100 0000 0001 0000 0010`.
`0x40802CD3` is binary `0100 0000 1000 0000 0010 1100 1101 0011`. -### IRremote functions -Use `bitreverseOneByte()` or `bitreverse32Bit()` for reversing. - ### Online tool which reverses every byte, but not the order of the bytes Use this [tool provided by analysir](https://www.analysir.com/hex2nec.php). @@ -286,7 +292,7 @@ Most likely your code will run and you will not miss the new features. Consider using the [original 2.4 release form 2017](https://github.com/Arduino-IRremote/Arduino-IRremote/releases/tag/v2.4.0) or the last backwards compatible [2.8 version](https://github.com/Arduino-IRremote/Arduino-IRremote/releases/tag/2.8.0) for you project.
It may be sufficient and deals flawlessly with 32 bit IR codes.
-If this doesn't fit your case, be assured that 4.x is at least trying to be backwards compatible, so your old examples should still work fine. +If this doesn't work for you, you can be sure that 4.x is trying to be compatible with earlier versions, so your old examples should work just fine. ### Drawbacks of using 2.x - Only the following decoders are available:
@@ -301,10 +307,10 @@ If this doesn't fit your case, be assured that 4.x is at least trying to be back **Every \*.cpp file is compiled separately** by a call of the compiler exclusively for this cpp file. These calls are managed by the IDE / make system. In the Arduino IDE the calls are executed when you click on *Verify* or *Upload*. -And now our problem with Arduino is:
+And now **our problem with Arduino** is:
**How to set [compile options](#compile-options--macros-for-this-library) for all *.cpp files, especially for libraries used?**
-IDE's like [Sloeber](https://github.com/ArminJo/ServoEasing#modifying-compile-options--macros-with-sloeber-ide) or -[PlatformIO](https://github.com/ArminJo/ServoEasing#modifying-compile-options--macros-with-platformio) support this by allowing to specify a set of options per project. +IDE's like [Sloeber](https://github.com/Arduino-IRremote/Arduino-IRremote?tab=readme-ov-file#modifying-compile-options--macros-with-sloeber-ide) or +[PlatformIO](https://github.com/Arduino-IRremote/Arduino-IRremote?tab=readme-ov-file#modifying-compile-options--macros-with-platformio) support this by allowing to specify a set of options per project. They add these options at each compiler call e.g. `-DTRACE`. But Arduino lacks this feature. @@ -312,10 +318,10 @@ So the **workaround** is not to compile all sources separately, but to concatena This is done by e.g. `#include "IRremote.hpp"`. But why not `#include "IRremote.cpp"`?
-Try it and you will see tons of errors, because each function of the *.cpp file is now compiled twice, -first by compiling the huge file and second by compiling the *.cpp file separately, like described above.
-So using the extension *cpp* is not longer possible, and one solution is to use *hpp* as extension, to show that it is an included *.cpp file.
-Every other extension e.g. *cinclude* would do, but *hpp* seems to be common sense. +If you try it, you will see lots of errors, because each function of the *.cpp file is now compiled twice:
+first when the huge file is compiled, and second when the .cpp file is compiled separately, as described above.
+Therefore, using the **.cpp** extension is no longer possible. One solution is to use the **.hpp** extension to indicate that it is an included .cpp file.
+Any other extension would work, e.g. *cinclude*, but *hpp* seems to be common sense. # Using the new *.hpp files In order to support [compile options](#compile-options--macros-for-this-library) more easily, @@ -403,15 +409,19 @@ struct IRData { uint16_t address; // Decoded address uint16_t command; // Decoded command uint16_t extra; // Used for Kaseikyo unknown vendor ID. Ticks used for decoding Distance protocol. + IRRawDataType decodedRawData; // Up to 32 (64 bit for 32 bit CPU architectures) bit decoded raw data, used for sendRaw functions. +#if defined(DECODE_DISTANCE_WIDTH) + DistanceWidthTimingInfoStruct DistanceWidthTimingInfo; // 12 bytes + IRRawDataType decodedRawDataArray[DECODED_RAW_DATA_ARRAY_SIZE]; // 32/64 bit decoded raw data, to be used for sendPulseDistanceWidthFromArray functions. +#endif uint16_t numberOfBits; // Number of bits received for data (address + command + parity) - to determine protocol length if different length are possible. uint8_t flags; // IRDATA_FLAGS_IS_REPEAT, IRDATA_FLAGS_WAS_OVERFLOW etc. See IRDATA_FLAGS_* definitions - IRRawDataType decodedRawData; // Up to 32 (64 bit for 32 bit CPU architectures) bit decoded raw data, used for sendRaw functions. - uint32_t decodedRawDataArray[RAW_DATA_ARRAY_SIZE]; // 32 bit decoded raw data, to be used for send function. - irparams_struct *rawDataPtr; // Pointer of the raw timing data to be decoded. Mainly the data buffer filled by receiving ISR. + IRRawlenType rawlen; // Counter of entries in rawbuf of last received frame. + uint16_t initialGapTicks; // Contains the initial gap of the last received frame. }; ``` #### Flags -This is the [list of flags](https://github.com/Arduino-IRremote/Arduino-IRremote/blob/master/src/IRProtocol.h#L88) contained in the flags field.
+This is the [list of flags](https://github.com/Arduino-IRremote/Arduino-IRremote/blob/master/src/IRProtocol.h#L143) contained in the flags field.
Check it with e.g. `if(IrReceiver.decodedIRData.flags & IRDATA_FLAGS_IS_REPEAT)`. | Flag name | Description | @@ -727,15 +737,20 @@ There are some other solutions to this on more powerful processors, **Another library is only working/compiling** if you deactivate the line `IrReceiver.begin(IR_RECEIVE_PIN, ENABLE_LED_FEEDBACK);`.
This is often due to **timer resource conflicts** with the other library. Please see [below](https://github.com/Arduino-IRremote/Arduino-IRremote?tab=readme-ov-file#timer-and-pin-usage). -## Multiple IR receiver and sender instances -**This library supports only one IR receiver and one IR sender object (IRrecv and IRsend) per CPU.**
-However since sending is a serial task, you can use `setSendPin()` to switch the pin to send, thus emulating multiple sender.
-The receiver uses a special **timer** triggered function, which reads the digital IR signal value from one pin every 50 µs.
-So **multiple IR receivers** can only be used by connecting the output pins of several IR receivers together. +## Multiple IR receivers +**This library now supports multiple IR receiver instances (IRrecv) per CPU** see the [MultipleReceivers example](https://github.com/Arduino-IRremote/Arduino-IRremote/blob/master/examples/MultipleReceivers/MultipleReceivers.ino). + +There is also another way to use multiple receivers. +You can connect the output pins of each IR receiver to one input pin. +Then you can use the standard receiver object (IrReceiver). The IR receiver modules internally use an NPN transistor as output device with just a 30k resistor to VCC. This is basically an "open collector" and allows multiple output pins to be connected to one Arduino input pin.
However, keep in mind that any weak / disturbed signal from one of the receivers will also interfere with a good signal from another receiver. +## Multiple IR sender instances +**This library only supports one IR sender object (IRsend) per CPU.**
+However since sending is a serial task, you can use `setSendPin()` to switch the pin to send, thus emulating multiple sender.
+ ## Increase strength of sent output signal **The best way to increase the IR power for free** is to use 2 or 3 IR diodes in series. One diode requires 1.2 volt at 20 mA or 1.5 volt at 100 mA so you can supply up to 3 diodes with a 5 volt output.
To power **2 diodes** with 1.2 V and 20 mA and a 5 V supply, set the resistor to: (5 V - 2.4 V) -> 2.6 V / 20 mA = **130 Ω**.
@@ -888,9 +903,10 @@ Modify them by enabling / disabling them, or change the values if applicable. | `EXCLUDE_UNIVERSAL_PROTOCOLS` | disabled | Excludes the universal decoder for pulse distance width protocols and decodeHash (special decoder for all protocols) from `decode()`. Saves up to 1000 bytes program memory. | | `EXCLUDE_EXOTIC_PROTOCOLS` | disabled | Excludes BANG_OLUFSEN, BOSEWAVE, WHYNTER, FAST and LEGO_PF from `decode()` and from sending with `IrSender.write()`. Saves up to 650 bytes program memory. | | `DECODE_` | all | Selection of individual protocol(s) to be decoded. You can specify multiple protocols. See [here](https://github.com/Arduino-IRremote/Arduino-IRremote/blob/master/src/IRremote.hpp#L98-L121) | -| `DECODE_STRICT_CHECKS` | disabled | Check for additional required characteristics of protocol timing like length of mark for a constant mark protocol, where space length determines the bit value. Requires up to 194 additional bytes of program memory. | +| `USE_THRESHOLD_DECODER` | disabled | If enabled, may give slightly better results especially for jittering signals and protocols with short 1 pulses / pauses and forces value of MARK_EXCESS_MICROS to 0 to save program memory. Requires up to additional 120 bytes program memory. | +| `USE_STRICT_DECODER` | disabled | Check for all 4 one and zero protocol timings. Only sensible for development or very exotic requirements. Requires up to 300 additional bytes of program memory. | | `IR_REMOTE_DISABLE_RECEIVE_COMPLETE_CALLBACK` | disabled | Saves up to 60 bytes of program memory and 2 bytes RAM. | -| `MARK_EXCESS_MICROS` | 20 | MARK_EXCESS_MICROS is subtracted from all marks and added to all spaces before decoding, to compensate for the signal forming of different IR receiver modules. | +| `MARK_EXCESS_MICROS` | 0 | MARK_EXCESS_MICROS is subtracted from all marks and added to all spaces before decoding, to compensate for the signal forming of different IR receiver modules. Is set to 20 if `DO_NOT_USE_THRESHOLD_DECODER` is enabled. | | `RECORD_GAP_MICROS` | 5000 | Minimum gap between IR transmissions, to detect the end of a protocol.
Must be greater than any space of a protocol e.g. the NEC header space of 4500 µs.
Must be smaller than any gap between a command and a repeat; e.g. the retransmission gap for Sony is around 24 ms.
Keep in mind, that this is the delay between the end of the received command and the start of decoding. | | `DISTANCE_WIDTH_DECODER_DURATION_ARRAY_SIZE` | 50 if RAM <= 2k, else 200 | A value of 200 allows to decode mark or space durations up to 10 ms. | | `IR_INPUT_IS_ACTIVE_HIGH` | disabled | Enable it if you use a RF receiver, which has an active HIGH output signal. | @@ -905,7 +921,7 @@ Modify them by enabling / disabling them, or change the values if applicable. | `FEEDBACK_LED_IS_ACTIVE_LOW` | disabled | Required on some boards (like my BluePill and my ESP8266 board), where the feedback LED is active low. | | `NO_LED_FEEDBACK_CODE` | disabled | Disables the LED feedback code for send and receive. Saves around 100 bytes program memory for receiving, around 500 bytes for sending and halving the receiver ISR (Interrupt Service Routine) processing time. | | `NO_LED_RECEIVE_FEEDBACK_CODE` | disabled | Disables the LED feedback code for receive. Saves around 100 bytes program memory for receiving and halving the receiver ISR (Interrupt Service Routine) processing time. | -| `NO_LED_SEND_FEEDBACK_CODE` | disabled | Disables the LED feedback code for send. Saves around 500 bytes for sending. | +| `NO_LED_SEND_FEEDBACK_CODE` | disabled | Disables the LED feedback code for send. Saves around 322 bytes for sending. | | `MICROS_PER_TICK` | 50 | Resolution of the raw input buffer data. Corresponds to 2 pulses of each 26.3 µs at 38 kHz. | | `TOLERANCE_FOR_DECODERS_MARK_OR_SPACE_MATCHING_PERCENT` | 25 | Relative tolerance for matchTicks(), matchMark() and matchSpace() functions used for protocol decoding. | | `DEBUG` | disabled | Enables lots of lovely debug output. | @@ -967,7 +983,7 @@ Digispark boards are only tested with [ATTinyCore](https://github.com/SpenceKond - ATtiny84, 85, 167 (Digispark + Digispark Pro) - SAMD (Zero, MKR*, **but not DUE, the latter is SAM architecture**) - ESP8266 -- ESP32 (ESP32-C3 since board package 2.0.2 from Espressif) +- ESP32 (ESP32-C3 since board package 2.0.2 from Espressif). New CPUs (as of January 2025) are not guaranteed to work! - Sparkfun Pro Micro - Nano Every, Uno WiFi Rev2, nRF5 BBC MicroBit, Nano33_BLE - BluePill with STM32 @@ -1025,7 +1041,7 @@ The code for the timer and the **timer selection** is located in [private/IRTime | [Teensy 4.0 - 4.1](https://www.pjrc.com/teensy/pinout.html) | **FlexPWM1.3** | **8** | 7, 25 | | [BluePill / STM32F103C8T6](https://github.com/stm32duino/Arduino_Core_STM32) | **3** | % | **PA6 & PA7 & PB0 & PB1** | | [BluePill / STM32F103C8T6](https://stm32-base.org/boards/STM32F103C8T6-Blue-Pill) | **TIM4** | % | **PB6 & PB7 & PB8 & PB9** | -| [RP2040 / Pi Pico](https://github.com/earlephilhower/arduino-pico) | [default alarm pool](https://raspberrypi.github.io/pico-sdk-doxygen/group__repeating__timer.html) | All pins | No pin | +| [RP2040 / Pi Pico](https://github.com/earlephilhower/arduino-pico) | [default alarm pool](https://www.raspberrypi.com/documentation/pico-sdk/high_level.html#group_alarm_1ga40b4a03bf9e967d4e7170d20c5c9fb15) | All pins | No pin | | [RP2040 / Mbed based](https://github.com/arduino/ArduinoCore-mbed) | Mbed Ticker | All pins | No pin | ### No timer required for sending @@ -1082,10 +1098,10 @@ This works on AVR boards like Uno because each call to` tone()` completely initi If you define `SEND_PWM_BY_TIMER`, the send PWM signal is forced to be generated by a hardware timer on most platforms.
By default, the same timer as for the receiver is used.
Since each hardware timer has its dedicated output pin(s), you must change timer or timer sub-specifications to change PWM output pin. See [private/IRTimer.hpp](https://github.com/Arduino-IRremote/Arduino-IRremote/blob/master/src/private/IRTimer.hpp)
-**Exceptions** are currently [ESP32, ARDUINO_ARCH_RP2040, PARTICLE and ARDUINO_ARCH_MBED](https://github.com/Arduino-IRremote/Arduino-IRremote/blob/master/examples/SimpleSender/PinDefinitionsAndMore.h#L334),where **PWM generation does not require a timer**. +**Exceptions** are currently [ESP32, ARDUINO_ARCH_RP2040, PARTICLE and ARDUINO_ARCH_MBED](https://github.com/Arduino-IRremote/Arduino-IRremote/blob/master/examples/SimpleSender/PinDefinitionsAndMore.h#L341), where **PWM generation does not require a timer**. ## Why do we use 30% duty cycle for sending -We [do it](https://github.com/Arduino-IRremote/Arduino-IRremote/blob/master/src/IRSend.hpp#L1192) according to the statement in the [Vishay datasheet](https://www.vishay.com/docs/80069/circuit.pdf): +We [do it](https://github.com/Arduino-IRremote/Arduino-IRremote/blob/master/src/IRSend.hpp#L1194) according to the statement in the [Vishay datasheet](https://www.vishay.com/docs/80069/circuit.pdf): - Carrier duty cycle 50 %, peak current of emitter IF = 200 mA, the resulting transmission distance is 25 m. - Carrier duty cycle 10 %, peak current of emitter IF = 800 mA, the resulting transmission distance is 29 m. - Factor 1.16 The reason is, that it is not the pure energy of the fundamental which is responsible for the receiver to detect a signal. @@ -1096,14 +1112,14 @@ Due to automatic gain control and other bias effects, high intensity of the 38 k # How we decode signals The IR signal is sampled at a **50 µs interval**. For a constant 525 µs pulse or pause we therefore get 10 or 11 samples, each with 50% probability.
And believe me, if you send a 525 µs signal, your receiver will output something between around 400 and 700 µs!
-Therefore **we decode by default with a +/- 25% margin** using the formulas [here](https://github.com/Arduino-IRremote/Arduino-IRremote/blob/master/src/IRremoteInt.h#L376-L399).
+Therefore **we decode by default with a +/- 25% margin** using the formulas [here](https://github.com/Arduino-IRremote/Arduino-IRremote/blob/master/src/IRremoteInt.h#L469-L491).
E.g. for the NEC protocol with its 560 µs unit length, we have TICKS_LOW = 8.358 and TICKS_HIGH = 15.0. This means, we accept any value between 8 ticks / 400 µs and 15 ticks / 750 µs (inclusive) as a mark or as a zero space. For a one space we have TICKS_LOW = 25.07 and TICKS_HIGH = 45.0.
And since the receivers generated marks are longer or shorter than the spaces, we have introduced the [`MARK_EXCESS_MICROS`](https://github.com/Arduino-IRremote/Arduino-IRremote?tab=readme-ov-file#compile-options--macros-for-this-library) macro -to compensate for this receiver (and signal strength as well as ambient light dependent :disappointed: ) specific deviation.
-Welcome to the world of **real world signal processing**. +to compensate for this receiver and signal strength as well as ambient light dependent :disappointed: specific deviation.
+**Welcome to the world of real world signal processing**.
diff --git a/changelog.md b/changelog.md index 7a6d5411..65118f7e 100644 --- a/changelog.md +++ b/changelog.md @@ -1,7 +1,18 @@ # Changelog The latest version may not be released! See also the commit log at github: https://github.com/Arduino-IRremote/Arduino-IRremote/commits/master -# 4.4.4 +# 4.5.0 +- Added support for multiple receiver instances. +- irparams_struct irparams is now member of IRrecv. Thus removed rawDataPtr (pointer to irparams) from IrReceiver.decodedIRData. +- Removed return value for all decodePulseDistanceWidthData() decoding functions, which returned a constant true. +- New handling of MARK_EXCESS_MICROS without strange rounding inconsistency. +- Fixed bug in ReceiveDemo.cpp if DEBUG_BUTTON_PIN is not defined. #1306. +- Fixed minor bugs in Denon decoder. +- Added threshold decoding. +- Minor bug fixes for DEBUG. +- LED feedback is always enabled for sending. It can only be disabled by using the macro NO_LED_SEND_FEEDBACK_CODE. +- Removed parameter aEnableLEDFeedback in function IRsend::begin(bool aEnableLEDFeedback, uint_fast8_t aFeedbackLEDPin) and IRsend::begin(uint_fast8_t aSendPin, bool aEnableLEDFeedback, uint_fast8_t aFeedbackLEDPin). +- Added experimental Velux send function. # 4.4.3 diff --git a/examples/AllProtocolsOnLCD/AllProtocolsOnLCD.ino b/examples/AllProtocolsOnLCD/AllProtocolsOnLCD.ino index e381293d..668922eb 100644 --- a/examples/AllProtocolsOnLCD/AllProtocolsOnLCD.ino +++ b/examples/AllProtocolsOnLCD/AllProtocolsOnLCD.ino @@ -59,6 +59,7 @@ #endif //#define EXCLUDE_UNIVERSAL_PROTOCOLS // Saves up to 1000 bytes program memory. //#define EXCLUDE_EXOTIC_PROTOCOLS // saves around 650 bytes program memory if all other protocols are active +//#define USE_THRESHOLD_DECODER // May give slightly better results especially for jittering signals and protocols with short 1 pulses / pauses. Requires additional 120 bytes program memory. // MARK_EXCESS_MICROS is subtracted from all marks and added to all spaces before decoding, // to compensate for the signal forming of different IR receiver modules. See also IRremote.hpp line 135. @@ -124,7 +125,7 @@ bool ProtocolStringOverwritesVoltage = false; void printsVCCVoltageMillivoltOnLCD(); void printIRResultOnLCD(); size_t printByteHexOnLCD(uint16_t aHexByteValue); -void printSpacesOnLCD(uint_fast8_t aNumberOfSpacesToPrint); +void printSpacesOnLCD(int_fast8_t aNumberOfSpacesToPrint); #endif // defined(USE_SERIAL_LCD) || defined(USE_PARALLEL_LCD) @@ -184,8 +185,13 @@ void setup() { // Info for receive Serial.print(RECORD_GAP_MICROS); Serial.println(F(" us is the (minimum) gap, after which the start of a new IR packet is assumed")); + +# if defined(USE_THRESHOLD_DECODER) + Serial.println(F("Threshold decoding is active and thus MARK_EXCESS_MICROS is set to 0")); +# else Serial.print(MARK_EXCESS_MICROS); Serial.println(F(" us are subtracted from all marks and added to all spaces for decoding")); +# endif #endif #if defined(USE_LCD) && defined(ADC_UTILS_ARE_AVAILABLE) @@ -364,21 +370,18 @@ void printIRResultOnLCD() { * Print number of bits received and hash code or microseconds of signal */ myLCD.setCursor(0, 1); - uint8_t tNumberOfBits = (IrReceiver.decodedIRData.rawDataPtr->rawlen + 1) / 2; + uint8_t tNumberOfBits = (IrReceiver.irparams.rawlen + 1) / 2; uint_fast8_t tPrintedStringLength = myLCD.print(tNumberOfBits); myLCD.print(F(" bit ")); - if (IrReceiver.decodedIRData.decodedRawData != 0) { - if (tNumberOfBits < 10) { - myLCD.print('0'); - tPrintedStringLength++; - } + if (tNumberOfBits < 10) { + myLCD.print('0'); + tPrintedStringLength++; + } + if (tNumberOfBits < 100) { myLCD.print('x'); - tPrintedStringLength += myLCD.print(IrReceiver.decodedIRData.decodedRawData, HEX) + 1; - } else { - tPrintedStringLength += myLCD.print(IrReceiver.getTotalDurationOfRawData()); - myLCD.print(F(" \xE4s")); // \xE4 is micro symbol } + tPrintedStringLength += myLCD.print(IrReceiver.decodedIRData.decodedRawData, HEX) + 1; printSpacesOnLCD(11 - tPrintedStringLength); sLastProtocolAddress = 4711; sLastCommand = 44711; @@ -386,7 +389,7 @@ void printIRResultOnLCD() { } else { /* * Protocol is know here - * Print address only if it has changed + * Print address only if it has changed or is PULSE_DISTANCE or PULSE_WIDTH */ if (sLastProtocolAddress != IrReceiver.decodedIRData.address || IrReceiver.decodedIRData.protocol == PULSE_DISTANCE || IrReceiver.decodedIRData.protocol == PULSE_WIDTH) { @@ -473,9 +476,11 @@ size_t printByteHexOnLCD(uint16_t aHexByteValue) { return myLCD.print(aHexByteValue, HEX) + tPrintSize; } -void printSpacesOnLCD(uint_fast8_t aNumberOfSpacesToPrint) { - for (uint_fast8_t i = 0; i < aNumberOfSpacesToPrint; ++i) { - myLCD.print(' '); +void printSpacesOnLCD(int_fast8_t aNumberOfSpacesToPrint) { + if (aNumberOfSpacesToPrint > 0) { + for (uint_fast8_t i = 0; i < aNumberOfSpacesToPrint; ++i) { + myLCD.print(' '); + } } } #endif // defined(USE_LCD) diff --git a/examples/MicroGirs/MicroGirs.ino b/examples/MicroGirs/MicroGirs.ino index ca2a9b18..194728d3 100644 --- a/examples/MicroGirs/MicroGirs.ino +++ b/examples/MicroGirs/MicroGirs.ino @@ -82,6 +82,8 @@ #define BAUDRATE 115200 #define NO_DECODER +//#define NO_LED_FEEDBACK_CODE // Saves 346 bytes program memory + #include "IRremote.hpp" #include @@ -258,13 +260,13 @@ static void sendRaw(const microseconds_t intro[], unsigned lengthIntro, const mi #if defined(RECEIVE) static void dump(Stream &stream) { - unsigned int count = IrReceiver.decodedIRData.rawDataPtr->rawlen; + unsigned int count = IrReceiver.irparams.rawlen; // If buffer gets full, count = RAW_BUFFER_LENGTH, which is odd, // and IrScrutinizer does not like that. count &= ~1; for (unsigned int i = 1; i < count; i++) { stream.write(i & 1 ? '+' : '-'); - stream.print(IrReceiver.decodedIRData.rawDataPtr->rawbuf[i] * MICROS_PER_TICK, DEC); + stream.print(IrReceiver.irparams.rawbuf[i] * MICROS_PER_TICK, DEC); stream.print(" "); } stream.print('-'); @@ -307,9 +309,13 @@ void setup() { #endif #if defined(IR_SEND_PIN) - IrSender.begin(); // Start with IR_SEND_PIN -which is defined in PinDefinitionsAndMore.h- as send pin and enable feedback LED at default feedback LED pin + /* + * No IR library setup required :-) + * Default is to use IR_SEND_PIN -which is defined in PinDefinitionsAndMore.h- as send pin + * and use feedback LED at default feedback LED pin if not disabled by #define NO_LED_SEND_FEEDBACK_CODE + */ #else - IrSender.begin(3, ENABLE_LED_FEEDBACK, USE_DEFAULT_FEEDBACK_LED_PIN); // Specify send pin and enable feedback LED at default feedback LED pin + IrSender.begin(3); // Specify send pin and enable feedback LED at default feedback LED pin #endif } diff --git a/examples/MultipleReceivers/MultipleReceivers.ino b/examples/MultipleReceivers/MultipleReceivers.ino new file mode 100644 index 00000000..254db7e1 --- /dev/null +++ b/examples/MultipleReceivers/MultipleReceivers.ino @@ -0,0 +1,148 @@ +/* + * MultipleReceivers.cpp + * + * Demonstrates receiving from multiple receivers at different pins using multiple IRreceiver instances + * + * This file is part of Arduino-IRremote https://github.com/Arduino-IRremote/Arduino-IRremote. + * + ************************************************************************************ + * MIT License + * + * Copyright (c) 2025 Armin Joachimsmeyer + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is furnished + * to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, + * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A + * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE + * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + ************************************************************************************ + */ + +#include + +#define IR_RECEIVE_PIN_OF_SECOND_RECEIVER 5 + +/* + * Specify which protocol(s) should be used for decoding. + * If no protocol is defined, all protocols (except Bang&Olufsen) are active. + * This must be done before the #include + */ +//#define DECODE_DENON // Includes Sharp +//#define DECODE_JVC +//#define DECODE_KASEIKYO +//#define DECODE_PANASONIC // alias for DECODE_KASEIKYO +//#define DECODE_LG +//#define DECODE_NEC // Includes Apple and Onkyo. To enable all protocols , just comment/disable this line. +//#define DECODE_SAMSUNG +//#define DECODE_SONY +//#define DECODE_RC5 +//#define DECODE_RC6 +//#define DECODE_BOSEWAVE +//#define DECODE_LEGO_PF +//#define DECODE_MAGIQUEST +//#define DECODE_WHYNTER +//#define DECODE_FAST +//#define DECODE_DISTANCE_WIDTH // Universal decoder for pulse distance width protocols +//#define DECODE_HASH // special decoder for all protocols +//#define DECODE_BEO // This protocol must always be enabled manually, i.e. it is NOT enabled if no protocol is defined. It prevents decoding of SONY! +//#define DEBUG // Activate this for lots of lovely debug output from the decoders. +//#define RAW_BUFFER_LENGTH 750 // For air condition remotes it may require up to 750. Default is 200. +#define SUPPORT_MULTIPLE_RECEIVER_INSTANCES +void UserIRReceiveTimerInterruptHandler(); // must also be before line #include + +/* + * This include defines the actual pin number for pins like IR_RECEIVE_PIN, IR_SEND_PIN for many different boards and architectures + */ +#include "PinDefinitionsAndMore.h" +#include // include the library + +IRrecv MySecondIrReceiver(IR_RECEIVE_PIN_OF_SECOND_RECEIVER); // This sets the pin for the second instance + +void handleSuccessfulDecoding(IRrecv *aIRReceiverInstance); + +void setup() { + Serial.begin(115200); + + // Just to know which program is running on my Arduino + Serial.println(F("START " __FILE__ " from " __DATE__ "\r\nUsing library version " VERSION_IRREMOTE)); + + // Start the receiver and if not 3. parameter specified, take LED_BUILTIN pin from the internal boards definition as default feedback LED + IrReceiver.begin(IR_RECEIVE_PIN, ENABLE_LED_FEEDBACK); // This sets the pin for the default / first instance and enables the global LED feedback + + Serial.print(F("Ready to receive IR signals of protocols: ")); + printActiveIRProtocols(&Serial); + Serial.println(F("at pin " STR(IR_RECEIVE_PIN) " and pin " STR(IR_RECEIVE_PIN_OF_SECOND_RECEIVER))); +} + +void loop() { + /* + * Check if received data is available and if yes, try to decode it. + * Decoded result is in the IrReceiver.decodedIRData structure. + * + * E.g. command is in IrReceiver.decodedIRData.command + * address is in command is in IrReceiver.decodedIRData.address + * and up to 32 bit raw data in IrReceiver.decodedIRData.decodedRawData + */ + if (IrReceiver.decode()) { + handleSuccessfulDecoding(&IrReceiver); + } + if (MySecondIrReceiver.decode()) { + handleSuccessfulDecoding(&MySecondIrReceiver); + } +} + +void handleSuccessfulDecoding(IRrecv *aIRReceiverInstance) { + + Serial.print(F("Receiver at pin ")); + Serial.print(aIRReceiverInstance->irparams.IRReceivePin); + Serial.print(F(": ")); + + /* + * Print a summary of received data + */ + if (aIRReceiverInstance->decodedIRData.protocol == UNKNOWN) { + Serial.println(F("Received noise or an unknown (or not yet enabled) protocol")); + // We have an unknown protocol here, print extended info + aIRReceiverInstance->printIRResultRawFormatted(&Serial, true); + + aIRReceiverInstance->resume(); // Do it here, to preserve raw data for printing with printIRResultRawFormatted() + } else { + aIRReceiverInstance->resume(); // Early enable receiving of the next IR frame + + aIRReceiverInstance->printIRResultShort(&Serial); + aIRReceiverInstance->printIRSendUsage(&Serial); + } + Serial.println(); + + /* + * Finally, check the received data and perform actions according to the received command + */ + if (aIRReceiverInstance->decodedIRData.flags & IRDATA_FLAGS_IS_REPEAT) { + Serial.println(F("Repeat received. Here you can repeat the same action as before.")); + } else { + if (aIRReceiverInstance->decodedIRData.command == 0x10) { + Serial.println(F("Received command 0x10.")); + // do something + } else if (aIRReceiverInstance->decodedIRData.command == 0x11) { + Serial.println(F("Received command 0x11.")); + // do something else + } + } + +} + +void UserIRReceiveTimerInterruptHandler() { + MySecondIrReceiver.ReceiveInterruptHandler(); +} diff --git a/examples/MultipleReceivers/PinDefinitionsAndMore.h b/examples/MultipleReceivers/PinDefinitionsAndMore.h new file mode 100644 index 00000000..907e2a64 --- /dev/null +++ b/examples/MultipleReceivers/PinDefinitionsAndMore.h @@ -0,0 +1,359 @@ +/* + * PinDefinitionsAndMore.h + * + * Contains pin definitions for IRremote examples for various platforms + * as well as definitions for feedback LED and tone() and includes + * + * Copyright (C) 2021-2023 Armin Joachimsmeyer + * armin.joachimsmeyer@gmail.com + * + * This file is part of IRremote https://github.com/Arduino-IRremote/Arduino-IRremote. + * + * Arduino-IRremote is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + */ + +/* + * Pin mapping table for different platforms + * + * Platform IR input IR output Tone Core/Pin schema + * -------------------------------------------------------------- + * DEFAULT/AVR 2 3 4 Arduino + * ATtinyX5 0|PB0 4|PB4 3|PB3 ATTinyCore + * ATtiny167 3|PA3 2|PA2 7|PA7 ATTinyCore + * ATtiny167 9|PA3 8|PA2 5|PA7 Digispark original core + * ATtiny84 |PB2 |PA4 |PA3 ATTinyCore + * ATtiny88 3|PD3 4|PD4 9|PB1 ATTinyCore + * ATtiny3216 14|PA1 15|PA2 16|PA3 MegaTinyCore + * ATtiny1604 2 3|PA5 % + * ATtiny816 14|PA1 16|PA3 1|PA5 MegaTinyCore + * ATtiny1614 8|PA1 10|PA3 1|PA5 MegaTinyCore + * MKR* 1 3 4 + * SAMD 2 3 4 + * ESP8266 14|D5 12|D6 % + * ESP32 15 4 27 + * ESP32-C3 2 3 4 + * BluePill PA6 PA7 PA3 + * APOLLO3 11 12 5 + * RP2040 3|GPIO15 4|GPIO16 5|GPIO17 + */ +//#define _IR_MEASURE_TIMING // For debugging purposes. + +#if defined(__AVR__) +#if (defined(__AVR_ATtiny25__) || defined(__AVR_ATtiny45__) || defined(__AVR_ATtiny85__)) && defined(PIN_PB0) // Digispark board. For use with ATTinyCore. +#include "ATtinySerialOut.hpp" // TX is at pin 2 - Available as Arduino library "ATtinySerialOut". Saves 700 bytes program memory and 70 bytes RAM for ATtinyCore. +#define IR_RECEIVE_PIN PIN_PB0 +#define IR_SEND_PIN PIN_PB4 // Pin 2 is serial output with ATtinySerialOut. Pin 1 is internal LED and Pin3 is USB+ with pullup on Digispark board. +#define TONE_PIN PIN_PB3 +#define _IR_TIMING_TEST_PIN PIN_PB3 + +# elif defined(__AVR_ATtiny87__) || defined(__AVR_ATtiny167__) // Digispark pro board +#include "ATtinySerialOut.hpp" // Available as Arduino library "ATtinySerialOut" +// For ATtiny167 Pins PB6 and PA3 are usable as interrupt source. +# if defined(ARDUINO_AVR_DIGISPARKPRO) +// For use with Digispark original core +#define IR_RECEIVE_PIN 9 // PA3 - on Digispark board labeled as pin 9 +//#define IR_RECEIVE_PIN 14 // PB6 / INT0 is connected to USB+ on DigisparkPro boards +#define IR_SEND_PIN 8 // PA2 - on Digispark board labeled as pin 8 +#define TONE_PIN 5 // PA7 - on Digispark board labeled as pin 5 +#define _IR_TIMING_TEST_PIN 10 // PA4 +# elif !defined(PIN_PA3) +#error ATtiny87 or ATtiny167 is not supported for the selected core. Please extend PinDefinitionsAndMore.h. +# else +// For use with ATTinyCore +#define IR_RECEIVE_PIN PIN_PA3 // On Digispark board labeled as pin 9 - INT0 is connected to USB+ on DigisparkPro boards +#define IR_SEND_PIN PIN_PA2 // On Digispark board labeled as pin 8 +#define TONE_PIN PIN_PA7 // On Digispark board labeled as pin 5 +# endif + +# elif defined(__AVR_ATtiny84__) && defined(PIN_PB2) // For use with ATTinyCore +#include "ATtinySerialOut.hpp" // Available as Arduino library "ATtinySerialOut". Saves 128 bytes program memory. +#define IR_RECEIVE_PIN PIN_PB2 // INT0 +#define IR_SEND_PIN PIN_PA4 +#define TONE_PIN PIN_PA3 +#define _IR_TIMING_TEST_PIN PIN_PA5 + +# elif defined(__AVR_ATtiny88__) && defined(PIN_PD3) // MH-ET Tiny88 board. For use with ATTinyCore. +#include "ATtinySerialOut.hpp" // Available as Arduino library "ATtinySerialOut". Saves 128 bytes program memory. +// Pin 6 is TX, pin 7 is RX +#define IR_RECEIVE_PIN PIN_PD3 // 3 - INT1 +#define IR_SEND_PIN PIN_PD4 // 4 +#define TONE_PIN PIN_PB1 // 9 +#define _IR_TIMING_TEST_PIN PIN_PB0 // 8 + +# elif (defined(__AVR_ATtiny1616__) || defined(__AVR_ATtiny3216__) || defined(__AVR_ATtiny3217__)) && defined(PIN_PA1) // For use with megaTinyCore +// Tiny Core Dev board +// https://www.tindie.com/products/xkimi/tiny-core-16-dev-board-attiny1616/ - Out of Stock +// https://www.tindie.com/products/xkimi/tiny-core-32-dev-board-attiny3217/ - Out of Stock +#define IR_RECEIVE_PIN PIN_PA1 // 14 use 18 instead of PIN_PA1 for TinyCore32 +#define IR_SEND_PIN PIN_PA2 // 15, 19 for TinyCore32 +#define TONE_PIN PIN_PA3 // 16, 20 for TinyCore32 +#define APPLICATION_PIN PIN_PC3 // 13, PIN_PA0 is RESET +#undef LED_BUILTIN // No LED available on the TinyCore 32 board, take the one on the programming board which is connected to the DAC output +#define LED_BUILTIN PIN_PA6 // use 2 instead of PIN_PA6 for TinyCore32 + +# elif defined(__AVR_ATtiny816__) && defined(PIN_PA1) // For use with megaTinyCore +#define IR_RECEIVE_PIN PIN_PA1 // 14 +#define IR_SEND_PIN PIN_PA3 // 16 +#define TONE_PIN PIN_PA5 // 1 +#define APPLICATION_PIN PIN_PA4 // 0 +#undef LED_BUILTIN // No LED available, take the one which is connected to the DAC output +#define LED_BUILTIN PIN_PB5 // 4 + +# elif defined(__AVR_ATtiny1614__) && defined(PIN_PA1) // For use with megaTinyCore +#define IR_RECEIVE_PIN PIN_PA1 // 8 +#define IR_SEND_PIN PIN_PA3 // 10 +#define TONE_PIN PIN_PA5 // 1 +#define APPLICATION_PIN PIN_PA4 // 0 + +# elif defined(__AVR_ATtiny1604__) && defined(PIN_PA6) // For use with megaTinyCore +#define IR_RECEIVE_PIN PIN_PA6 // 2 - To be compatible with interrupt example, pin 2 is chosen here. +#define IR_SEND_PIN PIN_PA7 // 3 +#define APPLICATION_PIN PIN_PB2 // 5 + +#define tone(...) void() // Define as void, since TCB0_INT_vect is also used by tone() +#define noTone(a) void() +#define TONE_PIN 42 // Dummy for examples using it + +# elif defined(__AVR_ATmega1284__) || defined(__AVR_ATmega1284P__) \ +|| defined(__AVR_ATmega644__) || defined(__AVR_ATmega644P__) \ +|| defined(__AVR_ATmega324P__) || defined(__AVR_ATmega324A__) \ +|| defined(__AVR_ATmega324PA__) || defined(__AVR_ATmega164A__) \ +|| defined(__AVR_ATmega164P__) || defined(__AVR_ATmega32__) \ +|| defined(__AVR_ATmega16__) || defined(__AVR_ATmega8535__) \ +|| defined(__AVR_ATmega64__) || defined(__AVR_ATmega128__) \ +|| defined(__AVR_ATmega1281__) || defined(__AVR_ATmega2561__) \ +|| defined(__AVR_ATmega8515__) || defined(__AVR_ATmega162__) +#define IR_RECEIVE_PIN 2 +#define IR_SEND_PIN 13 +#define TONE_PIN 4 +#define APPLICATION_PIN 5 +#define ALTERNATIVE_IR_FEEDBACK_LED_PIN 6 // E.g. used for examples which use LED_BUILDIN for example output. +#define _IR_TIMING_TEST_PIN 7 + +# else // Default as for ATmega328 like on Uno, Nano, Leonardo, Teensy 2.0 etc. +#define IR_RECEIVE_PIN 2 // To be compatible with interrupt example, pin 2 is chosen here. +#define IR_SEND_PIN 3 +#define TONE_PIN 4 +#define APPLICATION_PIN 5 +#define ALTERNATIVE_IR_FEEDBACK_LED_PIN 6 // E.g. used for examples which use LED_BUILDIN for example output. +#define _IR_TIMING_TEST_PIN 7 + +# if defined(ARDUINO_AVR_PROMICRO) // Sparkfun Pro Micro is __AVR_ATmega32U4__ but has different external circuit +// We have no built in LED at pin 13 -> reuse RX LED +#undef LED_BUILTIN +#define LED_BUILTIN LED_BUILTIN_RX +# endif +# endif // defined(__AVR_ATtiny25__)... + +#elif defined(ARDUINO_ARCH_RENESAS_UNO) // Uno R4 +// To be compatible with Uno R3. +#define IR_RECEIVE_PIN 2 +#define IR_SEND_PIN 3 +#define TONE_PIN 4 +#define APPLICATION_PIN 5 +#define ALTERNATIVE_IR_FEEDBACK_LED_PIN 6 // E.g. used for examples which use LED_BUILDIN for example output. +#define _IR_TIMING_TEST_PIN 7 + +#elif defined(ESP8266) +#define FEEDBACK_LED_IS_ACTIVE_LOW // The LED on my board (D4) is active LOW +#define IR_RECEIVE_PIN 14 // D5 +#define IR_SEND_PIN 12 // D6 - D4/pin 2 is internal LED +#define _IR_TIMING_TEST_PIN 2 // D4 +#define APPLICATION_PIN 13 // D7 + +#define tone(...) void() // tone() inhibits receive timer +#define noTone(a) void() +#define TONE_PIN 42 // Dummy for examples using it# + +#elif defined(ARDUINO_NOLOGO_ESP32C3_SUPER_MINI) +#define FEEDBACK_LED_IS_ACTIVE_LOW // The LED on my board (D8) is active LOW +#define IR_RECEIVE_PIN 2 +#define IR_SEND_PIN 3 +#define TONE_PIN 4 +#define APPLICATION_PIN 10 + +#elif defined(CONFIG_IDF_TARGET_ESP32C3) || defined(ARDUINO_ESP32C3_DEV) +#define NO_LED_FEEDBACK_CODE // The WS2812 on pin 8 of AI-C3 board crashes if used as receive feedback LED, other I/O pins are working... +#define IR_RECEIVE_PIN 6 +#define IR_SEND_PIN 7 +#define TONE_PIN 9 +#define APPLICATION_PIN 10 + +#elif defined(ESP32) +#include + +// tone() is included in ESP32 core since 2.0.2 +# if !defined(ESP_ARDUINO_VERSION) +#define ESP_ARDUINO_VERSION 0x010101 // Version 1.1.1 +# endif +# if !defined(ESP_ARDUINO_VERSION_VAL) +#define ESP_ARDUINO_VERSION_VAL(major, minor, patch) ((major << 16) | (minor << 8) | (patch)) +# endif +#if ESP_ARDUINO_VERSION <= ESP_ARDUINO_VERSION_VAL(2, 0, 2) +#define TONE_LEDC_CHANNEL 1 // Using channel 1 makes tone() independent of receiving timer -> No need to stop receiving timer. +void tone(uint8_t aPinNumber, unsigned int aFrequency){ + ledcAttachPin(aPinNumber, TONE_LEDC_CHANNEL); + ledcWriteTone(TONE_LEDC_CHANNEL, aFrequency); +} +void tone(uint8_t aPinNumber, unsigned int aFrequency, unsigned long aDuration){ + ledcAttachPin(aPinNumber, TONE_LEDC_CHANNEL); + ledcWriteTone(TONE_LEDC_CHANNEL, aFrequency); + delay(aDuration); + ledcWriteTone(TONE_LEDC_CHANNEL, 0); +} +void noTone(uint8_t aPinNumber){ + ledcWriteTone(TONE_LEDC_CHANNEL, 0); +} +#endif // ESP_ARDUINO_VERSION <= ESP_ARDUINO_VERSION_VAL(2, 0, 2) + +#define IR_RECEIVE_PIN 15 // D15 +#define IR_SEND_PIN 4 // D4 +#define TONE_PIN 27 // D27 25 & 26 are DAC0 and 1 +#define APPLICATION_PIN 16 // RX2 pin + +#elif (defined(ARDUINO_ARCH_STM32) || defined(ARDUINO_ARCH_STM32F1)) && defined(PA6) // BluePill +// Timer 3 blocks PA6, PA7, PB0, PB1 for use by Servo or tone() +#define IR_RECEIVE_PIN PA6 +#define IR_RECEIVE_PIN_STRING "PA6" +#define IR_SEND_PIN PA7 +#define IR_SEND_PIN_STRING "PA7" +#define TONE_PIN PA3 +#define _IR_TIMING_TEST_PIN PA5 +#define APPLICATION_PIN PA2 +#define APPLICATION_PIN_STRING "PA2" +# if defined(ARDUINO_GENERIC_STM32F103C) || defined(ARDUINO_BLUEPILL_F103C8) +// BluePill LED is active low +#define FEEDBACK_LED_IS_ACTIVE_LOW +# endif + +#elif defined(ARDUINO_ARCH_APOLLO3) // Sparkfun Apollo boards +#define IR_RECEIVE_PIN 11 +#define IR_SEND_PIN 12 +#define TONE_PIN 5 + +#elif defined(ARDUINO_ARCH_MBED) && defined(ARDUINO_ARCH_MBED_NANO) // Arduino Nano 33 BLE and Arduino Nano Connect layout for MBED +// Must be before ARDUINO_ARCH_RP2040, since it is the layout for the MBED core of Arduino Nano Connect +#define IR_RECEIVE_PIN 3 // GPIO15 Start with pin 3 since pin 2|GPIO25 is connected to LED on Pi pico +#define IR_SEND_PIN 4 // GPIO16 +#define TONE_PIN 5 +#define APPLICATION_PIN 6 +#define ALTERNATIVE_IR_FEEDBACK_LED_PIN 7 // E.g. used for examples which use LED_BUILDIN for example output. +#define _IR_TIMING_TEST_PIN 8 + +#elif defined(ARDUINO_ARCH_RP2040) // Arduino Nano Connect, Pi Pico with arduino-pico core https://github.com/earlephilhower/arduino-pico +#define IR_RECEIVE_PIN 15 // GPIO15 to be compatible with the Arduino Nano RP2040 Connect (pin3) +#define IR_SEND_PIN 16 // GPIO16 +#define TONE_PIN 17 +#define APPLICATION_PIN 18 +#define ALTERNATIVE_IR_FEEDBACK_LED_PIN 19 // E.g. used for examples which use LED_BUILDIN for example output. +#define _IR_TIMING_TEST_PIN 20 + +// If you program the Nano RP2040 Connect with this core, then you must redefine LED_BUILTIN +// and use the external reset with 1 kOhm to ground to enter UF2 mode +#undef LED_BUILTIN +#define LED_BUILTIN 6 + +#elif defined(PARTICLE) && defined(A4) // !!!UNTESTED!!! +#define IR_RECEIVE_PIN A4 +#define IR_SEND_PIN A5 // Particle supports multiple pins + +#define LED_BUILTIN D7 + +/* + * 4 times the same (default) layout for easy adaption in the future + */ +#elif defined(TEENSYDUINO) // Teensy 2.0 is handled at default for ATmega328 like on Uno, Nano, Leonardo etc. +#define IR_RECEIVE_PIN 2 +#define IR_SEND_PIN 3 +#define TONE_PIN 4 +#define APPLICATION_PIN 5 +#define ALTERNATIVE_IR_FEEDBACK_LED_PIN 6 // E.g. used for examples which use LED_BUILDIN for example output. +#define _IR_TIMING_TEST_PIN 7 + +#elif defined(ARDUINO_ARCH_MBED) // Arduino Nano 33 BLE +#define IR_RECEIVE_PIN 2 +#define IR_SEND_PIN 3 +#define TONE_PIN 4 +#define APPLICATION_PIN 5 +#define ALTERNATIVE_IR_FEEDBACK_LED_PIN 6 // E.g. used for examples which use LED_BUILDIN for example output. +#define _IR_TIMING_TEST_PIN 7 + +#elif defined(ARDUINO_ARCH_SAMD) || defined(ARDUINO_ARCH_SAM) +# if defined(USE_ARDUINO_MKR_PIN_LAYOUT) +#define IR_RECEIVE_PIN 1 // Pin 2 on MKR is not interrupt capable, see https://www.arduino.cc/reference/tr/language/functions/external-interrupts/attachinterrupt/ +# else +#define IR_RECEIVE_PIN 2 +# endif +#define IR_SEND_PIN 3 +#define TONE_PIN 4 +#define APPLICATION_PIN 5 +#define ALTERNATIVE_IR_FEEDBACK_LED_PIN 6 // E.g. used for examples which use LED_BUILDIN for example output. +#define _IR_TIMING_TEST_PIN 7 + +#if !defined(ARDUINO_SAMD_ADAFRUIT) && !defined(ARDUINO_SEEED_XIAO_M0) +// On the Zero and others we switch explicitly to SerialUSB +#define Serial SerialUSB +#endif + +// Definitions for the Chinese SAMD21 M0-Mini clone, which has no led connected to D13/PA17. +// Attention!!! D2 and D4 are swapped on these boards!!! +// If you connect the LED, it is on pin 24/PB11. In this case activate the next two lines. +//#undef LED_BUILTIN +//#define LED_BUILTIN 24 // PB11 +// As an alternative you can choose pin 25, it is the RX-LED pin (PB03), but active low.In this case activate the next 3 lines. +//#undef LED_BUILTIN +//#define LED_BUILTIN 25 // PB03 +//#define FEEDBACK_LED_IS_ACTIVE_LOW // The RX LED on the M0-Mini is active LOW + +#elif defined (NRF51) // BBC micro:bit +#define IR_RECEIVE_PIN 2 +#define IR_SEND_PIN 3 +#define APPLICATION_PIN 1 +#define _IR_TIMING_TEST_PIN 4 + +#define tone(...) void() // no tone() available +#define noTone(a) void() +#define TONE_PIN 42 // Dummy for examples using it + +#else +#warning Board and Core / CPU is not detected using pre-processor symbols -> using default values, which may not fit. Please extend PinDefinitionsAndMore.h. +// Default valued for unidentified boards +#define IR_RECEIVE_PIN 2 +#define IR_SEND_PIN 3 +#define TONE_PIN 4 +#define APPLICATION_PIN 5 +#define ALTERNATIVE_IR_FEEDBACK_LED_PIN 6 // E.g. used for examples which use LED_BUILDIN for example output. +#define _IR_TIMING_TEST_PIN 7 +#endif // defined(ESP8266) + +#if defined(ESP32) || defined(ARDUINO_ARCH_RP2040) || defined(PARTICLE) || defined(ARDUINO_ARCH_MBED) +#define SEND_PWM_BY_TIMER // We do not have pin restrictions for this CPU's, so lets use the hardware PWM for send carrier signal generation +#else +# if defined(SEND_PWM_BY_TIMER) +#undef IR_SEND_PIN // SendPin is determined by timer! This avoids warnings in IRremote.hpp and IRTimer.hpp +# endif +#endif + +#if !defined (FLASHEND) +#define FLASHEND 0xFFFF // Dummy value for platforms where FLASHEND is not defined +#endif + +/* + * Helper macro for getting a macro definition as string + */ +#if !defined(STR_HELPER) +#define STR_HELPER(x) #x +#define STR(x) STR_HELPER(x) +#endif diff --git a/examples/MultipleSendPins/MultipleSendPins.ino b/examples/MultipleSendPins/MultipleSendPins.ino index 33566bcb..30a627ef 100644 --- a/examples/MultipleSendPins/MultipleSendPins.ino +++ b/examples/MultipleSendPins/MultipleSendPins.ino @@ -16,7 +16,9 @@ #if !defined(ARDUINO_ESP32C3_DEV) // This is due to a bug in RISC-V compiler, which requires unused function sections :-(. #define DISABLE_CODE_FOR_RECEIVER // Disables static receiver code like receive timer ISR handler and static IRReceiver and irparams data. Saves 450 bytes program memory and 269 bytes RAM if receiving functions are not required. #endif + //#define USE_NO_SEND_PWM // Use no carrier PWM, just simulate an active low receiver signal. Overrides SEND_PWM_BY_TIMER definition +//#define NO_LED_FEEDBACK_CODE // Saves 52 bytes program memory #include // include the library diff --git a/examples/ReceiveAndSend/ReceiveAndSend.ino b/examples/ReceiveAndSend/ReceiveAndSend.ino index 5a093599..a104f910 100644 --- a/examples/ReceiveAndSend/ReceiveAndSend.ino +++ b/examples/ReceiveAndSend/ReceiveAndSend.ino @@ -84,6 +84,7 @@ //#define RECORD_GAP_MICROS 12000 // Default is 8000. Activate it for some LG air conditioner protocols //#define SEND_PWM_BY_TIMER // Disable carrier PWM generation in software and use (restricted) hardware PWM. //#define USE_NO_SEND_PWM // Use no carrier PWM, just simulate an active low receiver signal. Overrides SEND_PWM_BY_TIMER definition +//#define NO_LED_FEEDBACK_CODE // Saves 202 bytes program memory // MARK_EXCESS_MICROS is subtracted from all marks and added to all spaces before decoding, // to compensate for the signal forming of different IR receiver modules. See also IRremote.hpp line 135. @@ -129,7 +130,11 @@ void setup() { printActiveIRProtocols(&Serial); Serial.println(F("at pin " STR(IR_RECEIVE_PIN))); - IrSender.begin(); // Start with IR_SEND_PIN -which is defined in PinDefinitionsAndMore.h- as send pin and enable feedback LED at default feedback LED pin + /* + * No IR library setup required :-) + * Default is to use IR_SEND_PIN -which is defined in PinDefinitionsAndMore.h- as send pin + * and use feedback LED at default feedback LED pin if not disabled by #define NO_LED_SEND_FEEDBACK_CODE + */ Serial.print(F("Ready to send IR signal (with repeats) at pin " STR(IR_SEND_PIN) " as long as button at pin ")); Serial.print(SEND_BUTTON_PIN); Serial.println(F(" is pressed.")); @@ -185,9 +190,9 @@ void loop() { // Stores the code for later playback in sStoredIRData // Most of this code is just logging void storeCode() { - if (IrReceiver.decodedIRData.rawDataPtr->rawlen < 4) { + if (IrReceiver.irparams.rawlen < 4) { Serial.print(F("Ignore data with rawlen=")); - Serial.println(IrReceiver.decodedIRData.rawDataPtr->rawlen); + Serial.println(IrReceiver.irparams.rawlen); return; } if (IrReceiver.decodedIRData.flags & IRDATA_FLAGS_IS_REPEAT) { @@ -214,7 +219,7 @@ void storeCode() { auto tProtocol = sStoredIRData.receivedIRData.protocol; if (tProtocol == UNKNOWN || tProtocol == PULSE_WIDTH || tProtocol == PULSE_DISTANCE) { // TODO: support PULSE_WIDTH and PULSE_DISTANCE with IrSender.write - sStoredIRData.rawCodeLength = IrReceiver.decodedIRData.rawDataPtr->rawlen - 1; + sStoredIRData.rawCodeLength = IrReceiver.irparams.rawlen - 1; /* * Store the current raw data in a dedicated array for later usage */ @@ -223,7 +228,7 @@ void storeCode() { * Print info */ Serial.print(F("Received unknown or pulse width/distance code and store ")); - Serial.print(IrReceiver.decodedIRData.rawDataPtr->rawlen - 1); + Serial.print(IrReceiver.irparams.rawlen - 1); Serial.println(F(" timing entries as raw in buffer of size " STR(RAW_BUFFER_LENGTH))); IrReceiver.printIRResultRawFormatted(&Serial, true); // Output the results in RAW format @@ -249,7 +254,7 @@ void sendCode(storedIRDataStruct *aIRDataToSend) { * Use the write function, which does the switch for different protocols */ IrSender.write(&aIRDataToSend->receivedIRData); - printIRResultShort(&Serial, &aIRDataToSend->receivedIRData); + printIRDataShort(&Serial, &aIRDataToSend->receivedIRData); } } diff --git a/examples/ReceiveAndSendDistanceWidth/ReceiveAndSendDistanceWidth.ino b/examples/ReceiveAndSendDistanceWidth/ReceiveAndSendDistanceWidth.ino index 31391cb5..dac652bb 100644 --- a/examples/ReceiveAndSendDistanceWidth/ReceiveAndSendDistanceWidth.ino +++ b/examples/ReceiveAndSendDistanceWidth/ReceiveAndSendDistanceWidth.ino @@ -69,6 +69,9 @@ //#define RECORD_GAP_MICROS 12000 // Default is 8000. Activate it for some LG air conditioner protocols //#define SEND_PWM_BY_TIMER // Disable carrier PWM generation in software and use (restricted) hardware PWM. //#define USE_NO_SEND_PWM // Use no carrier PWM, just simulate an active low receiver signal. Overrides SEND_PWM_BY_TIMER definition +//#define NO_LED_FEEDBACK_CODE // Saves 218 bytes program memory +//#define NO_LED_RECEIVE_FEEDBACK_CODE // Saves 82 bytes program memory +//#define NO_LED_SEND_FEEDBACK_CODE // Saves 58 bytes program memory //#define DEBUG // Activate this for lots of lovely debug output from the decoders. @@ -101,7 +104,11 @@ void setup() { IrReceiver.begin(IR_RECEIVE_PIN, ENABLE_LED_FEEDBACK); Serial.println(F("Ready to receive pulse distance/width coded IR signals at pin " STR(IR_RECEIVE_PIN))); - IrSender.begin(); // Start with IR_SEND_PIN -which is defined in PinDefinitionsAndMore.h- as send pin and enable feedback LED at default feedback LED pin + /* + * No IR send setup required :-) + * Default is to use IR_SEND_PIN -which is defined in PinDefinitionsAndMore.h- as send pin + * and use feedback LED at default feedback LED pin if not disabled by #define NO_LED_SEND_FEEDBACK_CODE + */ Serial.print(F("Ready to send IR signals at pin " STR(IR_SEND_PIN) " on press of button at pin ")); Serial.println(SEND_BUTTON_PIN); } diff --git a/examples/ReceiveAndSendHob2Hood/ReceiveAndSendHob2Hood.ino b/examples/ReceiveAndSendHob2Hood/ReceiveAndSendHob2Hood.ino index f9b3a2b0..5ffd427e 100644 --- a/examples/ReceiveAndSendHob2Hood/ReceiveAndSendHob2Hood.ino +++ b/examples/ReceiveAndSendHob2Hood/ReceiveAndSendHob2Hood.ino @@ -34,8 +34,11 @@ #define DECODE_HASH // Only decoder, which works for Hob2Hood. protocol is UNKNOWN and only raw data is set. -//#define NO_LED_FEEDBACK_CODE // saves 92 bytes program memory -//#define SEND_PWM_BY_TIMER // Disable carrier PWM generation in software and use (restricted) hardware PWM. +//#define NO_LED_FEEDBACK_CODE // saves 92 bytes program memory +//#define SEND_PWM_BY_TIMER // Disable carrier PWM generation in software and use (restricted) hardware PWM. +//#define NO_LED_FEEDBACK_CODE // Saves 310 bytes program memory +//#define NO_LED_RECEIVE_FEEDBACK_CODE // Saves 44 bytes program memory +//#define NO_LED_SEND_FEEDBACK_CODE // Saves 34 bytes program memory #include "PinDefinitionsAndMore.h" // Define macros for input and output pin etc. #include @@ -86,7 +89,11 @@ void setup() { IrReceiver.begin(IR_RECEIVE_PIN, ENABLE_LED_FEEDBACK); Serial.print(F("Ready to receive Hob2Hood IR signals at pin " STR(IR_RECEIVE_PIN))); - IrSender.begin(); // Start with IR_SEND_PIN -which is defined in PinDefinitionsAndMore.h- as send pin and enable feedback LED at default feedback LED pin + /* + * No IR send setup required :-) + * Default is to use IR_SEND_PIN -which is defined in PinDefinitionsAndMore.h- as send pin + * and use feedback LED at default feedback LED pin if not disabled by #define NO_LED_SEND_FEEDBACK_CODE + */ Serial.println(F("Send Hob2Hood IR signals at pin " STR(IR_SEND_PIN))); } diff --git a/examples/ReceiveDemo/ReceiveDemo.ino b/examples/ReceiveDemo/ReceiveDemo.ino index 44fa78e6..4b44fc3d 100644 --- a/examples/ReceiveDemo/ReceiveDemo.ino +++ b/examples/ReceiveDemo/ReceiveDemo.ino @@ -48,7 +48,6 @@ //#define DECODE_KASEIKYO //#define DECODE_PANASONIC // alias for DECODE_KASEIKYO //#define DECODE_LG -//#define DECODE_ONKYO // Decodes only Onkyo and not NEC or Apple //#define DECODE_NEC // Includes Apple and Onkyo //#define DECODE_SAMSUNG //#define DECODE_SONY @@ -61,6 +60,7 @@ //#define DECODE_FAST //#define DECODE_DISTANCE_WIDTH // Universal decoder for pulse distance width protocols //#define DECODE_HASH // special decoder for all protocols +//#define DECODE_ONKYO // Disables NEC and Apple //#define DECODE_BEO // This protocol must always be enabled manually, i.e. it is NOT enabled if no protocol is defined. It prevents decoding of SONY! #if FLASHEND >= 0x3FFF // For 16k flash or more, like ATtiny1604. Code does not fit in program memory of ATtiny85 etc. // !!! Enabling B&O disables detection of Sony, because the repeat gap for SONY is smaller than the B&O frame gap :-( !!! @@ -95,7 +95,9 @@ //#define NO_LED_FEEDBACK_CODE // saves 92 bytes program memory //#define EXCLUDE_UNIVERSAL_PROTOCOLS // Saves up to 1000 bytes program memory. //#define EXCLUDE_EXOTIC_PROTOCOLS // saves around 650 bytes program memory if all other protocols are active +//#define USE_THRESHOLD_DECODER // May give slightly better results especially for jittering signals and protocols with short 1 pulses / pauses. Requires additional 1 bytes program memory. //#define IR_REMOTE_DISABLE_RECEIVE_COMPLETE_CALLBACK // saves 32 bytes program memory + // MARK_EXCESS_MICROS is subtracted from all marks and added to all spaces before decoding, // to compensate for the signal forming of different IR receiver modules. See also IRremote.hpp line 135. // 20 is taken as default if not otherwise specified / defined. @@ -110,12 +112,12 @@ #include -#if defined(APPLICATION_PIN) -#define DEBUG_BUTTON_PIN APPLICATION_PIN // if low, print timing for each received data set +#if defined(APPLICATION_PIN) && !defined(DEBUG_BUTTON_PIN) +#define DEBUG_BUTTON_PIN APPLICATION_PIN // if held low, print timing for each received data #else #define DEBUG_BUTTON_PIN 6 #endif -#if defined(ESP32) +#if defined(ESP32) && defined(DEBUG_BUTTON_PIN) # if !digitalPinIsValid(DEBUG_BUTTON_PIN) #undef DEBUG_BUTTON_PIN // DEBUG_BUTTON_PIN number is not valid, so delete definition to disable further usage # endif @@ -132,7 +134,7 @@ void setup() { # endif #endif - Serial.begin(9600); + Serial.begin(115200); #if defined(__AVR_ATmega32U4__) || defined(SERIAL_PORT_USBVIRTUAL) || defined(SERIAL_USB) /*stm32duino*/|| defined(USBCON) /*STM32_stm32*/ \ || defined(SERIALUSB_PID) || defined(ARDUINO_ARCH_RP2040) || defined(ARDUINO_attiny3217) || (defined(ESP32) && defined(ARDUINO_USB_MODE)) @@ -169,19 +171,20 @@ void setup() { Serial.println(); # if defined(DEBUG_BUTTON_PIN) Serial.print(F("If you connect debug pin ")); -# if defined(APPLICATION_PIN_STRING) - Serial.print(APPLICATION_PIN_STRING); -# else Serial.print(DEBUG_BUTTON_PIN); -# endif Serial.println(F(" to ground, raw data is always printed and tone is disabled")); # endif // infos for receive Serial.print(RECORD_GAP_MICROS); Serial.println(F(" us is the (minimum) gap, after which the start of a new IR packet is assumed")); + +# if defined(USE_THRESHOLD_DECODER) + Serial.println(F("Threshold decoding is active and thus MARK_EXCESS_MICROS is set to 0")); +# else Serial.print(MARK_EXCESS_MICROS); Serial.println(F(" us are subtracted from all marks and added to all spaces for decoding")); +# endif #endif // FLASHEND >= 0x3FFF } @@ -230,9 +233,9 @@ void loop() { */ if (IrReceiver.decodedIRData.protocol == UNKNOWN #if defined(DEBUG_BUTTON_PIN) - || digitalRead(DEBUG_BUTTON_PIN) == LOW) + || digitalRead(DEBUG_BUTTON_PIN) == LOW #endif - { + ) { // We have debug enabled or an unknown protocol, print extended info if (IrReceiver.decodedIRData.protocol == UNKNOWN) { Serial.println(F("Received noise or an unknown (or not yet enabled) protocol")); diff --git a/examples/ReceiveDump/ReceiveDump.ino b/examples/ReceiveDump/ReceiveDump.ino index d1921efb..7868f38c 100644 --- a/examples/ReceiveDump/ReceiveDump.ino +++ b/examples/ReceiveDump/ReceiveDump.ino @@ -90,8 +90,14 @@ void setup() { // infos for receive Serial.print(RECORD_GAP_MICROS); Serial.println(F(" us is the (minimum) gap, after which the start of a new IR packet is assumed")); + +# if defined(USE_THRESHOLD_DECODER) + Serial.println(F("Threshold decoding is active and thus MARK_EXCESS_MICROS is set to 0")); +# else Serial.print(MARK_EXCESS_MICROS); Serial.println(F(" us are subtracted from all marks and added to all spaces for decoding")); +# endif + Serial.println(); Serial.println(F("Because of the verbose output (>200 ms at 115200 baud), repeats are not dumped correctly!")); Serial.println(); diff --git a/examples/ReceiveOneAndSendMultiple/ReceiveOneAndSendMultiple.ino b/examples/ReceiveOneAndSendMultiple/ReceiveOneAndSendMultiple.ino index fd2a8932..3eb22c93 100644 --- a/examples/ReceiveOneAndSendMultiple/ReceiveOneAndSendMultiple.ino +++ b/examples/ReceiveOneAndSendMultiple/ReceiveOneAndSendMultiple.ino @@ -90,6 +90,8 @@ #include +//#define NO_LED_FEEDBACK_CODE // Saves 104 bytes program memory + // select only Samsung protocol for sending and receiving #define DECODE_SAMSUNG #define ADDRESS_OF_SAMSUNG_REMOTE 0x07 // The value you see as address in printIRResultShort() @@ -125,7 +127,11 @@ void setup() { printActiveIRProtocols(&Serial); Serial.println(F("at pin " STR(IR_RECEIVE_PIN))); - IrSender.begin(); // Start with IR_SEND_PIN -which is defined in PinDefinitionsAndMore.h- as send pin and enable feedback LED at default feedback LED pin + /* + * No IR send setup required :-) + * Default is to use IR_SEND_PIN -which is defined in PinDefinitionsAndMore.h- as send pin + * and use feedback LED at default feedback LED pin if not disabled by #define NO_LED_SEND_FEEDBACK_CODE + */ Serial.println(F("Ready to send IR signals at pin " STR(IR_SEND_PIN))); } diff --git a/examples/SendAndReceive/SendAndReceive.ino b/examples/SendAndReceive/SendAndReceive.ino index 9b80ab7e..eec023f1 100644 --- a/examples/SendAndReceive/SendAndReceive.ino +++ b/examples/SendAndReceive/SendAndReceive.ino @@ -38,10 +38,12 @@ //#define EXCLUDE_UNIVERSAL_PROTOCOLS // Saves up to 1000 bytes program memory. //#define EXCLUDE_EXOTIC_PROTOCOLS // saves around 650 bytes program memory if all other protocols are active -//#define NO_LED_FEEDBACK_CODE // saves 92 bytes program memory //#define RECORD_GAP_MICROS 12000 // Default is 8000. Activate it for some LG air conditioner protocols //#define SEND_PWM_BY_TIMER // Disable carrier PWM generation in software and use (restricted) hardware PWM. //#define USE_NO_SEND_PWM // Use no carrier PWM, just simulate an active low receiver signal. Overrides SEND_PWM_BY_TIMER definition +//#define NO_LED_FEEDBACK_CODE // saves 318 bytes program memory +//#define NO_LED_RECEIVE_FEEDBACK_CODE // Saves 44 bytes program memory +//#define NO_LED_SEND_FEEDBACK_CODE // Saves 36 bytes program memory //#define DEBUG // Activate this for lots of lovely debug output from the decoders. @@ -67,7 +69,11 @@ void setup() { Serial.print(F("Ready to receive IR signals of protocols: ")); printActiveIRProtocols(&Serial); Serial.println(F("at pin " STR(IR_RECEIVE_PIN))); - IrSender.begin(); // Start with IR_SEND_PIN -which is defined in PinDefinitionsAndMore.h- as send pin and enable feedback LED at default feedback LED pin + /* + * No IR send setup required :-) + * Default is to use IR_SEND_PIN -which is defined in PinDefinitionsAndMore.h- as send pin + * and use feedback LED at default feedback LED pin if not disabled by #define NO_LED_SEND_FEEDBACK_CODE + */ Serial.println(F("Send IR signals at pin " STR(IR_SEND_PIN))); #if FLASHEND >= 0x3FFF // For 16k flash or more, like ATtiny1604 @@ -89,8 +95,13 @@ void setup() { // infos for receive Serial.print(RECORD_GAP_MICROS); Serial.println(F(" us is the (minimum) gap, after which the start of a new IR packet is assumed")); + +# if defined(USE_THRESHOLD_DECODER) + Serial.println(F("Threshold decoding is active and thus MARK_EXCESS_MICROS is set to 0")); +# else Serial.print(MARK_EXCESS_MICROS); Serial.println(F(" us are subtracted from all marks and added to all spaces for decoding")); +# endif #endif } diff --git a/examples/SendBoseWaveDemo/SendBoseWaveDemo.ino b/examples/SendBoseWaveDemo/SendBoseWaveDemo.ino index 5046b96c..eb2fcdd0 100644 --- a/examples/SendBoseWaveDemo/SendBoseWaveDemo.ino +++ b/examples/SendBoseWaveDemo/SendBoseWaveDemo.ino @@ -37,6 +37,8 @@ #define DISABLE_CODE_FOR_RECEIVER // Disables static receiver code like receive timer ISR handler and static IRReceiver and irparams data. Saves 450 bytes program memory and 269 bytes RAM if receiving functions are not required. #endif +//#define NO_LED_FEEDBACK_CODE // Saves 216 bytes program memory + #include "PinDefinitionsAndMore.h" // Define macros for input and output pin etc. #include @@ -119,11 +121,15 @@ void setup() { Serial.println(F("START " __FILE__ " from " __DATE__ "\r\nUsing library version " VERSION_IRREMOTE)); #if defined(IR_SEND_PIN) - IrSender.begin(); // Start with IR_SEND_PIN -which is defined in PinDefinitionsAndMore.h- as send pin and enable feedback LED at default feedback LED pin + /* + * No IR library setup required :-) + * Default is to use IR_SEND_PIN -which is defined in PinDefinitionsAndMore.h- as send pin + * and use feedback LED at default feedback LED pin if not disabled by #define NO_LED_SEND_FEEDBACK_CODE + */ Serial.println(F("Send IR signals at pin " STR(IR_SEND_PIN))); #else uint8_t tSendPin = 3; - IrSender.begin(tSendPin, ENABLE_LED_FEEDBACK, USE_DEFAULT_FEEDBACK_LED_PIN); // Specify send pin and enable feedback LED at default feedback LED pin + IrSender.begin(tSendPin); // Specify send pin and enable feedback LED at default feedback LED pin // You can change send pin later with IrSender.setSendPin(); Serial.print(F("Send IR signals at pin ")); diff --git a/examples/SendDemo/SendDemo.ino b/examples/SendDemo/SendDemo.ino index 8aa9e0d6..f1b8e95a 100644 --- a/examples/SendDemo/SendDemo.ino +++ b/examples/SendDemo/SendDemo.ino @@ -44,8 +44,9 @@ //#define SEND_PWM_BY_TIMER // Disable carrier PWM generation in software and use (restricted) hardware PWM. //#define USE_NO_SEND_PWM // Use no carrier PWM, just simulate an active low receiver signal. Overrides SEND_PWM_BY_TIMER definition //#define USE_ACTIVE_HIGH_OUTPUT_FOR_NO_SEND_PWM // Simulate an active high receiver signal instead of an active low signal. +//#define NO_LED_FEEDBACK_CODE // Saves 322 bytes program memory #if FLASHEND <= 0x1FFF // For 8k flash or less like ATtiny85 -#define NO_LED_FEEDBACK_CODE // Saves 344 bytes program memory +#define NO_LED_FEEDBACK_CODE #endif //#undef IR_SEND_PIN // enable this, if you need to set send pin programmatically using uint8_t tSendPin below #include @@ -76,8 +77,11 @@ void setup() { Serial.println(F("START " __FILE__ " from " __DATE__ "\r\nUsing library version " VERSION_IRREMOTE)); #if defined(IR_SEND_PIN) - IrSender.begin(); // Start with IR_SEND_PIN -which is defined in PinDefinitionsAndMore.h- as send pin and enable feedback LED at default feedback LED pin -// disableLEDFeedback(); // Disable feedback LED at default feedback LED pin + /* + * No IR library setup required :-) + * Default is to use IR_SEND_PIN -which is defined in PinDefinitionsAndMore.h- as send pin + * and use feedback LED at default feedback LED pin if not disabled by #define NO_LED_SEND_FEEDBACK_CODE + */ # if defined(IR_SEND_PIN_STRING) Serial.println(F("Send IR signals at pin " IR_SEND_PIN_STRING)); # else @@ -86,7 +90,7 @@ void setup() { #else // Here the macro IR_SEND_PIN is not defined or undefined above with #undef IR_SEND_PIN uint8_t tSendPin = 3; - IrSender.begin(tSendPin, ENABLE_LED_FEEDBACK, USE_DEFAULT_FEEDBACK_LED_PIN); // Specify send pin and enable feedback LED at default feedback LED pin + IrSender.begin(tSendPin); // Specify send pin and use feedback LED at default feedback LED pin // You can change send pin later with IrSender.setSendPin(); Serial.print(F("Send IR signals at pin ")); @@ -107,7 +111,7 @@ void setup() { Serial.println(F(" us")); #endif -#if defined(LED_BUILTIN) && !defined(NO_LED_FEEDBACK_CODE) +#if defined(LED_BUILTIN) && !defined(NO_LED_FEEDBACK_CODE) && !defined(NO_LED_SEND_FEEDBACK_CODE) # if defined(FEEDBACK_LED_IS_ACTIVE_LOW) Serial.print(F("Active low ")); # endif @@ -208,7 +212,7 @@ void loop() { IrSender.sendNECMSB(0x40802CD3, 32, false); delay(DELAY_AFTER_SEND); - Serial.println(F("Send Panasonic 0xB, 0x10 as 48 bit PulseDistance PGM using ProtocolConstants")); + Serial.println(F("Send Panasonic 0xB, 0x10 as 48 bit PulseDistance PGM using ProtocolConstants 1=432|1296, 0=432|432")); Serial.flush(); # if __INT_WIDTH__ < 32 IrSender.sendPulseDistanceWidthFromPGMArray_P(&KaseikyoProtocolConstants, (IRRawDataType*) &tRawDataPGM[0], 48, NO_REPEATS); // Panasonic is a Kaseikyo variant @@ -221,7 +225,7 @@ void loop() { /* * Send 2 Panasonic 48 bit codes as Pulse Distance data, once with LSB and once with MSB first */ - Serial.println(F("Send Panasonic 0xB, 0x10 as 48 bit PulseDistance PGM")); + Serial.println(F("Send Panasonic 0xB, 0x10 as 48 bit PulseDistance PGM 1=450|1250, 0=450|400")); Serial.println(F(" LSB first")); Serial.flush(); # if __INT_WIDTH__ < 32 @@ -247,7 +251,7 @@ void loop() { # endif delay(DELAY_AFTER_SEND); - Serial.println(F("Send 72 bit PulseDistance 0x5A AFEDCBA9 87654321 LSB first")); + Serial.println(F("Send 72 bit PulseDistance 0x5A AFEDCBA9 87654321 LSB first 1=550|1700, 0=550|600")); Serial.flush(); # if __INT_WIDTH__ < 32 tRawData[0] = 0x87654321; // LSB of tRawData[0] is sent first @@ -263,7 +267,7 @@ void loop() { # endif delay(DELAY_AFTER_SEND); - Serial.println(F("Send 52 bit PulseDistanceWidth 0xDCBA9 87654321 LSB first")); + Serial.println(F("Send 52 bit PulseDistanceWidth 0xDCBA9 87654321 LSB first 1=300|600, 0=600|300")); Serial.flush(); // Real PulseDistanceWidth (constant bit length) does not require a stop bit # if __INT_WIDTH__ < 32 @@ -274,20 +278,31 @@ void loop() { # endif delay(DELAY_AFTER_SEND); - Serial.println(F("Send ASCII 7 bit PulseDistanceWidth LSB first")); + Serial.println(F("Send 52 bit PulseDistanceWidth 0xDCBA9 87654321 LSB first with inverse timing and data 1=600|300, 0=300|600")); + Serial.flush(); +# if __INT_WIDTH__ < 32 + tRawData[2] = ~tRawData[0]; + tRawData[3] = ~tRawData[1]; + IrSender.sendPulseDistanceWidthFromArray(38, 300, 600, 600, 300, 300, 600, &tRawData[2], 52, PROTOCOL_IS_LSB_FIRST, 0, 0); +# else + IrSender.sendPulseDistanceWidth(38, 300, 600, 600, 300, 300, 600, ~0xDCBA987654321, 52, PROTOCOL_IS_LSB_FIRST, 0, 0); +# endif + delay(DELAY_AFTER_SEND); + + Serial.println(F("Send 7 bit ASCII character with PulseDistanceWidth LSB first 1=500|1500, 0=1500|500")); Serial.flush(); // Real PulseDistanceWidth (constant bit length) does theoretically not require a stop bit, but we know the stop bit from serial transmission IrSender.sendPulseDistanceWidth(38, 6000, 500, 500, 1500, 1500, 500, sCommand, 7, PROTOCOL_IS_LSB_FIRST, 0, 0); delay(DELAY_AFTER_SEND); - Serial.println(F("Send Sony12 as PulseWidth LSB first")); + Serial.println(F("Send Sony12 as PulseWidth LSB first 1=1200|300, 0=600|600")); Serial.flush(); uint32_t tData = (uint32_t) sAddress << 7 | (sCommand & 0x7F); IrSender.sendPulseDistanceWidth(38, 2400, 600, 1200, 600, 600, 600, tData, SIRCS_12_PROTOCOL, PROTOCOL_IS_LSB_FIRST, 0, 0); delay(DELAY_AFTER_SEND); #endif // FLASHEND >= 0x3FFF ... - Serial.println(F("Send 32 bit PulseWidth 0x87654321 LSB first")); + Serial.println(F("Send 32 bit PulseWidth 0x87654321 LSB first 1=600|300, 0=300|300")); Serial.flush(); // Real PulseDistanceWidth (constant bit length) does not require a stop bit IrSender.sendPulseDistanceWidth(38, 1000, 500, 600, 300, 300, 300, 0x87654321, 32, PROTOCOL_IS_LSB_FIRST, 0, 0); diff --git a/examples/SendLGAirConditionerDemo/SendLGAirConditionerDemo.ino b/examples/SendLGAirConditionerDemo/SendLGAirConditionerDemo.ino index a92e45e2..7dc2ca86 100644 --- a/examples/SendLGAirConditionerDemo/SendLGAirConditionerDemo.ino +++ b/examples/SendLGAirConditionerDemo/SendLGAirConditionerDemo.ino @@ -32,6 +32,8 @@ */ #include +//#define NO_LED_FEEDBACK_CODE // Saves 276 bytes program memory + /* * LG2 has different header timing and a shorter bit time * Known LG remote controls, which uses LG2 protocol are: @@ -46,6 +48,8 @@ #define DISABLE_CODE_FOR_RECEIVER // Disables static receiver code like receive timer ISR handler and static IRReceiver and irparams data. Saves 450 bytes program memory and 269 bytes RAM if receiving functions are not required. #endif +//#define NO_LED_FEEDBACK_CODE // Saves 214 bytes program memory + #define INFO // Deactivate this to save program memory and suppress info output from the LG-AC driver. //#define DEBUG // Activate this for more output from the LG-AC driver. @@ -78,9 +82,10 @@ void setup() { Serial.println(F("Send IR signals at pin " STR(IR_SEND_PIN))); /* - * The IR library setup. That's all! + * No IR library setup required :-) + * Default is to use IR_SEND_PIN -which is defined in PinDefinitionsAndMore.h- as send pin + * and use feedback LED at default feedback LED pin if not disabled by #define NO_LED_SEND_FEEDBACK_CODE */ - IrSender.begin(); // Start with IR_SEND_PIN -which is defined in PinDefinitionsAndMore.h- as send pin and enable feedback LED at default feedback LED pin Serial.println(); MyLG_Aircondition.setType(LG_IS_WALL_TYPE); diff --git a/examples/SendProntoDemo/SendProntoDemo.ino b/examples/SendProntoDemo/SendProntoDemo.ino index e935d00c..f08a7035 100644 --- a/examples/SendProntoDemo/SendProntoDemo.ino +++ b/examples/SendProntoDemo/SendProntoDemo.ino @@ -36,6 +36,8 @@ #define DISABLE_CODE_FOR_RECEIVER // Disables static receiver code like receive timer ISR handler and static IRReceiver and irparams data. Saves 450 bytes program memory and 269 bytes RAM if receiving functions are not required. #endif +//#define NO_LED_FEEDBACK_CODE // Saves 266 bytes program memory + #include "PinDefinitionsAndMore.h" // Define macros for input and output pin etc. #include @@ -69,7 +71,11 @@ void setup() { Serial.println(F("START " __FILE__ " from " __DATE__ "\r\nUsing library version " VERSION_IRREMOTE)); Serial.println(F("Send IR signals at pin " STR(IR_SEND_PIN))); - IrSender.begin(); // Start with IR_SEND_PIN -which is defined in PinDefinitionsAndMore.h- as send pin and enable feedback LED at default feedback LED pin + /* + * No IR library setup required :-) + * Default is to use IR_SEND_PIN -which is defined in PinDefinitionsAndMore.h- as send pin + * and use feedback LED at default feedback LED pin if not disabled by #define NO_LED_SEND_FEEDBACK_CODE + */ } void loop() { diff --git a/examples/SendRawDemo/SendRawDemo.ino b/examples/SendRawDemo/SendRawDemo.ino index 5b03a643..02f28f4c 100644 --- a/examples/SendRawDemo/SendRawDemo.ino +++ b/examples/SendRawDemo/SendRawDemo.ino @@ -42,7 +42,7 @@ //#define SEND_PWM_BY_TIMER // Disable carrier PWM generation in software and use (restricted) hardware PWM. //#define USE_NO_SEND_PWM // Use no carrier PWM, just simulate an active low receiver signal. Overrides SEND_PWM_BY_TIMER definition -//#define NO_LED_FEEDBACK_CODE // Saves 566 bytes program memory +//#define NO_LED_FEEDBACK_CODE // Saves 220 bytes program memory //#define USE_OPEN_DRAIN_OUTPUT_FOR_SEND_PIN // Use or simulate open drain output mode at send pin. Attention, active state of open drain is LOW, so connect the send LED between positive supply and send pin! #include "PinDefinitionsAndMore.h" // Define macros for input and output pin etc. @@ -61,7 +61,11 @@ void setup() { Serial.println(F("START " __FILE__ " from " __DATE__ "\r\nUsing library version " VERSION_IRREMOTE)); Serial.println(F("Send IR signals at pin " STR(IR_SEND_PIN))); - IrSender.begin(); // Start with IR_SEND_PIN -which is defined in PinDefinitionsAndMore.h- as send pin and enable feedback LED at default feedback LED pin + /* + * No IR library setup required :-) + * Default is to use IR_SEND_PIN -which is defined in PinDefinitionsAndMore.h- as send pin + * and use feedback LED at default feedback LED pin if not disabled by #define NO_LED_SEND_FEEDBACK_CODE + */ } /* diff --git a/examples/SimpleReceiver/SimpleReceiver.ino b/examples/SimpleReceiver/SimpleReceiver.ino index 95eaee8c..84b04037 100644 --- a/examples/SimpleReceiver/SimpleReceiver.ino +++ b/examples/SimpleReceiver/SimpleReceiver.ino @@ -62,6 +62,7 @@ //#define DEBUG // Activate this for lots of lovely debug output from the decoders. +//#define USE_THRESHOLD_DECODER // May give slightly better results especially for jittering signals and protocols with short 1 pulses / pauses. Saves 110 bytes program memory. //#define RAW_BUFFER_LENGTH 750 // For air condition remotes it may require up to 750. Default is 200. /* diff --git a/examples/SimpleSender/SimpleSender.ino b/examples/SimpleSender/SimpleSender.ino index c6d97d62..91797630 100644 --- a/examples/SimpleSender/SimpleSender.ino +++ b/examples/SimpleSender/SimpleSender.ino @@ -19,6 +19,7 @@ #endif //#define SEND_PWM_BY_TIMER // Disable carrier PWM generation in software and use (restricted) hardware PWM. //#define USE_NO_SEND_PWM // Use no carrier PWM, just simulate an active low receiver signal. Overrides SEND_PWM_BY_TIMER definition +//#define NO_LED_FEEDBACK_CODE // Saves 216 bytes program memory /* * This include defines the actual pin number for pins like IR_RECEIVE_PIN, IR_SEND_PIN for many different boards and architectures @@ -37,10 +38,10 @@ void setup() { Serial.println(IR_SEND_PIN); /* - * The IR library setup. That's all! + * No IR library setup required :-) + * Default is to use IR_SEND_PIN -which is defined in PinDefinitionsAndMore.h- as send pin + * and use feedback LED at default feedback LED pin if not disabled by #define NO_LED_SEND_FEEDBACK_CODE */ - IrSender.begin(); // Start with IR_SEND_PIN -which is defined in PinDefinitionsAndMore.h- as send pin and enable feedback LED at default feedback LED pin - disableLEDFeedback(); // Disable feedback LED at default feedback LED pin } /* diff --git a/examples/UnitTest/UnitTest.ino b/examples/UnitTest/UnitTest.ino index a6ca7fcf..9faa6bf5 100644 --- a/examples/UnitTest/UnitTest.ino +++ b/examples/UnitTest/UnitTest.ino @@ -46,14 +46,17 @@ //#define EXCLUDE_UNIVERSAL_PROTOCOLS // Saves up to 1000 bytes program memory. //#define EXCLUDE_EXOTIC_PROTOCOLS // Saves around 240 bytes program memory if IrSender.write is used +//#define USE_THRESHOLD_DECODER // May give slightly better results especially for jittering signals and protocols with short 1 pulses / pauses. Requires additional 24 bytes program memory. +//#define USE_STRICT_DECODER // Check for additional required characteristics of protocol timing. Requires 300 additional bytes program memory. //#define USE_ACTIVE_LOW_OUTPUT_FOR_SEND_PIN // Reverses the polarity at the send pin. //#define USE_OPEN_DRAIN_OUTPUT_FOR_SEND_PIN // Use or simulate open drain output mode at send pin. Attention, active state of open drain is LOW, so connect the send LED between positive supply and send pin! //#define SEND_PWM_BY_TIMER // Disable carrier PWM generation in software and use (restricted) hardware PWM. //#define USE_NO_SEND_PWM // Use no carrier PWM, just simulate an active low receiver signal. Overrides SEND_PWM_BY_TIMER definition //#define USE_ACTIVE_HIGH_OUTPUT_FOR_NO_SEND_PWM // Simulate an active high receiver signal instead of an active low signal. -#if FLASHEND <= 0x7FFF // For 32k flash or less, like ATmega328 -#define NO_LED_FEEDBACK_CODE // Saves 344 bytes program memory -#endif +#define NO_LED_FEEDBACK_CODE // Saves 270 bytes program memory +//#define NO_LED_RECEIVE_FEEDBACK_CODE // Saves 176 bytes program memory +//#define NO_LED_SEND_FEEDBACK_CODE // Saves 38 bytes program memory + //#define USE_MSB_DECODING_FOR_DISTANCE_DECODER // MARK_EXCESS_MICROS is subtracted from all marks and added to all spaces before decoding, @@ -86,6 +89,8 @@ #define DECODE_SONY #define DECODE_SAMSUNG #define DECODE_LG +#define DECODE_LEGO_PF // LEGO is skipped, since it is difficult to receive because of its short marks and spaces +#endif #define DECODE_BEO // It prevents decoding of SONY (default repeats), which we are not using here. //#define ENABLE_BEO_WITHOUT_FRAME_GAP // !!!For successful unit testing we must see the warning at ir_BangOlufsen.hpp:100:2!!! @@ -100,20 +105,25 @@ #define DECODE_FAST //#define DECODE_WHYNTER -//#define DECODE_LEGO_PF -#endif //#undef IR_SEND_PIN // enable this, if you need to set send pin programmatically using uint8_t tSendPin below + +#define SHOW_DISTANCE_WIDTH_DECODER_ERRORS // Prints errors which prevents data to be decoded as distance width data #include -#if defined(APPLICATION_PIN) +#if defined(APPLICATION_PIN) && !defined(DEBUG_BUTTON_PIN) #define DEBUG_BUTTON_PIN APPLICATION_PIN // if held low, print timing for each received data #else #define DEBUG_BUTTON_PIN 6 #endif +#if defined(ESP32) && defined(DEBUG_BUTTON_PIN) +# if !digitalPinIsValid(DEBUG_BUTTON_PIN) +#undef DEBUG_BUTTON_PIN // DEBUG_BUTTON_PIN number is not valid, so delete definition to disable further usage +# endif +#endif -#define DELAY_AFTER_SEND 1000 -#define DELAY_AFTER_LOOP 5000 +#define DELAY_AFTER_SEND 700 +#define DELAY_AFTER_LOOP 3000 #if defined(SEND_PWM_BY_TIMER) && !defined(SEND_PWM_DOES_NOT_USE_RECEIVE_TIMER) #error Unit test cannot run if SEND_PWM_BY_TIMER is enabled i.e. receive timer us also used by send @@ -132,7 +142,9 @@ uint8_t const tRawDataPGM[] PROGMEM = { 0x02, 0x20, 0xB0, 0x00, /*0xB02002*/ #endif void setup() { +#if defined(DEBUG_BUTTON_PIN) pinMode(DEBUG_BUTTON_PIN, INPUT_PULLUP); +#endif Serial.begin(115200); @@ -172,7 +184,11 @@ void setup() { Serial.println(F("Receive buffer length is " STR(RAW_BUFFER_LENGTH))); #if defined(IR_SEND_PIN) - IrSender.begin(); // Start with IR_SEND_PIN -which is defined in PinDefinitionsAndMore.h- as send pin and enable feedback LED at default feedback LED pin + /* + * No IR send setup required :-) + * Default is to use IR_SEND_PIN -which is defined in PinDefinitionsAndMore.h- as send pin + * and use feedback LED at default feedback LED pin if not disabled by #define NO_LED_SEND_FEEDBACK_CODE + */ # if defined(IR_SEND_PIN_STRING) Serial.println(F("Send IR signals at pin " IR_SEND_PIN_STRING)); # else @@ -181,7 +197,7 @@ void setup() { #else // Here the macro IR_SEND_PIN is not defined or undefined above with #undef IR_SEND_PIN uint8_t tSendPin = 3; - IrSender.begin(tSendPin, ENABLE_LED_FEEDBACK, USE_DEFAULT_FEEDBACK_LED_PIN);// Specify send pin and enable feedback LED at default feedback LED pin + IrSender.begin(tSendPin);// Specify send pin and use feedback LED at default feedback LED pin // You can change send pin later with IrSender.setSendPin(); Serial.print(F("Send IR signals at pin ")); @@ -189,13 +205,11 @@ void setup() { #endif #if FLASHEND >= 0x3FFF // For 16k flash or more, like ATtiny1604 +# if defined(DEBUG_BUTTON_PIN) Serial.print(F("If you connect debug pin ")); -# if defined(APPLICATION_PIN_STRING) - Serial.print(APPLICATION_PIN_STRING); -# else Serial.print(DEBUG_BUTTON_PIN); -# endif Serial.println(F(" to ground, raw data is always printed")); +# endif // For esp32 we use PWM generation by ledcWrite() for each pin. # if !defined(SEND_PWM_BY_TIMER) @@ -215,8 +229,13 @@ void setup() { // infos for receive Serial.print(RECORD_GAP_MICROS); Serial.println(F(" us is the (minimum) gap, after which the start of a new IR packet is assumed")); + +# if defined(USE_THRESHOLD_DECODER) + Serial.println(F("Threshold decoding is active and thus MARK_EXCESS_MICROS is set to 0")); +# else Serial.print(MARK_EXCESS_MICROS); Serial.println(F(" us are subtracted from all marks and added to all spaces for decoding")); +# endif #endif delay(DELAY_AFTER_SEND); @@ -237,11 +256,16 @@ void checkReceivedRawData(IRRawDataType aRawData) { IrReceiver.printIRResultMinimal(&Serial); #endif #if FLASHEND >= 0x3FFF // For 16k flash or more, like ATtiny1604 - if (IrReceiver.decodedIRData.protocol == UNKNOWN || digitalRead(DEBUG_BUTTON_PIN) == LOW) { - // We have an unknown protocol, print more info + if (IrReceiver.decodedIRData.protocol == UNKNOWN +# if defined(DEBUG_BUTTON_PIN) + || digitalRead(DEBUG_BUTTON_PIN) == LOW +# endif + ) { + // We have an unknown protocol or debug button is held low, print more info IrReceiver.printIRResultRawFormatted(&Serial, true); } -#endif +#endif // FLASHEND >= 0x3FFF // For 16k flash or more, like ATtiny1604 + if (IrReceiver.decodedIRData.protocol == PULSE_DISTANCE || IrReceiver.decodedIRData.protocol == PULSE_WIDTH) { if (IrReceiver.decodedIRData.decodedRawData != aRawData) { Serial.print(F("ERROR: Received data=0x")); @@ -257,6 +281,7 @@ void checkReceivedRawData(IRRawDataType aRawData) { PrintULL::print(&Serial, aRawData, HEX); #endif Serial.println(); + IrReceiver.printIRResultAsCArray(&Serial, false, false); } } IrReceiver.resume(); @@ -282,8 +307,12 @@ void checkReceivedArray(IRRawDataType *aRawDataArrayPointer, uint8_t aArraySize) IrReceiver.printIRResultMinimal(&Serial); #endif #if FLASHEND >= 0x3FFF // For 16k flash or more, like ATtiny1604 - if (IrReceiver.decodedIRData.protocol == UNKNOWN || digitalRead(DEBUG_BUTTON_PIN) == LOW) { - // We have an unknown protocol, print more info + if (IrReceiver.decodedIRData.protocol == UNKNOWN +# if defined(DEBUG_BUTTON_PIN) + || digitalRead(DEBUG_BUTTON_PIN) == LOW +# endif + ) { + // We have an unknown protocol or debug button is held low, print more info IrReceiver.printIRResultRawFormatted(&Serial, true); } #endif @@ -299,6 +328,7 @@ void checkReceivedArray(IRRawDataType *aRawDataArrayPointer, uint8_t aArraySize) # endif Serial.print(F(" != sent data=0x")); Serial.println(*aRawDataArrayPointer, HEX); + IrReceiver.printIRResultAsCArray(&Serial, false, false); } aRawDataArrayPointer++; } @@ -347,7 +377,11 @@ void checkReceive(uint16_t aSentAddress, uint16_t aSentCommand) { } #if FLASHEND >= 0x3FFF // For 16k flash or more, like ATtiny1604 - if (IrReceiver.decodedIRData.protocol == UNKNOWN || digitalRead(DEBUG_BUTTON_PIN) == LOW) { + if (IrReceiver.decodedIRData.protocol == UNKNOWN +# if defined(DEBUG_BUTTON_PIN) + || digitalRead(DEBUG_BUTTON_PIN) == LOW +# endif + ) { // We have an unknown protocol, print more info IrReceiver.printIRResultRawFormatted(&Serial, true); } @@ -393,6 +427,11 @@ void checkReceive(uint16_t aSentAddress, uint16_t aSentCommand) { uint16_t sAddress = 0xFFF1; uint8_t sCommand = 0x76; uint16_t s16BitCommand = 0x9876; +/* + * Repeats cannot be automatically checked, because just the first frame is stored in receive buffer and all repeat frames are skipped. + * We cannot issue a resume() before sending of an repeat, because we use the blocking send*() functions. + * But an independent receiver could check it + */ uint8_t sRepeats = 0; void loop() { @@ -404,27 +443,35 @@ void loop() { Serial.print(sAddress, HEX); Serial.print(F(" command=0x")); Serial.print(sCommand, HEX); + if (sRepeats > 0) { + Serial.print(F(" repeats=")); + Serial.print(sRepeats); + } + Serial.println(); Serial.println(); +#if defined(DECODE_NEC) + /* + * Sending complete NEC frames as repeats to force decoding as NEC2 are tested here + */ Serial.print(F("Send NEC with 8 bit address")); if (sRepeats > 0) { Serial.print(F(" and complete NEC frames as repeats to force decoding as NEC2")); } Serial.println(); Serial.flush(); - IrSender.sendNEC(sAddress & 0xFF, sCommand, 0); + IrSender.sendNEC(sAddress & 0xFF, sCommand, 0); // sending first frame -> decodes as NEC checkReceive(sAddress & 0xFF, sCommand); - /* - * Complete NEC frames as repeats to force decoding as NEC2 are tested here - */ for (int8_t i = 0; i < sRepeats; i++) { +# if defined(DEBUG_BUTTON_PIN) if (digitalRead(DEBUG_BUTTON_PIN) != LOW) { // If debug is enabled, printing time (50 ms) is sufficient as delay delayMicroseconds(NEC_REPEAT_DISTANCE - 20000); // 20000 is just a guess } - IrSender.sendNEC(sAddress & 0xFF, sCommand, 0); +# endif + IrSender.sendNEC(sAddress & 0xFF, sCommand, 0); // sending repeat frames -> decodes as NEC2 checkReceive(sAddress & 0xFF, sCommand); } @@ -432,22 +479,25 @@ void loop() { Serial.println(F("Send NEC with 16 bit address")); Serial.flush(); - IrSender.sendNEC(sAddress, sCommand, 0); + IrSender.sendNEC(sAddress, sCommand, sRepeats); // no repeats checkReceive(sAddress, sCommand); delay(DELAY_AFTER_SEND); Serial.println(F("Send NEC2 with 16 bit address")); Serial.flush(); - IrSender.sendNEC2(sAddress, sCommand, 0); + IrSender.sendNEC2(sAddress, sCommand, sRepeats); checkReceive(sAddress, sCommand); delay(DELAY_AFTER_SEND); +#endif // defined(DECODE_NEC) -#if FLASHEND >= 0x3FFF // For 16k flash or more, like ATtiny1604. Code does not fit in program memory of ATtiny85 etc. - - if (sAddress == 0xFFF1) { -# if FLASHEND >= 0x7FFF && ((!defined(RAMEND) && !defined(RAMSIZE)) || (defined(RAMEND) && RAMEND > 0x6FF) || (defined(RAMSIZE) && RAMSIZE > 0x6FF)) // For 32k flash or more, like Uno. Code does not fit in program memory of ATtiny1604 etc. +#if FLASHEND >= 0x7FFF && ((!defined(RAMEND) && !defined(RAMSIZE)) || (defined(RAMEND) && RAMEND > 0x6FF) || (defined(RAMSIZE) && RAMSIZE > 0x6FF)) // For 32k flash or more, like Uno. Code does not fit in program memory of ATtiny1604 etc. + if (sCommand == 0x76) { + /* + * Do this only once at the first loop + */ IRRawDataType tRawData[4]; +# if defined(DECODE_NEC) /* * Send constant values only once in this demo */ @@ -497,158 +547,169 @@ void loop() { IrSender.sendNECMSB(0x40802CD3, 32, false); checkReceive(0x0102, 0x34); delay(DELAY_AFTER_SEND); +# endif // defined(DECODE_NEC) -# if defined(DECODE_PANASONIC) || defined(DECODE_KASEIKYO) - Serial.println(F("Send Panasonic 0xB, 0x10 as 48 bit PulseDistance PGM using ProtocolConstants")); +# if defined(DECODE_PANASONIC) || defined(DECODE_KASEIKYO) + Serial.println(F("Send Panasonic 0xB, 0x10 as 48 bit PulseDistance PGM using ProtocolConstants 1=432|1296, 0=432|432")); Serial.flush(); -# if __INT_WIDTH__ < 32 +# if __INT_WIDTH__ < 32 IrSender.sendPulseDistanceWidthFromPGMArray_P(&KaseikyoProtocolConstants, (IRRawDataType*) &tRawDataPGM[0], 48, NO_REPEATS); // Panasonic is a Kaseikyo variant checkReceive(0x0B, 0x10); -# else +# else IrSender.sendPulseDistanceWidth_P(&KaseikyoProtocolConstants, 0xA010B02002, 48, NO_REPEATS); // Panasonic is a Kaseikyo variant checkReceivedRawData(0xA010B02002); -# endif +# endif delay(DELAY_AFTER_SEND); /* * Send 2 Panasonic 48 bit codes as Pulse Distance data, once with LSB and once with MSB first */ - Serial.println(F("Send Panasonic 0xB, 0x10 as 48 bit PulseDistance PGM")); + Serial.println(F("Send Panasonic 0xB, 0x10 as 48 bit PulseDistance PGM 1=450|1250, 0=450|400")); Serial.println(F("-LSB first")); Serial.flush(); -# if __INT_WIDTH__ < 32 +# if __INT_WIDTH__ < 32 IrSender.sendPulseDistanceWidthFromPGMArray(38, 3450, 1700, 450, 1250, 450, 400, (IRRawDataType*) tRawDataPGM, 48, - PROTOCOL_IS_LSB_FIRST, 0, NO_REPEATS); + PROTOCOL_IS_LSB_FIRST, 0, NO_REPEATS); checkReceive(0x0B, 0x10); -# else +# else IrSender.sendPulseDistanceWidth(38, 3450, 1700, 450, 1250, 450, 400, 0xA010B02002, 48, PROTOCOL_IS_LSB_FIRST, 0, NO_REPEATS); checkReceivedRawData(0xA010B02002); -# endif +# endif delay(DELAY_AFTER_SEND); // The same with MSB first. Use bit reversed raw data of LSB first part Serial.println(F("-MSB first")); -# if __INT_WIDTH__ < 32 +# if __INT_WIDTH__ < 32 tRawData[0] = 0x40040D00; // MSB of tRawData[0] is sent first tRawData[1] = 0x805; IrSender.sendPulseDistanceWidthFromArray(38, 3450, 1700, 450, 1250, 450, 400, &tRawData[0], 48, PROTOCOL_IS_MSB_FIRST, 0, NO_REPEATS); checkReceive(0x0B, 0x10); -# else +# else IrSender.sendPulseDistanceWidth(38, 3450, 1700, 450, 1250, 450, 400, 0x40040D000805, 48, PROTOCOL_IS_MSB_FIRST, 0, NO_REPEATS); checkReceivedRawData(0x40040D000805); -# endif +# endif delay(DELAY_AFTER_SEND); -# endif // defined(DECODE_PANASONIC) || defined(DECODE_KASEIKYO) +# endif // defined(DECODE_PANASONIC) || defined(DECODE_KASEIKYO) -# if defined(DECODE_DISTANCE_WIDTH) -# if defined(USE_MSB_DECODING_FOR_DISTANCE_DECODER) - Serial.println(F("Send 52 bit PulseDistance 0x43D8613C and 0x3BC3B MSB first")); +# if defined(DECODE_DISTANCE_WIDTH) +# if defined(USE_MSB_DECODING_FOR_DISTANCE_DECODER) + Serial.println(F("Send 52 bit PulseDistance 0x43D8613C and 0x3BC3B MSB first 1=550|1700, 0=550|600")); Serial.flush(); -# if __INT_WIDTH__ < 32 +# if __INT_WIDTH__ < 32 tRawData[0] = 0x43D8613C; // MSB of tRawData[0] is sent first tRawData[1] = 0x3BC3B; IrSender.sendPulseDistanceWidthFromArray(38, 8900, 4450, 550, 1700, 550, 600, &tRawData[0], 52, PROTOCOL_IS_MSB_FIRST, 0, NO_REPEATS); checkReceivedArray(tRawData, 2); -# else +# else IrSender.sendPulseDistanceWidth(38, 8900, 4450, 550, 1700, 550, 600, 0x43D8613CBC3B, 52, PROTOCOL_IS_MSB_FIRST, 0, NO_REPEATS); checkReceivedRawData(0x43D8613CBC3B); -# endif +# endif delay(DELAY_AFTER_SEND); - Serial.println(F("Send 52 bit PulseDistanceWidth 0x43D8613C and 0x3BC3B MSB first")); + Serial.println(F("Send 52 bit PulseDistanceWidth 0x43D8613C and 0x3BC3B MSB first 1=600|300, 0=300|600")); Serial.flush(); // Real PulseDistanceWidth (constant bit length) does not require a stop bit -# if __INT_WIDTH__ < 32 +# if __INT_WIDTH__ < 32 IrSender.sendPulseDistanceWidthFromArray(38, 300, 600, 600, 300, 300, 600, &tRawData[0], 52, PROTOCOL_IS_MSB_FIRST, 0, 0); checkReceivedArray(tRawData, 2); -# else +# else IrSender.sendPulseDistanceWidth(38, 300, 600, 600, 300, 300, 600, 0x123456789ABC, 52, PROTOCOL_IS_MSB_FIRST, 0, 0); checkReceivedRawData(0x123456789ABC); -# endif +# endif delay(DELAY_AFTER_SEND); - Serial.println(F("Send 32 bit PulseWidth 0x43D8613C MSB first")); + Serial.println(F("Send 32 bit PulseWidth 0x43D8613C MSB first 1=600|300, 0=300|300")); Serial.flush(); // Real PulseDistanceWidth (constant bit length) does not require a stop bit IrSender.sendPulseDistanceWidth(38, 1000, 500, 600, 300, 300, 300, 0x43D8613C, 32, PROTOCOL_IS_MSB_FIRST, 0, 0); checkReceivedRawData(0x43D8613C); delay(DELAY_AFTER_SEND); -# else // defined(USE_MSB_DECODING_FOR_DISTANCE_DECODER) - Serial.println(F("Send 72 bit PulseDistance 0x5A AFEDCBA9 87654321 LSB first")); +# else // defined(USE_MSB_DECODING_FOR_DISTANCE_DECODER) + Serial.println(F("Send 72 bit PulseDistance 0x5A AFEDCBA9 87654321 LSB first 1=550|1700, 0=550|600")); Serial.flush(); -# if __INT_WIDTH__ < 32 +# if __INT_WIDTH__ < 32 tRawData[0] = 0x87654321; // LSB of tRawData[0] is sent first tRawData[1] = 0xAFEDCBA9; tRawData[2] = 0x5A; IrSender.sendPulseDistanceWidthFromArray(38, 8900, 4450, 550, 1700, 550, 600, &tRawData[0], 72, PROTOCOL_IS_LSB_FIRST, 0, NO_REPEATS); checkReceivedArray(tRawData, 3); -# else +# else tRawData[0] = 0xAFEDCBA987654321; tRawData[1] = 0x5A; // LSB of tRawData[0] is sent first IrSender.sendPulseDistanceWidthFromArray(38, 8900, 4450, 550, 1700, 550, 600, &tRawData[0], 72, PROTOCOL_IS_LSB_FIRST, 0, NO_REPEATS); checkReceivedArray(tRawData, 2); -# endif +# endif delay(DELAY_AFTER_SEND); - Serial.println(F("Send 52 bit PulseDistanceWidth 0xDCBA9 87654321 LSB first")); + Serial.println(F("Send 52 bit PulseDistanceWidth 0xDCBA9 87654321 LSB first 1=300|600, 0=600|300")); Serial.flush(); // Real PulseDistanceWidth (constant bit length) does theoretically not require a stop bit, but we know the stop bit from serial transmission -# if __INT_WIDTH__ < 32 +# if __INT_WIDTH__ < 32 tRawData[1] = 0xDCBA9; IrSender.sendPulseDistanceWidthFromArray(38, 300, 600, 300, 600, 600, 300, &tRawData[0], 52, PROTOCOL_IS_LSB_FIRST, 0, 0); checkReceivedArray(tRawData, 2); -# else +# else IrSender.sendPulseDistanceWidth(38, 300, 600, 300, 600, 600, 300, 0xDCBA987654321, 52, PROTOCOL_IS_LSB_FIRST, 0, 0); checkReceivedRawData(0xDCBA987654321); -# endif +# endif delay(DELAY_AFTER_SEND); - Serial.println(F("Send 52 bit PulseDistanceWidth 0xDCBA9 87654321 LSB first with inverse timing and data")); + Serial.println( + F("Send 52 bit PulseDistanceWidth 0xDCBA9 87654321 LSB first with inverse timing and data 1=600|300, 0=300|600")); Serial.flush(); -# if __INT_WIDTH__ < 32 +# if __INT_WIDTH__ < 32 tRawData[2] = ~tRawData[0]; tRawData[3] = ~tRawData[1]; IrSender.sendPulseDistanceWidthFromArray(38, 300, 600, 600, 300, 300, 600, &tRawData[2], 52, PROTOCOL_IS_LSB_FIRST, 0, 0); checkReceivedArray(tRawData, 2); -# else +# else IrSender.sendPulseDistanceWidth(38, 300, 600, 600, 300, 300, 600, ~0xDCBA987654321, 52, PROTOCOL_IS_LSB_FIRST, 0, 0); checkReceivedRawData(0xDCBA987654321); -# endif +# endif delay(DELAY_AFTER_SEND); - Serial.println(F("Send 7 bit ASCII character with PulseDistanceWidth LSB first")); + Serial.println(F("Send 7 bit ASCII character with PulseDistanceWidth LSB first 1=500|1500, 0=1500|500")); Serial.flush(); // Real PulseDistanceWidth (constant bit length) does theoretically not require a stop bit, but we know the stop bit from serial transmission IrSender.sendPulseDistanceWidth(38, 6000, 500, 500, 1500, 1500, 500, sCommand, 7, PROTOCOL_IS_LSB_FIRST, 0, 0); checkReceivedRawData(sCommand); delay(DELAY_AFTER_SEND); - Serial.println(F("Send Sony12 as PulseWidth LSB first")); +# if defined(DECODE_SONY) + Serial.println(F("Send Velux 0x765432 decoded as PulseDistanceWidth 0x44D5E6 LSB first 1=1275|475, 0=475|1275")); Serial.flush(); - uint32_t tData = (uint32_t) sAddress << 7 | (sCommand & 0x7F); - IrSender.sendPulseDistanceWidth(38, 2400, 600, 1200, 600, 600, 600, tData, SIRCS_12_PROTOCOL, PROTOCOL_IS_LSB_FIRST, 0, 0); + IrSender.sendPulseDistanceWidth_P(&VeluxProtocolConstants, 0x765432, VELUX_BITS, 0); + // We send without header, so >> 1. We send as pulse width so we must invert result, which is decoded as pulse distance + checkReceivedRawData((~(0x765432 >> 1)) & 0x7FFFFF); // ~0x3B2A19 = FFC4D5E6 & 0x7FFFFF = 0x44D5E6 + delay(DELAY_AFTER_SEND); +# endif + +# if defined(DECODE_SONY) + Serial.println(F("Send Sony12 as PulseWidth LSB first 1=1200|300, 0=600|600")); + Serial.flush(); + IrSender.sendPulseDistanceWidth(38, 2400, 600, 1200, 600, 600, 600, (sAddress << 7 | (sCommand & 0x7F)), SIRCS_12_PROTOCOL, + PROTOCOL_IS_LSB_FIRST, 0, 0); checkReceive(sAddress & 0x1F, sCommand & 0x7F); delay(DELAY_AFTER_SEND); +# endif - Serial.println(F("Send 32 bit PulseWidth 0x87654321 LSB first")); + Serial.println(F("Send 32 bit PulseWidth 0x87654321 LSB first 1=600|300, 0=300|300 - timing ratio is 1:2")); Serial.flush(); IrSender.sendPulseDistanceWidth(38, 1000, 500, 600, 300, 300, 300, 0x87654321, 32, PROTOCOL_IS_LSB_FIRST, 0, 0); checkReceivedRawData(0x87654321); delay(DELAY_AFTER_SEND); - -# endif // defined(USE_MSB_DECODING_FOR_DISTANCE_DECODER) -# endif // defined(DECODE_DISTANCE_WIDTH) -# endif // if FLASHEND >= 0x7FFF ... +# endif // defined(USE_MSB_DECODING_FOR_DISTANCE_DECODER) +# endif // defined(DECODE_DISTANCE_WIDTH) # if defined(DECODE_MAGIQUEST) - Serial.println(F("Send MagiQuest 0x6BCDFF00, 0x176 as 55 bit PulseDistanceWidth MSB first")); + Serial.println(F("Send MagiQuest 0x6BCDFF00, 0x176 as 55 bit PulseDistanceWidth MSB first 1=576|576, 0=287|864")); Serial.flush(); # if __INT_WIDTH__ < 32 IRRawDataType tRawData1[2]; @@ -658,67 +719,68 @@ void loop() { PROTOCOL_IS_MSB_FIRST | SUPPRESS_STOP_BIT, 0, 0); # else // 0xD79BFE00 is 0x6BCDFF00 is shifted 1 left - IrSender.sendPulseDistanceWidth(38, 287, 864, 576, 576, 287, 864, 0xD79BFE017619, 55, PROTOCOL_IS_MSB_FIRST, 0, 0); + IrSender.sendPulseDistanceWidth(38, 287, 864, 576, 576, 287, 864, 0xD79BFE017619, 55, PROTOCOL_IS_MSB_FIRST | SUPPRESS_STOP_BIT, 0, 0); # endif checkReceive(0xFF00, 0x176); if (IrReceiver.decodedIRData.decodedRawData != 0x6BCDFF00) { Serial.print(F("ERROR: Received address=0x")); -#if (__INT_WIDTH__ < 32) +# if (__INT_WIDTH__ < 32) Serial.print(IrReceiver.decodedIRData.decodedRawData, HEX); -#else +# else PrintULL::print(&Serial, IrReceiver.decodedIRData.decodedRawData, HEX); -#endif +# endif Serial.println(F(" != sent address=0x6BCDFF00")); Serial.println(); } delay(DELAY_AFTER_SEND); # endif // defined(DECODE_MAGIQUEST) + } // end of once at first loop +#endif // if FLASHEND >= 0x7FFF - } -#endif // if FLASHEND >= 0x3FFF - +#if defined(DECODE_NEC) Serial.println(F("Send Onkyo (NEC with 16 bit command)")); Serial.flush(); - IrSender.sendOnkyo(sAddress, (sCommand + 1) << 8 | sCommand, 0); + IrSender.sendOnkyo(sAddress, (sCommand + 1) << 8 | sCommand, sRepeats); checkReceive(sAddress, (sCommand + 1) << 8 | sCommand); delay(DELAY_AFTER_SEND); Serial.println(F("Send Apple")); Serial.flush(); - IrSender.sendApple(sAddress & 0xFF, sCommand, 0); + IrSender.sendApple(sAddress & 0xFF, sCommand, sRepeats); checkReceive(sAddress & 0xFF, sCommand); delay(DELAY_AFTER_SEND); +#endif #if defined(DECODE_PANASONIC) || defined(DECODE_KASEIKYO) Serial.println(F("Send Panasonic")); Serial.flush(); - IrSender.sendPanasonic(sAddress & 0xFFF, sCommand, 0); + IrSender.sendPanasonic(sAddress & 0xFFF, sCommand, sRepeats); checkReceive(sAddress & 0xFFF, sCommand); delay(DELAY_AFTER_SEND); Serial.println(F("Send Kaseikyo with 0x4711 as Vendor ID")); Serial.flush(); - IrSender.sendKaseikyo(sAddress & 0xFFF, sCommand, 0, 0x4711); + IrSender.sendKaseikyo(sAddress & 0xFFF, sCommand, sRepeats, 0x4711); checkReceive(sAddress & 0xFFF, sCommand); delay(DELAY_AFTER_SEND); Serial.println(F("Send Kaseikyo_Denon variant")); Serial.flush(); - IrSender.sendKaseikyo_Denon(sAddress & 0xFFF, sCommand, 0); + IrSender.sendKaseikyo_Denon(sAddress & 0xFFF, sCommand, sRepeats); checkReceive(sAddress & 0xFFF, sCommand); delay(DELAY_AFTER_SEND); #endif #if defined(DECODE_DENON) - Serial.println(F("Send Denon")); + Serial.println(F("Send Denon with repeats")); Serial.flush(); - IrSender.sendDenon(sAddress & 0x1F, sCommand, 0); + IrSender.sendDenon(sAddress & 0x1F, sCommand, sRepeats); checkReceive(sAddress & 0x1F, sCommand); delay(DELAY_AFTER_SEND); - Serial.println(F("Send Denon/Sharp variant")); + Serial.println(F("Send Denon/Sharp variant with repeats")); Serial.flush(); - IrSender.sendSharp(sAddress & 0x1F, sCommand, 0); + IrSender.sendSharp(sAddress & 0x1F, sCommand, sRepeats); checkReceive(sAddress & 0x1F, sCommand); delay(DELAY_AFTER_SEND); #endif @@ -726,19 +788,19 @@ void loop() { #if defined(DECODE_SONY) Serial.println(F("Send Sony/SIRCS with 7 command and 5 address bits")); Serial.flush(); - IrSender.sendSony(sAddress & 0x1F, sCommand, 0); // SIRCS_12_PROTOCOL is default + IrSender.sendSony(sAddress & 0x1F, sCommand, sRepeats); // SIRCS_12_PROTOCOL is default checkReceive(sAddress & 0x1F, sCommand & 0x7F); delay(DELAY_AFTER_SEND); Serial.println(F("Send Sony/SIRCS with 7 command and 8 address bits")); Serial.flush(); - IrSender.sendSony(sAddress & 0xFF, sCommand, 0, SIRCS_15_PROTOCOL); + IrSender.sendSony(sAddress & 0xFF, sCommand, sRepeats, SIRCS_15_PROTOCOL); checkReceive(sAddress & 0xFF, sCommand & 0x7F); delay(DELAY_AFTER_SEND); Serial.println(F("Send Sony/SIRCS with 7 command and 13 address bits")); Serial.flush(); - IrSender.sendSony(sAddress & 0x1FFF, sCommand, 0, SIRCS_20_PROTOCOL); + IrSender.sendSony(sAddress & 0x1FFF, sCommand, sRepeats, SIRCS_20_PROTOCOL); checkReceive(sAddress & 0x1FFF, sCommand & 0x7F); delay(DELAY_AFTER_SEND); #endif @@ -746,19 +808,19 @@ void loop() { #if defined(DECODE_SAMSUNG) Serial.println(F("Send Samsung 8 bit command and 8 bit address")); Serial.flush(); - IrSender.sendSamsung(sAddress & 0xFF, sCommand, 0); + IrSender.sendSamsung(sAddress & 0xFF, sCommand, sRepeats); checkReceive(sAddress & 0xFF, sCommand); delay(DELAY_AFTER_SEND); Serial.println(F("Send Samsung 16 bit command and address")); Serial.flush(); - IrSender.sendSamsung16BitAddressAndCommand(sAddress, s16BitCommand, 0); + IrSender.sendSamsung16BitAddressAndCommand(sAddress, s16BitCommand, sRepeats); checkReceive(sAddress, s16BitCommand); delay(DELAY_AFTER_SEND); Serial.println(F("Send Samsung48 16 bit command")); Serial.flush(); - IrSender.sendSamsung48(sAddress, s16BitCommand, 0); + IrSender.sendSamsung48(sAddress, s16BitCommand, sRepeats); checkReceive(sAddress, s16BitCommand); delay(DELAY_AFTER_SEND); #endif @@ -766,13 +828,13 @@ void loop() { #if defined(DECODE_RC5) Serial.println(F("Send RC5")); Serial.flush(); - IrSender.sendRC5(sAddress & 0x1F, sCommand & 0x3F, 0, true); // 5 address, 6 command bits + IrSender.sendRC5(sAddress & 0x1F, sCommand & 0x3F, sRepeats, true); // 5 address, 6 command bits checkReceive(sAddress & 0x1F, sCommand & 0x3F); delay(DELAY_AFTER_SEND); Serial.println(F("Send RC5X with 7.th MSB of command set")); Serial.flush(); - IrSender.sendRC5(sAddress & 0x1F, (sCommand & 0x3F) + 0x40, 0, true); // 5 address, 7 command bits + IrSender.sendRC5(sAddress & 0x1F, (sCommand & 0x3F) + 0x40, sRepeats, true); // 5 address, 7 command bits checkReceive(sAddress & 0x1F, (sCommand & 0x3F) + 0x40); delay(DELAY_AFTER_SEND); #endif @@ -782,32 +844,51 @@ void loop() { Serial.flush(); sLastSendToggleValue = sAddress & 0x01; // to modify toggling at each loop - IrSender.sendRC6(sAddress & 0xFF, sCommand, 0, true); + IrSender.sendRC6(sAddress & 0xFF, sCommand, sRepeats, true); checkReceive(sAddress & 0xFF, sCommand); delay(DELAY_AFTER_SEND); Serial.println(F("Send RC6A with 14 bit 0x2711 as extra")); Serial.flush(); - IrSender.sendRC6A(sAddress & 0xFF, sCommand, 0, 0x2711, true); + IrSender.sendRC6A(sAddress & 0xFF, sCommand, sRepeats, 0x2711, true); checkReceive(sAddress & 0xFF, sCommand); delay(DELAY_AFTER_SEND); #endif +#if defined(DECODE_MAGIQUEST) + uint32_t tWandId = 0x6BCD0000 | (uint32_t) sAddress; + Serial.print(F("Send MagiQuest, WandId=0x")); + Serial.println(tWandId, HEX); + Serial.flush(); + IrSender.sendMagiQuest(tWandId, s16BitCommand); // we have 31 bit address + checkReceive(sAddress, s16BitCommand & 0x1FF); // we have 9 bit command + delay(DELAY_AFTER_SEND); +#endif + +#if defined(DECODE_LEGO_PF) + Serial.println(F("Send Lego with 2 channel and with 4 command bits")); + Serial.flush(); + IrSender.sendLegoPowerFunctions(sAddress, sCommand, LEGO_MODE_COMBO, false); + checkReceive(sAddress & 0x0F, (sCommand | (LEGO_MODE_COMBO << LEGO_COMMAND_BITS)) & 0x1F); + delay(DELAY_AFTER_SEND); +#endif + #if defined(DECODE_BEO) - Serial.println(F("Send Bang&Olufsen")); + Serial.println(F("Send Bang&Olufsen / originally with 455 kHz")); Serial.flush(); - IrSender.sendBangOlufsen(sAddress & 0x0FF, sCommand, 0); + IrSender.sendBangOlufsen(sAddress & 0x0FF, sCommand, sRepeats); # if defined(ENABLE_BEO_WITHOUT_FRAME_GAP) delay((RECORD_GAP_MICROS / 1000) + 1); Serial.println(F("- ENABLE_BEO_WITHOUT_FRAME_GAP is enabled")); - Serial.println(F("- Now print raw data and try to decode the first 6 entries, which results in rawData 0x0")); IrReceiver.printIRResultRawFormatted(&Serial, true); - uint8_t tOriginalRawlen = IrReceiver.decodedIRData.rawDataPtr->rawlen; - IrReceiver.decodedIRData.rawDataPtr->rawlen = 6; + Serial.println(F("- Now try to decode the first 6 entries, which results in rawData 0x0")); + uint8_t tOriginalRawlen = IrReceiver.irparams.rawlen; + IrReceiver.decodedIRData.rawlen = 6; + IrReceiver.irparams.rawlen = 6; /* * decode first part / AGC part of frame */ - IrReceiver.decode(); // sets IrReceiver.decodedIRData.rawlen to 6 + IrReceiver.decode(); IrReceiver.printIRResultShort(&Serial); // -> Protocol=Bang&Olufsen Address=0x0 Command=0x0 Raw-Data=0x0 0 bits MSB first // Remove trailing 6 entries for second decode try @@ -816,23 +897,16 @@ void loop() { F( "- Remove trailing 6 entries, which is equivalent to define RECORD_GAP_MICROS < 15000, to enable successful B&O decode")); IrReceiver.decodedIRData.rawlen = tOriginalRawlen - 6; - IrReceiver.decodedIRData.rawDataPtr->rawlen = tOriginalRawlen - 6; + IrReceiver.irparams.rawlen = tOriginalRawlen - 6; for (uint_fast8_t i = 0; i < IrReceiver.decodedIRData.rawlen; ++i) { - IrReceiver.decodedIRData.rawDataPtr->rawbuf[i] = IrReceiver.decodedIRData.rawDataPtr->rawbuf[i + 6]; + IrReceiver.irparams.rawbuf[i] = IrReceiver.irparams.rawbuf[i + 6]; } + IrReceiver.decodedIRData.initialGapTicks = IrReceiver.irparams.rawbuf[0]; # endif checkReceive(sAddress & 0x0FF, sCommand); delay(DELAY_AFTER_SEND); #endif -#if defined(DECODE_MAGIQUEST) - Serial.println(F("Send MagiQuest")); - Serial.flush(); - IrSender.sendMagiQuest(0x6BCD0000 | (uint32_t) sAddress, s16BitCommand); // we have 31 bit address - checkReceive(sAddress, s16BitCommand & 0x1FF); // we have 9 bit command - delay(DELAY_AFTER_SEND); -#endif - /* * Next example how to use the IrSender.write function */ @@ -851,7 +925,7 @@ void loop() { Serial.print(F("Send ")); Serial.println(getProtocolString(IRSendData.protocol)); Serial.flush(); - IrSender.write(&IRSendData, 0); + IrSender.write(&IRSendData, sRepeats); checkReceive(IRSendData.address & 0xFF, IRSendData.command); delay(DELAY_AFTER_SEND); #endif @@ -874,7 +948,7 @@ void loop() { IRSendData.protocol = BOSEWAVE; Serial.println(F("Send Bosewave with no address and 8 command bits")); Serial.flush(); - IrSender.write(&IRSendData, 0); + IrSender.write(&IRSendData, sRepeats); checkReceive(0, IRSendData.command & 0xFF); delay(DELAY_AFTER_SEND); #endif @@ -884,19 +958,11 @@ void loop() { Serial.print(F("Send ")); Serial.println(getProtocolString(IRSendData.protocol)); Serial.flush(); - IrSender.write(&IRSendData, 0); + IrSender.write(&IRSendData, sRepeats); checkReceive(0, IRSendData.command & 0xFF); delay(DELAY_AFTER_SEND); #endif - /* - * LEGO is skipped, since it is difficult to receive because of its short marks and spaces - */ -// Serial.println(F("Send Lego with 2 channel and with 4 command bits")); -// Serial.flush(); -// IrSender.sendLegoPowerFunctions(sAddress, sCommand, LEGO_MODE_COMBO, true); -// checkReceive(sAddress, sCommand); // never has success for Lego protocol :-( -// delay(DELAY_AFTER_SEND); /* * Force buffer overflow */ diff --git a/examples/UnitTest/UnitTest.log b/examples/UnitTest/UnitTest.log index 4063d890..68e99aee 100644 --- a/examples/UnitTest/UnitTest.log +++ b/examples/UnitTest/UnitTest.log @@ -1,676 +1,803 @@ -START ../src/UnitTest.cpp from Jun 22 2024 -Using library version 4.4.0 -Ready to receive IR signals of protocols: NEC/NEC2/Onkyo/Apple, Panasonic/Kaseikyo, Denon/Sharp, Sony, RC5, RC6, LG, JVC, Samsung, Bang & Olufsen, FAST, Bosewave, MagiQuest, Universal Pulse Distance Width, Hash at pin 2 +START ../src/UnitTest.cpp from Jul 31 2025 +Using library version 4.4.2 +Ready to receive IR signals of protocols: NEC/NEC2/Onkyo/Apple, Panasonic/Kaseikyo, Denon/Sharp, Sony, RC5, RC6, LG, JVC, Samsung, Bang & Olufsen, FAST, Lego Power Functions, Bosewave, MagiQuest, Universal Pulse Distance Width, Hash at pin 2 Use ReceiveCompleteCallback -Receive buffer length is 200 +Receive buffer length is 400 Send IR signals at pin 3 If you connect debug pin 5 to ground, raw data is always printed Send signal mark duration for 38kHz is 8 us, pulse narrowing correction is 3000 ns, total period is 26 us 16000 us is the (minimum) gap, after which the start of a new IR packet is assumed -20 us are subtracted from all marks and added to all spaces for decoding +Threshold decoding is active and thus MARK_EXCESS_MICROS is set to 0 address=0xFFF1 command=0x76 Send NEC with 8 bit address -Protocol=NEC Address=0xF1 Command=0x76 Raw-Data=0x89760EF1 32 bits LSB first Duration=67850 us +Protocol=NEC Address=0xF1, Command=0x76, Raw-Data=0x89760EF1, 32 bits, LSB first, Gap=753700us, Duration=67800us Send with: IrSender.sendNEC(0xF1, 0x76, ); -rawData[68]: - -1049200 +rawData[68]: + -753700 +8950,-4350 + 650,-1600 + 650,- 500 + 600,- 500 + 650,- 500 - + 600,-1600 + 650,-1600 + 650,-1600 + 650,-1600 - + 650,- 500 + 600,-1600 + 650,-1600 + 650,-1600 - + 600,- 500 + 650,- 500 + 600,- 500 + 650,- 500 - + 600,- 500 + 650,-1600 + 650,-1600 + 650,- 500 - + 600,-1600 + 650,-1600 + 650,-1600 + 650,- 500 - + 600,-1650 + 600,- 500 + 650,- 500 + 600,-1600 - + 650,- 500 + 650,- 500 + 600,- 500 + 650,-1600 - + 650 -Duration=67850 us + + 650,-1600 + 600,-1650 + 600,-1600 + 650,-1600 + + 600,- 550 + 600,-1600 + 650,-1600 + 600,-1650 + + 600,- 500 + 650,- 500 + 600,- 500 + 600,- 550 + + 600,- 500 + 650,-1600 + 650,-1600 + 650,- 450 + + 650,-1600 + 650,-1600 + 600,-1650 + 600,- 500 + + 650,-1600 + 650,- 500 + 600,- 500 + 650,-1600 + + 600,- 550 + 600,- 500 + 600,- 550 + 600,-1650 + + 600 +Duration=67800us + Send NEC with 16 bit address -Protocol=NEC Address=0xFFF1 Command=0x76 Raw-Data=0x8976FFF1 32 bits LSB first Duration=73350 us +Protocol=NEC Address=0xFFF1, Command=0x76, Raw-Data=0x8976FFF1, 32 bits, LSB first, Gap=764300us, Duration=73350us Send with: IrSender.sendNEC(0xFFF1, 0x76, ); -rawData[68]: - -1060600 +rawData[68]: + -764300 +8950,-4400 + 600,-1600 + 650,- 500 + 650,- 450 + 650,- 500 - + 600,-1600 + 650,-1600 + 650,-1600 + 650,-1600 - + 650,-1600 + 600,-1600 + 650,-1600 + 650,-1600 - + 600,-1600 + 650,-1600 + 650,-1600 + 650,-1600 - + 600,- 500 + 650,-1600 + 650,-1600 + 650,- 500 - + 600,-1600 + 650,-1600 + 650,-1600 + 650,- 500 - + 600,-1600 + 650,- 500 + 600,- 500 + 650,-1600 + + 600,-1650 + 600,-1600 + 650,-1600 + 650,-1600 + + 600,-1600 + 650,-1600 + 650,-1600 + 600,-1650 + + 600,-1650 + 600,-1600 + 600,-1650 + 650,-1600 + + 600,- 500 + 650,-1600 + 650,-1600 + 600,- 500 + + 650,-1600 + 650,-1600 + 600,-1650 + 600,- 500 + + 650,-1600 + 650,- 500 + 600,- 500 + 650,-1600 + 650,- 500 + 600,- 500 + 650,- 500 + 600,-1600 + 650 -Duration=73350 us +Duration=73350us + Send NEC2 with 16 bit address -Protocol=NEC Address=0xFFF1 Command=0x76 Raw-Data=0x8976FFF1 32 bits LSB first Duration=73400 us +Protocol=NEC Address=0xFFF1, Command=0x76, Raw-Data=0x8976FFF1, 32 bits, LSB first, Gap=764750us, Duration=73350us Send with: IrSender.sendNEC(0xFFF1, 0x76, ); -rawData[68]: - -1061100 +rawData[68]: + -764750 +8950,-4400 - + 650,-1600 + 650,- 500 + 600,- 500 + 650,- 500 + + 600,-1600 + 650,- 500 + 600,- 500 + 650,- 500 + + 600,-1600 + 650,-1600 + 650,-1600 + 650,-1600 + 650,-1600 + 600,-1600 + 650,-1600 + 650,-1600 - + 650,-1600 + 600,-1650 + 600,-1600 + 650,-1600 - + 650,-1600 + 650,-1600 + 600,-1600 + 650,-1600 - + 600,- 500 + 650,-1600 + 650,-1600 + 650,- 500 - + 600,-1600 + 650,-1600 + 650,-1600 + 600,- 500 + + 650,-1600 + 600,-1600 + 650,-1600 + 650,-1600 + + 650,- 500 + 600,-1600 + 650,-1600 + 600,- 550 + + 600,-1600 + 650,-1600 + 600,-1650 + 600,- 500 + 650,-1600 + 650,- 500 + 600,- 500 + 650,-1600 + 650,- 500 + 600,- 500 + 650,- 500 + 600,-1600 + 650 -Duration=73400 us +Duration=73350us + + +Send NEC Pronto data with 8 bit address 0x80 and command 0x45 and no repeats +Protocol=NEC Address=0x80, Command=0x45, Raw-Data=0xBA457F80, 32 bits, LSB first, Gap=773500us, Duration=67800us +Send with: IrSender.sendNEC(0x80, 0x45, ); +rawData[68]: + -773500 + +9100,-4350 + + 650,- 450 + 650,- 500 + 650,- 550 + 600,- 550 + + 650,- 500 + 650,- 500 + 650,- 500 + 650,-1600 + + 650,-1550 + 650,-1550 + 650,-1600 + 600,-1550 + + 650,-1550 + 650,-1600 + 600,-1600 + 650,- 450 + + 650,-1550 + 650,- 500 + 650,-1600 + 650,- 500 + + 600,- 500 + 700,- 450 + 650,-1600 + 600,- 550 + + 650,- 450 + 750,-1450 + 650,- 500 + 650,-1600 + + 600,-1600 + 600,-1600 + 650,- 500 + 650,-1550 + + 650 +Duration=67800us + -Send Panasonic 0xB, 0x10 as 48 bit PulseDistance using ProtocolConstants -Protocol=Panasonic Address=0xB Command=0x10 Raw-Data=0xA01000B0 48 bits LSB first Duration=54150 us +Send NEC sendRaw data with 8 bit address=0xFB04 and command 0x08 and exact timing (16 bit array format) +Protocol=NEC Address=0x4, Command=0x8, Raw-Data=0xF708FB04, 32 bits, LSB first, Gap=770700us, Duration=68050us +Send with: IrSender.sendNEC(0x4, 0x8, ); +rawData[68]: + -770700 + +8950,-4400 + + 650,- 500 + 650,- 500 + 600,-1650 + 600,- 500 + + 650,- 500 + 600,- 500 + 650,- 500 + 600,- 500 + + 650,-1600 + 650,-1600 + 650,- 500 + 650,-1600 + + 650,-1600 + 650,-1600 + 650,-1600 + 650,-1600 + + 650,- 500 + 600,- 500 + 650,- 500 + 650,-1600 + + 650,- 500 + 600,- 500 + 650,- 500 + 650,- 500 + + 600,-1650 + 600,-1650 + 600,-1650 + 600,- 500 + + 650,-1600 + 650,-1600 + 650,-1600 + 600,-1650 + + 600 +Duration=68050us + + +Send ONKYO with 16 bit address 0x0102 and 16 bit command 0x0304 with NECRaw(0x03040102) +Protocol=Onkyo Address=0x102, Command=0x304, Raw-Data=0x3040102, 32 bits, LSB first, Gap=768950us, Duration=55600us +Send with: IrSender.sendOnkyo(0x102, 0x304, ); +rawData[68]: + -768950 + +8950,-4400 + + 600,- 500 + 650,-1600 + 650,- 500 + 600,- 500 + + 650,- 500 + 600,- 500 + 650,- 500 + 600,- 500 + + 650,-1600 + 650,- 500 + 600,- 500 + 650,- 500 + + 600,- 500 + 650,- 500 + 600,- 500 + 650,- 500 + + 650,- 500 + 600,- 500 + 650,-1600 + 650,- 500 + + 600,- 500 + 650,- 500 + 600,- 500 + 650,- 500 + + 650,-1600 + 600,-1600 + 650,- 500 + 600,- 500 + + 650,- 500 + 600,- 500 + 650,- 500 + 650,- 500 + + 600 +Duration=55600us + + +Send ONKYO with 16 bit address 0x0102 and command 0x34 with old 32 bit format MSB first (0x40802CD3) +Protocol=NEC Address=0x102, Command=0x34, Raw-Data=0xCB340102, 32 bits, LSB first, Gap=770950us, Duration=61100us +Send with: IrSender.sendNEC(0x102, 0x34, ); +rawData[68]: + -770950 + +8900,-4400 + + 650,- 500 + 650,-1600 + 600,- 500 + 650,- 500 + + 600,- 500 + 650,- 500 + 600,- 500 + 650,- 500 + + 600,-1600 + 650,- 500 + 600,- 500 + 650,- 500 + + 650,- 500 + 600,- 500 + 650,- 500 + 600,- 500 + + 650,- 500 + 600,- 500 + 650,-1600 + 650,- 500 + + 600,-1600 + 650,-1600 + 650,- 500 + 600,- 500 + + 650,-1600 + 650,-1600 + 600,- 500 + 650,-1600 + + 650,- 500 + 600,- 500 + 650,-1600 + 650,-1600 + + 600 +Duration=61100us + + +Send Panasonic 0xB, 0x10 as 48 bit PulseDistance PGM using ProtocolConstants 1=432|1296, 0=432|432 +Protocol=Panasonic Address=0xB, Command=0x10, Raw-Data=0xA01000B0, 48 bits, LSB first, Gap=770400us, Duration=54150us Send with: IrSender.sendPanasonic(0xB, 0x10, ); -rawData[100]: - -1064750 - +3500,-1650 - + 500,- 350 + 500,-1250 + 450,- 400 + 500,- 350 - + 500,- 400 + 450,- 400 + 500,- 350 + 500,- 400 +rawData[100]: + -770400 + +3450,-1700 + + 500,- 400 + 450,-1250 + 500,- 400 + 450,- 400 + + 500,- 350 + 500,- 400 + 450,- 400 + 500,- 400 + 450,- 400 + 500,- 350 + 500,- 400 + 450,- 400 + 500,- 350 + 500,-1250 + 500,- 350 + 500,- 400 - + 450,- 400 + 500,- 350 + 500,- 400 + 450,- 400 - + 500,-1200 + 500,-1250 + 450,- 400 + 500,-1250 - + 450,- 400 + 500,- 350 + 500,- 400 + 450,- 400 - + 500,- 400 + 450,- 400 + 500,- 350 + 500,- 400 - + 500,- 400 + 450,- 400 + 500,- 350 + 500,- 350 - + 500,-1250 + 500,- 350 + 500,- 400 + 500,- 350 - + 500,- 400 + 450,- 400 + 500,- 350 + 500,- 400 - + 500,- 350 + 500,-1250 + 450,- 400 + 500,-1250 + + 450,- 400 + 500,- 350 + 500,- 400 + 500,- 350 + + 500,-1250 + 450,-1250 + 500,- 400 + 450,-1250 + + 500,- 350 + 500,- 400 + 450,- 400 + 500,- 350 + + 500,- 400 + 500,- 350 + 500,- 350 + 500,- 400 + + 500,- 400 + 500,- 350 + 450,- 450 + 450,- 400 + + 500,-1200 + 450,- 450 + 450,- 400 + 500,- 350 + + 500,- 350 + 500,- 400 + 450,- 400 + 450,- 450 + + 450,- 400 + 450,-1250 + 450,- 450 + 500,-1200 + 450 -Duration=54150 us +Duration=54150us -Send Panasonic 0xB, 0x10 as 48 bit PulseDistance + +Send Panasonic 0xB, 0x10 as 48 bit PulseDistance PGM 1=450|1250, 0=450|400 -LSB first -Protocol=Panasonic Address=0xB Command=0x10 Raw-Data=0xA01000B0 48 bits LSB first Duration=53200 us +Protocol=Panasonic Address=0xB, Command=0x10, Raw-Data=0xA01000B0, 48 bits, LSB first, Gap=787100us, Duration=53200us Send with: IrSender.sendPanasonic(0xB, 0x10, ); -rawData[100]: - -1081400 - +3450,-1650 - + 550,- 300 + 500,-1200 + 500,- 350 + 500,- 350 +rawData[100]: + -787100 + +3500,-1650 + + 450,- 400 + 450,-1200 + 500,- 350 + 500,- 350 + 500,- 350 + 500,- 350 + 500,- 350 + 500,- 350 - + 500,- 350 + 500,- 350 + 550,- 300 + 500,- 350 - + 500,- 350 + 500,-1200 + 500,- 350 + 500,- 350 + 500,- 350 + 500,- 350 + 500,- 350 + 500,- 350 + + 500,- 350 + 500,-1200 + 500,- 350 + 500,- 400 + + 450,- 350 + 500,- 350 + 500,- 350 + 500,- 350 + 500,-1200 + 500,-1200 + 500,- 350 + 500,-1200 + 500,- 350 + 500,- 350 + 500,- 350 + 500,- 350 - + 500,- 350 + 500,- 350 + 500,- 350 + 550,- 350 - + 500,- 350 + 500,- 350 + 500,- 350 + 500,- 300 - + 550,-1150 + 500,- 400 + 450,- 350 + 500,- 350 - + 500,- 350 + 500,- 350 + 500,- 350 + 500,- 350 - + 550,- 300 + 500,-1200 + 500,- 350 + 500,-1200 + + 500,- 350 + 500,- 350 + 500,- 350 + 500,- 400 + + 450,- 350 + 500,- 350 + 500,- 350 + 500,- 350 + + 500,-1200 + 500,- 350 + 500,- 350 + 500,- 350 + + 500,- 350 + 500,- 350 + 500,- 400 + 450,- 350 + + 500,- 350 + 500,-1200 + 500,- 350 + 500,-1200 + 500 -Duration=53200 us +Duration=53200us + -MSB first -Protocol=Panasonic Address=0xB Command=0x10 Raw-Data=0xA01000B0 48 bits LSB first Duration=53200 us +Protocol=Panasonic Address=0xB, Command=0x10, Raw-Data=0xA01000B0, 48 bits, LSB first, Gap=779800us, Duration=53200us Send with: IrSender.sendPanasonic(0xB, 0x10, ); -rawData[100]: - -1076300 +rawData[100]: + -779800 +3450,-1650 - + 500,- 350 + 550,-1150 + 500,- 400 + 500,- 300 - + 550,- 300 + 550,- 300 + 500,- 350 + 550,- 300 + + 500,- 350 + 500,-1200 + 500,- 350 + 500,- 350 + + 500,- 350 + 500,- 350 + 500,- 350 + 500,- 350 + 500,- 350 + 500,- 350 + 500,- 350 + 500,- 350 + 500,- 350 + 500,-1200 + 500,- 350 + 500,- 350 + 500,- 350 + 500,- 350 + 500,- 350 + 500,- 350 + 500,-1200 + 500,-1200 + 500,- 350 + 500,-1200 + 500,- 350 + 500,- 350 + 500,- 350 + 500,- 350 - + 500,- 350 + 500,- 350 + 550,- 300 + 500,- 400 - + 500,- 350 + 500,- 350 + 500,- 350 + 500,- 300 - + 500,-1200 + 500,- 350 + 500,- 350 + 500,- 350 + + 500,- 350 + 500,- 350 + 500,- 350 + 500,- 400 + + 450,- 400 + 450,- 400 + 450,- 400 + 450,- 400 + + 450,-1200 + 500,- 350 + 500,- 350 + 550,- 300 + 500,- 350 + 500,- 350 + 500,- 350 + 500,- 350 + 500,- 350 + 500,-1200 + 500,- 350 + 500,-1200 + 500 -Duration=53200 us +Duration=53200us + -Send 72 bit PulseDistance 0x5A AFEDCBA9 87654321 LSB first -Protocol=PulseDistance Raw-Data=0x5A 72 bits LSB first Duration=138400 us -Send on a 8 bit platform with: +Send 72 bit PulseDistance 0x5A AFEDCBA9 87654321 LSB first 1=550|1700, 0=550|600 +Protocol=PulseDistance, Raw-Data=0x5A, 72 bits, LSB first, Gap=786600us, Duration=138350us +Send on a 8 bit platform with: uint32_t tRawData[]={0x87654321, 0xAFEDCBA9, 0x5A}; - IrSender.sendPulseDistanceWidthFromArray(38, 8900, 4400, 600, 1650, 600, 550, &tRawData[0], 72, PROTOCOL_IS_LSB_FIRST, , ); -rawData[148]: - -1081200 - +8900,-4400 - + 600,-1600 + 600,- 550 + 600,- 550 + 600,- 550 + IrSender.sendPulseDistanceWidthFromArray(38, 8900, 4350, 600, 1650, 600, 550, &tRawData[0], 72, PROTOCOL_IS_LSB_FIRST, , ); +rawData[148]: + -786600 + +8900,-4350 + + 600,-1650 + 600,- 550 + 600,- 550 + 600,- 550 + 600,- 550 + 600,-1650 + 600,- 550 + 600,- 550 + 600,-1650 + 600,-1650 + 600,- 550 + 600,- 550 + 600,- 550 + 600,- 550 + 600,-1650 + 600,- 550 + 600,-1650 + 600,- 550 + 600,-1650 + 600,- 550 + 600,- 550 + 600,-1650 + 600,-1650 + 600,- 550 + 600,-1650 + 600,-1650 + 600,-1650 + 600,- 550 - + 600,- 550 + 600,- 550 + 600,- 550 + 600,-1650 - + 650,-1600 + 600,- 550 + 600,- 550 + 600,-1650 + + 600,- 550 + 600,- 550 + 600,- 550 + 600,-1700 + + 550,-1650 + 600,- 550 + 600,- 550 + 600,-1650 + 600,- 550 + 600,-1650 + 600,- 550 + 600,-1650 + 600,-1650 + 600,-1650 + 600,- 550 + 600,-1650 + 600,- 550 + 600,- 550 + 600,-1650 + 600,-1650 - + 550,-1700 + 600,- 550 + 600,-1650 + 600,-1650 - + 600,- 550 + 600,-1650 + 600,-1650 + 600,-1650 - + 550,-1650 + 600,-1650 + 600,-1650 + 600,-1650 - + 600,- 550 + 600,-1650 + 600,- 550 + 600,-1700 - + 550,- 550 + 600,-1650 + 600,- 550 + 600,-1650 + + 600,-1650 + 600,- 550 + 600,-1650 + 600,-1650 + + 550,- 600 + 550,-1650 + 600,-1650 + 600,-1650 + + 600,-1650 + 600,-1650 + 600,-1650 + 550,-1700 + + 550,- 600 + 550,-1650 + 600,- 550 + 600,-1650 + + 600,- 550 + 600,-1650 + 600,- 550 + 600,-1650 + 600,-1650 + 600,- 550 + 600,-1650 + 600,- 550 + 600 -Duration=138400 us +Duration=138350us -Send 52 bit PulseDistanceWidth 0xDCBA9 87654321 LSB first -Protocol=PulseDistance Raw-Data=0xDCBA9 52 bits LSB first Duration=48250 us -Send on a 8 bit platform with: + +Send 52 bit PulseDistanceWidth 0xDCBA9 87654321 LSB first 1=300|600, 0=600|300 +Protocol=PulseDistance, Raw-Data=0xDCBA9, 52 bits, LSB first, Gap=822500us, Duration=48200us +Send on a 8 bit platform with: uint32_t tRawData[]={0x87654321, 0xDCBA9}; IrSender.sendPulseDistanceWidthFromArray(38, 350, 550, 350, 550, 650, 250, &tRawData[0], 52, PROTOCOL_IS_LSB_FIRST, , ); -rawData[108]: - -1118250 +rawData[108]: + -822500 + 350,- 550 - + 400,- 500 + 700,- 200 + 650,- 250 + 700,- 200 - + 650,- 250 + 400,- 550 + 650,- 250 + 650,- 250 - + 350,- 550 + 350,- 550 + 650,- 250 + 650,- 250 - + 650,- 250 + 650,- 200 + 400,- 550 + 650,- 200 - + 400,- 550 + 650,- 200 + 400,- 550 + 650,- 200 - + 700,- 200 + 400,- 550 + 350,- 550 + 650,- 250 - + 350,- 550 + 350,- 550 + 350,- 550 + 650,- 250 - + 650,- 250 + 650,- 250 + 650,- 250 + 350,- 550 - + 400,- 550 + 650,- 250 + 650,- 200 + 400,- 500 - + 700,- 200 + 400,- 550 + 650,- 250 + 350,- 550 - + 350,- 550 + 350,- 550 + 650,- 250 + 400,- 500 - + 700,- 250 + 650,- 250 + 350,- 550 + 350,- 550 - + 350,- 550 + 650,- 250 + 350,- 550 + 350,- 550 - + 400 -Duration=48250 us - -Send 52 bit PulseDistanceWidth 0xDCBA9 87654321 LSB first with inverse timing and data -Protocol=PulseDistance Raw-Data=0xDCBA9 52 bits LSB first Duration=48500 us -Send on a 8 bit platform with: + + 350,- 550 + 650,- 250 + 700,- 200 + 650,- 250 + + 700,- 200 + 400,- 550 + 600,- 250 + 650,- 250 + + 400,- 550 + 350,- 550 + 600,- 250 + 650,- 250 + + 650,- 250 + 700,- 200 + 400,- 500 + 650,- 250 + + 400,- 550 + 600,- 250 + 350,- 600 + 600,- 300 + + 600,- 300 + 350,- 550 + 300,- 600 + 600,- 300 + + 350,- 550 + 300,- 600 + 350,- 550 + 600,- 300 + + 600,- 300 + 600,- 300 + 600,- 250 + 400,- 550 + + 350,- 550 + 650,- 250 + 650,- 250 + 400,- 500 + + 650,- 250 + 350,- 600 + 600,- 300 + 350,- 550 + + 350,- 550 + 350,- 600 + 600,- 250 + 350,- 600 + + 600,- 300 + 600,- 300 + 300,- 600 + 300,- 550 + + 400,- 550 + 600,- 300 + 350,- 550 + 350,- 550 + + 350 +Duration=48200us + + +Send 52 bit PulseDistanceWidth 0xDCBA9 87654321 LSB first with inverse timing and data 1=600|300, 0=300|600 +Protocol=PulseDistance, Raw-Data=0xDCBA9, 52 bits, LSB first, Gap=802750us, Duration=48450us +Send on a 8 bit platform with: uint32_t tRawData[]={0x87654321, 0xDCBA9}; - IrSender.sendPulseDistanceWidthFromArray(38, 350, 550, 350, 550, 650, 250, &tRawData[0], 52, PROTOCOL_IS_LSB_FIRST, , ); -rawData[108]: - -1097950 - + 350,- 550 - + 400,- 500 + 650,- 250 + 650,- 250 + 650,- 250 - + 650,- 250 + 400,- 500 + 700,- 200 + 700,- 250 - + 350,- 550 + 350,- 550 + 650,- 250 + 650,- 250 - + 650,- 250 + 650,- 250 + 350,- 550 + 650,- 250 - + 350,- 550 + 650,- 250 + 350,- 550 + 650,- 250 - + 650,- 250 + 400,- 550 + 350,- 500 + 650,- 250 - + 400,- 500 + 400,- 500 + 400,- 550 + 650,- 250 - + 650,- 200 + 700,- 200 + 650,- 250 + 400,- 550 - + 400,- 500 + 650,- 250 + 650,- 250 + 400,- 550 - + 600,- 250 + 400,- 500 + 650,- 250 + 400,- 550 - + 350,- 550 + 350,- 550 + 650,- 250 + 350,- 550 - + 650,- 250 + 650,- 250 + 350,- 550 + 350,- 550 - + 350,- 550 + 650,- 250 + 350,- 550 + 400,- 500 - + 650 -Duration=48500 us + IrSender.sendPulseDistanceWidthFromArray(38, 350, 600, 350, 550, 600, 300, &tRawData[0], 52, PROTOCOL_IS_LSB_FIRST, , ); +rawData[108]: + -802750 + + 350,- 600 + + 350,- 550 + 600,- 300 + 600,- 300 + 600,- 300 + + 600,- 300 + 350,- 550 + 600,- 300 + 600,- 300 + + 350,- 550 + 350,- 550 + 600,- 300 + 600,- 300 + + 600,- 300 + 600,- 300 + 350,- 550 + 600,- 300 + + 350,- 550 + 600,- 300 + 300,- 600 + 600,- 300 + + 600,- 300 + 350,- 550 + 350,- 550 + 650,- 250 + + 350,- 600 + 350,- 550 + 350,- 550 + 600,- 300 + + 600,- 300 + 600,- 300 + 600,- 300 + 350,- 550 + + 350,- 550 + 650,- 250 + 650,- 250 + 400,- 500 + + 650,- 250 + 350,- 550 + 650,- 300 + 300,- 550 + + 350,- 600 + 350,- 550 + 600,- 250 + 350,- 600 + + 600,- 300 + 600,- 250 + 350,- 550 + 400,- 550 + + 300,- 600 + 600,- 300 + 350,- 550 + 350,- 550 + + 600 +Duration=48450us + -Send 7 bit ASCII character with PulseDistanceWidth LSB first -Protocol=PulseDistance Raw-Data=0x76 7 bits LSB first Duration=20950 us +Send 7 bit ASCII character with PulseDistanceWidth LSB first 1=500|1500, 0=1500|500 +Protocol=PulseDistance, Raw-Data=0x76, 7 bits, LSB first, Gap=800750us, Duration=20950us Send on a 8 bit platform with: IrSender.sendPulseDistanceWidth(38, 6000, 450, 550, 1450, 1550, 450, 0x76, 7, PROTOCOL_IS_LSB_FIRST, , ); -rawData[18]: - -1095750 +rawData[18]: + -800750 +6000,- 450 - +1550,- 450 + 550,-1400 + 550,-1450 +1550,- 450 + +1550,- 450 + 500,-1450 + 550,-1450 +1550,- 450 + 550,-1450 + 550,-1450 + 550,-1450 + 550 -Duration=20950 us +Duration=20950us -Send Sony12 as PulseWidth LSB first -Protocol=Sony Address=0x11 Command=0x76 Raw-Data=0x8F6 12 bits LSB first Duration=21050 us + +Send Velux 0x765432 decoded as PulseDistanceWidth 0x44D5E6 LSB first 1=1275|475, 0=475|1275 +Protocol=PulseDistance, Raw-Data=0x44D5E6, 23 bits, LSB first, Gap=746700us, Duration=42700us +Send on a 8 bit platform with: IrSender.sendPulseDistanceWidth(38, 600, 1200, 550, 1200, 1300, 400, 0x44D5E6, 23, PROTOCOL_IS_LSB_FIRST, , ); +rawData[50]: + -746700 + + 600,-1200 + +1300,- 450 + 500,-1200 + 550,-1200 +1350,- 350 + +1300,- 400 + 550,-1200 + 550,-1150 + 600,-1150 + + 550,-1200 +1300,- 400 + 550,-1150 +1300,- 400 + + 550,-1200 +1350,- 350 + 550,-1150 + 550,-1200 + +1300,- 400 +1300,- 400 + 600,-1150 +1350,- 350 + +1300,- 400 +1350,- 400 + 500,-1200 +1350 +Duration=42700us + + +Send Sony12 as PulseWidth LSB first 1=1200|300, 0=600|600 +Protocol=Sony Address=0x11, Command=0x76, Raw-Data=0x8F6, 12 bits, LSB first, Gap=744650us, Duration=21050us Send with: IrSender.sendSony(0x11, 0x76, 2, 12); -rawData[26]: - -1038650 - +2500,- 500 - + 700,- 500 +1250,- 550 +1250,- 550 + 650,- 550 +rawData[26]: + -744650 + +2450,- 600 + + 600,- 550 +1250,- 550 +1250,- 550 + 650,- 550 +1250,- 550 +1250,- 550 +1250,- 550 +1250,- 550 + 650,- 550 + 650,- 550 + 650,- 550 +1250 -Duration=21050 us - -Send 32 bit PulseWidth 0x87654321 LSB first -Protocol=PulseWidth Raw-Data=0x87654321 32 bits LSB first Duration=24650 us -Send on a 8 bit platform with: IrSender.sendPulseDistanceWidth(38, 1100, 450, 650, 250, 350, 250, 0x87654321, 32, PROTOCOL_IS_LSB_FIRST, , ); -rawData[66]: - -1038250 - +1100,- 450 - + 600,- 300 + 350,- 250 + 350,- 250 + 400,- 200 - + 400,- 250 + 600,- 300 + 350,- 250 + 350,- 250 - + 650,- 250 + 650,- 250 + 400,- 250 + 350,- 250 - + 350,- 250 + 400,- 200 + 650,- 250 + 400,- 250 - + 650,- 250 + 350,- 250 + 650,- 250 + 350,- 250 - + 350,- 250 + 650,- 250 + 700,- 200 + 400,- 250 - + 650,- 200 + 700,- 200 + 700,- 200 + 400,- 250 - + 350,- 250 + 350,- 250 + 400,- 200 + 700 -Duration=24650 us - -Send MagiQuest 0x6BCDFF00, 0x176 as 55 bit PulseDistanceWidth MSB first Duration=63850 us -Protocol=MagiQuest Address=0xFF00 Command=0x176 Raw-Data=0x6BCDFF00 56 bits MSB first +Duration=21050us + + +Send 32 bit PulseWidth 0x87654321 LSB first 1=600|300, 0=300|300 +Protocol=PulseWidth, Raw-Data=0x87654321, 32 bits, LSB first, Gap=744500us, Duration=24550us +Send on a 8 bit platform with: IrSender.sendPulseDistanceWidth(38, 1050, 500, 650, 250, 350, 250, 0x87654321, 32, PROTOCOL_IS_LSB_FIRST, , ); +rawData[66]: + -744500 + +1050,- 500 + + 600,- 250 + 400,- 250 + 350,- 250 + 350,- 250 + + 350,- 250 + 650,- 250 + 400,- 250 + 350,- 250 + + 650,- 250 + 650,- 250 + 350,- 250 + 350,- 250 + + 400,- 250 + 350,- 250 + 600,- 300 + 350,- 250 + + 600,- 300 + 350,- 250 + 600,- 300 + 350,- 250 + + 400,- 200 + 650,- 250 + 650,- 250 + 400,- 250 + + 600,- 250 + 650,- 250 + 650,- 250 + 400,- 250 + + 350,- 250 + 350,- 250 + 400,- 200 + 650 +Duration=24550us + + +Send MagiQuest 0x6BCDFF00, 0x176 as 55 bit PulseDistanceWidth MSB first 1=576|576, 0=287|864 +Protocol=MagiQuest Address=0xFF00, Command=0x176, Raw-Data=0x6BCDFF00, 56 bits, MSB first, Gap=773750us, Duration=63850us Send with: IrSender.sendMagiQuest(0x6BCDFF00, 0x176, ); rawData[112]: - -1065600 - + 350,- 800 + 350,- 800 + 350,- 800 + 350,- 800 + -773750 + + 350,- 850 + 300,- 850 + 300,- 800 + 350,- 800 + 350,- 800 + 350,- 800 + 350,- 800 + 350,- 800 - + 600,- 550 + 600,- 550 + 350,- 800 + 600,- 550 + + 650,- 500 + 600,- 550 + 350,- 800 + 600,- 550 + 350,- 800 + 600,- 550 + 600,- 550 + 600,- 550 - + 600,- 550 + 350,- 800 + 350,- 800 + 600,- 550 - + 600,- 550 + 350,- 800 + 600,- 550 + 600,- 550 - + 600,- 550 + 600,- 550 + 600,- 550 + 600,- 550 - + 600,- 550 + 600,- 550 + 600,- 550 + 300,- 850 - + 350,- 850 + 300,- 850 + 300,- 800 + 350,- 800 + + 600,- 550 + 350,- 850 + 300,- 800 + 650,- 500 + + 650,- 500 + 350,- 800 + 650,- 550 + 600,- 500 + + 650,- 500 + 650,- 500 + 650,- 500 + 650,- 500 + + 650,- 500 + 650,- 500 + 650,- 500 + 350,- 800 + + 300,- 900 + 300,- 850 + 300,- 800 + 350,- 800 + 350,- 800 + 350,- 800 + 350,- 800 + 600,- 550 - + 350,- 800 + 650,- 500 + 600,- 600 + 550,- 550 - + 300,- 850 + 600,- 550 + 600,- 550 + 350,- 800 - + 300,- 850 + 350,- 800 + 350,- 800 + 600,- 550 + + 350,- 800 + 600,- 550 + 650,- 500 + 650,- 500 + + 350,- 800 + 650,- 500 + 650,- 500 + 350,- 800 + + 350,- 800 + 350,- 800 + 350,- 800 + 650,- 500 + 600,- 550 + 350,- 800 + 350,- 800 + 600 -Duration=63850 us +Duration=63850us + Send Onkyo (NEC with 16 bit command) -Protocol=Onkyo Address=0xFFF1 Command=0x7776 Raw-Data=0x7776FFF1 32 bits LSB first Duration=76750 us +Protocol=Onkyo Address=0xFFF1, Command=0x7776, Raw-Data=0x7776FFF1, 32 bits, LSB first, Gap=790650us, Duration=76650us Send with: IrSender.sendOnkyo(0xFFF1, 0x7776, ); -rawData[68]: - -1115300 +rawData[68]: + -790650 +8950,-4400 - + 650,-1600 + 650,- 500 + 600,- 500 + 650,- 500 + + 600,-1600 + 650,- 500 + 600,- 500 + 650,- 500 + 600,-1600 + 650,-1600 + 650,-1600 + 650,-1600 - + 650,-1600 + 600,-1650 + 600,-1600 + 650,-1600 - + 650,-1600 + 650,-1600 + 600,-1650 + 600,-1600 - + 650,- 500 + 600,-1600 + 650,-1600 + 650,- 500 - + 600,-1600 + 650,-1600 + 650,-1600 + 650,- 500 - + 600,-1600 + 650,-1600 + 650,-1600 + 600,- 550 - + 600,-1600 + 650,-1600 + 650,-1600 + 650,- 500 + + 600,-1600 + 650,-1600 + 650,-1600 + 650,-1600 + + 600,-1650 + 600,-1600 + 600,-1650 + 650,-1600 + + 650,- 450 + 650,-1600 + 650,-1600 + 600,- 500 + + 650,-1600 + 650,-1600 + 650,-1600 + 600,- 500 + + 650,-1600 + 650,-1600 + 600,-1650 + 600,- 500 + + 600,-1650 + 600,-1650 + 600,-1600 + 600,- 550 + 600 -Duration=76750 us +Duration=76650us + Send Apple -Protocol=Apple Address=0xF1 Command=0x76 Raw-Data=0xF17687EE 32 bits LSB first Duration=72250 us +Protocol=Apple Address=0xF1, Command=0x76, Raw-Data=0xF17687EE, 32 bits, LSB first, Gap=763800us, Duration=72250us Send with: IrSender.sendApple(0xF1, 0x76, ); -rawData[68]: - -1060250 +rawData[68]: + -763800 +8950,-4400 - + 600,- 500 + 650,-1600 + 650,-1600 + 650,-1600 + + 650,- 500 + 650,-1550 + 650,-1600 + 650,-1600 + 650,- 500 + 600,-1600 + 650,-1600 + 650,-1600 - + 600,-1650 + 600,-1600 + 650,-1600 + 600,- 500 - + 650,- 500 + 600,- 500 + 650,- 500 + 650,-1600 - + 600,- 500 + 650,-1600 + 650,-1600 + 600,- 500 - + 650,-1600 + 650,-1600 + 650,-1600 + 600,- 500 - + 650,-1600 + 650,- 500 + 600,- 500 + 650,- 500 - + 600,-1600 + 650,-1600 + 650,-1600 + 650,-1600 + + 600,-1650 + 600,-1600 + 650,-1600 + 650,- 500 + + 600,- 500 + 650,- 500 + 650,- 500 + 600,-1600 + + 650,- 500 + 600,-1600 + 650,-1600 + 650,- 500 + + 600,-1650 + 600,-1600 + 600,-1650 + 650,- 500 + + 600,-1600 + 650,- 500 + 600,- 500 + 650,- 500 + + 600,-1650 + 600,-1600 + 600,-1650 + 650,-1600 + 600 -Duration=72250 us +Duration=72250us + Send Panasonic -Protocol=Panasonic Address=0xFF1 Command=0x76 Raw-Data=0x9976FF10 48 bits LSB first Duration=64450 us +Protocol=Panasonic Address=0xFF1, Command=0x76, Raw-Data=0x9976FF10, 48 bits, LSB first, Gap=763550us, Duration=64400us Send with: IrSender.sendPanasonic(0xFF1, 0x76, ); -rawData[100]: - -1059900 - +3500,-1650 +rawData[100]: + -763550 + +3450,-1700 + + 500,- 350 + 500,-1250 + 500,- 350 + 500,- 350 + + 500,- 400 + 500,- 350 + 500,- 400 + 450,- 400 + + 500,- 350 + 500,- 400 + 500,- 350 + 500,- 350 + 500,- 400 + 500,-1200 + 500,- 400 + 450,- 400 + 500,- 350 + 500,- 400 + 500,- 350 + 500,- 350 - + 500,- 400 + 500,- 350 + 500,- 400 + 450,- 400 - + 500,- 350 + 500,-1250 + 450,- 400 + 500,- 350 - + 500,- 400 + 500,- 350 + 500,- 350 + 500,- 400 - + 500,-1200 + 500,- 400 + 450,- 400 + 500,- 350 - + 500,-1250 + 450,-1250 + 500,-1250 + 500,-1200 - + 500,-1200 + 500,-1250 + 500,-1200 + 500,-1250 - + 500,- 400 + 450,-1250 + 500,-1250 + 450,- 400 - + 500,-1250 + 450,-1250 + 500,-1250 + 450,- 400 - + 500,-1200 + 500,- 400 + 450,- 400 + 500,-1250 - + 450,-1250 + 500,- 350 + 500,- 400 + 450,-1250 - + 500 -Duration=64450 us + + 500,-1250 + 500,- 400 + 450,- 400 + 500,- 350 + + 500,-1250 + 500,-1200 + 500,-1200 + 500,-1250 + + 500,-1200 + 500,-1250 + 450,-1250 + 450,-1300 + + 450,- 400 + 500,-1250 + 450,-1250 + 450,- 450 + + 450,-1250 + 450,-1300 + 450,-1250 + 500,- 350 + + 500,-1250 + 500,- 350 + 500,- 400 + 450,-1250 + + 450,-1300 + 450,- 400 + 500,- 350 + 500,-1250 + + 450 +Duration=64400us + Send Kaseikyo with 0x4711 as Vendor ID -Protocol=Kaseikyo Address=0xFF1 Command=0x76 Extra=0x4711 Raw-Data=0x9A76FF13 48 bits LSB first Duration=69550 us +Protocol=Kaseikyo Address=0xFF1, Command=0x76, Extra=0x4711, Raw-Data=0x9A76FF13, 48 bits, LSB first, Gap=783450us, Duration=69550us Send with: IrSender.sendKaseikyo(0xFF1, 0x76, , 0x4711); -rawData[100]: - -1080100 - +3450,-1700 - + 500,-1200 + 500,- 400 + 450,- 400 + 500,- 350 +rawData[100]: + -783450 + +3500,-1650 + 500,-1250 + 450,- 400 + 500,- 350 + 500,- 400 - + 450,-1250 + 500,-1250 + 450,-1250 + 500,- 400 - + 450,- 400 + 500,- 350 + 500,-1250 + 500,- 350 - + 500,-1250 + 450,-1250 + 500,- 400 + 450,- 400 - + 500,-1200 + 500,- 400 + 450,- 400 + 500,- 350 - + 500,-1250 + 450,-1250 + 500,-1250 + 450,-1250 - + 500,-1250 + 450,-1250 + 500,-1250 + 450,-1300 - + 450,- 400 + 500,-1200 + 500,-1250 + 450,- 400 + + 450,-1250 + 500,- 350 + 500,- 400 + 500,- 350 + 500,-1250 + 450,-1250 + 500,-1250 + 450,- 400 - + 500,- 350 + 500,-1250 + 500,- 350 + 500,-1250 - + 450,-1250 + 500,- 400 + 450,- 400 + 500,-1200 - + 500 -Duration=69550 us + + 500,- 350 + 500,- 400 + 450,-1250 + 500,- 400 + + 450,-1250 + 500,-1200 + 500,- 400 + 500,- 350 + + 500,-1250 + 450,- 400 + 500,- 350 + 500,- 400 + + 450,-1250 + 450,-1300 + 450,-1250 + 450,-1300 + + 450,-1250 + 450,-1300 + 450,-1250 + 450,-1300 + + 450,- 400 + 500,-1250 + 450,-1250 + 500,- 400 + + 450,-1250 + 500,-1250 + 450,-1250 + 450,- 450 + + 450,- 400 + 500,-1200 + 500,- 400 + 450,-1250 + + 500,-1250 + 450,- 400 + 500,- 350 + 450,-1300 + + 450 +Duration=69550us + Send Kaseikyo_Denon variant -Protocol=Kaseikyo_Denon Address=0xFF1 Command=0x76 Raw-Data=0x9976FF10 48 bits LSB first Duration=67900 us +Protocol=Kaseikyo_Denon Address=0xFF1, Command=0x76, Raw-Data=0x9976FF10, 48 bits, LSB first, Gap=784200us, Duration=67850us Send with: IrSender.sendKaseikyo_Denon(0xFF1, 0x76, ); -rawData[100]: - -1080850 +rawData[100]: + -784200 +3500,-1650 - + 500,- 400 + 500,- 350 + 500,-1250 + 450,- 400 - + 500,-1250 + 450,- 400 + 500,-1200 + 500,- 400 - + 500,- 350 + 500,-1200 + 500,- 400 + 450,- 400 - + 500,-1200 + 500,-1250 + 450,- 400 + 500,- 350 - + 500,- 400 + 450,- 400 + 500,- 350 + 500,- 400 - + 500,-1200 + 500,- 400 + 450,- 400 + 500,- 350 - + 500,-1250 + 500,-1200 + 500,-1250 + 500,-1250 - + 450,-1250 + 500,-1250 + 500,-1200 + 500,-1250 - + 500,- 350 + 500,-1250 + 500,-1250 + 450,- 400 - + 500,-1200 + 500,-1250 + 500,-1200 + 500,- 350 + + 500,- 400 + 450,- 400 + 500,-1250 + 450,- 400 + + 500,-1200 + 450,- 450 + 450,-1250 + 450,- 450 + + 450,- 400 + 500,-1200 + 450,- 450 + 450,- 400 + + 450,-1250 + 500,-1250 + 450,- 400 + 500,- 400 + + 450,- 400 + 450,- 400 + 450,- 450 + 450,- 400 + + 450,-1300 + 450,- 400 + 450,- 400 + 450,- 450 + + 500,-1200 + 500,-1250 + 450,-1250 + 450,-1300 + + 450,-1250 + 450,-1300 + 450,-1250 + 500,-1250 + + 500,- 350 + 450,-1300 + 450,-1250 + 450,- 400 + + 500,-1250 + 450,-1250 + 500,-1250 + 500,- 350 + 500,-1250 + 500,- 350 + 500,- 350 + 500,-1250 - + 500,-1250 + 450,- 400 + 500,- 350 + 500,-1250 + + 450,-1250 + 450,- 450 + 450,- 400 + 450,-1250 + 500 -Duration=67900 us +Duration=67850us -Send Denon -Protocol=Denon Address=0x11 Command=0x76 Raw-Data=0xED1 15 bits LSB first Duration=23150 us -Send with: IrSender.sendDenon(0x11, 0x76, ); -rawData[32]: - -1078600 - + 300,-1750 + 300,- 750 + 300,- 750 + 300,- 750 - + 300,-1750 + 350,- 700 + 350,-1700 + 350,-1750 - + 300,- 750 + 300,-1750 + 350,-1700 + 350,-1750 - + 300,- 750 + 300,- 750 + 300,- 700 + 350 -Duration=23150 us - -Send Denon/Sharp variant -Protocol=Denon Address=0x11 Command=0x76 Raw-Data=0x2ED1 15 bits LSB first Duration=24200 us + +Send Denon with repeats +Protocol=Denon Address=0x11, Command=0x76, Raw-Data=0xED1, 15 bits, LSB first, Gap=783000us, Duration=23100us Send with: IrSender.sendDenon(0x11, 0x76, ); -rawData[32]: - -1020800 - + 300,-1750 + 350,- 700 + 350,- 700 + 300,- 750 - + 300,-1750 + 350,- 700 + 350,-1700 + 350,-1750 - + 350,- 700 + 300,-1750 + 350,-1750 + 300,-1750 - + 350,- 700 + 350,-1700 + 350,- 700 + 350 -Duration=24200 us +rawData[32]: + -783000 + + 250,-1800 + 300,- 750 + 300,- 750 + 300,- 700 + + 300,-1800 + 300,- 750 + 250,-1800 + 300,-1750 + + 300,- 750 + 300,-1750 + 300,-1800 + 300,-1750 + + 300,- 750 + 300,- 750 + 300,- 750 + 300 +Duration=23100us -Send Sony/SIRCS with 7 command and 5 address bits -Protocol=Sony Address=0x11 Command=0x76 Raw-Data=0x8F6 12 bits LSB first Duration=21050 us -Send with: IrSender.sendSony(0x11, 0x76, 2, 12); -rawData[26]: - -1023000 - +2450,- 550 - + 700,- 500 +1300,- 500 +1250,- 550 + 650,- 550 - +1250,- 550 +1250,- 550 +1250,- 550 +1250,- 550 - + 700,- 500 + 600,- 600 + 650,- 550 +1250 -Duration=21050 us -Send Sony/SIRCS with 7 command and 8 address bits -Protocol=Sony Address=0xF1 Command=0x76 Raw-Data=0x78F6 15 bits LSB first Duration=26450 us -Send with: IrSender.sendSony(0xF1, 0x76, 2, 15); -rawData[32]: - -1038750 - +2450,- 550 - + 700,- 500 +1250,- 550 +1250,- 550 + 650,- 550 - +1250,- 550 +1250,- 550 +1250,- 550 +1250,- 550 - + 650,- 550 + 650,- 550 + 650,- 550 +1250,- 550 - +1250,- 550 +1250,- 550 +1250 -Duration=26450 us +Send Denon/Sharp variant with repeats +Protocol=Sharp Address=0x11, Command=0x76, Raw-Data=0x2ED1, 15 bits, LSB first, Gap=726000us, Duration=24150us +Send with: IrSender.sendSharp(0x11, 0x76, ); +rawData[32]: + -726000 + + 300,-1800 + 300,- 750 + 250,- 750 + 300,- 750 + + 300,-1750 + 300,- 750 + 300,-1800 + 250,-1800 + + 300,- 750 + 300,-1750 + 300,-1800 + 300,-1750 + + 300,- 750 + 300,-1750 + 300,- 750 + 300 +Duration=24150us + Send Sony/SIRCS with 7 command and 5 address bits -Protocol=Sony Address=0x11 Command=0x76 Raw-Data=0x8F6 12 bits LSB first Duration=21050 us +Protocol=Sony Address=0x11, Command=0x76, Raw-Data=0x8F6, 12 bits, LSB first, Gap=727100us, Duration=21050us Send with: IrSender.sendSony(0x11, 0x76, 2, 12); rawData[26]: - -1020900 + -727100 +2450,- 550 + 650,- 550 +1250,- 550 +1250,- 550 + 650,- 550 +1250,- 550 +1250,- 550 +1250,- 550 +1250,- 550 - + 650,- 550 + 650,- 550 + 650,- 550 +1250 -Duration=21050 us + + 650,- 550 + 650,- 550 + 600,- 600 +1250 +Duration=21050us + Send Sony/SIRCS with 7 command and 8 address bits -Protocol=Sony Address=0xF1 Command=0x76 Raw-Data=0x78F6 15 bits LSB first Duration=26450 us +Protocol=Sony Address=0xF1, Command=0x76, Raw-Data=0x78F6, 15 bits, LSB first, Gap=743250us, Duration=26450us Send with: IrSender.sendSony(0xF1, 0x76, 2, 15); rawData[32]: - -1036650 - +2450,- 550 - + 650,- 550 +1250,- 550 +1250,- 550 + 650,- 550 + -743250 + +2400,- 600 + + 650,- 550 +1200,- 600 +1250,- 550 + 650,- 550 +1250,- 550 +1250,- 550 +1250,- 550 +1250,- 550 + 650,- 550 + 650,- 550 + 650,- 550 +1250,- 550 +1250,- 550 +1250,- 550 +1250 -Duration=26450 us +Duration=26450us + Send Sony/SIRCS with 7 command and 13 address bits -Protocol=Sony Address=0x1FF1 Command=0x76 Raw-Data=0xFF8F6 20 bits LSB first Duration=35400 us +Protocol=Sony Address=0x1FF1, Command=0x76, Raw-Data=0xFF8F6, 20 bits, LSB first, Gap=746700us, Duration=35400us Send with: IrSender.sendSony(0x1FF1, 0x76, 2, 20); rawData[42]: - -1040400 - +2400,- 550 - + 650,- 550 +1250,- 550 +1250,- 550 + 650,- 550 + -746700 + +2400,- 600 + + 600,- 600 +1200,- 550 +1250,- 550 + 700,- 500 +1250,- 550 +1250,- 550 +1250,- 550 +1250,- 550 - + 650,- 550 + 600,- 600 + 650,- 550 +1250,- 550 + + 600,- 600 + 650,- 550 + 650,- 550 +1250,- 550 +1250,- 550 +1250,- 550 +1250,- 550 +1250,- 550 +1250,- 550 +1250,- 550 +1250,- 550 +1250 -Duration=35400 us +Duration=35400us -Send Samsung 16 bit command and address -Protocol=Samsung Address=0xFFF1 Command=0x9876 Raw-Data=0x9876FFF1 32 bits LSB first Duration=69000 us -Send with: IrSender.sendSamsung(0xFFF1, 0x9876, ); -rawData[68]: - -1057350 + +Send Samsung 8 bit command and 8 bit address +Protocol=Samsung Address=0xF1, Command=0x76, Raw-Data=0x8976F1F1, 32 bits, LSB first, Gap=751750us, Duration=65600us +Send with: IrSender.sendSamsung(0xF1, 0x76, ); +rawData[68]: + -751750 +4550,-4350 + 650,-1600 + 650,- 500 + 600,- 500 + 650,- 500 - + 600,-1600 + 650,-1600 + 650,-1600 + 650,-1600 - + 600,-1650 + 600,-1600 + 650,-1600 + 650,-1600 - + 600,-1600 + 650,-1600 + 650,-1600 + 650,-1600 - + 600,- 500 + 650,-1600 + 650,-1600 + 650,- 500 - + 600,-1600 + 650,-1600 + 650,-1600 + 600,- 500 - + 650,- 500 + 650,- 450 + 650,- 500 + 650,-1600 - + 650,-1600 + 600,- 500 + 650,- 500 + 650,-1600 + + 650,-1550 + 650,-1600 + 650,-1600 + 600,-1650 + + 650,-1600 + 650,- 450 + 650,- 500 + 600,- 500 + + 650,-1600 + 600,-1650 + 650,-1600 + 600,-1600 + + 650,- 500 + 600,-1650 + 600,-1600 + 650,- 500 + + 600,-1650 + 600,-1650 + 600,-1600 + 600,- 550 + + 600,-1650 + 600,- 500 + 600,- 500 + 650,-1600 + + 650,- 500 + 600,- 500 + 650,- 500 + 600,-1600 + 650 -Duration=69000 us +Duration=65600us -Send Samsung48 16 bit command -Protocol=Samsung48 Address=0xFFF1 Command=0x9876 Raw-Data=0x6798 48 bits LSB first Duration=95900 us -Send with: IrSender.sendSamsung48(0xFFF1, 0x9876, ); -rawData[100]: - -1039600 - +4550,-4400 - + 600,-1600 + 650,- 500 + 650,- 450 + 650,- 500 + +Send Samsung 16 bit command and address +Protocol=Samsung Address=0xFFF1, Command=0x9876, Raw-Data=0x9876FFF1, 32 bits, LSB first, Gap=766100us, Duration=68950us +Send with: IrSender.sendSamsung(0xFFF1, 0x9876, ); +rawData[68]: + -766100 + +4500,-4400 + + 650,-1600 + 650,- 500 + 600,- 500 + 650,- 500 + 600,-1650 + 600,-1600 + 650,-1600 + 650,-1600 - + 600,-1600 + 650,-1600 + 650,-1600 + 650,-1600 + 650,-1600 + 600,-1600 + 650,-1600 + 650,-1600 + + 650,-1600 + 650,-1550 + 650,-1600 + 600,-1650 + 650,- 500 + 600,-1600 + 650,-1600 + 650,- 500 + 600,-1600 + 650,-1600 + 650,-1600 + 650,- 500 - + 600,-1600 + 650,- 500 + 650,- 500 + 600,-1600 - + 600,- 550 + 600,- 500 + 650,- 500 + 600,-1650 - + 650,- 500 + 600,- 500 + 650,- 500 + 600,-1600 - + 650,-1600 + 650,- 500 + 600,- 500 + 650,-1600 - + 650,-1600 + 600,-1650 + 600,-1600 + 650,- 500 - + 600,- 500 + 650,-1600 + 650,-1600 + 650,- 450 + + 600,- 500 + 650,- 500 + 650,- 450 + 600,-1650 + + 650,-1600 + 600,- 500 + 600,- 550 + 600,-1600 + 650 -Duration=95900 us +Duration=68950us + + +Send Samsung48 16 bit command +Protocol=Samsung48 Address=0xFFF1, Command=0x9876, Raw-Data=0x6798, 48 bits, LSB first, Gap=765950us, Duration=95900us +Send with: IrSender.sendSamsung48(0xFFF1, 0x9876, ); +rawData[100]: + -765950 + +4500,-4450 + + 600,-1600 + 650,- 500 + 600,- 500 + 650,- 500 + + 600,-1600 + 650,-1600 + 650,-1600 + 600,-1650 + + 600,-1600 + 650,-1600 + 600,-1650 + 650,-1600 + + 600,-1600 + 600,-1650 + 600,-1650 + 600,-1650 + + 600,- 500 + 600,-1650 + 600,-1650 + 600,- 500 + + 600,-1650 + 600,-1650 + 600,-1600 + 650,- 500 + + 650,-1600 + 600,- 500 + 650,- 500 + 600,-1650 + + 600,- 500 + 600,- 550 + 650,- 500 + 600,-1600 + + 600,- 550 + 650,- 500 + 600,- 500 + 650,-1600 + + 650,-1600 + 650,- 500 + 600,- 500 + 650,-1650 + + 550,-1650 + 600,-1650 + 550,-1650 + 650,- 500 + + 600,- 500 + 600,-1650 + 600,-1650 + 600,- 550 + + 600 +Duration=95900us + Send RC5 -Protocol=RC5 Address=0x11 Command=0x36 Raw-Data=0x1476 13 bits MSB first Duration=23200 us +Protocol=RC5 Address=0x11, Command=0x36, Raw-Data=0x1476, 13 bits, MSB first, Gap=782100us, Duration=23150us Send with: IrSender.sendRC5(0x11, 0x36, ); -rawData[20]: - -1078850 - + 950,- 850 - +1850,-1700 +1800,- 850 + 950,- 850 + 950,-1700 - + 950,- 850 + 950,- 800 +1850,-1700 + 950,- 850 +rawData[20]: + -782100 + + 900,- 850 + +1850,-1700 +1850,- 850 + 900,- 850 + 950,-1700 + + 950,- 850 + 950,- 850 +1800,-1700 + 950,- 850 +1850 -Duration=23200 us +Duration=23150us + Send RC5X with 7.th MSB of command set -Protocol=RC5 Address=0x11 Command=0x76 Toggle=1 Raw-Data=0xC76 13 bits MSB first Duration=23150 us +Protocol=RC5 Address=0x11, Command=0x76, Toggle=1, Raw-Data=0xC76, 13 bits, MSB first, Gap=742250us, Duration=23100us Send with: IrSender.sendRC5(0x11, 0x76, ); -rawData[20]: - -1037700 - +1850,-1700 - + 950,- 850 +1800,- 850 + 950,- 800 + 950,-1750 - + 950,- 800 + 950,- 850 +1800,-1750 + 950,- 800 - +1850 -Duration=23150 us +rawData[20]: + -742250 + +1800,-1700 + + 950,- 850 +1800,- 850 + 950,- 850 + 950,-1700 + + 950,- 850 + 900,- 850 +1850,-1700 + 950,- 850 + +1800 +Duration=23100us + Send RC6 -Protocol=RC6 Address=0xF1 Command=0x76 Raw-Data=0xF176 20 bits MSB first Duration=23300 us +Protocol=RC6 Address=0xF1, Command=0x76, Raw-Data=0xF176, 20 bits, MSB first, Gap=739650us, Duration=23300us Send with: IrSender.sendRC6(0xF1, 0x76, ); -rawData[36]: - -1035050 - +2700,- 800 - + 500,- 850 + 500,- 400 + 500,- 400 + 500,- 850 +rawData[36]: + -739650 + +2700,- 850 + + 450,- 900 + 450,- 400 + 500,- 400 + 500,- 850 +1400,- 350 + 500,- 400 + 500,- 400 + 500,- 850 + 500,- 400 + 500,- 400 + 950,- 850 + 950,- 400 + 500,- 400 + 500,- 850 + 950,- 400 + 500,- 850 + 500 -Duration=23300 us +Duration=23300us + Send RC6A with 14 bit 0x2711 as extra -Protocol=RC6A Address=0xF1 Command=0x76 Extra=0x2711 Toggle=1 Raw-Data=0xA711F176 35 bits MSB first Duration=36800 us +Protocol=RC6A Address=0xF1, Command=0x76, Extra=0x2711, Toggle=1, Raw-Data=0xA711F176, 35 bits, MSB first, Gap=749700us, Duration=36800us Send with: IrSender.sendRC6A(0xF1, 0x76, , 0x2711); -rawData[58]: - -1045150 +rawData[58]: + -749700 +2700,- 800 - + 500,- 400 + 500,- 450 + 450,- 900 +1350,-1300 - + 950,- 850 + 500,- 400 + 900,- 400 + 500,- 450 - + 450,- 850 + 500,- 400 + 500,- 400 + 950,- 850 - + 500,- 400 + 500,- 400 +1000,- 400 + 450,- 400 - + 500,- 450 + 500,- 400 + 450,- 850 + 500,- 400 - + 500,- 400 +1000,- 800 +1000,- 400 + 450,- 450 - + 450,- 850 + 950,- 400 + 500,- 850 + 500 -Duration=36800 us - -Send Bang&Olufsen -- ENABLE_BEO_WITHOUT_FRAME_GAP is enabled -- Now print raw data and try to decode the first 6 entries, which results in rawData 0x0 + + 500,- 450 + 450,- 450 + 500,- 800 +1400,-1300 + + 950,- 800 + 500,- 450 + 900,- 400 + 500,- 400 + + 500,- 850 + 500,- 400 + 500,- 400 + 950,- 850 + + 500,- 400 + 500,- 400 + 950,- 450 + 450,- 450 + + 450,- 450 + 450,- 450 + 450,- 850 + 500,- 400 + + 500,- 400 + 950,- 850 + 950,- 400 + 500,- 400 + + 500,- 850 + 950,- 400 + 500,- 850 + 500 +Duration=36800us + + +Send MagiQuest, WandId=0x6BCDFFF1 +Protocol=MagiQuest Address=0xFFF1, Command=0x76, Raw-Data=0x6BCDFFF1, 56 bits, MSB first, Gap=765200us, Duration=64000us +Send with: IrSender.sendMagiQuest(0x6BCDFFF1, 0x76, ); +rawData[112]: + -765200 + + 350,- 800 + 350,- 800 + 300,- 850 + 350,- 800 + + 350,- 800 + 350,- 800 + 350,- 800 + 350,- 850 + + 600,- 550 + 600,- 550 + 350,- 800 + 650,- 500 + + 350,- 800 + 600,- 550 + 600,- 550 + 600,- 550 + + 600,- 550 + 350,- 800 + 350,- 800 + 650,- 500 + + 600,- 550 + 350,- 800 + 600,- 550 + 600,- 550 + + 650,- 500 + 600,- 550 + 600,- 550 + 600,- 550 + + 600,- 550 + 600,- 550 + 600,- 550 + 600,- 550 + + 600,- 550 + 600,- 550 + 600,- 550 + 350,- 800 + + 350,- 800 + 350,- 800 + 600,- 600 + 300,- 850 + + 300,- 850 + 600,- 550 + 600,- 550 + 600,- 550 + + 350,- 800 + 650,- 550 + 550,- 550 + 300,- 900 + + 300,- 850 + 300,- 850 + 600,- 550 + 600,- 550 + + 350,- 800 + 600,- 550 + 600,- 550 + 600 +Duration=64000us + + +Send Lego with 2 channel and with 4 command bits +Protocol=Lego Address=0x1, Command=0x16, Raw-Data=0x1169, 16 bits, MSB first, Gap=791500us, Duration=9950us +Send with: IrSender.sendLego(0x1, 0x16, ); rawData[36]: - -1033000 + -791500 + + 250,- 950 + + 200,- 500 + 250,- 200 + 200,- 200 + 250,- 450 + + 250,- 200 + 200,- 500 + 200,- 550 + 200,- 200 + + 200,- 550 + 200,- 200 + 200,- 250 + 200,- 200 + + 200,- 550 + 200,- 200 + 200,- 250 + 200,- 200 + + 200 +Duration=9950us + + +Send Bang&Olufsen / originally with 455 kHz +- ENABLE_BEO_WITHOUT_FRAME_GAP is enabled +rawData[44]: + -748300 + 250,-2850 - + 250,-2850 + 250,-15250 + 250,-2850 + 250,-9050 - + 250,-6000 + 200,-5950 + 250,-6000 + 200,-2900 - + 250,-5950 + 200,-6000 + 200,-9050 + 250,-2900 + + 200,-2900 + 250,-12750 + 250,-2900 + 250,-9000 + + 250,-6000 + 250,-5950 + 200,-6000 + 200,-2900 + + 200,-6000 + 200,-5950 + 250,-9050 + 250,-2900 + 250,-9000 + 250,-6000 + 250,-5950 + 250,-2850 + + 250,-9050 + 250,-5950 + 250,-2850 + 250,-12150 + 250 -Duration=105700 us -Protocol=Bang&Olufsen Address=0x0 Command=0x0 Raw-Data=0x0 0 bits MSB first +Duration=134200us + +- Now try to decode the first 6 entries, which results in rawData 0x0 +Protocol=Bang&Olufsen Address=0x0, Command=0x0, Raw-Data=0x0, 0 bits, MSB first, Gap=748300us, Duration=6450us - Remove trailing 6 entries, which is equivalent to define RECORD_GAP_MICROS < 15000, to enable successful B&O decode -Protocol=Bang&Olufsen Address=0xF1 Command=0x76 Raw-Data=0xF176 16 bits MSB first Duration=115000 us +Protocol=Bang&Olufsen Address=0xF1, Command=0x76, Raw-Data=0xF176, 16 bits, MSB first, Gap=12750us, Duration=115000us Send with: IrSender.sendBang&Olufsen(0xF1, 0x76, ); rawData[38]: - -15250 - + 250,-2850 - + 250,-9050 + 250,-6000 + 200,-5950 + 250,-6000 - + 200,-2900 + 250,-5950 + 200,-6000 + 200,-9050 + -12750 + + 250,-2900 + + 250,-9000 + 250,-6000 + 250,-5950 + 200,-6000 + + 200,-2900 + 200,-6000 + 200,-5950 + 250,-9050 + 250,-2900 + 250,-9000 + 250,-6000 + 250,-5950 - + 250,-2850 + 250,-9100 + 200,-5950 + 250,-2900 - + 200,-12150 + 250 -Duration=115000 us + + 250,-2850 + 250,-9050 + 250,-5950 + 250,-2850 + + 250,-12150 + 250 +Duration=115000us -Send MagiQuest -Protocol=MagiQuest Address=0xFFF1 Command=0x76 Raw-Data=0x6BCDFFF1 56 bits MSB first Duration=63900 us -Send with: IrSender.sendMagiQuest(0x6BCDFFF1, 0x76, ); -rawData[112]: - -1089250 - + 350,- 800 + 350,- 800 + 350,- 800 + 350,- 800 - + 350,- 800 + 350,- 800 + 350,- 800 + 350,- 850 - + 600,- 550 + 600,- 550 + 350,- 800 + 600,- 550 - + 350,- 750 + 650,- 500 + 650,- 500 + 650,- 500 - + 650,- 500 + 300,- 850 + 350,- 800 + 650,- 500 - + 650,- 500 + 350,- 800 + 650,- 500 + 650,- 500 - + 650,- 500 + 650,- 500 + 650,- 500 + 650,- 500 - + 650,- 500 + 650,- 500 + 650,- 500 + 650,- 500 - + 650,- 500 + 650,- 500 + 650,- 500 + 350,- 800 - + 350,- 800 + 350,- 800 + 650,- 550 + 300,- 800 - + 350,- 800 + 650,- 500 + 650,- 500 + 650,- 500 - + 350,- 800 + 650,- 500 + 650,- 500 + 350,- 850 - + 350,- 750 + 350,- 800 + 650,- 500 + 650,- 500 - + 350,- 800 + 650,- 500 + 650,- 500 + 650 -Duration=63900 us Send next protocols with IrSender.write Send JVC -Protocol=JVC Address=0xF1 Command=0x76 Raw-Data=0x76F1 16 bits LSB first Duration=40400 us +Protocol=JVC Address=0xF1, Command=0x76, Raw-Data=0x76F1, 16 bits, LSB first, Gap=804700us, Duration=40450us Send with: IrSender.sendJVC(0xF1, 0x76, ); -rawData[36]: - -1087300 - +8400,-4100 +rawData[36]: + -804700 + +8400,-4150 + 600,-1500 + 600,- 450 + 600,- 450 + 600,- 450 + 600,-1500 + 600,-1500 + 600,-1500 + 600,-1500 + 600,- 450 + 600,-1500 + 600,-1500 + 600,- 450 - + 600,-1500 + 600,-1500 + 600,-1500 + 600,- 450 + + 600,-1500 + 600,-1500 + 600,-1500 + 550,- 500 + 600 -Duration=40400 us +Duration=40450us + Send LG -Protocol=LG Address=0xF1 Command=0x9876 Raw-Data=0xF19876E 28 bits MSB first Duration=59450 us +Protocol=LG Address=0xF1, Command=0x9876, Raw-Data=0xF19876E, 28 bits, MSB first, Gap=745550us, Duration=59450us Send with: IrSender.sendLG(0xF1, 0x9876, ); -rawData[60]: - -1041500 - +9000,-4150 - + 500,-1550 + 550,-1500 + 550,-1550 + 550,-1500 +rawData[60]: + -745550 + +9000,-4100 + + 550,-1550 + 500,-1550 + 550,-1550 + 550,-1500 + 550,- 500 + 550,- 500 + 550,- 500 + 550,-1550 - + 550,-1500 + 550,- 500 + 550,- 500 + 550,-1550 - + 550,-1500 + 550,- 500 + 550,- 500 + 550,- 500 - + 550,- 500 + 600,-1500 + 550,-1500 + 550,-1550 - + 550,- 500 + 550,-1500 + 550,-1550 + 550,- 500 - + 550,-1500 + 550,-1550 + 500,-1550 + 550,- 500 + + 500,-1550 + 550,- 500 + 550,- 500 + 550,-1550 + + 500,-1550 + 550,- 500 + 550,- 500 + 550,- 500 + + 550,- 500 + 550,-1550 + 500,-1550 + 550,-1550 + + 500,- 550 + 500,-1550 + 550,-1550 + 500,- 550 + + 500,-1550 + 550,-1550 + 500,-1550 + 550,- 500 + 550 -Duration=59450 us +Duration=59450us + Send Bosewave with no address and 8 command bits -Protocol=BoseWave Address=0x0 Command=0x76 Raw-Data=0x8976 16 bits LSB first Duration=26800 us +Protocol=BoseWave Address=0x0, Command=0x76, Raw-Data=0x8976, 16 bits, LSB first, Gap=762100us, Duration=26800us Send with: IrSender.sendBoseWave(0x0, 0x76, ); -rawData[36]: - -1058350 +rawData[36]: + -762100 +1050,-1450 - + 550,- 400 + 600,-1400 + 550,-1400 + 600,- 400 - + 600,-1400 + 550,-1400 + 600,-1400 + 600,- 400 - + 550,-1400 + 600,- 400 + 600,- 400 + 600,-1400 - + 550,- 400 + 600,- 400 + 600,- 400 + 600,-1400 + + 550,- 400 + 600,-1400 + 550,-1450 + 550,- 400 + + 600,-1400 + 600,-1400 + 550,-1400 + 600,- 400 + + 550,-1450 + 550,- 400 + 550,- 450 + 550,-1450 + + 550,- 450 + 550,- 400 + 600,- 400 + 550,-1450 + 550 -Duration=26800 us +Duration=26800us + Send FAST -Protocol=FAST Address=0x0 Command=0x76 Raw-Data=0x8976 16 bits LSB first Duration=28900 us +Protocol=FAST Address=0x0, Command=0x76, Raw-Data=0x8976, 16 bits, LSB first, Gap=746450us, Duration=28900us Send with: IrSender.sendFAST(0x0, 0x76, ); -rawData[36]: - -1042350 - +2150,-1000 - + 550,- 500 + 600,-1500 + 550,-1550 + 550,- 500 - + 550,-1550 + 550,-1550 + 550,-1550 + 550,- 500 - + 550,-1550 + 550,- 500 + 550,- 500 + 600,-1500 - + 550,- 500 + 550,- 500 + 600,- 450 + 550,-1550 - + 550 -Duration=28900 us +rawData[36]: + -746450 + +2100,-1050 + + 600,- 450 + 600,-1500 + 600,-1500 + 550,- 500 + + 600,-1500 + 550,-1550 + 550,-1550 + 550,- 500 + + 600,-1500 + 550,- 500 + 550,- 500 + 550,-1550 + + 550,- 500 + 550,- 500 + 550,- 500 + 600,-1550 + + 500 +Duration=28900us + Force buffer overflow by sending 450 marks and spaces Overflow Try to increase the "RAW_BUFFER_LENGTH" value of 400 in ../src/UnitTest.cpp -rawData[400]: - -1041550 - + 300,- 500 - + 250,- 500 + 250,- 550 + 200,- 500 + 250,- 550 - + 200,- 500 + 250,- 500 + 250,- 500 + 250,- 500 - + 250,- 500 + 250,- 550 + 200,- 500 + 250,- 500 - + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 - + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 - + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 - + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 - + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 - + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 - + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 - + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 - + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 - + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 - + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 - + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 - + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 - + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 - + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 - + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 +rawData[400]: + -745700 + + 200,- 500 + + 250,- 550 + 200,- 550 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 550 + + 200,- 500 + 250,- 500 + 250,- 550 + 200,- 500 + + 250,- 500 + 250,- 500 + 250,- 550 + 200,- 500 + + 250,- 500 + 300,- 450 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + + 250,- 500 + 250,- 500 + 300,- 450 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + + 250,- 500 + 300,- 450 + 250,- 500 + 250,- 500 + + 250,- 500 + 300,- 450 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + + 250,- 500 + 300,- 450 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 550 + + 200,- 550 + 200,- 550 + 200,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + + 250,- 500 + 250,- 500 + 250,- 500 + 300,- 450 + + 300,- 450 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 @@ -678,220 +805,657 @@ rawData[400]: + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + + 250,- 500 + 250,- 550 + 250,- 500 + 200,- 550 + + 250,- 500 + 250,- 450 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + + 250,- 500 + 250,- 500 + 300,- 450 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + + 300,- 450 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + + 300,- 450 + 250,- 500 + 250,- 500 + 250,- 500 + + 250,- 500 + 250,- 500 + 250,- 500 + 300,- 450 + 250,- 500 + 250,- 500 + 250 -Duration=149550 us +Duration=149500us + ERROR: Unknown protocol Stop receiver Start receiver -address=0xF2 command=0x87 +address=0xF2 command=0x87 repeats=1 Send NEC with 8 bit address and complete NEC frames as repeats to force decoding as NEC2 -Protocol=NEC Address=0xF2 Command=0x87 Raw-Data=0x78870DF2 32 bits LSB first Duration=67850 us +Protocol=NEC Address=0xF2, Command=0x87, Raw-Data=0x78870DF2, 32 bits, LSB first, Gap=923450us, Duration=67850us Send with: IrSender.sendNEC(0xF2, 0x87, ); -rawData[68]: - -1028850 - +8900,-4400 - + 650,- 500 + 650,-1600 + 600,- 500 + 600,- 550 - + 600,-1650 + 600,-1600 + 650,-1600 + 650,-1600 - + 650,-1600 + 650,- 450 + 650,-1600 + 650,-1600 - + 650,- 500 + 600,- 500 + 650,- 500 + 600,- 500 - + 650,-1600 + 650,-1600 + 650,-1600 + 650,- 450 +rawData[68]: + -923450 + +8950,-4400 + + 600,- 500 + 650,-1600 + 650,- 500 + 600,- 500 + + 650,-1600 + 650,-1600 + 650,-1600 + 600,-1650 + + 600,-1600 + 650,- 500 + 600,-1650 + 600,-1600 + + 600,- 550 + 600,- 500 + 650,- 500 + 650,- 450 + + 650,-1600 + 600,-1650 + 600,-1650 + 600,- 500 + 650,- 500 + 600,- 500 + 650,- 500 + 600,-1600 - + 650,- 500 + 650,- 500 + 600,- 500 + 650,-1600 - + 650,-1600 + 650,-1600 + 600,-1650 + 600,- 500 + + 650,- 500 + 650,- 500 + 600,- 500 + 600,-1650 + + 600,-1650 + 600,-1600 + 650,-1600 + 650,- 500 + 650 -Duration=67850 us +Duration=67850us -Protocol=NEC2 Address=0xF2 Command=0x87 Repeat gap=67950us Raw-Data=0x78870DF2 32 bits LSB first Duration=67900 us + +Protocol=NEC2 Address=0xF2, Command=0x87, Raw-Data=0x78870DF2, 32 bits, LSB first, Repeat, Gap=68700us, Duration=67800us Send with: IrSender.sendNEC2(0xF2, 0x87, ); -rawData[68]: - -67950 - +8950,-4400 - + 600,- 550 + 600,-1650 + 600,- 500 + 600,- 550 - + 600,-1600 + 600,-1650 + 600,-1650 + 600,-1650 - + 600,-1650 + 600,- 550 + 600,-1600 + 600,-1650 - + 600,- 550 + 600,- 500 + 600,- 550 + 600,- 500 - + 600,-1650 + 600,-1650 + 600,-1650 + 600,- 500 - + 600,- 550 + 600,- 500 + 600,- 550 + 600,-1650 - + 600,- 500 + 600,- 550 + 600,- 500 + 600,-1650 - + 600,-1650 + 650,-1600 + 650,-1600 + 600,- 500 +rawData[68]: + -68700 + +8950,-4350 + + 650,- 500 + 650,-1600 + 600,- 550 + 600,- 500 + + 650,-1600 + 650,-1600 + 600,-1600 + 650,-1600 + + 650,-1600 + 650,- 500 + 600,-1600 + 650,-1600 + + 650,- 500 + 600,- 500 + 650,- 500 + 600,- 500 + + 650,-1600 + 650,-1600 + 600,-1600 + 650,- 500 + + 600,- 550 + 600,- 500 + 650,- 500 + 600,-1600 + + 650,- 500 + 600,- 500 + 650,- 500 + 650,-1600 + + 600,-1600 + 650,-1600 + 650,-1600 + 600,- 500 + 650 -Duration=67900 us +Duration=67800us + Send NEC with 16 bit address -Protocol=NEC Address=0xF2 Command=0x87 Raw-Data=0x78870DF2 32 bits LSB first Duration=67800 us +Protocol=NEC Address=0xF2, Command=0x87, Raw-Data=0x78870DF2, 32 bits, LSB first, Gap=765000us, Duration=67800us Send with: IrSender.sendNEC(0xF2, 0x87, ); -rawData[68]: - -1062200 - +8950,-4400 - + 600,- 500 + 650,-1600 + 650,- 450 + 650,- 500 +rawData[68]: + -765000 + +8950,-4350 + + 650,- 500 + 650,-1600 + 600,- 500 + 650,- 500 + 650,-1600 + 600,-1600 + 650,-1600 + 650,-1600 - + 650,-1600 + 600,- 500 + 650,-1600 + 650,-1600 - + 650,- 500 + 600,- 500 + 650,- 500 + 600,- 500 - + 650,-1600 + 650,-1600 + 600,-1650 + 600,- 500 - + 650,- 450 + 650,- 500 + 650,- 500 + 600,-1600 + + 600,-1650 + 600,- 500 + 650,-1600 + 600,-1650 + + 600,- 500 + 650,- 500 + 600,- 500 + 650,- 500 + + 600,-1600 + 650,-1600 + 650,-1600 + 650,- 500 + + 600,- 500 + 650,- 500 + 600,- 500 + 650,-1600 + 650,- 500 + 600,- 500 + 650,- 500 + 600,-1600 - + 650,-1600 + 650,-1600 + 600,-1650 + 600,- 500 + + 650,-1600 + 650,-1600 + 650,-1600 + 600,- 500 + 650 -Duration=67800 us +Duration=67800us + Send NEC2 with 16 bit address -Protocol=NEC Address=0xF2 Command=0x87 Raw-Data=0x78870DF2 32 bits LSB first Duration=67850 us +Protocol=NEC Address=0xF2, Command=0x87, Raw-Data=0x78870DF2, 32 bits, LSB first, Gap=764400us, Duration=67800us Send with: IrSender.sendNEC(0xF2, 0x87, ); -rawData[68]: - -1060650 - +8950,-4400 +rawData[68]: + -764400 + +8950,-4350 + 650,- 500 + 600,-1650 + 600,- 500 + 650,- 500 + 600,-1600 + 650,-1600 + 650,-1600 + 650,-1600 - + 600,-1650 + 600,- 500 + 650,-1600 + 600,-1600 - + 650,- 500 + 650,- 500 + 600,- 500 + 650,- 500 - + 600,-1600 + 650,-1600 + 650,-1600 + 650,- 500 - + 600,- 500 + 650,- 500 + 600,- 500 + 650,-1600 - + 650,- 500 + 600,- 500 + 650,- 500 + 600,-1600 - + 650,-1600 + 650,-1600 + 650,-1600 + 600,- 500 - + 650 -Duration=67850 us + + 600,-1650 + 600,- 500 + 650,-1600 + 600,-1650 + + 600,- 500 + 650,- 500 + 600,- 500 + 650,- 500 + + 600,-1650 + 600,-1600 + 600,-1650 + 650,- 450 + + 650,- 500 + 650,- 500 + 600,- 500 + 650,-1600 + + 650,- 500 + 600,- 500 + 650,- 500 + 600,-1650 + + 600,-1600 + 650,-1600 + 650,-1600 + 600,- 550 + + 600 +Duration=67800us + Send Onkyo (NEC with 16 bit command) -Protocol=Onkyo Address=0xF2 Command=0x8887 Raw-Data=0x888700F2 32 bits LSB first Duration=62250 us +Protocol=Onkyo Address=0xF2, Command=0x8887, Raw-Data=0x888700F2, 32 bits, LSB first, Gap=765000us, Duration=62300us Send with: IrSender.sendOnkyo(0xF2, 0x8887, ); -rawData[68]: - -1061250 - +8950,-4400 - + 650,- 500 + 600,-1600 + 650,- 500 + 650,- 500 - + 600,-1600 + 650,-1600 + 600,-1650 + 600,-1600 - + 650,- 500 + 600,- 500 + 650,- 500 + 600,- 500 +rawData[68]: + -765000 + +8950,-4350 + + 650,- 500 + 650,-1600 + 600,- 500 + 650,- 500 + + 600,-1650 + 600,-1600 + 650,-1600 + 650,-1600 + 650,- 500 + 600,- 500 + 650,- 500 + 600,- 500 - + 650,-1600 + 650,-1600 + 650,-1600 + 650,- 450 - + 650,- 500 + 600,- 500 + 650,- 500 + 650,-1600 - + 600,- 500 + 650,- 500 + 650,- 450 + 650,-1600 - + 650,- 500 + 650,- 450 + 650,- 500 + 650,-1600 - + 600 -Duration=62250 us + + 650,- 500 + 650,- 450 + 650,- 500 + 600,- 500 + + 650,-1600 + 650,-1600 + 650,-1600 + 600,- 500 + + 650,- 500 + 650,- 500 + 600,- 500 + 650,-1600 + + 650,- 500 + 600,- 500 + 650,- 500 + 600,-1650 + + 600,- 500 + 650,- 500 + 600,- 500 + 650,-1600 + + 650 +Duration=62300us + Send Apple -Protocol=Apple Address=0xF2 Command=0x87 Raw-Data=0xF28787EE 32 bits LSB first Duration=71150 us +Protocol=Apple Address=0xF2, Command=0x87, Raw-Data=0xF28787EE, 32 bits, LSB first, Gap=763450us, Duration=71150us Send with: IrSender.sendApple(0xF2, 0x87, ); -rawData[68]: - -1059700 +rawData[68]: + -763450 +8950,-4400 - + 600,- 500 + 650,-1600 + 650,-1600 + 650,-1550 - + 650,- 500 + 650,-1600 + 650,-1600 + 600,-1600 - + 650,-1600 + 650,-1600 + 600,-1600 + 650,- 500 + + 650,- 500 + 600,-1600 + 650,-1600 + 650,-1600 + + 650,- 500 + 600,-1600 + 650,-1600 + 650,-1600 + + 650,-1600 + 600,-1600 + 650,-1600 + 650,- 500 + 600,- 500 + 650,- 500 + 600,- 500 + 650,-1600 - + 650,-1600 + 650,-1600 + 600,-1600 + 650,- 500 - + 650,- 500 + 600,- 500 + 650,- 500 + 600,-1650 - + 600,- 500 + 650,-1600 + 650,- 500 + 600,- 500 - + 650,-1600 + 650,-1600 + 600,-1600 + 650,-1600 - + 650 -Duration=71150 us + + 650,-1600 + 600,-1650 + 600,-1600 + 650,- 500 + + 600,- 500 + 650,- 500 + 600,- 500 + 650,-1600 + + 650,- 500 + 650,-1600 + 600,- 500 + 650,- 500 + + 600,-1600 + 650,-1600 + 650,-1600 + 650,-1600 + + 600 +Duration=71150us + Send Panasonic -Protocol=Panasonic Address=0xF2 Command=0x87 Raw-Data=0xA8870F20 48 bits LSB first Duration=59250 us +Protocol=Panasonic Address=0xF2, Command=0x87, Raw-Data=0xA8870F20, 48 bits, LSB first, Gap=763500us, Duration=59350us Send with: IrSender.sendPanasonic(0xF2, 0x87, ); -rawData[100]: - -1059850 - +3500,-1650 - + 500,- 350 + 500,-1250 + 500,- 350 + 500,- 400 - + 450,- 400 + 500,- 350 + 500,- 400 + 450,- 400 - + 500,- 350 + 500,- 400 + 450,- 400 + 500,- 350 - + 500,- 400 + 500,-1200 + 500,- 400 + 450,- 400 - + 500,- 350 + 500,- 400 + 450,- 400 + 500,- 350 - + 500,- 400 + 500,-1200 + 500,- 400 + 450,- 400 - + 500,-1200 + 500,-1250 + 450,-1250 + 500,-1250 - + 450,- 400 + 500,- 350 + 500,- 400 + 450,- 400 - + 500,-1250 + 450,-1250 + 500,-1250 + 450,- 400 - + 500,- 350 + 500,- 400 + 500,- 350 + 500,-1250 - + 450,- 400 + 500,- 350 + 500,- 400 + 450,-1250 - + 500,- 350 + 500,-1250 + 500,- 350 + 500,-1200 +rawData[100]: + -763500 + +3500,-1700 + + 450,- 400 + 500,-1250 + 450,- 400 + 500,- 350 + + 500,- 350 + 500,- 400 + 500,- 350 + 500,- 400 + + 450,- 400 + 500,- 400 + 450,- 400 + 500,- 350 + + 500,- 350 + 500,-1250 + 500,- 400 + 450,- 400 + + 500,- 350 + 500,- 400 + 500,- 350 + 450,- 450 + + 450,- 400 + 500,-1250 + 450,- 400 + 500,- 350 + + 500,-1250 + 450,-1250 + 500,-1250 + 450,-1250 + + 450,- 450 + 450,- 400 + 500,- 350 + 500,- 400 + + 500,-1200 + 500,-1250 + 500,-1200 + 500,- 400 + + 500,- 350 + 450,- 450 + 450,- 400 + 500,-1200 + + 500,- 400 + 450,- 400 + 500,- 350 + 500,-1250 + + 500,- 350 + 450,-1300 + 450,- 400 + 500,-1200 + 500 -Duration=59250 us +Duration=59350us + Send Kaseikyo with 0x4711 as Vendor ID -Protocol=Kaseikyo Address=0xF2 Command=0x87 Extra=0x4711 Raw-Data=0xAB870F23 48 bits LSB first Duration=66200 us +Protocol=Kaseikyo Address=0xF2, Command=0x87, Extra=0x4711, Raw-Data=0xAB870F23, 48 bits, LSB first, Gap=783250us, Duration=66150us Send with: IrSender.sendKaseikyo(0xF2, 0x87, , 0x4711); -rawData[100]: - -1079850 - +3450,-1700 - + 500,-1200 + 500,- 400 + 450,- 400 + 500,- 400 - + 450,-1250 + 500,- 350 + 500,- 400 + 500,- 350 +rawData[100]: + -783250 + +3500,-1650 + + 500,-1250 + 450,- 400 + 500,- 350 + 500,- 400 + + 450,-1250 + 500,- 350 + 500,- 400 + 450,- 400 + 500,-1250 + 450,-1250 + 500,-1250 + 450,- 400 - + 500,- 350 + 500,- 400 + 450,-1250 + 500,- 350 - + 500,-1250 + 500,-1250 + 450,- 400 + 500,- 350 + + 500,- 400 + 450,- 400 + 500,-1200 + 500,- 400 + + 450,-1250 + 500,-1250 + 450,- 400 + 500,- 350 + 500,- 400 + 450,-1250 + 500,- 400 + 450,- 400 + 500,-1200 + 500,-1250 + 450,-1250 + 500,-1250 + 450,- 400 + 500,- 350 + 500,- 400 + 500,- 400 + 450,-1250 + 500,-1250 + 450,-1250 + 500,- 400 - + 450,- 400 + 500,- 350 + 500,- 400 + 450,-1250 - + 500,-1250 + 450,-1250 + 500,- 400 + 450,-1250 - + 500,- 400 + 450,-1250 + 500,- 350 + 500,-1250 - + 500 -Duration=66200 us + + 450,- 400 + 500,- 350 + 500,- 400 + 500,-1200 + + 500,-1250 + 500,-1200 + 500,- 400 + 450,-1250 + + 500,- 350 + 500,-1250 + 500,- 350 + 500,-1250 + + 450 +Duration=66150us + Send Kaseikyo_Denon variant -Protocol=Kaseikyo_Denon Address=0xF2 Command=0x87 Raw-Data=0xA8870F20 48 bits LSB first Duration=62750 us +Protocol=Kaseikyo_Denon Address=0xF2, Command=0x87, Raw-Data=0xA8870F20, 48 bits, LSB first, Gap=784050us, Duration=62700us Send with: IrSender.sendKaseikyo_Denon(0xF2, 0x87, ); -rawData[100]: - -1080600 - +3500,-1650 - + 500,- 350 + 500,- 400 + 500,-1200 + 500,- 400 - + 450,-1250 + 500,- 350 + 500,-1250 + 500,- 350 - + 500,- 400 + 500,-1200 + 500,- 400 + 450,- 400 - + 500,-1250 + 450,-1250 + 500,- 350 + 500,- 400 - + 500,- 350 + 500,- 350 + 500,- 400 + 500,- 350 - + 500,- 400 + 450,-1250 + 500,- 350 + 500,- 400 - + 450,-1250 + 500,-1250 + 450,-1250 + 500,-1250 - + 450,- 400 + 500,- 350 + 500,- 400 + 500,- 400 - + 450,-1250 + 500,-1250 + 450,-1250 + 500,- 400 - + 450,- 400 + 500,- 350 + 500,- 400 + 450,-1250 - + 500,- 400 + 450,- 400 + 500,- 350 + 500,-1250 - + 450,- 400 + 500,-1250 + 450,- 400 + 500,-1200 - + 500 -Duration=62750 us +rawData[100]: + -784050 + +3450,-1700 + + 500,- 350 + 500,- 350 + 500,-1250 + 500,- 350 + + 500,-1250 + 450,- 400 + 500,-1200 + 500,- 400 + + 500,- 350 + 500,-1250 + 500,- 350 + 500,- 400 + + 450,-1250 + 500,-1250 + 450,- 400 + 500,- 400 + + 450,- 400 + 450,- 400 + 500,- 350 + 500,- 400 + + 450,- 400 + 500,-1250 + 450,- 400 + 500,- 350 + + 500,-1250 + 500,-1200 + 500,-1250 + 500,-1200 + + 450,- 400 + 500,- 400 + 500,- 350 + 500,- 400 + + 500,-1250 + 450,-1250 + 450,-1300 + 450,- 400 + + 450,- 450 + 450,- 400 + 450,- 400 + 500,-1250 + + 450,- 400 + 450,- 450 + 450,- 400 + 450,-1250 + + 450,- 450 + 450,-1250 + 450,- 400 + 500,-1250 + + 450 +Duration=62700us -Send Denon -Protocol=Denon Address=0x12 Command=0x87 Raw-Data=0x10F2 15 bits LSB first Duration=22150 us -Send with: IrSender.sendDenon(0x12, 0x87, ); -rawData[32]: - -1078350 - + 350,- 700 + 300,-1750 + 350,- 700 + 350,- 700 - + 350,-1700 + 350,-1750 + 300,-1750 + 350,-1750 - + 300,- 750 + 300,- 700 + 350,- 700 + 350,- 700 - + 300,-1750 + 350,- 700 + 350,- 700 + 350 -Duration=22150 us - -Send Denon/Sharp variant -Protocol=Denon Address=0x12 Command=0x87 Raw-Data=0x30F2 15 bits LSB first Duration=23200 us + +Send Denon with repeats +Protocol=Denon Address=0x12, Command=0x87, Raw-Data=0x10F2, 15 bits, LSB first, Gap=782850us, Duration=22100us Send with: IrSender.sendDenon(0x12, 0x87, ); -rawData[32]: - -1020850 - + 350,- 700 + 350,-1750 + 300,- 700 + 350,- 700 - + 350,-1750 + 300,-1750 + 350,-1700 + 350,-1750 - + 300,- 750 + 300,- 750 + 300,- 700 + 350,- 700 - + 350,-1750 + 300,-1750 + 350,- 700 + 350 -Duration=23200 us +rawData[32]: + -782850 + + 300,- 750 + 250,-1800 + 300,- 750 + 300,- 750 + + 300,-1750 + 300,-1750 + 300,-1800 + 300,-1750 + + 300,- 750 + 300,- 750 + 300,- 750 + 300,- 750 + + 300,-1750 + 300,- 750 + 300,- 750 + 300 +Duration=22100us + + +Send Denon/Sharp variant with repeats +Protocol=Sharp Address=0x12, Command=0x87, Raw-Data=0x30F2, 15 bits, LSB first, Gap=726100us, Duration=23150us +Send with: IrSender.sendSharp(0x12, 0x87, ); +rawData[32]: + -726100 + + 300,- 750 + 300,-1750 + 300,- 750 + 300,- 750 + + 300,-1750 + 300,-1800 + 300,-1750 + 300,-1800 + + 300,- 700 + 300,- 750 + 300,- 750 + 300,- 750 + + 300,-1750 + 300,-1800 + 300,- 750 + 300 +Duration=23150us + Send Sony/SIRCS with 7 command and 5 address bits -Protocol=Sony Address=0x12 Command=0x7 Raw-Data=0x907 12 bits LSB first Duration=19850 us +Protocol=Sony Address=0x12, Command=0x7, Raw-Data=0x907, 12 bits, LSB first, Gap=727150us, Duration=19800us Send with: IrSender.sendSony(0x12, 0x7, 2, 12); -rawData[26]: - -1022950 +rawData[26]: + -727150 + +2350,- 600 + +1250,- 550 +1250,- 550 +1250,- 550 + 600,- 600 + + 650,- 550 + 650,- 550 + 650,- 550 + 650,- 550 + +1250,- 550 + 650,- 550 + 600,- 600 +1250 +Duration=19800us + + +Send Sony/SIRCS with 7 command and 8 address bits +Protocol=Sony Address=0xF2, Command=0x7, Raw-Data=0x7907, 15 bits, LSB first, Gap=743050us, Duration=25250us +Send with: IrSender.sendSony(0xF2, 0x7, 2, 15); +rawData[32]: + -743050 +2450,- 550 - +1250,- 550 +1250,- 550 +1250,- 550 + 650,- 550 + +1300,- 500 +1250,- 550 +1250,- 550 + 650,- 550 + 650,- 550 + 650,- 550 + 650,- 550 + 650,- 550 - +1250,- 550 + 650,- 550 + 650,- 550 +1250 -Duration=19850 us + +1250,- 550 + 650,- 550 + 600,- 600 +1250,- 550 + +1250,- 550 +1250,- 550 +1250 +Duration=25250us + + +Send Sony/SIRCS with 7 command and 13 address bits +Protocol=Sony Address=0xF2, Command=0x7, Raw-Data=0x7907, 20 bits, LSB first, Gap=746500us, Duration=31250us +Send with: IrSender.sendSony(0xF2, 0x7, 2, 20); +rawData[42]: + -746500 + +2450,- 550 + +1300,- 500 +1250,- 550 +1250,- 550 + 650,- 550 + + 650,- 550 + 600,- 600 + 600,- 600 + 650,- 550 + +1250,- 550 + 650,- 550 + 650,- 550 +1250,- 550 + +1250,- 550 +1250,- 550 +1250,- 550 + 650,- 550 + + 650,- 550 + 650,- 550 + 650,- 550 + 650 +Duration=31250us + + +Send Samsung 8 bit command and 8 bit address +Protocol=Samsung Address=0xF2, Command=0x87, Raw-Data=0x7887F2F2, 32 bits, LSB first, Gap=751200us, Duration=65550us +Send with: IrSender.sendSamsung(0xF2, 0x87, ); +rawData[68]: + -751200 + +4500,-4400 + + 600,- 500 + 650,-1600 + 650,- 500 + 650,- 450 + + 650,-1600 + 650,-1600 + 650,-1600 + 600,-1600 + + 650,- 500 + 650,-1600 + 600,- 500 + 650,- 500 + + 600,-1600 + 650,-1600 + 650,-1600 + 650,-1600 + + 600,-1650 + 600,-1600 + 650,-1600 + 650,- 500 + + 600,- 500 + 650,- 500 + 600,- 500 + 650,-1600 + + 650,- 500 + 600,- 500 + 650,- 500 + 600,-1600 + + 650,-1600 + 650,-1600 + 650,-1600 + 600,- 500 + + 600 +Duration=65550us + + +Send Samsung 16 bit command and address +Protocol=Samsung Address=0xF2, Command=0xA987, Raw-Data=0xA98700F2, 32 bits, LSB first, Gap=766150us, Duration=60050us +Send with: IrSender.sendSamsung(0xF2, 0xA987, ); +rawData[68]: + -766150 + +4550,-4350 + + 650,- 500 + 650,-1600 + 650,- 450 + 650,- 500 + + 600,-1600 + 650,-1600 + 650,-1600 + 650,-1600 + + 600,- 550 + 600,- 500 + 650,- 500 + 600,- 500 + + 650,- 500 + 650,- 450 + 650,- 500 + 650,- 450 + + 650,-1600 + 650,-1600 + 650,-1600 + 600,- 500 + + 600,- 550 + 650,- 500 + 600,- 500 + 650,-1600 + + 600,-1650 + 600,- 500 + 600,- 550 + 650,-1600 + + 600,- 500 + 600,-1650 + 600,- 500 + 600,-1650 + + 600 +Duration=60050us + + +Send Samsung48 16 bit command +Protocol=Samsung48 Address=0xF2, Command=0xA987, Raw-Data=0x56A9, 48 bits, LSB first, Gap=765650us, Duration=87000us +Send with: IrSender.sendSamsung48(0xF2, 0xA987, ); +rawData[100]: + -765650 + +4450,-4450 + + 600,- 500 + 650,-1600 + 600,- 550 + 600,- 500 + + 600,-1650 + 600,-1650 + 600,-1650 + 600,-1650 + + 600,- 500 + 650,- 500 + 600,- 500 + 600,- 550 + + 600,- 550 + 600,- 500 + 600,- 550 + 600,- 500 + + 600,-1650 + 600,-1650 + 600,-1650 + 600,- 500 + + 600,- 550 + 600,- 500 + 650,- 500 + 650,-1600 + + 600,- 500 + 600,- 550 + 600,- 500 + 650,-1600 + + 600,-1650 + 600,-1650 + 600,-1600 + 600,- 550 + + 600,-1650 + 600,- 550 + 600,- 500 + 650,-1600 + + 600,- 500 + 600,-1650 + 600,- 500 + 650,-1600 + + 600,- 550 + 600,-1650 + 600,-1600 + 600,- 550 + + 600,-1650 + 600,- 500 + 600,-1650 + 600,- 500 + + 650 +Duration=87000us + + +Send RC5 +Protocol=RC5 Address=0x12, Command=0x7, Raw-Data=0x1487, 13 bits, MSB first, Gap=781750us, Duration=24000us +Send with: IrSender.sendRC5(0x12, 0x7, ); +rawData[22]: + -781750 + + 950,- 800 + +1850,-1700 +1850,- 850 + 900,-1750 +1850,- 800 + + 950,- 850 + 900,- 850 + 950,-1700 + 950,- 850 + + 950,- 800 + 950 +Duration=24000us + + +Send RC5X with 7.th MSB of command set +Protocol=RC5 Address=0x12, Command=0x47, Toggle=1, Raw-Data=0xC87, 13 bits, MSB first, Gap=742250us, Duration=24050us +Send with: IrSender.sendRC5(0x12, 0x47, ); +rawData[22]: + -742250 + +1850,-1700 + + 950,- 850 +1800,- 850 + 950,-1700 +1850,- 850 + + 950,- 800 + 950,- 850 + 950,-1700 + 950,- 800 + + 950,- 850 + 950 +Duration=24050us + + +Send RC6 +Protocol=RC6 Address=0xF2, Command=0x87, Toggle=1, Raw-Data=0x1F287, 20 bits, MSB first, Gap=739800us, Duration=22850us +Send with: IrSender.sendRC6(0xF2, 0x87, ); +rawData[36]: + -739800 + +2700,- 800 + + 500,- 850 + 500,- 400 + 500,- 400 +1400,- 850 + + 500,- 400 + 450,- 400 + 500,- 400 + 500,- 850 + + 500,- 400 + 950,- 850 +1000,- 800 + 500,- 400 + + 500,- 400 + 500,- 450 + 900,- 400 + 500,- 400 + + 500 +Duration=22850us + + +Send RC6A with 14 bit 0x2711 as extra +Protocol=RC6A Address=0xF2, Command=0x87, Extra=0x2711, Raw-Data=0x2711F287, 35 bits, MSB first, Gap=751050us, Duration=36400us +Send with: IrSender.sendRC6A(0xF2, 0x87, , 0x2711); +rawData[60]: + -751050 + +2700,- 800 + + 500,- 400 + 500,- 450 + 450,- 850 + 500,- 850 + + 950,- 400 + 950,- 850 + 500,- 400 + 950,- 450 + + 450,- 450 + 450,- 850 + 500,- 400 + 500,- 400 + + 950,- 850 + 500,- 400 + 500,- 400 + 950,- 400 + + 500,- 400 + 500,- 400 + 500,- 400 + 500,- 850 + + 500,- 400 + 950,- 850 + 950,- 850 + 500,- 400 + + 500,- 450 + 450,- 400 + 950,- 450 + 450,- 450 + + 450 +Duration=36400us + + +Send MagiQuest, WandId=0x6BCD00F2 +Protocol=MagiQuest Address=0xF2, Command=0x187, Raw-Data=0x6BCD00F2, 56 bits, MSB first, Gap=765950us, Duration=63700us +Send with: IrSender.sendMagiQuest(0x6BCD00F2, 0x187, ); +rawData[112]: + -765950 + + 350,- 800 + 350,- 800 + 350,- 800 + 350,- 800 + + 350,- 800 + 350,- 800 + 350,- 800 + 350,- 850 + + 650,- 500 + 600,- 550 + 350,- 800 + 600,- 550 + + 300,- 850 + 650,- 500 + 650,- 500 + 650,- 500 + + 600,- 550 + 300,- 850 + 350,- 800 + 650,- 500 + + 650,- 500 + 350,- 800 + 650,- 500 + 300,- 850 + + 350,- 800 + 350,- 800 + 350,- 800 + 350,- 800 + + 350,- 800 + 350,- 800 + 350,- 800 + 650,- 550 + + 600,- 550 + 600,- 550 + 600,- 550 + 300,- 800 + + 400,- 750 + 650,- 500 + 350,- 850 + 600,- 550 + + 600,- 550 + 300,- 850 + 300,- 850 + 300,- 850 + + 300,- 800 + 600,- 550 + 600,- 550 + 650,- 550 + + 300,- 850 + 300,- 850 + 600,- 550 + 300,- 850 + + 350,- 800 + 350,- 800 + 600,- 550 + 350 +Duration=63700us + + +Send Lego with 2 channel and with 4 command bits +Protocol=Lego Address=0x2, Command=0x17, Raw-Data=0x217B, 16 bits, MSB first, Gap=791750us, Duration=10550us +Send with: IrSender.sendLego(0x2, 0x17, ); +rawData[36]: + -791750 + + 200,-1000 + + 200,- 500 + 200,- 550 + 200,- 200 + 200,- 500 + + 200,- 550 + 200,- 500 + 200,- 500 + 200,- 250 + + 200,- 500 + 200,- 250 + 200,- 200 + 200,- 250 + + 200,- 200 + 200,- 550 + 200,- 200 + 200,- 250 + + 200 +Duration=10550us + + +Send Bang&Olufsen / originally with 455 kHz +- ENABLE_BEO_WITHOUT_FRAME_GAP is enabled +rawData[44]: + -748450 + + 200,-2900 + + 200,-2900 + 200,-12750 + 250,-2850 + 250,-9100 + + 200,-5950 + 250,-6000 + 250,-5950 + 200,-2900 + + 250,-5950 + 200,-9050 + 250,-2900 + 250,-9000 + + 250,-2900 + 250,-5950 + 250,-5950 + 250,-5950 + + 200,-9050 + 250,-6000 + 200,-6000 + 200,-12150 + + 250 +Duration=137200us + +- Now try to decode the first 6 entries, which results in rawData 0x0 +Protocol=Bang&Olufsen Address=0x0, Command=0x0, Raw-Data=0x0, 0 bits, MSB first, Gap=748450us, Duration=6400us + +- Remove trailing 6 entries, which is equivalent to define RECORD_GAP_MICROS < 15000, to enable successful B&O decode +Protocol=Bang&Olufsen Address=0xF2, Command=0x87, Raw-Data=0xF287, 16 bits, MSB first, Gap=12750us, Duration=118050us +Send with: IrSender.sendBang&Olufsen(0xF2, 0x87, ); +rawData[38]: + -12750 + + 250,-2850 + + 250,-9100 + 200,-5950 + 250,-6000 + 250,-5950 + + 200,-2900 + 250,-5950 + 200,-9050 + 250,-2900 + + 250,-9000 + 250,-2900 + 250,-5950 + 250,-5950 + + 250,-5950 + 200,-9050 + 250,-6000 + 200,-6000 + + 200,-12150 + 250 +Duration=118050us + + +Send next protocols with IrSender.write + +Send JVC +Protocol=JVC Address=0xF2, Command=0x87, Raw-Data=0x87F2, 16 bits, LSB first, Gap=804750us, Duration=39400us +Send with: IrSender.sendJVC(0xF2, 0x87, ); +rawData[36]: + -804750 + +8400,-4150 + + 550,- 500 + 600,-1500 + 600,- 450 + 600,- 450 + + 600,-1500 + 600,-1500 + 600,-1500 + 600,-1500 + + 600,-1500 + 600,-1500 + 600,-1500 + 600,- 450 + + 600,- 450 + 600,- 450 + 600,- 450 + 600,-1500 + + 600 +Duration=39400us + + +Send LG +Protocol=LG Address=0xF2, Command=0xA987, Raw-Data=0xF2A9872, 28 bits, MSB first, Gap=745550us, Duration=57400us +Send with: IrSender.sendLG(0xF2, 0xA987, ); +rawData[60]: + -745550 + +9000,-4150 + + 500,-1550 + 550,-1500 + 550,-1550 + 550,-1500 + + 550,- 500 + 550,- 500 + 550,-1550 + 500,- 550 + + 500,-1550 + 550,- 500 + 550,-1550 + 500,- 550 + + 500,-1550 + 550,- 500 + 550,- 500 + 550,-1550 + + 500,-1550 + 550,- 500 + 550,- 500 + 550,- 500 + + 550,- 500 + 550,-1550 + 550,-1500 + 550,-1550 + + 500,- 550 + 500,- 550 + 500,-1550 + 550,- 500 + + 550 +Duration=57400us + + +Send Bosewave with no address and 8 command bits +Protocol=BoseWave Address=0x0, Command=0x87, Raw-Data=0x7887, 16 bits, LSB first, Gap=762100us, Duration=26750us +Send with: IrSender.sendBoseWave(0x0, 0x87, ); +rawData[36]: + -762100 + +1050,-1400 + + 600,-1400 + 600,-1400 + 550,-1400 + 550,- 450 + + 600,- 400 + 550,- 450 + 500,- 450 + 600,-1400 + + 550,- 400 + 600,- 400 + 600,- 400 + 600,-1400 + + 550,-1400 + 600,-1400 + 550,-1400 + 600,- 400 + + 550 +Duration=26750us + + +Send FAST +Protocol=FAST Address=0x0, Command=0x87, Raw-Data=0x7887, 16 bits, LSB first, Gap=746450us, Duration=28950us +Send with: IrSender.sendFAST(0x0, 0x87, ); +rawData[36]: + -746450 + +2150,-1050 + + 550,-1550 + 550,-1500 + 600,-1550 + 550,- 500 + + 550,- 500 + 550,- 500 + 600,- 450 + 600,-1500 + + 600,- 450 + 550,- 500 + 600,- 450 + 550,-1550 + + 600,-1500 + 550,-1550 + 550,-1550 + 550,- 500 + + 550 +Duration=28950us + + +Force buffer overflow by sending 450 marks and spaces +Overflow +Try to increase the "RAW_BUFFER_LENGTH" value of 400 in ../src/UnitTest.cpp +rawData[400]: + -745650 + + 200,- 450 + + 250,- 550 + 250,- 500 + 250,- 500 + 250,- 500 + + 250,- 550 + 250,- 500 + 200,- 550 + 200,- 500 + + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + + 250,- 500 + 250,- 500 + 250,- 500 + 300,- 450 + + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + + 250,- 500 + 250,- 500 + 300,- 500 + 250,- 450 + + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + + 250,- 500 + 300,- 450 + 250,- 500 + 250,- 500 + + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + + 250,- 500 + 250,- 500 + 300,- 450 + 250,- 500 + + 250,- 500 + 300,- 450 + 250,- 500 + 250,- 500 + + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + + 250,- 500 + 300,- 450 + 250,- 500 + 250,- 500 + + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + + 250,- 500 + 250,- 500 + 300,- 450 + 250,- 500 + + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + + 250,- 500 + 250,- 500 + 250,- 550 + 250,- 500 + + 200,- 500 + 250,- 500 + 250,- 550 + 200,- 500 + + 300,- 450 + 250,- 500 + 250,- 500 + 250,- 500 + + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 550 + + 250,- 450 + 250,- 500 + 250,- 500 + 250,- 500 + + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + + 250,- 500 + 250,- 500 + 250,- 500 + 250,- 500 + + 250,- 500 + 250,- 500 + 250,- 500 + 300,- 450 + + 300,- 450 + 250,- 500 + 250,- 500 + 250,- 500 + + 250,- 500 + 250,- 500 + 300 +Duration=149500us + +ERROR: Unknown protocol + +Stop receiver +Start receiver + +address=0x1F3 command=0x98 repeats=2 + +Send NEC with 8 bit address and complete NEC frames as repeats to force decoding as NEC2 +Protocol=NEC Address=0xF3, Command=0x98, Raw-Data=0x67980CF3, 32 bits, LSB first, Gap=923500us, Duration=67850us +Send with: IrSender.sendNEC(0xF3, 0x98, ); +rawData[68]: + -923500 + +8950,-4400 + + 600,-1600 + 650,-1600 + 650,- 500 + 600,- 500 + + 650,-1600 + 650,-1600 + 600,-1650 + 600,-1600 + + 650,- 500 + 600,- 500 + 650,-1600 + 650,-1600 + + 650,- 500 + 600,- 500 + 650,- 500 + 650,- 500 + + 600,- 500 + 650,- 500 + 600,- 500 + 650,-1600 + + 650,-1600 + 650,- 500 + 600,- 500 + 650,-1600 + + 650,-1600 + 650,-1600 + 600,-1600 + 650,- 500 + + 650,- 500 + 600,-1600 + 600,-1650 + 600,- 550 + + 600 +Duration=67850us + + +Protocol=NEC2 Address=0xF3, Command=0x98, Raw-Data=0x67980CF3, 32 bits, LSB first, Repeat, Gap=68750us, Duration=67850us +Send with: IrSender.sendNEC2(0xF3, 0x98, ); +rawData[68]: + -68750 + +8950,-4350 + + 650,-1600 + 650,-1600 + 650,- 500 + 600,- 500 + + 650,-1600 + 650,-1600 + 600,-1600 + 650,-1600 + + 650,- 500 + 600,- 500 + 650,-1600 + 650,-1600 + + 650,- 500 + 600,- 500 + 650,- 500 + 600,- 500 + + 650,- 500 + 650,- 500 + 600,- 500 + 650,-1600 + + 650,-1600 + 600,- 500 + 650,- 500 + 600,-1600 + + 650,-1600 + 650,-1600 + 650,-1600 + 650,- 500 + + 600,- 500 + 650,-1600 + 600,-1650 + 650,- 450 + + 650 +Duration=67850us + +Protocol=NEC2 Address=0xF3, Command=0x98, Raw-Data=0x67980CF3, 32 bits, LSB first, Repeat, Gap=69400us, Duration=67850us +Send with: IrSender.sendNEC2(0xF3, 0x98, ); +rawData[68]: + -69400 + +8950,-4400 + + 600,-1600 + 650,-1600 + 650,- 500 + 600,- 500 + + 650,-1600 + 650,-1600 + 650,-1600 + 600,-1600 + + 650,- 500 + 650,- 500 + 600,-1600 + 650,-1600 + + 650,- 500 + 600,- 500 + 650,- 500 + 650,- 500 + + 600,- 500 + 650,- 500 + 600,- 500 + 650,-1600 + + 650,-1600 + 650,- 500 + 600,- 500 + 650,-1600 + + 650,-1600 + 650,-1600 + 650,-1600 + 600,- 500 + + 650,- 500 + 600,-1600 + 650,-1600 + 650,- 500 + + 600 +Duration=67850us + + +Send NEC with 16 bit address +Protocol=NEC Address=0x1F3, Command=0x98, Raw-Data=0x679801F3, 32 bits, LSB first, Gap=765000us, Duration=66650us +Send with: IrSender.sendNEC(0x1F3, 0x98, ); +rawData[68]: + -765000 + +8950,-4400 + + 600,-1600 + 650,-1600 + 650,- 500 + 600,- 500 + + 650,-1600 + 650,-1600 + 650,-1600 + 600,-1600 + + 650,-1600 + 650,- 500 + 600,- 500 + 650,- 500 + + 600,- 500 + 650,- 500 + 650,- 450 + 650,- 500 + + 600,- 500 + 650,- 500 + 600,- 500 + 650,-1600 + + 650,-1600 + 600,- 500 + 650,- 500 + 650,-1600 + + 600,-1600 + 650,-1600 + 650,-1600 + 600,- 500 + + 650,- 500 + 650,-1600 + 600,-1650 + 600,- 500 + + 600 +Duration=66650us + + +Send NEC2 with 16 bit address +Protocol=NEC Address=0x1F3, Command=0x98, Raw-Data=0x679801F3, 32 bits, LSB first, Gap=764600us, Duration=66750us +Send with: IrSender.sendNEC(0x1F3, 0x98, ); +rawData[68]: + -764600 + +8950,-4400 + + 600,-1600 + 650,-1600 + 650,- 500 + 600,- 500 + + 650,-1600 + 650,-1600 + 650,-1600 + 650,-1600 + + 600,-1600 + 650,- 500 + 600,- 500 + 650,- 500 + + 600,- 500 + 650,- 500 + 650,- 500 + 600,- 500 + + 650,- 500 + 600,- 500 + 650,- 500 + 650,-1600 + + 600,-1600 + 650,- 500 + 650,- 500 + 600,-1600 + + 650,-1600 + 650,-1600 + 650,-1600 + 650,- 500 + + 600,- 500 + 650,-1600 + 650,-1600 + 650,- 450 + + 650 +Duration=66750us diff --git a/examples/UnitTest/UnitTest_64bit.log b/examples/UnitTest/UnitTest_64bit.log index 7def9abb..82e257d3 100644 --- a/examples/UnitTest/UnitTest_64bit.log +++ b/examples/UnitTest/UnitTest_64bit.log @@ -1,648 +1,735 @@ -START UnitTest.cpp from Feb 24 2023 -Using library version 4.1.0 -Ready to receive IR signals of protocols: NEC/NEC2/Onkyo/Apple, Panasonic/Kaseikyo, Denon/Sharp, Sony, RC5, RC6, LG, JVC, Samsung, Bang & Olufsen, FAST, Bosewave , MagiQuest, Universal Pulse Distance Width, Hash at pin 14 -Send IR signals at pin 12 -If you connect debug pin 13 to ground, raw data is always printed -Send signal mark duration for 38kHz is 8 us, pulse narrowing correction is 600 ns, total period is 26 us +START C:\Users\armin\AppData\Local\Temp\.arduinoIDE-unsaved2025614-8520-1rntouk.pt81h\UnitTest\UnitTest.ino from Jul 14 2025 +Using library version 4.4.2 +Ready to receive IR signals of protocols: NEC/NEC2/Onkyo/Apple, Panasonic/Kaseikyo, Denon/Sharp, Sony, RC5, RC6, LG, JVC, Samsung, Bang & Olufsen, FAST, Bosewave, MagiQuest, Universal Pulse Distance Width, Hash at pin 15 +Use ReceiveCompleteCallback +Receive buffer length is 750 +Send IR signals at pin 4 +If you connect debug pin 16 to ground, raw data is always printed 16000 us is the (minimum) gap, after which the start of a new IR packet is assumed -100 us are subtracted from all marks and added to all spaces for decoding +20 us are subtracted from all marks and added to all spaces for decoding address=0xFFF1 command=0x76 Send NEC with 8 bit address -Protocol=NEC Address=0xF1 Command=0x76 Raw-Data=0x89760EF1 32 bits LSB first +Protocol=NEC Address=0xF1 Command=0x76 Raw-Data=0x89760EF1 32 bits LSB first Gap=1047000us Duration=68250us Send with: IrSender.sendNEC(0xF1, 0x76, ); rawData[68]: - -1050650 + -1047000 +9050,-4450 - + 650,-1600 + 700,- 450 + 650,- 500 + 650,- 450 - + 700,-1600 + 650,-1600 + 650,-1600 + 650,-1600 - + 700,- 450 + 650,-1600 + 650,-1650 + 650,-1600 - + 650,- 450 + 700,- 450 + 650,- 500 + 650,- 450 - + 700,- 450 + 650,-1600 + 650,-1600 + 700,- 450 - + 650,-1600 + 650,-1600 + 700,-1600 + 650,- 450 - + 700,-1600 + 650,- 450 + 700,- 450 + 650,-1600 - + 650,- 500 + 650,- 450 + 700,- 450 + 650,-1600 - + 700 -Sum: 68500 + + 600,-1650 + 600,- 550 + 600,- 500 + 600,- 550 + + 600,-1650 + 600,-1650 + 600,-1650 + 600,-1650 + + 600,- 550 + 600,-1650 + 600,-1650 + 600,-1650 + + 600,- 500 + 650,- 500 + 600,- 550 + 600,- 500 + + 650,- 500 + 600,-1650 + 600,-1650 + 600,- 550 + + 600,-1650 + 600,-1650 + 600,-1650 + 600,- 500 + + 600,-1650 + 650,- 500 + 600,- 500 + 650,-1650 + + 600,- 500 + 600,- 550 + 600,- 550 + 600,-1650 + + 600 +Duration=68250us + Send NEC with 16 bit address -Protocol=NEC Address=0xFFF1 Command=0x76 Raw-Data=0x8976FFF1 32 bits LSB first +Protocol=NEC Address=0xFFF1 Command=0x76 Raw-Data=0x8976FFF1 32 bits LSB first Gap=1067700us Duration=73800us Send with: IrSender.sendNEC(0xFFF1, 0x76, ); rawData[68]: - -1060200 - +9050,-4400 - + 650,-1600 + 650,- 500 + 650,- 450 + 700,- 450 - + 650,-1600 + 650,-1600 + 700,-1600 + 650,-1600 - + 650,-1600 + 650,-1600 + 700,-1600 + 650,-1600 - + 650,-1600 + 650,-1600 + 700,-1600 + 650,-1600 - + 650,- 500 + 650,-1600 + 650,-1600 + 650,- 500 - + 650,-1600 + 650,-1600 + 650,-1650 + 650,- 450 - + 650,-1600 + 700,- 450 + 650,- 500 + 650,-1600 - + 650,- 500 + 650,- 450 + 650,- 500 + 650,-1600 - + 650 -Sum: 74050 + -1067700 + +9050,-4450 + + 550,-1650 + 650,- 500 + 600,- 550 + 600,- 500 + + 650,-1600 + 600,-1650 + 650,-1600 + 600,-1650 + + 650,-1600 + 600,-1650 + 650,-1600 + 600,-1650 + + 650,-1600 + 650,-1600 + 650,-1600 + 650,-1600 + + 650,- 500 + 600,-1650 + 600,-1650 + 600,- 550 + + 600,-1650 + 600,-1650 + 600,-1650 + 600,- 500 + + 650,-1650 + 550,- 550 + 600,- 550 + 600,-1650 + + 600,- 500 + 600,- 550 + 600,- 500 + 650,-1650 + + 600 +Duration=73800us + Send NEC2 with 16 bit address -Protocol=NEC Address=0xFFF1 Command=0x76 Raw-Data=0x8976FFF1 32 bits LSB first +Protocol=NEC Address=0xFFF1 Command=0x76 Raw-Data=0x8976FFF1 32 bits LSB first Gap=1067300us Duration=73750us Send with: IrSender.sendNEC(0xFFF1, 0x76, ); rawData[68]: - -1060450 - +9050,-4450 - + 650,-1600 + 650,- 500 + 650,- 450 + 650,- 500 - + 650,-1600 + 650,-1600 + 700,-1600 + 650,-1600 - + 650,-1600 + 650,-1600 + 700,-1600 + 650,-1600 - + 650,-1600 + 650,-1600 + 700,-1600 + 650,-1600 - + 650,- 500 + 650,-1600 + 650,-1600 + 650,- 500 - + 650,-1600 + 650,-1600 + 700,-1600 + 650,- 500 - + 650,-1600 + 650,- 500 + 650,- 500 + 650,-1600 - + 650,- 450 + 700,- 450 + 650,- 500 + 650,-1600 - + 650 -Sum: 74150 + -1067300 + +9000,-4450 + + 600,-1650 + 650,- 500 + 600,- 500 + 600,- 550 + + 600,-1650 + 600,-1650 + 600,-1650 + 600,-1650 + + 600,-1650 + 600,-1650 + 600,-1650 + 600,-1650 + + 600,-1650 + 650,-1600 + 600,-1650 + 600,-1650 + + 600,- 550 + 650,-1600 + 600,-1650 + 600,- 500 + + 650,-1650 + 550,-1650 + 650,-1650 + 550,- 550 + + 600,-1650 + 600,- 550 + 600,- 500 + 650,-1600 + + 650,- 500 + 600,- 550 + 650,- 450 + 650,-1650 + + 550 +Duration=73750us + Send NEC Pronto data with 8 bit address 0x80 and command 0x45 and no repeats -Protocol=NEC Address=0x80 Command=0x45 Raw-Data=0xBA457F80 32 bits LSB first +Protocol=NEC Address=0x80 Command=0x45 Raw-Data=0xBA457F80 32 bits LSB first Gap=1071500us Duration=68500us Send with: IrSender.sendNEC(0x80, 0x45, ); rawData[68]: - -1065600 - +9200,-4400 - + 700,- 450 + 700,- 450 + 700,- 500 + 650,- 500 - + 700,- 500 + 650,- 500 + 650,- 550 + 700,-1550 - + 700,-1550 + 700,-1550 + 700,-1550 + 650,-1550 - + 700,-1550 + 700,-1550 + 700,-1550 + 700,- 450 - + 700,-1550 + 650,- 500 + 650,-1600 + 700,- 450 - + 700,- 450 + 700,- 450 + 700,-1550 + 700,- 450 - + 750,- 450 + 700,-1500 + 700,- 450 + 700,-1550 - + 700,-1550 + 700,-1550 + 700,- 450 + 700,-1550 + -1071500 + +9100,-4450 + + 600,- 550 + 650,- 500 + 650,- 550 + 600,- 550 + + 650,- 500 + 650,- 550 + 600,- 550 + 600,-1600 + + 650,-1600 + 700,-1550 + 650,-1600 + 550,-1600 + + 700,-1550 + 650,-1600 + 650,-1600 + 600,- 550 + + 650,-1550 + 650,- 500 + 650,-1600 + 650,- 500 + + 700,- 450 + 650,- 500 + 650,-1600 + 650,- 550 + + 650,- 450 + 700,-1550 + 650,- 500 + 650,-1600 + + 650,-1600 + 650,-1550 + 650,- 500 + 700,-1550 + 700 -Sum: 68800 +Duration=68500us + Send NEC sendRaw data with 8 bit address=0xFB04 and command 0x08 and exact timing (16 bit array format) -Protocol=NEC Address=0x4 Command=0x8 Raw-Data=0xF708FB04 32 bits LSB first +Protocol=NEC Address=0x4 Command=0x8 Raw-Data=0xF708FB04 32 bits LSB first Gap=1073650us Duration=68450us Send with: IrSender.sendNEC(0x4, 0x8, ); rawData[68]: - -1066550 - +9150,-4400 - + 650,- 500 + 650,- 450 + 700,-1600 + 650,- 450 - + 700,- 450 + 650,- 500 + 650,- 450 + 650,- 500 - + 650,-1600 + 700,-1600 + 650,- 450 + 700,-1600 - + 650,-1600 + 700,-1600 + 650,-1600 + 650,-1650 - + 650,- 450 + 700,- 450 + 650,- 500 + 650,-1600 - + 650,- 500 + 650,- 450 + 700,- 450 + 650,- 500 - + 650,-1600 + 650,-1600 + 700,-1600 + 650,- 500 - + 650,-1600 + 650,-1600 + 700,-1600 + 650,-1600 - + 700 -Sum: 68700 + -1073650 + +9050,-4450 + + 600,- 550 + 600,- 500 + 650,-1600 + 650,- 500 + + 600,- 550 + 600,- 550 + 600,- 550 + 550,- 550 + + 600,-1650 + 600,-1700 + 600,- 500 + 600,-1650 + + 600,-1650 + 650,-1650 + 600,-1650 + 600,-1650 + + 600,- 550 + 600,- 550 + 600,- 500 + 600,-1700 + + 600,- 500 + 600,- 550 + 600,- 550 + 600,- 500 + + 650,-1650 + 600,-1650 + 600,-1650 + 650,- 500 + + 600,-1650 + 600,-1650 + 650,-1600 + 650,-1650 + + 600 +Duration=68450us + Send ONKYO with 16 bit address 0x0102 and 16 bit command 0x0304 with NECRaw(0x03040102) -Protocol=Onkyo Address=0x102 Command=0x304 Raw-Data=0x3040102 32 bits LSB first +Protocol=Onkyo Address=0x102 Command=0x304 Raw-Data=0x3040102 32 bits LSB first Gap=1072150us Duration=55900us Send with: IrSender.sendOnkyo(0x102, 0x304, ); rawData[68]: - -1064800 - +9050,-4450 - + 650,- 450 + 650,-1600 + 700,- 450 + 650,- 500 - + 650,- 450 + 650,- 500 + 650,- 500 + 650,- 450 - + 650,-1600 + 700,- 450 + 700,- 450 + 650,- 500 - + 650,- 450 + 650,- 500 + 650,- 450 + 700,- 450 - + 650,- 500 + 650,- 450 + 700,-1600 + 650,- 450 - + 650,- 500 + 650,- 450 + 650,- 500 + 650,- 500 - + 650,-1600 + 650,-1600 + 650,- 500 + 650,- 450 - + 650,- 550 + 650,- 500 + 600,- 500 + 650,- 500 - + 650 -Sum: 56050 + -1072150 + +9050,-4400 + + 600,- 550 + 600,-1650 + 650,- 450 + 650,- 500 + + 600,- 550 + 600,- 500 + 650,- 500 + 600,- 500 + + 650,-1650 + 600,- 500 + 650,- 500 + 600,- 550 + + 600,- 500 + 650,- 500 + 600,- 500 + 650,- 500 + + 600,- 550 + 600,- 550 + 600,-1650 + 600,- 500 + + 650,- 500 + 600,- 550 + 600,- 500 + 650,- 500 + + 600,-1650 + 600,-1650 + 600,- 550 + 600,- 550 + + 550,- 550 + 600,- 550 + 600,- 500 + 600,- 550 + + 600 +Duration=55900us + Send ONKYO with 16 bit address 0x0102 and command 0x34 with old 32 bit format MSB first (0x40802CD3) -Protocol=NEC Address=0x102 Command=0x34 Raw-Data=0xCB340102 32 bits LSB first +Protocol=NEC Address=0x102 Command=0x34 Raw-Data=0xCB340102 32 bits LSB first Gap=1074200us Duration=61500us Send with: IrSender.sendNEC(0x102, 0x34, ); rawData[68]: - -1066900 - +9050,-4400 - + 650,- 500 + 650,-1600 + 650,- 500 + 650,- 450 - + 650,- 500 + 650,- 450 + 700,- 450 + 650,- 500 - + 650,-1600 + 650,- 500 + 650,- 450 + 650,- 550 - + 650,- 450 + 700,- 450 + 650,- 500 + 650,- 450 - + 650,- 500 + 650,- 450 + 700,-1600 + 650,- 450 - + 700,-1600 + 650,-1600 + 650,- 500 + 650,- 450 - + 650,-1600 + 700,-1600 + 600,- 500 + 650,-1650 - + 650,- 450 + 700,- 450 + 650,-1600 + 650,-1600 - + 700 -Sum: 61700 + -1074200 + +9050,-4450 + + 600,- 500 + 600,-1650 + 600,- 550 + 600,- 500 + + 600,- 550 + 600,- 550 + 600,- 500 + 650,- 500 + + 600,-1650 + 600,- 550 + 600,- 500 + 650,- 500 + + 600,- 550 + 600,- 500 + 650,- 500 + 600,- 550 + + 600,- 500 + 650,- 500 + 600,-1650 + 600,- 550 + + 600,-1650 + 600,-1650 + 600,- 500 + 650,- 500 + + 600,-1650 + 600,-1650 + 600,- 550 + 600,-1650 + + 600,- 500 + 600,- 550 + 600,-1650 + 650,-1600 + + 600 +Duration=61500us + -Send Panasonic 0xB, 0x10 as 48 bit generic PulseDistance using ProtocolConstants -Protocol=Panasonic Address=0x10B Command=0xA0 Raw-Data=0xA010B02002 48 bits LSB first +Send Panasonic 0xB, 0x10 as 48 bit PulseDistance PGM using ProtocolConstants 1=432|1296, 0=432|432 +Protocol=Panasonic Address=0x10B Command=0xA0 Raw-Data=0xA010B02002 48 bits LSB first Gap=1073350us Duration=54650us Send with: IrSender.sendPanasonic(0x10B, 0xA0, ); rawData[100]: - -1064700 + -1073350 +3550,-1650 - + 550,- 350 + 500,-1250 + 500,- 400 + 500,- 350 - + 500,- 400 + 500,- 350 + 500,- 400 + 500,- 350 - + 500,- 400 + 500,- 350 + 500,- 400 + 500,- 350 - + 500,- 400 + 450,-1300 + 500,- 350 + 500,- 400 - + 500,- 350 + 500,- 400 + 500,- 350 + 500,- 400 - + 500,-1250 + 500,-1250 + 500,- 350 + 500,-1250 - + 500,- 400 + 500,- 350 + 500,- 400 + 500,- 350 - + 500,-1250 + 500,- 400 + 500,- 350 + 500,- 400 - + 500,- 350 + 550,- 350 + 500,- 350 + 550,- 350 - + 500,- 350 + 500,-1250 + 500,- 400 + 500,-1250 - + 500,- 350 + 550,- 350 + 500,- 350 + 550,- 350 - + 500,- 350 + 550,- 350 + 500,- 400 + 500,- 350 - + 500 -Sum: 54750 + + 500,- 400 + 450,-1250 + 500,- 400 + 450,- 450 + + 450,- 400 + 500,- 400 + 450,- 400 + 450,- 450 + + 450,- 400 + 500,- 400 + 500,- 350 + 500,- 400 + + 450,- 400 + 500,-1250 + 500,- 350 + 500,- 400 + + 500,- 400 + 500,- 350 + 500,- 400 + 450,- 400 + + 500,-1250 + 500,-1250 + 500,- 400 + 450,-1250 + + 500,- 400 + 500,- 350 + 500,- 400 + 450,- 400 + + 500,-1250 + 450,- 450 + 450,- 400 + 500,- 350 + + 500,- 400 + 450,- 450 + 450,- 400 + 500,- 400 + + 450,- 400 + 450,-1300 + 450,- 400 + 500,-1250 + + 500,- 400 + 450,- 400 + 500,- 400 + 450,- 450 + + 450,- 400 + 500,- 400 + 450,- 400 + 450,- 450 + + 450 +Duration=54650us + -Send Panasonic 0xB, 0x10 as generic 48 bit PulseDistance - LSB first -Protocol=Panasonic Address=0x10B Command=0xA0 Raw-Data=0xA010B02002 48 bits LSB first +Send Panasonic 0xB, 0x10 as 48 bit PulseDistance PGM 1=450|1250, 0=450|400 +-LSB first +Protocol=Panasonic Address=0x10B Command=0xA0 Raw-Data=0xA010B02002 48 bits LSB first Gap=1092300us Duration=53850us Send with: IrSender.sendPanasonic(0x10B, 0xA0, ); rawData[100]: - -1082450 - +3550,-1600 - + 550,- 350 + 550,-1150 + 550,- 300 + 600,- 300 - + 550,- 300 + 550,- 300 + 600,- 300 + 550,- 300 - + 550,- 300 + 550,- 350 + 550,- 300 + 550,- 350 - + 550,- 300 + 550,-1200 + 550,- 300 + 550,- 300 - + 550,- 350 + 550,- 300 + 550,- 300 + 550,- 350 - + 550,-1150 + 550,-1200 + 550,- 300 + 550,-1200 - + 550,- 300 + 550,- 300 + 550,- 300 + 600,- 300 - + 550,-1150 + 600,- 300 + 550,- 300 + 550,- 300 - + 550,- 350 + 550,- 300 + 550,- 350 + 550,- 300 - + 550,- 300 + 550,-1200 + 550,- 300 + 550,-1200 - + 550,- 300 + 550,- 300 + 600,- 300 + 550,- 300 - + 550,- 300 + 600,- 300 + 550,- 300 + 550,- 300 - + 550 -Sum: 54200 + -1092300 + +3500,-1700 + + 500,- 350 + 500,-1200 + 500,- 350 + 500,- 400 + + 450,- 350 + 550,- 350 + 500,- 350 + 500,- 400 + + 450,- 400 + 500,- 350 + 500,- 350 + 500,- 400 + + 450,- 350 + 550,-1200 + 500,- 350 + 500,- 350 + + 500,- 400 + 450,- 400 + 500,- 250 + 600,- 350 + + 500,-1200 + 550,-1200 + 450,- 350 + 550,-1200 + + 500,- 400 + 450,- 400 + 500,- 350 + 500,- 350 + + 500,-1200 + 500,- 400 + 450,- 400 + 500,- 350 + + 500,- 350 + 500,- 400 + 450,- 400 + 500,- 350 + + 500,- 350 + 500,-1200 + 500,- 400 + 500,-1200 + + 500,- 350 + 500,- 350 + 550,- 350 + 450,- 400 + + 500,- 350 + 500,- 350 + 500,- 400 + 450,- 400 + + 500 +Duration=53850us - MSB first -Protocol=Panasonic Address=0xB Command=0x10 Raw-Data=0xA01000B02002 48 bits LSB first + +-MSB first +Protocol=Panasonic Address=0xB Command=0x10 Raw-Data=0xA01000B02002 48 bits LSB first Gap=1084600us Duration=53850us Send with: IrSender.sendPanasonic(0xB, 0x10, ); rawData[100]: - -1076300 - +3550,-1600 - + 550,- 350 + 550,-1150 + 550,- 300 + 600,- 300 - + 550,- 300 + 600,- 300 + 550,- 300 + 550,- 300 - + 600,- 300 + 550,- 300 + 550,- 300 + 600,- 300 - + 550,- 300 + 550,-1200 + 550,- 300 + 550,- 300 - + 550,- 350 + 550,- 300 + 550,- 300 + 550,- 350 - + 550,-1150 + 550,-1200 + 550,- 300 + 550,-1200 - + 550,- 300 + 550,- 300 + 550,- 350 + 550,- 300 - + 550,- 350 + 550,- 350 + 550,- 300 + 550,- 300 - + 550,- 350 + 550,- 300 + 550,- 300 + 550,- 350 - + 550,-1150 + 550,- 300 + 600,- 300 + 550,- 300 - + 550,- 300 + 600,- 300 + 550,- 300 + 550,- 300 - + 600,- 300 + 550,-1150 + 550,- 350 + 550,-1150 - + 550 -Sum: 54250 + -1084600 + +3500,-1650 + + 500,- 350 + 550,-1200 + 450,- 400 + 500,- 350 + + 500,- 350 + 550,- 350 + 450,- 400 + 500,- 350 + + 500,- 350 + 500,- 400 + 450,- 400 + 500,- 350 + + 500,- 350 + 500,-1200 + 550,- 350 + 450,- 400 + + 500,- 350 + 500,- 350 + 550,- 350 + 450,- 400 + + 500,-1200 + 500,-1200 + 500,- 400 + 500,-1200 + + 500,- 350 + 500,- 350 + 500,- 400 + 450,- 400 + + 500,- 350 + 500,- 350 + 500,- 350 + 500,- 400 + + 500,- 350 + 500,- 350 + 500,- 350 + 550,- 350 + + 500,-1200 + 500,- 350 + 500,- 350 + 500,- 400 + + 450,- 400 + 500,- 350 + 550,- 300 + 500,- 400 + + 450,- 400 + 500,-1200 + 500,- 350 + 500,-1250 + + 500 +Duration=53850us -Send generic 72 bit PulseDistance 0x5A AFEDCBA9 87654321 LSB first -Protocol=PulseDistance Raw-Data=0x5A 72 bits LSB first -Send with: + +Send 72 bit PulseDistance 0x5A AFEDCBA9 87654321 LSB first 1=550|1700, 0=550|600 +Protocol=PulseDistance Raw-Data=0x5A 72 bits LSB first Gap=1091200us Duration=139400us +Send on a 32 bit platform with: uint64_t tRawData[]={0xAFEDCBA987654321, 0x5A}; - IrSender.sendPulseDistanceWidthFromArray(38, 9000, 4350, 650, 1600, 650, 500, &tRawData[0], 72, PROTOCOL_IS_LSB_FIRST, , ); + IrSender.sendPulseDistanceWidthFromArray(38, 8950, 4450, 600, 1650, 600, 550, &tRawData[0], 72, PROTOCOL_IS_LSB_FIRST, , ); rawData[148]: - -1082050 - +9000,-4350 - + 700,-1600 + 650,- 500 + 700,- 500 + 650,- 500 - + 650,- 550 + 650,-1600 + 650,- 550 + 650,- 500 - + 700,-1600 + 650,-1650 + 650,- 500 + 650,- 500 - + 700,- 500 + 650,- 500 + 650,-1650 + 650,- 500 - + 650,-1650 + 650,- 500 + 650,-1650 + 650,- 500 - + 650,- 550 + 650,-1600 + 650,-1650 + 650,- 500 - + 650,-1650 + 650,-1600 + 700,-1600 + 650,- 500 - + 700,- 500 + 650,- 500 + 700,- 500 + 650,-1600 - + 700,-1600 + 650,- 500 + 700,- 500 + 650,-1600 - + 700,- 500 + 650,-1650 + 600,- 550 + 700,-1600 - + 650,-1650 + 650,-1600 + 650,- 550 + 650,-1600 - + 700,- 500 + 650,- 500 + 650,-1650 + 650,-1600 - + 650,-1650 + 650,- 500 + 700,-1600 + 650,-1650 - + 650,- 500 + 650,-1650 + 650,-1600 + 700,-1600 - + 650,-1650 + 650,-1600 + 700,-1600 + 650,-1650 - + 650,- 500 + 650,-1650 + 650,- 500 + 700,-1600 - + 650,- 500 + 700,-1600 + 650,- 550 + 650,-1600 - + 650,-1650 + 650,- 500 + 650,-1650 + 650,- 500 + -1091200 + +8950,-4450 + + 550,-1700 + 600,- 550 + 600,- 550 + 600,- 550 + + 600,- 600 + 600,-1650 + 600,- 550 + 600,- 600 + + 550,-1650 + 650,-1650 + 550,- 600 + 600,- 550 + + 600,- 600 + 550,- 600 + 600,-1650 + 600,- 550 + + 600,-1650 + 600,- 600 + 550,-1700 + 600,- 550 + + 600,- 600 + 600,-1600 + 650,-1650 + 600,- 550 + + 600,-1700 + 550,-1650 + 650,-1650 + 550,- 600 + + 650,- 500 + 600,- 600 + 550,- 600 + 600,-1650 + + 600,-1650 + 650,- 500 + 600,- 600 + 600,-1650 + + 600,- 550 + 600,-1650 + 600,- 550 + 650,-1650 + + 600,-1650 + 650,-1600 + 600,- 600 + 600,-1650 + + 550,- 600 + 600,- 550 + 600,-1700 + 550,-1700 + + 600,-1650 + 600,- 550 + 600,-1700 + 550,-1700 + + 600,- 550 + 600,-1650 + 600,-1650 + 600,-1700 + + 600,-1650 + 600,-1650 + 600,-1700 + 550,-1700 + + 600,- 550 + 600,-1650 + 600,- 550 + 600,-1700 + + 550,- 600 + 600,-1650 + 600,- 550 + 600,-1650 + + 600,-1700 + 550,- 600 + 600,-1650 + 600,- 550 + + 600 +Duration=139400us + + +Send 52 bit PulseDistanceWidth 0xDCBA9 87654321 LSB first 1=300|600, 0=600|300 +Protocol=PulseDistance Raw-Data=0xDCBA987654321 52 bits LSB first Gap=1134450us Duration=48650us +Send on a 32 bit platform with: IrSender.sendPulseDistanceWidth(38, 350, 550, 350, 550, 650, 200, 0xDCBA987654321, 52, PROTOCOL_IS_LSB_FIRST, , ); +rawData[108]: + -1134450 + + 350,- 550 + + 350,- 550 + 650,- 200 + 700,- 250 + 700,- 200 + + 700,- 250 + 350,- 550 + 650,- 200 + 700,- 250 + + 400,- 550 + 350,- 550 + 650,- 250 + 650,- 250 + + 700,- 200 + 700,- 250 + 350,- 600 + 650,- 150 + + 450,- 550 + 650,- 250 + 350,- 550 + 650,- 250 + + 700,- 150 + 450,- 550 + 350,- 550 + 650,- 250 + + 350,- 600 + 350,- 550 + 350,- 600 + 600,- 200 + + 700,- 250 + 700,- 200 + 700,- 200 + 400,- 600 + + 300,- 550 + 650,- 250 + 700,- 250 + 350,- 550 + + 650,- 250 + 400,- 550 + 650,- 200 + 450,- 500 + + 350,- 600 + 300,- 600 + 650,- 200 + 400,- 600 + + 600,- 200 + 700,- 250 + 350,- 600 + 350,- 550 + + 350,- 600 + 600,- 200 + 450,- 550 + 350,- 550 + + 350 +Duration=48650us + + +Send 52 bit PulseDistanceWidth 0xDCBA9 87654321 LSB first with inverse timing and data 1=600|300, 0=300|600 +Protocol=PulseDistance Raw-Data=0xDCBA987654321 52 bits LSB first Gap=1104850us Duration=48950us +Send on a 32 bit platform with: IrSender.sendPulseDistanceWidth(38, 300, 600, 350, 550, 650, 200, 0xDCBA987654321, 52, PROTOCOL_IS_LSB_FIRST, , ); +rawData[108]: + -1104850 + + 300,- 600 + + 350,- 550 + 650,- 250 + 650,- 200 + 750,- 200 + + 700,- 250 + 350,- 550 + 650,- 250 + 700,- 150 + + 450,- 550 + 350,- 550 + 650,- 200 + 700,- 250 + + 700,- 250 + 650,- 200 + 400,- 550 + 650,- 250 + + 400,- 550 + 650,- 250 + 350,- 600 + 600,- 200 + + 750,- 200 + 400,- 550 + 350,- 550 + 650,- 250 + + 350,- 550 + 400,- 550 + 350,- 550 + 700,- 150 + + 700,- 250 + 700,- 250 + 650,- 200 + 400,- 550 + + 350,- 600 + 650,- 200 + 700,- 250 + 350,- 600 + + 600,- 200 + 400,- 600 + 650,- 250 + 350,- 550 + + 350,- 600 + 300,- 550 + 650,- 250 + 400,- 550 + + 650,- 200 + 700,- 250 + 400,- 550 + 350,- 550 + + 350,- 550 + 650,- 250 + 350,- 600 + 350,- 550 + 650 -Sum: 140550 - -Send generic 52 bit PulseDistanceWidth 0xDCBA9 87654321 LSB first -Protocol=PulseWidth Raw-Data=0xDCBA987654321 52 bits LSB first -Send with: IrSender.sendPulseDistanceWidth(38, 400, 550, 750, 150, 400, 500, 0xDCBA987654321, 52, PROTOCOL_IS_LSB_FIRST, , ); -rawData[106]: - -1120100 - + 400,- 550 - + 700,- 150 + 450,- 500 + 400,- 550 + 400,- 500 - + 400,- 500 + 700,- 150 + 450,- 550 + 400,- 500 - + 700,- 150 + 800,- 150 + 450,- 500 + 400,- 500 - + 400,- 550 + 350,- 550 + 700,- 200 + 400,- 550 - + 700,- 200 + 400,- 500 + 750,- 200 + 400,- 500 - + 400,- 550 + 700,- 150 + 750,- 200 + 450,- 500 - + 700,- 150 + 750,- 200 + 750,- 150 + 450,- 500 - + 400,- 550 + 400,- 500 + 400,- 500 + 700,- 150 - + 800,- 150 + 450,- 500 + 400,- 500 + 750,- 150 - + 450,- 500 + 700,- 200 + 450,- 500 + 700,- 250 - + 700,- 150 + 800,- 150 + 450,- 500 + 700,- 200 - + 450,- 500 + 400,- 500 + 700,- 200 + 750,- 150 - + 750,- 150 + 450,- 550 + 700,- 200 + 700 -Sum: 48450 - -Send generic 32 bit PulseWidth 0x87654321 LSB first -Protocol=PulseWidth Raw-Data=0x87654321 32 bits LSB first -Send with: IrSender.sendPulseDistanceWidth(38, 1100, 400, 750, 200, 450, 200, 0x87654321, 32, PROTOCOL_IS_LSB_FIRST, , ); +Duration=48950us + + +Send 7 bit ASCII character with PulseDistanceWidth LSB first 1=500|1500, 0=1500|500 +Protocol=PulseDistance Raw-Data=0x76 7 bits LSB first Gap=1102950us Duration=21150us +Send on a 32 bit platform with: IrSender.sendPulseDistanceWidth(38, 6050, 500, 500, 1500, 1550, 500, 0x76, 7, PROTOCOL_IS_LSB_FIRST, , ); +rawData[18]: + -1102950 + +6050,- 500 + +1500,- 500 + 500,-1500 + 550,-1450 +1550,- 500 + + 500,-1500 + 500,-1500 + 550,-1450 + 550 +Duration=21150us + + +Send Sony12 as PulseWidth LSB first 1=1200|300, 0=600|600 +Protocol=Sony Address=0x11 Command=0x76 Raw-Data=0x8F6 12 bits LSB first Gap=1053600us Duration=21200us +Send with: IrSender.sendSony(0x11, 0x76, 2, 12); +rawData[26]: + -1053600 + +2450,- 600 + + 650,- 550 +1250,- 550 +1250,- 600 + 600,- 600 + +1200,- 600 +1250,- 550 +1250,- 550 +1300,- 500 + + 650,- 600 + 650,- 550 + 650,- 550 +1250 +Duration=21200us + + +Send 32 bit PulseWidth 0x87654321 LSB first 1=600|300, 0=300|300 +Protocol=PulseWidth Raw-Data=0x87654321 32 bits LSB first Gap=1048400us Duration=24750us +Send on a 32 bit platform with: IrSender.sendPulseDistanceWidth(38, 1100, 450, 700, 200, 400, 200, 0x87654321, 32, PROTOCOL_IS_LSB_FIRST, , ); rawData[66]: - -1090450 - +1100,- 400 - + 700,- 150 + 450,- 200 + 450,- 150 + 450,- 200 - + 400,- 200 + 750,- 150 + 450,- 150 + 450,- 200 - + 700,- 200 + 750,- 200 + 400,- 200 + 400,- 200 - + 450,- 150 + 450,- 150 + 750,- 150 + 450,- 200 - + 750,- 200 + 400,- 200 + 750,- 150 + 450,- 150 - + 450,- 200 + 700,- 200 + 750,- 200 + 400,- 200 - + 750,- 150 + 750,- 200 + 700,- 200 + 450,- 150 - + 450,- 200 + 400,- 200 + 450,- 150 + 750 -Sum: 24900 - -Send MagiQuest 0x6BCDFF00, 0x176 as generic 55 bit PulseDistanceWidth MSB first -Protocol=MagiQuest Address=0xFF00 Command=0x176 Raw-Data=0x6BCDFF00 56 bits MSB first + -1048400 + +1100,- 450 + + 650,- 200 + 400,- 250 + 350,- 250 + 400,- 150 + + 450,- 200 + 700,- 200 + 400,- 200 + 450,- 200 + + 700,- 150 + 750,- 250 + 350,- 200 + 400,- 200 + + 400,- 250 + 400,- 200 + 700,- 200 + 450,- 200 + + 650,- 200 + 450,- 250 + 650,- 200 + 400,- 250 + + 400,- 200 + 700,- 150 + 750,- 200 + 400,- 250 + + 700,- 150 + 700,- 250 + 700,- 250 + 350,- 250 + + 400,- 200 + 400,- 200 + 400,- 250 + 650 +Duration=24750us + + +Send MagiQuest 0x6BCDFF00, 0x176 as 55 bit PulseDistanceWidth MSB first 1=576|576, 0=287|864 +Protocol=MagiQuest Address=0xFF00 Command=0x176 Raw-Data=0x6BCDFF00 56 bits MSB first Gap=1090700us Duration=64700us Send with: IrSender.sendMagiQuest(0x6BCDFF00, 0x176, ); rawData[112]: - -1070250 - + 400,- 800 + 400,- 750 + 450,- 800 + 400,- 750 - + 400,- 800 + 400,- 750 + 400,- 800 + 400,- 750 - + 700,- 500 + 650,- 500 + 400,- 800 + 650,- 500 - + 400,- 800 + 650,- 500 + 700,- 500 + 650,- 500 - + 700,- 450 + 450,- 750 + 400,- 750 + 700,- 500 - + 700,- 450 + 400,- 800 + 700,- 450 + 700,- 500 - + 700,- 500 + 650,- 500 + 700,- 450 + 700,- 500 - + 700,- 450 + 700,- 500 + 700,- 450 + 400,- 800 - + 350,- 800 + 400,- 800 + 400,- 750 + 400,- 800 - + 400,- 750 + 400,- 800 + 400,- 750 + 700,- 450 - + 450,- 750 + 700,- 450 + 700,- 500 + 700,- 450 - + 400,- 800 + 650,- 500 + 700,- 500 + 400,- 750 - + 400,- 800 + 400,- 750 + 450,- 750 + 700,- 450 - + 700,- 500 + 400,- 750 + 400,- 800 + 700 -Sum: 65350 + -1090700 + + 300,- 850 + 350,- 800 + 350,- 800 + 350,- 850 + + 350,- 800 + 350,- 800 + 350,- 850 + 350,- 800 + + 650,- 500 + 650,- 550 + 300,- 850 + 650,- 500 + + 300,- 900 + 600,- 550 + 600,- 550 + 650,- 550 + + 600,- 550 + 300,- 850 + 350,- 850 + 600,- 550 + + 600,- 550 + 350,- 800 + 650,- 550 + 600,- 550 + + 650,- 500 + 650,- 550 + 600,- 550 + 600,- 550 + + 650,- 550 + 600,- 550 + 600,- 550 + 350,- 850 + + 300,- 850 + 300,- 850 + 350,- 850 + 300,- 850 + + 300,- 850 + 300,- 850 + 350,- 800 + 650,- 550 + + 300,- 850 + 600,- 550 + 650,- 550 + 600,- 550 + + 350,- 800 + 650,- 550 + 600,- 550 + 350,- 800 + + 350,- 850 + 300,- 850 + 350,- 800 + 650,- 500 + + 650,- 550 + 300,- 850 + 350,- 800 + 650 +Duration=64700us + Send Onkyo (NEC with 16 bit command) -Protocol=Onkyo Address=0xFFF1 Command=0x7776 Raw-Data=0x7776FFF1 32 bits LSB first +Protocol=Onkyo Address=0xFFF1 Command=0x7776 Raw-Data=0x7776FFF1 32 bits LSB first Gap=1113450us Duration=77150us Send with: IrSender.sendOnkyo(0xFFF1, 0x7776, ); rawData[68]: - -1086400 - +9050,-4400 - + 700,-1600 + 650,- 450 + 700,- 450 + 650,- 500 - + 650,-1600 + 650,-1600 + 650,-1600 + 700,-1600 - + 650,-1600 + 650,-1600 + 650,-1600 + 700,-1600 - + 650,-1600 + 650,-1600 + 650,-1600 + 700,-1600 - + 650,- 450 + 700,-1600 + 650,-1600 + 650,- 500 - + 650,-1600 + 650,-1600 + 650,-1600 + 700,- 450 - + 650,-1600 + 650,-1600 + 700,-1600 + 650,- 450 - + 700,-1600 + 650,-1600 + 650,-1600 + 650,- 500 + -1113450 + +9000,-4450 + + 650,-1600 + 600,- 550 + 600,- 500 + 650,- 500 + + 600,-1650 + 600,-1650 + 600,-1650 + 600,-1650 + + 600,-1650 + 600,-1650 + 600,-1650 + 600,-1650 + + 600,-1650 + 600,-1650 + 600,-1650 + 650,-1600 + + 600,- 550 + 600,-1650 + 600,-1650 + 600,- 500 + + 650,-1600 + 600,-1650 + 650,-1600 + 650,- 500 + + 600,-1650 + 600,-1650 + 600,-1650 + 600,- 550 + + 600,-1650 + 600,-1650 + 600,-1650 + 600,- 500 + 650 -Sum: 77500 +Duration=77150us + Send Apple -Protocol=Apple Address=0xF1 Command=0x76 Raw-Data=0xF17687EE 32 bits LSB first +Protocol=Apple Address=0xF1 Command=0x76 Raw-Data=0xF17687EE 32 bits LSB first Gap=1065600us Duration=72650us Send with: IrSender.sendApple(0xF1, 0x76, ); rawData[68]: - -1059500 - +9050,-4400 - + 700,- 500 + 650,-1600 + 700,-1600 + 650,-1600 - + 650,- 500 + 650,-1600 + 650,-1600 + 650,-1600 - + 700,-1600 + 650,-1600 + 650,-1600 + 650,- 500 - + 650,- 450 + 700,- 450 + 700,- 450 + 650,-1600 - + 650,- 500 + 650,-1600 + 650,-1600 + 700,- 450 - + 650,-1600 + 650,-1600 + 700,-1600 + 650,- 450 - + 700,-1600 + 650,- 450 + 650,- 500 + 650,- 500 - + 650,-1600 + 650,-1600 + 650,-1600 + 700,-1600 + -1065600 + +9000,-4450 + + 600,- 550 + 600,-1650 + 600,-1650 + 600,-1650 + + 650,- 450 + 600,-1650 + 650,-1600 + 600,-1700 + + 550,-1650 + 600,-1700 + 600,-1600 + 650,- 500 + + 600,- 550 + 600,- 500 + 650,- 500 + 600,-1650 + + 600,- 550 + 600,-1650 + 600,-1650 + 600,- 500 + + 650,-1650 + 550,-1650 + 650,-1650 + 550,- 550 + + 600,-1650 + 600,- 550 + 600,- 500 + 650,- 500 + + 600,-1650 + 600,-1650 + 600,-1650 + 600,-1650 + 600 -Sum: 73000 +Duration=72650us + Send Panasonic -Protocol=Panasonic Address=0xFF1 Command=0x76 Raw-Data=0x9976FF102002 48 bits LSB first +Protocol=Panasonic Address=0xFF1 Command=0x76 Raw-Data=0x9976FF102002 48 bits LSB first Gap=1065700us Duration=65000us Send with: IrSender.sendPanasonic(0xFF1, 0x76, ); rawData[100]: - -1059200 + -1065700 +3500,-1700 - + 500,- 350 + 500,-1250 + 500,- 400 + 500,- 350 - + 500,- 400 + 500,- 350 + 500,- 400 + 500,- 350 - + 500,- 400 + 500,- 350 + 500,- 400 + 500,- 350 - + 500,- 400 + 500,-1250 + 500,- 350 + 500,- 400 - + 500,- 350 + 500,- 400 + 450,- 400 + 500,- 400 - + 500,-1250 + 500,- 350 + 500,- 400 + 450,- 400 - + 500,-1250 + 500,-1250 + 500,-1250 + 500,-1250 - + 500,-1250 + 500,-1250 + 500,-1250 + 500,-1250 - + 500,- 400 + 500,-1250 + 500,-1250 + 500,- 350 - + 500,-1250 + 500,-1250 + 500,-1250 + 500,- 400 - + 500,-1250 + 500,- 350 + 500,- 400 + 500,-1250 - + 500,-1250 + 500,- 400 + 500,- 350 + 500,-1250 - + 500 -Sum: 65200 + + 500,- 400 + 450,-1250 + 500,- 400 + 500,- 400 + + 450,- 400 + 500,- 400 + 450,- 400 + 500,- 400 + + 450,- 400 + 500,- 400 + 450,- 400 + 550,- 350 + + 450,- 400 + 500,-1250 + 450,- 450 + 450,- 400 + + 500,- 350 + 500,- 400 + 500,- 400 + 450,- 400 + + 500,-1250 + 500,- 400 + 450,- 400 + 500,- 350 + + 500,-1250 + 500,-1250 + 500,-1250 + 450,-1300 + + 450,-1300 + 450,-1250 + 500,-1250 + 500,-1250 + + 450,- 450 + 450,-1250 + 500,-1250 + 500,- 350 + + 500,-1250 + 500,-1250 + 500,-1250 + 450,- 450 + + 450,-1250 + 500,- 400 + 450,- 400 + 500,-1250 + + 500,-1250 + 500,- 350 + 500,- 400 + 450,-1300 + + 450 +Duration=65000us + Send Kaseikyo with 0x4711 as Vendor ID -Protocol=Kaseikyo Address=0xFF1 Command=0x76 Extra=0x4711 Raw-Data=0x9A76FF134711 48 bits LSB first +Protocol=Kaseikyo Address=0xFF1 Command=0x76 Extra=0x4711 Raw-Data=0x9A76FF134711 48 bits LSB first Gap=1091050us Duration=70250us Send with: IrSender.sendKaseikyo(0xFF1, 0x76, , 0x4711); rawData[100]: - -1079950 + -1091050 +3550,-1650 - + 500,-1250 + 500,- 400 + 500,- 350 + 500,- 400 - + 500,-1250 + 500,- 350 + 550,- 350 + 500,- 400 - + 500,-1250 + 500,-1250 + 500,-1250 + 500,- 350 - + 500,- 400 + 500,- 350 + 500,-1250 + 500,- 400 - + 500,-1250 + 500,-1250 + 500,- 350 + 500,- 400 - + 500,-1250 + 500,- 350 + 500,- 400 + 500,- 350 - + 500,-1250 + 500,-1250 + 500,-1250 + 500,-1250 - + 500,-1250 + 500,-1250 + 500,-1250 + 550,-1200 - + 550,- 350 + 500,-1250 + 500,-1250 + 500,- 350 - + 500,-1250 + 500,-1250 + 500,-1250 + 550,- 350 - + 500,- 350 + 500,-1250 + 550,- 350 + 500,-1250 - + 500,-1250 + 500,- 350 + 500,- 400 + 500,-1250 + + 500,-1250 + 500,- 400 + 450,- 400 + 500,- 400 + + 450,-1300 + 450,- 400 + 500,- 350 + 500,- 400 + + 500,-1250 + 450,-1300 + 450,-1300 + 450,- 400 + + 500,- 400 + 450,- 400 + 450,-1300 + 450,- 400 + + 500,-1250 + 500,-1250 + 500,- 400 + 450,- 400 + + 500,-1250 + 500,- 400 + 450,- 400 + 500,- 350 + + 500,-1250 + 500,-1250 + 500,-1250 + 450,-1300 + + 450,-1300 + 450,-1250 + 500,-1250 + 500,-1250 + + 450,- 450 + 450,-1250 + 500,-1250 + 500,- 350 + + 500,-1250 + 500,-1250 + 500,-1250 + 450,- 450 + + 450,- 400 + 500,-1250 + 450,- 450 + 450,-1250 + + 500,-1250 + 500,- 400 + 450,- 400 + 500,-1250 + 500 -Sum: 70500 +Duration=70250us + Send Kaseikyo_Denon variant -Protocol=Kaseikyo_Denon Address=0xFF1 Command=0x76 Raw-Data=0x9976FF103254 48 bits LSB first +Protocol=Kaseikyo_Denon Address=0xFF1 Command=0x76 Raw-Data=0x9976FF103254 48 bits LSB first Gap=1089850us Duration=68450us Send with: IrSender.sendKaseikyo_Denon(0xFF1, 0x76, ); rawData[100]: - -1080650 - +3550,-1650 - + 550,- 350 + 500,- 350 + 550,-1200 + 550,- 350 - + 500,-1250 + 500,- 350 + 550,-1200 + 500,- 400 - + 500,- 350 + 500,-1250 + 550,- 350 + 500,- 350 - + 550,-1200 + 550,-1200 + 550,- 350 + 500,- 350 - + 550,- 350 + 500,- 350 + 550,- 350 + 500,- 350 - + 550,-1200 + 550,- 350 + 500,- 350 + 550,- 350 - + 500,-1250 + 500,-1250 + 500,-1250 + 500,-1250 - + 500,-1250 + 500,-1250 + 500,-1250 + 500,-1250 - + 500,- 350 + 500,-1250 + 500,-1250 + 500,- 400 - + 500,-1250 + 500,-1250 + 500,-1250 + 500,- 350 - + 500,-1250 + 550,- 350 + 500,- 350 + 550,-1250 - + 450,-1300 + 500,- 350 + 500,- 400 + 500,-1250 + -1089850 + +3500,-1650 + + 500,- 400 + 500,- 400 + 450,-1250 + 500,- 400 + + 500,-1250 + 450,- 400 + 500,-1250 + 450,- 450 + + 450,- 400 + 500,-1250 + 450,- 450 + 450,- 400 + + 450,-1300 + 500,-1200 + 500,- 400 + 450,- 400 + + 500,- 400 + 450,- 400 + 500,- 400 + 450,- 400 + + 500,-1250 + 500,- 400 + 450,- 400 + 500,- 400 + + 450,-1300 + 450,-1250 + 500,-1250 + 500,-1250 + + 500,-1250 + 450,-1300 + 450,-1300 + 450,-1250 + + 550,- 350 + 450,-1250 + 500,-1250 + 500,- 400 + + 450,-1300 + 450,-1300 + 450,-1250 + 450,- 450 + + 450,-1250 + 500,- 400 + 450,- 450 + 450,-1250 + + 500,-1250 + 500,- 400 + 450,- 400 + 500,-1250 + 500 -Sum: 68750 +Duration=68450us + Send Denon -Protocol=Denon Address=0x11 Command=0x76 Raw-Data=0xED1 15 bits LSB first +Protocol=Denon Address=0x11 Command=0x76 Raw-Data=0xED1 15 bits LSB first Gap=1089050us Duration=23400us Send with: IrSender.sendDenon(0x11, 0x76, ); rawData[32]: - -1078400 - + 350,-1750 + 350,- 700 + 350,- 700 + 350,- 700 - + 350,-1750 + 350,- 700 + 300,-1800 + 350,-1750 - + 350,- 700 + 350,-1750 + 350,-1750 + 350,-1750 - + 350,- 700 + 350,- 700 + 350,- 700 + 350 -Sum: 23450 + -1089050 + + 350,-1750 + 300,- 750 + 300,- 750 + 300,- 750 + + 300,-1800 + 300,- 750 + 300,-1800 + 300,-1800 + + 300,- 750 + 300,-1800 + 300,-1750 + 350,-1750 + + 300,- 750 + 350,- 750 + 300,- 750 + 300 +Duration=23400us + Send Denon/Sharp variant -Protocol=Sharp Address=0x11 Command=0x76 Raw-Data=0x4ED1 15 bits LSB first -Send with: IrSender.sendSharp(0x11, 0x76, ); +Protocol=Denon Address=0x11 Command=0x76 Raw-Data=0x2ED1 15 bits LSB first Gap=1034900us Duration=24450us +Send with: IrSender.sendDenon(0x11, 0x76, ); rawData[32]: - -1023500 - + 350,-1750 + 350,- 700 + 350,- 700 + 350,- 700 - + 350,-1750 + 350,- 700 + 350,-1750 + 350,-1750 - + 350,- 700 + 350,-1750 + 350,-1750 + 350,-1750 - + 350,- 700 + 300,- 750 + 350,-1750 + 350 -Sum: 24500 + -1034900 + + 300,-1800 + 300,- 750 + 300,- 750 + 300,- 750 + + 300,-1800 + 300,- 750 + 300,-1800 + 300,-1800 + + 300,- 750 + 300,-1800 + 300,-1800 + 300,-1750 + + 350,- 700 + 300,-1800 + 300,- 750 + 350 +Duration=24450us + Send Sony/SIRCS with 7 command and 5 address bits -Protocol=Sony Address=0x11 Command=0x76 Raw-Data=0x8F6 12 bits LSB first +Protocol=Sony Address=0x11 Command=0x76 Raw-Data=0x8F6 12 bits LSB first Gap=1037050us Duration=21150us Send with: IrSender.sendSony(0x11, 0x76, 2, 12); rawData[26]: - -1025750 - +2500,- 500 - + 700,- 500 +1300,- 650 +1250,- 550 + 700,- 500 - +1300,- 500 +1300,- 500 +1300,- 550 +1300,- 500 - + 700,- 500 + 700,- 500 + 700,- 550 +1250 -Sum: 21300 + -1037050 + +2400,- 600 + + 650,- 550 +1250,- 550 +1300,- 550 + 600,- 600 + +1250,- 550 +1250,- 550 +1250,- 550 +1250,- 550 + + 650,- 600 + 650,- 550 + 650,- 550 +1250 +Duration=21150us + Send Sony/SIRCS with 7 command and 8 address bits -Protocol=Sony Address=0xF1 Command=0x76 Raw-Data=0x78F6 15 bits LSB first +Protocol=Sony Address=0xF1 Command=0x76 Raw-Data=0x78F6 15 bits LSB first Gap=1046850us Duration=26600us Send with: IrSender.sendSony(0xF1, 0x76, 2, 15); rawData[32]: - -1037600 - +2500,- 550 - + 650,- 550 +1300,- 500 +1300,- 500 + 700,- 500 - +1300,- 550 +1250,- 550 +1300,- 500 +1300,- 500 - + 700,- 500 + 700,- 550 + 650,- 550 +1300,- 500 - +1300,- 550 +1300,- 500 +1300 -Sum: 26700 + -1046850 + +2450,- 550 + + 650,- 550 +1250,- 550 +1250,- 600 + 600,- 600 + +1250,- 550 +1250,- 550 +1250,- 600 +1200,- 550 + + 650,- 600 + 650,- 550 + 650,- 600 +1200,- 550 + +1250,- 600 +1250,- 550 +1250 +Duration=26600us + Send Sony/SIRCS with 7 command and 13 address bits -Protocol=Sony Address=0x1FF1 Command=0x76 Raw-Data=0xFF8F6 20 bits LSB first +Protocol=Sony Address=0x1FF1 Command=0x76 Raw-Data=0xFF8F6 20 bits LSB first Gap=1057450us Duration=35700us Send with: IrSender.sendSony(0x1FF1, 0x76, 2, 20); rawData[42]: - -1041100 - +2500,- 500 - + 700,- 550 +1300,- 500 +1300,- 500 + 700,- 550 - +1250,- 550 +1300,- 500 +1300,- 550 +1300,- 500 - + 700,- 500 + 700,- 500 + 700,- 500 +1300,- 550 - +1300,- 500 +1300,- 500 +1300,- 500 +1300,- 550 - +1300,- 500 +1300,- 500 +1300,- 550 +1250 -Sum: 35750 - -Send Samsung 8 bit command -Protocol=Samsung Address=0xFFF1 Command=0x76 Raw-Data=0x8976FFF1 32 bits LSB first -Send with: IrSender.sendSamsung(0xFFF1, 0x76, ); + -1057450 + +2450,- 600 + + 650,- 550 +1200,- 600 +1250,- 550 + 650,- 550 + +1250,- 600 +1250,- 550 +1250,- 550 +1250,- 550 + + 650,- 600 + 650,- 550 + 650,- 550 +1250,- 550 + +1250,- 600 +1250,- 550 +1250,- 550 +1250,- 550 + +1250,- 550 +1250,- 600 +1200,- 600 +1250 +Duration=35700us + + +Send Samsung 8 bit command and 8 bit address +Protocol=Samsung Address=0xF1 Command=0x76 Raw-Data=0x8976F1F1 32 bits LSB first Gap=1056800us Duration=65950us +Send with: IrSender.sendSamsung(0xF1, 0x76, ); rawData[68]: - -1044850 - +4550,-4400 - + 700,-1600 + 650,- 450 + 700,- 450 + 650,- 500 - + 650,-1600 + 650,-1600 + 650,-1600 + 700,-1600 - + 650,-1600 + 650,-1600 + 650,-1600 + 700,-1600 - + 650,-1600 + 650,-1600 + 650,-1600 + 700,-1600 - + 650,- 450 + 700,-1600 + 650,-1600 + 650,- 500 - + 650,-1600 + 650,-1600 + 700,-1600 + 650,- 450 - + 700,-1600 + 650,- 450 + 650,- 500 + 650,-1600 - + 650,- 500 + 650,- 450 + 700,- 450 + 650,-1600 - + 650 -Sum: 69600 + -1056800 + +4550,-4450 + + 550,-1700 + 600,- 500 + 600,- 550 + 600,- 550 + + 600,-1650 + 600,-1650 + 600,-1650 + 600,-1650 + + 600,-1650 + 600,- 550 + 550,- 550 + 600,- 550 + + 600,-1650 + 600,-1650 + 600,-1650 + 600,-1650 + + 600,- 500 + 600,-1650 + 650,-1600 + 650,- 500 + + 600,-1650 + 600,-1650 + 600,-1650 + 600,- 550 + + 600,-1650 + 600,- 500 + 650,- 500 + 600,-1650 + + 600,- 550 + 600,- 500 + 600,- 550 + 600,-1650 + + 600 +Duration=65950us + -Send Samsung 16 bit command -Protocol=Samsung Address=0xFFF1 Command=0x9876 Raw-Data=0x9876FFF1 32 bits LSB first +Send Samsung 16 bit command and address +Protocol=Samsung Address=0xFFF1 Command=0x9876 Raw-Data=0x9876FFF1 32 bits LSB first Gap=1068600us Duration=69300us Send with: IrSender.sendSamsung(0xFFF1, 0x9876, ); rawData[68]: - -1061000 - +4600,-4400 - + 650,-1600 + 700,- 450 + 650,- 500 + 650,- 450 - + 700,-1550 + 700,-1600 + 650,-1600 + 650,-1600 - + 650,-1600 + 700,-1600 + 650,-1600 + 650,-1600 - + 650,-1600 + 700,-1600 + 650,-1600 + 650,-1600 - + 650,- 500 + 650,-1600 + 700,-1600 + 650,- 450 - + 700,-1600 + 650,-1600 + 650,-1600 + 650,- 500 - + 650,- 450 + 700,- 450 + 650,- 500 + 650,-1600 - + 650,-1600 + 650,- 500 + 650,- 450 + 700,-1600 - + 650 -Sum: 69650 + -1068600 + +4550,-4450 + + 600,-1650 + 600,- 500 + 650,- 500 + 600,- 550 + + 600,-1650 + 600,-1650 + 600,-1650 + 600,-1650 + + 600,-1650 + 600,-1650 + 600,-1650 + 600,-1650 + + 600,-1650 + 600,-1650 + 600,-1650 + 600,-1650 + + 600,- 550 + 550,-1650 + 650,-1650 + 550,- 550 + + 600,-1650 + 600,-1650 + 600,-1650 + 600,- 550 + + 600,- 500 + 650,- 500 + 600,- 500 + 650,-1650 + + 600,-1650 + 600,- 550 + 600,- 500 + 600,-1650 + + 600 +Duration=69300us + Send Samsung48 16 bit command -Protocol=Samsung48 Address=0xFFF1 Command=0x9876 Raw-Data=0xFFFFFFFF8976FFF1 48 bits LSB first +Protocol=Samsung48 Address=0xFFF1 Command=0x9876 Raw-Data=0xFFFFFFFF8976FFF1 48 bits LSB first Gap=1066850us Duration=96400us Send with: IrSender.sendSamsung48(0xFFF1, 0x9876, ); rawData[100]: - -1066350 + -1066850 +4550,-4400 - + 650,-1650 + 600,- 500 + 700,- 450 + 650,- 500 - + 650,-1600 + 650,-1600 + 650,-1600 + 700,-1600 - + 600,-1650 + 650,-1600 + 650,-1600 + 700,-1600 - + 600,-1650 + 650,-1600 + 650,-1600 + 700,-1550 - + 700,- 450 + 650,-1600 + 700,-1600 + 600,- 500 - + 650,-1600 + 700,-1600 + 650,-1600 + 650,- 500 - + 650,-1600 + 650,- 500 + 650,- 500 + 650,-1600 - + 650,- 450 + 700,- 450 + 650,- 500 + 650,-1600 - + 650,- 500 + 650,- 450 + 650,- 500 + 650,-1600 - + 650,-1600 + 700,- 450 + 650,- 500 + 650,-1600 - + 650,-1600 + 650,-1600 + 650,-1650 + 650,- 450 - + 650,- 500 + 650,-1600 + 650,-1600 + 650,- 500 + + 650,-1650 + 550,- 550 + 600,- 550 + 600,- 500 + + 600,-1650 + 650,-1600 + 600,-1650 + 650,-1600 + + 600,-1650 + 650,-1600 + 600,-1650 + 650,-1600 + + 600,-1650 + 650,-1600 + 600,-1650 + 650,-1600 + + 600,- 550 + 600,-1650 + 650,-1600 + 600,- 550 + + 600,-1650 + 600,-1650 + 600,-1650 + 600,- 550 + + 550,-1650 + 650,- 500 + 600,- 550 + 600,-1650 + + 600,- 500 + 600,- 550 + 600,- 550 + 600,-1650 + + 600,- 550 + 550,- 550 + 600,- 550 + 600,-1650 + + 600,-1650 + 600,- 500 + 600,- 550 + 600,-1650 + + 600,-1650 + 600,-1650 + 600,-1650 + 600,- 550 + + 600,- 500 + 650,-1650 + 550,-1650 + 650,- 500 + 650 -Sum: 96750 +Duration=96400us + Send RC5 -Protocol=RC5 Address=0x11 Command=0x36 Raw-Data=0x1476 13 bits MSB first +Protocol=RC5 Address=0x11 Command=0x36 Raw-Data=0x1476 13 bits MSB first Gap=1089700us Duration=23300us Send with: IrSender.sendRC5(0x11, 0x36, ); rawData[20]: - -1079150 - +1000,- 800 - +1900,-1650 +1900,- 800 +1000,- 800 +1000,-1700 - +1000,- 800 +1000,- 750 +1900,-1700 +1000,- 800 - +1900 -Sum: 23400 + -1089700 + + 900,- 850 + +1850,-1750 +1850,- 850 + 900,- 850 + 950,-1750 + + 950,- 850 + 950,- 850 +1800,-1750 + 950,- 850 + +1850 +Duration=23300us + Send RC5X with 7.th MSB of command set -Protocol=RC5 Address=0x11 Command=0x76 Toggle=1 Raw-Data=0xC76 13 bits MSB first +Protocol=RC5 Address=0x11 Command=0x76 Toggle=1 Raw-Data=0xC76 13 bits MSB first Gap=1047250us Duration=23350us Send with: IrSender.sendRC5(0x11, 0x76, ); rawData[20]: - -1035450 - +1900,-1700 - +1000,- 800 +1900,- 750 +1000,- 800 +1000,-1700 - +1000,- 800 +1000,- 800 +1900,-1650 +1000,- 800 - +1900 -Sum: 23400 + -1047250 + +1850,-1750 + + 950,- 850 +1850,- 850 + 900,- 900 + 900,-1750 + + 950,- 850 + 950,- 850 +1800,-1750 +1000,- 800 + +1850 +Duration=23350us + Send RC6 -Protocol=RC6 Address=0xF1 Command=0x76 Raw-Data=0xF176 20 bits MSB first +Protocol=RC6 Address=0xF1 Command=0x76 Raw-Data=0xF176 20 bits MSB first Gap=1043200us Duration=23400us Send with: IrSender.sendRC6(0xF1, 0x76, ); rawData[36]: - -1032650 - +2750,- 800 - + 550,- 800 + 550,- 350 + 550,- 350 + 550,- 800 - +1450,- 350 + 550,- 350 + 550,- 350 + 550,- 800 - + 550,- 350 + 550,- 350 +1000,- 800 +1000,- 350 - + 550,- 350 + 550,- 800 +1000,- 350 + 550,- 800 - + 550 -Sum: 23450 + -1043200 + +2700,- 850 + + 500,- 850 + 500,- 400 + 500,- 400 + 500,- 850 + +1400,- 400 + 500,- 400 + 500,- 400 + 500,- 850 + + 500,- 400 + 500,- 400 + 950,- 850 + 950,- 400 + + 500,- 400 + 500,- 850 + 950,- 400 + 500,- 850 + + 500 +Duration=23400us + Send RC6A with 14 bit 0x2711 as extra -Protocol=RC6A Address=0xF1 Command=0x76 Extra=0x2711 Toggle=1 Raw-Data=0xA711F176 35 bits MSB first +Protocol=RC6A Address=0xF1 Command=0x76 Extra=0x2711 Toggle=1 Raw-Data=0xA711F176 35 bits MSB first Gap=1067100us Duration=36900us Send with: IrSender.sendRC6A(0xF1, 0x76, , 0x2711); rawData[58]: - -1032900 - +2650,- 900 - + 450,- 450 + 450,- 450 + 450,- 850 +1400,-1300 - + 950,- 850 + 500,- 400 + 950,- 400 + 500,- 450 - + 450,- 850 + 500,- 400 + 500,- 400 + 950,- 850 - + 500,- 400 + 500,- 400 + 950,- 450 + 450,- 450 - + 450,- 450 + 450,- 400 + 500,- 850 + 500,- 400 + -1067100 + +2750,- 800 + + 500,- 400 + 500,- 350 + 600,- 800 +1400,-1300 + + 950,- 850 + 500,- 400 + 950,- 400 + 500,- 400 + + 500,- 850 + 500,- 400 + 500,- 400 + 950,- 850 + + 500,- 400 + 500,- 400 + 950,- 400 + 500,- 400 + + 500,- 400 + 500,- 400 + 500,- 850 + 500,- 400 + 500,- 400 + 950,- 850 + 950,- 400 + 500,- 400 - + 500,- 850 + 950,- 450 + 450,- 850 + 500 -Sum: 36850 + + 500,- 850 + 950,- 400 + 500,- 850 + 500 +Duration=36900us + Send Bang&Olufsen - ENABLE_BEO_WITHOUT_FRAME_GAP is enabled -- Now print raw data and try to decode the first 6 entries, which results in rawData 0x0! -rawData[36]: - -1032400 - + 300,-2850 - + 250,-2850 + 250,-15200 + 300,-2850 + 250,-9000 - + 300,-5950 + 250,-5950 + 250,-5900 + 300,-2850 - + 250,-5950 + 250,-9050 + 250,-2850 + 250,-9000 - + 300,-2850 + 250,-5950 + 250,-5950 + 250,-5950 +rawData[44]: + -1066350 + + 250,-2900 + + 250,-2900 + 250,-12750 + 250,-2850 + 250,-9150 + + 250,-6000 + 250,-6050 + 250,-6000 + 250,-2850 + + 250,-6050 + 250,-6000 + 250,-9150 + 250,-2850 + + 250,-9150 + 250,-6000 + 250,-6000 + 250,-2900 + + 250,-9150 + 250,-6000 + 250,-2900 + 250,-12250 + 250 -Sum: 105700 -Protocol=Bang&Olufsen Address=0x0 Command=0x0 Raw-Data=0x0 0 bits MSB first +Duration=135350us + +- Now try to decode the first 6 entries, which results in rawData 0x0 +Protocol=Bang&Olufsen Address=0x0 Command=0x0 Raw-Data=0x0 0 bits MSB first Gap=1066350us Duration=6550us - Remove trailing 6 entries, which is equivalent to define RECORD_GAP_MICROS < 15000, to enable successful B&O decode -Protocol=Bang&Olufsen Address=0xF2 Command=0x87 Raw-Data=0xF287 16 bits MSB first -Send with: IrSender.sendBang&Olufsen(0xF2, 0x87, ); +Protocol=Bang&Olufsen Address=0xF1 Command=0x76 Raw-Data=0xF176 16 bits MSB first Gap=12750us Duration=116050us +Send with: IrSender.sendBang&Olufsen(0xF1, 0x76, ); rawData[38]: - -15200 - + 300,-2850 - + 250,-9000 + 300,-5950 + 250,-5950 + 250,-5900 - + 300,-2850 + 250,-5950 + 250,-9050 + 250,-2850 - + 250,-9000 + 300,-2850 + 250,-5950 + 250,-5950 - + 250,-5950 + 250,-9050 + 250,-5900 + 300,-5950 - + 250,-12100 + 300 -Sum: 118100 + -12750 + + 250,-2850 + + 250,-9150 + 250,-6000 + 250,-6050 + 250,-6000 + + 250,-2850 + 250,-6050 + 250,-6000 + 250,-9150 + + 250,-2850 + 250,-9150 + 250,-6000 + 250,-6000 + + 250,-2900 + 250,-9150 + 250,-6000 + 250,-2900 + + 250,-12250 + 250 +Duration=116050us + Send MagiQuest -Protocol=MagiQuest Address=0xF2 Command=0x187 Raw-Data=0x6BCD00F2 56 bits MSB first -Send with: IrSender.sendMagiQuest(0x6BCD00F2, 0x187, ); +Protocol=MagiQuest Address=0xFFF1 Command=0x76 Raw-Data=0x6BCDFFF1 56 bits MSB first Gap=1104750us Duration=64450us +Send with: IrSender.sendMagiQuest(0x6BCDFFF1, 0x76, ); rawData[112]: - -1088750 - + 350,- 800 + 350,- 800 + 350,- 800 + 350,- 800 - + 350,- 800 + 350,- 800 + 350,- 800 + 350,- 850 - + 600,- 550 + 600,- 550 + 350,- 750 + 650,- 550 - + 300,- 850 + 600,- 550 + 600,- 550 + 600,- 550 - + 600,- 550 + 350,- 800 + 350,- 750 + 650,- 500 - + 650,- 500 + 350,- 800 + 650,- 500 + 350,- 800 - + 350,- 800 + 350,- 800 + 350,- 800 + 350,- 800 - + 350,- 800 + 350,- 800 + 350,- 800 + 650,- 500 - + 650,- 500 + 650,- 500 + 650,- 500 + 350,- 800 - + 350,- 800 + 650,- 500 + 350,- 850 + 600,- 550 - + 600,- 550 + 350,- 800 + 300,- 800 + 350,- 800 - + 350,- 800 + 650,- 500 + 650,- 500 + 650,- 550 - + 350,- 800 + 300,- 800 + 650,- 500 + 350,- 800 - + 350,- 800 + 350,- 800 + 650,- 500 + 350 -Sum: 63600 + -1104750 + + 350,- 850 + 300,- 850 + 300,- 850 + 300,- 850 + + 350,- 800 + 350,- 800 + 350,- 850 + 300,- 850 + + 600,- 550 + 600,- 550 + 350,- 800 + 650,- 550 + + 350,- 800 + 600,- 550 + 600,- 550 + 650,- 500 + + 650,- 550 + 300,- 850 + 300,- 850 + 600,- 550 + + 600,- 550 + 350,- 800 + 650,- 550 + 600,- 550 + + 650,- 500 + 650,- 550 + 600,- 550 + 600,- 550 + + 600,- 550 + 600,- 550 + 600,- 550 + 650,- 500 + + 650,- 550 + 600,- 550 + 650,- 500 + 350,- 850 + + 300,- 850 + 300,- 850 + 600,- 550 + 350,- 800 + + 350,- 800 + 650,- 550 + 600,- 550 + 600,- 550 + + 350,- 850 + 600,- 550 + 600,- 550 + 300,- 850 + + 350,- 800 + 350,- 800 + 650,- 500 + 650,- 550 + + 350,- 800 + 650,- 500 + 650,- 550 + 600 +Duration=64450us + Send next protocols with IrSender.write Send JVC -Protocol=JVC Address=0xF1 Command=0x76 Raw-Data=0x76F1 16 bits LSB first +Protocol=JVC Address=0xF1 Command=0x76 Raw-Data=0x76F1 16 bits LSB first Gap=1114750us Duration=40800us Send with: IrSender.sendJVC(0xF1, 0x76, ); rawData[36]: - -1040750 + -1114750 +8500,-4150 - + 650,-1500 + 650,- 400 + 650,- 450 + 600,- 450 - + 650,-1500 + 600,-1500 + 650,-1500 + 600,-1550 - + 600,- 450 + 650,-1500 + 650,-1450 + 650,- 450 - + 650,-1450 + 650,-1500 + 650,-1500 + 600,- 450 - + 650 -Sum: 41050 + + 550,-1550 + 600,- 500 + 550,- 500 + 600,- 450 + + 600,-1500 + 600,-1550 + 550,-1550 + 600,-1550 + + 550,- 500 + 600,-1550 + 550,-1550 + 550,- 500 + + 550,-1550 + 600,-1550 + 550,-1550 + 550,- 500 + + 600 +Duration=40800us + Send LG -Protocol=LG Address=0xF1 Command=0x9876 Raw-Data=0xF19876E 28 bits MSB first +Protocol=LG Address=0xF1 Command=0x9876 Raw-Data=0xF19876E 28 bits MSB first Gap=1053400us Duration=60000us Send with: IrSender.sendLG(0xF1, 0x9876, ); rawData[60]: - -1059650 - +9100,-4100 - + 650,-1500 + 600,-1500 + 600,-1500 + 600,-1500 - + 600,- 500 + 600,- 450 + 600,- 450 + 650,-1500 - + 600,-1500 + 600,- 450 + 600,- 500 + 600,-1500 - + 600,-1500 + 600,- 500 + 600,- 450 + 600,- 450 - + 650,- 450 + 600,-1500 + 600,-1500 + 600,-1500 - + 650,- 450 + 600,-1500 + 600,-1500 + 600,- 500 - + 600,-1500 + 600,-1500 + 600,-1500 + 600,- 500 - + 600 -Sum: 60450 + -1053400 + +9050,-4150 + + 550,-1550 + 550,-1550 + 550,-1550 + 550,-1550 + + 550,- 500 + 550,- 500 + 550,- 550 + 550,-1500 + + 600,-1500 + 550,- 500 + 550,- 550 + 550,-1500 + + 550,-1550 + 550,- 500 + 600,- 450 + 600,- 500 + + 550,- 500 + 550,-1550 + 550,-1550 + 550,-1550 + + 550,- 500 + 550,-1550 + 550,-1550 + 550,- 500 + + 550,-1550 + 550,-1550 + 550,-1550 + 550,- 500 + + 550 +Duration=60000us + Send Bosewave with no address and 8 command bits -Protocol=BoseWave Address=0x0 Command=0x76 Raw-Data=0x8976 16 bits LSB first +Protocol=BoseWave Address=0x0 Command=0x76 Raw-Data=0x8976 16 bits LSB first Gap=1068550us Duration=27050us Send with: IrSender.sendBoseWave(0x0, 0x76, ); rawData[36]: - -1050250 - +1100,-1400 - + 600,- 400 + 600,-1400 + 600,-1400 + 600,- 400 - + 600,-1400 + 600,-1400 + 650,-1400 + 600,- 400 + -1068550 + +1050,-1450 + + 600,- 400 + 550,-1450 + 550,-1450 + 600,- 400 + + 550,-1450 + 550,-1400 + 600,-1400 + 600,- 400 + 600,-1400 + 600,- 400 + 600,- 400 + 600,-1400 + 600,- 400 + 600,- 400 + 600,- 400 + 600,-1400 + 600 -Sum: 27150 +Duration=27050us + Send FAST -Protocol=FAST Address=0x0 Command=0x76 Raw-Data=0x8976 16 bits LSB first +Protocol=FAST Address=0x0 Command=0x76 Raw-Data=0x8976 16 bits LSB first Gap=1053550us Duration=29200us Send with: IrSender.sendFAST(0x0, 0x76, ); rawData[36]: - -1041350 - +2200,-1000 - + 650,- 400 + 650,-1500 + 650,-1500 + 600,- 450 - + 650,-1500 + 650,-1500 + 600,-1500 + 650,- 450 - + 600,-1500 + 650,- 450 + 600,- 450 + 650,-1500 - + 600,- 450 + 650,- 450 + 600,- 450 + 650,-1500 - + 600 -Sum: 29450 + -1053550 + +2150,-1050 + + 550,- 500 + 550,-1550 + 600,-1550 + 550,- 500 + + 550,-1600 + 550,-1550 + 550,-1550 + 600,- 450 + + 600,-1500 + 600,- 500 + 550,- 500 + 600,-1550 + + 550,- 500 + 600,- 450 + 600,- 500 + 550,-1550 + + 550 +Duration=29200us + Force buffer overflow by sending 280 marks and spaces Overflow @@ -678,148 +765,338 @@ rawData[200]: Sum: 77050 ERROR: Unknown protocol +Stop receiver +Start receiver address=0xF2 command=0x87 Send NEC with 8 bit address and complete NEC frames as repeats to force decoding as NEC2 -Protocol=NEC Address=0xF2 Command=0x87 Raw-Data=0x78870DF2 32 bits LSB first +Protocol=NEC Address=0xF2 Command=0x87 Raw-Data=0x78870DF2 32 bits LSB first Gap=1275750us Duration=68200us Send with: IrSender.sendNEC(0xF2, 0x87, ); rawData[68]: - -3276750 - +8900,-4450 - + 600,- 500 + 650,-1600 + 600,- 550 + 600,- 500 - + 650,-1600 + 600,-1650 + 600,-1650 + 600,-1650 - + 600,-1600 + 600,- 550 + 600,-1600 + 650,-1600 - + 600,- 550 + 600,- 500 + 600,- 550 + 600,- 500 - + 600,-1650 + 600,-1650 + 600,-1650 + 600,- 550 - + 600,- 500 + 600,- 550 + 600,- 550 + 600,-1600 - + 600,- 550 + 600,- 500 + 650,- 500 + 600,-1650 - + 600,-1650 + 600,-1600 + 600,-1650 + 600,- 550 + -1275750 + +9000,-4450 + + 650,- 500 + 600,-1650 + 600,- 550 + 600,- 550 + + 550,-1650 + 650,-1650 + 550,-1650 + 650,-1650 + + 550,-1650 + 650,- 500 + 600,-1650 + 600,-1650 + + 650,- 450 + 650,- 500 + 600,- 550 + 600,- 550 + + 600,-1650 + 600,-1650 + 600,-1650 + 600,- 500 + + 650,- 500 + 600,- 500 + 650,- 500 + 600,-1650 + + 600,- 550 + 600,- 550 + 600,- 500 + 650,-1650 + + 550,-1650 + 650,-1650 + 550,-1650 + 650,- 500 + 600 -Sum: 67850 +Duration=68200us + -Protocol=NEC2 Address=0xF2 Command=0x87 Repeat gap=65900us Raw-Data=0x78870DF2 32 bits LSB first +Protocol=NEC2 Address=0xF2 Command=0x87 Raw-Data=0x78870DF2 32 bits LSB first Repeat Gap=65700us Duration=68200us Send with: IrSender.sendNEC2(0xF2, 0x87, ); rawData[68]: - -65900 - +8900,-4450 - + 600,- 500 + 600,-1650 + 600,- 500 + 600,- 550 - + 600,-1650 + 600,-1600 + 600,-1650 + 600,-1650 - + 600,-1650 + 600,- 500 + 600,-1650 + 600,-1650 - + 600,- 500 + 600,- 550 + 600,- 550 + 600,- 500 - + 600,-1650 + 600,-1650 + 600,-1600 + 600,- 550 - + 600,- 550 + 600,- 500 + 600,- 550 + 600,-1650 - + 600,- 500 + 600,- 550 + 600,- 500 + 650,-1600 - + 600,-1650 + 600,-1600 + 650,-1600 + 600,- 550 - + 600 -Sum: 67800 + -65700 + +9000,-4450 + + 600,- 550 + 600,-1650 + 600,- 500 + 600,- 550 + + 600,-1650 + 600,-1650 + 600,-1650 + 600,-1650 + + 600,-1650 + 600,- 500 + 650,-1650 + 600,-1650 + + 600,- 550 + 550,- 550 + 600,- 550 + 600,- 500 + + 600,-1650 + 650,-1600 + 600,-1650 + 600,- 550 + + 600,- 500 + 650,- 550 + 550,- 550 + 600,-1650 + + 600,- 550 + 600,- 500 + 650,- 500 + 600,-1650 + + 600,-1650 + 600,-1650 + 600,-1650 + 600,- 500 + + 650 +Duration=68200us + Send NEC with 16 bit address -Protocol=NEC Address=0xF2 Command=0x87 Raw-Data=0x78870DF2 32 bits LSB first +Protocol=NEC Address=0xF2 Command=0x87 Raw-Data=0x78870DF2 32 bits LSB first Gap=1067650us Duration=68200us Send with: IrSender.sendNEC(0xF2, 0x87, ); rawData[68]: - -1060000 - +9100,-4400 - + 650,- 450 + 700,-1600 + 650,- 450 + 700,- 450 - + 650,-1600 + 650,-1600 + 700,-1600 + 650,-1600 - + 650,-1600 + 650,- 500 + 650,-1600 + 650,-1600 - + 650,- 500 + 650,- 500 + 600,- 500 + 650,- 500 - + 650,-1600 + 650,-1600 + 650,-1600 + 700,- 450 - + 650,- 500 + 600,- 500 + 650,- 500 + 650,-1600 - + 650,- 500 + 650,- 450 + 700,- 450 + 650,-1600 - + 700,-1550 + 700,-1600 + 650,-1600 + 650,- 500 - + 650 -Sum: 68450 + -1067650 + +9000,-4450 + + 600,- 550 + 600,-1650 + 600,- 550 + 600,- 500 + + 650,-1650 + 550,-1650 + 650,-1600 + 600,-1650 + + 650,-1600 + 600,- 550 + 600,-1650 + 600,-1650 + + 600,- 550 + 600,- 500 + 650,- 500 + 600,- 550 + + 600,-1650 + 600,-1650 + 600,-1650 + 600,- 550 + + 550,- 550 + 600,- 550 + 600,- 500 + 600,-1650 + + 600,- 550 + 600,- 550 + 600,- 550 + 550,-1650 + + 650,-1650 + 550,-1650 + 650,-1650 + 550,- 550 + + 600 +Duration=68200us + Send NEC2 with 16 bit address -Protocol=NEC Address=0xF2 Command=0x87 Raw-Data=0x78870DF2 32 bits LSB first +Protocol=NEC Address=0xF2 Command=0x87 Raw-Data=0x78870DF2 32 bits LSB first Gap=1066900us Duration=68200us Send with: IrSender.sendNEC(0xF2, 0x87, ); rawData[68]: - -1060100 - +9050,-4400 - + 700,- 450 + 650,-1600 + 650,- 500 + 650,- 450 - + 700,-1600 + 650,-1600 + 650,-1600 + 650,-1600 - + 700,-1600 + 650,- 450 + 700,-1600 + 650,-1600 - + 650,- 500 + 600,- 500 + 650,- 500 + 650,- 450 - + 700,-1600 + 650,-1600 + 650,-1600 + 650,- 500 - + 650,- 450 + 700,- 450 + 650,- 500 + 650,-1600 - + 650,- 500 + 650,- 500 + 650,- 450 + 650,-1600 - + 700,-1600 + 600,-1650 + 650,-1600 + 650,- 500 - + 650 -Sum: 68450 + -1066900 + +9000,-4450 + + 650,- 500 + 600,-1650 + 600,- 550 + 550,- 550 + + 600,-1650 + 600,-1650 + 600,-1650 + 600,-1650 + + 600,-1650 + 600,- 500 + 650,-1650 + 600,-1650 + + 600,- 550 + 600,- 500 + 650,- 500 + 600,- 550 + + 600,-1650 + 600,-1650 + 600,-1650 + 600,- 500 + + 600,- 550 + 600,- 550 + 600,- 500 + 650,-1650 + + 550,- 550 + 600,- 550 + 600,- 500 + 600,-1650 + + 600,-1650 + 600,-1650 + 600,-1650 + 600,- 550 + + 600 +Duration=68200us + Send Onkyo (NEC with 16 bit command) -Protocol=Onkyo Address=0xF2 Command=0x8887 Raw-Data=0x888700F2 32 bits LSB first +Protocol=Onkyo Address=0xF2 Command=0x8887 Raw-Data=0x888700F2 32 bits LSB first Gap=1068400us Duration=62600us Send with: IrSender.sendOnkyo(0xF2, 0x8887, ); rawData[68]: - -1060700 - +9100,-4400 - + 650,- 450 + 700,-1600 + 650,- 450 + 700,- 450 - + 650,-1600 + 650,-1600 + 700,-1600 + 650,-1600 - + 650,- 450 + 700,- 450 + 650,- 500 + 650,- 450 - + 700,- 450 + 650,- 500 + 650,- 450 + 650,- 500 - + 650,-1600 + 650,-1600 + 700,-1550 + 700,- 450 - + 650,- 500 + 650,- 500 + 650,- 450 + 650,-1600 - + 700,- 450 + 650,- 500 + 650,- 450 + 650,-1650 - + 650,- 500 + 650,- 450 + 700,- 450 + 650,-1600 - + 650 -Sum: 62800 + -1068400 + +9000,-4450 + + 600,- 550 + 600,-1650 + 600,- 500 + 600,- 550 + + 600,-1650 + 600,-1650 + 600,-1650 + 600,-1650 + + 600,- 550 + 600,- 500 + 650,- 500 + 600,- 550 + + 600,- 500 + 650,- 500 + 600,- 500 + 650,- 550 + + 550,-1650 + 650,-1650 + 550,-1650 + 650,- 500 + + 600,- 550 + 600,- 500 + 650,- 500 + 600,-1650 + + 600,- 550 + 600,- 500 + 650,- 500 + 600,-1650 + + 600,- 550 + 600,- 500 + 600,- 550 + 600,-1650 + + 600 +Duration=62600us + Send Apple -Protocol=Apple Address=0xF2 Command=0x87 Raw-Data=0xF28787EE 32 bits LSB first +Protocol=Apple Address=0xF2 Command=0x87 Raw-Data=0xF28787EE 32 bits LSB first Gap=1067150us Duration=71550us Send with: IrSender.sendApple(0xF2, 0x87, ); rawData[68]: - -1059150 - +9050,-4400 - + 650,- 500 + 650,-1600 + 650,-1600 + 700,-1600 - + 650,- 450 + 650,-1600 + 700,-1600 + 650,-1600 - + 650,-1600 + 650,-1600 + 700,-1600 + 650,- 450 - + 700,- 450 + 650,- 500 + 650,- 450 + 650,-1600 - + 700,-1600 + 650,-1600 + 650,-1600 + 650,- 500 - + 650,- 450 + 700,- 450 + 650,- 500 + 650,-1600 - + 650,- 500 + 600,-1650 + 650,- 500 + 650,- 450 - + 650,-1600 + 650,-1650 + 650,-1600 + 650,-1600 - + 650 -Sum: 71800 + -1067150 + +9000,-4450 + + 600,- 550 + 600,-1650 + 600,-1650 + 600,-1650 + + 600,- 500 + 650,-1650 + 600,-1650 + 600,-1650 + + 600,-1650 + 600,-1650 + 600,-1650 + 600,- 550 + + 550,- 550 + 600,- 550 + 600,- 500 + 600,-1650 + + 650,-1600 + 650,-1650 + 600,-1600 + 650,- 500 + + 600,- 550 + 600,- 500 + 650,- 500 + 600,-1650 + + 650,- 500 + 600,-1650 + 600,- 500 + 650,- 500 + + 600,-1650 + 600,-1650 + 600,-1650 + 600,-1650 + + 600 +Duration=71550us + Send Panasonic -Protocol=Panasonic Address=0xF2 Command=0x87 Raw-Data=0xA8870F202002 48 bits LSB first +Protocol=Panasonic Address=0xF2 Command=0x87 Raw-Data=0xA8870F202002 48 bits LSB first Gap=1065800us Duration=59800us Send with: IrSender.sendPanasonic(0xF2, 0x87, ); rawData[100]: - -1069050 - +3550,-1650 - + 500,- 400 + 500,-1250 + 500,- 350 + 500,- 400 - + 500,- 350 + 500,- 400 + 500,- 350 + 500,- 400 - + 500,- 350 + 500,- 400 + 500,- 350 + 500,- 400 - + 500,- 350 + 500,-1250 + 500,- 400 + 500,- 350 - + 500,- 400 + 500,- 350 + 500,- 400 + 500,- 350 - + 500,- 400 + 450,-1300 + 500,- 350 + 550,- 350 - + 500,-1250 + 500,-1250 + 500,-1250 + 500,-1250 - + 500,- 350 + 500,- 400 + 500,- 350 + 500,- 400 - + 500,-1250 + 500,-1250 + 450,-1300 + 500,- 350 - + 500,- 400 + 450,- 400 + 500,- 400 + 450,-1300 - + 500,- 350 + 550,- 350 + 500,- 350 + 500,-1250 - + 550,- 350 + 500,-1250 + 450,- 400 + 550,-1200 - + 550 -Sum: 60000 + -1065800 + +3500,-1700 + + 500,- 400 + 450,-1250 + 500,- 400 + 500,- 350 + + 500,- 350 + 500,- 400 + 500,- 400 + 450,- 400 + + 500,- 400 + 450,- 400 + 500,- 400 + 500,- 350 + + 500,- 400 + 450,-1250 + 550,- 350 + 450,- 400 + + 500,- 400 + 500,- 350 + 500,- 400 + 450,- 450 + + 450,- 400 + 500,-1250 + 450,- 450 + 450,- 400 + + 500,-1250 + 450,-1250 + 500,-1250 + 500,-1250 + + 500,- 400 + 450,- 400 + 500,- 400 + 450,- 400 + + 500,-1250 + 500,-1250 + 500,-1250 + 450,- 400 + + 500,- 400 + 500,- 350 + 500,- 400 + 450,-1300 + + 450,- 400 + 500,- 400 + 450,- 400 + 500,-1250 + + 450,- 450 + 450,-1250 + 500,- 400 + 450,-1250 + + 500 +Duration=59800us + Send Kaseikyo with 0x4711 as Vendor ID -Protocol=Kaseikyo Address=0xF2 Command=0x87 Extra=0x4711 Raw-Data=0xAB870F234711 48 bits LSB first +Protocol=Kaseikyo Address=0xF2 Command=0x87 Extra=0x4711 Raw-Data=0xAB870F234711 48 bits LSB first Gap=1091300us Duration=66700us Send with: IrSender.sendKaseikyo(0xF2, 0x87, , 0x4711); rawData[100]: - -1079750 - +3550,-1650 - + 550,-1200 + 550,- 350 + 500,- 350 + 550,- 350 - + 500,-1250 + 500,- 350 + 550,- 350 + 500,- 350 - + 550,-1200 + 550,-1200 + 550,-1200 + 550,- 350 - + 500,- 350 + 550,- 350 + 500,-1250 + 500,- 350 - + 550,-1200 + 550,-1200 + 550,- 350 + 500,- 350 - + 550,- 350 + 500,-1250 + 500,- 350 + 550,- 350 - + 500,-1250 + 500,-1250 + 500,-1250 + 500,-1250 - + 500,- 300 + 550,- 400 + 500,- 350 + 550,- 350 - + 500,-1250 + 500,-1250 + 500,-1250 + 500,- 350 - + 500,- 400 + 500,- 350 + 500,- 400 + 500,-1250 - + 500,-1250 + 500,-1250 + 500,- 350 + 500,-1250 - + 500,- 400 + 500,-1250 + 500,- 350 + 500,-1250 - + 550 -Sum: 67000 \ No newline at end of file + -1091300 + +3500,-1650 + + 500,-1250 + 500,- 400 + 500,- 350 + 500,- 400 + + 450,-1300 + 450,- 400 + 450,- 450 + 450,- 400 + + 500,-1250 + 450,-1250 + 500,-1250 + 500,- 400 + + 450,- 400 + 500,- 400 + 450,-1250 + 500,- 400 + + 500,-1250 + 450,-1300 + 450,- 400 + 500,- 400 + + 450,- 400 + 500,-1250 + 450,- 450 + 450,- 400 + + 500,-1250 + 450,-1300 + 450,-1300 + 450,-1250 + + 500,- 400 + 450,- 450 + 450,- 400 + 500,- 350 + + 500,-1250 + 500,-1250 + 500,-1250 + 450,- 400 + + 500,- 400 + 500,- 400 + 450,- 400 + 500,-1250 + + 450,-1300 + 450,-1250 + 500,- 400 + 450,-1300 + + 450,- 400 + 500,-1250 + 500,- 350 + 500,-1250 + + 500 +Duration=66700us + + +Send Kaseikyo_Denon variant +Protocol=Kaseikyo_Denon Address=0xF2 Command=0x87 Raw-Data=0xA8870F203254 48 bits LSB first Gap=1090350us Duration=63250us +Send with: IrSender.sendKaseikyo_Denon(0xF2, 0x87, ); +rawData[100]: + -1090350 + +3500,-1700 + + 500,- 200 + 650,- 400 + 450,-1300 + 450,- 400 + + 450,-1300 + 450,- 350 + 550,-1250 + 450,- 450 + + 450,- 400 + 500,-1250 + 450,- 400 + 500,- 400 + + 450,-1300 + 450,-1250 + 500,- 400 + 500,- 400 + + 450,- 400 + 500,- 350 + 500,- 400 + 500,- 400 + + 450,- 400 + 500,-1250 + 500,- 350 + 500,- 400 + + 500,-1250 + 450,-1250 + 500,-1250 + 500,-1250 + + 500,- 350 + 500,- 400 + 450,- 450 + 450,- 400 + + 500,-1250 + 450,-1250 + 500,-1250 + 500,- 400 + + 500,- 350 + 500,- 400 + 450,- 400 + 500,-1250 + + 500,- 400 + 450,- 400 + 500,- 400 + 450,-1300 + + 450,- 400 + 450,-1300 + 500,- 350 + 500,-1250 + + 500 +Duration=63250us + + +Send Denon +Protocol=Denon Address=0x12 Command=0x87 Raw-Data=0x10F2 15 bits LSB first Gap=1088250us Duration=22350us +Send with: IrSender.sendDenon(0x12, 0x87, ); +rawData[32]: + -1088250 + + 300,- 750 + 300,-1800 + 300,- 750 + 300,- 750 + + 300,-1800 + 300,-1800 + 300,-1800 + 300,-1800 + + 300,- 700 + 350,- 700 + 300,- 750 + 300,- 750 + + 300,-1850 + 300,- 750 + 300,- 700 + 350 +Duration=22350us + + +Send Denon/Sharp variant +Protocol=Denon Address=0x12 Command=0x87 Raw-Data=0x30F2 15 bits LSB first Gap=1035000us Duration=23350us +Send with: IrSender.sendDenon(0x12, 0x87, ); +rawData[32]: + -1035000 + + 300,- 750 + 300,-1750 + 300,- 750 + 300,- 750 + + 300,-1800 + 300,-1800 + 300,-1800 + 300,-1800 + + 300,- 750 + 300,- 750 + 300,- 750 + 300,- 750 + + 300,-1750 + 350,-1750 + 350,- 750 + 300 +Duration=23350us + + +Send Sony/SIRCS with 7 command and 5 address bits +Protocol=Sony Address=0x12 Command=0x7 Raw-Data=0x907 12 bits LSB first Gap=1037100us Duration=20000us +Send with: IrSender.sendSony(0x12, 0x7, 2, 12); +rawData[26]: + -1037100 + +2450,- 550 + +1250,- 550 +1250,- 550 +1250,- 600 + 650,- 550 + + 650,- 550 + 650,- 550 + 650,- 600 + 600,- 600 + +1250,- 550 + 650,- 550 + 650,- 600 +1250 +Duration=20000us + + +Send Sony/SIRCS with 7 command and 8 address bits +Protocol=Sony Address=0xF2 Command=0x7 Raw-Data=0x7907 15 bits LSB first Gap=1047000us Duration=25400us +Send with: IrSender.sendSony(0xF2, 0x7, 2, 15); +rawData[32]: + -1047000 + +2450,- 550 + +1250,- 550 +1300,- 500 +1250,- 600 + 650,- 550 + + 650,- 550 + 650,- 550 + 650,- 600 + 600,- 600 + +1250,- 550 + 650,- 550 + 650,- 600 +1250,- 550 + +1200,- 600 +1250,- 550 +1250 +Duration=25400us + + +Send Sony/SIRCS with 7 command and 13 address bits +Protocol=Sony Address=0xF2 Command=0x7 Raw-Data=0x7907 20 bits LSB first Gap=1057650us Duration=31500us +Send with: IrSender.sendSony(0xF2, 0x7, 2, 20); +rawData[42]: + -1057650 + +2450,- 550 + +1250,- 600 +1250,- 550 +1250,- 550 + 650,- 550 + + 650,- 600 + 650,- 550 + 650,- 550 + 650,- 550 + +1250,- 600 + 600,- 600 + 650,- 550 +1250,- 550 + +1250,- 600 +1250,- 550 +1200,- 600 + 650,- 550 + + 650,- 600 + 600,- 600 + 650,- 550 + 650 +Duration=31500us + + +Send Samsung 8 bit command and 8 bit address +Protocol=Samsung Address=0xF2 Command=0x87 Raw-Data=0x7887F2F2 32 bits LSB first Gap=1058000us Duration=65950us +Send with: IrSender.sendSamsung(0xF2, 0x87, ); +rawData[68]: + -1058000 + +4550,-4450 + + 600,- 500 + 650,-1650 + 550,- 550 + 600,- 550 + + 600,-1650 + 600,-1650 + 600,-1650 + 600,-1650 + + 600,- 500 + 600,-1650 + 600,- 550 + 600,- 500 + + 650,-1650 + 600,-1650 + 600,-1650 + 600,-1650 + + 600,-1650 + 600,-1650 + 600,-1650 + 600,- 500 + + 650,- 500 + 600,- 550 + 600,- 550 + 600,-1600 + + 650,- 500 + 600,- 550 + 600,- 500 + 650,-1650 + + 550,-1650 + 650,-1650 + 550,-1650 + 650,- 500 + + 600 +Duration=65950us + + +Send Samsung 16 bit command and address +Protocol=Samsung Address=0xF2 Command=0xA987 Raw-Data=0xA98700F2 32 bits LSB first Gap=1068650us Duration=60350us +Send with: IrSender.sendSamsung(0xF2, 0xA987, ); +rawData[68]: + -1068650 + +4500,-4450 + + 600,- 500 + 650,-1600 + 600,- 550 + 600,- 550 + + 600,-1650 + 600,-1650 + 600,-1650 + 600,-1650 + + 600,- 550 + 600,- 500 + 600,- 550 + 600,- 550 + + 600,- 500 + 650,- 500 + 600,- 550 + 600,- 500 + + 650,-1600 + 600,-1650 + 650,-1600 + 600,- 550 + + 600,- 550 + 600,- 500 + 600,- 550 + 600,-1650 + + 600,-1650 + 600,- 550 + 600,- 500 + 650,-1600 + + 600,- 550 + 600,-1650 + 600,- 500 + 650,-1650 + + 600 +Duration=60350us + + +Send Samsung48 16 bit command +Protocol=Samsung48 Address=0xF2 Command=0xA987 Raw-Data=0x56A9788700F2 48 bits LSB first Gap=1067750us Duration=87450us +Send with: IrSender.sendSamsung48(0xF2, 0xA987, ); +rawData[100]: + -1067750 + +4550,-4400 + + 650,- 500 + 650,-1600 + 600,- 550 + 600,- 550 + + 600,-1650 + 600,-1650 + 600,-1650 + 600,-1650 + + 600,- 500 + 650,- 500 + 600,- 500 + 650,- 500 + + 600,- 550 + 600,- 550 + 600,- 550 + 550,- 550 + + 600,-1650 + 600,-1650 + 600,-1650 + 600,- 550 + + 600,- 500 + 600,- 550 + 600,- 550 + 600,-1650 + + 600,- 500 + 650,- 500 + 600,- 550 + 600,-1650 + + 600,-1650 + 600,-1650 + 600,-1650 + 600,- 500 + + 600,-1650 + 600,- 550 + 600,- 550 + 600,-1650 + + 600,- 550 + 550,-1650 + 650,- 500 + 600,-1650 + + 600,- 550 + 600,-1650 + 600,-1650 + 600,- 500 + + 600,-1650 + 600,- 550 + 600,-1650 + 600,- 550 + + 600 +Duration=87450us + + +Send RC5 +Protocol=RC5 Address=0x12 Command=0x7 Raw-Data=0x1487 13 bits MSB first Gap=1089650us Duration=24200us +Send with: IrSender.sendRC5(0x12, 0x7, ); +rawData[22]: + -1089650 + + 950,- 850 + +1800,-1750 +1800,- 850 + 950,-1750 +1850,- 850 + + 900,- 850 + 950,- 850 + 950,-1750 + 950,- 850 + + 900,- 900 + 950 +Duration=24200us + + +Send RC5X with 7.th MSB of command set +Protocol=RC5 Address=0x12 Command=0x47 Toggle=1 Raw-Data=0xC87 13 bits MSB first Gap=1046350us Duration=24250us +Send with: IrSender.sendRC5(0x12, 0x47, ); +rawData[22]: + -1046350 + +1850,-1750 + + 950,- 850 +1800,- 850 + 950,-1750 +1850,- 850 + + 900,- 900 + 900,- 850 + 950,-1750 + 950,- 850 + + 900,- 900 + 950 +Duration=24250us + + +Send RC6 +Protocol=RC6 Address=0xF2 Command=0x87 Toggle=1 Raw-Data=0x1F287 20 bits MSB first Gap=1042300us Duration=22950us +Send with: IrSender.sendRC6(0xF2, 0x87, ); +rawData[36]: + -1042300 + +2700,- 850 + + 500,- 850 + 500,- 400 + 500,- 400 +1400,- 850 + + 500,- 400 + 500,- 400 + 500,- 400 + 500,- 850 + + 500,- 400 + 950,- 850 + 950,- 850 + 500,- 400 + + 500,- 400 + 500,- 400 + 950,- 400 + 500,- 400 + + 500 +Duration=22950us diff --git a/keywords.txt b/keywords.txt index a67cd0ed..5f05f9d1 100644 --- a/keywords.txt +++ b/keywords.txt @@ -140,7 +140,6 @@ IRDATA_FLAGS_IS_MSB_FIRST LITERAL1 RAW_BUFFER_LENGTH LITERAL1 EXCLUDE_UNIVERSAL_PROTOCOLS LITERAL1 EXCLUDE_EXOTIC_PROTOCOLS LITERAL1 -DECODE_STRICT_CHECKS LITERAL1 IR_REMOTE_DISABLE_RECEIVE_COMPLETE_CALLBACK LITERAL1 MARK_EXCESS_MICROS LITERAL1 RECORD_GAP_MICROS LITERAL1 diff --git a/library.json b/library.json index 62260bdf..7aecaa48 100644 --- a/library.json +++ b/library.json @@ -1,6 +1,6 @@ { "name": "IRremote", - "version": "4.4.3", + "version": "4.5.0", "description": "Send and receive infrared signals with multiple protocols", "keywords": "communication, infrared, ir, remote", "homepage": "https://github.com/Arduino-IRremote/Arduino-IRremote", diff --git a/library.properties b/library.properties index b5c0b1eb..ec368ba6 100644 --- a/library.properties +++ b/library.properties @@ -1,9 +1,9 @@ name=IRremote -version=4.4.3 +version=4.5.0 author=shirriff, z3t0, ArminJo maintainer=Armin Joachimsmeyer 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, FAST, MagiQuest, Universal Pulse Distance and Pulse Width. +paragraph=Currently included protocols: Denon / Sharp, JVC, LG / LG2, NEC / Onkyo / Apple, Panasonic / Kaseikyo, RC5, RC6, Samsung, Sony, (Pronto), BangOlufsen, BoseWave, Lego, Whynter, FAST, MagiQuest, Velux, Universal Pulse Distance and Pulse Width. category=Communication url=https://github.com/Arduino-IRremote/Arduino-IRremote architectures=avr,megaavr,samd,esp8266,esp32,stm32,STM32F1,mbed,mbed_nano,rp2040,mbed_rp2040,renesas_uno diff --git a/src/IRFeedbackLED.hpp b/src/IRFeedbackLED.hpp index 0db0c02f..a40abdad 100644 --- a/src/IRFeedbackLED.hpp +++ b/src/IRFeedbackLED.hpp @@ -40,104 +40,96 @@ * Contains pin number and enable status of the feedback LED */ struct FeedbackLEDControlStruct { - uint8_t FeedbackLEDPin; ///< if 0, then take board specific FEEDBACK_LED_ON() and FEEDBACK_LED_OFF() functions - uint8_t LedFeedbackEnabled; ///< LED_FEEDBACK_ENABLED_FOR_RECEIVE or LED_FEEDBACK_ENABLED_FOR_SEND -> enable blinking of pin on IR processing + uint8_t FeedbackLEDPin = USE_DEFAULT_FEEDBACK_LED_PIN; ///< if USE_DEFAULT_FEEDBACK_LED_PIN / 0, then use digitalWriteFast(LED_BUILTIN,..) otherwise use digitalWrite(FeedbackLEDPin,..) + bool LedFeedbackEnabled; ///< Disabled for receive at default. Feedback for send is always enabled and can be disabled by NO_LED_SEND_FEEDBACK_CODE or #define NO_LED_FEEDBACK_CODE macros }; struct FeedbackLEDControlStruct FeedbackLEDControl; ///< The feedback LED control instance /** - * Enables blinking of feedback LED (LED_BUILTIN is taken as default) on IR sending and receiving - * Cannot disable it here!!! Use disableLEDFeedbackForReceive() or disableLEDFeedbackForSend() - * @param aFeedbackLEDPin If aFeedbackLEDPin == 0, then take board specific FEEDBACK_LED_ON() and FEEDBACK_LED_ON() and FEEDBACK_LED_OFF() functions - * If FeedbackLEDPin == 0 and no LED_BUILTIN defined, disable LED feedback - * @param aEnableLEDFeedback If LED_FEEDBACK_ENABLED_FOR_RECEIVE or LED_FEEDBACK_ENABLED_FOR_SEND -> enable blinking of Feedback LED + * @param aFeedbackLEDPin If FeedbackLEDPin != USE_DEFAULT_FEEDBACK_LED_PIN / 0, then use digitalWrite(FeedbackLEDPin,..) + * If FeedbackLEDPin == USE_DEFAULT_FEEDBACK_LED_PIN / 0 and no LED_BUILTIN defined, disable LED feedback */ -void setLEDFeedback(uint8_t aFeedbackLEDPin, uint8_t aEnableLEDFeedback) { - - FeedbackLEDControl.FeedbackLEDPin = aFeedbackLEDPin; // default is 0 -> use LED_BUILTIN if available, else disable feedback - - if (aEnableLEDFeedback != DO_NOT_ENABLE_LED_FEEDBACK) { - FeedbackLEDControl.LedFeedbackEnabled |= aEnableLEDFeedback; - if (aFeedbackLEDPin != USE_DEFAULT_FEEDBACK_LED_PIN) { - pinModeFast(aFeedbackLEDPin, OUTPUT); -#if defined(LED_BUILTIN) - } else { - pinModeFast(LED_BUILTIN, OUTPUT); -#else - FeedbackLEDControl.LedFeedbackEnabled = LED_FEEDBACK_DISABLED_COMPLETELY; // we have no LED_BUILTIN available -#endif - } - } +void setLEDFeedbackPin(uint8_t aFeedbackLEDPin) { + FeedbackLEDControl.FeedbackLEDPin = aFeedbackLEDPin; } /* * Direct replacement for blink13() */ void setLEDFeedback(bool aEnableLEDFeedback) { - bool tEnableLEDFeedback = LED_FEEDBACK_DISABLED_COMPLETELY; - if (aEnableLEDFeedback) { - tEnableLEDFeedback = LED_FEEDBACK_ENABLED_FOR_SEND | LED_FEEDBACK_ENABLED_FOR_RECEIVE; - } - setLEDFeedback(FeedbackLEDControl.FeedbackLEDPin, tEnableLEDFeedback); + FeedbackLEDControl.LedFeedbackEnabled = aEnableLEDFeedback; } +/* + * Historically this only affects receive LED + */ void enableLEDFeedback() { - FeedbackLEDControl.LedFeedbackEnabled |= LED_FEEDBACK_ENABLED_FOR_RECEIVE; + FeedbackLEDControl.LedFeedbackEnabled = ENABLE_LED_FEEDBACK; } - void disableLEDFeedback() { - FeedbackLEDControl.LedFeedbackEnabled &= ~(LED_FEEDBACK_ENABLED_FOR_RECEIVE); -} - -void enableLEDFeedbackForSend() { - FeedbackLEDControl.LedFeedbackEnabled |= LED_FEEDBACK_ENABLED_FOR_SEND; -} - -void disableLEDFeedbackForSend() { - FeedbackLEDControl.LedFeedbackEnabled &= ~(LED_FEEDBACK_ENABLED_FOR_SEND); + FeedbackLEDControl.LedFeedbackEnabled = DISABLE_LED_FEEDBACK; } /** * Flash LED while receiving or sending IR data. Does not check if enabled, this must be done by the caller. - * Handles the 0 value of FeedbackLEDPin and the macro FEEDBACK_LED_IS_ACTIVE_LOW. + * Handles the USE_DEFAULT_FEEDBACK_LED_PIN / 0 value of FeedbackLEDPin and the macro FEEDBACK_LED_IS_ACTIVE_LOW. + * If FeedbackLEDPin == USE_DEFAULT_FEEDBACK_LED_PIN and LED_BUILTIN is NOT defined no action is done */ #if defined(ESP32) || defined(ESP8266) IRAM_ATTR #endif void setFeedbackLED(bool aSwitchLedOn) { if (aSwitchLedOn) { - if (FeedbackLEDControl.FeedbackLEDPin != USE_DEFAULT_FEEDBACK_LED_PIN) { - // Turn user defined pin LED on -#if defined(FEEDBACK_LED_IS_ACTIVE_LOW) - if (__builtin_constant_p(FeedbackLEDControl.FeedbackLEDPin) ) { digitalWriteFast(FeedbackLEDControl.FeedbackLEDPin, LOW);} else { digitalWrite(FeedbackLEDControl.FeedbackLEDPin, LOW);} -#else - if (__builtin_constant_p(FeedbackLEDControl.FeedbackLEDPin) ) { digitalWriteFast(FeedbackLEDControl.FeedbackLEDPin, HIGH);} else { digitalWrite(FeedbackLEDControl.FeedbackLEDPin, HIGH);} -#endif + // Turn user defined pin LED on + if (FeedbackLEDControl.FeedbackLEDPin == USE_DEFAULT_FEEDBACK_LED_PIN) { #if defined(LED_BUILTIN) // use fast macros here - } else { # if defined(FEEDBACK_LED_IS_ACTIVE_LOW) digitalWriteFast(LED_BUILTIN, LOW); // For AVR, this generates a single cbi command # else digitalWriteFast(LED_BUILTIN, HIGH); // For AVR, this generates a single sbi command # endif #endif - } - } else { - if (FeedbackLEDControl.FeedbackLEDPin != USE_DEFAULT_FEEDBACK_LED_PIN) { - // Turn user defined pin LED off + + } else { #if defined(FEEDBACK_LED_IS_ACTIVE_LOW) - if (__builtin_constant_p(FeedbackLEDControl.FeedbackLEDPin) ) { digitalWriteFast(FeedbackLEDControl.FeedbackLEDPin, HIGH);} else { digitalWrite(FeedbackLEDControl.FeedbackLEDPin, HIGH);} + if (__builtin_constant_p(FeedbackLEDControl.FeedbackLEDPin) ) { + digitalWriteFast(FeedbackLEDControl.FeedbackLEDPin, LOW); + } else { + digitalWrite(FeedbackLEDControl.FeedbackLEDPin, LOW); + } #else - if (__builtin_constant_p(FeedbackLEDControl.FeedbackLEDPin) ) { digitalWriteFast(FeedbackLEDControl.FeedbackLEDPin, LOW);} else { digitalWrite(FeedbackLEDControl.FeedbackLEDPin, LOW);} + if (__builtin_constant_p(FeedbackLEDControl.FeedbackLEDPin)) { + digitalWriteFast(FeedbackLEDControl.FeedbackLEDPin, HIGH); + } else { + digitalWrite(FeedbackLEDControl.FeedbackLEDPin, HIGH); + } #endif + } + + } else { + // Turn user defined pin LED off + if (FeedbackLEDControl.FeedbackLEDPin == USE_DEFAULT_FEEDBACK_LED_PIN) { #if defined(LED_BUILTIN) - } else { # if defined(FEEDBACK_LED_IS_ACTIVE_LOW) digitalWriteFast(LED_BUILTIN, HIGH); // For AVR, this generates a single sbi command # else digitalWriteFast(LED_BUILTIN, LOW); // For AVR, this generates a single cbi command # endif +#endif + } else { +#if defined(FEEDBACK_LED_IS_ACTIVE_LOW) + if (__builtin_constant_p(FeedbackLEDControl.FeedbackLEDPin) ) { + digitalWriteFast(FeedbackLEDControl.FeedbackLEDPin, HIGH); + } else { + digitalWrite(FeedbackLEDControl.FeedbackLEDPin, HIGH); + } +#else + if (__builtin_constant_p(FeedbackLEDControl.FeedbackLEDPin)) { + digitalWriteFast(FeedbackLEDControl.FeedbackLEDPin, LOW); + } else { + digitalWrite(FeedbackLEDControl.FeedbackLEDPin, LOW); + } #endif } } @@ -147,13 +139,13 @@ void setFeedbackLED(bool aSwitchLedOn) { * Old deprecated function name for setLEDFeedback() or enableLEDFeedback() / disableLEDFeedback() */ void IRrecv::blink13(uint8_t aEnableLEDFeedback) { - setLEDFeedback(FeedbackLEDControl.FeedbackLEDPin, aEnableLEDFeedback); + setLEDFeedback(aEnableLEDFeedback); } /** * Old deprecated function name for setLEDFeedback() */ void setBlinkPin(uint8_t aBlinkPin) { - setLEDFeedback(aBlinkPin, FeedbackLEDControl.LedFeedbackEnabled); + setLEDFeedbackPin(aBlinkPin); } /** @}*/ diff --git a/src/IRProtocol.h b/src/IRProtocol.h index 8f144589..258aaf5b 100644 --- a/src/IRProtocol.h +++ b/src/IRProtocol.h @@ -32,6 +32,59 @@ #ifndef _IR_PROTOCOL_H #define _IR_PROTOCOL_H +/* + * If activated, BANG_OLUFSEN, BOSEWAVE, MAGIQUEST, WHYNTER, FAST and LEGO_PF are excluded in decoding and in sending with IrSender.write + */ +//#define EXCLUDE_EXOTIC_PROTOCOLS + +/* + * Supported IR protocols + * Each protocol you include costs memory and, during decode, costs time + * Copy the lines with the protocols you need in your program before the #include line + * See also SimpleReceiver example + */ + +#if !defined(NO_DECODER) // for sending raw only +# if (!(defined(DECODE_DENON) || defined(DECODE_JVC) || defined(DECODE_KASEIKYO) \ +|| defined(DECODE_PANASONIC) || defined(DECODE_LG) || defined(DECODE_NEC) || defined(DECODE_ONKYO) || defined(DECODE_SAMSUNG) \ +|| defined(DECODE_SONY) || defined(DECODE_RC5) || defined(DECODE_RC6) \ +|| defined(DECODE_DISTANCE_WIDTH) || defined(DECODE_HASH) || defined(DECODE_BOSEWAVE) \ +|| defined(DECODE_LEGO_PF) || defined(DECODE_MAGIQUEST) || defined(DECODE_FAST) || defined(DECODE_WHYNTER))) +/* + * If no protocol is explicitly enabled, we enable all protocols + */ +#define DECODE_DENON // Includes Sharp +#define DECODE_JVC +#define DECODE_KASEIKYO +#define DECODE_PANASONIC // alias for DECODE_KASEIKYO +#define DECODE_LG +#define DECODE_NEC // Includes Apple and Onkyo +#define DECODE_SAMSUNG +#define DECODE_SONY +#define DECODE_RC5 +#define DECODE_RC6 + +# if !defined(EXCLUDE_EXOTIC_PROTOCOLS) // saves around 2000 bytes program memory +#define DECODE_BOSEWAVE +#define DECODE_LEGO_PF +#define DECODE_MAGIQUEST +#define DECODE_WHYNTER +#define DECODE_FAST +# endif + +# if !defined(EXCLUDE_UNIVERSAL_PROTOCOLS) +#define DECODE_DISTANCE_WIDTH // universal decoder for pulse distance width protocols - requires up to 750 bytes additional program memory +#define DECODE_HASH // special decoder for all protocols - requires up to 250 bytes additional program memory +# endif +# endif +#endif // !defined(NO_DECODER) + +//#define DECODE_BEO // Bang & Olufsen protocol always must be enabled explicitly. It prevents decoding of SONY! + +#if defined(DECODE_NEC) && !(~(~DECODE_NEC + 0) == 0 && ~(~DECODE_NEC + 1) == 1) +#warning "The macros DECODE_XXX no longer require a value. Decoding is now switched by defining / non defining the macro." +#endif + /** * An enum consisting of all supported formats. * You do NOT need to remove entries from this list when disabling protocols! @@ -69,7 +122,8 @@ typedef enum { LEGO_PF, MAGIQUEST, WHYNTER, /* 30 */ - FAST + FAST, + OTHER } decode_type_t; extern const char *const ProtocolNames[]; // The array of name strings for the decode_type_t enum @@ -100,37 +154,7 @@ struct DistanceWidthTimingInfoStruct { #define IRDATA_FLAGS_WAS_OVERFLOW 0x40 ///< irparams.rawlen is set to 0 in this case to avoid endless OverflowFlag. #define IRDATA_FLAGS_IS_MSB_FIRST 0x80 ///< Value is mainly determined by the (known) protocol. #define IRDATA_FLAGS_IS_LSB_FIRST 0x00 - -#define DECODED_RAW_DATA_ARRAY_SIZE ((((RAW_BUFFER_LENGTH - 2) - 1) / (2 * BITS_IN_RAW_DATA_TYPE)) + 1) // The -2 is for initial gap + stop bit mark, 128 mark + spaces for 64 bit. -/** - * Data structure for the user application, available as decodedIRData. - * Filled by decoders and read by print functions or user application. - */ -struct IRData { - decode_type_t protocol; ///< UNKNOWN, NEC, SONY, RC5, PULSE_DISTANCE, ... - uint16_t address; ///< Decoded address, Distance protocol (tMarkTicksLong (if tMarkTicksLong == 0, then tMarkTicksShort) << 8) | tSpaceTicksLong - uint16_t command; ///< Decoded command, Distance protocol (tMarkTicksShort << 8) | tSpaceTicksShort - uint16_t extra; ///< Contains upper 16 bit of Magiquest WandID, Kaseikyo unknown vendor ID and Distance protocol (HeaderMarkTicks << 8) | HeaderSpaceTicks. - IRRawDataType decodedRawData; ///< Up to 32/64 bit decoded raw data, to be used for send functions. -#if defined(DECODE_DISTANCE_WIDTH) - // This replaces the address, command, extra and decodedRawData in case of protocol == PULSE_DISTANCE or -rather seldom- protocol == PULSE_WIDTH. - DistanceWidthTimingInfoStruct DistanceWidthTimingInfo; // 12 bytes - IRRawDataType decodedRawDataArray[DECODED_RAW_DATA_ARRAY_SIZE]; ///< 32/64 bit decoded raw data, to be used for send function. -#endif - uint16_t numberOfBits; ///< Number of bits received for data (address + command + parity) - to determine protocol length if different length are possible. - uint8_t flags; ///< IRDATA_FLAGS_IS_REPEAT, IRDATA_FLAGS_WAS_OVERFLOW etc. See IRDATA_FLAGS_* definitions above - - /* - * These 2 variables allow to call resume() directly after decode. - * After resume(), decodedIRData.rawDataPtr->initialGapTicks and decodedIRData.rawDataPtr->rawlen are - * the first variables, which are overwritten by the next received frame. - * since 4.3.0. - */ - IRRawlenType rawlen; ///< counter of entries in rawbuf of last received frame. - uint16_t initialGapTicks; ///< contains the initial gap (pre 4.4: the value in rawbuf[0]) of the last received frame. - - irparams_struct *rawDataPtr; ///< Pointer of the raw timing data to be decoded. Mainly the OverflowFlag and the data buffer filled by receiving ISR. -}; +#define IRDATA_FLAGS_LSB_MSB_FIRST_MASK IRDATA_FLAGS_IS_MSB_FIRST extern uint8_t sLastSendToggleValue; // Currently used by RC5 + RC6 @@ -146,9 +170,14 @@ struct PulseDistanceWidthProtocolConstants { /* * Definitions for member PulseDistanceWidthProtocolConstants.Flags */ -#define SUPPRESS_STOP_BIT 0x20 // Stop bit is otherwise sent for all pulse distance protocols, i.e. aOneSpaceMicros != aZeroSpaceMicros. -#define PROTOCOL_IS_MSB_FIRST IRDATA_FLAGS_IS_MSB_FIRST -#define PROTOCOL_IS_LSB_FIRST IRDATA_FLAGS_IS_LSB_FIRST +#define PROTOCOL_IS_PULSE_DISTANCE 0x00 +#define PROTOCOL_IS_PULSE_DISTANCE_WIDTH 0x00 // can often successfully be decoded as pulse distance +#define PROTOCOL_IS_PULSE_WIDTH 0x10 +#define PROTOCOL_IS_PULSE_WIDTH_MASK PROTOCOL_IS_PULSE_WIDTH +#define SUPPRESS_STOP_BIT 0x20 // Stop bit is otherwise sent for all pulse distance protocols, i.e. aOneSpaceMicros != aZeroSpaceMicros. +#define PROTOCOL_IS_MSB_FIRST IRDATA_FLAGS_IS_MSB_FIRST +#define PROTOCOL_IS_LSB_FIRST IRDATA_FLAGS_IS_LSB_FIRST +#define PROTOCOL_IS_MSB_MASK IRDATA_FLAGS_IS_MSB_FIRST /* * Carrier frequencies for various protocols @@ -171,8 +200,6 @@ const __FlashStringHelper* getProtocolString(decode_type_t aProtocol); #else const char* getProtocolString(decode_type_t aProtocol); #endif -void printIRResultShort(Print *aSerial, IRData *aIRDataPtr, bool aPrintRepeatGap) __attribute__ ((deprecated ("Remove last parameter, it is not supported any more."))); -void printIRResultShort(Print *aSerial, IRData *aIRDataPtr); // A static function to be able to print send or copied received data. /* * Convenience functions to convert MSB to LSB values diff --git a/src/IRProtocol.hpp b/src/IRProtocol.hpp index bed8fa7a..aa058fa2 100644 --- a/src/IRProtocol.hpp +++ b/src/IRProtocol.hpp @@ -74,6 +74,7 @@ const char string_Lego[] PROGMEM = "Lego"; const char string_MagiQuest[] PROGMEM = "MagiQuest"; const char string_Whynter[] PROGMEM = "Whynter"; const char string_FAST[] PROGMEM = "FAST"; +const char string_Other[] PROGMEM = "OTHER"; /* * !!Must be the same order as in decode_type_t in IRProtocol.h!!! @@ -84,7 +85,7 @@ PROGMEM = { string_Unknown, string_PulseWidth, string_PulseDistance, string_Appl string_Kaseikyo_JVC, string_Kaseikyo_Mitsubishi, string_RC5, string_RC6, string_RC6A, string_Samsung, string_SamsungLG, string_Samsung48, string_Sharp, string_Sony #if !defined(EXCLUDE_EXOTIC_PROTOCOLS) - , string_BangOlufsen, string_BoseWave, string_Lego, string_MagiQuest, string_Whynter, string_FAST + , string_BangOlufsen, string_BoseWave, string_Lego, string_MagiQuest, string_Whynter, string_FAST, string_Other #endif }; @@ -150,127 +151,6 @@ namespace PrintULL { # endif #endif -/** @} - * \addtogroup Print Print functions - * @{ - */ -/** - * Function to print decoded result and flags in one line. - * A static function to be able to print data to send or copied received data. - * Ends with println(). - * - * @param aSerial The Print object on which to write, for Arduino you can use &Serial. - * @param aIRDataPtr Pointer to the data to be printed. - * @param aPrintRepeatGap If true also print the gap before repeats. - * - */ -void printIRResultShort(Print *aSerial, IRData *aIRDataPtr, bool aPrintRepeatGap) { - (void) aPrintRepeatGap; - printIRResultShort(aSerial, aIRDataPtr); -} -void printIRResultShort(Print *aSerial, IRData *aIRDataPtr) { - if (aIRDataPtr->flags & IRDATA_FLAGS_WAS_OVERFLOW) { - aSerial->println(F("Overflow")); - return; - } - aSerial->print(F("Protocol=")); - aSerial->print(getProtocolString(aIRDataPtr->protocol)); - if (aIRDataPtr->protocol == UNKNOWN) { -#if defined(DECODE_HASH) - aSerial->print(F(" Hash=0x")); -#if (__INT_WIDTH__ < 32) - aSerial->print(aIRDataPtr->decodedRawData, HEX); -#else - PrintULL::print(aSerial,aIRDataPtr->decodedRawData, HEX); -#endif - -#endif -#if !defined(DISABLE_CODE_FOR_RECEIVER) - aSerial->print(' '); - aSerial->print((aIRDataPtr->rawlen + 1) / 2, DEC); - aSerial->println(F(" bits (incl. gap and start) received")); -#endif - } else { -#if defined(DECODE_DISTANCE_WIDTH) - if (aIRDataPtr->protocol != PULSE_DISTANCE && aIRDataPtr->protocol != PULSE_WIDTH) { -#endif - /* - * New decoders have address and command - */ - aSerial->print(F(" Address=0x")); - aSerial->print(aIRDataPtr->address, HEX); - - aSerial->print(F(" Command=0x")); - aSerial->print(aIRDataPtr->command, HEX); - - if (aIRDataPtr->flags & IRDATA_FLAGS_EXTRA_INFO) { - aSerial->print(F(" Extra=0x")); - aSerial->print(aIRDataPtr->extra, HEX); - } - - if (aIRDataPtr->flags & IRDATA_FLAGS_PARITY_FAILED) { - aSerial->print(F(" Parity fail")); - } - - if (aIRDataPtr->flags & IRDATA_FLAGS_TOGGLE_BIT) { - aSerial->print(F(" Toggle=1")); - } -#if defined(DECODE_DISTANCE_WIDTH) - } -#endif - - /* - * Print raw data - */ - if (!(aIRDataPtr->flags & IRDATA_FLAGS_IS_REPEAT) || aIRDataPtr->decodedRawData != 0) { - aSerial->print(F(" Raw-Data=0x")); -#if (__INT_WIDTH__ < 32) - aSerial->print(aIRDataPtr->decodedRawData, HEX); -#else - PrintULL::print(aSerial, aIRDataPtr->decodedRawData, HEX); -#endif - /* - * Print number of bits processed - */ - aSerial->print(' '); - aSerial->print(aIRDataPtr->numberOfBits, DEC); - aSerial->print(F(" bits")); - - if (aIRDataPtr->flags & IRDATA_FLAGS_IS_MSB_FIRST) { - aSerial->print(F(" MSB first")); - } else { - aSerial->print(F(" LSB first")); - } - } - - /* - * Print gap and duration, in order to be able to compute the repeat period of the protocol by adding the next gap time - */ - if (aIRDataPtr->flags & (IRDATA_FLAGS_IS_AUTO_REPEAT | IRDATA_FLAGS_IS_REPEAT)) { - aSerial->print(' '); - if (aIRDataPtr->flags & IRDATA_FLAGS_IS_AUTO_REPEAT) { - aSerial->print(F("Auto-")); - } - aSerial->print(F("Repeat")); - } -#if !defined(DISABLE_CODE_FOR_RECEIVER) - aSerial->print(F(" Gap=")); - aSerial->print((uint32_t) aIRDataPtr->initialGapTicks * MICROS_PER_TICK); - aSerial->print(F("us")); - - uint16_t tSumOfDurationTicks = 0; - for (IRRawlenType i = 1; i < aIRDataPtr->rawlen; i++) { - tSumOfDurationTicks += aIRDataPtr->rawDataPtr->rawbuf[i]; - } - aSerial->print(F(" Duration=")); - aSerial->print((uint32_t) tSumOfDurationTicks * MICROS_PER_TICK, DEC); - aSerial->println(F("us")); -#else - aSerial->println(); -#endif - } -} - /** @} * \addtogroup Utils Utility functions * @{ diff --git a/src/IRReceive.hpp b/src/IRReceive.hpp index bf13923c..ba478066 100644 --- a/src/IRReceive.hpp +++ b/src/IRReceive.hpp @@ -9,7 +9,7 @@ ************************************************************************************ * MIT License * - * Copyright (c) 2009-2023 Ken Shirriff, Rafi Khan, Armin Joachimsmeyer + * Copyright (c) 2009-2025 Ken Shirriff, Rafi Khan, Armin Joachimsmeyer * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -34,7 +34,7 @@ #define _IR_RECEIVE_HPP #if defined(DEBUG) -//#define LOCAL_DEBUG // +#define LOCAL_DEBUG #else //#define LOCAL_DEBUG // This enables debug output only for this file #endif @@ -50,6 +50,11 @@ //#define _IR_MEASURE_TIMING // for ISR //#define _IR_TIMING_TEST_PIN 7 // "pinModeFast(_IR_TIMING_TEST_PIN, OUTPUT);" is executed at start() // + +#if !defined(NO_LED_RECEIVE_FEEDBACK_CODE) +#define LED_RECEIVE_FEEDBACK_CODE // Resolve the double negative +#endif + /** \addtogroup Receiving Receiving IR data for multiple protocols * @{ */ @@ -61,7 +66,7 @@ IRrecv IrReceiver; /* * The control structure instance */ -struct irparams_struct irparams; // the irparams instance +//struct irparams_struct irparams; // the irparams instance unsigned long sMicrosAtLastStopTimer = 0; // Used to adjust TickCounterForISR with uncounted ticks between stopTimer() and restartTimer() /** @@ -69,19 +74,11 @@ unsigned long sMicrosAtLastStopTimer = 0; // Used to adjust TickCounterForISR wi * @param IRReceivePin Arduino pin to use. No sanity check is made. */ IRrecv::IRrecv() { - decodedIRData.rawDataPtr = &irparams; // for decodePulseDistanceData() etc. setReceivePin(0); -#if !defined(NO_LED_RECEIVE_FEEDBACK_CODE) - setLEDFeedback(0, DO_NOT_ENABLE_LED_FEEDBACK); -#endif } IRrecv::IRrecv(uint_fast8_t aReceivePin) { - decodedIRData.rawDataPtr = &irparams; // for decodePulseDistanceData() etc. setReceivePin(aReceivePin); -#if !defined(NO_LED_RECEIVE_FEEDBACK_CODE) - setLEDFeedback(0, DO_NOT_ENABLE_LED_FEEDBACK); -#endif } /** @@ -90,10 +87,9 @@ IRrecv::IRrecv(uint_fast8_t aReceivePin) { * @param aFeedbackLEDPin if 0, then take board specific FEEDBACK_LED_ON() and FEEDBACK_LED_OFF() functions */ IRrecv::IRrecv(uint_fast8_t aReceivePin, uint_fast8_t aFeedbackLEDPin) { - decodedIRData.rawDataPtr = &irparams; // for decodePulseDistanceData() etc. setReceivePin(aReceivePin); -#if !defined(NO_LED_RECEIVE_FEEDBACK_CODE) - setLEDFeedback(aFeedbackLEDPin, DO_NOT_ENABLE_LED_FEEDBACK); +#if defined(LED_RECEIVE_FEEDBACK_CODE) + setLEDFeedbackPin(aFeedbackLEDPin); #else (void) aFeedbackLEDPin; #endif @@ -122,7 +118,8 @@ IRrecv::IRrecv(uint_fast8_t aReceivePin, uint_fast8_t aFeedbackLEDPin) { #pragma GCC diagnostic ignored "-Wvolatile" IRAM_ATTR #endif -void IRReceiveTimerInterruptHandler() { + +void IRrecv::ReceiveInterruptHandler() { #if defined(_IR_MEASURE_TIMING) && defined(_IR_TIMING_TEST_PIN) digitalWriteFast(_IR_TIMING_TEST_PIN, HIGH); // 2 clock cycles #endif @@ -139,11 +136,13 @@ void IRReceiveTimerInterruptHandler() { uint_fast8_t tIRInputLevel = (uint_fast8_t) digitalReadFast(irparams.IRReceivePin); #endif + uint_fast16_t tTickCounterForISR = irparams.TickCounterForISR; /* * Increase TickCounter and clip it at maximum 0xFFFF / 3.2 seconds at 50 us ticks */ if (irparams.TickCounterForISR < UINT16_MAX) { - irparams.TickCounterForISR++; // One more 50uS tick + tTickCounterForISR++; // One more 50uS tick + irparams.TickCounterForISR = tTickCounterForISR; } /* @@ -152,13 +151,14 @@ void IRReceiveTimerInterruptHandler() { */ // switch (irparams.StateForISR) { // - if (irparams.StateForISR == IR_REC_STATE_IDLE) { + uint_fast8_t tStateForISR = irparams.StateForISR; + if (tStateForISR == IR_REC_STATE_IDLE) { /* * Here we are just resumed and maybe in the middle of a transmission */ if (tIRInputLevel == INPUT_MARK) { // check if we did not start in the middle of a transmission by checking the minimum length of leading space - if (irparams.TickCounterForISR > RECORD_GAP_TICKS) { + if (tTickCounterForISR > RECORD_GAP_TICKS) { #if defined(_IR_MEASURE_TIMING) && defined(_IR_TIMING_TEST_PIN) // digitalWriteFast(_IR_TIMING_TEST_PIN, HIGH); // 2 clock cycles #endif @@ -170,14 +170,14 @@ void IRReceiveTimerInterruptHandler() { // irparams.rawbuf[0] = irparams.TickCounterForISR; // Usage of initialGapTicks enables usage of 8 bit buffer instead of 16 bit since 4.4, // because the big gap value is not stored in this buffer any more - irparams.initialGapTicks = irparams.TickCounterForISR; + irparams.initialGapTicks = tTickCounterForISR; irparams.rawlen = 1; irparams.StateForISR = IR_REC_STATE_MARK; } // otherwise stay in idle state irparams.TickCounterForISR = 0; // reset counter in both cases } - } else if (irparams.StateForISR == IR_REC_STATE_MARK) { + } else if (tStateForISR == IR_REC_STATE_MARK) { // Timing mark here, rawlen is even if (tIRInputLevel != INPUT_MARK) { /* @@ -186,17 +186,22 @@ void IRReceiveTimerInterruptHandler() { #if defined(_IR_MEASURE_TIMING) && defined(_IR_TIMING_TEST_PIN) // digitalWriteFast(_IR_TIMING_TEST_PIN, HIGH); // 2 clock cycles #endif - irparams.rawbuf[irparams.rawlen++] = irparams.TickCounterForISR; // record mark +#if RECORD_GAP_TICKS <= 400 + if (tTickCounterForISR > UINT8_MAX) { + tTickCounterForISR = UINT8_MAX; + } +#endif + irparams.rawbuf[irparams.rawlen++] = tTickCounterForISR; // record mark irparams.StateForISR = IR_REC_STATE_SPACE; irparams.TickCounterForISR = 0; // This resets the tick counter also at end of frame :-) } - } else if (irparams.StateForISR == IR_REC_STATE_SPACE) { + } else if (tStateForISR == IR_REC_STATE_SPACE) { /* * In space receiving here, rawlen is odd * Check for timeout or overflow */ - if (irparams.TickCounterForISR > RECORD_GAP_TICKS || irparams.rawlen >= RAW_BUFFER_LENGTH - 1) { + if (tTickCounterForISR > RECORD_GAP_TICKS || irparams.rawlen >= RAW_BUFFER_LENGTH - 1) { if (irparams.rawlen >= RAW_BUFFER_LENGTH) { // Flag up a read OverflowFlag; Stop the state machine irparams.OverflowFlag = true; @@ -210,7 +215,7 @@ void IRReceiveTimerInterruptHandler() { */ /* * These 2 variables allow to call resume() directly after decode. - * After resume(), decodedIRData.rawDataPtr->initialGapTicks and decodedIRData.rawDataPtr->rawlen are + * After resume(), irparams.initialGapTicks and irparams.rawlen are * the first variables, which are overwritten by the next received frame. * since 4.3.0. * For backward compatibility, there are the same 2 statements in decode() if IrReceiver is not used. @@ -235,11 +240,16 @@ void IRReceiveTimerInterruptHandler() { #if defined(_IR_MEASURE_TIMING) && defined(_IR_TIMING_TEST_PIN) // digitalWriteFast(_IR_TIMING_TEST_PIN, HIGH); // 2 clock cycles #endif - irparams.rawbuf[irparams.rawlen++] = irparams.TickCounterForISR; // record space +#if RECORD_GAP_TICKS <= 400 + if (tTickCounterForISR > UINT8_MAX) { + tTickCounterForISR = UINT8_MAX; + } +#endif + irparams.rawbuf[irparams.rawlen++] = tTickCounterForISR; // record space irparams.StateForISR = IR_REC_STATE_MARK; irparams.TickCounterForISR = 0; } - } else if (irparams.StateForISR == IR_REC_STATE_STOP) { + } else if (tStateForISR == IR_REC_STATE_STOP) { /* * Complete command received * stay here until resume() is called, which switches state to IR_REC_STATE_IDLE @@ -253,8 +263,8 @@ void IRReceiveTimerInterruptHandler() { } } -#if !defined(NO_LED_RECEIVE_FEEDBACK_CODE) - if (FeedbackLEDControl.LedFeedbackEnabled & LED_FEEDBACK_ENABLED_FOR_RECEIVE) { +#if defined(LED_RECEIVE_FEEDBACK_CODE) + if (FeedbackLEDControl.LedFeedbackEnabled) { setFeedbackLED(tIRInputLevel == INPUT_MARK); } #endif @@ -264,9 +274,22 @@ void IRReceiveTimerInterruptHandler() { #endif } - /* - * The ISR, which calls the interrupt handler + * The handler which directly calls the interrupt handler function of the IRrecv object. + * This must be a separate function, because we need this static function in IRTimer.hpp. + * Doing it this way, we are able to modify the body of this function to support multiple IRrecv instances for receiving + */ +void IRReceiveTimerInterruptHandler() { + IrReceiver.ReceiveInterruptHandler(); +#if defined(SUPPORT_MULTIPLE_RECEIVER_INSTANCES) + // Quick and dirty solution by used defined extension + UserIRReceiveTimerInterruptHandler(); +#endif +} + +/********************************************************************************************************************** + * Interrupt Service Routine - Called every 50 us + * This in turn calls calls the static interrupt handler function, which in turn calls the interrupt handler function of the IRrecv object */ #if defined(TIMER_INTR_NAME) || defined(ISR) # if defined(TIMER_INTR_NAME) @@ -293,12 +316,9 @@ ISR() void IRrecv::begin(uint_fast8_t aReceivePin, bool aEnableLEDFeedback, uint_fast8_t aFeedbackLEDPin) { setReceivePin(aReceivePin); -#if !defined(NO_LED_RECEIVE_FEEDBACK_CODE) - uint_fast8_t tEnableLEDFeedback = DO_NOT_ENABLE_LED_FEEDBACK; - if (aEnableLEDFeedback) { - tEnableLEDFeedback = LED_FEEDBACK_ENABLED_FOR_RECEIVE; - } - setLEDFeedback(aFeedbackLEDPin, tEnableLEDFeedback); +#if defined(LED_RECEIVE_FEEDBACK_CODE) + setLEDFeedback(aEnableLEDFeedback); + setLEDFeedbackPin(aFeedbackLEDPin); #else (void) aEnableLEDFeedback; (void) aFeedbackLEDPin; @@ -662,7 +682,7 @@ bool IRrecv::decode() { #endif #if defined(DECODE_BOSEWAVE) - IR_TRACE_PRINTLN(F("Attempting Bosewave decode")); + IR_TRACE_PRINTLN(F("Attempting Bosewave decode")); if (decodeBoseWave()) { return true; } @@ -708,58 +728,128 @@ bool IRrecv::decode() { * Common decode functions **********************************************************************************************************************/ /** - * Decode pulse distance width protocols. We only check the mark or space length of a 1, otherwise we always assume a 0! + * Decode pulse distance width protocols. We only check the mark or space length of a 1 against a threshold value, otherwise we always assume a 0! + * using matchMark() and matchSpace(), which includes MARK_EXCESS_MICROS in comparison. * * We can have the following protocol timings * PULSE_DISTANCE: Pause/spaces have different length and determine the bit value, longer space is 1. Pulses/marks can be constant, like NEC. * PULSE_WIDTH: Pulses/marks have different length and determine the bit value, longer mark is 1. Pause/spaces can be constant, like Sony. - * PULSE_DISTANCE_WIDTH: Pulses/marks and pause/spaces have different length, often the bit length is constant, like MagiQuest. Can be decoded by PULSE_DISTANCE decoder. + * PULSE_DISTANCE_WIDTH: Pulses/marks and pause/spaces have different length, often the bit length is constant, like MagiQuest. Can be decoded using the PULSE_DISTANCE decoding. * - * Input is IrReceiver.decodedIRData.rawDataPtr->rawbuf[] + * Input is IrReceiver.irparams.rawbuf[] * Output is IrReceiver.decodedIRData.decodedRawData * - * Assume PULSE_DISTANCE if aOneMarkMicros == aZeroMarkMicros - * - * @param aNumberOfBits Number of bits to decode from decodedIRData.rawDataPtr->rawbuf[] array. - * @param aStartOffset Offset in decodedIRData.rawDataPtr->rawbuf[] to start decoding. Must point to a mark. - * @param aOneMarkMicros Checked if PULSE_WIDTH - * @param aZeroMarkMicros Required for deciding if we have PULSE_DISTANCE. - * @param aOneSpaceMicros Checked if PULSE_DISTANCE. - * @param aMSBfirst If true send Most Significant Bit first, else send Least Significant Bit (lowest bit) first. - * @return true If decoding was successful + * @param aNumberOfBits Number of bits to decode from irparams.rawbuf[] array. + * @param aStartOffset Offset in irparams.rawbuf[] to start decoding. Must point to a mark. + * @param aOneMicros Timing value for 1 + * @param aIsPulseWidthProtocol If true the aOneThresholdMicros id the mark threshold for 1, otherwise the space threshold + * @param aMSBfirst If true send Most Significant Bit first, else send Least Significant Bit (lowest bit) first. */ -bool IRrecv::decodePulseDistanceWidthData(uint_fast8_t aNumberOfBits, IRRawlenType aStartOffset, uint16_t aOneMarkMicros, - uint16_t aOneSpaceMicros, uint16_t aZeroMarkMicros, bool aMSBfirst) { +void IRrecv::decodePulseDistanceWidthData(uint_fast8_t aNumberOfBits, IRRawlenType aStartOffset, uint16_t aOneMicros, + bool aIsPulseWidthProtocol, bool aMSBfirst) { - auto *tRawBufPointer = &decodedIRData.rawDataPtr->rawbuf[aStartOffset]; - - bool isPulseDistanceProtocol = (aOneMarkMicros == aZeroMarkMicros); // If true, we check aOneSpaceMicros -> pulse distance protocol +#if defined(LOCAL_DEBUG) + Serial.print(F("aOneMicros=")); + Serial.print(aOneMicros); + Serial.print(F(", 0.75*aOneMicros=")); + Serial.print((aOneMicros * 3) / 4); + Serial.print(F(", MARK_EXCESS_MICROS=" STR(MARK_EXCESS_MICROS) " isPulseWidthProtocol=")); + Serial.print(aIsPulseWidthProtocol); + Serial.println(); +#endif IRRawDataType tDecodedData = 0; // For MSB first tDecodedData is shifted left each loop IRRawDataType tMask = 1UL; // Mask is only used for LSB first + auto *tRawBufPointer = &irparams.rawbuf[aStartOffset]; for (uint_fast8_t i = aNumberOfBits; i > 0; i--) { - // get one mark and space pair - unsigned int tMarkTicks; - unsigned int tSpaceTicks; - bool tBitValue; - if (isPulseDistanceProtocol) { + bool tBitValue; + uint16_t tCurrentTicks; + if (aIsPulseWidthProtocol) { + /* + * PULSE_WIDTH here. + * !!!We only check variable length mark indicating a 1 or 0!!! + */ + tCurrentTicks = *tRawBufPointer++; + tBitValue = matchMark(tCurrentTicks, aOneMicros); // Check for variable length mark indicating a 1 or 0 + tRawBufPointer++; + } else { /* * PULSE_DISTANCE -including PULSE_DISTANCE_WIDTH- here. * !!!We only check variable length space indicating a 1 or 0!!! */ tRawBufPointer++; - tSpaceTicks = *tRawBufPointer++; // maybe buffer overflow for last bit, but we do not evaluate this value :-) - tBitValue = matchSpace(tSpaceTicks, aOneSpaceMicros); // Check for variable length space indicating a 1 or 0 + tCurrentTicks = *tRawBufPointer++; // maybe buffer overflow for last bit, but we do not evaluate this value :-) + tBitValue = matchSpace(tCurrentTicks, aOneMicros); // Check for variable length space indicating a 1 or 0 + } + if (aMSBfirst) { + tDecodedData <<= 1; + } + + if (tBitValue) { + // It's a 1 -> set the bit + if (aMSBfirst) { + tDecodedData |= 1; + } else { + tDecodedData |= tMask; + } + IR_TRACE_PRINT(tCurrentTicks); + IR_TRACE_PRINTLN(F(" => 1")); } else { - /* - * PULSE_WIDTH here. - * !!!We only check variable length mark indicating a 1 or 0!!! - */ - tMarkTicks = *tRawBufPointer++; - tBitValue = matchMark(tMarkTicks, aOneMarkMicros); // Check for variable length mark indicating a 1 or 0 + // do not set the bit + IR_TRACE_PRINT(tCurrentTicks); + IR_TRACE_PRINTLN(F(" => 0")); + } + tMask <<= 1; + } + decodedIRData.decodedRawData = tDecodedData; +} + +/** + * New threshold decoder to be activated by USE_THRESHOLD_DECODER + * Assumes a 0 for shorter and a 1 for longer timing. Thus the value must be eventually inverted by the calling protocol decoder (MagiQuest). + * In normal decoder we check the if we have a timing for a 1 (normally the longer timing) within a range of 75 % and 125 % of the nominal timing see TICKS_LOW. + * Many protocols have a ratio of 1 to 3 between short and long timing. In this case this decoder extends the range to 66% and the upper bound does not matter anyway. + * I hope that this will give slightly better results especially for + * - jittering signals + * - protocols with a smaller timing ratio than 1 to 2 + * - protocols with short 1 pulses / pauses like MagiQuest. + * Requires up to 458 bytes more program space, if more than 1 protocol is involved. + * but saves 90 bytes if only e.g. NEC is selected. + * + * @param aNumberOfBits Number of bits to decode from irparams.rawbuf[] array. + * @param aStartOffset Offset in irparams.rawbuf[] to start decoding. Must point to a mark. + * @param aOneThresholdMicros Threshold value for 1 + * @param aIsPulseWidthProtocol If true the aOneThresholdMicros id the mark threshold for 1, otherwise the space threshold + * @param aMSBfirst If true send Most Significant Bit first, else send Least Significant Bit (lowest bit) first. + */ +void IRrecv::decodeWithThresholdPulseDistanceWidthData(uint_fast8_t aNumberOfBits, IRRawlenType aStartOffset, + uint16_t aOneThresholdMicros, bool aIsPulseWidthProtocol, bool aMSBfirst) { + +#if defined(LOCAL_DEBUG) + Serial.print(F("OneThresholdMicros=")); + Serial.print(aOneThresholdMicros); + Serial.print(F(" isPulseWidthProtocol=")); + Serial.print(aIsPulseWidthProtocol); + Serial.println(); +#endif + + IRRawDataType tDecodedData = 0; // For MSB first tDecodedData is shifted left each loop + IRRawDataType tMask = 1UL; // Mask is only used for LSB first + auto *tRawBufPointer = &irparams.rawbuf[aStartOffset]; + + for (uint_fast8_t i = aNumberOfBits; i > 0; i--) { + + if (!aIsPulseWidthProtocol) { + tRawBufPointer++; + } + uint16_t tCurrentMicros = *tRawBufPointer * MICROS_PER_TICK; + bool tBitValue = tCurrentMicros > aOneThresholdMicros; // Check for variable length timing indicating a 1 or 0 + tRawBufPointer++; + + if (aIsPulseWidthProtocol) { tRawBufPointer++; } @@ -774,26 +864,27 @@ bool IRrecv::decodePulseDistanceWidthData(uint_fast8_t aNumberOfBits, IRRawlenTy } else { tDecodedData |= tMask; } - IR_TRACE_PRINTLN(F("=> 1")); + IR_TRACE_PRINT(tCurrentMicros); + IR_TRACE_PRINTLN(F(" => 1")); } else { // do not set the bit - IR_TRACE_PRINTLN(F("=> 0")); + IR_TRACE_PRINT(tCurrentMicros); + IR_TRACE_PRINTLN(F(" => 0")); } tMask <<= 1; } decodedIRData.decodedRawData = tDecodedData; - return true; } -/* - * Old deprecated version with 7 parameters and unused aZeroSpaceMicros parameter +/** + * Old deprecated version with 3 timing parameters instead of one and a aIsPulseWidthProtocol flag */ -bool IRrecv::decodePulseDistanceWidthData(uint_fast8_t aNumberOfBits, IRRawlenType aStartOffset, uint16_t aOneMarkMicros, - uint16_t aZeroMarkMicros, uint16_t aOneSpaceMicros, uint16_t aZeroSpaceMicros, bool aMSBfirst) { +void IRrecv::decodePulseDistanceWidthData(uint_fast8_t aNumberOfBits, IRRawlenType aStartOffset, uint16_t aOneMarkMicros, + uint16_t aOneSpaceMicros, uint16_t aZeroMarkMicros, bool aMSBfirst) { - (void) aZeroSpaceMicros; - auto *tRawBufPointer = &decodedIRData.rawDataPtr->rawbuf[aStartOffset]; - bool isPulseDistanceProtocol = (aOneMarkMicros == aZeroMarkMicros); // If true, we have a constant mark -> pulse distance protocol + auto *tRawBufPointer = &irparams.rawbuf[aStartOffset]; + + bool isPulseDistanceProtocol = (aOneMarkMicros == aZeroMarkMicros); // If true, we check aOneSpaceMicros -> pulse distance protocol IRRawDataType tDecodedData = 0; // For MSB first tDecodedData is shifted left each loop IRRawDataType tMask = 1UL; // Mask is only used for LSB first @@ -806,16 +897,17 @@ bool IRrecv::decodePulseDistanceWidthData(uint_fast8_t aNumberOfBits, IRRawlenTy if (isPulseDistanceProtocol) { /* - * Pulse distance here, it is not required to check constant mark duration (aOneMarkMicros) and zero space duration. + * PULSE_DISTANCE -including PULSE_DISTANCE_WIDTH- here. + * !!!We only check variable length space indicating a 1 or 0!!! */ - - (void) aZeroSpaceMicros; tRawBufPointer++; tSpaceTicks = *tRawBufPointer++; // maybe buffer overflow for last bit, but we do not evaluate this value :-) tBitValue = matchSpace(tSpaceTicks, aOneSpaceMicros); // Check for variable length space indicating a 1 or 0 + } else { /* - * Pulse width here, it is not required to check (constant) space duration and zero mark duration. + * PULSE_WIDTH here. + * !!!We only check variable length mark indicating a 1 or 0!!! */ tMarkTicks = *tRawBufPointer++; tBitValue = matchMark(tMarkTicks, aOneMarkMicros); // Check for variable length mark indicating a 1 or 0 @@ -841,22 +933,32 @@ bool IRrecv::decodePulseDistanceWidthData(uint_fast8_t aNumberOfBits, IRRawlenTy tMask <<= 1; } decodedIRData.decodedRawData = tDecodedData; - return true; } /* + * Old deprecated version with 7 parameters and unused aZeroSpaceMicros parameter + */ +void IRrecv::decodePulseDistanceWidthData(uint_fast8_t aNumberOfBits, IRRawlenType aStartOffset, uint16_t aOneMarkMicros, + uint16_t aZeroMarkMicros, uint16_t aOneSpaceMicros, uint16_t aZeroSpaceMicros, bool aMSBfirst) { + + (void) aZeroSpaceMicros; + decodePulseDistanceWidthData(aNumberOfBits, aStartOffset, aOneMarkMicros, aZeroMarkMicros, aOneSpaceMicros, aMSBfirst); +} + +/* + * Only sensible for development or very exotic requirements. - Not used yet * Check for additional required characteristics of timing like length of mark for a constant mark protocol, * where space length determines the bit value. Requires up to 194 additional bytes of program memory. - * Only sensible for development or very exotic requirements. + * * @param aZeroMarkMicros For strict checks * @param aZeroSpaceMicros For strict checks + * @return true if decoding successful * - * Not used yet */ -bool IRrecv::decodePulseDistanceWidthDataStrict(uint_fast8_t aNumberOfBits, IRRawlenType aStartOffset, uint16_t aOneMarkMicros, - uint16_t aZeroMarkMicros, uint16_t aOneSpaceMicros, uint16_t aZeroSpaceMicros, bool aMSBfirst) { +bool IRrecv::decodeStrictPulseDistanceWidthData(uint_fast8_t aNumberOfBits, IRRawlenType aStartOffset, uint16_t aOneMarkMicros, + uint16_t aOneSpaceMicros, uint16_t aZeroMarkMicros, uint16_t aZeroSpaceMicros, bool aMSBfirst) { - auto *tRawBufPointer = &decodedIRData.rawDataPtr->rawbuf[aStartOffset]; + auto *tRawBufPointer = &irparams.rawbuf[aStartOffset]; bool isPulseDistanceProtocol = (aOneMarkMicros == aZeroMarkMicros); // If true, we have a constant mark -> pulse distance protocol @@ -871,13 +973,14 @@ bool IRrecv::decodePulseDistanceWidthDataStrict(uint_fast8_t aNumberOfBits, IRRa if (isPulseDistanceProtocol) { /* - * PULSE_DISTANCE here, it is not required to check constant mark duration (aOneMarkMicros) and zero space duration. + * PULSE_DISTANCE here (aOneMarkMicros == aZeroMarkMicros) + * We additionally check constant mark duration and in case of zero the zero space duration. */ tMarkTicks = *tRawBufPointer++; tSpaceTicks = *tRawBufPointer++; // maybe buffer overflow for last bit, but we do not evaluate this value :-) tBitValue = matchSpace(tSpaceTicks, aOneSpaceMicros); // Check for variable length space indicating a 1 or 0 - // Check for constant length mark + // Check for constant mark duration if (!matchMark(tMarkTicks, aOneMarkMicros)) { #if defined(LOCAL_DEBUG) Serial.print(F("Mark=")); @@ -891,15 +994,57 @@ bool IRrecv::decodePulseDistanceWidthDataStrict(uint_fast8_t aNumberOfBits, IRRa return false; } + // in case of 0, check for zero space duration + if (!tBitValue && !matchSpace(tSpaceTicks, aZeroSpaceMicros)) { +#if defined(LOCAL_DEBUG) + Serial.print(F("Space=")); + Serial.print(tSpaceTicks * MICROS_PER_TICK); + Serial.print(F(" is not ")); + Serial.print(aZeroSpaceMicros); + Serial.print(F(". Index=")); + Serial.print(aNumberOfBits - i); + Serial.print(' '); +#endif + return false; + } + } else { /* - * PULSE_DISTANCE -including PULSE_DISTANCE_WIDTH- here. - * !!!We only check variable length mark indicating a 1 or 0!!! - * It is not required to check space duration and zero mark duration. + * PULSE_WIDTH -including PULSE_DISTANCE_WIDTH- here. + * We additionally check two space durations and in case of zero the zero mark duration. */ tMarkTicks = *tRawBufPointer++; tBitValue = matchMark(tMarkTicks, aOneMarkMicros); // Check for variable length mark indicating a 1 or 0 tSpaceTicks = *tRawBufPointer++; // maybe buffer overflow for last bit, but we do not evaluate this value :-) + + // Check for space length, which is not constant in case of PULSE_DISTANCE_WIDTH + if ((tBitValue && !matchSpace(tSpaceTicks, aOneSpaceMicros)) + || ((!tBitValue && !matchSpace(tSpaceTicks, aZeroSpaceMicros)))) { +#if defined(LOCAL_DEBUG) + Serial.print(F("Space=")); + Serial.print(tSpaceTicks * MICROS_PER_TICK); + Serial.print(F(" is not ")); + Serial.print(aOneSpaceMicros); + Serial.print(F(" or ")); + Serial.print(aZeroSpaceMicros); + Serial.print(F(". Index=")); + Serial.print(aNumberOfBits - i); + Serial.print(' '); +#endif + return false; + } + if (!tBitValue && !matchMark(tMarkTicks, aZeroMarkMicros)) { +#if defined(LOCAL_DEBUG) + Serial.print(F("Mark=")); + Serial.print(tMarkTicks * MICROS_PER_TICK); + Serial.print(F(" is not ")); + Serial.print(aZeroMarkMicros); + Serial.print(F(". Index=")); + Serial.print(aNumberOfBits - i); + Serial.print(' '); +#endif + return false; + } } if (aMSBfirst) { @@ -915,61 +1060,9 @@ bool IRrecv::decodePulseDistanceWidthDataStrict(uint_fast8_t aNumberOfBits, IRRa } IR_TRACE_PRINTLN(F("=> 1")); } else { - /* - * Additionally check length of tSpaceTicks parameter for PULSE_DISTANCE or tMarkTicks for PULSE_WIDTH - * which determine a zero - */ - if (isPulseDistanceProtocol) { - if (!matchSpace(tSpaceTicks, aZeroSpaceMicros)) { -#if defined(LOCAL_DEBUG) - Serial.print(F("Space=")); - Serial.print(tSpaceTicks * MICROS_PER_TICK); - Serial.print(F(" is not ")); - Serial.print(aOneSpaceMicros); - Serial.print(F(" or ")); - Serial.print(aZeroSpaceMicros); - Serial.print(F(". Index=")); - Serial.print(aNumberOfBits - i); - Serial.print(' '); -#endif - return false; - } - } else { - if (!matchMark(tMarkTicks, aZeroMarkMicros)) { -#if defined(LOCAL_DEBUG) - Serial.print(F("Mark=")); - Serial.print(tMarkTicks * MICROS_PER_TICK); - Serial.print(F(" is not ")); - Serial.print(aOneMarkMicros); - Serial.print(F(" or ")); - Serial.print(aZeroMarkMicros); - Serial.print(F(". Index=")); - Serial.print(aNumberOfBits - i); - Serial.print(' '); -#endif - return false; - } - } // do not set the bit IR_TRACE_PRINTLN(F("=> 0")); } - // If we have no stop bit, assume that last space, which is not recorded, is correct, since we can not check it - if (aZeroSpaceMicros == aOneSpaceMicros - && tRawBufPointer < &decodedIRData.rawDataPtr->rawbuf[decodedIRData.rawDataPtr->rawlen]) { - // Check for constant length space (of pulse width protocol) here - if (!matchSpace(tSpaceTicks, aOneSpaceMicros)) { -#if defined(LOCAL_DEBUG) - Serial.print(F("Space=")); - Serial.print(tSpaceTicks * MICROS_PER_TICK); - Serial.print(F(" is not ")); - Serial.print(aOneSpaceMicros); - Serial.print(F(". Index=")); - Serial.print(aNumberOfBits - i); - Serial.print(' '); -#endif - return false; - } - } tMask <<= 1; } decodedIRData.decodedRawData = tDecodedData; @@ -980,21 +1073,54 @@ bool IRrecv::decodePulseDistanceWidthDataStrict(uint_fast8_t aNumberOfBits, IRRa * Decode pulse distance protocols for PulseDistanceWidthProtocolConstants. * @return true if decoding was successful */ -bool IRrecv::decodePulseDistanceWidthData(PulseDistanceWidthProtocolConstants *aProtocolConstants, uint_fast8_t aNumberOfBits, +#if defined(USE_STRICT_DECODER) +bool +#else +void +#endif +IRrecv::decodePulseDistanceWidthData(PulseDistanceWidthProtocolConstants *aProtocolConstants, uint_fast8_t aNumberOfBits, IRRawlenType aStartOffset) { - return decodePulseDistanceWidthData(aNumberOfBits, aStartOffset, aProtocolConstants->DistanceWidthTimingInfo.OneMarkMicros, - aProtocolConstants->DistanceWidthTimingInfo.OneSpaceMicros, aProtocolConstants->DistanceWidthTimingInfo.ZeroMarkMicros, - aProtocolConstants->Flags); +#if defined(USE_STRICT_DECODER) + return decodeStrictPulseDistanceWidthData(aNumberOfBits, aStartOffset, aProtocolConstants->DistanceWidthTimingInfo.OneMarkMicros, + aProtocolConstants->DistanceWidthTimingInfo.OneSpaceMicros, aProtocolConstants->DistanceWidthTimingInfo.ZeroMarkMicros, + aProtocolConstants->DistanceWidthTimingInfo.ZeroSpaceMicros, (aProtocolConstants->Flags & PROTOCOL_IS_MSB_MASK)); + +#else + bool tIsPulseWidthProtocol = aProtocolConstants->Flags & PROTOCOL_IS_PULSE_WIDTH_MASK; + uint16_t tThresholdMicros; + +# if defined(USE_THRESHOLD_DECODER) + if (tIsPulseWidthProtocol) { + // we check the length of marks here + tThresholdMicros = ((aProtocolConstants->DistanceWidthTimingInfo.OneMarkMicros + + aProtocolConstants->DistanceWidthTimingInfo.ZeroMarkMicros) / 2) - MARK_EXCESS_MICROS;// MARK_EXCESS_MICROS is 0 here if not explicitly specified by user + } else { + // we check the length of spaces here + tThresholdMicros = ((aProtocolConstants->DistanceWidthTimingInfo.OneSpaceMicros + + aProtocolConstants->DistanceWidthTimingInfo.ZeroSpaceMicros) / 2) + MARK_EXCESS_MICROS;// MARK_EXCESS_MICROS is 0 here if not explicitly specified by user + } + return decodeWithThresholdPulseDistanceWidthData(aNumberOfBits, aStartOffset, tThresholdMicros, + aProtocolConstants->Flags & PROTOCOL_IS_PULSE_WIDTH_MASK, (aProtocolConstants->Flags & PROTOCOL_IS_MSB_MASK)); +# else + if (tIsPulseWidthProtocol) { + tThresholdMicros = aProtocolConstants->DistanceWidthTimingInfo.OneMarkMicros; + } else { + tThresholdMicros = aProtocolConstants->DistanceWidthTimingInfo.OneSpaceMicros; + } + decodePulseDistanceWidthData(aNumberOfBits, aStartOffset, tThresholdMicros, + aProtocolConstants->Flags & PROTOCOL_IS_PULSE_WIDTH_MASK, (aProtocolConstants->Flags & PROTOCOL_IS_MSB_MASK)); +# endif +#endif } -bool IRrecv::decodePulseDistanceWidthData_P(PulseDistanceWidthProtocolConstants const *aProtocolConstantsPGM, +void IRrecv::decodePulseDistanceWidthData_P(PulseDistanceWidthProtocolConstants const *aProtocolConstantsPGM, uint_fast8_t aNumberOfBits, IRRawlenType aStartOffset) { PulseDistanceWidthProtocolConstants tTemporaryPulseDistanceWidthProtocolConstants; memcpy_P(&tTemporaryPulseDistanceWidthProtocolConstants, aProtocolConstantsPGM, sizeof(tTemporaryPulseDistanceWidthProtocolConstants)); - return decodePulseDistanceWidthData(&tTemporaryPulseDistanceWidthProtocolConstants, aNumberOfBits, aStartOffset); + decodePulseDistanceWidthData(&tTemporaryPulseDistanceWidthProtocolConstants, aNumberOfBits, aStartOffset); } /* @@ -1040,7 +1166,7 @@ uint_fast8_t IRrecv::getBiphaselevel() { * Setup data if sUsedTimingIntervals is 0 */ if (sBiphaseUsedTimingIntervals == 0) { - uint16_t tCurrentTimingWith = decodedIRData.rawDataPtr->rawbuf[sBiphaseDecodeRawbuffOffset]; + uint16_t tCurrentTimingWith = irparams.rawbuf[sBiphaseDecodeRawbuffOffset]; uint16_t tMarkExcessCorrection = (tLevelOfCurrentInterval == MARK) ? MARK_EXCESS_MICROS : -MARK_EXCESS_MICROS; if (matchTicks(tCurrentTimingWith, sBiphaseTimeUnit + tMarkExcessCorrection)) { @@ -1120,7 +1246,7 @@ bool IRrecv::decodeHash() { } for (IRRawlenType i = 1; (i + 2) < decodedIRData.rawlen; i++) { // Compare mark with mark and space with space - uint_fast8_t value = compare(decodedIRData.rawDataPtr->rawbuf[i], decodedIRData.rawDataPtr->rawbuf[i + 2]); + uint_fast8_t value = compare(irparams.rawbuf[i], irparams.rawbuf[i + 2]); // Add value into the hash hash = (hash * FNV_PRIME_32) ^ value; } @@ -1163,17 +1289,17 @@ bool IRrecv::decodeHashOld(decode_results *aResults) { */ bool IRrecv::checkHeader(PulseDistanceWidthProtocolConstants *aProtocolConstants) { // Check header "mark" and "space" - if (!matchMark(decodedIRData.rawDataPtr->rawbuf[1], aProtocolConstants->DistanceWidthTimingInfo.HeaderMarkMicros)) { + if (!matchMark(irparams.rawbuf[1], aProtocolConstants->DistanceWidthTimingInfo.HeaderMarkMicros)) { #if defined(LOCAL_TRACE) - Serial.print(::getProtocolString(aProtocolConstants->ProtocolIndex)); - Serial.println(F(": Header mark length is wrong")); + Serial.print(::getProtocolString(aProtocolConstants->ProtocolIndex)); + Serial.println(F(": Header mark length is wrong")); #endif return false; } - if (!matchSpace(decodedIRData.rawDataPtr->rawbuf[2], aProtocolConstants->DistanceWidthTimingInfo.HeaderSpaceMicros)) { + if (!matchSpace(irparams.rawbuf[2], aProtocolConstants->DistanceWidthTimingInfo.HeaderSpaceMicros)) { #if defined(LOCAL_TRACE) - Serial.print(::getProtocolString(aProtocolConstants->ProtocolIndex)); - Serial.println(F(": Header space length is wrong")); + Serial.print(::getProtocolString(aProtocolConstants->ProtocolIndex)); + Serial.println(F(": Header space length is wrong")); #endif return false; } @@ -1182,17 +1308,17 @@ bool IRrecv::checkHeader(PulseDistanceWidthProtocolConstants *aProtocolConstants bool IRrecv::checkHeader_P(PulseDistanceWidthProtocolConstants const *aProtocolConstantsPGM) { // Check header "mark" and "space" - if (!matchMark(decodedIRData.rawDataPtr->rawbuf[1], pgm_read_word(&aProtocolConstantsPGM->DistanceWidthTimingInfo.HeaderMarkMicros))) { + if (!matchMark(irparams.rawbuf[1], pgm_read_word(&aProtocolConstantsPGM->DistanceWidthTimingInfo.HeaderMarkMicros))) { #if defined(LOCAL_TRACE) - Serial.print(::getProtocolString(aProtocolConstantsPGM->ProtocolIndex)); - Serial.println(F(": Header mark length is wrong")); + Serial.print(::getProtocolString((decode_type_t) pgm_read_byte(&aProtocolConstantsPGM->ProtocolIndex))); + Serial.println(F(": Header mark length is wrong")); #endif return false; } - if (!matchSpace(decodedIRData.rawDataPtr->rawbuf[2], pgm_read_word(&aProtocolConstantsPGM->DistanceWidthTimingInfo.HeaderSpaceMicros))) { + if (!matchSpace(irparams.rawbuf[2], pgm_read_word(&aProtocolConstantsPGM->DistanceWidthTimingInfo.HeaderSpaceMicros))) { #if defined(LOCAL_TRACE) - Serial.print(::getProtocolString(aProtocolConstantsPGM->ProtocolIndex)); - Serial.println(F(": Header space length is wrong")); + Serial.print(::getProtocolString((decode_type_t) pgm_read_byte(&aProtocolConstantsPGM->ProtocolIndex))); + Serial.println(F(": Header space length is wrong")); #endif return false; } @@ -1208,7 +1334,7 @@ void IRrecv::checkForRepeatSpaceTicksAndSetFlag(uint16_t aMaximumRepeatSpaceTick if (decodedIRData.initialGapTicks < aMaximumRepeatSpaceTicks #if defined(ENABLE_COMPLETE_REPEAT_CHECK) // Check also for same command and address values to detect a repeat. Not sensible for standard protocols, because it is almost not possible to press 2 different buttons on the remote within around 100 ms - && decodedIRData.address == lastDecodedAddress && decodedIRData.command == lastDecodedCommand /* requires around 44 bytes program space */ + && decodedIRData.address == lastDecodedAddress && decodedIRData.command == lastDecodedCommand /* requires around 44 bytes program space */ #endif ) { decodedIRData.flags |= IRDATA_FLAGS_IS_REPEAT; @@ -1216,30 +1342,64 @@ void IRrecv::checkForRepeatSpaceTicksAndSetFlag(uint16_t aMaximumRepeatSpaceTick } /** - * Match function without compensating for marks exceeded or spaces shortened by demodulator hardware + * Match function WITHOUT compensating for marks exceeded or spaces shortened by demodulator hardware * @return true, if values match - * Currently not used */ bool matchTicks(uint16_t aMeasuredTicks, uint16_t aMatchValueMicros) { + uint16_t tMeasuredMicros = (aMeasuredTicks * MICROS_PER_TICK); + uint16_t tMatchValueMicrosQuarter = aMatchValueMicros / 4; #if defined(LOCAL_TRACE) - Serial.print(F("Testing: ")); - Serial.print(TICKS_LOW(aMatchValueMicros), DEC); - Serial.print(F(" <= ")); - Serial.print(aMeasuredTicks, DEC); - Serial.print(F(" <= ")); - Serial.print(TICKS_HIGH(aMatchValueMicros), DEC); -#endif - bool passed = ((aMeasuredTicks >= TICKS_LOW(aMatchValueMicros)) && (aMeasuredTicks <= TICKS_HIGH(aMatchValueMicros))); + Serial.print(F("Testing (actual vs desired): ")); + Serial.print(tMeasuredMicros); + Serial.print(F("us vs ")); + Serial.print(aMatchValueMicros); + Serial.print(F("us: ")); + Serial.print(tMatchValueMicrosQuarter * 3); // rounded value because we divide first + Serial.print(F(" <= ")); + Serial.print(aMeasuredTicks * MICROS_PER_TICK); + Serial.print(F(" <= ")); + Serial.print(tMatchValueMicrosQuarter * 5); +#endif + bool passed = (tMeasuredMicros >= (tMatchValueMicrosQuarter * 3) && tMeasuredMicros <= (tMatchValueMicrosQuarter * 5)); #if defined(LOCAL_TRACE) - if (passed) { - Serial.println(F(" => passed")); - } else { - Serial.println(F(" => FAILED")); - } + if (passed) { + Serial.println(F(" => passed")); + } else { + Serial.println(F(" => FAILED")); + } #endif return passed; } +/** + * Match function WITH compensating for marks exceeded or spaces shortened by demodulator hardware + * @return true, if values match + */ +bool matchTicks(uint16_t aMeasuredTicks, uint16_t aMatchValueMicros, int16_t aCompensationMicrosForTicks) { + uint16_t tMeasuredMicros = (aMeasuredTicks * MICROS_PER_TICK) + aCompensationMicrosForTicks; + uint16_t tMatchValueMicrosQuarter = aMatchValueMicros / 4; +#if defined(LOCAL_TRACE) + Serial.print(F("Testing (actual vs desired): ")); + Serial.print(tMeasuredMicros); + Serial.print(F("us vs ")); + Serial.print(aMatchValueMicros); + Serial.print(F("us: ")); + Serial.print(tMatchValueMicrosQuarter * 3); // rounded value because we divide first + Serial.print(F(" < ")); + Serial.print(aMeasuredTicks * MICROS_PER_TICK); + Serial.print(F(" <= ")); + Serial.print(tMatchValueMicrosQuarter * 5); +#endif + bool passed = (tMeasuredMicros > (tMatchValueMicrosQuarter * 3) && tMeasuredMicros <= (tMatchValueMicrosQuarter * 5)); +#if defined(LOCAL_TRACE) + if (passed) { + Serial.println(F(" => passed")); + } else { + Serial.println(F(" => FAILED")); + } +#endif + return passed; +} bool MATCH(uint16_t measured_ticks, uint16_t desired_us) { return matchTicks(measured_ticks, desired_us); } @@ -1249,29 +1409,43 @@ bool MATCH(uint16_t measured_ticks, uint16_t desired_us) { * @return true, if values match */ bool matchMark(uint16_t aMeasuredTicks, uint16_t aMatchValueMicros) { -#if defined(LOCAL_TRACE) - Serial.print(F("Testing mark (actual vs desired): ")); - Serial.print(aMeasuredTicks * MICROS_PER_TICK, DEC); - Serial.print(F("us vs ")); - Serial.print(aMatchValueMicros, DEC); - Serial.print(F("us: ")); - Serial.print(TICKS_LOW(aMatchValueMicros + MARK_EXCESS_MICROS) * MICROS_PER_TICK, DEC); - Serial.print(F(" <= ")); - Serial.print(aMeasuredTicks * MICROS_PER_TICK, DEC); - Serial.print(F(" <= ")); - Serial.print(TICKS_HIGH(aMatchValueMicros + MARK_EXCESS_MICROS) * MICROS_PER_TICK, DEC); -#endif - // compensate for marks exceeded by demodulator hardware - bool passed = ((aMeasuredTicks >= TICKS_LOW(aMatchValueMicros + MARK_EXCESS_MICROS)) - && (aMeasuredTicks <= TICKS_HIGH(aMatchValueMicros + MARK_EXCESS_MICROS))); -#if defined(LOCAL_TRACE) - if (passed) { - Serial.println(F(" => passed")); - } else { - Serial.println(F(" => FAILED")); - } +#if (MARK_EXCESS_MICROS == 0) + return matchTicks(aMeasuredTicks, aMatchValueMicros); +#else + +# if !defined(USE_OLD_MATCH_FUNCTIONS) + return matchTicks(aMeasuredTicks, aMatchValueMicros, -MARK_EXCESS_MICROS); // New handling of MARK_EXCESS_MICROS without strange rounding errors +# endif + + // old version here + aMatchValueMicros += MARK_EXCESS_MICROS; +# if defined(LOCAL_TRACE) + Serial.print(F("Testing mark (actual vs desired): ")); + Serial.print(aMeasuredTicks * MICROS_PER_TICK); + Serial.print(F("us vs ")); + Serial.print(aMatchValueMicros); + Serial.print(F("us: ")); +// Serial.print(F("TICKS_LOW=")); +// Serial.print(TICKS_LOW(aMatchValueMicros)); +// Serial.print(F(" ")); + Serial.print(TICKS_LOW(aMatchValueMicros) * MICROS_PER_TICK); + Serial.print(F(" <= ")); + Serial.print(aMeasuredTicks * MICROS_PER_TICK); + Serial.print(F(" <= ")); + Serial.print(TICKS_HIGH(aMatchValueMicros) * MICROS_PER_TICK); +# endif + // compensate for marks exceeded by demodulator hardware + bool passed = ((aMeasuredTicks >= TICKS_LOW(aMatchValueMicros)) + && (aMeasuredTicks <= TICKS_HIGH(aMatchValueMicros))); +# if defined(LOCAL_TRACE) + if (passed) { + Serial.println(F(" => passed")); + } else { + Serial.println(F(" => FAILED")); + } +# endif + return passed; #endif - return passed; } bool MATCH_MARK(uint16_t measured_ticks, uint16_t desired_us) { @@ -1283,29 +1457,41 @@ bool MATCH_MARK(uint16_t measured_ticks, uint16_t desired_us) { * @return true, if values match */ bool matchSpace(uint16_t aMeasuredTicks, uint16_t aMatchValueMicros) { -#if defined(LOCAL_TRACE) - Serial.print(F("Testing space (actual vs desired): ")); - Serial.print(aMeasuredTicks * MICROS_PER_TICK, DEC); - Serial.print(F("us vs ")); - Serial.print(aMatchValueMicros, DEC); - Serial.print(F("us: ")); - Serial.print(TICKS_LOW(aMatchValueMicros - MARK_EXCESS_MICROS) * MICROS_PER_TICK, DEC); - Serial.print(F(" <= ")); - Serial.print(aMeasuredTicks * MICROS_PER_TICK, DEC); - Serial.print(F(" <= ")); - Serial.print(TICKS_HIGH(aMatchValueMicros - MARK_EXCESS_MICROS) * MICROS_PER_TICK, DEC); -#endif - // compensate for spaces shortened by demodulator hardware - bool passed = ((aMeasuredTicks >= TICKS_LOW(aMatchValueMicros - MARK_EXCESS_MICROS)) - && (aMeasuredTicks <= TICKS_HIGH(aMatchValueMicros - MARK_EXCESS_MICROS))); -#if defined(LOCAL_TRACE) - if (passed) { - Serial.println(F(" => passed")); - } else { - Serial.println(F(" => FAILED")); - } +#if (MARK_EXCESS_MICROS == 0) + return matchTicks(aMeasuredTicks, aMatchValueMicros); +#else +# if !defined(USE_OLD_MATCH_FUNCTIONS) + return matchTicks(aMeasuredTicks, aMatchValueMicros, MARK_EXCESS_MICROS); // New handling of MARK_EXCESS_MICROS without strange rounding errors +# endif + // old version here + aMatchValueMicros -= MARK_EXCESS_MICROS; +# if defined(LOCAL_TRACE) + Serial.print(F("Testing space (actual vs desired): ")); + Serial.print(aMeasuredTicks * MICROS_PER_TICK); + Serial.print(F("us vs ")); + Serial.print(aMatchValueMicros); + Serial.print(F("us: ")); + Serial.print(F("LOW=")); + Serial.print(TICKS_LOW(aMatchValueMicros)); + Serial.print(F(" ")); + Serial.print(TICKS_LOW(aMatchValueMicros) * MICROS_PER_TICK); + Serial.print(F(" <= ")); + Serial.print(aMeasuredTicks * MICROS_PER_TICK); + Serial.print(F(" <= ")); + Serial.print(TICKS_HIGH(aMatchValueMicros) * MICROS_PER_TICK); +# endif + // compensate for spaces shortened by demodulator hardware + bool passed = ((aMeasuredTicks >= TICKS_LOW(aMatchValueMicros)) + && (aMeasuredTicks <= TICKS_HIGH(aMatchValueMicros))); +# if defined(LOCAL_TRACE) + if (passed) { + Serial.println(F(" => passed")); + } else { + Serial.println(F(" => FAILED")); + } +# endif + return passed; #endif - return passed; } bool MATCH_SPACE(uint16_t measured_ticks, uint16_t desired_us) { @@ -1359,66 +1545,71 @@ void IRrecv::printActiveIRProtocols(Print *aSerial) { */ void printActiveIRProtocols(Print *aSerial) { #if defined(DECODE_ONKYO) - aSerial->print(F("Onkyo, ")); + aSerial->print(F("Onkyo, ")); #elif defined(DECODE_NEC) - aSerial->print(F("NEC/NEC2/Onkyo/Apple, ")); + aSerial->print(F("NEC/NEC2/Onkyo/Apple, ")); #endif #if defined(DECODE_PANASONIC) || defined(DECODE_KASEIKYO) - aSerial->print(F("Panasonic/Kaseikyo, ")); + aSerial->print(F("Panasonic/Kaseikyo, ")); #endif #if defined(DECODE_DENON) - aSerial->print(F("Denon/Sharp, ")); + aSerial->print(F("Denon/Sharp, ")); #endif #if defined(DECODE_SONY) - aSerial->print(F("Sony, ")); + aSerial->print(F("Sony, ")); #endif #if defined(DECODE_RC5) - aSerial->print(F("RC5, ")); + aSerial->print(F("RC5, ")); #endif #if defined(DECODE_RC6) - aSerial->print(F("RC6, ")); + aSerial->print(F("RC6, ")); #endif #if defined(DECODE_LG) - aSerial->print(F("LG, ")); + aSerial->print(F("LG, ")); #endif #if defined(DECODE_JVC) - aSerial->print(F("JVC, ")); + aSerial->print(F("JVC, ")); #endif #if defined(DECODE_SAMSUNG) - aSerial->print(F("Samsung, ")); + aSerial->print(F("Samsung, ")); #endif /* * Start of the exotic protocols */ #if defined(DECODE_BEO) - aSerial->print(F("Bang & Olufsen, ")); + aSerial->print(F("Bang & Olufsen, ")); #endif #if defined(DECODE_FAST) - aSerial->print(F("FAST, ")); + aSerial->print(F("FAST, ")); #endif #if defined(DECODE_WHYNTER) - aSerial->print(F("Whynter, ")); + aSerial->print(F("Whynter, ")); #endif #if defined(DECODE_LEGO_PF) - aSerial->print(F("Lego Power Functions, ")); + aSerial->print(F("Lego Power Functions, ")); #endif #if defined(DECODE_BOSEWAVE) - aSerial->print(F("Bosewave, ")); + aSerial->print(F("Bosewave, ")); #endif #if defined(DECODE_MAGIQUEST) - aSerial->print(F("MagiQuest, ")); + aSerial->print(F("MagiQuest, ")); #endif #if defined(DECODE_DISTANCE_WIDTH) - aSerial->print(F("Universal Pulse Distance Width, ")); + aSerial->print(F("Universal Pulse Distance Width, ")); #endif #if defined(DECODE_HASH) - aSerial->print(F("Hash ")); + aSerial->print(F("Hash ")); #endif #if defined(NO_DECODER) // for sending raw only - (void)aSerial; // to avoid compiler warnings + (void)aSerial; // to avoid compiler warnings #endif } +/** @} + * \addtogroup Print Print functions + * @{ + */ + /** * Function to print values and flags of IrReceiver.decodedIRData in one line. * Ends with println(). @@ -1428,20 +1619,287 @@ void printActiveIRProtocols(Print *aSerial) { * which in turn may block the proper detection of repeats.* * @return true, if CheckForRecordGapsMicros() has printed a message, i.e. gap < 15ms (RECORD_GAP_MICROS_WARNING_THRESHOLD). */ -bool IRrecv::printIRResultShort(Print *aSerial, bool aPrintRepeatGap, bool aCheckForRecordGapsMicros) { +bool IRrecv::printIRResultShort(Print *aSerial, bool aPrintRepeatGap, bool aCheckForRecordGapsMicros) { // DEPRECATED (void) aPrintRepeatGap; return printIRResultShort(aSerial, aCheckForRecordGapsMicros); } bool IRrecv::printIRResultShort(Print *aSerial, bool aCheckForRecordGapsMicros) { + + uint8_t tFlags = decodedIRData.flags; + if (tFlags & IRDATA_FLAGS_WAS_OVERFLOW) { + aSerial->println(F("Overflow")); + } else { + aSerial->print(F("Protocol=")); + aSerial->print(getProtocolString()); + if (decodedIRData.protocol == UNKNOWN) { +#if defined(DECODE_HASH) + aSerial->print(F(" Hash=0x")); +#if (__INT_WIDTH__ < 32) + aSerial->print(decodedIRData.decodedRawData, HEX); +#else + PrintULL::print(aSerial,decodedIRData.decodedRawData, HEX); +#endif + +#endif +#if !defined(DISABLE_CODE_FOR_RECEIVER) + aSerial->print(' '); + aSerial->print((decodedIRData.rawlen + 1) / 2); + aSerial->println(F(" bits (incl. gap and start) received")); +#endif + } else { +#if defined(DECODE_DISTANCE_WIDTH) + if (decodedIRData.protocol != PULSE_DISTANCE && decodedIRData.protocol != PULSE_WIDTH) { +#endif + /* + * New decoders have address and command + */ + aSerial->print(F(" Address=0x")); + aSerial->print(decodedIRData.address, HEX); + + aSerial->print(F(", Command=0x")); + aSerial->print(decodedIRData.command, HEX); + + if (tFlags & IRDATA_FLAGS_EXTRA_INFO) { + aSerial->print(F(", Extra=0x")); + aSerial->print(decodedIRData.extra, HEX); + } + + if (tFlags & IRDATA_FLAGS_PARITY_FAILED) { + aSerial->print(F(", Parity fail")); + } + + if (tFlags & IRDATA_FLAGS_TOGGLE_BIT) { + aSerial->print(F(", Toggle=1")); + } +#if defined(DECODE_DISTANCE_WIDTH) + } +#endif + + /* + * Print raw data, numberOfBits and MSB or LSB + */ + if (!(tFlags & IRDATA_FLAGS_IS_REPEAT) || decodedIRData.decodedRawData != 0) { + aSerial->print(F(", Raw-Data=0x")); +#if (__INT_WIDTH__ < 32) + aSerial->print(decodedIRData.decodedRawData, HEX); +#else + PrintULL::print(aSerial, decodedIRData.decodedRawData, HEX); +#endif + aSerial->print(F(", ")); + + /* + * Print number of bits processed + */ + aSerial->print(decodedIRData.numberOfBits); + aSerial->print(F(" bits,")); + + if (tFlags & IRDATA_FLAGS_IS_MSB_FIRST) { + aSerial->print(F(" MSB first")); + } else { + aSerial->print(F(" LSB first")); + } + } + + /* + * Print gap and duration, in order to be able to compute the repeat period of the protocol by adding the next gap time + */ + if (tFlags & (IRDATA_FLAGS_IS_AUTO_REPEAT | IRDATA_FLAGS_IS_REPEAT)) { + aSerial->print(F(", ")); + if (tFlags & IRDATA_FLAGS_IS_AUTO_REPEAT) { + aSerial->print(F("Auto-")); + } + aSerial->print(F("Repeat")); + } +#if !defined(DISABLE_CODE_FOR_RECEIVER) + aSerial->print(F(", Gap=")); + aSerial->print((uint32_t) decodedIRData.initialGapTicks * MICROS_PER_TICK); + aSerial->print(F("us")); + + /* + * Print complete duration of IR frame + */ + uint16_t tSumOfDurationTicks = 0; + for (IRRawlenType i = 1; i < decodedIRData.rawlen; i++) { + tSumOfDurationTicks += irparams.rawbuf[i]; + } + aSerial->print(F(", Duration=")); + aSerial->print((uint32_t) tSumOfDurationTicks * MICROS_PER_TICK); + aSerial->println(F("us")); +#else + aSerial->println(); +#endif + } + } + // call no class function with same name - ::printIRResultShort(aSerial, &decodedIRData); if (aCheckForRecordGapsMicros && decodedIRData.protocol != UNKNOWN) { return checkForRecordGapsMicros(aSerial); } return false; } +/* + * Only used in example ReceiveAndSend.cpp + */ +void printIRDataShort(Print *aSerial, IRData *aIRDataPtr) { + + aSerial->print(F("Protocol=")); + aSerial->print(getProtocolString(aIRDataPtr->protocol)); +#if defined(DECODE_DISTANCE_WIDTH) + if (aIRDataPtr->protocol != PULSE_DISTANCE && aIRDataPtr->protocol != PULSE_WIDTH) { +#endif + /* + * New decoders have address and command + */ + aSerial->print(F(" Address=0x")); + aSerial->print(aIRDataPtr->address, HEX); + + aSerial->print(F(" Command=0x")); + aSerial->print(aIRDataPtr->command, HEX); + +#if defined(DECODE_DISTANCE_WIDTH) + } +#endif + + /* + * Print number of bits + */ + aSerial->print(' '); + aSerial->print(aIRDataPtr->numberOfBits, DEC); + aSerial->print(F(" bits")); + + if (aIRDataPtr->flags & IRDATA_FLAGS_IS_MSB_FIRST) { + aSerial->print(F(" MSB first")); + } else { + aSerial->print(F(" LSB first")); + } + + /* + * Print gap and duration, in order to be able to compute the repeat period of the protocol by adding the next gap time + */ + if (aIRDataPtr->flags & (IRDATA_FLAGS_IS_AUTO_REPEAT | IRDATA_FLAGS_IS_REPEAT)) { + aSerial->print(' '); + if (aIRDataPtr->flags & IRDATA_FLAGS_IS_AUTO_REPEAT) { + aSerial->print(F("Auto-")); + } + aSerial->print(F("Repeat")); + } + aSerial->println(); +} + +/** + * Deprecated static function to be able to print data to send or copied received data. + * Ends with println(). + * + * @param aSerial The Print object on which to write, for Arduino you can use &Serial. + * @param aIRDataPtr Pointer to the data to be printed. + * @param aPrintRepeatGap If true also print the gap before repeats. + * + */ +void printIRResultShort(Print *aSerial, IRData *aIRDataPtr, bool aPrintRepeatGap) { + // DEPRECATED + + (void) aPrintRepeatGap; + printIRDataShort(aSerial, aIRDataPtr); +} +void printIRResultShort(Print *aSerial, IRData *aIRDataPtr) { + // DEPRECATED + + if (aIRDataPtr->flags & IRDATA_FLAGS_WAS_OVERFLOW) { + aSerial->println(F("Overflow")); + return; + } + aSerial->print(F("Protocol=")); + aSerial->print(getProtocolString(aIRDataPtr->protocol)); + if (aIRDataPtr->protocol == UNKNOWN) { +#if defined(DECODE_HASH) + aSerial->print(F(" Hash=0x")); +#if (__INT_WIDTH__ < 32) + aSerial->print(aIRDataPtr->decodedRawData, HEX); +#else + PrintULL::print(aSerial,aIRDataPtr->decodedRawData, HEX); +#endif + +#endif +#if !defined(DISABLE_CODE_FOR_RECEIVER) + aSerial->print(' '); + aSerial->print((aIRDataPtr->rawlen + 1) / 2, DEC); + aSerial->println(F(" bits (incl. gap and start) received")); +#endif + } else { +#if defined(DECODE_DISTANCE_WIDTH) + if (aIRDataPtr->protocol != PULSE_DISTANCE && aIRDataPtr->protocol != PULSE_WIDTH) { +#endif + /* + * New decoders have address and command + */ + aSerial->print(F(" Address=0x")); + aSerial->print(aIRDataPtr->address, HEX); + + aSerial->print(F(" Command=0x")); + aSerial->print(aIRDataPtr->command, HEX); + + if (aIRDataPtr->flags & IRDATA_FLAGS_EXTRA_INFO) { + aSerial->print(F(" Extra=0x")); + aSerial->print(aIRDataPtr->extra, HEX); + } + + if (aIRDataPtr->flags & IRDATA_FLAGS_PARITY_FAILED) { + aSerial->print(F(" Parity fail")); + } + + if (aIRDataPtr->flags & IRDATA_FLAGS_TOGGLE_BIT) { + aSerial->print(F(" Toggle=1")); + } +#if defined(DECODE_DISTANCE_WIDTH) + } +#endif + + /* + * Print raw data + */ + if (!(aIRDataPtr->flags & IRDATA_FLAGS_IS_REPEAT) || aIRDataPtr->decodedRawData != 0) { + aSerial->print(F(" Raw-Data=0x")); +#if (__INT_WIDTH__ < 32) + aSerial->print(aIRDataPtr->decodedRawData, HEX); +#else + PrintULL::print(aSerial, aIRDataPtr->decodedRawData, HEX); +#endif + /* + * Print number of bits processed + */ + aSerial->print(' '); + aSerial->print(aIRDataPtr->numberOfBits, DEC); + aSerial->print(F(" bits")); + + if (aIRDataPtr->flags & IRDATA_FLAGS_IS_MSB_FIRST) { + aSerial->print(F(" MSB first")); + } else { + aSerial->print(F(" LSB first")); + } + } + + /* + * Print gap and duration, in order to be able to compute the repeat period of the protocol by adding the next gap time + */ + if (aIRDataPtr->flags & (IRDATA_FLAGS_IS_AUTO_REPEAT | IRDATA_FLAGS_IS_REPEAT)) { + aSerial->print(' '); + if (aIRDataPtr->flags & IRDATA_FLAGS_IS_AUTO_REPEAT) { + aSerial->print(F("Auto-")); + } + aSerial->print(F("Repeat")); + } +#if !defined(DISABLE_CODE_FOR_RECEIVER) + aSerial->print(F(" Gap=")); + aSerial->print((uint32_t) aIRDataPtr->initialGapTicks * MICROS_PER_TICK); + aSerial->println(F("us")); +#else + aSerial->println(); +#endif + } +} + void IRrecv::printDistanceWidthTimingInfo(Print *aSerial, DistanceWidthTimingInfoStruct *aDistanceWidthTimingInfo) { aSerial->print(aDistanceWidthTimingInfo->HeaderMarkMicros); aSerial->print(F(", ")); @@ -1463,7 +1921,7 @@ void IRrecv::printDistanceWidthTimingInfo(Print *aSerial, DistanceWidthTimingInf uint8_t IRrecv::getMaximumMarkTicksFromRawData() { uint8_t tMaximumTick = 0; for (IRRawlenType i = 3; i < decodedIRData.rawlen - 2; i += 2) { // Skip leading start and trailing stop bit. - auto tTick = decodedIRData.rawDataPtr->rawbuf[i]; + auto tTick = irparams.rawbuf[i]; if (tMaximumTick < tTick) { tMaximumTick = tTick; } @@ -1473,7 +1931,7 @@ uint8_t IRrecv::getMaximumMarkTicksFromRawData() { uint8_t IRrecv::getMaximumSpaceTicksFromRawData() { uint8_t tMaximumTick = 0; for (IRRawlenType i = 4; i < decodedIRData.rawlen - 2; i += 2) { // Skip leading start and trailing stop bit. - auto tTick = decodedIRData.rawDataPtr->rawbuf[i]; + auto tTick = irparams.rawbuf[i]; if (tMaximumTick < tTick) { tMaximumTick = tTick; } @@ -1493,7 +1951,7 @@ uint8_t IRrecv::getMaximumTicksFromRawData(bool aSearchSpaceInsteadOfMark) { i = 3; } for (; i < decodedIRData.rawlen - 2; i += 2) { // Skip leading start and trailing stop bit. - auto tTick = decodedIRData.rawDataPtr->rawbuf[i]; + auto tTick = irparams.rawbuf[i]; if (tMaximumTick < tTick) { tMaximumTick = tTick; } @@ -1505,7 +1963,7 @@ uint32_t IRrecv::getTotalDurationOfRawData() { uint16_t tSumOfDurationTicks = 0; for (IRRawlenType i = 1; i < decodedIRData.rawlen; i++) { - tSumOfDurationTicks += decodedIRData.rawDataPtr->rawbuf[i]; + tSumOfDurationTicks += irparams.rawbuf[i]; } return tSumOfDurationTicks * (uint32_t) MICROS_PER_TICK; } @@ -1533,48 +1991,48 @@ void IRrecv::printIRSendUsage(Print *aSerial) { aSerial->print(F(" uint32_t tRawData[]={0x")); # else aSerial->print(F("Send on a 32 bit platform with: ")); - tNumberOfArrayData = ((decodedIRData.numberOfBits - 1) / 64) + 1; - if(tNumberOfArrayData > 1) { - aSerial->println(); - aSerial->print(F(" uint64_t tRawData[]={0x")); + tNumberOfArrayData = ((decodedIRData.numberOfBits - 1) / 64) + 1; + if(tNumberOfArrayData > 1) { + aSerial->println(); + aSerial->print(F(" uint64_t tRawData[]={0x")); # endif - for (uint_fast8_t i = 0; i < tNumberOfArrayData; ++i) { + for (uint_fast8_t i = 0; i < tNumberOfArrayData; ++i) { # if (__INT_WIDTH__ < 32) - aSerial->print(decodedIRData.decodedRawDataArray[i], HEX); + aSerial->print(decodedIRData.decodedRawDataArray[i], HEX); # else - PrintULL::print(aSerial, decodedIRData.decodedRawDataArray[i], HEX); + PrintULL::print(aSerial, decodedIRData.decodedRawDataArray[i], HEX); # endif - if (i != tNumberOfArrayData - 1) { - aSerial->print(F(", 0x")); + if (i != tNumberOfArrayData - 1) { + aSerial->print(F(", 0x")); + } } + aSerial->println(F("};")); + aSerial->print(F(" ")); } - aSerial->println(F("};")); - aSerial->print(F(" ")); + } else { + aSerial->print(F("Send with: ")); } - } else { - aSerial->print(F("Send with: ")); - } - aSerial->print(F("IrSender.send")); + aSerial->print(F("IrSender.send")); #else aSerial->print(F("Send with: IrSender.send")); #endif #if defined(DECODE_DISTANCE_WIDTH) - if (decodedIRData.protocol != PULSE_DISTANCE && decodedIRData.protocol != PULSE_WIDTH) { + if (decodedIRData.protocol != PULSE_DISTANCE && decodedIRData.protocol != PULSE_WIDTH) { #endif aSerial->print(getProtocolString()); aSerial->print(F("(0x")); #if defined(DECODE_MAGIQUEST) - if (decodedIRData.protocol == MAGIQUEST) { + if (decodedIRData.protocol == MAGIQUEST) { # if (__INT_WIDTH__ < 32) - aSerial->print(decodedIRData.decodedRawData, HEX); + aSerial->print(decodedIRData.decodedRawData, HEX); # else - PrintULL::print(aSerial, decodedIRData.decodedRawData, HEX); + PrintULL::print(aSerial, decodedIRData.decodedRawData, HEX); # endif - } else { - aSerial->print(decodedIRData.address, HEX); - } + } else { + aSerial->print(decodedIRData.address, HEX); + } #else /* * New decoders have address and command @@ -1592,45 +2050,45 @@ void IRrecv::printIRSendUsage(Print *aSerial) { } #if defined(DECODE_DISTANCE_WIDTH) - } else { - /* - * Pulse distance or pulse width here - */ - aSerial->print(F("PulseDistanceWidth")); - if(tNumberOfArrayData > 1) { - aSerial->print(F("FromArray(38, ")); } else { - aSerial->print(F("(38, ")); - } - printDistanceWidthTimingInfo(aSerial, &decodedIRData.DistanceWidthTimingInfo); + /* + * Pulse distance or pulse width here + */ + aSerial->print(F("PulseDistanceWidth")); + if(tNumberOfArrayData > 1) { + aSerial->print(F("FromArray(38, ")); + } else { + aSerial->print(F("(38, ")); + } + printDistanceWidthTimingInfo(aSerial, &decodedIRData.DistanceWidthTimingInfo); - if(tNumberOfArrayData > 1) { - aSerial->print(F(", &tRawData[0], ")); - } else { - aSerial->print(F(", 0x")); + if(tNumberOfArrayData > 1) { + aSerial->print(F(", &tRawData[0], ")); + } else { + aSerial->print(F(", 0x")); # if (__INT_WIDTH__ < 32) - aSerial->print(decodedIRData.decodedRawData, HEX); + aSerial->print(decodedIRData.decodedRawData, HEX); # else - PrintULL::print(aSerial, decodedIRData.decodedRawData, HEX); + PrintULL::print(aSerial, decodedIRData.decodedRawData, HEX); # endif - aSerial->print(F(", ")); - } - aSerial->print(decodedIRData.numberOfBits);// aNumberOfBits - aSerial->print(F(", PROTOCOL_IS_")); + aSerial->print(F(", ")); + } + aSerial->print(decodedIRData.numberOfBits); // aNumberOfBits + aSerial->print(F(", PROTOCOL_IS_")); - if (decodedIRData.flags & IRDATA_FLAGS_IS_MSB_FIRST) { - aSerial->print('M'); - } else { - aSerial->print('L'); + if (decodedIRData.flags & IRDATA_FLAGS_IS_MSB_FIRST) { + aSerial->print('M'); + } else { + aSerial->print('L'); + } + aSerial->print(F("SB_FIRST, , ")); } - aSerial->print(F("SB_FIRST, , ")); - } #endif #if defined(DECODE_PANASONIC) || defined(DECODE_KASEIKYO) || defined(DECODE_RC6) - if ((decodedIRData.flags & IRDATA_FLAGS_EXTRA_INFO) && (decodedIRData.protocol == KASEIKYO || decodedIRData.protocol == RC6A)) { - aSerial->print(F(", 0x")); - aSerial->print(decodedIRData.extra, HEX); - } + if ((decodedIRData.flags & IRDATA_FLAGS_EXTRA_INFO) && (decodedIRData.protocol == KASEIKYO || decodedIRData.protocol == RC6A)) { + aSerial->print(F(", 0x")); + aSerial->print(decodedIRData.extra, HEX); + } #endif aSerial->print(F(");")); aSerial->println(); @@ -1648,15 +2106,15 @@ void IRrecv::printIRResultMinimal(Print *aSerial) { aSerial->print(decodedIRData.protocol); if (decodedIRData.protocol == UNKNOWN) { #if defined(DECODE_HASH) - aSerial->print(F(" #=0x")); + aSerial->print(F(" #=0x")); # if (__INT_WIDTH__ < 32) - aSerial->print(decodedIRData.decodedRawData, HEX); + aSerial->print(decodedIRData.decodedRawData, HEX); # else - PrintULL::print(aSerial, decodedIRData.decodedRawData, HEX); + PrintULL::print(aSerial, decodedIRData.decodedRawData, HEX); # endif #endif aSerial->print(' '); - aSerial->print((decodedIRData.rawlen + 1) / 2, DEC); + aSerial->print((decodedIRData.rawlen + 1) / 2); aSerial->println(F(" bits received")); } else { /* @@ -1672,7 +2130,7 @@ void IRrecv::printIRResultMinimal(Print *aSerial) { #if (__INT_WIDTH__ < 32) aSerial->print(decodedIRData.decodedRawData, HEX); #else - PrintULL::print(aSerial, decodedIRData.decodedRawData, HEX); + PrintULL::print(aSerial, decodedIRData.decodedRawData, HEX); #endif if (decodedIRData.flags & (IRDATA_FLAGS_IS_AUTO_REPEAT | IRDATA_FLAGS_IS_REPEAT)) { @@ -1687,21 +2145,21 @@ void IRrecv::printIRResultMinimal(Print *aSerial) { void IRrecv::printIRDuration(Print *aSerial, bool aOutputMicrosecondsInsteadOfTicks) { uint16_t tSumOfDurationTicks = 0; for (IRRawlenType i = 1; i < decodedIRData.rawlen; i++) { - tSumOfDurationTicks += decodedIRData.rawDataPtr->rawbuf[i]; + tSumOfDurationTicks += irparams.rawbuf[i]; } aSerial->print(F("Duration=")); if (aOutputMicrosecondsInsteadOfTicks) { - aSerial->print((uint32_t) tSumOfDurationTicks * MICROS_PER_TICK, DEC); + aSerial->print((uint32_t) tSumOfDurationTicks * MICROS_PER_TICK); aSerial->println(F("us")); } else { - aSerial->print(tSumOfDurationTicks, DEC); + aSerial->print(tSumOfDurationTicks); aSerial->println(F(" ticks")); } } /** - * Dump out the timings in IrReceiver.decodedIRData.rawDataPtr->rawbuf[] array 8 values per line. + * Dump out the timings in IrReceiver.irparams.rawbuf[] array 8 values per line. * * @param aSerial The Print object on which to write, for Arduino you can use &Serial. * @param aOutputMicrosecondsInsteadOfTicks Output the (rawbuf_values * MICROS_PER_TICK) for better readability. @@ -1710,7 +2168,7 @@ void IRrecv::printIRResultRawFormatted(Print *aSerial, bool aOutputMicrosecondsI // Print Raw data aSerial->print(F("rawData[")); - aSerial->print(decodedIRData.rawlen, DEC); + aSerial->print(decodedIRData.rawlen); aSerial->println(F("]: ")); /* @@ -1718,9 +2176,9 @@ void IRrecv::printIRResultRawFormatted(Print *aSerial, bool aOutputMicrosecondsI */ aSerial->print(F(" -")); if (aOutputMicrosecondsInsteadOfTicks) { - aSerial->println((uint32_t) decodedIRData.initialGapTicks * MICROS_PER_TICK, DEC); + aSerial->println((uint32_t) decodedIRData.initialGapTicks * MICROS_PER_TICK); } else { - aSerial->println(decodedIRData.initialGapTicks, DEC); + aSerial->println(decodedIRData.initialGapTicks); } // Newline is printed every 8. value, if tCounterForNewline % 8 == 0 @@ -1728,22 +2186,22 @@ void IRrecv::printIRResultRawFormatted(Print *aSerial, bool aOutputMicrosecondsI // check if we have a protocol with no or 8 start bits #if defined(DECODE_DENON) || defined(DECODE_MAGIQUEST) - if ( + if ( # if defined(DECODE_DENON) - decodedIRData.protocol == DENON || decodedIRData.protocol == SHARP || + decodedIRData.protocol == DENON || decodedIRData.protocol == SHARP || # endif # if defined(DECODE_MAGIQUEST) - decodedIRData.protocol == MAGIQUEST || + decodedIRData.protocol == MAGIQUEST || # endif - false) { - tCounterForNewline = 0; // no or 8 start bits - } + false) { + tCounterForNewline = 0; // no or 8 start bits + } #endif uint32_t tDuration; uint16_t tSumOfDurationTicks = 0; for (IRRawlenType i = 1; i < decodedIRData.rawlen; i++) { - auto tCurrentTicks = decodedIRData.rawDataPtr->rawbuf[i]; + auto tCurrentTicks = irparams.rawbuf[i]; if (aOutputMicrosecondsInsteadOfTicks) { tDuration = tCurrentTicks * MICROS_PER_TICK; } else { @@ -1767,7 +2225,7 @@ void IRrecv::printIRResultRawFormatted(Print *aSerial, bool aOutputMicrosecondsI if (tDuration < 10) { aSerial->print(' '); } - aSerial->print(tDuration, DEC); + aSerial->print(tDuration); if ((i & 1) && (i + 1) < decodedIRData.rawlen) { aSerial->print(','); //',' not required for last one @@ -1782,11 +2240,11 @@ void IRrecv::printIRResultRawFormatted(Print *aSerial, bool aOutputMicrosecondsI aSerial->println(); aSerial->print(F("Duration=")); if (aOutputMicrosecondsInsteadOfTicks) { - aSerial->print((uint32_t) tSumOfDurationTicks * MICROS_PER_TICK, DEC); + aSerial->print((uint32_t) tSumOfDurationTicks * MICROS_PER_TICK); aSerial->println(F("us")); } else { - aSerial->print(tSumOfDurationTicks, DEC); + aSerial->print(tSumOfDurationTicks); aSerial->println(F(" ticks")); } aSerial->println(); @@ -1794,17 +2252,21 @@ void IRrecv::printIRResultRawFormatted(Print *aSerial, bool aOutputMicrosecondsI } /** - * Dump out the IrReceiver.decodedIRData.rawDataPtr->rawbuf[] to be used as C definition for sendRaw(). + * Dump out the IrReceiver.irparams.rawbuf[] to be used as C definition for sendRaw(). + * * - * Compensate received values by MARK_EXCESS_MICROS, like it is done for decoding! * Print ticks in 8 bit format to save space. * Maximum is 255*50 microseconds = 12750 microseconds = 12.75 ms, which hardly ever occurs inside an IR sequence. * Recording of IRremote anyway stops at a gap of RECORD_GAP_MICROS (5 ms). * - * @param aSerial The Print object on which to write, for Arduino you can use &Serial. - * @param aOutputMicrosecondsInsteadOfTicks Output the (rawbuf_values * MICROS_PER_TICK) for better readability. + * @param aSerial The Print object on which to write, for Arduino you can use &Serial. + * @param aOutputMicrosecondsInsteadOfTicks Output the (rawbuf_values * MICROS_PER_TICK) for better readability. + * @param aDoCompensate Compensate received values by MARK_EXCESS_MICROS, like it is done for decoding! */ void IRrecv::compensateAndPrintIRResultAsCArray(Print *aSerial, bool aOutputMicrosecondsInsteadOfTicks) { + printIRResultAsCArray(aSerial, aOutputMicrosecondsInsteadOfTicks, true); +} +void IRrecv::printIRResultAsCArray(Print *aSerial, bool aOutputMicrosecondsInsteadOfTicks, bool aDoCompensate) { // Start declaration if (aOutputMicrosecondsInsteadOfTicks) { aSerial->print(F("uint16_t rawData[")); // variable type, array name @@ -1812,18 +2274,20 @@ void IRrecv::compensateAndPrintIRResultAsCArray(Print *aSerial, bool aOutputMicr aSerial->print(F("uint8_t rawTicks[")); // variable type, array name } - aSerial->print(decodedIRData.rawlen - 1, DEC); // array size + aSerial->print(decodedIRData.rawlen - 1); // array size aSerial->print(F("] = {")); // Start declaration // Dump data for (IRRawlenType i = 1; i < decodedIRData.rawlen; i++) { - uint32_t tDuration = decodedIRData.rawDataPtr->rawbuf[i] * MICROS_PER_TICK; + uint32_t tDuration = irparams.rawbuf[i] * MICROS_PER_TICK; - if (i & 1) { - // Mark - tDuration -= MARK_EXCESS_MICROS; - } else { - tDuration += MARK_EXCESS_MICROS; + if (aDoCompensate) { + if (i & 1) { + // Mark + tDuration -= MARK_EXCESS_MICROS; + } else { + tDuration += MARK_EXCESS_MICROS; + } } if (aOutputMicrosecondsInsteadOfTicks) { @@ -1854,7 +2318,7 @@ void IRrecv::compensateAndPrintIRResultAsCArray(Print *aSerial, bool aOutputMicr /** * Store the decodedIRData to be used for sendRaw(). * - * Compensate received values by MARK_EXCESS_MICROS, like it is done for decoding and store it in an array provided. + * Compensate received values by MARK_EXCESS_MICROS, like it is done for decoding and store it in an array. * * Maximum for uint8_t is 255*50 microseconds = 12750 microseconds = 12.75 ms, which hardly ever occurs inside an IR sequence. * Recording of IRremote anyway stops at a gap of RECORD_GAP_MICROS (5 ms). @@ -1865,7 +2329,7 @@ void IRrecv::compensateAndStoreIRResultInArray(uint8_t *aArrayPtr) { // Store data, skip leading space# IRRawlenType i; for (i = 1; i < decodedIRData.rawlen; i++) { - uint32_t tDuration = decodedIRData.rawDataPtr->rawbuf[i] * MICROS_PER_TICK; + uint32_t tDuration = irparams.rawbuf[i] * MICROS_PER_TICK; if (i & 1) { // Mark tDuration -= MARK_EXCESS_MICROS; @@ -1881,6 +2345,9 @@ void IRrecv::compensateAndStoreIRResultInArray(uint8_t *aArrayPtr) { /** * Print results as C variables to be used for sendXXX() + * uint16_t address = 0x44; + * uint16_t command = 0x11; + * uint32_t rawData = 0x44BB11EE; * @param aSerial The Print object on which to write, for Arduino you can use &Serial. */ void IRrecv::printIRResultAsCVariables(Print *aSerial) { @@ -1904,12 +2371,12 @@ void IRrecv::printIRResultAsCVariables(Print *aSerial) { #if __INT_WIDTH__ < 32 aSerial->print(F("uint32_t rawData = 0x")); #else - aSerial->print(F("uint64_t rawData = 0x")); + aSerial->print(F("uint64_t rawData = 0x")); #endif #if (__INT_WIDTH__ < 32) aSerial->print(decodedIRData.decodedRawData, HEX); #else - PrintULL::print(aSerial, decodedIRData.decodedRawData, HEX); + PrintULL::print(aSerial, decodedIRData.decodedRawData, HEX); #endif aSerial->println(';'); aSerial->println(); @@ -1922,10 +2389,10 @@ const __FlashStringHelper* IRrecv::getProtocolString() { return ::getProtocolString(decodedIRData.protocol); } #else -const char* IRrecv::getProtocolString() { - // call no class function with same name - return ::getProtocolString(decodedIRData.protocol); -} + const char* IRrecv::getProtocolString() { + // call no class function with same name + return ::getProtocolString(decodedIRData.protocol); + } #endif /********************************************************************************************************************** @@ -1959,66 +2426,66 @@ bool IRrecv::decode_old(decode_results *aResults) { decodedIRData.flags = IRDATA_FLAGS_IS_MSB_FIRST; // for print #if defined(DECODE_NEC) - IR_DEBUG_PRINTLN(F("Attempting old NEC decode")); - if (decodeNECMSB(aResults)) { - return true; - } + IR_DEBUG_PRINTLN(F("Attempting old NEC decode")); + if (decodeNECMSB(aResults)) { + return true; + } #endif #if defined(DECODE_SONY) - IR_DEBUG_PRINTLN(F("Attempting old Sony decode")); - if (decodeSonyMSB(aResults)) { - return true; - } + IR_DEBUG_PRINTLN(F("Attempting old Sony decode")); + if (decodeSonyMSB(aResults)) { + return true; + } #endif #if defined(DECODE_RC5) - IR_DEBUG_PRINTLN(F("Attempting RC5 decode")); - if (decodeRC5()) { - aResults->bits = decodedIRData.numberOfBits; - aResults->value = decodedIRData.decodedRawData; - aResults->decode_type = RC5; + IR_DEBUG_PRINTLN(F("Attempting RC5 decode")); + if (decodeRC5()) { + aResults->bits = decodedIRData.numberOfBits; + aResults->value = decodedIRData.decodedRawData; + aResults->decode_type = RC5; - return true; - } + return true; + } #endif #if defined(DECODE_RC6) - IR_DEBUG_PRINTLN(F("Attempting RC6 decode")); - if (decodeRC6()) { - aResults->bits = decodedIRData.numberOfBits; - aResults->value = decodedIRData.decodedRawData; - aResults->decode_type = RC6; - return true; - } + IR_DEBUG_PRINTLN(F("Attempting RC6 decode")); + if (decodeRC6()) { + aResults->bits = decodedIRData.numberOfBits; + aResults->value = decodedIRData.decodedRawData; + aResults->decode_type = RC6; + return true; + } #endif // Removed bool IRrecv::decodePanasonicMSB(decode_results *aResults) since implementations was wrong (wrong length), and nobody recognized it #if defined(DECODE_LG) - IR_DEBUG_PRINTLN(F("Attempting old LG decode")); - if (decodeLGMSB(aResults)) {return true;} + IR_DEBUG_PRINTLN(F("Attempting old LG decode")); + if (decodeLGMSB(aResults)) {return true;} #endif #if defined(DECODE_JVC) - IR_DEBUG_PRINTLN(F("Attempting old JVC decode")); - if (decodeJVCMSB(aResults)) { - return true; - } + IR_DEBUG_PRINTLN(F("Attempting old JVC decode")); + if (decodeJVCMSB(aResults)) { + return true; + } #endif #if defined(DECODE_SAMSUNG) - IR_DEBUG_PRINTLN(F("Attempting old SAMSUNG decode")); - if (decodeSAMSUNG(aResults)) { - return true; - } + IR_DEBUG_PRINTLN(F("Attempting old SAMSUNG decode")); + if (decodeSAMSUNG(aResults)) { + return true; + } #endif #if defined(DECODE_DENON) - IR_DEBUG_PRINTLN(F("Attempting old Denon decode")); - if (decodeDenonOld(aResults)) { - return true; - } + IR_DEBUG_PRINTLN(F("Attempting old Denon decode")); + if (decodeDenonOld(aResults)) { + return true; + } #endif // decodeHash returns a hash on any input. diff --git a/src/IRSend.hpp b/src/IRSend.hpp index 756af9d9..36792eff 100644 --- a/src/IRSend.hpp +++ b/src/IRSend.hpp @@ -57,6 +57,10 @@ #define sendPin IR_SEND_PIN #endif +#if !defined(NO_LED_SEND_FEEDBACK_CODE) +#define LED_SEND_FEEDBACK_CODE // Resolve the double negative +#endif + /** \addtogroup Sending Sending IR data for multiple protocols * @{ */ @@ -68,50 +72,32 @@ IRsend::IRsend() { // @suppress("Class members should be properly initialized") #if !defined(IR_SEND_PIN) sendPin = 0; #endif - -#if !defined(NO_LED_SEND_FEEDBACK_CODE) - setLEDFeedback(0, DO_NOT_ENABLE_LED_FEEDBACK); -#endif } +/****************************************************************************************************************** + * LED feedback is always enabled for sending. It can only be disabled by using the macro NO_LED_SEND_FEEDBACK_CODE + *****************************************************************************************************************/ #if defined(IR_SEND_PIN) /** - * Only required to set LED feedback - * Simple start with defaults - LED feedback enabled! Used if IR_SEND_PIN is defined. Saves program memory. + * Simple start with defaults. Used if IR_SEND_PIN is defined. Saves program memory. */ void IRsend::begin(){ -# if !defined(NO_LED_SEND_FEEDBACK_CODE) - setLEDFeedback(USE_DEFAULT_FEEDBACK_LED_PIN, LED_FEEDBACK_ENABLED_FOR_SEND); -# endif #if defined(_IR_MEASURE_TIMING) && defined(_IR_TIMING_TEST_PIN) pinModeFast(_IR_TIMING_TEST_PIN, OUTPUT); #endif } /** - * Only required to set LED feedback - * @param aEnableLEDFeedback If true / ENABLE_LED_FEEDBACK, the feedback LED is activated while receiving or sending a PWM signal /a mark - * @param aFeedbackLEDPin If 0 / USE_DEFAULT_FEEDBACK_LED_PIN, then take board specific FEEDBACK_LED_ON() and FEEDBACK_LED_OFF() functions + * Only required to set LED feedback pin + * @param aFeedbackLEDPin If USE_DEFAULT_FEEDBACK_LED_PIN / 0, then take board specific FEEDBACK_LED_ON() and FEEDBACK_LED_OFF() functions */ -void IRsend::begin(bool aEnableLEDFeedback, uint_fast8_t aFeedbackLEDPin) { -#if !defined(NO_LED_SEND_FEEDBACK_CODE) - uint_fast8_t tEnableLEDFeedback = DO_NOT_ENABLE_LED_FEEDBACK; - if(aEnableLEDFeedback) { - tEnableLEDFeedback = LED_FEEDBACK_ENABLED_FOR_SEND; - } - setLEDFeedback(aFeedbackLEDPin, tEnableLEDFeedback); -#else - (void) aEnableLEDFeedback; - (void) aFeedbackLEDPin; -#endif +void IRsend::begin(uint_fast8_t aFeedbackLEDPin) { + setLEDFeedbackPin(aFeedbackLEDPin); } #else // defined(IR_SEND_PIN) IRsend::IRsend(uint_fast8_t aSendPin) { // @suppress("Class members should be properly initialized") sendPin = aSendPin; -# if !defined(NO_LED_SEND_FEEDBACK_CODE) - setLEDFeedback(0, DO_NOT_ENABLE_LED_FEEDBACK); -# endif } /** @@ -120,9 +106,6 @@ IRsend::IRsend(uint_fast8_t aSendPin) { // @suppress("Class members should be pr */ void IRsend::begin(uint_fast8_t aSendPin) { sendPin = aSendPin; -# if !defined(NO_LED_SEND_FEEDBACK_CODE) - setLEDFeedback(USE_DEFAULT_FEEDBACK_LED_PIN, LED_FEEDBACK_ENABLED_FOR_SEND); -# endif } void IRsend::setSendPin(uint_fast8_t aSendPin) { @@ -132,29 +115,29 @@ void IRsend::setSendPin(uint_fast8_t aSendPin) { /** * Initializes the send and feedback pin * @param aSendPin The Arduino pin number, where a IR sender diode is connected. - * @param aEnableLEDFeedback If true the feedback LED is activated while receiving or sending a PWM signal /a mark * @param aFeedbackLEDPin If 0 / USE_DEFAULT_FEEDBACK_LED_PIN, then take board specific FEEDBACK_LED_ON() and FEEDBACK_LED_OFF() functions */ -void IRsend::begin(uint_fast8_t aSendPin, bool aEnableLEDFeedback, uint_fast8_t aFeedbackLEDPin) { +void IRsend::begin(uint_fast8_t aSendPin, uint_fast8_t aFeedbackLEDPin) { #if defined(IR_SEND_PIN) (void) aSendPin; // for backwards compatibility #else sendPin = aSendPin; #endif -#if !defined(NO_LED_SEND_FEEDBACK_CODE) - uint_fast8_t tEnableLEDFeedback = DO_NOT_ENABLE_LED_FEEDBACK; - if (aEnableLEDFeedback) { - tEnableLEDFeedback = LED_FEEDBACK_ENABLED_FOR_SEND; - } - setLEDFeedback(aFeedbackLEDPin, tEnableLEDFeedback); +#if defined(LED_SEND_FEEDBACK_CODE) + setLEDFeedbackPin(aFeedbackLEDPin); #else - (void) aEnableLEDFeedback; (void) aFeedbackLEDPin; #endif } #endif // defined(IR_SEND_PIN) +// Deprecated +void IRsend::begin(uint_fast8_t aSendPin, bool aEnableLEDFeedback, uint_fast8_t aFeedbackLEDPin) { + (void) aEnableLEDFeedback; + begin(aSendPin,aFeedbackLEDPin); +} + /** * Interprets and sends a IRData structure. * @param aIRSendData The values of protocol, address, command and repeat flag are taken for sending. @@ -407,6 +390,10 @@ size_t IRsend::write(decode_type_t aProtocol, uint16_t aAddress, uint16_t aComma return 1; } +/********************************************************************************************************************** + * SendRaw functions + **********************************************************************************************************************/ + /** * Sends a 16 byte microsecond timing array. * Raw data starts with a Mark. No leading space as in received timing data! @@ -516,22 +503,155 @@ void IRsend::sendRaw_P(const uint8_t aBufferWithTicks[], uint_fast16_t aLengthOf #endif } +/********************************************************************************************************************** + * Core send function + **********************************************************************************************************************/ /** - * Sends PulseDistance data from array - * For LSB First the LSB of array[0] is sent first then all bits until MSB of array[0]. Next is LSB of array[1] and so on. + * Sends PulseDistance data with timing parameters and flag parameters. * The output always ends with a space - * Stop bit is always sent - * @param aFlags Evaluated flags are PROTOCOL_IS_MSB_FIRST and SUPPRESS_STOP_BIT. Stop bit is otherwise sent for all pulse distance protocols. + * @param aOneMarkMicros Timing for sending this protocol. + * @param aData uint32 or uint64 holding the bits to be sent. + * @param aNumberOfBits Number of bits from aData to be actually sent. + * @param aFlags Evaluated flags are PROTOCOL_IS_MSB_FIRST and SUPPRESS_STOP_BIT. Stop bit is otherwise sent for all pulse distance protocols. */ -void IRsend::sendPulseDistanceWidthFromArray(uint_fast8_t aFrequencyKHz, DistanceWidthTimingInfoStruct *aDistanceWidthTimingInfo, - IRRawDataType *aDecodedRawDataArray, uint16_t aNumberOfBits, uint8_t aFlags, uint16_t aRepeatPeriodMillis, - int_fast8_t aNumberOfRepeats) { - sendPulseDistanceWidthFromArray(aFrequencyKHz, aDistanceWidthTimingInfo->HeaderMarkMicros, - aDistanceWidthTimingInfo->HeaderSpaceMicros, aDistanceWidthTimingInfo->OneMarkMicros, - aDistanceWidthTimingInfo->OneSpaceMicros, aDistanceWidthTimingInfo->ZeroMarkMicros, - aDistanceWidthTimingInfo->ZeroSpaceMicros, aDecodedRawDataArray, aNumberOfBits, aFlags, aRepeatPeriodMillis, - aNumberOfRepeats); +void IRsend::sendPulseDistanceWidthData(uint16_t aOneMarkMicros, uint16_t aOneSpaceMicros, uint16_t aZeroMarkMicros, + uint16_t aZeroSpaceMicros, IRRawDataType aData, uint_fast8_t aNumberOfBits, uint8_t aFlags) { + +#if defined(LOCAL_DEBUG) + Serial.print(aData, HEX); + Serial.print('|'); + Serial.println(aNumberOfBits); + Serial.flush(); +#endif + + // For MSBFirst, send data from MSB to LSB until mask bit is shifted out + IRRawDataType tMask = 1ULL << (aNumberOfBits - 1); + for (uint_fast8_t i = aNumberOfBits; i > 0; i--) { + if (((aFlags & PROTOCOL_IS_MSB_MASK) && (aData & tMask)) || (!(aFlags & PROTOCOL_IS_MSB_MASK) && (aData & 1))) { +#if defined(LOCAL_TRACE) + Serial.print('1'); +#endif + mark(aOneMarkMicros); + space(aOneSpaceMicros); + } else { +#if defined(LOCAL_TRACE) + Serial.print('0'); +#endif + mark(aZeroMarkMicros); + space(aZeroSpaceMicros); + } + if (aFlags & PROTOCOL_IS_MSB_MASK) { + tMask >>= 1; + } else { + aData >>= 1; + } + } + /* + * Stop bit is sent for all pulse distance protocols i.e. aOneSpaceMicros != aZeroSpaceMicros. + * Therefore it is not sent for Sony :-) + * For sending from an array, no intermediate stop bit must be sent for all but last data chunk. + */ + if ((!(aFlags & SUPPRESS_STOP_BIT)) && (abs(aOneSpaceMicros - aZeroSpaceMicros) > (aOneSpaceMicros / 4))) { + // Send stop bit here +#if defined(LOCAL_TRACE) + Serial.print('S'); +#endif + mark(aOneMarkMicros); // Use aOneMarkMicros for stop bits. This seems to be correct for all protocols :-) + } +#if defined(LOCAL_TRACE) + Serial.println(); +#endif +} + +/********************************************************************************************************************** + * Stubs for core send function with PulseDistanceWidthProtocolConstants parameter + **********************************************************************************************************************/ + +/** + * Sends PulseDistance from data contained in parameter using ProtocolConstants structure for timing etc. + * The output always ends with a space + * Each additional call costs 16 bytes program memory + * @param aProtocolConstants The constants to use for sending this protocol. + * @param aData uint32 or uint64 holding the bits to be sent. + * @param aNumberOfBits Number of bits from aData to be actually sent. + */ +void IRsend::sendPulseDistanceWidthData(PulseDistanceWidthProtocolConstants *aProtocolConstants, IRRawDataType aData, + uint_fast8_t aNumberOfBits) { + + sendPulseDistanceWidthData(aProtocolConstants->DistanceWidthTimingInfo.OneMarkMicros, + aProtocolConstants->DistanceWidthTimingInfo.OneSpaceMicros, aProtocolConstants->DistanceWidthTimingInfo.ZeroMarkMicros, + aProtocolConstants->DistanceWidthTimingInfo.ZeroSpaceMicros, aData, aNumberOfBits, aProtocolConstants->Flags); +} + +void IRsend::sendPulseDistanceWidthData_P(PulseDistanceWidthProtocolConstants const *aProtocolConstantsPGM, IRRawDataType aData, + uint_fast8_t aNumberOfBits) { + + PulseDistanceWidthProtocolConstants tTemporaryPulseDistanceWidthProtocolConstants; + memcpy_P(&tTemporaryPulseDistanceWidthProtocolConstants, aProtocolConstantsPGM, + sizeof(tTemporaryPulseDistanceWidthProtocolConstants)); + sendPulseDistanceWidthData(&tTemporaryPulseDistanceWidthProtocolConstants, aData, aNumberOfBits); +} + +/********************************************************************************************************************** + * Send functions with detailed parameters + **********************************************************************************************************************/ + +/** + * Sends PulseDistance frames and repeats. + * @param aFrequencyKHz, aHeaderMarkMicros, aHeaderSpaceMicros, aOneMarkMicros, aOneSpaceMicros, aZeroMarkMicros, aZeroSpaceMicros, aFlags, aRepeatPeriodMillis Values to use for sending this protocol, also contained in the PulseDistanceWidthProtocolConstants of this protocol. + * @param aData uint32 or uint64 holding the bits to be sent. + * @param aNumberOfBits Number of bits from aData to be actually sent. + * @param aFlags Evaluated flags are PROTOCOL_IS_MSB_FIRST and SUPPRESS_STOP_BIT. Stop bit is otherwise sent for all pulse distance protocols. + * @param aNumberOfRepeats If < 0 and a aProtocolConstants->SpecialSendRepeatFunction() is specified + * then it is called without leading and trailing space. + * @param aSpecialSendRepeatFunction If nullptr, the first frame is repeated completely, otherwise this function is used for sending the repeat frame. + */ +void IRsend::sendPulseDistanceWidth(uint_fast8_t aFrequencyKHz, uint16_t aHeaderMarkMicros, uint16_t aHeaderSpaceMicros, + uint16_t aOneMarkMicros, uint16_t aOneSpaceMicros, uint16_t aZeroMarkMicros, uint16_t aZeroSpaceMicros, IRRawDataType aData, + uint_fast8_t aNumberOfBits, uint8_t aFlags, uint16_t aRepeatPeriodMillis, int_fast8_t aNumberOfRepeats, + void (*aSpecialSendRepeatFunction)()) { + + if (aNumberOfRepeats < 0) { + if (aSpecialSendRepeatFunction != nullptr) { + aSpecialSendRepeatFunction(); + return; + } else { + aNumberOfRepeats = 0; // send a plain frame as repeat + } + } + + // Set IR carrier frequency + enableIROut(aFrequencyKHz); + + uint_fast8_t tNumberOfCommands = aNumberOfRepeats + 1; + while (tNumberOfCommands > 0) { + unsigned long tStartOfFrameMillis = millis(); + + if (tNumberOfCommands < ((uint_fast8_t) aNumberOfRepeats + 1) && aSpecialSendRepeatFunction != nullptr) { + // send special repeat + aSpecialSendRepeatFunction(); + } else { + // Header and regular frame + mark(aHeaderMarkMicros); + space(aHeaderSpaceMicros); + sendPulseDistanceWidthData(aOneMarkMicros, aOneSpaceMicros, aZeroMarkMicros, aZeroSpaceMicros, aData, aNumberOfBits, + aFlags); + } + + tNumberOfCommands--; + // skip last delay! + if (tNumberOfCommands > 0) { + /* + * Check and fallback for wrong RepeatPeriodMillis parameter. I.e the repeat period must be greater than each frame duration. + */ + auto tFrameDurationMillis = millis() - tStartOfFrameMillis; + if (aRepeatPeriodMillis > tFrameDurationMillis) { + delay(aRepeatPeriodMillis - tFrameDurationMillis); + } + } + } } + void IRsend::sendPulseDistanceWidthFromArray(uint_fast8_t aFrequencyKHz, uint16_t aHeaderMarkMicros, uint16_t aHeaderSpaceMicros, uint16_t aOneMarkMicros, uint16_t aOneSpaceMicros, uint16_t aZeroMarkMicros, uint16_t aZeroSpaceMicros, IRRawDataType *aDecodedRawDataArray, uint16_t aNumberOfBits, uint8_t aFlags, uint16_t aRepeatPeriodMillis, @@ -668,6 +788,27 @@ void IRsend::sendPulseDistanceWidthFromPGMArray(uint_fast8_t aFrequencyKHz, uint } } +/********************************************************************************************************************** + * Stubs for send functions + **********************************************************************************************************************/ + +/** + * Sends PulseDistance data from array + * For LSB First the LSB of array[0] is sent first then all bits until MSB of array[0]. Next is LSB of array[1] and so on. + * The output always ends with a space + * Stop bit is always sent + * @param aFlags Evaluated flags are PROTOCOL_IS_MSB_FIRST and SUPPRESS_STOP_BIT. Stop bit is otherwise sent for all pulse distance protocols. + */ +void IRsend::sendPulseDistanceWidthFromArray(uint_fast8_t aFrequencyKHz, DistanceWidthTimingInfoStruct *aDistanceWidthTimingInfo, + IRRawDataType *aDecodedRawDataArray, uint16_t aNumberOfBits, uint8_t aFlags, uint16_t aRepeatPeriodMillis, + int_fast8_t aNumberOfRepeats) { + sendPulseDistanceWidthFromArray(aFrequencyKHz, aDistanceWidthTimingInfo->HeaderMarkMicros, + aDistanceWidthTimingInfo->HeaderSpaceMicros, aDistanceWidthTimingInfo->OneMarkMicros, + aDistanceWidthTimingInfo->OneSpaceMicros, aDistanceWidthTimingInfo->ZeroMarkMicros, + aDistanceWidthTimingInfo->ZeroSpaceMicros, aDecodedRawDataArray, aNumberOfBits, aFlags, aRepeatPeriodMillis, + aNumberOfRepeats); +} + void IRsend::sendPulseDistanceWidthFromArray_P(uint_fast8_t aFrequencyKHz, DistanceWidthTimingInfoStruct const *aDistanceWidthTimingInfoPGM, IRRawDataType *aDecodedRawDataArray, uint16_t aNumberOfBits, uint8_t aFlags, uint16_t aRepeatPeriodMillis, int_fast8_t aNumberOfRepeats) { @@ -678,6 +819,74 @@ void IRsend::sendPulseDistanceWidthFromArray_P(uint_fast8_t aFrequencyKHz, aRepeatPeriodMillis, aNumberOfRepeats); } +/********************************************************************************************************************** + * Send functions with PulseDistanceWidthProtocolConstants parameter + **********************************************************************************************************************/ +/** + * Sends PulseDistance frames and repeats + * @param aProtocolConstants The constants to use for sending this protocol. + * @param aData uint32 or uint64 holding the bits to be sent. + * @param aNumberOfBits Number of bits from aData to be actually sent. + * @param aNumberOfRepeats If < 0 and a aProtocolConstants->SpecialSendRepeatFunction() is specified + * then it is called without leading and trailing space. + */ +void IRsend::sendPulseDistanceWidth(PulseDistanceWidthProtocolConstants *aProtocolConstants, IRRawDataType aData, + uint_fast8_t aNumberOfBits, int_fast8_t aNumberOfRepeats) { + +#if defined(LOCAL_DEBUG) + Serial.print(F("Data=0x")); + Serial.print(aData, HEX); + Serial.print(F(" #=")); + Serial.println(aNumberOfBits); + Serial.flush(); +#endif + + if (aNumberOfRepeats < 0) { + if (aProtocolConstants->SpecialSendRepeatFunction != nullptr) { + /* + * Send only a special repeat and return + */ + aProtocolConstants->SpecialSendRepeatFunction(); + return; + } else { + // Send only one plain frame (as repeat) + aNumberOfRepeats = 0; + } + } + + // Set IR carrier frequency + enableIROut(aProtocolConstants->FrequencyKHz); + + uint_fast8_t tNumberOfCommands = aNumberOfRepeats + 1; + while (tNumberOfCommands > 0) { + unsigned long tStartOfFrameMillis = millis(); + + if (tNumberOfCommands < ((uint_fast8_t) aNumberOfRepeats + 1) && aProtocolConstants->SpecialSendRepeatFunction != nullptr) { + // send special repeat, if specified and we are not in the first loop + aProtocolConstants->SpecialSendRepeatFunction(); + } else { + /* + * Send Header and regular frame + */ + mark(aProtocolConstants->DistanceWidthTimingInfo.HeaderMarkMicros); + space(aProtocolConstants->DistanceWidthTimingInfo.HeaderSpaceMicros); + sendPulseDistanceWidthData(aProtocolConstants, aData, aNumberOfBits); + } + + tNumberOfCommands--; + // skip last delay! + if (tNumberOfCommands > 0) { + auto tCurrentFrameDurationMillis = millis() - tStartOfFrameMillis; + /* + * Check and fallback for wrong RepeatPeriodMillis parameter. I.e the repeat period must be greater than each frame duration. + */ + if (aProtocolConstants->RepeatPeriodMillis > tCurrentFrameDurationMillis) { + delay(aProtocolConstants->RepeatPeriodMillis - tCurrentFrameDurationMillis); + } + } + } +} + /** * Sends PulseDistance data from array using PulseDistanceWidthProtocolConstants * For LSB First the LSB of array[0] is sent first then all bits until MSB of array[0]. Next is LSB of array[1] and so on. @@ -761,25 +970,6 @@ void IRsend::sendPulseDistanceWidthFromArray(PulseDistanceWidthProtocolConstants } } -void IRsend::sendPulseDistanceWidthFromArray_P(PulseDistanceWidthProtocolConstants const *aProtocolConstantsPGM, - IRRawDataType *aDecodedRawDataArray, uint16_t aNumberOfBits, int_fast8_t aNumberOfRepeats) { - - PulseDistanceWidthProtocolConstants tTemporaryPulseDistanceWidthProtocolConstants; - memcpy_P(&tTemporaryPulseDistanceWidthProtocolConstants, aProtocolConstantsPGM, - sizeof(tTemporaryPulseDistanceWidthProtocolConstants)); - sendPulseDistanceWidthFromArray(&tTemporaryPulseDistanceWidthProtocolConstants, aDecodedRawDataArray, aNumberOfBits, - aNumberOfRepeats); -} -void IRsend::sendPulseDistanceWidthFromPGMArray_P(PulseDistanceWidthProtocolConstants const *aProtocolConstantsPGM, - IRRawDataType const *aDecodedRawDataPGMArray, uint16_t aNumberOfBits, int_fast8_t aNumberOfRepeats) { - - PulseDistanceWidthProtocolConstants tTemporaryPulseDistanceWidthProtocolConstants; - memcpy_P(&tTemporaryPulseDistanceWidthProtocolConstants, aProtocolConstantsPGM, - sizeof(tTemporaryPulseDistanceWidthProtocolConstants)); - sendPulseDistanceWidthFromPGMArray(&tTemporaryPulseDistanceWidthProtocolConstants, aDecodedRawDataPGMArray, aNumberOfBits, - aNumberOfRepeats); -} - void IRsend::sendPulseDistanceWidthFromPGMArray(PulseDistanceWidthProtocolConstants *aProtocolConstants, IRRawDataType const *aDecodedRawDataPGMArray, uint16_t aNumberOfBits, int_fast8_t aNumberOfRepeats) { @@ -859,214 +1049,35 @@ void IRsend::sendPulseDistanceWidthFromPGMArray(PulseDistanceWidthProtocolConsta } } -/** - * Sends PulseDistance frames and repeats - * @param aProtocolConstants The constants to use for sending this protocol. - * @param aData uint32 or uint64 holding the bits to be sent. - * @param aNumberOfBits Number of bits from aData to be actually sent. - * @param aNumberOfRepeats If < 0 and a aProtocolConstants->SpecialSendRepeatFunction() is specified - * then it is called without leading and trailing space. - */ -void IRsend::sendPulseDistanceWidth(PulseDistanceWidthProtocolConstants *aProtocolConstants, IRRawDataType aData, - uint_fast8_t aNumberOfBits, int_fast8_t aNumberOfRepeats) { - -#if defined(LOCAL_DEBUG) - Serial.print(F("Data=0x")); - Serial.print(aData, HEX); - Serial.print(F(" #=")); - Serial.println(aNumberOfBits); - Serial.flush(); -#endif - - if (aNumberOfRepeats < 0) { - if (aProtocolConstants->SpecialSendRepeatFunction != nullptr) { - /* - * Send only a special repeat and return - */ - aProtocolConstants->SpecialSendRepeatFunction(); - return; - } else { - // Send only one plain frame (as repeat) - aNumberOfRepeats = 0; - } - } - - // Set IR carrier frequency - enableIROut(aProtocolConstants->FrequencyKHz); - - uint_fast8_t tNumberOfCommands = aNumberOfRepeats + 1; - while (tNumberOfCommands > 0) { - unsigned long tStartOfFrameMillis = millis(); +/********************************************************************************************************************** + * Stubs for send functions with PulseDistanceWidthProtocolConstants parameter + **********************************************************************************************************************/ - if (tNumberOfCommands < ((uint_fast8_t) aNumberOfRepeats + 1) && aProtocolConstants->SpecialSendRepeatFunction != nullptr) { - // send special repeat, if specified and we are not in the first loop - aProtocolConstants->SpecialSendRepeatFunction(); - } else { - /* - * Send Header and regular frame - */ - mark(aProtocolConstants->DistanceWidthTimingInfo.HeaderMarkMicros); - space(aProtocolConstants->DistanceWidthTimingInfo.HeaderSpaceMicros); - sendPulseDistanceWidthData(aProtocolConstants, aData, aNumberOfBits); - } +void IRsend::sendPulseDistanceWidthFromArray_P(PulseDistanceWidthProtocolConstants const *aProtocolConstantsPGM, + IRRawDataType *aDecodedRawDataArray, uint16_t aNumberOfBits, int_fast8_t aNumberOfRepeats) { - tNumberOfCommands--; - // skip last delay! - if (tNumberOfCommands > 0) { - auto tCurrentFrameDurationMillis = millis() - tStartOfFrameMillis; - /* - * Check and fallback for wrong RepeatPeriodMillis parameter. I.e the repeat period must be greater than each frame duration. - */ - if (aProtocolConstants->RepeatPeriodMillis > tCurrentFrameDurationMillis) { - delay(aProtocolConstants->RepeatPeriodMillis - tCurrentFrameDurationMillis); - } - } - } -} -void IRsend::sendPulseDistanceWidth_P(PulseDistanceWidthProtocolConstants const *aProtocolConstantsPGM, IRRawDataType aData, - uint_fast8_t aNumberOfBits, int_fast8_t aNumberOfRepeats) { PulseDistanceWidthProtocolConstants tTemporaryPulseDistanceWidthProtocolConstants; memcpy_P(&tTemporaryPulseDistanceWidthProtocolConstants, aProtocolConstantsPGM, sizeof(tTemporaryPulseDistanceWidthProtocolConstants)); - sendPulseDistanceWidth(&tTemporaryPulseDistanceWidthProtocolConstants, aData, aNumberOfBits, aNumberOfRepeats); -} - -/** - * Sends PulseDistance frames and repeats. - * @param aFrequencyKHz, aHeaderMarkMicros, aHeaderSpaceMicros, aOneMarkMicros, aOneSpaceMicros, aZeroMarkMicros, aZeroSpaceMicros, aFlags, aRepeatPeriodMillis Values to use for sending this protocol, also contained in the PulseDistanceWidthProtocolConstants of this protocol. - * @param aData uint32 or uint64 holding the bits to be sent. - * @param aNumberOfBits Number of bits from aData to be actually sent. - * @param aFlags Evaluated flags are PROTOCOL_IS_MSB_FIRST and SUPPRESS_STOP_BIT. Stop bit is otherwise sent for all pulse distance protocols. - * @param aNumberOfRepeats If < 0 and a aProtocolConstants->SpecialSendRepeatFunction() is specified - * then it is called without leading and trailing space. - * @param aSpecialSendRepeatFunction If nullptr, the first frame is repeated completely, otherwise this function is used for sending the repeat frame. - */ -void IRsend::sendPulseDistanceWidth(uint_fast8_t aFrequencyKHz, uint16_t aHeaderMarkMicros, uint16_t aHeaderSpaceMicros, - uint16_t aOneMarkMicros, uint16_t aOneSpaceMicros, uint16_t aZeroMarkMicros, uint16_t aZeroSpaceMicros, IRRawDataType aData, - uint_fast8_t aNumberOfBits, uint8_t aFlags, uint16_t aRepeatPeriodMillis, int_fast8_t aNumberOfRepeats, - void (*aSpecialSendRepeatFunction)()) { - - if (aNumberOfRepeats < 0) { - if (aSpecialSendRepeatFunction != nullptr) { - aSpecialSendRepeatFunction(); - return; - } else { - aNumberOfRepeats = 0; // send a plain frame as repeat - } - } - - // Set IR carrier frequency - enableIROut(aFrequencyKHz); - - uint_fast8_t tNumberOfCommands = aNumberOfRepeats + 1; - while (tNumberOfCommands > 0) { - unsigned long tStartOfFrameMillis = millis(); - - if (tNumberOfCommands < ((uint_fast8_t) aNumberOfRepeats + 1) && aSpecialSendRepeatFunction != nullptr) { - // send special repeat - aSpecialSendRepeatFunction(); - } else { - // Header and regular frame - mark(aHeaderMarkMicros); - space(aHeaderSpaceMicros); - sendPulseDistanceWidthData(aOneMarkMicros, aOneSpaceMicros, aZeroMarkMicros, aZeroSpaceMicros, aData, aNumberOfBits, - aFlags); - } - - tNumberOfCommands--; - // skip last delay! - if (tNumberOfCommands > 0) { - /* - * Check and fallback for wrong RepeatPeriodMillis parameter. I.e the repeat period must be greater than each frame duration. - */ - auto tFrameDurationMillis = millis() - tStartOfFrameMillis; - if (aRepeatPeriodMillis > tFrameDurationMillis) { - delay(aRepeatPeriodMillis - tFrameDurationMillis); - } - } - } -} - -/** - * Sends PulseDistance from data contained in parameter using ProtocolConstants structure for timing etc. - * The output always ends with a space - * Each additional call costs 16 bytes program memory - * @param aProtocolConstants The constants to use for sending this protocol. - * @param aData uint32 or uint64 holding the bits to be sent. - * @param aNumberOfBits Number of bits from aData to be actually sent. - */ -void IRsend::sendPulseDistanceWidthData(PulseDistanceWidthProtocolConstants *aProtocolConstants, IRRawDataType aData, - uint_fast8_t aNumberOfBits) { - - sendPulseDistanceWidthData(aProtocolConstants->DistanceWidthTimingInfo.OneMarkMicros, - aProtocolConstants->DistanceWidthTimingInfo.OneSpaceMicros, aProtocolConstants->DistanceWidthTimingInfo.ZeroMarkMicros, - aProtocolConstants->DistanceWidthTimingInfo.ZeroSpaceMicros, aData, aNumberOfBits, aProtocolConstants->Flags); + sendPulseDistanceWidthFromArray(&tTemporaryPulseDistanceWidthProtocolConstants, aDecodedRawDataArray, aNumberOfBits, + aNumberOfRepeats); } - -void IRsend::sendPulseDistanceWidthData_P(PulseDistanceWidthProtocolConstants const *aProtocolConstantsPGM, IRRawDataType aData, - uint_fast8_t aNumberOfBits) { +void IRsend::sendPulseDistanceWidthFromPGMArray_P(PulseDistanceWidthProtocolConstants const *aProtocolConstantsPGM, + IRRawDataType const *aDecodedRawDataPGMArray, uint16_t aNumberOfBits, int_fast8_t aNumberOfRepeats) { PulseDistanceWidthProtocolConstants tTemporaryPulseDistanceWidthProtocolConstants; memcpy_P(&tTemporaryPulseDistanceWidthProtocolConstants, aProtocolConstantsPGM, sizeof(tTemporaryPulseDistanceWidthProtocolConstants)); - sendPulseDistanceWidthData(&tTemporaryPulseDistanceWidthProtocolConstants, aData, aNumberOfBits); + sendPulseDistanceWidthFromPGMArray(&tTemporaryPulseDistanceWidthProtocolConstants, aDecodedRawDataPGMArray, aNumberOfBits, + aNumberOfRepeats); } -/** - * Sends PulseDistance data with timing parameters and flag parameters. - * The output always ends with a space - * @param aOneMarkMicros Timing for sending this protocol. - * @param aData uint32 or uint64 holding the bits to be sent. - * @param aNumberOfBits Number of bits from aData to be actually sent. - * @param aFlags Evaluated flags are PROTOCOL_IS_MSB_FIRST and SUPPRESS_STOP_BIT. Stop bit is otherwise sent for all pulse distance protocols. - */ -void IRsend::sendPulseDistanceWidthData(uint16_t aOneMarkMicros, uint16_t aOneSpaceMicros, uint16_t aZeroMarkMicros, - uint16_t aZeroSpaceMicros, IRRawDataType aData, uint_fast8_t aNumberOfBits, uint8_t aFlags) { - -#if defined(LOCAL_DEBUG) - Serial.print(aData, HEX); - Serial.print('|'); - Serial.println(aNumberOfBits); - Serial.flush(); -#endif - - // For MSBFirst, send data from MSB to LSB until mask bit is shifted out - IRRawDataType tMask = 1ULL << (aNumberOfBits - 1); - for (uint_fast8_t i = aNumberOfBits; i > 0; i--) { - if (((aFlags & PROTOCOL_IS_MSB_FIRST) && (aData & tMask)) || (!(aFlags & PROTOCOL_IS_MSB_FIRST) && (aData & 1))) { -#if defined(LOCAL_TRACE) - Serial.print('1'); -#endif - mark(aOneMarkMicros); - space(aOneSpaceMicros); - } else { -#if defined(LOCAL_TRACE) - Serial.print('0'); -#endif - mark(aZeroMarkMicros); - space(aZeroSpaceMicros); - } - if (aFlags & PROTOCOL_IS_MSB_FIRST) { - tMask >>= 1; - } else { - aData >>= 1; - } - } - /* - * Stop bit is sent for all pulse distance protocols i.e. aOneSpaceMicros != aZeroSpaceMicros. - * Therefore it is not sent for Sony :-) - * For sending from an array, no intermediate stop bit must be sent for all but last data chunk. - */ - if ((!(aFlags & SUPPRESS_STOP_BIT)) && (abs(aOneSpaceMicros - aZeroSpaceMicros) > (aOneSpaceMicros / 4))) { - // Send stop bit here -#if defined(LOCAL_TRACE) - Serial.print('S'); -#endif - mark(aOneMarkMicros); // Use aOneMarkMicros for stop bits. This seems to be correct for all protocols :-) - } -#if defined(LOCAL_TRACE) - Serial.println(); -#endif +void IRsend::sendPulseDistanceWidth_P(PulseDistanceWidthProtocolConstants const *aProtocolConstantsPGM, IRRawDataType aData, + uint_fast8_t aNumberOfBits, int_fast8_t aNumberOfRepeats) { + PulseDistanceWidthProtocolConstants tTemporaryPulseDistanceWidthProtocolConstants; + memcpy_P(&tTemporaryPulseDistanceWidthProtocolConstants, aProtocolConstantsPGM, + sizeof(tTemporaryPulseDistanceWidthProtocolConstants)); + sendPulseDistanceWidth(&tTemporaryPulseDistanceWidthProtocolConstants, aData, aNumberOfBits, aNumberOfRepeats); } /** @@ -1142,10 +1153,8 @@ void IRsend::sendBiphaseData(uint16_t aBiphaseTimeUnit, uint32_t aData, uint_fas void IRsend::mark(uint16_t aMarkMicros) { #if defined(SEND_PWM_BY_TIMER) || defined(USE_NO_SEND_PWM) -# if !defined(NO_LED_SEND_FEEDBACK_CODE) - if (FeedbackLEDControl.LedFeedbackEnabled == LED_FEEDBACK_ENABLED_FOR_SEND) { - setFeedbackLED(true); - } +# if defined(LED_SEND_FEEDBACK_CODE) + setFeedbackLED(true); # endif #endif @@ -1173,29 +1182,29 @@ void IRsend::mark(uint16_t aMarkMicros) { customDelayMicroseconds(aMarkMicros); IRLedOff(); -# if !defined(NO_LED_SEND_FEEDBACK_CODE) - if (FeedbackLEDControl.LedFeedbackEnabled == LED_FEEDBACK_ENABLED_FOR_SEND) { - setFeedbackLED(false); - } +# if defined(LED_SEND_FEEDBACK_CODE) + setFeedbackLED(false); return; # endif #else // defined(SEND_PWM_BY_TIMER) - /* - * Generate PWM by bit banging - */ - unsigned long tStartMicros = micros(); - unsigned long tNextPeriodEnding = tStartMicros; - unsigned long tMicros; -# if !defined(NO_LED_SEND_FEEDBACK_CODE) - bool FeedbackLedIsActive = false; -# endif + unsigned long tMicrosOfEndOfNextPWMPause = micros(); +# if defined(LED_SEND_FEEDBACK_CODE) + unsigned long tStartMicros = tMicrosOfEndOfNextPWMPause + (136 / CLOCKS_PER_MICRO); // To compensate for call duration and activating of LED + bool tFeedbackLedIsActive = false; +#else + unsigned long tStartMicros = tMicrosOfEndOfNextPWMPause + (112 / CLOCKS_PER_MICRO); // To compensate for call duration - 112 is an empirical value +#endif + + /*************************************************************************************************** + * Generate the IR PWM with 30% duty cycle with a frequency of e.g. 38 kHz by software / bit banging + **************************************************************************************************/ do { // digitalToggleFast(_IR_TIMING_TEST_PIN); - /* + /***************************************** * Output the PWM pulse - IR LED is active - */ + ****************************************/ noInterrupts(); // do not let interrupts extend the short on period # if defined(USE_OPEN_DRAIN_OUTPUT_FOR_SEND_PIN) || defined(USE_ACTIVE_LOW_OUTPUT_FOR_SEND_PIN) # if defined(USE_ACTIVE_LOW_OUTPUT_FOR_SEND_PIN) || defined(OUTPUT_OPEN_DRAIN) @@ -1217,11 +1226,15 @@ void IRsend::mark(uint16_t aMarkMicros) { digitalWrite(sendPin, HIGH); } # endif - delayMicroseconds (periodOnTimeMicros); // On time is 8 us for 30% duty cycle. This is normally implemented by a blocking wait. - /* - * Output the PWM pause - IR LED is inactive + * Timing for the on time of the e.g. 38 kHz signal. + * On time is 8 us for 30% duty cycle. This is normally implemented by a blocking wait. */ + delayMicroseconds (periodOnTimeMicros); + + /******************************************* + * Output the PWM pause - IR LED is inactive + ******************************************/ # if defined(USE_OPEN_DRAIN_OUTPUT_FOR_SEND_PIN) || defined(USE_ACTIVE_LOW_OUTPUT_FOR_SEND_PIN) # if defined(USE_ACTIVE_LOW_OUTPUT_FOR_SEND_PIN) || defined(OUTPUT_OPEN_DRAIN) if (__builtin_constant_p(sendPin)) { @@ -1246,28 +1259,26 @@ void IRsend::mark(uint16_t aMarkMicros) { */ interrupts(); -# if !defined(NO_LED_SEND_FEEDBACK_CODE) +# if defined(LED_SEND_FEEDBACK_CODE) /* * Delayed call of setFeedbackLED() to get better startup timing, especially required for consecutive marks */ - if (!FeedbackLedIsActive) { - FeedbackLedIsActive = true; - if (FeedbackLEDControl.LedFeedbackEnabled & LED_FEEDBACK_ENABLED_FOR_SEND) { - setFeedbackLED(true); - } + if (!tFeedbackLedIsActive) { + tFeedbackLedIsActive = true; // do it only once + setFeedbackLED(true); } # endif - /* - * PWM pause timing - * Measured delta between pause duration values are 13 us for a 16 MHz Uno (from 13 to 26), if interrupts are disabled below - * Measured delta between pause duration values are 20 us for a 16 MHz Uno (from 7.8 to 28), if interrupts are not disabled below - * Minimal pause duration is 5.2 us with NO_LED_SEND_FEEDBACK_CODE enabled - * and 8.1 us with NO_LED_SEND_FEEDBACK_CODE disabled. - */ - tNextPeriodEnding += periodTimeMicros; + /******************************************************************************************************************************** + * Check for end of the PWM pause with micros() < tMicrosOfEndOfNextPWMPause. + * This generates the timing for the transmit frequency e.g. 38 kHz + * Measured delta between pause duration values are 8 us for a 16 MHz Uno (from 15 to 23), if interrupts are disabled below + * Minimal pause duration is 5.2 us + *******************************************************************************************************************************/ + tMicrosOfEndOfNextPWMPause += periodTimeMicros; #if defined(__AVR__) // micros() for STM sometimes give decreasing values if interrupts are disabled. See https://github.com/stm32duino/Arduino_Core_STM32/issues/1680 noInterrupts(); // disable interrupts (especially the 20 us receive interrupts) only at start of the PWM pause. Otherwise it may extend the pause too much. #endif + unsigned long tMicros; do { #if defined(_IR_MEASURE_TIMING) && defined(_IR_TIMING_TEST_PIN) digitalWriteFast(_IR_TIMING_TEST_PIN, HIGH); // 2 clock cycles @@ -1275,44 +1286,30 @@ void IRsend::mark(uint16_t aMarkMicros) { /* * For AVR @16MHz we have only 4 us resolution. * The duration of the micros() call itself is 3 us. - * It takes 0.9 us from signal going low here. - * The rest of the loop takes 1.2 us with NO_LED_SEND_FEEDBACK_CODE enabled - * and 3 us with NO_LED_SEND_FEEDBACK_CODE disabled. + * It takes 0.9 us from signal going low to here. + * The rest of the loop takes 1.2 us */ #if defined(_IR_MEASURE_TIMING) && defined(_IR_TIMING_TEST_PIN) digitalWriteFast(_IR_TIMING_TEST_PIN, LOW); // 2 clock cycles #endif - /* - * Exit the forever loop if aMarkMicros has reached - */ + + /************************************************* + * Check for end of mark duration / PWM generation + ************************************************/ tMicros = micros(); uint16_t tDeltaMicros = tMicros - tStartMicros; -#if defined(__AVR__) // reset feedback led in the last pause before end // tDeltaMicros += (160 / CLOCKS_PER_MICRO); // adding this once increases program size, so do it below ! -# if !defined(NO_LED_SEND_FEEDBACK_CODE) - if (tDeltaMicros >= aMarkMicros - (30 + (112 / CLOCKS_PER_MICRO))) { // 30 to be constant. Using periodTimeMicros increases program size too much. - if (FeedbackLEDControl.LedFeedbackEnabled & LED_FEEDBACK_ENABLED_FOR_SEND) { - setFeedbackLED(false); - } - } -# endif - // Just getting variables and check for end condition takes minimal 3.8 us - if (tDeltaMicros >= aMarkMicros - (112 / CLOCKS_PER_MICRO)) { // To compensate for call duration - 112 is an empirical value -#else if (tDeltaMicros >= aMarkMicros) { -# if !defined(NO_LED_SEND_FEEDBACK_CODE) - if (FeedbackLEDControl.LedFeedbackEnabled == LED_FEEDBACK_ENABLED_FOR_SEND) { - setFeedbackLED(false); - } -# endif +#if defined(LED_SEND_FEEDBACK_CODE) + setFeedbackLED(false); #endif #if defined(__AVR__) interrupts(); #endif return; } - } while (tMicros < tNextPeriodEnding); + } while (tMicros < tMicrosOfEndOfNextPWMPause); // = End of one PWM period } while (true); # endif } @@ -1354,16 +1351,15 @@ void IRsend::IRLedOff() { # endif #endif -#if !defined(NO_LED_SEND_FEEDBACK_CODE) - if (FeedbackLEDControl.LedFeedbackEnabled & LED_FEEDBACK_ENABLED_FOR_SEND) { - setFeedbackLED(false); - } +#if defined(LED_SEND_FEEDBACK_CODE) + setFeedbackLED(false); #endif } /** * Sends an IR space for the specified number of microseconds. * A space is "no output", so just wait. + * Executing program between end of mark and start of next mark uses around 15 to 20 us @ 16 MHz. This time is adds to the space delay here. */ void IRsend::space(uint16_t aSpaceMicros) { customDelayMicroseconds(aSpaceMicros); diff --git a/src/IRremote.hpp b/src/IRremote.hpp index 942e9aba..b84963e6 100644 --- a/src/IRremote.hpp +++ b/src/IRremote.hpp @@ -54,6 +54,7 @@ * - EXCLUDE_EXOTIC_PROTOCOLS If activated, BANG_OLUFSEN, BOSEWAVE, WHYNTER, FAST and LEGO_PF are excluded in decode() and in sending with IrSender.write(). * - EXCLUDE_UNIVERSAL_PROTOCOLS If activated, the universal decoder for pulse distance protocols and decodeHash (special decoder for all protocols) are excluded in decode(). * - DECODE_* Selection of individual protocols to be decoded. See below. + * - USE_THRESHOLD_DECODER May give slightly better results especially for jittering signals and protocols with short 1 pulses / pauses. * - MARK_EXCESS_MICROS Value is subtracted from all marks and added to all spaces before decoding, to compensate for the signal forming of different IR receiver modules. * - RECORD_GAP_MICROS Minimum gap between IR transmissions, to detect the end of a protocol. * - FEEDBACK_LED_IS_ACTIVE_LOW Required on some boards (like my BluePill and my ESP8266 board), where the feedback LED is active low. @@ -74,60 +75,7 @@ // activate it for all cores that does not use the -flto flag, if you get false error messages regarding begin() during compilation. //#define SUPPRESS_ERROR_MESSAGE_FOR_BEGIN -/* - * If activated, BANG_OLUFSEN, BOSEWAVE, MAGIQUEST, WHYNTER, FAST and LEGO_PF are excluded in decoding and in sending with IrSender.write - */ -//#define EXCLUDE_EXOTIC_PROTOCOLS -/**************************************************** - * PROTOCOLS - ****************************************************/ -/* - * Supported IR protocols - * Each protocol you include costs memory and, during decode, costs time - * Copy the lines with the protocols you need in your program before the #include line - * See also SimpleReceiver example - */ - -#if !defined(NO_DECODER) // for sending raw only -# if (!(defined(DECODE_DENON) || defined(DECODE_JVC) || defined(DECODE_KASEIKYO) \ -|| defined(DECODE_PANASONIC) || defined(DECODE_LG) || defined(DECODE_NEC) || defined(DECODE_ONKYO) || defined(DECODE_SAMSUNG) \ -|| defined(DECODE_SONY) || defined(DECODE_RC5) || defined(DECODE_RC6) \ -|| defined(DECODE_DISTANCE_WIDTH) || defined(DECODE_HASH) || defined(DECODE_BOSEWAVE) \ -|| defined(DECODE_LEGO_PF) || defined(DECODE_MAGIQUEST) || defined(DECODE_FAST) || defined(DECODE_WHYNTER))) -/* - * If no protocol is explicitly enabled, we enable all protocols - */ -#define DECODE_DENON // Includes Sharp -#define DECODE_JVC -#define DECODE_KASEIKYO -#define DECODE_PANASONIC // alias for DECODE_KASEIKYO -#define DECODE_LG -#define DECODE_NEC // Includes Apple and Onkyo -#define DECODE_SAMSUNG -#define DECODE_SONY -#define DECODE_RC5 -#define DECODE_RC6 - -# if !defined(EXCLUDE_EXOTIC_PROTOCOLS) // saves around 2000 bytes program memory -#define DECODE_BOSEWAVE -#define DECODE_LEGO_PF -#define DECODE_MAGIQUEST -#define DECODE_WHYNTER -#define DECODE_FAST -# endif - -# if !defined(EXCLUDE_UNIVERSAL_PROTOCOLS) -#define DECODE_DISTANCE_WIDTH // universal decoder for pulse distance width protocols - requires up to 750 bytes additional program memory -#define DECODE_HASH // special decoder for all protocols - requires up to 250 bytes additional program memory -# endif -# endif -#endif // !defined(NO_DECODER) - -//#define DECODE_BEO // Bang & Olufsen protocol always must be enabled explicitly. It prevents decoding of SONY! - -#if defined(DECODE_NEC) && !(~(~DECODE_NEC + 0) == 0 && ~(~DECODE_NEC + 1) == 1) -#warning "The macros DECODE_XXX no longer require a value. Decoding is now switched by defining / non defining the macro." -#endif +#include "IRProtocol.h" //#define DEBUG // Activate this for lots of lovely debug output from the IRremote core. @@ -143,8 +91,6 @@ * At 100 us it also worked, but not as well. * Set MARK_EXCESS to 100 us and the VS1838 doesn't work at all. * - * The right value is critical for IR codes using short pulses like Denon / Sharp / Lego - * * Observed values: * Delta of each signal type is around 50 up to 100 us and at low signals up to 200 us. * TSOP is better, especially at low IR signal level. @@ -152,8 +98,12 @@ * TSOP31238 Mark Excess 0 to +50 */ #if !defined(MARK_EXCESS_MICROS) +# if defined(USE_THRESHOLD_DECODER) +#define MARK_EXCESS_MICROS 0 // MARK_EXCESS_MICROS is not very relevant here, so we set it to 0 to save up to 164 bytes programming space +# else // To override this value, you simply can add a line #define "MARK_EXCESS_MICROS " in your ino file before the line "#include " -#define MARK_EXCESS_MICROS 20 +#define MARK_EXCESS_MICROS 20 // a value != 0 requires up to 100 bytes program space +# endif #endif /** @@ -262,6 +212,7 @@ #define MICROS_IN_ONE_MILLI 1000L #if defined(NO_LED_FEEDBACK_CODE) +// convert to receive and send macros # if !defined(NO_LED_RECEIVE_FEEDBACK_CODE) #define NO_LED_RECEIVE_FEEDBACK_CODE # endif @@ -269,6 +220,9 @@ #define NO_LED_SEND_FEEDBACK_CODE # endif #endif +#if defined(NO_LED_RECEIVE_FEEDBACK_CODE) && defined(NO_LED_SEND_FEEDBACK_CODE) && !defined(NO_LED_FEEDBACK_CODE) +#define NO_LED_FEEDBACK_CODE +#endif #include "IRremoteInt.h" /* @@ -282,7 +236,8 @@ #if !defined(USE_IRREMOTE_HPP_AS_PLAIN_INCLUDE) #include "private/IRTimer.hpp" // defines IR_SEND_PIN for AVR and SEND_PWM_BY_TIMER -# if !defined(NO_LED_FEEDBACK_CODE) +# if !defined(NO_LED_FEEDBACK_CODE) && !(defined(DISABLE_CODE_FOR_RECEIVER) && defined(NO_LED_SEND_FEEDBACK_CODE)) +// Led feedback code enabled here # if !defined(LED_BUILTIN) /* * print a warning diff --git a/src/IRremoteInt.h b/src/IRremoteInt.h index 1fe27979..745a1558 100644 --- a/src/IRremoteInt.h +++ b/src/IRremoteInt.h @@ -56,13 +56,6 @@ //#define DEBUG // Activate this for lots of lovely debug output from the IRremote core and all protocol decoders. //#define TRACE // Activate this for more debug output. -/** - * For better readability of code - */ -#define DISABLE_LED_FEEDBACK false -#define ENABLE_LED_FEEDBACK true -#define USE_DEFAULT_FEEDBACK_LED_PIN 0 - /** * The RAW_BUFFER_LENGTH determines the length of the byte buffer where the received IR timing data is stored before decoding. * 100 is sufficient for standard protocols up to 48 bits, with 1 bit consisting of one mark and space plus 1 byte for initial gap, 2 bytes for header and 1 byte for stop bit. @@ -126,8 +119,8 @@ typedef uint64_t IRRawDataType; #define IR_REC_STATE_STOP 3 // Stopped until set to IR_REC_STATE_IDLE which can only be done by resume() /** - * This struct contains the data and control used for receiver static functions and the ISR (interrupt service routine) - * Only StateForISR needs to be volatile. All the other fields are not written by ISR after data available and before start/resume. + * This struct contains the data and control used for receiver functions and the ISR (interrupt service routine) + * Only StateForISR needs to be volatile. All the other fields are not written by ISR after available() == true and before start() / resume(). */ struct irparams_struct { // The fields are ordered to reduce memory overflow caused by struct-padding @@ -149,7 +142,34 @@ struct irparams_struct { extern unsigned long sMicrosAtLastStopTimer; // Used to adjust TickCounterForISR with uncounted ticks between stopTimer() and restartTimer() -#include "IRProtocol.h" +#define DECODED_RAW_DATA_ARRAY_SIZE ((((RAW_BUFFER_LENGTH - 2) - 1) / (2 * BITS_IN_RAW_DATA_TYPE)) + 1) // The -2 is for initial gap + stop bit mark, 128 mark + spaces for 64 bit. +/** + * Data structure for the user application, available as decodedIRData. + * Filled by decoders and read by print functions or user application. + */ +struct IRData { + decode_type_t protocol; ///< UNKNOWN, NEC, SONY, RC5, PULSE_DISTANCE, ... + uint16_t address; ///< Decoded address, Distance protocol (tMarkTicksLong (if tMarkTicksLong == 0, then tMarkTicksShort) << 8) | tSpaceTicksLong + uint16_t command; ///< Decoded command, Distance protocol (tMarkTicksShort << 8) | tSpaceTicksShort + uint16_t extra; ///< Contains upper 16 bit of Magiquest WandID, Kaseikyo unknown vendor ID and Distance protocol (HeaderMarkTicks << 8) | HeaderSpaceTicks. + IRRawDataType decodedRawData; ///< Up to 32/64 bit decoded raw data, to be used for sendRaw functions. +#if defined(DECODE_DISTANCE_WIDTH) + // This replaces the address, command, extra and decodedRawData in case of protocol == PULSE_DISTANCE or -rather seldom- protocol == PULSE_WIDTH. + DistanceWidthTimingInfoStruct DistanceWidthTimingInfo; // 12 bytes + IRRawDataType decodedRawDataArray[DECODED_RAW_DATA_ARRAY_SIZE]; ///< 32/64 bit decoded raw data, to be used for sendPulseDistanceWidthFromArray functions. +#endif + uint16_t numberOfBits; ///< Number of bits received for data (address + command + parity) - to determine protocol length if different length are possible. + uint8_t flags; ///< IRDATA_FLAGS_IS_REPEAT, IRDATA_FLAGS_WAS_OVERFLOW etc. See IRDATA_FLAGS_* definitions above + + /* + * These 2 variables allow to call resume() directly after decode. + * After resume(), irparams.initialGapTicks and irparams.rawlen are + * the first variables, which are overwritten by the next received frame. + * since 4.3.0. + */ + IRRawlenType rawlen; ///< Counter of entries in rawbuf of last received frame. + uint16_t initialGapTicks; ///< Contains the initial gap (pre 4.4: the value in rawbuf[0]) of the last received frame. +}; /* * Debug directives @@ -194,28 +214,35 @@ struct decode_results { bool isRepeat; // deprecated, moved to decodedIRData.flags ///< True if repeat of value is detected // next 3 values are copies of irparams_struct values - see above - uint16_t *rawbuf; // deprecated, moved to decodedIRData.rawDataPtr->rawbuf ///< Raw intervals in 50uS ticks - uint_fast8_t rawlen; // deprecated, moved to decodedIRData.rawDataPtr->rawlen ///< Number of records in rawbuf + uint16_t *rawbuf; // deprecated, moved to irparams.rawbuf ///< Raw intervals in 50uS ticks + uint_fast8_t rawlen; // deprecated, moved to irparams.rawlen ///< Number of records in rawbuf bool overflow; // deprecated, moved to decodedIRData.flags ///< true if IR raw code too long }; /** * Main class for receiving IR signals */ +#define USE_DEFAULT_FEEDBACK_LED_PIN 0 // we need it here class IRrecv { public: IRrecv(); +#if defined(SUPPORT_MULTIPLE_RECEIVER_INSTANCES) + IRrecv(uint_fast8_t aReceivePin); + IRrecv(uint_fast8_t aReceivePin, uint_fast8_t aFeedbackLEDPin); +#else IRrecv( uint_fast8_t aReceivePin) __attribute__ ((deprecated ("Please use the default IRrecv instance \"IrReceiver\" and IrReceiver.begin(), and not your own IRrecv instance."))); IRrecv(uint_fast8_t aReceivePin, uint_fast8_t aFeedbackLEDPin) __attribute__ ((deprecated ("Please use the default IRrecv instance \"IrReceiver\" and IrReceiver.begin(), and not your own IRrecv instance.."))); +#endif void setReceivePin(uint_fast8_t aReceivePinNumber); #if !defined(IR_REMOTE_DISABLE_RECEIVE_COMPLETE_CALLBACK) void registerReceiveCompleteCallback(void (*aReceiveCompleteCallbackFunction)(void)); #endif + void ReceiveInterruptHandler(); /* * Stream like API @@ -273,6 +300,7 @@ class IRrecv { #endif static void printActiveIRProtocols(Print *aSerial); + void printIRResultAsCArray(Print *aSerial, bool aOutputMicrosecondsInsteadOfTicks = true, bool aDoCompensate = true); void compensateAndPrintIRResultAsCArray(Print *aSerial, bool aOutputMicrosecondsInsteadOfTicks = true); void compensateAndPrintIRResultAsPronto(Print *aSerial, uint16_t frequency = 38000U); @@ -285,21 +313,32 @@ class IRrecv { /* * The main decoding functions used by the individual decoders */ - bool decodePulseDistanceWidthData(PulseDistanceWidthProtocolConstants *aProtocolConstants, uint_fast8_t aNumberOfBits, +#if defined(USE_STRICT_DECODER) + bool +#else + void +#endif + decodePulseDistanceWidthData(PulseDistanceWidthProtocolConstants *aProtocolConstants, uint_fast8_t aNumberOfBits, IRRawlenType aStartOffset = 3); - bool decodePulseDistanceWidthData_P(PulseDistanceWidthProtocolConstants const *aProtocolConstantsPGM, + void decodePulseDistanceWidthData_P(PulseDistanceWidthProtocolConstants const *aProtocolConstantsPGM, uint_fast8_t aNumberOfBits, IRRawlenType aStartOffset = 3); - bool decodePulseDistanceWidthData(uint_fast8_t aNumberOfBits, IRRawlenType aStartOffset, uint16_t aOneMarkMicros, + void decodePulseDistanceWidthData(uint_fast8_t aNumberOfBits, IRRawlenType aStartOffset, uint16_t aOneMicros, + bool aIsPulseWidthProtocol, bool aMSBfirst); + + void decodeWithThresholdPulseDistanceWidthData(uint_fast8_t aNumberOfBits, IRRawlenType aStartOffset, + uint16_t aOneThresholdMicros, bool aIsPulseWidthProtocol, bool aMSBfirst); + + void decodePulseDistanceWidthData(uint_fast8_t aNumberOfBits, IRRawlenType aStartOffset, uint16_t aOneMarkMicros, uint16_t aOneSpaceMicros, uint16_t aZeroMarkMicros, bool aMSBfirst); - bool decodePulseDistanceWidthData(uint_fast8_t aNumberOfBits, IRRawlenType aStartOffset, uint16_t aOneMarkMicros, + void decodePulseDistanceWidthData(uint_fast8_t aNumberOfBits, IRRawlenType aStartOffset, uint16_t aOneMarkMicros, uint16_t aZeroMarkMicros, uint16_t aOneSpaceMicros, uint16_t aZeroSpaceMicros, bool aMSBfirst) __attribute__ ((deprecated ("Please use decodePulseDistanceWidthData() with 6 parameters."))); - bool decodePulseDistanceWidthDataStrict(uint_fast8_t aNumberOfBits, IRRawlenType aStartOffset, uint16_t aOneMarkMicros, - uint16_t aZeroMarkMicros, uint16_t aOneSpaceMicros, uint16_t aZeroSpaceMicros, bool aMSBfirst); + bool decodeStrictPulseDistanceWidthData(uint_fast8_t aNumberOfBits, IRRawlenType aStartOffset, uint16_t aOneMarkMicros, + uint16_t aOneSpaceMicros, uint16_t aZeroMarkMicros, uint16_t aZeroSpaceMicros, bool aMSBfirst); bool decodeBiPhaseData(uint_fast8_t aNumberOfBits, IRRawlenType aStartOffset, uint_fast8_t aStartClockCount, uint_fast8_t aValueOfSpaceToMarkTransition, uint16_t aBiphaseTimeUnit); @@ -366,6 +405,7 @@ class IRrecv { void checkForRepeatSpaceTicksAndSetFlag(uint16_t aMaximumRepeatSpaceTicks); bool checkForRecordGapsMicros(Print *aSerial); + irparams_struct irparams; IRData decodedIRData; // Decoded IR data for the application // Last decoded IR data for repeat detection and to fill in JVC, LG, NEC repeat values. Parity for Denon autorepeat @@ -379,12 +419,21 @@ class IRrecv { uint8_t repeatCount; // Used e.g. for Denon decode for autorepeat decoding. }; -extern uint_fast8_t sBiphaseDecodeRawbuffOffset; // +void printIRResultShort(Print *aSerial, IRData *aIRDataPtr, bool aPrintRepeatGap) + __attribute__ ((deprecated ("Remove last parameter, it is not supported any more."))); +void printIRResultShort(Print *aSerial, IRData *aIRDataPtr) + __attribute__ ((deprecated ("Use member function or printIRDataShort() instead."))); +; +// A static function to be able to print send or copied received data. +void printIRDataShort(Print *aSerial, IRData *aIRDataPtr); + +extern uint_fast8_t sBiphaseDecodeRawbuffOffset; /* * Mark & Space matching functions */ bool matchTicks(uint16_t aMeasuredTicks, uint16_t aMatchValueMicros); +bool matchTicks(uint16_t aMeasuredTicks, uint16_t aMatchValueMicros, int16_t aCompensationMicrosForTicks); bool matchMark(uint16_t aMeasuredTicks, uint16_t aMatchValueMicros); bool matchSpace(uint16_t aMeasuredTicks, uint16_t aMatchValueMicros); @@ -402,13 +451,12 @@ void printActiveIRProtocols(Print *aSerial); /**************************************************** * Feedback LED related functions ****************************************************/ -#define DO_NOT_ENABLE_LED_FEEDBACK 0x00 -#define LED_FEEDBACK_DISABLED_COMPLETELY 0x00 -#define LED_FEEDBACK_ENABLED_FOR_RECEIVE 0x01 -#define LED_FEEDBACK_ENABLED_FOR_SEND 0x02 -void setFeedbackLED(bool aSwitchLedOn); -void setLEDFeedback(uint8_t aFeedbackLEDPin, uint8_t aEnableLEDFeedback); // if aFeedbackLEDPin == 0, then take board BLINKLED_ON() and BLINKLED_OFF() functions +#define DISABLE_LED_FEEDBACK false +#define ENABLE_LED_FEEDBACK true +//#define USE_DEFAULT_FEEDBACK_LED_PIN 0 // repeated definition for info void setLEDFeedback(bool aEnableLEDFeedback); // Direct replacement for blink13() +void setLEDFeedbackPin(uint8_t aFeedbackLEDPin); +void setFeedbackLED(bool aSwitchLedOn); void enableLEDFeedback(); constexpr auto enableLEDFeedbackForReceive = enableLEDFeedback; // alias for enableLEDFeedback void disableLEDFeedback(); @@ -429,8 +477,8 @@ void setBlinkPin(uint8_t aFeedbackLEDPin) __attribute__ ((deprecated ("Please us #define TICKS(us) ((us)/MICROS_PER_TICK) // (us)/50 #if MICROS_PER_TICK == 50 && TOLERANCE_FOR_DECODERS_MARK_OR_SPACE_MATCHING_PERCENT == 25 // Defaults -#define TICKS_LOW(us) ((us)/67 ) // 67 = MICROS_PER_TICK / ((100-25)/100) = (MICROS_PER_TICK * 100) / (100-25) -#define TICKS_HIGH(us) (((us)/40) + 1) // 40 = MICROS_PER_TICK / ((100+25)/100) = (MICROS_PER_TICK * 100) / (100+25) +#define TICKS_LOW(us) ((us)/67 ) // =(us * 0.75 /MICROS_PER_TICK), 67 = MICROS_PER_TICK / ((100-25)/100) = (MICROS_PER_TICK * 100) / (100-25) +#define TICKS_HIGH(us) (((us)/40) + 1) // =(us * 1,25 /MICROS_PER_TICK), 40 = MICROS_PER_TICK / ((100+25)/100) = (MICROS_PER_TICK * 100) / (100+25) #else /** Lower tolerance for comparison of measured data */ //#define LTOL (1.0 - (TOLERANCE/100.)) @@ -475,25 +523,17 @@ class IRsend { #if defined(IR_SEND_PIN) void begin(); // The default parameter allowed to specify IrSender.begin(7); without errors, if IR_SEND_PIN was defined. But the semantics is not the one the user expect. - void begin(bool aEnableLEDFeedback, uint_fast8_t aFeedbackLEDPin); // 4.3.1 Removed default value USE_DEFAULT_FEEDBACK_LED_PIN for last parameter - // The next function is a dummy to avoid acceptance of pre 4.3 calls to begin(DISABLE_LED_FEEDBACK); - void begin(uint8_t aSendPin) -# if !defined (DOXYGEN) - __attribute__ ((deprecated ("ERROR: IR_SEND_PIN is still defined, therefore the function begin(aSendPin) is NOT available. You must disable '#define IR_SEND_PIN' to enable this function."))); -# endif - - // The next function is a dummy to avoid acceptance of pre 4.0 calls to begin(IR_SEND_PIN, DISABLE_LED_FEEDBACK); - void begin(uint_fast8_t aSendPin, bool aEnableLEDFeedback) -# if !defined (DOXYGEN) - __attribute__ ((deprecated ("You must use begin() and enableLEDFeedback() or disableLEDFeedback() since version 4.3."))); -# endif + void begin(uint_fast8_t aFeedbackLEDPin); #else IRsend(uint_fast8_t aSendPin); void begin(uint_fast8_t aSendPin); void setSendPin(uint_fast8_t aSendPin); // required if we use IRsend() as constructor - // Since 4.0 guarded and without default parameter - void begin(uint_fast8_t aSendPin, bool aEnableLEDFeedback, uint_fast8_t aFeedbackLEDPin); // aFeedbackLEDPin can be USE_DEFAULT_FEEDBACK_LED_PIN #endif + void begin(uint_fast8_t aSendPin, uint_fast8_t aFeedbackLEDPin); // aFeedbackLEDPin is by default USE_DEFAULT_FEEDBACK_LED_PIN + void begin(uint_fast8_t aSendPin, bool aEnableLEDFeedback, uint_fast8_t aFeedbackLEDPin) +# if !defined (DOXYGEN) + __attribute__ ((deprecated ("Use begin(aSendPin, aFeedbackLEDPin) instead."))); +# endif size_t write(IRData *aIRSendData, int_fast8_t aNumberOfRepeats = NO_REPEATS); size_t write(decode_type_t aProtocol, uint16_t aAddress, uint16_t aCommand, int_fast8_t aNumberOfRepeats = NO_REPEATS); @@ -677,7 +717,10 @@ class IRsend { int nbits) __attribute__ ((deprecated ("This old function sends MSB first! Please use sendSony(aAddress, aCommand, aNumberOfRepeats)."))); - void sendWhynter(uint32_t aData, uint8_t aNumberOfBitsToSend); + void sendWhynter(uint32_t aData, int_fast8_t aNumberOfRepeats); + void sendVelux(uint8_t aCommand, uint8_t aMotorNumber, uint8_t aMotorSet, uint16_t aSecurityCode, uint8_t aCRC, + int_fast8_t aNumberOfRepeats); + void sendVelux(uint32_t aData, int_fast8_t aNumberOfRepeats); #if !defined(IR_SEND_PIN) uint8_t sendPin; diff --git a/src/TinyIR.h b/src/TinyIR.h index 8e29871e..ea1ce7bf 100644 --- a/src/TinyIR.h +++ b/src/TinyIR.h @@ -53,14 +53,14 @@ #define NEC_UNIT 560 -#define NEC_HEADER_MARK (16 * NEC_UNIT) // 9000 -#define NEC_HEADER_SPACE (8 * NEC_UNIT) // 4500 +#define NEC_HEADER_MARK (16 * NEC_UNIT) // 8860 +#define NEC_HEADER_SPACE (8 * NEC_UNIT) // 4480 #define NEC_BIT_MARK NEC_UNIT -#define NEC_ONE_SPACE (3 * NEC_UNIT) // 1690 +#define NEC_ONE_SPACE (3 * NEC_UNIT) // 1680 #define NEC_ZERO_SPACE NEC_UNIT -#define NEC_REPEAT_HEADER_SPACE (4 * NEC_UNIT) // 2250 +#define NEC_REPEAT_HEADER_SPACE (4 * NEC_UNIT) // 2240 #define NEC_REPEAT_PERIOD 110000 // Commands are repeated every 110 ms (measured from start to start) for as long as the key on the remote control is held down. #define NEC_MINIMAL_DURATION 49900 // NEC_HEADER_MARK + NEC_HEADER_SPACE + 32 * 2 * NEC_UNIT + NEC_UNIT // 2.5 because we assume more zeros than ones @@ -122,10 +122,12 @@ #define TINY_RECEIVER_HEADER_MARK FAST_HEADER_MARK #define TINY_RECEIVER_HEADER_SPACE FAST_HEADER_SPACE +#define TINY_RECEIVER_MARK_TIMEOUT (2 * FAST_HEADER_MARK) #define TINY_RECEIVER_BIT_MARK FAST_BIT_MARK #define TINY_RECEIVER_ONE_SPACE FAST_ONE_SPACE #define TINY_RECEIVER_ZERO_SPACE FAST_ZERO_SPACE +#define TINY_RECEIVER_ONE_THRESHOLD (2 * FAST_UNIT) // 1052 #define TINY_RECEIVER_MAXIMUM_REPEAT_DISTANCE FAST_MAXIMUM_REPEAT_DISTANCE // for repeat detection @@ -151,11 +153,13 @@ #define TINY_RECEIVER_UNIT NEC_UNIT #define TINY_RECEIVER_HEADER_MARK NEC_HEADER_MARK +#define TINY_RECEIVER_MARK_TIMEOUT (2 * NEC_HEADER_MARK) #define TINY_RECEIVER_HEADER_SPACE NEC_HEADER_SPACE #define TINY_RECEIVER_BIT_MARK NEC_BIT_MARK #define TINY_RECEIVER_ONE_SPACE NEC_ONE_SPACE #define TINY_RECEIVER_ZERO_SPACE NEC_ZERO_SPACE +#define TINY_RECEIVER_ONE_THRESHOLD (2 * NEC_UNIT) // 1120 #define TINY_RECEIVER_MAXIMUM_REPEAT_DISTANCE NEC_MAXIMUM_REPEAT_DISTANCE #endif diff --git a/src/TinyIRReceiver.hpp b/src/TinyIRReceiver.hpp index af66d3c8..cd5fe88e 100644 --- a/src/TinyIRReceiver.hpp +++ b/src/TinyIRReceiver.hpp @@ -131,6 +131,9 @@ volatile TinyIRReceiverCallbackDataStruct TinyIRReceiverData; # endif #endif +#if !defined(NO_LED_RECEIVE_FEEDBACK_CODE) +#define LED_RECEIVE_FEEDBACK_CODE // Resolve the double negative +#endif #if !( \ (defined(__AVR_ATtiny25__) || defined(__AVR_ATtiny45__) || defined(__AVR_ATtiny85__)) /* ATtinyX5 */ \ @@ -171,7 +174,7 @@ void IRPinChangeInterruptHandler(void) { */ uint_fast8_t tIRLevel = digitalReadFast(IR_RECEIVE_PIN); -#if !defined(NO_LED_RECEIVE_FEEDBACK_CODE) && defined(IR_FEEDBACK_LED_PIN) +#if defined(LED_RECEIVE_FEEDBACK_CODE) && defined(IR_FEEDBACK_LED_PIN) # if defined(FEEDBACK_LED_IS_ACTIVE_LOW) digitalWriteFast(IR_FEEDBACK_LED_PIN, tIRLevel); # else @@ -184,7 +187,7 @@ void IRPinChangeInterruptHandler(void) { */ // Repeats can be sent after a pause, which is longer than 64000 microseconds, so we need a 32 bit value for check of repeats uint32_t tCurrentMicros = micros(); - uint32_t tMicrosOfMarkOrSpace32 = tCurrentMicros - TinyIRReceiverControl.LastChangeMicros; + uint32_t tMicrosOfMarkOrSpace32 = tCurrentMicros - TinyIRReceiverControl.LastChangeMicros; // statement is required to force 32 bit arithmetic uint16_t tMicrosOfMarkOrSpace = tMicrosOfMarkOrSpace32; TinyIRReceiverControl.LastChangeMicros = tCurrentMicros; @@ -202,9 +205,9 @@ void IRPinChangeInterruptHandler(void) { if (tIRLevel == LOW) { /* - * We have a mark here + * We are at the start of a mark here and tMicrosOfMarkOrSpace is the time of the previous space */ - if (tMicrosOfMarkOrSpace > 2 * TINY_RECEIVER_HEADER_MARK) { + if (tMicrosOfMarkOrSpace > TINY_RECEIVER_MARK_TIMEOUT) { // timeout -> must reset state machine tState = IR_RECEIVER_STATE_WAITING_FOR_START_MARK; } @@ -229,7 +232,7 @@ void IRPinChangeInterruptHandler(void) { if (tMicrosOfMarkOrSpace >= lowerValue25Percent(TINY_RECEIVER_HEADER_SPACE) && tMicrosOfMarkOrSpace <= upperValue25Percent(TINY_RECEIVER_HEADER_SPACE)) { /* - * We had a valid data header space here -> initialize data + * We had a valid data header space before -> initialize data */ TinyIRReceiverControl.IRRawDataBitCounter = 0; #if (TINY_RECEIVER_BITS > 16) @@ -239,8 +242,9 @@ void IRPinChangeInterruptHandler(void) { #endif TinyIRReceiverControl.IRRawDataMask = 1; tState = IR_RECEIVER_STATE_WAITING_FOR_DATA_SPACE; + #if !defined(ENABLE_NEC2_REPEATS) - // Check for NEC repeat header + // Alternatively check for NEC repeat header space length } else if (tMicrosOfMarkOrSpace >= lowerValue25Percent(NEC_REPEAT_HEADER_SPACE) && tMicrosOfMarkOrSpace <= upperValue25Percent(NEC_REPEAT_HEADER_SPACE) && TinyIRReceiverControl.IRRawDataBitCounter >= TINY_RECEIVER_BITS) { @@ -257,13 +261,17 @@ void IRPinChangeInterruptHandler(void) { } } + else if (tState == IR_RECEIVER_STATE_WAITING_FOR_DATA_MARK) { - // Check data space length + /* + * Start of data mark here, check data space length + * Maybe the minimum length check could be removed here. + */ if (tMicrosOfMarkOrSpace >= lowerValue50Percent(TINY_RECEIVER_ZERO_SPACE) && tMicrosOfMarkOrSpace <= upperValue50Percent(TINY_RECEIVER_ONE_SPACE)) { // We have a valid bit here tState = IR_RECEIVER_STATE_WAITING_FOR_DATA_SPACE; - if (tMicrosOfMarkOrSpace >= 2 * TINY_RECEIVER_UNIT) { + if (tMicrosOfMarkOrSpace >= TINY_RECEIVER_ONE_THRESHOLD) { // we received a 1 #if (TINY_RECEIVER_BITS > 16) TinyIRReceiverControl.IRRawData.ULong |= TinyIRReceiverControl.IRRawDataMask; @@ -288,7 +296,8 @@ void IRPinChangeInterruptHandler(void) { else { /* - * We have a space here + * We are at the start of a space here and tMicrosOfMarkOrSpace is the time of the previous mark + * */ if (tState == IR_RECEIVER_STATE_WAITING_FOR_START_SPACE) { /* @@ -457,7 +466,7 @@ bool isIRReceiverAttachedForTinyReceiver() { bool initPCIInterruptForTinyReceiver() { pinModeFast(IR_RECEIVE_PIN, INPUT); -#if !defined(NO_LED_RECEIVE_FEEDBACK_CODE) && defined(IR_FEEDBACK_LED_PIN) +#if defined(LED_RECEIVE_FEEDBACK_CODE) && defined(IR_FEEDBACK_LED_PIN) pinModeFast(IR_FEEDBACK_LED_PIN, OUTPUT); # if defined(FEEDBACK_LED_IS_ACTIVE_LOW) digitalWriteFast(IR_FEEDBACK_LED_PIN, HIGH); diff --git a/src/TinyIRSender.hpp b/src/TinyIRSender.hpp index be0d07ef..1053d52c 100644 --- a/src/TinyIRSender.hpp +++ b/src/TinyIRSender.hpp @@ -66,6 +66,10 @@ #warning "IR_SEND_PIN is not defined, so it is set to 3" #define IR_SEND_PIN 3 #endif +#if !defined(NO_LED_SEND_FEEDBACK_CODE) +#define LED_SEND_FEEDBACK_CODE // Resolve the double negative +#endif + /* * Generate 38 kHz IR signal by bit banging */ @@ -164,7 +168,7 @@ void sendONKYO(uint8_t aSendPin, uint16_t aAddress, uint16_t aCommand, uint_fast } } } -#if !defined(NO_LED_SEND_FEEDBACK_CODE) && defined(IR_FEEDBACK_LED_PIN) +#if defined(LED_SEND_FEEDBACK_CODE) && defined(IR_FEEDBACK_LED_PIN) pinModeFast(IR_FEEDBACK_LED_PIN, OUTPUT); # if defined(FEEDBACK_LED_IS_ACTIVE_LOW) digitalWriteFast(IR_FEEDBACK_LED_PIN, HIGH); @@ -187,7 +191,7 @@ void sendNECMinimal(uint8_t aSendPin, uint16_t aAddress, uint16_t aCommand, uint void sendNEC(uint8_t aSendPin, uint16_t aAddress, uint16_t aCommand, uint_fast8_t aNumberOfRepeats, bool aSendNEC2Repeats) { pinModeFast(aSendPin, OUTPUT); -#if !defined(NO_LED_SEND_FEEDBACK_CODE) && defined(IR_FEEDBACK_LED_PIN) +#if defined(LED_SEND_FEEDBACK_CODE) && defined(IR_FEEDBACK_LED_PIN) pinModeFast(IR_FEEDBACK_LED_PIN, OUTPUT); # if defined(FEEDBACK_LED_IS_ACTIVE_LOW) digitalWriteFast(IR_FEEDBACK_LED_PIN, LOW); @@ -250,7 +254,7 @@ void sendNEC(uint8_t aSendPin, uint16_t aAddress, uint16_t aCommand, uint_fast8_ } } } -#if !defined(NO_LED_SEND_FEEDBACK_CODE) && defined(IR_FEEDBACK_LED_PIN) +#if defined(LED_SEND_FEEDBACK_CODE) && defined(IR_FEEDBACK_LED_PIN) pinModeFast(IR_FEEDBACK_LED_PIN, OUTPUT); # if defined(FEEDBACK_LED_IS_ACTIVE_LOW) digitalWriteFast(IR_FEEDBACK_LED_PIN, HIGH); @@ -270,7 +274,7 @@ void sendNEC(uint8_t aSendPin, uint16_t aAddress, uint16_t aCommand, uint_fast8_ void sendExtendedNEC(uint8_t aSendPin, uint16_t aAddress, uint16_t aCommand, uint_fast8_t aNumberOfRepeats, bool aSendNEC2Repeats) { pinModeFast(aSendPin, OUTPUT); -#if !defined(NO_LED_SEND_FEEDBACK_CODE) && defined(IR_FEEDBACK_LED_PIN) +#if defined(LED_SEND_FEEDBACK_CODE) && defined(IR_FEEDBACK_LED_PIN) pinModeFast(IR_FEEDBACK_LED_PIN, OUTPUT); # if defined(FEEDBACK_LED_IS_ACTIVE_LOW) digitalWriteFast(IR_FEEDBACK_LED_PIN, LOW); @@ -324,7 +328,7 @@ void sendExtendedNEC(uint8_t aSendPin, uint16_t aAddress, uint16_t aCommand, uin } } } -#if !defined(NO_LED_SEND_FEEDBACK_CODE) && defined(IR_FEEDBACK_LED_PIN) +#if defined(LED_SEND_FEEDBACK_CODE) && defined(IR_FEEDBACK_LED_PIN) pinModeFast(IR_FEEDBACK_LED_PIN, OUTPUT); # if defined(FEEDBACK_LED_IS_ACTIVE_LOW) digitalWriteFast(IR_FEEDBACK_LED_PIN, HIGH); @@ -347,7 +351,7 @@ void sendFast8BitAndParity(uint8_t aSendPin, uint8_t aCommand, uint_fast8_t aNum void sendFAST(uint8_t aSendPin, uint16_t aCommand, uint_fast8_t aNumberOfRepeats) { pinModeFast(aSendPin, OUTPUT); -#if !defined(NO_LED_SEND_FEEDBACK_CODE) && defined(IR_FEEDBACK_LED_PIN) +#if defined(LED_SEND_FEEDBACK_CODE) && defined(IR_FEEDBACK_LED_PIN) pinModeFast(IR_FEEDBACK_LED_PIN, OUTPUT); # if defined(FEEDBACK_LED_IS_ACTIVE_LOW) digitalWriteFast(IR_FEEDBACK_LED_PIN, LOW); @@ -399,7 +403,7 @@ void sendFAST(uint8_t aSendPin, uint16_t aCommand, uint_fast8_t aNumberOfRepeats } } } -#if !defined(NO_LED_SEND_FEEDBACK_CODE) && defined(IR_FEEDBACK_LED_PIN) +#if defined(LED_SEND_FEEDBACK_CODE) && defined(IR_FEEDBACK_LED_PIN) pinModeFast(IR_FEEDBACK_LED_PIN, OUTPUT); # if defined(FEEDBACK_LED_IS_ACTIVE_LOW) digitalWriteFast(IR_FEEDBACK_LED_PIN, HIGH); diff --git a/src/ir_BangOlufsen.hpp b/src/ir_BangOlufsen.hpp index f399741f..3c1f3015 100644 --- a/src/ir_BangOlufsen.hpp +++ b/src/ir_BangOlufsen.hpp @@ -10,7 +10,7 @@ ************************************************************************************ * MIT License * - * Copyright (c) 2022-2023 Daniel Wallner and Armin Joachimsmeyer + * Copyright (c) 2022-2025 Daniel Wallner and Armin Joachimsmeyer * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -59,22 +59,22 @@ // If you need to parallel a receiver with another one you may need to delay the signal to get in phase with the other receiver // 2. A stream of messages can be sent back to back with a new message immediately following the previous stop space - // It might be that this only happens over IR and not on the datalink protocol // You can choose to support this or not: // Mode 1: Mode with gaps between frames -// Set RECORD_GAP_MICROS to at least 16000 to accept the unusually long 3. start space +// Do NOT define ENABLE_BEO_WITHOUT_FRAME_GAP and set RECORD_GAP_MICROS to at least 16000 to accept the unusually long 3. start space // Can only receive single messages. Back to back repeats will result in overflow // Mode 2: Break at start mode // Define ENABLE_BEO_WITHOUT_FRAME_GAP and set RECORD_GAP_MICROS to less than 15000 -// to treat the 3. start space of 15.5 ms as a gap between messages, which makes decoding easier :-). + +// This treats the 3. start space of 15.5 ms as a gap between 2 messages, which makes decoding easier :-). // The receiving of a transmission will then result in a dummy decode of the first 2 start bits with 0 bits data // followed by a 15.5 ms gap and a data frame with one start bit (originally sent as 4. start bit). -// If the receiver is not resumed within a ms or so, partial messages will be decoded -// Debug printing in the wrong place is very likely to break reception -// Make sure to check the number of bits to filter dummy and incomplete messages +// If the receiver is not immediately resumed after the 2 start bit frame, partial second frame will be decoded! +// Thus debug printing in the wrong place is very likely to break reception! +// Make sure to check the number of bits to filter dummy and incomplete messages. // !!! We assume that the real implementations never set the official first header bit to anything other than 0 !!! // !!! We therefore use 4 start bits instead of the specified 3 and in turn ignore the first header bit of the specification !!! @@ -85,7 +85,7 @@ // B&O is a pulse distance protocol, but it has 3 bit values 0, 1 and (equal/repeat) as well as a special start and trailing bit. // -// MSB first, 4 start bits + 8 to 16? bit address + 8 bit command + 1 special trailing bit + 1 stop bit. +// MSB first, 4 start bits + 8 (to 16?) bit address + 8 bit command + 1 special trailing bit + 1 stop bit. // Address can be longer than 8 bit. /* @@ -111,6 +111,10 @@ #define BEO_UNIT 3125 // All timings are in microseconds #define BEO_IR_MARK 200 // The length of a mark in the IR protocol + +// With decode we see length from 200 to 300 and the 300 leads to errors, if we use 200 as mark length for decode. +// And the space value is at least 3125, so we can do a reluctant test for the mark anyway. +#define BEO_IR_MARK_FOR_DECODE 250 #define BEO_DATALINK_MARK (BEO_UNIT / 2) // The length of a mark in the Datalink protocol #define BEO_PULSE_LENGTH_ZERO BEO_UNIT // The length of a one to zero transition @@ -147,16 +151,17 @@ /* * TODO aNumberOfRepeats are handled not correctly if ENABLE_BEO_WITHOUT_FRAME_GAP is defined + * @param aNumberOfHeaderBits default is 8 */ void IRsend::sendBangOlufsen(uint16_t aHeader, uint8_t aData, int_fast8_t aNumberOfRepeats, int8_t aNumberOfHeaderBits) { for (int_fast8_t i = 0; i < aNumberOfRepeats + 1; ++i) { - sendBangOlufsenRaw((uint32_t(aHeader) << 8) | aData, aNumberOfHeaderBits + 8, i != 0); + sendBangOlufsenRaw((uint32_t(aHeader) << aNumberOfHeaderBits) | aData, aNumberOfHeaderBits + BEO_DATA_BITS, i != 0); } } void IRsend::sendBangOlufsenDataLink(uint32_t aHeader, uint8_t aData, int_fast8_t aNumberOfRepeats, int8_t aNumberOfHeaderBits) { for (int_fast8_t i = 0; i < aNumberOfRepeats + 1; ++i) { - sendBangOlufsenRawDataLink((uint64_t(aHeader) << 8) | aData, aNumberOfHeaderBits + 8, i != 0, true); + sendBangOlufsenRawDataLink((uint64_t(aHeader) << aNumberOfHeaderBits) | aData, aNumberOfHeaderBits + BEO_DATA_BITS, i != 0, true); } } @@ -293,8 +298,16 @@ static bool matchBeoLength(uint16_t aMeasuredTicks, uint16_t aMatchValueMicros) bool IRrecv::decodeBangOlufsen() { #if defined(ENABLE_BEO_WITHOUT_FRAME_GAP) if (decodedIRData.rawlen != 6 && decodedIRData.rawlen < 36) { // 16 bits minimum + BEO_DEBUG_PRINT(F("B&O: ")); + BEO_DEBUG_PRINT(F("Data length=")); + BEO_DEBUG_PRINT(decodedIRData.rawlen); + BEO_DEBUG_PRINTLN(F(" is not < 36 or 6")); #else if (decodedIRData.rawlen < 44) { // 16 bits minimum + BEO_DEBUG_PRINT(F("B&O: ")); + BEO_DEBUG_PRINT(F("Data length=")); + BEO_DEBUG_PRINT(decodedIRData.rawlen); + BEO_DEBUG_PRINTLN(F(" is not < 44")); #endif return false; } @@ -310,7 +323,7 @@ bool IRrecv::decodeBangOlufsen() { uint8_t tBitNumber = 0; BEO_TRACE_PRINT(F("Pre gap: ")); - BEO_TRACE_PRINT(decodedIRData.initialGapTicks * 50); + BEO_TRACE_PRINT((uint32_t)decodedIRData.initialGapTicks * 50); BEO_TRACE_PRINT(F(" raw len: ")); BEO_TRACE_PRINTLN(decodedIRData.rawlen); @@ -319,34 +332,33 @@ bool IRrecv::decodeBangOlufsen() { * Check if we have the AGC part of the first frame, i.e. start bit 1 and 2. */ if (decodedIRData.rawlen == 6) { - if ((matchMark(decodedIRData.rawDataPtr->rawbuf[3], BEO_IR_MARK) - || matchMark(decodedIRData.rawDataPtr->rawbuf[3], BEO_DATALINK_MARK)) - && (matchSpace(decodedIRData.rawDataPtr->rawbuf[4], BEO_PULSE_LENGTH_ZERO - BEO_IR_MARK) - || matchSpace(decodedIRData.rawDataPtr->rawbuf[4], BEO_PULSE_LENGTH_ZERO - BEO_DATALINK_MARK))) { - BEO_TRACE_PRINT(::getProtocolString(BANG_OLUFSEN)); + if ((matchMark(irparams.rawbuf[3], BEO_IR_MARK_FOR_DECODE) + || matchMark(irparams.rawbuf[3], BEO_DATALINK_MARK)) + && (matchSpace(irparams.rawbuf[4], BEO_PULSE_LENGTH_ZERO - BEO_IR_MARK_FOR_DECODE) + || matchSpace(irparams.rawbuf[4], BEO_PULSE_LENGTH_ZERO - BEO_DATALINK_MARK))) { BEO_TRACE_PRINTLN(F("B&O: AGC only part (start bits 1 + 2 of 4) detected")); } else { return false; // no B&O protocol } } else { /* - * Check if leading gap is trailing bit of first frame + * Check if leading gap is trailing bit of first AGC frame */ if (!matchSpace(decodedIRData.initialGapTicks, BEO_PULSE_LENGTH_START_BIT)) { - BEO_TRACE_PRINT(::getProtocolString(BANG_OLUFSEN)); - BEO_TRACE_PRINTLN(F(": Leading gap is wrong")); // Leading gap is trailing bit of first frame + BEO_TRACE_PRINT(F("B&O: Leading gap of ")); // Leading gap is trailing bit of first frame + BEO_TRACE_PRINT((uint32_t)decodedIRData.initialGapTicks * 50); // Leading gap is trailing bit of first frame + BEO_TRACE_PRINTLN(F(" us is wrong")); // Leading gap is trailing bit of first frame return false; // no B&O protocol } - if (matchMark(decodedIRData.rawDataPtr->rawbuf[1], BEO_IR_MARK)) { + if (matchMark(irparams.rawbuf[1], BEO_IR_MARK_FOR_DECODE)) { # if defined(SUPPORT_BEO_DATALINK_TIMING_FOR_DECODE) - protocolMarkLength = BEO_IR_MARK; - } else if (matchMark(decodedIRData.rawDataPtr->rawbuf[1], BEO_DATALINK_MARK)) { + protocolMarkLength = BEO_IR_MARK_FOR_DECODE; + } else if (matchMark(irparams.rawbuf[1], BEO_DATALINK_MARK)) { protocolMarkLength = BEO_DATALINK_MARK; # endif } else { - BEO_TRACE_PRINT(::getProtocolString(BANG_OLUFSEN)); - BEO_TRACE_PRINTLN(F(": mark length is wrong")); + BEO_TRACE_PRINTLN(F("B&O: mark length is wrong")); return false; } @@ -356,8 +368,8 @@ bool IRrecv::decodeBangOlufsen() { for (uint8_t tRawBufferMarkIndex = 1; tRawBufferMarkIndex < decodedIRData.rawlen; tRawBufferMarkIndex += 2) { #endif // defined(ENABLE_BEO_WITHOUT_FRAME_GAP) - uint16_t markLength = decodedIRData.rawDataPtr->rawbuf[tRawBufferMarkIndex]; - uint16_t spaceLength = decodedIRData.rawDataPtr->rawbuf[tRawBufferMarkIndex + 1]; + uint16_t markLength = irparams.rawbuf[tRawBufferMarkIndex]; + uint16_t spaceLength = irparams.rawbuf[tRawBufferMarkIndex + 1]; BEO_TRACE_PRINT(tPulseNumber); BEO_TRACE_PRINT(' '); @@ -376,29 +388,27 @@ bool IRrecv::decodeBangOlufsen() { if (tPulseNumber < 4) { if (tPulseNumber < 2) { // bit 0 and 1 - if (matchSpace(spaceLength, BEO_PULSE_LENGTH_START_BIT - BEO_IR_MARK)) { + if (matchSpace(spaceLength, BEO_PULSE_LENGTH_START_BIT - BEO_IR_MARK_FOR_DECODE)) { BEO_TRACE_PRINTLN(F(": detected long start bit -> synchronize state now")); tPulseNumber = 2; } } else { if (tPulseNumber == 3) { - if (matchMark(markLength, BEO_IR_MARK)) { + if (matchMark(markLength, BEO_IR_MARK_FOR_DECODE)) { # if defined(SUPPORT_BEO_DATALINK_TIMING_FOR_DECODE) - protocolMarkLength = BEO_IR_MARK; + protocolMarkLength = BEO_IR_MARK_FOR_DECODE; } else if (matchMark(markLength, BEO_DATALINK_MARK)) { protocolMarkLength = BEO_DATALINK_MARK; # endif } else { - BEO_DEBUG_PRINT(::getProtocolString(BANG_OLUFSEN)); - BEO_DEBUG_PRINTLN(F(": 4. (start) mark length is wrong")); + BEO_DEBUG_PRINTLN(F("B&O: 4. (start) mark length is wrong")); return false; } } // bit 2 and 3 if (!matchBeoLength(markLength + spaceLength, (tPulseNumber == 2) ? BEO_PULSE_LENGTH_START_BIT : BEO_PULSE_LENGTH_ZERO)) { - BEO_DEBUG_PRINT(::getProtocolString(BANG_OLUFSEN)); - BEO_DEBUG_PRINTLN(F(": Start length is wrong")); + BEO_DEBUG_PRINTLN(F("B&O: Start length is wrong")); return false; } } @@ -412,10 +422,9 @@ bool IRrecv::decodeBangOlufsen() { #if defined(SUPPORT_BEO_DATALINK_TIMING_FOR_DECODE) if (!matchMark(markLength, protocolMarkLength)) { #else - if (!matchMark(markLength, BEO_IR_MARK)) { + if (!matchMark(markLength, BEO_IR_MARK_FOR_DECODE)) { #endif - BEO_DEBUG_PRINT(::getProtocolString(BANG_OLUFSEN)); - BEO_DEBUG_PRINTLN(F(": Mark length is wrong")); + BEO_DEBUG_PRINTLN(F("B&O: Mark length is wrong")); return false; } @@ -424,14 +433,12 @@ bool IRrecv::decodeBangOlufsen() { */ if (tBitNumber > BEO_DATA_BITS + 4) { if (matchBeoLength(markLength + spaceLength, BEO_PULSE_LENGTH_TRAILING_BIT)) { - BEO_DEBUG_PRINT(::getProtocolString(BANG_OLUFSEN)); - BEO_DEBUG_PRINTLN(F(": Trailing bit detected")); + BEO_DEBUG_PRINTLN(F("B&O: Trailing bit detected")); break; } #if !defined(ENABLE_BEO_WITHOUT_FRAME_GAP) if (tRawBufferMarkIndex >= decodedIRData.rawlen - 3) { // (rawlen - 3) is index of trailing bit mark - BEO_DEBUG_PRINT(::getProtocolString(BANG_OLUFSEN)); - BEO_DEBUG_PRINTLN(F(": End of buffer, but no trailing bit detected")); + BEO_DEBUG_PRINTLN(F("B&O: End of buffer, but no trailing bit detected")); return false; } #endif @@ -445,8 +452,7 @@ bool IRrecv::decodeBangOlufsen() { } else if (tLastDecodedBitValue == 1 && matchBeoLength(markLength + spaceLength, BEO_PULSE_LENGTH_ZERO)) { tLastDecodedBitValue = 0; } else if (!matchBeoLength(markLength + spaceLength, BEO_PULSE_LENGTH_EQUAL)) { - BEO_DEBUG_PRINT(::getProtocolString(BANG_OLUFSEN)); - BEO_DEBUG_PRINT(F(": Index=")); + BEO_DEBUG_PRINT(F("B&O: Index=")); BEO_DEBUG_PRINT(tRawBufferMarkIndex); BEO_DEBUG_PRINT(F(" Length ")); BEO_DEBUG_PRINT((markLength + spaceLength) * MICROS_PER_TICK); @@ -471,8 +477,7 @@ bool IRrecv::decodeBangOlufsen() { * Check for last bit after decoding it */ if (tRawBufferMarkIndex >= decodedIRData.rawlen - 3) { // (rawlen - 3) is index of last bit mark - BEO_TRACE_PRINT(::getProtocolString(BANG_OLUFSEN)); - BEO_TRACE_PRINTLN(F(": Last bit reached")); + BEO_TRACE_PRINTLN(F("B&O: Last bit reached")); break; } #endif diff --git a/src/ir_BoseWave.hpp b/src/ir_BoseWave.hpp index 336d886f..b278d1f0 100644 --- a/src/ir_BoseWave.hpp +++ b/src/ir_BoseWave.hpp @@ -47,7 +47,7 @@ #define BOSEWAVE_MAXIMUM_REPEAT_DISTANCE 62000 struct PulseDistanceWidthProtocolConstants const BoseWaveProtocolConstants PROGMEM = {BOSEWAVE, BOSEWAVE_KHZ, BOSEWAVE_HEADER_MARK, - BOSEWAVE_HEADER_SPACE, BOSEWAVE_BIT_MARK, BOSEWAVE_ONE_SPACE, BOSEWAVE_BIT_MARK, BOSEWAVE_ZERO_SPACE, PROTOCOL_IS_LSB_FIRST + BOSEWAVE_HEADER_SPACE, BOSEWAVE_BIT_MARK, BOSEWAVE_ONE_SPACE, BOSEWAVE_BIT_MARK, BOSEWAVE_ZERO_SPACE, PROTOCOL_IS_LSB_FIRST | PROTOCOL_IS_PULSE_DISTANCE , (BOSEWAVE_REPEAT_PERIOD / MICROS_IN_ONE_MILLI), nullptr}; /************************************ @@ -76,16 +76,10 @@ bool IRrecv::decodeBoseWave() { return false; } - if (!decodePulseDistanceWidthData_P(&BoseWaveProtocolConstants, BOSEWAVE_BITS)) { -#if defined(LOCAL_DEBUG) - Serial.print(F("Bose: ")); - Serial.println(F("Decode failed")); -#endif - return false; - } + decodePulseDistanceWidthData_P(&BoseWaveProtocolConstants, BOSEWAVE_BITS); // Stop bit - if (!matchMark(decodedIRData.rawDataPtr->rawbuf[3 + (2 * BOSEWAVE_BITS)], BOSEWAVE_BIT_MARK)) { + if (!matchMark(irparams.rawbuf[3 + (2 * BOSEWAVE_BITS)], BOSEWAVE_BIT_MARK)) { #if defined(LOCAL_DEBUG) Serial.print(F("Bose: ")); Serial.println(F("Stop bit mark length is wrong")); diff --git a/src/ir_Denon.hpp b/src/ir_Denon.hpp index bfbe45ca..69827fef 100644 --- a/src/ir_Denon.hpp +++ b/src/ir_Denon.hpp @@ -106,7 +106,7 @@ #define DENON_HEADER_SPACE (3 * DENON_UNIT) // 780 // The length of the Header:Space struct PulseDistanceWidthProtocolConstants const DenonProtocolConstants PROGMEM = {DENON, DENON_KHZ, DENON_HEADER_MARK, DENON_HEADER_SPACE, - DENON_BIT_MARK, DENON_ONE_SPACE, DENON_BIT_MARK, DENON_ZERO_SPACE, PROTOCOL_IS_LSB_FIRST, + DENON_BIT_MARK, DENON_ONE_SPACE, DENON_BIT_MARK, DENON_ZERO_SPACE, PROTOCOL_IS_LSB_FIRST | PROTOCOL_IS_PULSE_DISTANCE, (DENON_REPEAT_PERIOD / MICROS_IN_ONE_MILLI), nullptr}; /************************************ @@ -138,7 +138,7 @@ void IRsend::sendDenon(uint8_t aAddress, uint8_t aCommand, int_fast8_t aNumberOf tCommand |= aSendSharpFrameMarker << 8; // the 2 upper bits are 00 for Denon and 01 or 10 for Sharp uint16_t tData = aAddress | ((uint16_t) tCommand << DENON_ADDRESS_BITS); - uint16_t tInvertedData = (tData ^ 0x7FE0); // Command and frame (upper 10 bits) are inverted + uint16_t tInvertedData = (tData ^ 0x7FE0); // Command and frame (upper 10 bits, bit 5 to 14) are inverted uint_fast8_t tNumberOfCommands = aNumberOfRepeats + 1; while (tNumberOfCommands > 0) { @@ -179,16 +179,10 @@ bool IRrecv::decodeDenon() { } // Try to decode as Denon protocol - if (!decodePulseDistanceWidthData_P(&DenonProtocolConstants, DENON_BITS, 1)) { -#if defined(LOCAL_DEBUG) - Serial.print(F("Denon: ")); - Serial.println(F("Decode failed")); -#endif - return false; - } + decodePulseDistanceWidthData_P(&DenonProtocolConstants, DENON_BITS, 1); - // Check for stop mark - if (!matchMark(decodedIRData.rawDataPtr->rawbuf[(2 * DENON_BITS) + 1], DENON_HEADER_MARK)) { + // Check for stop mark, this stop bit distinguishes it from decoding as Sony + if (!matchMark(irparams.rawbuf[(2 * DENON_BITS) + 1], DENON_HEADER_MARK)) { #if defined(LOCAL_DEBUG) Serial.print(F("Denon: ")); Serial.println(F("Stop bit mark length is wrong")); @@ -204,49 +198,53 @@ bool IRrecv::decodeDenon() { // Check for (auto) repeat if (decodedIRData.initialGapTicks < ((DENON_AUTO_REPEAT_DISTANCE + (DENON_AUTO_REPEAT_DISTANCE / 4)) / MICROS_PER_TICK)) { - repeatCount++; - if (repeatCount > 1) { // skip first auto repeat - decodedIRData.flags = IRDATA_FLAGS_IS_REPEAT; - } + decodedIRData.flags |= IRDATA_FLAGS_IS_AUTO_REPEAT; - if (tFrameBits & 0x01) { + repeatCount++; + /* + * 1. repeat is inverted autorepeat -> IRDATA_FLAGS_IS_AUTO_REPEAT + * 2. repeat is normal autorepeat (end) or 1. normal repeat -> IRDATA_FLAGS_IS_AUTO_REPEAT + * 3. repeat is inverted autorepeat of the 1. repeat -> IRDATA_FLAGS_IS_REPEAT (not the correct frame, but this enables easy counting of repeats) + * 4. repeat is normal autorepeat (end) or 2. normal repeat -> IRDATA_FLAGS_IS_AUTO_REPEAT + * 5. repeat is inverted autorepeat of the 2. repeat -> IRDATA_FLAGS_IS_REPEAT (not the correct frame, but this enables easy counting of repeats) + * 6. repeat is normal autorepeat (end) or 3. normal repeat -> IRDATA_FLAGS_IS_AUTO_REPEAT + */ + + if (repeatCount & 0x01) { /* - * Here we are in the auto repeated frame with the inverted command + * Here we are in an inverted auto repeated frame where the command and frame bits are inverted */ #if defined(LOCAL_DEBUG) - Serial.print(F("Denon: ")); - Serial.println(F("Autorepeat received=")); + Serial.print(F("Denon: Inverted frame")); #endif - decodedIRData.flags |= IRDATA_FLAGS_IS_AUTO_REPEAT; + if (repeatCount > 1) { // skip first auto repeat + decodedIRData.flags = IRDATA_FLAGS_IS_REPEAT; + } // Check parity of consecutive received commands. There is no parity in one data set. if ((uint8_t) lastDecodedCommand != (uint8_t)(~decodedIRData.command)) { decodedIRData.flags |= IRDATA_FLAGS_PARITY_FAILED; #if defined(LOCAL_DEBUG) - Serial.print(F("Denon: ")); - Serial.print(F("Parity check for repeat failed. Last command=")); - Serial.print(lastDecodedCommand, HEX); + Serial.print(F("Denon: Parity check of inverted with non inverted frame failed. Last command=")); + Serial.print((uint8_t)lastDecodedCommand, HEX); Serial.print(F(" current=")); - Serial.println(~decodedIRData.command, HEX); + Serial.println((uint8_t)~decodedIRData.command, HEX); #endif } // always take non inverted command decodedIRData.command = lastDecodedCommand; - } - // repeated command here - if (tFrameBits == 1 || tFrameBits == 2) { - decodedIRData.protocol = SHARP; - } else { - decodedIRData.protocol = DENON; + // inverted command here, re-invert the frame bits for later protocol decoding + tFrameBits = tFrameBits ^ 0x03; } } else { - repeatCount = 0; // first command here - if (tFrameBits == 2) { - decodedIRData.protocol = SHARP; - } else { - decodedIRData.protocol = DENON; - } + repeatCount = 0; + } + + if (tFrameBits) { + decodedIRData.protocol = SHARP; + } else { + decodedIRData.protocol = DENON; } decodedIRData.numberOfBits = DENON_BITS; @@ -308,9 +306,7 @@ bool IRrecv::decodeDenonOld(decode_results *aResults) { } // Try to decode as Denon protocol. - if (!decodePulseDistanceWidthData(DENON_BITS, 3, DENON_BIT_MARK, DENON_ONE_SPACE, 0, PROTOCOL_IS_MSB_FIRST)) { - return false; - } + decodePulseDistanceWidthData(DENON_BITS, 3, DENON_BIT_MARK, DENON_ONE_SPACE, 0, PROTOCOL_IS_MSB_FIRST); // Success aResults->value = decodedIRData.decodedRawData; diff --git a/src/ir_DistanceWidthProtocol.hpp b/src/ir_DistanceWidthProtocol.hpp index 0012625c..d7a7a9cd 100644 --- a/src/ir_DistanceWidthProtocol.hpp +++ b/src/ir_DistanceWidthProtocol.hpp @@ -67,6 +67,7 @@ #else //#define LOCAL_DEBUG // This enables debug output only for this file #endif +//#define SHOW_DISTANCE_WIDTH_DECODER_ERRORS // Prints errors which prevents data to be decoded as distance width data #if !defined(DISTANCE_WIDTH_DECODER_DURATION_ARRAY_SIZE) # if (defined(RAMEND) && RAMEND <= 0x8FF) || (defined(RAMSIZE) && RAMSIZE < 0x8FF) @@ -209,10 +210,12 @@ bool IRrecv::decodeDistanceWidth() { * Only protocols with at least 7 bits are accepted */ if (decodedIRData.rawlen < (2 * 7) + 4) { - IR_DEBUG_PRINT(F("PULSE_DISTANCE_WIDTH: ")); - IR_DEBUG_PRINT(F("Data length=")); - IR_DEBUG_PRINT(decodedIRData.rawlen); - IR_DEBUG_PRINTLN(F(" is less than 18")); +#if defined(DEBUG) || defined(SHOW_DISTANCE_WIDTH_DECODER_ERRORS) + Serial.print(F("PULSE_DISTANCE_WIDTH: ")); + Serial.print(F("Data length=")); + Serial.print(decodedIRData.rawlen); + Serial.println(F(" is less than 18")); +#endif return false; } @@ -224,14 +227,14 @@ bool IRrecv::decodeDistanceWidth() { * Count number of mark durations. Skip leading start and trailing stop bit. */ for (IRRawlenType i = 3; i < decodedIRData.rawlen - 2; i += 2) { - auto tDurationTicks = decodedIRData.rawDataPtr->rawbuf[i]; + auto tDurationTicks = irparams.rawbuf[i]; if (tDurationTicks < DISTANCE_WIDTH_DECODER_DURATION_ARRAY_SIZE) { tDurationArray[tDurationTicks]++; // count duration if less than DISTANCE_WIDTH_DECODER_DURATION_ARRAY_SIZE if (tIndexOfMaxDuration < tDurationTicks) { tIndexOfMaxDuration = tDurationTicks; } } else { -#if defined(LOCAL_DEBUG) +#if defined(LOCAL_DEBUG) || defined(SHOW_DISTANCE_WIDTH_DECODER_ERRORS) Serial.print(F("PULSE_DISTANCE_WIDTH: ")); Serial.print(F("Mark ")); Serial.print(tDurationTicks * MICROS_PER_TICK); @@ -256,7 +259,7 @@ bool IRrecv::decodeDistanceWidth() { #endif if (!tSuccess) { -#if defined(LOCAL_DEBUG) +#if defined(LOCAL_DEBUG) || defined(SHOW_DISTANCE_WIDTH_DECODER_ERRORS) Serial.print(F("PULSE_DISTANCE_WIDTH: ")); Serial.println(F("Mark aggregation failed, more than 2 distinct mark duration values found")); #endif @@ -271,14 +274,14 @@ bool IRrecv::decodeDistanceWidth() { */ tIndexOfMaxDuration = 0; for (IRRawlenType i = 4; i < decodedIRData.rawlen - 2; i += 2) { - auto tDurationTicks = decodedIRData.rawDataPtr->rawbuf[i]; + auto tDurationTicks = irparams.rawbuf[i]; if (tDurationTicks < DISTANCE_WIDTH_DECODER_DURATION_ARRAY_SIZE) { tDurationArray[tDurationTicks]++; if (tIndexOfMaxDuration < tDurationTicks) { tIndexOfMaxDuration = tDurationTicks; } } else { -#if defined(LOCAL_DEBUG) +#if defined(LOCAL_DEBUG) || defined(SHOW_DISTANCE_WIDTH_DECODER_ERRORS) Serial.print(F("PULSE_DISTANCE_WIDTH: ")); Serial.print(F("Space ")); Serial.print(tDurationTicks * MICROS_PER_TICK); @@ -303,72 +306,83 @@ bool IRrecv::decodeDistanceWidth() { #endif if (!tSuccess) { -#if defined(LOCAL_DEBUG) +#if defined(LOCAL_DEBUG) || defined(SHOW_DISTANCE_WIDTH_DECODER_ERRORS) Serial.print(F("PULSE_DISTANCE_WIDTH: ")); Serial.println(F("Space aggregation failed, more than 2 distinct space duration values found")); #endif return false; } +#if RAW_BUFFER_LENGTH <= (512 -4) + uint_fast8_t tNumberOfBits; +#else + uint16_t tNumberOfBits; +#endif + tNumberOfBits = (decodedIRData.rawlen / 2) - 1; + if (tSpaceTicksLong > 0) { + // For PULSE_DISTANCE -including PULSE_DISTANCE_WIDTH- a stop bit is mandatory, for PULSE_WIDTH it is not required! + tNumberOfBits--; // Correct for PULSE_DISTANCE stop bit + } + decodedIRData.numberOfBits = tNumberOfBits; + /* * Print characteristics of this protocol. Durations are in (50 us) ticks. * Number of bits, start bit, start pause, long mark, long space, short mark, short space * - * NEC: 32, 180, 90, 0, 34, 11, 11 - * Samsung32: 32, 90, 90, 0, 34, 11, 11 - * LG: 28, 180, 84, 0, 32, 10, 11 - * JVC: 16, 168, 84, 0, 32, 10, 10 - * Kaseikyo: 48. 69, 35, 0, 26, 9, 9 - * Sony: 12|15|20, 48, 12, 24, 0, 12, 12 // the only known pulse width protocol + * NEC: 32, 180, 90, 11, 34, 11, 11 + * Samsung32: 32, 90, 90, 11, 34, 11, 11 + * LG: 28, 180, 84, 10, 32, 10, 11 + * JVC: 16, 168, 84, 10, 32, 10, 10 + * Kaseikyo: 48. 69, 35, 9, 26, 9, 9 + * Sony: 12|15|20, 48, 12, 24, 12, 12, 12 // the only known pulse width protocol * Disney monorail * model: 7, 120, 10, 30, 30, 10, 10 // PulseDistanceWidth. Can be seen as direct conversion of a 7 bit serial timing at 250 baud with a 6 ms start bit. */ #if defined(LOCAL_DEBUG) Serial.print(F("DistanceWidthTimingInfoStruct: ")); - Serial.print(decodedIRData.rawDataPtr->rawbuf[1] * MICROS_PER_TICK); + Serial.print(tNumberOfBits); Serial.print(F(", ")); - Serial.print(decodedIRData.rawDataPtr->rawbuf[2] * MICROS_PER_TICK); + Serial.print(irparams.rawbuf[1] * MICROS_PER_TICK); Serial.print(F(", ")); - Serial.print(tMarkTicksLong * MICROS_PER_TICK); + Serial.print(irparams.rawbuf[2] * MICROS_PER_TICK); Serial.print(F(", ")); - Serial.print(tSpaceTicksLong * MICROS_PER_TICK); + if(tMarkTicksLong == 0) { + Serial.print(tMarkTicksShort * MICROS_PER_TICK); + } else { + Serial.print(tMarkTicksLong * MICROS_PER_TICK); + } + Serial.print(F(", ")); + if(tSpaceTicksLong == 0) { + Serial.print(tSpaceTicksShort * MICROS_PER_TICK); + } else { + Serial.print(tSpaceTicksLong * MICROS_PER_TICK); + } Serial.print(F(", ")); Serial.print(tMarkTicksShort * MICROS_PER_TICK); Serial.print(F(", ")); Serial.println(tSpaceTicksShort * MICROS_PER_TICK); #endif -#if RAW_BUFFER_LENGTH <= (512 -4) - uint_fast8_t tNumberOfBits; -#else - uint16_t tNumberOfBits; -#endif - tNumberOfBits = (decodedIRData.rawlen / 2) - 1; - if (tSpaceTicksLong > 0) { - // For PULSE_DISTANCE -including PULSE_DISTANCE_WIDTH- a stop bit is mandatory, for PULSE_WIDTH it is not required! - tNumberOfBits--; // Correct for stop bit - } - decodedIRData.numberOfBits = tNumberOfBits; + uint8_t tNumberOfAdditionalArrayValues = (tNumberOfBits - 1) / BITS_IN_RAW_DATA_TYPE; /* * We can have the following protocol timings * PULSE_DISTANCE: Pause/spaces have different length and determine the bit value, longer space is 1. Pulses/marks can be constant, like NEC. * PULSE_WIDTH: Pulses/marks have different length and determine the bit value, longer mark is 1. Pause/spaces can be constant, like Sony. - * PULSE_DISTANCE_WIDTH: Pulses/marks and pause/spaces have different length, often the bit length is constant, like MagiQuest. Can be decoded by PULSE_DISTANCE decoder. + * PULSE_DISTANCE_WIDTH: Pulses/marks and pause/spaces have different length, often the bit length is constant, like MagiQuest. Can be decoded by PULSE_DISTANCE approach. */ if (tMarkTicksLong == 0 && tSpaceTicksLong == 0) { #if defined(LOCAL_DEBUG) Serial.print(F("PULSE_DISTANCE: ")); - Serial.println(F("Only 1 distinct duration value for each space and mark found")); + Serial.println(F("Cannot decode, because there is only one distinct duration value for each space and mark")); #endif return false; } unsigned int tSpaceMicrosShort; -#if defined DECODE_STRICT_CHECKS +#if defined(LOCAL_DEBUG) if(tMarkTicksLong > 0 && tSpaceTicksLong > 0) { - // We have different mark and space length here, so signal decodePulseDistanceWidthData() not to check against constant length decodePulseDistanceWidthData - tSpaceMicrosShort = 0; + Serial.println(F("PULSE_DISTANCE_WIDTH signal found")); } #endif tSpaceMicrosShort = tSpaceTicksShort * MICROS_PER_TICK; @@ -385,44 +399,48 @@ bool IRrecv::decodeDistanceWidth() { if (tNumberOfBitsForOneDecode > BITS_IN_RAW_DATA_TYPE) { tNumberOfBitsForOneDecode = BITS_IN_RAW_DATA_TYPE; } - bool tResult; if (tSpaceTicksLong > 0) { /* - * Here short and long space durations found. - * Since parameters aOneMarkMicros and aOneSpaceMicros are equal, we only check tSpaceMicrosLong here. + * Here short and long space durations found. So we have PULSE_DISTANCE or PULSE_DISTANCE_WIDTH. + * PULSE_DISTANCE_WIDTH can successfully be decoded by only using the timings of space :-). */ - decodedIRData.protocol = PULSE_DISTANCE; // Sony + PULSE_DISTANCE_WIDTH - tResult = decodePulseDistanceWidthData(tNumberOfBitsForOneDecode, tStartIndex, tMarkMicrosShort, tSpaceMicrosLong, - tMarkMicrosShort, + decodedIRData.protocol = PULSE_DISTANCE; // NEC etc. + PULSE_DISTANCE_WIDTH +#if defined(USE_THRESHOLD_DECODER) + decodeWithThresholdPulseDistanceWidthData(tNumberOfBitsForOneDecode, tStartIndex, + ((tSpaceMicrosLong + tSpaceMicrosShort) / 2) + MARK_EXCESS_MICROS, // MARK_EXCESS_MICROS is 0 here if not explicitly specified by user +#else + decodePulseDistanceWidthData(tNumberOfBitsForOneDecode, tStartIndex, tSpaceMicrosLong, +#endif + PROTOCOL_IS_PULSE_DISTANCE, #if defined(USE_MSB_DECODING_FOR_DISTANCE_DECODER) - true + PROTOCOL_IS_MSB_FIRST #else - false + PROTOCOL_IS_LSB_FIRST #endif ); + } else { /* - * Here no long space duration found. => short and long mark durations found, check tMarkMicrosLong here + * Here no long space duration but short and long mark durations found. So we have PULSE_WIDTH. + * Use timing of marks for decoding here. * This else case will most likely never be used, but it only requires 12 bytes additional programming space :-) */ - decodedIRData.protocol = PULSE_WIDTH; // NEC etc. - tResult = decodePulseDistanceWidthData(tNumberOfBitsForOneDecode, tStartIndex, tMarkMicrosLong, tSpaceMicrosShort, - tMarkMicrosShort, + decodedIRData.protocol = PULSE_WIDTH; // Sony +#if defined(USE_THRESHOLD_DECODER) + decodeWithThresholdPulseDistanceWidthData(tNumberOfBitsForOneDecode, tStartIndex, + ((tMarkMicrosLong+ tMarkMicrosShort) / 2) - MARK_EXCESS_MICROS, // MARK_EXCESS_MICROS is 0 here if not explicitly specified by user +#else + decodePulseDistanceWidthData(tNumberOfBitsForOneDecode, tStartIndex, tMarkMicrosLong, +#endif + PROTOCOL_IS_PULSE_WIDTH, #if defined(USE_MSB_DECODING_FOR_DISTANCE_DECODER) - true + PROTOCOL_IS_MSB_FIRST #else - false + PROTOCOL_IS_LSB_FIRST #endif ); } - if (!tResult) { -#if defined(LOCAL_DEBUG) - Serial.print(F("PULSE_WIDTH: ")); - Serial.println(F("Decode failed")); -#endif - return false; - } #if defined(LOCAL_DEBUG) Serial.print(F("PULSE_WIDTH: ")); Serial.print(F("decodedRawData=0x")); @@ -448,8 +466,8 @@ bool IRrecv::decodeDistanceWidth() { /* * Store timing data to reproduce frame for sending */ - decodedIRData.DistanceWidthTimingInfo.HeaderMarkMicros = (decodedIRData.rawDataPtr->rawbuf[1] * MICROS_PER_TICK); - decodedIRData.DistanceWidthTimingInfo.HeaderSpaceMicros = (decodedIRData.rawDataPtr->rawbuf[2] * MICROS_PER_TICK); + decodedIRData.DistanceWidthTimingInfo.HeaderMarkMicros = (irparams.rawbuf[1] * MICROS_PER_TICK); + decodedIRData.DistanceWidthTimingInfo.HeaderSpaceMicros = (irparams.rawbuf[2] * MICROS_PER_TICK); decodedIRData.DistanceWidthTimingInfo.ZeroMarkMicros = tMarkMicrosShort; decodedIRData.DistanceWidthTimingInfo.ZeroSpaceMicros = tSpaceMicrosShort; if (tMarkMicrosLong != 0) { diff --git a/src/ir_FAST.hpp b/src/ir_FAST.hpp index e01f9829..81c7281a 100644 --- a/src/ir_FAST.hpp +++ b/src/ir_FAST.hpp @@ -64,9 +64,8 @@ Sum: 28900 */ struct PulseDistanceWidthProtocolConstants const FASTProtocolConstants PROGMEM = { FAST, FAST_KHZ, FAST_HEADER_MARK, - FAST_HEADER_SPACE, - FAST_BIT_MARK, FAST_ONE_SPACE, FAST_BIT_MARK, FAST_ZERO_SPACE, PROTOCOL_IS_LSB_FIRST, (FAST_REPEAT_PERIOD - / MICROS_IN_ONE_MILLI), nullptr }; +FAST_HEADER_SPACE, FAST_BIT_MARK, FAST_ONE_SPACE, FAST_BIT_MARK, FAST_ZERO_SPACE, PROTOCOL_IS_LSB_FIRST + | PROTOCOL_IS_PULSE_DISTANCE, (FAST_REPEAT_PERIOD / MICROS_IN_ONE_MILLI), nullptr }; /************************************ * Start of send and decode functions @@ -113,14 +112,7 @@ bool IRrecv::decodeFAST() { return false; } - if (!decodePulseDistanceWidthData_P(&FASTProtocolConstants, FAST_BITS)) { -#if defined(LOCAL_DEBUG) - Serial.print(F("FAST: ")); - Serial.println(F("Decode failed")); -#endif - return false; - } - + decodePulseDistanceWidthData_P(&FASTProtocolConstants, FAST_BITS); WordUnion tValue; tValue.UWord = decodedIRData.decodedRawData; @@ -128,7 +120,7 @@ bool IRrecv::decodeFAST() { #if defined(LOCAL_DEBUG) Serial.print(F("FAST: ")); Serial.print(F("8 bit parity is not correct. Expected=0x")); - Serial.print((uint8_t)~(tValue.UByte.LowByte), HEX); + Serial.print((uint8_t) ~(tValue.UByte.LowByte), HEX); Serial.print(F(" received=0x")); Serial.print(tValue.UByte.HighByte, HEX); Serial.print(F(" data=0x")); diff --git a/src/ir_JVC.hpp b/src/ir_JVC.hpp index ef69a598..500b9164 100644 --- a/src/ir_JVC.hpp +++ b/src/ir_JVC.hpp @@ -81,7 +81,7 @@ #define JVC_REPEAT_PERIOD 65000 // assume around 40 ms for a JVC frame. JVC IR Remotes: RM-SA911U, RM-SX463U have 45 ms period struct PulseDistanceWidthProtocolConstants const JVCProtocolConstants PROGMEM = {JVC, JVC_KHZ, JVC_HEADER_MARK, JVC_HEADER_SPACE, JVC_BIT_MARK, - JVC_ONE_SPACE, JVC_BIT_MARK, JVC_ZERO_SPACE, PROTOCOL_IS_LSB_FIRST, (JVC_REPEAT_PERIOD / MICROS_IN_ONE_MILLI), nullptr}; + JVC_ONE_SPACE, JVC_BIT_MARK, JVC_ZERO_SPACE, PROTOCOL_IS_LSB_FIRST | PROTOCOL_IS_PULSE_DISTANCE, (JVC_REPEAT_PERIOD / MICROS_IN_ONE_MILLI), nullptr}; /************************************ * Start of send and decode functions @@ -137,8 +137,8 @@ bool IRrecv::decodeJVC() { * Check leading space and first and last mark length */ if (decodedIRData.initialGapTicks < ((JVC_REPEAT_DISTANCE + (JVC_REPEAT_DISTANCE / 4) / MICROS_PER_TICK)) - && matchMark(decodedIRData.rawDataPtr->rawbuf[1], JVC_BIT_MARK) - && matchMark(decodedIRData.rawDataPtr->rawbuf[decodedIRData.rawlen - 1], JVC_BIT_MARK)) { + && matchMark(irparams.rawbuf[1], JVC_BIT_MARK) + && matchMark(irparams.rawbuf[decodedIRData.rawlen - 1], JVC_BIT_MARK)) { /* * We have a repeat here, so do not check for start bit */ @@ -153,15 +153,8 @@ bool IRrecv::decodeJVC() { return false; } - if (!decodePulseDistanceWidthData_P(&JVCProtocolConstants, JVC_BITS)) { -#if defined(LOCAL_DEBUG) - Serial.print(F("JVC: ")); - Serial.println(F("Decode failed")); -#endif - return false; - } + decodePulseDistanceWidthData_P(&JVCProtocolConstants, JVC_BITS); - // Success // decodedIRData.flags = IRDATA_FLAGS_IS_LSB_FIRST; // Not required, since this is the start value decodedIRData.command = decodedIRData.decodedRawData >> JVC_ADDRESS_BITS; // upper 8 bits of LSB first value decodedIRData.address = decodedIRData.decodedRawData & 0xFF; // lowest 8 bit of LSB first value @@ -208,9 +201,7 @@ bool IRrecv::decodeJVCMSB(decode_results *aResults) { } offset++; - if (!decodePulseDistanceWidthData(JVC_BITS, offset, JVC_BIT_MARK, JVC_ONE_SPACE, 0, PROTOCOL_IS_MSB_FIRST)) { - return false; - } + decodePulseDistanceWidthData(JVC_BITS, offset, JVC_BIT_MARK, JVC_ONE_SPACE, 0, PROTOCOL_IS_MSB_FIRST); // Stop bit if (!matchMark(aResults->rawbuf[offset + (2 * JVC_BITS)], JVC_BIT_MARK)) { diff --git a/src/ir_Kaseikyo.hpp b/src/ir_Kaseikyo.hpp index 9abce660..fa108685 100644 --- a/src/ir_Kaseikyo.hpp +++ b/src/ir_Kaseikyo.hpp @@ -119,7 +119,7 @@ #define JVC_VENDOR_ID_CODE 0x0103 struct PulseDistanceWidthProtocolConstants const KaseikyoProtocolConstants PROGMEM = {KASEIKYO, KASEIKYO_KHZ, KASEIKYO_HEADER_MARK, - KASEIKYO_HEADER_SPACE, KASEIKYO_BIT_MARK, KASEIKYO_ONE_SPACE, KASEIKYO_BIT_MARK, KASEIKYO_ZERO_SPACE, PROTOCOL_IS_LSB_FIRST + KASEIKYO_HEADER_SPACE, KASEIKYO_BIT_MARK, KASEIKYO_ONE_SPACE, KASEIKYO_BIT_MARK, KASEIKYO_ZERO_SPACE, PROTOCOL_IS_LSB_FIRST | PROTOCOL_IS_PULSE_DISTANCE , (KASEIKYO_REPEAT_PERIOD / MICROS_IN_ONE_MILLI), nullptr}; /************************************ @@ -213,13 +213,7 @@ bool IRrecv::decodeKaseikyo() { } // decode first 16 Vendor ID bits - if (!decodePulseDistanceWidthData_P(&KaseikyoProtocolConstants, KASEIKYO_VENDOR_ID_BITS)) { -#if defined(LOCAL_DEBUG) - Serial.print(F("Kaseikyo: ")); - Serial.println(F("Vendor ID decode failed")); -#endif - return false; - } + decodePulseDistanceWidthData_P(&KaseikyoProtocolConstants, KASEIKYO_VENDOR_ID_BITS); uint16_t tVendorId = decodedIRData.decodedRawData; if (tVendorId == PANASONIC_VENDOR_ID_CODE) { @@ -243,15 +237,9 @@ bool IRrecv::decodeKaseikyo() { /* * Decode next 32 bits, 8 VendorID parity parity + 12 address (device and subdevice) + 8 command + 8 parity */ - if (!decodePulseDistanceWidthData_P(&KaseikyoProtocolConstants, + decodePulseDistanceWidthData_P(&KaseikyoProtocolConstants, KASEIKYO_VENDOR_ID_PARITY_BITS + KASEIKYO_ADDRESS_BITS + KASEIKYO_COMMAND_BITS + KASEIKYO_PARITY_BITS, - 3 + (2 * KASEIKYO_VENDOR_ID_BITS))) { -#if defined(LOCAL_DEBUG) - Serial.print(F("Kaseikyo: ")); - Serial.println(F("VendorID parity, address, command + parity decode failed")); -#endif - return false; - } + 3 + (2 * KASEIKYO_VENDOR_ID_BITS)); // Success // decodedIRData.flags = IRDATA_FLAGS_IS_LSB_FIRST; // Not required, since this is the start value diff --git a/src/ir_LG.hpp b/src/ir_LG.hpp index 0eacdb54..28c04c65 100644 --- a/src/ir_LG.hpp +++ b/src/ir_LG.hpp @@ -115,10 +115,10 @@ //#define LG_REPEAT_DISTANCE (LG_REPEAT_PERIOD - LG_AVERAGE_DURATION) // 52 ms struct PulseDistanceWidthProtocolConstants const LGProtocolConstants PROGMEM= {LG, LG_KHZ, LG_HEADER_MARK, LG_HEADER_SPACE, LG_BIT_MARK, - LG_ONE_SPACE, LG_BIT_MARK, LG_ZERO_SPACE, PROTOCOL_IS_MSB_FIRST, (LG_REPEAT_PERIOD / MICROS_IN_ONE_MILLI), &sendNECSpecialRepeat}; + LG_ONE_SPACE, LG_BIT_MARK, LG_ZERO_SPACE, PROTOCOL_IS_MSB_FIRST | PROTOCOL_IS_PULSE_DISTANCE, (LG_REPEAT_PERIOD / MICROS_IN_ONE_MILLI), &sendNECSpecialRepeat}; struct PulseDistanceWidthProtocolConstants const LG2ProtocolConstants PROGMEM = {LG2, LG_KHZ, LG2_HEADER_MARK, LG2_HEADER_SPACE, LG_BIT_MARK, - LG_ONE_SPACE, LG_BIT_MARK, LG_ZERO_SPACE, PROTOCOL_IS_MSB_FIRST, (LG_REPEAT_PERIOD / MICROS_IN_ONE_MILLI), &sendLG2SpecialRepeat}; + LG_ONE_SPACE, LG_BIT_MARK, LG_ZERO_SPACE, PROTOCOL_IS_MSB_FIRST | PROTOCOL_IS_PULSE_DISTANCE, (LG_REPEAT_PERIOD / MICROS_IN_ONE_MILLI), &sendLG2SpecialRepeat}; /************************************ * Start of send and decode functions @@ -185,6 +185,7 @@ bool IRrecv::decodeLG() { // Check we have the right amount of data (60). The +4 is for initial gap, start bit mark and space + stop bit mark. if (decodedIRData.rawlen != ((2 * LG_BITS) + 4) && (decodedIRData.rawlen != 4)) { + // Is only printed, if LOCAL_DEBUG is defined globally IR_DEBUG_PRINT(F("LG: ")); IR_DEBUG_PRINT(F("Data length=")); IR_DEBUG_PRINT(decodedIRData.rawlen); @@ -193,8 +194,8 @@ bool IRrecv::decodeLG() { } // Check header "mark" this must be done for repeat and data - if (!matchMark(decodedIRData.rawDataPtr->rawbuf[1], LG_HEADER_MARK)) { - if (matchMark(decodedIRData.rawDataPtr->rawbuf[1], LG2_HEADER_MARK)) { + if (!matchMark(irparams.rawbuf[1], LG_HEADER_MARK)) { + if (matchMark(irparams.rawbuf[1], LG2_HEADER_MARK)) { tProtocol = LG2; tHeaderSpace = LG2_HEADER_SPACE; } else { @@ -208,8 +209,7 @@ bool IRrecv::decodeLG() { // Check for repeat - here we have another header space length if (decodedIRData.rawlen == 4) { - if (matchSpace(decodedIRData.rawDataPtr->rawbuf[2], LG_REPEAT_HEADER_SPACE) - && matchMark(decodedIRData.rawDataPtr->rawbuf[3], LG_BIT_MARK)) { + if (matchSpace(irparams.rawbuf[2], LG_REPEAT_HEADER_SPACE) && matchMark(irparams.rawbuf[3], LG_BIT_MARK)) { decodedIRData.flags = IRDATA_FLAGS_IS_REPEAT | IRDATA_FLAGS_IS_MSB_FIRST; decodedIRData.address = lastDecodedAddress; decodedIRData.command = lastDecodedCommand; @@ -224,7 +224,7 @@ bool IRrecv::decodeLG() { } // Check command header space - if (!matchSpace(decodedIRData.rawDataPtr->rawbuf[2], tHeaderSpace)) { + if (!matchSpace(irparams.rawbuf[2], tHeaderSpace)) { #if defined(LOCAL_DEBUG) Serial.print(F("LG: ")); Serial.println(F("Header space length is wrong")); @@ -232,13 +232,7 @@ bool IRrecv::decodeLG() { return false; } - if (!decodePulseDistanceWidthData_P(&LGProtocolConstants, LG_BITS)) { -#if defined(LOCAL_DEBUG) - Serial.print(F("LG: ")); - Serial.println(F("Decode failed")); -#endif - return false; - } + decodePulseDistanceWidthData_P(&LGProtocolConstants, LG_BITS); // Success decodedIRData.flags = IRDATA_FLAGS_IS_MSB_FIRST; @@ -306,9 +300,8 @@ bool IRrecv::decodeLGMSB(decode_results *aResults) { } offset++; - if (!decodePulseDistanceWidthData(LG_BITS, offset, LG_BIT_MARK, LG_ONE_SPACE, 0, PROTOCOL_IS_MSB_FIRST)) { - return false; - } + decodePulseDistanceWidthData(LG_BITS, offset, LG_BIT_MARK, LG_ONE_SPACE, 0, PROTOCOL_IS_MSB_FIRST); + // Stop bit if (!matchMark(aResults->rawbuf[offset + (2 * LG_BITS)], LG_BIT_MARK)) { #if defined(LOCAL_DEBUG) diff --git a/src/ir_Lego.hpp b/src/ir_Lego.hpp index 156bf743..1104395d 100644 --- a/src/ir_Lego.hpp +++ b/src/ir_Lego.hpp @@ -32,6 +32,12 @@ #ifndef _IR_LEGO_HPP #define _IR_LEGO_HPP +#if defined(DEBUG) +#define LOCAL_DEBUG +#else +//#define LOCAL_DEBUG // This enables debug output only for this file +#endif + /** \addtogroup Decoder Decoders and encoders for different protocols * @{ */ @@ -48,18 +54,30 @@ // For original LEGO receiver see: https://www.philohome.com/pfrec/pfrec.htm and https://www.youtube.com/watch?v=KCM4Ug1bPrM // // To ensure correct detection of IR messages six 38 kHz cycles are transmitted as mark. -// Low bit consists of 6 cycles of IR and 10 �cycles� of pause, -// high bit of 6 cycles IR and 21 �cycles� of pause and start bit of 6 cycles IR and 39 �cycles� of pause. -// Low bit range 316 - 526 us -// High bit range 526 � 947 us -// Start/stop bit range 947 � 1579 us +// Low bit consists of 6 cycles of IR and 10 cycles of pause, +// High bit of 6 cycles IR and 21 cycles of pause, +// Start/stop of 6 cycles IR and 39 cycles of pause. +// // If tm is the maximum message length (16ms) and Ch is the channel number, then -// The delay before transmitting the first message is: (4 � Ch)*tm -// The time from start to start for the next 2 messages is: 5*tm -// The time from start to start for the following messages is: (6 + 2*Ch)*tm +// The delay before transmitting the first message is: (4 - Ch) * tm +// The time from start to start for the next 2 messages is: 5 * tm +// The time from start to start for the following messages is: (6 + 2 * Ch) * tm // Supported Devices // LEGO Power Functions IR Receiver 8884 // MSB first, 1 start bit + 4 bit channel, 4 bit mode + 4 bit command + 4 bit parity + 1 stop bit. +/* Protocol=Lego Address=0x1, Command=0x16, Raw-Data=0x1169 ,16 bits, MSB first, Gap=1050600us, Duration=10000us + Send with: IrSender.sendLego(0x1, 0x16, ); + rawData[36]: + -1050600 + + 250,- 950 + + 250,- 500 + 200,- 200 + 200,- 250 + 200,- 500 + + 200,- 250 + 200,- 500 + 200,- 500 + 200,- 250 + + 200,- 500 + 200,- 200 + 250,- 200 + 200,- 200 + + 250,- 500 + 200,- 200 + 250,- 200 + 200,- 250 + + 200 + Duration=10000us + */ + #define LEGO_CHANNEL_BITS 4 #define LEGO_MODE_BITS 4 #define LEGO_COMMAND_BITS 4 @@ -73,6 +91,7 @@ #define LEGO_BIT_MARK 158 // 6 cycles #define LEGO_ONE_SPACE 553 // 21 cycles #define LEGO_ZERO_SPACE 263 // 10 cycles +#define LEGO_ONE_THRESHOLD 408 // 15.5 cycles - not used, just for info #define LEGO_AVERAGE_DURATION 11000 // LEGO_HEADER_MARK + LEGO_HEADER_SPACE + 16 * 600 + 158 @@ -83,9 +102,10 @@ #define LEGO_MODE_COMBO 1 #define LEGO_MODE_SINGLE 0x4 // here the 2 LSB have meanings like Output A / Output B +// Cannot be constant, since we need to change RepeatPeriodMillis during sending struct PulseDistanceWidthProtocolConstants LegoProtocolConstants = { LEGO_PF, 38, LEGO_HEADER_MARK, LEGO_HEADER_SPACE, -LEGO_BIT_MARK, LEGO_ONE_SPACE, LEGO_BIT_MARK, LEGO_ZERO_SPACE, PROTOCOL_IS_LSB_FIRST, (LEGO_AUTO_REPEAT_PERIOD_MIN - / MICROS_IN_ONE_MILLI), nullptr }; +LEGO_BIT_MARK, LEGO_ONE_SPACE, LEGO_BIT_MARK, LEGO_ZERO_SPACE, PROTOCOL_IS_LSB_FIRST | PROTOCOL_IS_PULSE_DISTANCE, + (LEGO_AUTO_REPEAT_PERIOD_MIN / MICROS_IN_ONE_MILLI), nullptr }; /************************************ * Start of send and decode functions @@ -107,8 +127,10 @@ void IRsend::sendLegoPowerFunctions(uint8_t aChannel, uint8_t aCommand, uint8_t void IRsend::sendLegoPowerFunctions(uint16_t aRawData, uint8_t aChannel, bool aDoSend5Times) { - IR_DEBUG_PRINT(F("sendLego aRawData=0x")); - IR_DEBUG_PRINTLN(aRawData, HEX); +#if defined(LOCAL_DEBUG) + Serial.print(F("sendLego aRawData=0x")); + Serial.println(aRawData, HEX); +#endif aChannel &= 0x03; // we have 4 channels @@ -127,7 +149,11 @@ void IRsend::sendLegoPowerFunctions(uint16_t aRawData, uint8_t aChannel, bool aD */ bool IRrecv::decodeLegoPowerFunctions() { - if (!checkHeader(&LegoProtocolConstants)) { + /* + * Check header timings + * Since LEGO_HEADER_MARK is just 158 us use a relaxed threshold compare (237) for it instead of matchMark() + */ + if ((irparams.rawbuf[1] > LEGO_HEADER_MARK + (LEGO_HEADER_MARK / 2)) || (!matchSpace(irparams.rawbuf[2], LEGO_HEADER_SPACE))) { return false; } @@ -135,23 +161,21 @@ bool IRrecv::decodeLegoPowerFunctions() { if (decodedIRData.rawlen != (2 * LEGO_BITS) + 4) { IR_DEBUG_PRINT(F("LEGO: ")); IR_DEBUG_PRINT(F("Data length=")); - IR_DEBUG_PRINT(decodedIRData.rawDataPtr->rawlen); + IR_DEBUG_PRINT(irparams.rawlen); IR_DEBUG_PRINTLN(F(" is not 36")); return false; } - if (!decodePulseDistanceWidthData(&LegoProtocolConstants, LEGO_BITS)) { - IR_DEBUG_PRINT(F("LEGO: ")); - IR_DEBUG_PRINTLN(F("Decode failed")); - return false; - } + decodePulseDistanceWidthData(&LegoProtocolConstants, LEGO_BITS); - // Stop bit - if (!matchMark(decodedIRData.rawDataPtr->rawbuf[3 + (2 * LEGO_BITS)], LEGO_BIT_MARK)) { - IR_DEBUG_PRINT(F("LEGO: ")); - IR_DEBUG_PRINTLN(F("Stop bit mark length is wrong")); - return false; - } + // Stop bit, use threshold decoding - not required :-) +// if (irparams.rawbuf[3 + (2 * LEGO_BITS)] > (2 * LEGO_BIT_MARK)) { +//#if defined(LOCAL_DEBUG) +// Serial.print(F("LEGO: ")); +// Serial.println(F("Stop bit mark length is wrong")); +//#endif +// return false; +// } // Success decodedIRData.flags = IRDATA_FLAGS_IS_MSB_FIRST; @@ -167,19 +191,21 @@ bool IRrecv::decodeLegoPowerFunctions() { // parity check if (tParityReceived != tParityComputed) { - IR_DEBUG_PRINT(F("LEGO: ")); - IR_DEBUG_PRINT(F("Parity is not correct. expected=0x")); - IR_DEBUG_PRINT(tParityComputed, HEX); - IR_DEBUG_PRINT(F(" received=0x")); - IR_DEBUG_PRINT(tParityReceived, HEX); - IR_DEBUG_PRINT(F(", raw=0x")); - IR_DEBUG_PRINT(tDecodedValue, HEX); - IR_DEBUG_PRINT(F(", 3 nibbles are 0x")); - IR_DEBUG_PRINT(tToggleEscapeChannel, HEX); - IR_DEBUG_PRINT(F(", 0x")); - IR_DEBUG_PRINT(tMode, HEX); - IR_DEBUG_PRINT(F(", 0x")); - IR_DEBUG_PRINTLN(tData, HEX); +#if defined(LOCAL_DEBUG) + Serial.print(F("LEGO: ")); + Serial.print(F("Parity is not correct. expected=0x")); + Serial.print(tParityComputed, HEX); + Serial.print(F(" received=0x")); + Serial.print(tParityReceived, HEX); + Serial.print(F(", raw=0x")); + Serial.print(tDecodedValue, HEX); + Serial.print(F(", 3 nibbles are 0x")); + Serial.print(tToggleEscapeChannel, HEX); + Serial.print(F(", 0x")); + Serial.print(tMode, HEX); + Serial.print(F(", 0x")); + Serial.println(tData, HEX); +#endif // might not be an error, so just continue decodedIRData.flags = IRDATA_FLAGS_PARITY_FAILED | IRDATA_FLAGS_IS_MSB_FIRST; } @@ -191,7 +217,7 @@ bool IRrecv::decodeLegoPowerFunctions() { decodedIRData.flags |= IRDATA_FLAGS_IS_AUTO_REPEAT; } decodedIRData.address = tToggleEscapeChannel; - decodedIRData.command = tData | tMode << LEGO_COMMAND_BITS; + decodedIRData.command = tData | (tMode << LEGO_COMMAND_BITS); decodedIRData.numberOfBits = LEGO_BITS; decodedIRData.protocol = LEGO_PF; @@ -207,4 +233,7 @@ void IRsend::sendLegoPowerFunctions(uint16_t aRawData, bool aDoSend5Times) { } /** @}*/ +#if defined(LOCAL_DEBUG) +#undef LOCAL_DEBUG +#endif #endif // _IR_LEGO_HPP diff --git a/src/ir_MagiQuest.hpp b/src/ir_MagiQuest.hpp index 73599526..3517fb69 100644 --- a/src/ir_MagiQuest.hpp +++ b/src/ir_MagiQuest.hpp @@ -93,6 +93,8 @@ #define MAGIQUEST_BITS (MAGIQUEST_CHECKSUM_BITS + MAGIQUEST_MAGNITUDE_BITS + MAGIQUEST_WAND_ID_BITS + MAGIQUEST_START_BITS) // 56 Size of the command with the start bits /* + * Protocol is Pulse Distance Width not pure Pulse Distance and a longer space is not a one but a zero + * * 0 = 25% mark & 75% space across 1 period * 1150 * 0.25 = 288 usec mark * 1150 - 288 = 862 usec space @@ -107,10 +109,10 @@ #define MAGIQUEST_ZERO_MARK MAGIQUEST_UNIT // 287.5 #define MAGIQUEST_ZERO_SPACE (3 * MAGIQUEST_UNIT) // 864 -// assume 110 as repeat period -struct PulseDistanceWidthProtocolConstants const MagiQuestProtocolConstants PROGMEM = { MAGIQUEST, 38, MAGIQUEST_ZERO_MARK, MAGIQUEST_ZERO_SPACE, -MAGIQUEST_ONE_MARK, MAGIQUEST_ONE_SPACE, MAGIQUEST_ZERO_MARK, MAGIQUEST_ZERO_SPACE, PROTOCOL_IS_MSB_FIRST | SUPPRESS_STOP_BIT, 110, -nullptr }; +// assume 110 as repeat period. +struct PulseDistanceWidthProtocolConstants const MagiQuestProtocolConstants PROGMEM = {MAGIQUEST, 38, MAGIQUEST_ZERO_MARK, MAGIQUEST_ZERO_SPACE, + MAGIQUEST_ONE_MARK, MAGIQUEST_ONE_SPACE, MAGIQUEST_ZERO_MARK, MAGIQUEST_ZERO_SPACE, + PROTOCOL_IS_MSB_FIRST | PROTOCOL_IS_PULSE_DISTANCE_WIDTH | SUPPRESS_STOP_BIT, 110, nullptr}; //+============================================================================= // /** @@ -164,14 +166,13 @@ bool IRrecv::decodeMagiQuest() { /* * Check for 8 zero header bits */ - if (!decodePulseDistanceWidthData_P(&MagiQuestProtocolConstants, MAGIQUEST_START_BITS, 1)) { -#if defined(LOCAL_DEBUG) - Serial.print(F("MagiQuest: ")); - Serial.println(F("Start bit decode failed")); + decodePulseDistanceWidthData_P(&MagiQuestProtocolConstants, MAGIQUEST_START_BITS, 1); +#if defined(USE_THRESHOLD_DECODER) + if (decodedIRData.decodedRawData != 0xFF) // For Magiquest a small pause is a 1 which is inverse to threshold decoding +#else + if (decodedIRData.decodedRawData != 0) #endif - return false; - } - if (decodedIRData.decodedRawData != 0) { + { #if defined(LOCAL_DEBUG) Serial.print(F("MagiQuest: ")); Serial.print(F("Not 8 leading zero start bits received, RawData=0x")); @@ -183,18 +184,12 @@ bool IRrecv::decodeMagiQuest() { /* * Decode the 31 bit ID */ - if (!decodePulseDistanceWidthData_P(&MagiQuestProtocolConstants, MAGIQUEST_WAND_ID_BITS, (MAGIQUEST_START_BITS * 2) + 1)) { -#if defined(LOCAL_DEBUG) - Serial.print(F("MagiQuest: ")); - Serial.println(F("ID decode failed")); + decodePulseDistanceWidthData_P(&MagiQuestProtocolConstants, MAGIQUEST_WAND_ID_BITS, (MAGIQUEST_START_BITS * 2) + 1); +#if defined(USE_THRESHOLD_DECODER) + decodedIRData.decodedRawData = decodedIRData.decodedRawData ^ 0x7FFFFFFF; // We have 31 bit. For Magiquest a small pause is a 1 which is inverse to threshold decoding #endif - return false; - } + LongUnion tDecodedRawData; -#if defined(LOCAL_DEBUG) - Serial.print(F("31 bit WandId=0x")); - Serial.println(decodedIRData.decodedRawData, HEX); -#endif uint32_t tWandId = decodedIRData.decodedRawData; // save tWandId for later use tDecodedRawData.ULong = decodedIRData.decodedRawData << 1; // shift for checksum computation uint8_t tChecksum = tDecodedRawData.Bytes[0] + tDecodedRawData.Bytes[1] + tDecodedRawData.Bytes[2] + tDecodedRawData.Bytes[3]; @@ -207,14 +202,13 @@ bool IRrecv::decodeMagiQuest() { /* * Decode the 9 bit Magnitude + 8 bit checksum */ - if (!decodePulseDistanceWidthData_P(&MagiQuestProtocolConstants, MAGIQUEST_MAGNITUDE_BITS + MAGIQUEST_CHECKSUM_BITS, - ((MAGIQUEST_WAND_ID_BITS + MAGIQUEST_START_BITS) * 2) + 1)) { -#if defined(LOCAL_DEBUG) - Serial.print(F("MagiQuest: ")); - Serial.println(F("Magnitude + checksum decode failed")); + decodePulseDistanceWidthData_P(&MagiQuestProtocolConstants, MAGIQUEST_MAGNITUDE_BITS + MAGIQUEST_CHECKSUM_BITS, + ((MAGIQUEST_WAND_ID_BITS + MAGIQUEST_START_BITS) * 2) + 1); + +#if defined(USE_THRESHOLD_DECODER) + decodedIRData.decodedRawData = decodedIRData.decodedRawData ^ 0x0001FFFF; // We have 17 bit. For Magiquest a small pause is a 1 which is inverse to threshold decoding + #endif - return false; - } #if defined(LOCAL_DEBUG) Serial.print(F("Magnitude + checksum=0x")); diff --git a/src/ir_NEC.hpp b/src/ir_NEC.hpp index 6302b424..e70c87c8 100644 --- a/src/ir_NEC.hpp +++ b/src/ir_NEC.hpp @@ -116,12 +116,12 @@ #define APPLE_ADDRESS 0x87EE struct PulseDistanceWidthProtocolConstants const NECProtocolConstants PROGMEM = {NEC, NEC_KHZ, NEC_HEADER_MARK, NEC_HEADER_SPACE, NEC_BIT_MARK, - NEC_ONE_SPACE, NEC_BIT_MARK, NEC_ZERO_SPACE, PROTOCOL_IS_LSB_FIRST, (NEC_REPEAT_PERIOD / MICROS_IN_ONE_MILLI), - &sendNECSpecialRepeat}; + NEC_ONE_SPACE, NEC_BIT_MARK, NEC_ZERO_SPACE, PROTOCOL_IS_LSB_FIRST | PROTOCOL_IS_PULSE_DISTANCE, (NEC_REPEAT_PERIOD / MICROS_IN_ONE_MILLI), + &sendNECSpecialRepeat}; // Like NEC but repeats are full frames instead of special NEC repeats struct PulseDistanceWidthProtocolConstants const NEC2ProtocolConstants PROGMEM = {NEC2, NEC_KHZ, NEC_HEADER_MARK, NEC_HEADER_SPACE, NEC_BIT_MARK, - NEC_ONE_SPACE, NEC_BIT_MARK, NEC_ZERO_SPACE, PROTOCOL_IS_LSB_FIRST, (NEC_REPEAT_PERIOD / MICROS_IN_ONE_MILLI), nullptr}; + NEC_ONE_SPACE, NEC_BIT_MARK, NEC_ZERO_SPACE, PROTOCOL_IS_LSB_FIRST | PROTOCOL_IS_PULSE_DISTANCE, (NEC_REPEAT_PERIOD / MICROS_IN_ONE_MILLI), nullptr}; /************************************ * Start of send and decode functions @@ -250,14 +250,14 @@ bool IRrecv::decodeNEC() { } // Check header "mark" this must be done for repeat and data - if (!matchMark(decodedIRData.rawDataPtr->rawbuf[1], NEC_HEADER_MARK)) { + if (!matchMark(irparams.rawbuf[1], NEC_HEADER_MARK)) { return false; } // Check for repeat - here we have another header space length if (decodedIRData.rawlen == 4) { - if (matchSpace(decodedIRData.rawDataPtr->rawbuf[2], NEC_REPEAT_HEADER_SPACE) - && matchMark(decodedIRData.rawDataPtr->rawbuf[3], NEC_BIT_MARK)) { + if (matchSpace(irparams.rawbuf[2], NEC_REPEAT_HEADER_SPACE) + && matchMark(irparams.rawbuf[3], NEC_BIT_MARK)) { decodedIRData.flags = IRDATA_FLAGS_IS_REPEAT | IRDATA_FLAGS_IS_LSB_FIRST; decodedIRData.address = lastDecodedAddress; decodedIRData.command = lastDecodedCommand; @@ -268,7 +268,7 @@ bool IRrecv::decodeNEC() { } // Check command header space - if (!matchSpace(decodedIRData.rawDataPtr->rawbuf[2], NEC_HEADER_SPACE)) { + if (!matchSpace(irparams.rawbuf[2], NEC_HEADER_SPACE)) { #if defined(LOCAL_DEBUG) Serial.print(F("NEC: ")); Serial.println(F("Header space length is wrong")); @@ -276,14 +276,8 @@ bool IRrecv::decodeNEC() { return false; } - // Try to decode as NEC protocol - if (!decodePulseDistanceWidthData_P(&NECProtocolConstants, NEC_BITS)) { -#if defined(LOCAL_DEBUG) - Serial.print(F("NEC: ")); - Serial.println(F("Decode failed")); -#endif - return false; - } + // Decode as NEC protocol + decodePulseDistanceWidthData_P(&NECProtocolConstants, NEC_BITS); // Success // decodedIRData.flags = IRDATA_FLAGS_IS_LSB_FIRST; // Not required, since this is the start value @@ -292,7 +286,7 @@ bool IRrecv::decodeNEC() { decodedIRData.command = tValue.UByte.MidHighByte; // 8 bit #if defined(DECODE_ONKYO) - // Here only Onkyo protocol is supported -> force 16 bit address and command decoding + // Here only Onkyo protocol is supported -> force 16 bit address and command decoding. No NEC decoding possible! decodedIRData.address = tValue.UWord.LowWord; // first 16 bit decodedIRData.protocol = ONKYO; decodedIRData.command = tValue.UWord.HighWord; // 16 bit command @@ -379,13 +373,7 @@ bool IRrecv::decodeNECMSB(decode_results *aResults) { } offset++; - if (!decodePulseDistanceWidthData(NEC_BITS, offset, NEC_BIT_MARK, NEC_ONE_SPACE, 0, PROTOCOL_IS_MSB_FIRST)) { -#if defined(LOCAL_DEBUG) - Serial.print(F("NEC MSB: ")); - Serial.println(F("Decode failed")); -#endif - return false; - } + decodePulseDistanceWidthData(NEC_BITS, offset, NEC_BIT_MARK, NEC_ONE_SPACE, 0, PROTOCOL_IS_MSB_FIRST); // Stop bit if (!matchMark(aResults->rawbuf[offset + (2 * NEC_BITS)], NEC_BIT_MARK)) { diff --git a/src/ir_Others.hpp b/src/ir_Others.hpp index 20e4cc62..6d893cd8 100644 --- a/src/ir_Others.hpp +++ b/src/ir_Others.hpp @@ -58,8 +58,8 @@ #define DISH_ZERO_SPACE 2800 #define DISH_REPEAT_SPACE 6200 // really? -struct PulseDistanceWidthProtocolConstants const DishProtocolConstants PROGMEM = { UNKNOWN, 56, DISH_HEADER_MARK, DISH_HEADER_SPACE, -DISH_BIT_MARK, DISH_ONE_SPACE, DISH_BIT_MARK, DISH_ZERO_SPACE, PROTOCOL_IS_MSB_FIRST, 40, nullptr }; +struct PulseDistanceWidthProtocolConstants const DishProtocolConstants PROGMEM = {UNKNOWN, 56, DISH_HEADER_MARK, DISH_HEADER_SPACE, + DISH_BIT_MARK, DISH_ONE_SPACE, DISH_BIT_MARK, DISH_ZERO_SPACE, PROTOCOL_IS_MSB_FIRST | PROTOCOL_IS_PULSE_DISTANCE, 40, nullptr}; void IRsend::sendDish(uint16_t aData) { sendPulseDistanceWidth_P(&DishProtocolConstants, aData, DISH_BITS, 4); @@ -84,11 +84,11 @@ void IRsend::sendDish(uint16_t aData) { #define WHYNTER_ONE_SPACE 2150 #define WHYNTER_ZERO_SPACE 750 -struct PulseDistanceWidthProtocolConstants const WhynterProtocolConstants PROGMEM = { WHYNTER, 38, WHYNTER_HEADER_MARK, WHYNTER_HEADER_SPACE, -WHYNTER_BIT_MARK, WHYNTER_ONE_SPACE, WHYNTER_BIT_MARK, WHYNTER_ZERO_SPACE, PROTOCOL_IS_MSB_FIRST, 110, nullptr }; +struct PulseDistanceWidthProtocolConstants const WhynterProtocolConstants PROGMEM = {WHYNTER, 38, WHYNTER_HEADER_MARK, WHYNTER_HEADER_SPACE, + WHYNTER_BIT_MARK, WHYNTER_ONE_SPACE, WHYNTER_BIT_MARK, WHYNTER_ZERO_SPACE, PROTOCOL_IS_MSB_FIRST | PROTOCOL_IS_PULSE_DISTANCE, 110, nullptr}; -void IRsend::sendWhynter(uint32_t aData, uint8_t aNumberOfBitsToSend) { - sendPulseDistanceWidth_P(&WhynterProtocolConstants, aData, NEC_BITS, aNumberOfBitsToSend); +void IRsend::sendWhynter(uint32_t aData, int_fast8_t aNumberOfRepeats) { + sendPulseDistanceWidth_P(&WhynterProtocolConstants, aData, NEC_BITS, aNumberOfRepeats); } bool IRrecv::decodeWhynter() { @@ -99,15 +99,74 @@ bool IRrecv::decodeWhynter() { if (!checkHeader_P(&WhynterProtocolConstants)) { return false; } - if (!decodePulseDistanceWidthData_P(&WhynterProtocolConstants, WHYNTER_BITS)) { - return false; - } - // Success + decodePulseDistanceWidthData_P(&WhynterProtocolConstants, WHYNTER_BITS); + decodedIRData.flags = IRDATA_FLAGS_IS_MSB_FIRST; decodedIRData.numberOfBits = WHYNTER_BITS; decodedIRData.protocol = WHYNTER; return true; } +/** + * VELUX + * see https://github.com/XPModder/Velux-IR-protocol + * see https://github.com/Arduino-IRremote/Arduino-IRremote/issues/612 + * We have a pulse width protocol with constant bit length of 1700 us with no header and one autorepeat after 27 ms. + * Length of one frame is constant 23 * 1700 + 425 (for stop bit) = 39525 = 40 ms + * + * BIT meaning: + * Bit 0 is stop + * Bit 1 is up | 0 or down | 1 + * Bit 2 is automatic and also set for stop + * Bit 3 is Motor 3 + * Bit 4 is Motor 2 + * Bit 5 is Motor 1 + * [6:9] is motor set (from 1 to 10), 0 = all sets + * [10:19] security code + * [20:23] is checksum, no clue how to compute it. It is no simple XOR or addition + * Here some checksum raw data to verify a checksum function: + * 0x424 -> 1 + * 0x426 -> B + * 0x425 -> 4 + * 0x414 -> B + * 0x415 -> E + * 0x7626 -> 3 + * 0x7624 -> 9 + * 0x7614 -> 3 + * 0x760C -> 6 + * 0x760A -> 1 + */ + +// All timings are in microseconds +#define VELUX_BITS 24 // We have pulse width, so we have no stop bit +#define VELUX_HEADER_MARK 0 +#define VELUX_HEADER_SPACE 0 +#define VELUX_UNIT 425 +#define VELUX_ONE_MARK (3*VELUX_UNIT) // 1275 +#define VELUX_ONE_SPACE VELUX_UNIT +#define VELUX_ZERO_MARK VELUX_UNIT +#define VELUX_ZERO_SPACE (3*VELUX_UNIT) +#define VELUX_PERIOD ((23 * 4) + 1 ) * VELUX_UNIT) // 39525 +#define VELUX_AUTOREPEAT_SPACE 27000 // 27ms +#define VELUX_REPEAT_SPACE 100000 // 100ms, which is just a guess + +struct PulseDistanceWidthProtocolConstants const VeluxProtocolConstants PROGMEM = {OTHER, 30, VELUX_HEADER_MARK, VELUX_HEADER_SPACE, + VELUX_ONE_MARK, VELUX_ONE_SPACE, VELUX_ZERO_MARK, VELUX_ZERO_SPACE, PROTOCOL_IS_LSB_FIRST | PROTOCOL_IS_PULSE_WIDTH, 27, nullptr}; + +void IRsend::sendVelux(uint8_t aCommand, uint8_t aMotorNumber, uint8_t aMotorSet, uint16_t aSecurityCode, uint8_t aCRC, + int_fast8_t aNumberOfRepeats) { + + sendVelux(((uint32_t)aCRC << 20) | ((uint32_t)aSecurityCode << 10) | (aMotorSet << 6) | (aMotorNumber << 3) | aCommand, aNumberOfRepeats); +} + +void IRsend::sendVelux(uint32_t aData, int_fast8_t aNumberOfRepeats) { + do { + sendPulseDistanceWidth_P(&VeluxProtocolConstants, aData, VELUX_BITS, 0); + delay(VELUX_AUTOREPEAT_SPACE / MICROS_IN_ONE_MILLI); + sendPulseDistanceWidth_P(&VeluxProtocolConstants, aData, VELUX_BITS, 0); + delay(VELUX_REPEAT_SPACE / MICROS_IN_ONE_MILLI); + aNumberOfRepeats--; + } while (aNumberOfRepeats >= 0); +} /** @}*/ #endif // _IR_OTHERS_HPP diff --git a/src/ir_Pronto.hpp b/src/ir_Pronto.hpp index e07c0b50..4ad19850 100644 --- a/src/ir_Pronto.hpp +++ b/src/ir_Pronto.hpp @@ -266,7 +266,7 @@ void IRrecv::compensateAndPrintIRResultAsPronto(Print *aSerial, uint16_t aFreque dumpNumberHex(aSerial, (decodedIRData.rawlen + 1) / 2); dumpNumberHex(aSerial, 0); // no repeat data uint16_t timebase = toTimebase(aFrequencyHertz); - compensateAndDumpSequence(aSerial, &decodedIRData.rawDataPtr->rawbuf[1], decodedIRData.rawlen - 1, timebase); // skip leading space + compensateAndDumpSequence(aSerial, &irparams.rawbuf[1], decodedIRData.rawlen - 1, timebase); // skip leading space aSerial->println(F("\";")); } @@ -335,7 +335,7 @@ size_t IRrecv::compensateAndStorePronto(String *aString, uint16_t frequency) { size += dumpNumberHex(aString, toFrequencyCode(frequency)); size += dumpNumberHex(aString, (decodedIRData.rawlen + 1) / 2); size += dumpNumberHex(aString, 0); - size += compensateAndDumpSequence(aString, &decodedIRData.rawDataPtr->rawbuf[1], decodedIRData.rawlen - 1, timebase); // skip leading space + size += compensateAndDumpSequence(aString, &irparams.rawbuf[1], decodedIRData.rawlen - 1, timebase); // skip leading space return size; } diff --git a/src/ir_RC5_RC6.hpp b/src/ir_RC5_RC6.hpp index d97f11b4..3a826f7c 100644 --- a/src/ir_RC5_RC6.hpp +++ b/src/ir_RC5_RC6.hpp @@ -461,8 +461,8 @@ bool IRrecv::decodeRC6() { } // Check header "mark" and "space", this must be done for repeat and data - if (!matchMark(decodedIRData.rawDataPtr->rawbuf[1], RC6_HEADER_MARK) - || !matchSpace(decodedIRData.rawDataPtr->rawbuf[2], RC6_HEADER_SPACE)) { + if (!matchMark(irparams.rawbuf[1], RC6_HEADER_MARK) + || !matchSpace(irparams.rawbuf[2], RC6_HEADER_SPACE)) { // no debug output, since this check is mainly to determine the received protocol IR_DEBUG_PRINT(F("RC6: ")); IR_DEBUG_PRINTLN(F("Header mark or space length is wrong")); diff --git a/src/ir_Samsung.hpp b/src/ir_Samsung.hpp index 58b285df..46ec5d55 100644 --- a/src/ir_Samsung.hpp +++ b/src/ir_Samsung.hpp @@ -103,11 +103,11 @@ // 19 byte RAM struct PulseDistanceWidthProtocolConstants const SamsungProtocolConstants PROGMEM = {SAMSUNG, SAMSUNG_KHZ, SAMSUNG_HEADER_MARK, - SAMSUNG_HEADER_SPACE, SAMSUNG_BIT_MARK, SAMSUNG_ONE_SPACE, SAMSUNG_BIT_MARK, SAMSUNG_ZERO_SPACE, PROTOCOL_IS_LSB_FIRST, + SAMSUNG_HEADER_SPACE, SAMSUNG_BIT_MARK, SAMSUNG_ONE_SPACE, SAMSUNG_BIT_MARK, SAMSUNG_ZERO_SPACE, PROTOCOL_IS_LSB_FIRST | PROTOCOL_IS_PULSE_DISTANCE, (SAMSUNG_REPEAT_PERIOD / MICROS_IN_ONE_MILLI), nullptr}; struct PulseDistanceWidthProtocolConstants const SamsungLGProtocolConstants PROGMEM = {SAMSUNGLG, SAMSUNG_KHZ, SAMSUNG_HEADER_MARK, - SAMSUNG_HEADER_SPACE, SAMSUNG_BIT_MARK, SAMSUNG_ONE_SPACE, SAMSUNG_BIT_MARK, SAMSUNG_ZERO_SPACE, PROTOCOL_IS_LSB_FIRST, + SAMSUNG_HEADER_SPACE, SAMSUNG_BIT_MARK, SAMSUNG_ONE_SPACE, SAMSUNG_BIT_MARK, SAMSUNG_ZERO_SPACE, PROTOCOL_IS_LSB_FIRST | PROTOCOL_IS_PULSE_DISTANCE, (SAMSUNG_REPEAT_PERIOD / MICROS_IN_ONE_MILLI), &sendSamsungLGSpecialRepeat}; /************************************ * Start of send and decode functions @@ -298,13 +298,7 @@ bool IRrecv::decodeSamsung() { /* * Decode first 32 bits */ - if (!decodePulseDistanceWidthData_P(&SamsungProtocolConstants, SAMSUNG_BITS, 3)) { -#if defined(LOCAL_DEBUG) - Serial.print(F("Samsung: ")); - Serial.println(F("Decode failed")); -#endif - return false; - } + decodePulseDistanceWidthData_P(&SamsungProtocolConstants, SAMSUNG_BITS, 3); LongUnion tValue; tValue.ULong = decodedIRData.decodedRawData; decodedIRData.address = tValue.UWord.LowWord; @@ -314,14 +308,8 @@ bool IRrecv::decodeSamsung() { * Samsung48 */ // decode additional 16 bit - if (!decodePulseDistanceWidthData_P(&SamsungProtocolConstants, (SAMSUNG_COMMAND32_BITS - SAMSUNG_COMMAND16_BITS), - 3 + (2 * SAMSUNG_BITS))) { -#if defined(LOCAL_DEBUG) - Serial.print(F("Samsung: ")); - Serial.println(F("Decode failed")); -#endif - return false; - } + decodePulseDistanceWidthData_P(&SamsungProtocolConstants, (SAMSUNG_COMMAND32_BITS - SAMSUNG_COMMAND16_BITS), + 3 + (2 * SAMSUNG_BITS)); /* * LSB data is already in tValue.UWord.HighWord! @@ -401,11 +389,8 @@ bool IRrecv::decodeSAMSUNG(decode_results *aResults) { } offset++; - if (!decodePulseDistanceWidthData(SAMSUNG_BITS, offset, SAMSUNG_BIT_MARK, SAMSUNG_ONE_SPACE, 0, PROTOCOL_IS_MSB_FIRST)) { - return false; - } + decodePulseDistanceWidthData(SAMSUNG_BITS, offset, SAMSUNG_BIT_MARK, SAMSUNG_ONE_SPACE, 0, PROTOCOL_IS_MSB_FIRST); - // Success aResults->value = decodedIRData.decodedRawData; aResults->bits = SAMSUNG_BITS; aResults->decode_type = SAMSUNG; diff --git a/src/ir_Sony.hpp b/src/ir_Sony.hpp index bcb9eb9d..d97ff575 100644 --- a/src/ir_Sony.hpp +++ b/src/ir_Sony.hpp @@ -91,7 +91,7 @@ #define SONY_MAXIMUM_REPEAT_DISTANCE (SONY_REPEAT_PERIOD - SONY_AVERAGE_DURATION_MIN) // 24 ms struct PulseDistanceWidthProtocolConstants const SonyProtocolConstants PROGMEM = { SONY, SONY_KHZ, SONY_HEADER_MARK, SONY_SPACE, SONY_ONE_MARK, -SONY_SPACE, SONY_ZERO_MARK, SONY_SPACE, PROTOCOL_IS_LSB_FIRST, (SONY_REPEAT_PERIOD / MICROS_IN_ONE_MILLI), nullptr }; +SONY_SPACE, SONY_ZERO_MARK, SONY_SPACE, PROTOCOL_IS_LSB_FIRST | PROTOCOL_IS_PULSE_WIDTH, (SONY_REPEAT_PERIOD / MICROS_IN_ONE_MILLI), nullptr }; /************************************ * Start of send and decode functions @@ -122,13 +122,7 @@ bool IRrecv::decodeSony() { return false; } - if (!decodePulseDistanceWidthData_P(&SonyProtocolConstants, (decodedIRData.rawlen - 1) / 2, 3)) { -#if defined(LOCAL_DEBUG) - Serial.print(F("Sony: ")); - Serial.println(F("Decode failed")); -#endif - return false; - } + decodePulseDistanceWidthData_P(&SonyProtocolConstants, (decodedIRData.rawlen - 1) / 2, 3); // Success // decodedIRData.flags = IRDATA_FLAGS_IS_LSB_FIRST; // Not required, since this is the start value diff --git a/src/ir_Template.hpp b/src/ir_Template.hpp index ce1dab06..f4726da4 100644 --- a/src/ir_Template.hpp +++ b/src/ir_Template.hpp @@ -143,7 +143,7 @@ bool IRrecv::decodeShuzu() { * Next try the decode */ // Check we have the right amount of data (28). The +4 is for initial gap, start bit mark and space + stop bit mark - if (decodedIRData.rawDataPtr->rawlen != (2 * SHUZU_BITS) + 4) { + if (irparams.rawlen != (2 * SHUZU_BITS) + 4) { // no debug output, since this check is mainly to determine the received protocol return false; } diff --git a/src/private/IRTimer.hpp b/src/private/IRTimer.hpp index be3c50c4..ac893cc1 100644 --- a/src/private/IRTimer.hpp +++ b/src/private/IRTimer.hpp @@ -11,7 +11,7 @@ ************************************************************************************* * MIT License * - * Copyright (c) 2021-2023 Armin Joachimsmeyer + * Copyright (c) 2021-2025 Armin Joachimsmeyer * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -1606,13 +1606,13 @@ hw_timer_t *s50usTimer = nullptr; // set by timerConfigForReceive() #define _IRREMOTE_ESP32_LEDC_RESOLUTION_MAX_PWM_VALUE 255 //# if ESP_ARDUINO_VERSION < ESP_ARDUINO_VERSION_VAL(3, 0, 0) && !defined(SEND_LEDC_CHANNEL) -# if ESP_ARDUINO_VERSION < (3 << 16 + 0 >> 8 + 0) && !defined(SEND_LEDC_CHANNEL) +# if ESP_ARDUINO_VERSION < (3 << 16 | 0 << 8 | 0) && !defined(SEND_LEDC_CHANNEL) // works also in case ESP_ARDUINO_VERSION_VAL is not defined #define SEND_LEDC_CHANNEL 0 // The channel used for PWM 0 to 7 are high speed PWM channels # endif void timerEnableReceiveInterrupt() { //# if ESP_ARDUINO_VERSION >= ESP_ARDUINO_VERSION_VAL(3, 0, 0) -# if ESP_ARDUINO_VERSION >= (3 << 16 + 0 >> 8 + 0) +# if ESP_ARDUINO_VERSION >= (3 << 16 | 0 << 8 | 0) timerStart(s50usTimer); # else timerAlarmEnable(s50usTimer); @@ -1620,7 +1620,7 @@ void timerEnableReceiveInterrupt() { } //# if ESP_ARDUINO_VERSION < ESP_ARDUINO_VERSION_VAL(2, 0, 2) -# if ESP_ARDUINO_VERSION < (2 << 16 + 0 >> 8 + 2) +# if ESP_ARDUINO_VERSION < (2 << 16 | 0 << 8 | 2) /* * Special support for ESP core < 202 */ @@ -1635,7 +1635,7 @@ void timerDisableReceiveInterrupt() { void timerDisableReceiveInterrupt() { if (s50usTimer != nullptr) { //# if ESP_ARDUINO_VERSION >= ESP_ARDUINO_VERSION_VAL(3, 0, 0) -# if ESP_ARDUINO_VERSION >= (3 << 16 + 0 >> 8 + 0) +# if ESP_ARDUINO_VERSION >= (3 << 16 | 0 << 8 | 0) timerStop(s50usTimer); # else timerAlarmDisable(s50usTimer); @@ -1655,7 +1655,8 @@ void timerConfigForReceive() { // simply call the readable API versions :) // 3 timers, choose #1, 80 divider for microsecond precision @80MHz clock, count_up = true if (s50usTimer == nullptr) { -# if ESP_ARDUINO_VERSION >= ESP_ARDUINO_VERSION_VAL(3, 0, 0) +//# if ESP_ARDUINO_VERSION >= ESP_ARDUINO_VERSION_VAL(3, 0, 0) +# if ESP_ARDUINO_VERSION >= (3 << 16 | 0 << 8 | 0) s50usTimer = timerBegin(1000000); // Only 1 parameter is required. 1000000 corresponds to 1 MHz / 1 uSec. After successful setup the timer will automatically start. timerStop(s50usTimer); // Stop it here, to avoid "error E (3447) gptimer: gptimer_start(348): timer is not enabled yet" at timerEnableReceiveInterrupt() timerAttachInterrupt(s50usTimer, &IRReceiveTimerInterruptHandler); @@ -1674,7 +1675,8 @@ uint8_t sLastSendPin = 0; // Avoid multiple attach() or if pin changes, detach b # if defined(SEND_PWM_BY_TIMER) void enableSendPWMByTimer() { -# if ESP_ARDUINO_VERSION >= ESP_ARDUINO_VERSION_VAL(3, 0, 0) +//# if ESP_ARDUINO_VERSION >= ESP_ARDUINO_VERSION_VAL(3, 0, 0) +# if ESP_ARDUINO_VERSION >= (3 << 16 | 0 << 8 | 0) # if defined(IR_SEND_PIN) ledcWrite(IR_SEND_PIN, (IR_SEND_DUTY_CYCLE_PERCENT_FOR_LEVEL_HIGH * _IRREMOTE_ESP32_LEDC_RESOLUTION_MAX_PWM_VALUE) / 100); // 3.x API # else @@ -1686,7 +1688,8 @@ void enableSendPWMByTimer() { # endif } void disableSendPWMByTimer() { -# if ESP_ARDUINO_VERSION >= ESP_ARDUINO_VERSION_VAL(3, 0, 0) +//# if ESP_ARDUINO_VERSION >= ESP_ARDUINO_VERSION_VAL(3, 0, 0) +# if ESP_ARDUINO_VERSION >= (3 << 16 | 0 << 8 | 0) # if defined(IR_SEND_PIN) # if defined(USE_ACTIVE_LOW_OUTPUT_FOR_SEND_PIN) ledcWrite(IR_SEND_PIN, _IRREMOTE_ESP32_LEDC_RESOLUTION_MAX_PWM_VALUE); // 3.x API @@ -1711,7 +1714,8 @@ void disableSendPWMByTimer() { * ledcWrite since ESP 2.0.2 does not work if pin mode is set. */ void timerConfigForSend(uint16_t aFrequencyKHz) { -# if ESP_ARDUINO_VERSION >= ESP_ARDUINO_VERSION_VAL(3, 0, 0) +//# if ESP_ARDUINO_VERSION >= ESP_ARDUINO_VERSION_VAL(3, 0, 0) +# if ESP_ARDUINO_VERSION >= (3 << 16 | 0 << 8 | 0) # if defined(IR_SEND_PIN) if(sLastSendPin == 0){ ledcAttach(IR_SEND_PIN, aFrequencyKHz * 1000, _IRREMOTE_ESP32_LEDC_RESOLUTION); // 3.x API