mirror of
https://github.com/Theaninova/Arduino-IRremote.git
synced 2025-12-30 10:12:49 +00:00
Compare commits
1 Commits
salocinx-m
...
z3t0-patch
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4f24b696cf |
@@ -15,9 +15,8 @@ These are the active contributors of this project that you may contact if there
|
||||
- [csBlueChip](https://github.com/csbluechip) : Active contributor, who contributed major and vital changes to the code base.
|
||||
- [Sebazzz](https://github.com/sebazz): Contributor
|
||||
- [lumbric](https://github.com/lumbric): Contributor
|
||||
- [ElectricRCAircraftGuy](https://github.com/electricrcaircraftguy): Contributor
|
||||
- [ElectricRCAircraftGuy](https://github.com/electricrcaircraftguy): Active Contributor
|
||||
- [henkel](https://github.com/henkel): Contributor
|
||||
- [MCUdude](https://github.com/MCUdude): Contributor
|
||||
- [salocinx](https://github.com/salocinx): Contributor
|
||||
|
||||
Note: This list is being updated constantly so please let [z3t0](https://github.com/z3t0) know if you have been missed.
|
||||
|
||||
16
IRremote.h
16
IRremote.h
@@ -79,9 +79,6 @@
|
||||
#define DECODE_LEGO_PF 0 // NOT WRITTEN
|
||||
#define SEND_LEGO_PF 1
|
||||
|
||||
#define DECODE_CDTV 1
|
||||
#define SEND_CDTV 1
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
// When sending a Pronto code we request to send either the "once" code
|
||||
// or the "repeat" code
|
||||
@@ -122,7 +119,6 @@ typedef
|
||||
DENON,
|
||||
PRONTO,
|
||||
LEGO_PF,
|
||||
CDTV,
|
||||
}
|
||||
decode_type_t;
|
||||
|
||||
@@ -251,13 +247,9 @@ class IRrecv
|
||||
# if DECODE_DENON
|
||||
bool decodeDenon (decode_results *results) ;
|
||||
# endif
|
||||
//......................................................................
|
||||
//......................................................................
|
||||
# if DECODE_LEGO_PF
|
||||
bool decodeLegoPowerFunctions (decode_results *results) ;
|
||||
# endif
|
||||
//......................................................................
|
||||
# if DECODE_CDTV
|
||||
bool decodeCDTV (decode_results *results) ;
|
||||
# endif
|
||||
} ;
|
||||
|
||||
@@ -343,13 +335,9 @@ class IRsend
|
||||
# if SEND_PRONTO
|
||||
void sendPronto (char* code, bool repeat, bool fallback) ;
|
||||
# endif
|
||||
//......................................................................
|
||||
//......................................................................
|
||||
# if SEND_LEGO_PF
|
||||
void sendLegoPowerFunctions (uint16_t data, bool repeat = true) ;
|
||||
# endif
|
||||
//......................................................................
|
||||
# if SEND_CDTV
|
||||
void sendCDTV (unsigned long data, int nbits) ;
|
||||
# endif
|
||||
} ;
|
||||
|
||||
|
||||
@@ -108,6 +108,6 @@ EXTERN volatile irparams_t irparams;
|
||||
#define SPACE 1
|
||||
|
||||
// All board specific stuff has been moved to its own file, included here.
|
||||
#include "IRremoteBoardDefs.h"
|
||||
#include "boarddefs.h"
|
||||
|
||||
#endif
|
||||
|
||||
@@ -14,8 +14,12 @@
|
||||
Use [a gist](gist.github.com) if the code exceeds 30 lines
|
||||
|
||||
**checklist:**
|
||||
- [] I have **read** the README.md file thoroughly
|
||||
- [] I have searched existing issues to see if there is anything I have missed.
|
||||
- [] The latest [release](https://github.com/z3t0/Arduino-IRremote/releases/latest) is used
|
||||
- [] Any code referenced is provided
|
||||
- [] Any code referenced is provided and if over 30 lines a gist is linked INSTEAD of it being pasted in here
|
||||
- [] The title of the issue is helpful and relevant
|
||||
|
||||
The above is a short template allowing you to make detailed issues!
|
||||
** We will start to close 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!**
|
||||
|
||||
The above is a short template allowing you to make detailed issues!
|
||||
|
||||
@@ -17,8 +17,8 @@
|
||||
// Whynter A/C ARC-110WD added by Francesco Meschia
|
||||
//******************************************************************************
|
||||
|
||||
#ifndef IRremoteBoardDefs_h
|
||||
#define IRremoteBoardDefs_h
|
||||
#ifndef boarddefs_h
|
||||
#define boarddefs_h
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
// Defines for blinking the LED
|
||||
@@ -545,4 +545,4 @@
|
||||
# error "Internal code configuration error, no known IR_USE_TIMER# defined\n"
|
||||
#endif
|
||||
|
||||
#endif // ! IRremoteBoardDefs_h
|
||||
#endif // ! boarddefs_h
|
||||
@@ -1,8 +1,4 @@
|
||||
## 2.3.0 - 2017/02/06
|
||||
- Added Commodore Amiga CDTV Support [ISSUE #407](https://github.com/z3t0/Arduino-IRremote/issues/407) [PR #413](https://github.com/z3t0/Arduino-IRremote/pull/413)
|
||||
|
||||
## 2.2.2 - 2017/01/20
|
||||
- Renamed "boarddefs.h" [ISSUE #375](https://github.com/z3t0/Arduino-IRremote/issues/375)
|
||||
- Fixed naming bug [PR #398](https://github.com/z3t0/Arduino-IRremote/pull/398)
|
||||
|
||||
## 2.2.1 - 2016/07/27
|
||||
|
||||
@@ -84,11 +84,6 @@ int IRrecv::decode (decode_results *results)
|
||||
DBG_PRINTLN("Attempting Lego Power Functions");
|
||||
if (decodeLegoPowerFunctions(results)) return true ;
|
||||
#endif
|
||||
|
||||
#if DECODE_CDTV
|
||||
DBG_PRINTLN("Attempting Commodore Amiga CDTV decode");
|
||||
if (decodeCDTV(results)) return true;
|
||||
#endif
|
||||
|
||||
// decodeHash returns a hash on any input.
|
||||
// Thus, it needs to be last in the list.
|
||||
|
||||
148
ir_CDTV.cpp
148
ir_CDTV.cpp
@@ -1,148 +0,0 @@
|
||||
#include "IRremote.h"
|
||||
#include "IRremoteInt.h"
|
||||
|
||||
//==============================================================================
|
||||
// COMMODORE AMIGA CD-TV
|
||||
//==============================================================================
|
||||
|
||||
//==============================================================================
|
||||
// CCCC DDDD TTTTT V V
|
||||
// C D D T V V
|
||||
// C D D T V V
|
||||
// C D D T V V
|
||||
// CCCC DDDD T V
|
||||
//==============================================================================
|
||||
|
||||
//==============================================================================
|
||||
// MEASUREMENTS
|
||||
//==============================================================================
|
||||
|
||||
/*Encoding: UNKNOWN
|
||||
Code : 72A03D6B(32 bits)
|
||||
Timing[51] :
|
||||
+8900, -4450 + 400, -1200 + 350, -400 + 400, -400
|
||||
+ 400, -400 + 400, -1200 + 400, -400 + 350, -450
|
||||
+ 350, -400 + 400, -400 + 400, -350 + 450, -400
|
||||
+ 350, -450 + 350, -400 + 400, -1200 + 400, -1200
|
||||
+ 350, -1200 + 400, -450 + 350, -1200 + 400, -1200
|
||||
+ 350, -1200 + 400, -1200 + 350, -1250 + 350, -1200
|
||||
+ 400, -1200 + 350
|
||||
unsigned int rawData[51] = { 8900,4450, 400,1200, 350,400, 400,400, 400,400, 400,1200, 400,400, 350,450, 350,400, 400,400, 400,350, 450,400, 350,450, 350,400, 400,1200, 400,1200, 350,1200, 400,450, 350,1200, 400,1200, 350,1200, 400,1200, 350,1250, 350,1200, 400,1200, 350 }; // UNKNOWN 72A03D6B
|
||||
*/
|
||||
|
||||
// NOTE: The array dump above begins at index = 1; therefore offset = 1 in the code below
|
||||
|
||||
//==============================================================================
|
||||
|
||||
#define CDTV_BITS 24
|
||||
// timing intervals in usec
|
||||
#define CDTV_HDR_MARK 8850 // start burst
|
||||
#define CDTV_HDR_SPACE 4450 // pause after start
|
||||
#define CDTV_BIT_MARK 350 // pulse
|
||||
#define CDTV_ONE_SPACE 1250 // receive a '1'
|
||||
#define CDTV_ZERO_SPACE 450 // receive a '0'
|
||||
#define CDTV_RPT_SPACE 2250 // repeat signal
|
||||
// message sizes measured in raw pulses
|
||||
#define CDTV_RAW_REPEAT_LENGTH 4 // CDTV_HDR_MARK + CDTV_HDR_SPACE + CDTV_BIT_MARK
|
||||
#define CDTV_RAW_SIGNAL_LENGTH 52 // CDTV_HDR_MARK + CDTV_HDR_SPACE + CDTV_BITS * (CDTV_BIT_MARK + CDTV_ZERO_SPACE | CDTV_ONE_SPACE)
|
||||
|
||||
//+=============================================================================
|
||||
#if SEND_CDTV
|
||||
void IRsend::sendCDTV(unsigned long data, int nbits) {
|
||||
|
||||
// set IR carrier frequency
|
||||
enableIROut(40);
|
||||
|
||||
// send header
|
||||
mark(CDTV_HDR_MARK);
|
||||
space(CDTV_HDR_SPACE);
|
||||
|
||||
// send data
|
||||
for (unsigned long mask = 1UL << (nbits - 1); mask; mask >>= 1) {
|
||||
if (data & mask) {
|
||||
mark(CDTV_BIT_MARK);
|
||||
space(CDTV_ONE_SPACE);
|
||||
} else {
|
||||
mark(CDTV_BIT_MARK);
|
||||
space(CDTV_ZERO_SPACE);
|
||||
}
|
||||
}
|
||||
|
||||
// send footer
|
||||
mark(CDTV_BIT_MARK);
|
||||
// always end with the LED off
|
||||
space(0);
|
||||
|
||||
}
|
||||
#endif
|
||||
|
||||
//+=============================================================================
|
||||
// CDTV have a repeat signal that is 4-bits long [#FFFFFF]
|
||||
//
|
||||
#if DECODE_CDTV
|
||||
bool IRrecv::decodeCDTV(decode_results *results) {
|
||||
|
||||
unsigned long data = 0; // we decode into this field; start with empty placeholder
|
||||
int offset = 1; // skip first entry since it has not a lot of meaning
|
||||
|
||||
// check if header mark is within range
|
||||
if (!MATCH_MARK(results->rawbuf[offset], CDTV_HDR_MARK)) {
|
||||
return false;
|
||||
}
|
||||
offset++; // -> offset[2]
|
||||
|
||||
// check for 4-bit repeat signal
|
||||
if ((irparams.rawlen == CDTV_RAW_REPEAT_LENGTH)
|
||||
&& MATCH_SPACE(results->rawbuf[offset], CDTV_RPT_SPACE)
|
||||
&& MATCH_MARK(results->rawbuf[offset+1], CDTV_BIT_MARK)) {
|
||||
results->bits = 4;
|
||||
results->value = 0xFFFFFF;
|
||||
results->decode_type = CDTV;
|
||||
return true;
|
||||
}
|
||||
|
||||
// check on minimal raw length for decoding the 24-bit signal correctly
|
||||
if (irparams.rawlen < CDTV_RAW_SIGNAL_LENGTH) {
|
||||
return false;
|
||||
}
|
||||
|
||||
// check header space
|
||||
if (!MATCH_SPACE(results->rawbuf[offset], CDTV_HDR_SPACE)) {
|
||||
return false;
|
||||
}
|
||||
offset++; // -> offset[3]
|
||||
|
||||
// build the data
|
||||
for (int i = 0; i < CDTV_BITS; i++) {
|
||||
// check if data mark is available; otherwise break
|
||||
if (!MATCH_MARK(results->rawbuf[offset], CDTV_BIT_MARK)) {
|
||||
return false;
|
||||
}
|
||||
offset++; // -> offset[4->28]
|
||||
// append this bit
|
||||
if (MATCH_SPACE(results->rawbuf[offset], CDTV_ONE_SPACE)) {
|
||||
data = (data << 1) | 1;
|
||||
} else if (MATCH_SPACE(results->rawbuf[offset], CDTV_ZERO_SPACE)) {
|
||||
data = (data << 1) | 0;
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
offset++;
|
||||
}
|
||||
|
||||
// validate checksum by comparing lower 12-bits with inverted higher 12-bits
|
||||
unsigned long lo = data & 0xFFF; // extract lower 12-bit
|
||||
unsigned long hi = data >> 12; // extract higher 12-bit
|
||||
|
||||
// success if (low XOR high == 0xFFF)
|
||||
if (lo^hi == 0xFFF) {
|
||||
results->bits = CDTV_BITS;
|
||||
results->value = data;
|
||||
results->decode_type = CDTV;
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
|
||||
}
|
||||
#endif
|
||||
Reference in New Issue
Block a user