diff options
| author | ukw | 2015-01-19 11:04:00 +0000 |
|---|---|---|
| committer | ukw | 2015-01-19 11:04:00 +0000 |
| commit | 061e654cba197b09f58c6297e7d76d4527742885 (patch) | |
| tree | c9f1cb9a4075fbfb3fb6ed114c6b002903025c65 /irmpconfig.h | |
| parent | 7a0f3214a21aaa500521005adbadb0fa77da8fe5 (diff) | |
| download | irmp-061e654cba197b09f58c6297e7d76d4527742885.zip | |
Version 2.6.8: added merlin protocol
git-svn-id: svn://mikrocontroller.net/irmp@151 aeb2e35e-bfc4-4214-b83c-9e8de998ed28
Diffstat (limited to 'irmpconfig.h')
| -rw-r--r-- | irmpconfig.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/irmpconfig.h b/irmpconfig.h index 6239e83..73b06db 100644 --- a/irmpconfig.h +++ b/irmpconfig.h @@ -6,7 +6,7 @@ * Copyright (c) 2009-2014 Frank Meyer - frank(at)fli4l.de
* Extensions for PIC 12F1820 W.Strobl 2014-07-20
*
- * $Id: irmpconfig.h,v 1.121 2014/09/15 12:36:28 fm Exp $
+ * $Id: irmpconfig.h,v 1.123 2015/01/19 10:54:37 fm Exp $
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -90,6 +90,7 @@ #define IRMP_SUPPORT_RCMM_PROTOCOL 0 // RCMM 12,24, or 32 >= 20000 ~150 bytes
#define IRMP_SUPPORT_LGAIR_PROTOCOL 0 // LG Air Condition >= 10000 ~300 bytes
#define IRMP_SUPPORT_SAMSUNG48_PROTOCOL 0 // Samsung48 >= 10000 ~100 bytes (SAMSUNG must be enabled!)
+#define IRMP_SUPPORT_MERLIN_PROTOCOL 0 // Merlin >= 15000 (better 20000) ~300 bytes
#define IRMP_SUPPORT_RADIO1_PROTOCOL 0 // RADIO, e.g. TEVION >= 10000 ~250 bytes (experimental)
/*---------------------------------------------------------------------------------------------------------------------------------------------------
|