Theaninova/Arduino-IRremote
1
0
Fork 0
mirror of https://github.com/Theaninova/Arduino-IRremote.git synced 2026-01-06 21:42:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fab672000-master' into experimental

Browse Source 
Conflicts:
	IRremote.cpp
	IRremote.h
* Saves lots of precious ram
* Debug Improvement
* Minor refactoring
* Better Install Instructions
* Using F() Macro

Credits: @zt30 and @fab672000.
Merged PR: #109
This commit is contained in:
Rafi Khan
2015-03-09 22:55:22 -06:00
parent 0096727887 e04e7d31b7
commit 49855488d5
3 changed files with 127 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

259
IRremote.cpp
View File

@@ -17,7 +17,6 @@
* LG added by Darryl Smith (based on the JVC protocol)
* Whynter A/C ARC-110WD added by Francesco Meschia
*/
#include "IRremote.h"
#include "IRremoteInt.h"
@@ -31,39 +30,39 @@ volatile irparams_t irparams;
// Normally macros are used for efficiency
#ifdef DEBUG
int MATCH(int measured, int desired) {
Serial.print("Testing: ");
Serial.print(F("Testing: "));
Serial.print(TICKS_LOW(desired), DEC);
Serial.print(" <= ");
Serial.print(F(" <= "));
Serial.print(measured, DEC);
Serial.print(" <= ");
Serial.print(F(" <= "));
Serial.println(TICKS_HIGH(desired), DEC);
return measured >= TICKS_LOW(desired) && measured <= TICKS_HIGH(desired);
}
int MATCH_MARK(int measured_ticks, int desired_us) {
Serial.print("Testing mark ");
Serial.print(F("Testing mark "));
Serial.print(measured_ticks * USECPERTICK, DEC);
Serial.print(" vs ");
Serial.print(F(" vs "));
Serial.print(desired_us, DEC);
Serial.print(": ");
Serial.print(F(": "));
Serial.print(TICKS_LOW(desired_us + MARK_EXCESS), DEC);
Serial.print(" <= ");
Serial.print(F(" <= "));
Serial.print(measured_ticks, DEC);
Serial.print(" <= ");
Serial.print(F(" <= "));
Serial.println(TICKS_HIGH(desired_us + MARK_EXCESS), DEC);
return measured_ticks >= TICKS_LOW(desired_us + MARK_EXCESS) && measured_ticks <= TICKS_HIGH(desired_us + MARK_EXCESS);
}
int MATCH_SPACE(int measured_ticks, int desired_us) {
Serial.print("Testing space ");
Serial.print(F("Testing space "));
Serial.print(measured_ticks * USECPERTICK, DEC);
Serial.print(" vs ");
Serial.print(F(" vs "));
Serial.print(desired_us, DEC);
Serial.print(": ");
Serial.print(F(": "));
Serial.print(TICKS_LOW(desired_us - MARK_EXCESS), DEC);
Serial.print(" <= ");
Serial.print(F(" <= "));
Serial.print(measured_ticks, DEC);
Serial.print(" <= ");
Serial.print(F(" <= "));
Serial.println(TICKS_HIGH(desired_us - MARK_EXCESS), DEC);
return measured_ticks >= TICKS_LOW(desired_us - MARK_EXCESS) && measured_ticks <= TICKS_HIGH(desired_us - MARK_EXCESS);
}
@@ -311,6 +310,74 @@ void IRsend::enableIROut(int khz) {
// The top value for the timer. The modulation frequency will be SYSCLOCK / 2 / OCR2A.
TIMER_CONFIG_KHZ(khz);
}
/* Sharp and DISH support by Todd Treece ( http://unionbridge.org/design/ircommand )
The Dish send function needs to be repeated 4 times, and the Sharp function
has the necessary repeat built in because of the need to invert the signal.
Sharp protocol documentation:
http://www.sbprojects.com/knowledge/ir/sharp.htm
Here are the LIRC files that I found that seem to match the remote codes
from the oscilloscope:
Sharp LCD TV:
http://lirc.sourceforge.net/remotes/sharp/GA538WJSA
DISH NETWORK (echostar 301):
http://lirc.sourceforge.net/remotes/echostar/301_501_3100_5100_58xx_59xx
For the DISH codes, only send the last for characters of the hex.
i.e. use 0x1C10 instead of 0x0000000000001C10 which is listed in the
linked LIRC file.
*/
void IRsend::sendSharpRaw(unsigned long data, int nbits) {
enableIROut(38);
// Sending codes in bursts of 3 (normal, inverted, normal) makes transmission
// much more reliable. That's the exact behaviour of CD-S6470 remote control.
for (int n = 0; n < 3; n++) {
for (int i = 1 << (nbits-1); i > 0; i>>=1) {
if (data & i) {
mark(SHARP_BIT_MARK);
space(SHARP_ONE_SPACE);
}
else {
mark(SHARP_BIT_MARK);
space(SHARP_ZERO_SPACE);
}
}
mark(SHARP_BIT_MARK);
space(SHARP_ZERO_SPACE);
delay(40);
data = data ^ SHARP_TOGGLE_MASK;
}
}
// Sharp send compatible with data obtained through decodeSharp
void IRsend::sendSharp(unsigned int address, unsigned int command) {
sendSharpRaw((address << 10) | (command << 2) | 2, 15);
}
void IRsend::sendDISH(unsigned long data, int nbits) {
enableIROut(56);
mark(DISH_HDR_MARK);
space(DISH_HDR_SPACE);
for (int i = 0; i < nbits; i++) {
if (data & DISH_TOP_BIT) {
mark(DISH_BIT_MARK);
space(DISH_ONE_SPACE);
}
else {
mark(DISH_BIT_MARK);
space(DISH_ZERO_SPACE);
}
data <<= 1;
}
}
IRrecv::IRrecv(int recvpin)
{
@@ -441,73 +508,73 @@ int IRrecv::decode(decode_results *results) {
return ERR;
}
#ifdef DEBUG
Serial.println("Attempting NEC decode");
Serial.println(F("Attempting NEC decode"));
#endif
if (decodeNEC(results)) {
return DECODED;
}
#ifdef DEBUG
Serial.println("Attempting Sony decode");
Serial.println(F("Attempting Sony decode"));
#endif
if (decodeSony(results)) {
return DECODED;
}
#ifdef DEBUG
Serial.println("Attempting Sanyo decode");
Serial.println(F("Attempting Sanyo decode"));
#endif
if (decodeSanyo(results)) {
return DECODED;
}
#ifdef DEBUG
Serial.println("Attempting Sharp decode");
Serial.println(F("Attempting Sharp decode"));
#endif
if (decodeSharp(results)) {
return DECODED;
}
#ifdef DEBUG
Serial.println("Attempting Mitsubishi decode");
Serial.println(F("Attempting Mitsubishi decode"));
#endif
if (decodeMitsubishi(results)) {
return DECODED;
}
#ifdef DEBUG
Serial.println("Attempting RC5 decode");
Serial.println(F("Attempting RC5 decode"));
#endif
if (decodeRC5(results)) {
return DECODED;
}
#ifdef DEBUG
Serial.println("Attempting RC6 decode");
Serial.println(F("Attempting RC6 decode"));
#endif
if (decodeRC6(results)) {
return DECODED;
}
#ifdef DEBUG
Serial.println("Attempting Panasonic decode");
Serial.println(F("Attempting Panasonic decode"));
#endif
if (decodePanasonic(results)) {
return DECODED;
}
#ifdef DEBUG
Serial.println("Attempting LG decode");
Serial.println(F("Attempting LG decode"));
#endif
if (decodeLG(results)) {
return DECODED;
}
#ifdef DEBUG
Serial.println("Attempting JVC decode");
Serial.println(F("Attempting JVC decode"));
#endif
if (decodeJVC(results)) {
return DECODED;
}
#ifdef DEBUG
Serial.println("Attempting SAMSUNG decode");
Serial.println(F("Attempting SAMSUNG decode"));
#endif
if (decodeSAMSUNG(results)) {
return DECODED;
}
#ifdef DEBUG
Serial.println("Attempting Whynter decode");
Serial.println(F("Attempting Whynter decode"));
#endif
if (decodeWhynter(results)) {
return DECODED;
@@ -589,7 +656,7 @@ long IRrecv::decodeSony(decode_results *results) {
// Some Sony's deliver repeats fast after first
// unfortunately can't spot difference from of repeat from two fast clicks
if (results->rawbuf[offset] < SONY_DOUBLE_SPACE_USECS) {
// Serial.print("IR Gap found: ");
// Serial.print(F("IR Gap found: "));
results->bits = 0;
results->value = REPEAT;
results->decode_type = SANYO;
@@ -746,13 +813,13 @@ long IRrecv::decodeSanyo(decode_results *results) {
int offset = 0; // Skip first space
// Initial space
/* Put this back in for debugging - note can't use #DEBUG as if Debug on we don't see the repeat cos of the delay
Serial.print("IR Gap: ");
Serial.print(F("IR Gap: "));
Serial.println( results->rawbuf[offset]);
Serial.println( "test against:");
Serial.println(F("test against:"));
Serial.println(results->rawbuf[offset]);
*/
if (results->rawbuf[offset] < SANYO_DOUBLE_SPACE_USECS) {
// Serial.print("IR Gap found: ");
// Serial.print(F("IR Gap found: "));
results->bits = 0;
results->value = REPEAT;
results->decode_type = SANYO;
@@ -802,7 +869,7 @@ long IRrecv::decodeSanyo(decode_results *results) {
// Looks like Sony except for timings, 48 chars of data and time/space different
long IRrecv::decodeMitsubishi(decode_results *results) {
// Serial.print("?!? decoding Mitsubishi:");Serial.print(irparams.rawlen); Serial.print(" want "); Serial.println( 2 * MITSUBISHI_BITS + 2);
// Serial.print(F("?!? decoding Mitsubishi:"));Serial.print(irparams.rawlen); Serial.print(F(" want ")); Serial.println( 2 * MITSUBISHI_BITS + 2);
long data = 0;
if (irparams.rawlen < 2 * MITSUBISHI_BITS + 2) {
return ERR;
@@ -810,14 +877,14 @@ long IRrecv::decodeMitsubishi(decode_results *results) {
int offset = 0; // Skip first space
// Initial space
/* Put this back in for debugging - note can't use #DEBUG as if Debug on we don't see the repeat cos of the delay
Serial.print("IR Gap: ");
Serial.print(F("IR Gap: "));
Serial.println( results->rawbuf[offset]);
Serial.println( "test against:");
Serial.println(F("test against:"));
Serial.println(results->rawbuf[offset]);
*/
/* Not seeing double keys from Mitsubishi
if (results->rawbuf[offset] < MITSUBISHI_DOUBLE_SPACE_USECS) {
// Serial.print("IR Gap found: ");
// Serial.print(F("IR Gap found: "));
results->bits = 0;
results->value = REPEAT;
results->decode_type = MITSUBISHI;
@@ -842,12 +909,12 @@ long IRrecv::decodeMitsubishi(decode_results *results) {
data <<= 1;
}
else {
// Serial.println("A"); Serial.println(offset); Serial.println(results->rawbuf[offset]);
// Serial.println(F("A")); Serial.println(offset); Serial.println(results->rawbuf[offset]);
return ERR;
}
offset++;
if (!MATCH_SPACE(results->rawbuf[offset], MITSUBISHI_HDR_SPACE)) {
// Serial.println("B"); Serial.println(offset); Serial.println(results->rawbuf[offset]);
// Serial.println(F("B")); Serial.println(offset); Serial.println(results->rawbuf[offset]);
break;
}
offset++;
@@ -902,10 +969,10 @@ int IRrecv::getRClevel(decode_results *results, int *offset, int *used, int t1)
}
#ifdef DEBUG
if (val == MARK) {
Serial.println("MARK");
Serial.println(F("MARK"));
}
else {
Serial.println("SPACE");
Serial.println(F("SPACE"));
}
#endif
return val;
@@ -1289,121 +1356,5 @@ long IRrecv::decodeHash(decode_results *results) {
return DECODED;
}
/* Sharp and DISH support by Todd Treece ( http://unionbridge.org/design/ircommand )
The Dish send function needs to be repeated 4 times, and the Sharp function
has the necessary repeat built in because of the need to invert the signal.
Sharp protocol documentation:
http://www.sbprojects.com/knowledge/ir/sharp.htm
Here are the LIRC files that I found that seem to match the remote codes
from the oscilloscope:
Sharp LCD TV:
http://lirc.sourceforge.net/remotes/sharp/GA538WJSA
DISH NETWORK (echostar 301):
http://lirc.sourceforge.net/remotes/echostar/301_501_3100_5100_58xx_59xx
For the DISH codes, only send the last for characters of the hex.
i.e. use 0x1C10 instead of 0x0000000000001C10 which is listed in the
linked LIRC file.
*/
void IRsend::sendSharpRaw(unsigned long data, int nbits) {
enableIROut(38);
// Sending codes in bursts of 3 (normal, inverted, normal) makes transmission
// much more reliable. That's the exact behaviour of CD-S6470 remote control.
for (int n = 0; n < 3; n++) {
for (int i = 1 << (nbits-1); i > 0; i>>=1) {
if (data & i) {
mark(SHARP_BIT_MARK);
space(SHARP_ONE_SPACE);
}
else {
mark(SHARP_BIT_MARK);
space(SHARP_ZERO_SPACE);
}
}
mark(SHARP_BIT_MARK);
space(SHARP_ZERO_SPACE);
delay(40);
data = data ^ SHARP_TOGGLE_MASK;
}
}
// Sharp send compatible with data obtained through decodeSharp
void IRsend::sendSharp(unsigned int address, unsigned int command) {
sendSharpRaw((address << 10) | (command << 2) | 2, 15);
}
void IRsend::sendDISH(unsigned long data, int nbits) {
enableIROut(56);
mark(DISH_HDR_MARK);
space(DISH_HDR_SPACE);
for (int i = 0; i < nbits; i++) {
if (data & DISH_TOP_BIT) {
mark(DISH_BIT_MARK);
space(DISH_ONE_SPACE);
}
else {
mark(DISH_BIT_MARK);
space(DISH_ZERO_SPACE);
}
data <<= 1;
}
}
/**
* Aiwa system
* Remote control RC-T501
* Lirc file http://lirc.sourceforge.net/remotes/aiwa/RC-T501
*
*/
void IRsend::sendAiwaRCT501(int code) {
// PRE-DATA, 26 bits, 0x227EEC0
long int pre = 0x227EEC0;
int i;
enableIROut(AIWA_RC_T501_HZ);
// HDR mark + HDR space
mark(AIWA_RC_T501_HDR_MARK);
space(AIWA_RC_T501_HDR_SPACE);
// Skip leading zero's
pre <<= 6;
// Send pre-data
for(i=0; i < 26; i++) {
mark(AIWA_RC_T501_BIT_MARK);
if(pre & TOPBIT) {
space(AIWA_RC_T501_ONE_SPACE);
} else {
space(AIWA_RC_T501_ZERO_SPACE);
}
pre <<= 1;
}
// Skip firts code bit
code <<= 1;
// Send code
for(i=0; i < 15; i++) {
mark(AIWA_RC_T501_BIT_MARK);
if(code & TOPBIT) {
space(AIWA_RC_T501_ONE_SPACE);
} else {
space(AIWA_RC_T501_ZERO_SPACE);
}
code <<= 1;
}
// POST-DATA, 1 bit, 0x0
mark(AIWA_RC_T501_BIT_MARK);
space(AIWA_RC_T501_ZERO_SPACE);
mark(AIWA_RC_T501_BIT_MARK);
space(0);
}

21
IRremote.h
View File

@@ -17,6 +17,13 @@
#ifndef IRremote_h
#define IRremote_h
#if defined(ARDUINO) && ARDUINO >= 100
#include <Arduino.h>
#else
#include <WProgram.h>
#endif
// The following are compile-time library options.
// If you change them, recompile the library.
// If DEBUG is defined, a lot of debugging output will be printed during decoding.
@@ -28,13 +35,15 @@
// Results returned from the decoder
class decode_results {
public:
int decode_type; // NEC, SONY, RC5, UNKNOWN
union {
unsigned int panasonicAddress; // This is only used for decoding Panasonic data
unsigned int sharpAddress; // This is only used for decoding Panasonic data
int8_t decode_type; // NEC, SONY, RC5, UNKNOWN
int8_t bits; // Number of bits in decoded value
unsigned long value; // Decoded value
union { // This is used for decoding Panasonic and Sharp data
unsigned int panasonicAddress;
unsigned int sharpAddress;
};
unsigned long value; // Decoded value
int bits; // Number of bits in decoded value
volatile unsigned int *rawbuf; // Raw intervals in .5 us ticks
int rawlen; // Number of records in rawbuf.
};

12
README.md
View File

@@ -1,14 +1,16 @@
# IRremote Arduino Library
This library enables you to send and receive using infra-red signals on an arduino
This library enables you to send and receive using infra-red signals on an arduino.
Check [here](http://shirriff.github.io/Arduino-IRremote/) for tutorials and more information.
## Version - 1.01
## Installation
1. Click "Download ZIP"
2. Extract the downloaded zip file
3. Rename the extracted folder from "Arduino-IRremote" to "IRremote"
4. Move this folder to your libraries directory
1. Navigate to the [Releases](https://github.com/shirriff/Arduino-IRremote/releases) page.
2. Download the latest release.
3. Extract the zip file
4. Move the "IRremote" folder that has been extracted to your libraries directory.
## Contributing
If you want to contribute to this project: