Skip to content

Commit 822bc3b

Browse files
author
Matthias Neeracher
committed
Add declarations for RC-MM protocol (which I had misnamed before)
1 parent 3bcccad commit 822bc3b

File tree

2 files changed

+11
-16
lines changed

2 files changed

+11
-16
lines changed

IRremote.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
*
1111
* JVC and Panasonic protocol added by Kristian Lauszus (Thanks to zenwheel and other people at the original blog post)
1212
*
13-
* Protocol for Cisco 8685DVB added by Matthias Neeracher.
13+
* RCMM protocol added by Matthias Neeracher.
1414
*/
1515

1616
#ifndef IRremote_h
@@ -22,7 +22,7 @@
2222
// TEST must be defined for the IRtest unittests to work. It will make some
2323
// methods virtual, which will be slightly slower, which is why it is optional.
2424
// #define DEBUG
25-
// #define TEST
25+
#define TEST
2626

2727
// Results returned from the decoder
2828
class decode_results {
@@ -44,7 +44,7 @@ class decode_results {
4444
#define SHARP 6
4545
#define PANASONIC 7
4646
#define JVC 8
47-
#define CISCO 9
47+
#define RCMM 9
4848
#define UNKNOWN -1
4949

5050
// Decoded value for NEC when a repeat code is received
@@ -68,7 +68,7 @@ class IRrecv
6868
long decodeRC6(decode_results *results);
6969
long decodePanasonic(decode_results *results);
7070
long decodeJVC(decode_results *results);
71-
long decodeCisco(decode_results *results);
71+
long decodeRCMM(decode_results *results);
7272
long decodeHash(decode_results *results);
7373
int compare(unsigned int oldval, unsigned int newval);
7474

@@ -95,7 +95,7 @@ class IRsend
9595
void sendSharp(unsigned long data, int nbits);
9696
void sendPanasonic(unsigned int address, unsigned long data);
9797
void sendJVC(unsigned long data, int nbits, int repeat); // *Note instead of sending the REPEAT constant if you want the JVC repeat signal sent, send the original code value and change the repeat argument from 0 to 1. JVC protocol repeats by skipping the header NOT by sending a separate code value like NEC does.
98-
void sendCisco(unsigned long data, int nbits);
98+
void sendRCMM(unsigned long data, int nbits);
9999
// private:
100100
void enableIROut(int khz);
101101
VIRTUAL void mark(int usec);

IRremoteInt.h

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -136,13 +136,10 @@
136136
#define JVC_ZERO_SPACE 550
137137
#define JVC_RPT_LENGTH 60000
138138

139-
#define CISCO_HDR_MARK 450
140-
#define CISCO_HDR_SPACE 210
141-
#define CISCO_MARK 210
142-
#define CISCO_00_SPACE 220
143-
#define CISCO_01_SPACE 380
144-
#define CISCO_10_SPACE 540
145-
#define CISCO_11_SPACE 700
139+
#define RCMM_HDR_MARK 417
140+
#define RCMM_MARK 149 // Protocol says 167, but in practice we often seem to be short
141+
#define RCMM_SPACE 277
142+
#define RCMM_INCREMENT 167
146143

147144
#define SHARP_BITS 15
148145
#define DISH_BITS 16
@@ -188,17 +185,15 @@ extern volatile irparams_t irparams;
188185
#define MARK 0
189186
#define SPACE 1
190187

191-
#define TOPBIT 0x80000000
188+
#define TOPBIT 0x80000000
192189

193190
#define NEC_BITS 32
194191
#define SONY_BITS 12
195192
#define MIN_RC5_SAMPLES 11
196193
#define MIN_RC6_SAMPLES 1
197194
#define PANASONIC_BITS 48
198195
#define JVC_BITS 16
199-
200-
201-
196+
#define RCMM_BITS 12
202197

203198
// defines for timer2 (8 bits)
204199
#if defined(IR_USE_TIMER2)

0 commit comments

Comments
 (0)