Version 2.5.0: added SPEAKER protocol (IRMP)

[irmp.git] / irmpprotocols.h

diff --git a/irmpprotocols.h b/irmpprotocols.h
index f97a701dfbcd154f09e34ff575e93f04c87bba24..d029e3e2c9fc8832ec2629594f288635e70d8b06 100644 (file)
--- a/irmpprotocols.h
+++ b/irmpprotocols.h
@@ -5,7 +5,7 @@
  *\r
  * Copyright (c) 2013 Frank Meyer - frank(at)fli4l.de\r
  *\r
- * $Id: irmpprotocols.h,v 1.17 2014/02/20 14:55:17 fm Exp $\r
+ * $Id: irmpprotocols.h,v 1.22 2014/05/30 12:48:54 fm Exp $\r
  *\r
  * This program is free software; you can redistribute it and/or modify\r
  * it under the terms of the GNU General Public License as published by\r
@@ -63,8 +63,10 @@
 #define IRMP_RCMM32_PROTOCOL                    36              // Fujitsu-Siemens (Activy remote control)\r
 #define IRMP_RCMM24_PROTOCOL                    37              // Fujitsu-Siemens (Activy keyboard)\r
 #define IRMP_RCMM12_PROTOCOL                    38              // Fujitsu-Siemens (Activy keyboard)\r
+#define IRMP_SPEAKER_PROTOCOL                   39              // Another loudspeaker protocol, similar to Nubert\r
+#define IRMP_RADIO1_PROTOCOL                    40              // Radio protocol (devel status), do not use it yet!\r
 \r
-#define IRMP_N_PROTOCOLS                        38              // number of supported protocols\r
+#define IRMP_N_PROTOCOLS                        40              // number of supported protocols\r
 \r
 /*---------------------------------------------------------------------------------------------------------------------------------------------------\r
  * timing constants:\r
@@ -158,8 +160,8 @@ typedef uint8_t     PAUSE_LEN;
 #define SAMSUNG_START_BIT_PULSE_TIME            4500.0e-6                       // 4500 usec pulse\r
 #define SAMSUNG_START_BIT_PAUSE_TIME            4500.0e-6                       // 4500 usec pause\r
 #define SAMSUNG_PULSE_TIME                       550.0e-6                       //  550 usec pulse\r
-#define SAMSUNG_1_PAUSE_TIME                    1650.0e-6                       // 1650 usec pause\r
-#define SAMSUNG_0_PAUSE_TIME                     550.0e-6                       //  550 usec pause\r
+#define SAMSUNG_1_PAUSE_TIME                    1500.0e-6                       // 1550 usec pause\r
+#define SAMSUNG_0_PAUSE_TIME                     500.0e-6                       //  500 usec pause\r
 \r
 #define SAMSUNG_FRAME_REPEAT_PAUSE_TIME           25.0e-3                       // frame repeat after 25ms\r
 #define SAMSUNG_ADDRESS_OFFSET                   0                              // skip 0 bits\r
@@ -334,6 +336,28 @@ typedef uint8_t     PAUSE_LEN;
 #define NUBERT_LSB                              0                               // MSB?\r
 #define NUBERT_FLAGS                            0                               // flags\r
 \r
+/*---------------------------------------------------------------------------------------------------------------------------------------------------\r
+ * SPEAKER:\r
+ *---------------------------------------------------------------------------------------------------------------------------------------------------\r
+ */\r
+#define SPEAKER_START_BIT_PULSE_TIME             440.0e-6                       // 1340 usec pulse\r
+#define SPEAKER_START_BIT_PAUSE_TIME            1250.0e-6                       //  340 usec pause\r
+#define SPEAKER_1_PULSE_TIME                    1250.0e-6                       // 1340 usec pulse\r
+#define SPEAKER_1_PAUSE_TIME                     440.0e-6                       //  340 usec pause\r
+#define SPEAKER_0_PULSE_TIME                     440.0e-6                       //  500 usec pulse\r
+#define SPEAKER_0_PAUSE_TIME                    1250.0e-6                       // 1300 usec pause\r
+#define SPEAKER_FRAMES                          2                               // Nubert sends 2 frames\r
+#define SPEAKER_AUTO_REPETITION_PAUSE_TIME        35.0e-3                       // auto repetition after 35ms\r
+#define SPEAKER_FRAME_REPEAT_PAUSE_TIME           35.0e-3                       // frame repeat after 45ms\r
+#define SPEAKER_ADDRESS_OFFSET                  0                               // skip 0 bits\r
+#define SPEAKER_ADDRESS_LEN                     0                               // read 0 address bits\r
+#define SPEAKER_COMMAND_OFFSET                  0                               // skip 0 bits\r
+#define SPEAKER_COMMAND_LEN                     10                              // read 10 bits\r
+#define SPEAKER_COMPLETE_DATA_LEN               10                              // complete length\r
+#define SPEAKER_STOP_BIT                        1                               // has stop bit\r
+#define SPEAKER_LSB                             0                               // MSB?\r
+#define SPEAKER_FLAGS                           0                               // flags\r
+\r
 /*---------------------------------------------------------------------------------------------------------------------------------------------------\r
  * BANG_OLUFSEN:\r
  *---------------------------------------------------------------------------------------------------------------------------------------------------\r
@@ -405,12 +429,23 @@ typedef uint8_t     PAUSE_LEN;
  * SIEMENS & RUWIDO:\r
  *---------------------------------------------------------------------------------------------------------------------------------------------------\r
  */\r
