summaryrefslogtreecommitdiff
path: root/irmp.h
diff options
context:
space:
mode:
authorukw2012-02-24 14:25:32 +0000
committerukw2012-02-24 14:25:32 +0000
commita48187fa5b6eeab9fdfbcbc8f09d8e0127bd1e73 (patch)
tree709734fffa63386077ecd9312c5707cc844f8aac /irmp.h
parentf60c464437d9976037876933079a7a2e1792bfb8 (diff)
downloadirmp-a48187fa5b6eeab9fdfbcbc8f09d8e0127bd1e73.zip
Version 2.1.2:
- added IR60 protocol for IRSND git-svn-id: svn://mikrocontroller.net/irmp@91 aeb2e35e-bfc4-4214-b83c-9e8de998ed28
Diffstat (limited to 'irmp.h')
-rw-r--r--irmp.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/irmp.h b/irmp.h
index f7a3b25..1e54f2c 100644
--- a/irmp.h
+++ b/irmp.h
@@ -3,7 +3,7 @@
*
* Copyright (c) 2009-2011 Frank Meyer - frank(at)fli4l.de
*
- * $Id: irmp.h,v 1.71 2012/02/24 11:40:41 fm Exp $
+ * $Id: irmp.h,v 1.72 2012/02/24 14:24:27 fm Exp $
*
* ATMEGA88 @ 8 MHz
*
@@ -311,7 +311,7 @@ typedef uint8_t PAUSE_LEN;
#define GRUNDIG_NOKIA_IR60_FLAGS (IRMP_PARAM_FLAG_IS_MANCHESTER | IRMP_PARAM_FLAG_1ST_PULSE_IS_1) // flags
#define GRUNDIG_FRAMES 2 // GRUNDIG sends each frame 1+1 times
-#define GRUNDIG_AUTO_REPETITION_PAUSE_TIME 20.0e-3 // repetition after 20ms
+#define GRUNDIG_AUTO_REPETITION_PAUSE_TIME 20.0e-3 // repetition after 20ms
#define GRUNDIG_ADDRESS_OFFSET 0 // no address
#define GRUNDIG_ADDRESS_LEN 0 // no address
#define GRUNDIG_COMMAND_OFFSET 1 // skip 1 start bit
@@ -319,13 +319,15 @@ typedef uint8_t PAUSE_LEN;
#define GRUNDIG_COMPLETE_DATA_LEN 10 // complete length: 1 start bit + 9 data bits
#define NOKIA_FRAMES 3 // NOKIA sends each frame 1 + 1 + 1 times
-#define NOKIA_AUTO_REPETITION_PAUSE_TIME 20.0e-3 // repetition after 20ms
+#define NOKIA_AUTO_REPETITION_PAUSE_TIME 20.0e-3 // repetition after 20ms
#define NOKIA_ADDRESS_OFFSET 9 // skip 9 bits (1 start bit + 8 data bits)
#define NOKIA_ADDRESS_LEN 8 // 7 address bits
#define NOKIA_COMMAND_OFFSET 1 // skip 1 bit (1 start bit)
#define NOKIA_COMMAND_LEN 8 // read 8 command bits
#define NOKIA_COMPLETE_DATA_LEN 17 // complete length: 1 start bit + 8 address bits + 8 command bits
+#define IR60_FRAMES 2 // IR60 sends each frame 1+1 times
+#define IR60_AUTO_REPETITION_PAUSE_TIME 22.2e-3 // repetition after 22.2ms
#define IR60_TIMEOUT_TIME 5000.0e-6 // timeout grundig frame, switch to IR60
#define IR60_ADDRESS_OFFSET 0 // skip 1 bits
#define IR60_ADDRESS_LEN 0 // read 0 address bits