From beda975f4477b6788b682aaf6695c8bbc2d33161 Mon Sep 17 00:00:00 2001
From: ukw
Date: Fri, 20 May 2011 09:32:31 +0000
Subject: version 1.9.3: added thomson protocol

git-svn-id: svn://mikrocontroller.net/irmp@71 aeb2e35e-bfc4-4214-b83c-9e8de998ed28
---
 irmpconfig.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'irmpconfig.h')

diff --git a/irmpconfig.h b/irmpconfig.h
index 43a423f..49502a6 100644
--- a/irmpconfig.h
+++ b/irmpconfig.h
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2009-2011 Frank Meyer - frank(at)fli4l.de
  *
- * $Id: irmpconfig.h,v 1.66 2011/04/20 09:09:48 fm Exp $
+ * $Id: irmpconfig.h,v 1.69 2011/05/20 09:31:25 fm Exp $
  *
  * ATMEGA88 @ 8 MHz
  *
@@ -67,8 +67,10 @@
 #define IRMP_SUPPORT_BANG_OLUFSEN_PROTOCOL      0       // Bang & Olufsen       >= 10000                 ~200 bytes
 #define IRMP_SUPPORT_RECS80_PROTOCOL            0       // RECS80 (SAA3004)     >= 15000                  ~50 bytes
 #define IRMP_SUPPORT_RECS80EXT_PROTOCOL         0       // RECS80EXT (SAA3008)  >= 15000                  ~50 bytes
+#define IRMP_SUPPORT_THOMSON_PROTOCOL           1       // Thomson              >= 10000                 ~250 bytes
 #define IRMP_SUPPORT_NIKON_PROTOCOL             0       // NIKON camera         >= 10000                 ~250 bytes
 #define IRMP_SUPPORT_NETBOX_PROTOCOL            0       // Netbox keyboard      >= 10000                 ~400 bytes (PROTOTYPE!)
+#define IRMP_SUPPORT_MERLIN_PROTOCOL            1       // Merlin keyboard      >= 10000                 ~400 bytes (PROTOTYPE!)
 #define IRMP_SUPPORT_IMON_PROTOCOL              0       // IMON keyboard        >= 10000                 ~400 bytes (PROTOTYPE!)
 #define IRMP_SUPPORT_FDC_PROTOCOL               0       // FDC3402 keyboard     >= 10000 (better 15000)  ~150 bytes (~400 in combination with RC5)
 #define IRMP_SUPPORT_RCCAR_PROTOCOL             0       // RC Car               >= 10000 (better 15000)  ~150 bytes (~500 in combination with RC5)
-- 
cgit v1.2.3