+\r
+#if 0\r
 #define SIEMENS_OR_RUWIDO_START_BIT_PULSE_TIME    275.0e-6                      //  275 usec pulse\r
 #define SIEMENS_OR_RUWIDO_START_BIT_PAUSE_TIME    550.0e-6                      //  550 usec pause\r
 #define SIEMENS_OR_RUWIDO_BIT_PULSE_TIME          275.0e-6                      //  275 usec short pulse\r
 #define SIEMENS_OR_RUWIDO_BIT_PULSE_TIME_2        550.0e-6                      //  550 usec long pulse\r
 #define SIEMENS_OR_RUWIDO_BIT_PAUSE_TIME          275.0e-6                      //  275 usec short pause\r
 #define SIEMENS_OR_RUWIDO_BIT_PAUSE_TIME_2        550.0e-6                      //  550 usec long pause\r
+#else\r
+#define SIEMENS_OR_RUWIDO_START_BIT_PULSE_TIME    370.0e-6                      //  370 usec pulse\r
+#define SIEMENS_OR_RUWIDO_START_BIT_PAUSE_TIME    550.0e-6                      //  550 usec pause\r
+#define SIEMENS_OR_RUWIDO_BIT_PULSE_TIME          370.0e-6                      //  370 usec short pulse\r
+#define SIEMENS_OR_RUWIDO_BIT_PULSE_TIME_2        680.0e-6                      //  680 usec long pulse\r
+#define SIEMENS_OR_RUWIDO_BIT_PAUSE_TIME          275.0e-6                      //  275 usec short pause\r
+#define SIEMENS_OR_RUWIDO_BIT_PAUSE_TIME_2        550.0e-6                      //  550 usec long pause\r
+#endif\r
+\r
 #define SIEMENS_OR_RUWIDO_FRAME_REPEAT_PAUSE_TIME 45.0e-3                       // frame repeat after 45ms\r
 #define SIEMENS_OR_RUWIDO_STOP_BIT                0                             // has no stop bit\r
 #define SIEMENS_OR_RUWIDO_LSB                     0                             // MSB...LSB\r
@@ -694,8 +729,8 @@ typedef uint8_t     PAUSE_LEN;
 #define RCMM32_START_BIT_PAUSE_TIME              220.0e-6                       // 220 usec pause\r
 #define RCMM32_PULSE_TIME                        230.0e-6                       // 230 usec pulse\r
 #define RCMM32_00_PAUSE_TIME                     220.0e-6                       // 220 usec pause\r
-#define RCMM32_01_PAUSE_TIME                     380.0e-6                       // 380 usec pause\r
-#define RCMM32_10_PAUSE_TIME                     550.0e-6                       // 550 usec pause\r
+#define RCMM32_01_PAUSE_TIME                     370.0e-6                       // 370 usec pause\r
+#define RCMM32_10_PAUSE_TIME                     540.0e-6                       // 540 usec pause\r
 #define RCMM32_11_PAUSE_TIME                     720.0e-6                       // 720 usec pause\r
 \r
 #define RCMM32_FRAME_REPEAT_PAUSE_TIME            80.0e-3                       // frame repeat after 80 ms\r
@@ -708,6 +743,27 @@ typedef uint8_t     PAUSE_LEN;
 #define RCMM32_LSB                              0                               // LSB...MSB\r
 #define RCMM32_FLAGS                            0                               // flags\r
 \r
+/*---------------------------------------------------------------------------------------------------------------------------------------------------\r
+ * RADIO1 - e.g. Tevion\r
+ *---------------------------------------------------------------------------------------------------------------------------------------------------\r
+ */\r
+#define RADIO1_START_BIT_PULSE_TIME            3000.0e-6                       // 3000 usec pulse\r
+#define RADIO1_START_BIT_PAUSE_TIME            7000.0e-6                       // 7000 usec pulse\r
+#define RADIO1_0_PULSE_TIME                     500.0e-6                       //  500 usec pulse\r
+#define RADIO1_0_PAUSE_TIME                    1000.0e-6                       // 1000 usec pause\r
+#define RADIO1_1_PULSE_TIME                    1000.0e-6                       // 1000 usec pulse\r
+#define RADIO1_1_PAUSE_TIME                     500.0e-6                       //  500 usec pause\r
+\r
+#define RADIO1_FRAME_REPEAT_PAUSE_TIME           25.0e-3                       // frame repeat after 25ms\r
+#define RADIO1_ADDRESS_OFFSET                   4                              // skip 4 bits\r
+#define RADIO1_ADDRESS_LEN                     16                              // read 16 address bits\r
+#define RADIO1_COMMAND_OFFSET                  20                              // skip 4 + 16 bits\r
+#define RADIO1_COMMAND_LEN                      3                              // read 3 command bits\r
+#define RADIO1_COMPLETE_DATA_LEN               23                              // complete length\r
+#define RADIO1_STOP_BIT                        1                               // has stop bit\r
+#define RADIO1_LSB                             1                               // LSB...MSB?\r
+#define RADIO1_FLAGS                           0                               // flags\r
+\r
 /*---------------------------------------------------------------------------------------------------------------------------------------------------\r
  * Frame Repetitions:\r
  *---------------------------------------------------------------------------------------------------------------------------------------------------\r