mirror of
https://github.com/Theaninova/Arduino-IRremote.git
synced 2025-12-13 01:46:21 +00:00
Merge pull request #215 from audetto/master
Merge back irISR.cpp into irRemote.cpp to avoid a linker issue
This commit is contained in:
Rafi Khan
86
IRremote.cpp
86
IRremote.cpp
@@ -18,6 +18,8 @@
|
|||||||
// Whynter A/C ARC-110WD added by Francesco Meschia
|
// Whynter A/C ARC-110WD added by Francesco Meschia
|
||||||
//******************************************************************************
|
//******************************************************************************
|
||||||
|
|
||||||
|
#include <avr/interrupt.h>
|
||||||
|
|
||||||
// Defining IR_GLOBAL here allows us to declare the instantiation of global variables
|
// Defining IR_GLOBAL here allows us to declare the instantiation of global variables
|
||||||
#define IR_GLOBAL
|
#define IR_GLOBAL
|
||||||
# include "IRremote.h"
|
# include "IRremote.h"
|
||||||
@@ -88,3 +90,87 @@ int MATCH_SPACE (int measured_ticks, int desired_us)
|
|||||||
return ((measured_ticks >= TICKS_LOW (desired_us - MARK_EXCESS))
|
return ((measured_ticks >= TICKS_LOW (desired_us - MARK_EXCESS))
|
||||||
&& (measured_ticks <= TICKS_HIGH(desired_us - MARK_EXCESS)));
|
&& (measured_ticks <= TICKS_HIGH(desired_us - MARK_EXCESS)));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//+=============================================================================
|
||||||
|
// Interrupt Service Routine - Fires every 50uS
|
||||||
|
// TIMER2 interrupt code to collect raw data.
|
||||||
|
// Widths of alternating SPACE, MARK are recorded in rawbuf.
|
||||||
|
// Recorded in ticks of 50uS [microseconds, 0.000050 seconds]
|
||||||
|
// 'rawlen' counts the number of entries recorded so far.
|
||||||
|
// First entry is the SPACE between transmissions.
|
||||||
|
// As soon as a the first [SPACE] entry gets long:
|
||||||
|
// Ready is set; State switches to IDLE; Timing of SPACE continues.
|
||||||
|
// As soon as first MARK arrives:
|
||||||
|
// Gap width is recorded; Ready is cleared; New logging starts
|
||||||
|
//
|
||||||
|
ISR (TIMER_INTR_NAME)
|
||||||
|
{
|
||||||
|
TIMER_RESET;
|
||||||
|
|
||||||
|
// Read if IR Receiver -> SPACE [xmt LED off] or a MARK [xmt LED on]
|
||||||
|
// digitalRead() is very slow. Optimisation is possible, but makes the code unportable
|
||||||
|
uint8_t irdata = (uint8_t)digitalRead(irparams.recvpin);
|
||||||
|
|
||||||
|
irparams.timer++; // One more 50uS tick
|
||||||
|
if (irparams.rawlen >= RAWBUF) irparams.rcvstate = STATE_OVERFLOW ; // Buffer overflow
|
||||||
|
|
||||||
|
switch(irparams.rcvstate) {
|
||||||
|
//......................................................................
|
||||||
|
case STATE_IDLE: // In the middle of a gap
|
||||||
|
if (irdata == MARK) {
|
||||||
|
if (irparams.timer < GAP_TICKS) { // Not big enough to be a gap.
|
||||||
|
irparams.timer = 0;
|
||||||
|
|
||||||
|
} else {
|
||||||
|
// Gap just ended; Record duration; Start recording transmission
|
||||||
|
irparams.overflow = false;
|
||||||
|
irparams.rawlen = 0;
|
||||||
|
irparams.rawbuf[irparams.rawlen++] = irparams.timer;
|
||||||
|
irparams.timer = 0;
|
||||||
|
irparams.rcvstate = STATE_MARK;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
//......................................................................
|
||||||
|
case STATE_MARK: // Timing Mark
|
||||||
|
if (irdata == SPACE) { // Mark ended; Record time
|
||||||
|
irparams.rawbuf[irparams.rawlen++] = irparams.timer;
|
||||||
|
irparams.timer = 0;
|
||||||
|
irparams.rcvstate = STATE_SPACE;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
//......................................................................
|
||||||
|
case STATE_SPACE: // Timing Space
|
||||||
|
if (irdata == MARK) { // Space just ended; Record time
|
||||||
|
irparams.rawbuf[irparams.rawlen++] = irparams.timer;
|
||||||
|
irparams.timer = 0;
|
||||||
|
irparams.rcvstate = STATE_MARK;
|
||||||
|
|
||||||
|
} else if (irparams.timer > GAP_TICKS) { // Space
|
||||||
|
// A long Space, indicates gap between codes
|
||||||
|
// Flag the current code as ready for processing
|
||||||
|
// Switch to STOP
|
||||||
|
// Don't reset timer; keep counting Space width
|
||||||
|
irparams.rcvstate = STATE_STOP;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
//......................................................................
|
||||||
|
case STATE_STOP: // Waiting; Measuring Gap
|
||||||
|
if (irdata == MARK) irparams.timer = 0 ; // Reset gap timer
|
||||||
|
break;
|
||||||
|
//......................................................................
|
||||||
|
case STATE_OVERFLOW: // Flag up a read overflow; Stop the State Machine
|
||||||
|
irparams.overflow = true;
|
||||||
|
irparams.rcvstate = STATE_STOP;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
// If requested, flash LED while receiving IR data
|
||||||
|
if (irparams.blinkflag) {
|
||||||
|
if (irdata == MARK)
|
||||||
|
if (irparams.blinkpin) digitalWrite(irparams.blinkpin, HIGH); // Turn user defined pin LED on
|
||||||
|
else BLINKLED_ON() ; // if no user defined LED pin, turn default LED pin for the hardware on
|
||||||
|
else if (irparams.blinkpin) digitalWrite(irparams.blinkpin, LOW); // Turn user defined pin LED on
|
||||||
|
else BLINKLED_OFF() ; // if no user defined LED pin, turn default LED pin for the hardware on
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
88
irISR.cpp
88
irISR.cpp
@@ -1,88 +0,0 @@
|
|||||||
#include <avr/interrupt.h>
|
|
||||||
|
|
||||||
#include "IRremote.h"
|
|
||||||
#include "IRremoteInt.h"
|
|
||||||
|
|
||||||
//+=============================================================================
|
|
||||||
// Interrupt Service Routine - Fires every 50uS
|
|
||||||
// TIMER2 interrupt code to collect raw data.
|
|
||||||
// Widths of alternating SPACE, MARK are recorded in rawbuf.
|
|
||||||
// Recorded in ticks of 50uS [microseconds, 0.000050 seconds]
|
|
||||||
// 'rawlen' counts the number of entries recorded so far.
|
|
||||||
// First entry is the SPACE between transmissions.
|
|
||||||
// As soon as a the first [SPACE] entry gets long:
|
|
||||||
// Ready is set; State switches to IDLE; Timing of SPACE continues.
|
|
||||||
// As soon as first MARK arrives:
|
|
||||||
// Gap width is recorded; Ready is cleared; New logging starts
|
|
||||||
//
|
|
||||||
ISR (TIMER_INTR_NAME)
|
|
||||||
{
|
|
||||||
TIMER_RESET;
|
|
||||||
|
|
||||||
// Read if IR Receiver -> SPACE [xmt LED off] or a MARK [xmt LED on]
|
|
||||||
// digitalRead() is very slow. Optimisation is possible, but makes the code unportable
|
|
||||||
uint8_t irdata = (uint8_t)digitalRead(irparams.recvpin);
|
|
||||||
|
|
||||||
irparams.timer++; // One more 50uS tick
|
|
||||||
if (irparams.rawlen >= RAWBUF) irparams.rcvstate = STATE_OVERFLOW ; // Buffer overflow
|
|
||||||
|
|
||||||
switch(irparams.rcvstate) {
|
|
||||||
//......................................................................
|
|
||||||
case STATE_IDLE: // In the middle of a gap
|
|
||||||
if (irdata == MARK) {
|
|
||||||
if (irparams.timer < GAP_TICKS) { // Not big enough to be a gap.
|
|
||||||
irparams.timer = 0;
|
|
||||||
|
|
||||||
} else {
|
|
||||||
// Gap just ended; Record duration; Start recording transmission
|
|
||||||
irparams.overflow = false;
|
|
||||||
irparams.rawlen = 0;
|
|
||||||
irparams.rawbuf[irparams.rawlen++] = irparams.timer;
|
|
||||||
irparams.timer = 0;
|
|
||||||
irparams.rcvstate = STATE_MARK;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
//......................................................................
|
|
||||||
case STATE_MARK: // Timing Mark
|
|
||||||
if (irdata == SPACE) { // Mark ended; Record time
|
|
||||||
irparams.rawbuf[irparams.rawlen++] = irparams.timer;
|
|
||||||
irparams.timer = 0;
|
|
||||||
irparams.rcvstate = STATE_SPACE;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
//......................................................................
|
|
||||||
case STATE_SPACE: // Timing Space
|
|
||||||
if (irdata == MARK) { // Space just ended; Record time
|
|
||||||
irparams.rawbuf[irparams.rawlen++] = irparams.timer;
|
|
||||||
irparams.timer = 0;
|
|
||||||
irparams.rcvstate = STATE_MARK;
|
|
||||||
|
|
||||||
} else if (irparams.timer > GAP_TICKS) { // Space
|
|
||||||
// A long Space, indicates gap between codes
|
|
||||||
// Flag the current code as ready for processing
|
|
||||||
// Switch to STOP
|
|
||||||
// Don't reset timer; keep counting Space width
|
|
||||||
irparams.rcvstate = STATE_STOP;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
//......................................................................
|
|
||||||
case STATE_STOP: // Waiting; Measuring Gap
|
|
||||||
if (irdata == MARK) irparams.timer = 0 ; // Reset gap timer
|
|
||||||
break;
|
|
||||||
//......................................................................
|
|
||||||
case STATE_OVERFLOW: // Flag up a read overflow; Stop the State Machine
|
|
||||||
irparams.overflow = true;
|
|
||||||
irparams.rcvstate = STATE_STOP;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
// If requested, flash LED while receiving IR data
|
|
||||||
if (irparams.blinkflag) {
|
|
||||||
if (irdata == MARK)
|
|
||||||
if (irparams.blinkpin) digitalWrite(irparams.blinkpin, HIGH); // Turn user defined pin LED on
|
|
||||||
else BLINKLED_ON() ; // if no user defined LED pin, turn default LED pin for the hardware on
|
|
||||||
else if (irparams.blinkpin) digitalWrite(irparams.blinkpin, LOW); // Turn user defined pin LED on
|
|
||||||
else BLINKLED_OFF() ; // if no user defined LED pin, turn default LED pin for the hardware on
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user