Version 1.4.0: Added Grundig + Nokia protocol

git-svn-id: svn://mikrocontroller.net/irmp@15 aeb2e35e-bfc4-4214-b83c-9e8de998ed28

diff --git a/IR-Data/Dbox.txt b/IR-Data/Dbox.txt
new file mode 100644 (file)
index 0000000..b4f7199
--- /dev/null
+++ b/IR-Data/Dbox.txt
@@ -0,0 +1,52 @@
+# Power\r
+00000111111111111111111111111100000111111111100000000001111100000111110000011111000001111100000111110000011111000001111000000111100000011110000001111000000111100000011110000001111000000111100000011111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111000000111111111111111111111111000001111111111000001111100000000001111100000111111111100000111110000011111000001111100000111110000011111000000000011111000001111100000111111111100000000001111111111000001111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111000001111111111111111111111111000001111111111000000000011111000001111100000111110000011111000001111000000111100000011110000001111000000111100000011110000001111000000111100000011110000001111000000111111111111111111111\r
+# 1\r
+00000011111111111111111111111100000011111111100000000000111100000011110000001111000000111100000011110000001111000000111100000011110000001111000000111100000011110000011111000001111100000111110000011111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111100000111111111111111111111111100000111110000011111111110000011111000001111100000111110000011111000001111100000111110000011111000001111100000000001111100000111110000011111111110000000000111111111000000111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111000000111111111111111111111111000000111111111000000000001111000000111100000011110000001111000000111100000011110000001111000000111100000111110000011111000001111100000111110000011111000001111100000111111111111111111111\r
+# 2\r
+00000111111111111111111111111100000111111111100000000001111100000111110000011111000001111100000111110000011110000001111000000111100000011110000001111000000111100000011110000001111000000111100000011111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111000000111111111111111111111111000001111111111000000000011111111110000011111000001111100000111110000011111000001111100000111110000011111000000000011111000001111100000111111111100000000001111111111000001111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111000001111111111111111111111111000001111111111000000000011111000001111100000111110000011110000001111000000111100000011110000001111000000111100000011110000001111000000111100000011110000001111000000111111111111111111111\r
+# 3\r
+00000111111111111111111111111100000111111111100000000001111100000111110000011111000001111100000111110000011111000001111100000111110000011111000001111100000111100000011110000001111000000111100000011111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111000000111111111111111111111111000000111100000011110000001111111110000011111000001111100000111110000011111000001111100000111110000011111000000000011111000001111100000111111111100000000001111111111000001111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111000001111111111111111111111111000001111111111000000000011111000001111100000111110000011111000001111100000111110000011111000001111100000111100000011110000001111000000111100000011110000001111000000111111111111111111111\r
+# HOME\r
+0000001111111111111111111111110000001111111110000000000011110000001111000000111100000011110000011111000001111100000111110000011111000001111100000111110000011111000001111100000111110000011111000001111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111110000011111111111111111111111110000011111111110000011111000001111100000111110000011111000000000011111111110000011110000001111000000111100000000000111100000011110000001111111110000000000011111111100000011111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111110000011111111111111111111111100000011111111100000011110000001111000000111100000011110000000000011111111100000011110000001111000000111100000000001111100000111110000011111111110000000000111111111100000111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111100000111111111111111111111111100000111111111100000000001111100000111110000011111000001111100000111110000011111000001111100000111110000011111000001111100000111110000011111000001111100000111110000011111111111111111\r
+# 4\r
+000001111111111111111111111111000001111111111000000000011111000001111100000111110000011111000001111100000111110000011111000001111100000111110000011111000001111100000111110000011111000001111100000111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111110000001111111111111111111111110000001111111110000001111000000000001111111110000001111000000111100000011110000001111000001111100000111110000000000111110000011111000001111111111000000000011111111110000011111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111110000001111111111111111111111110000011111111110000011111000000000011111111110000011111000001111100000111110000011111000001111100000111110000000000111110000011111000001111111111000000000011111111110000011111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111100000011111111111111111111111110000011111111110000000000111100000011110000001111000000111100000011110000001111000000111100000011110000001111000000111100000011110000001111000000111100000011110000001111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111\r
+# 5\r
+0000011111111111111111111111110000011111111110000000000111110000011111000001111100000111110000011111000001111100000111110000011111000001111100000111110000011110000001111000000111100000011110000001111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111100000011111111111111111111111100000011110000001111111110000000000111111111100000111110000011111000001111100000111110000011111000001111100000000001111100000111110000011111111110000000000111111111100000111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111100000111111111111111111111111100000111110000011111111110000000000111111111100000111110000011111000001111100000111110000011111000001111100000000001111100000111110000011111111110000000000111111111000000111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111000000111111111111111111111111000000111111111000000000001111000000111100000011110000001111000000111100000011110000001111000000111100000011110000001111000001111100000111110000011111000001111100000111111111111111111\r
+# 6\r
+0000001111111111111111111111110000001111111110000000000011110000001111000000111100000011110000001111000000111100000011110000001111000000111100000111110000011111000001111100000111110000011111000001111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111110000011111111111111111111111110000011111111110000000000111110000011111111110000011111000001111100000111110000011111000001111100000111110000000000111110000011110000001111111110000000000011111111100000011111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111100000011111111111111111111111110000011111111100000000000111100000011111111100000011110000001111000000111100000011110000001111000000111100000000000111100000011110000001111111110000000000011111111100000111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111100000011111111111111111111111100000111111111100000000001111100000111110000011111000001111100000111110000011111000001111100000111110000011111000001111100000111110000011111000001111100000111110000011111111111111111\r
+# EXIT\r
+00000111111111111111111111111100000111111111100000000001111100000111110000011111000001111100000111110000011111000001111000000111100000011110000001111000000111100000011110000001111000000111100000011111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111000000111111111111111111111111000001111100000111110000011111000001111111111000001111100000000001111111111000001111100000111110000011111000000000011111000001111100000111111111100000000001111111111000001111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111000001111111111111111111111111000001111111111000000000011111000001111100000111110000011110000001111000000111100000011110000001111000000111100000011110000001111000000111100000011110000001111000000111111111111111111111\r
+# 7\r
+0000011111111111111111111111110000011111111110000000000111110000011111000001111100000111110000011111000001111100000111110000011111000001111100000111110000011110000001111000000111100000011110000001111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111100000011111111111111111111111100000011110000001111000000111100000111111111100000111110000011111000001111100000111110000011111000001111100000000001111100000111110000011111111110000000000111111111100000111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111100000111111111111111111111111100000111110000011111000001111100000111111111100000111110000011111000001111100000111110000011111000001111100000000001111100000111110000011111111110000000000111111111000000111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111000000111111111111111111111111000000111111111000000000001111000000111100000011110000001111000000111100000011110000001111000000111100000011110000001111000001111100000111110000011111000001111100000111111111111111111\r
+# 8\r
+00000011111111111111111111111110000011111111110000000000111100000011110000001111000000111100000011110000001111000000111100000011110000001111000000111100000011110000001111000000111100000011110000001111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111100000111111111111111111111111100000111111111100000111110000011111000000000011111111110000011111000001111100000111110000011111000001111100000000001111100000111110000011111111110000000000111111111100000111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111000000111111111111111111111111000000111111111000000000001111000000111100000011110000001111000000111100000011110000001111000000111100000011110000001111000000111100000011110000001111000001111100000111111111111111111111\r
+# 9\r
+0000011111111111111111111111100000011111111100000000000111100000011110000001111000000111100000011110000001111000000111100000011110000001111000000111100000111110000011111000001111100000111110000011111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111100000111111111111111111111111100000111110000011111111110000011111000000000011111111110000011111000001111100000111110000011111000001111100000000001111100000111100000011111111100000000000111111111000000111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111000000111111111111111111111111100000111100000011111111100000011110000000000011111111100000011110000001111000000111100000011110000001111000000000001111000000111100000011111111100000000000111111111000001111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111000000111111111111111111111111000001111111111000000000011111000001111100000111110000011111000001111100000111110000011111000001111100000111110000011111000001111100000111110000011111000001111100000111111111111111111\r
+# 0\r
+0000001111111111111111111111110000001111111110000000000011110000001111000000111100000011110000001111000000111100000011110000001111000000111100000011110000011111000001111100000111110000011111000001111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111110000011111111111111111111111110000011111111110000011111000001111100000111110000011111000001111100000111110000011111000001111100000111110000000000111110000011111000001111111110000000000011111111100000011111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111110000011111111111111111111111110000011111111100000011110000001111000000111100000011110000001111000000111100000011110000001111000000111100000000000111100000011110000001111111110000000000011111111100000111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111100000011111111111111111111111100000111111111100000000001111100000111110000011111000001111100000111110000011111000001111100000111110000011111000001111100000111110000011111000001111100000111110000011111111111111111\r
+# Rot\r
+0000001111111111111111111111110000011111111110000000000111110000011111000001111100000111110000011111000001111100000111110000011111000001111100000111110000011111000001111100000111110000011111000001111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111100000011111111111111111111111110000011110000001111111110000000000011110000001111111110000000000011111111100000011110000001111000000111100000000000111100000011110000001111111110000000000111111111100000111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111100000011111111111111111111111100000011110000001111111110000000000111110000011111111110000000000111111111100000111110000011111000001111100000000001111100000111110000011111111110000000000111111111100000111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111100000111111111111111111111111100000111111111100000000001111100000111110000011111000001111100000111110000011111000001111100000111100000011110000001111000000111100000011110000001111000000111100000011111111111111111\r
+# Grün\r
+00000011111111111111111111111100000111111111100000000001111100000111110000011111000001111100000111110000011111000001111100000111110000011111000001111100000111110000011111000001111100000111110000011111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111000000111111111111111111111111000000111100000011111111100000000000111111111000000000001111111110000000000011111111100000011110000001111000000000001111000000111100000111111111100000000001111111111000001111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111000001111111111111111111111111000001111111111000000000011111000001111100000111110000011111000001111100000111110000011111000001111100000111110000011111000001111100000111110000011111000001111100000111111111111111111111\r
+# Gelb\r
+00000111111111111111111111111100000111111111100000000001111100000111110000011111000001111100000111110000011111000001111100000111110000011111000001111100000111110000011110000001111000000111100000011111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111000000111111111111111111111111000000111111111000000000001111111110000001111000000000011111111110000000000111111111100000111110000011111000000000011111000001111100000111111111100000000001111111111000001111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111110011111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111000001111111111111111111111111000001111111111000000000011111000001111100000111110000011111000001111100000111110000011111000001111100000111110000011110000001111000000111100000011110000001111000000111111111111111111111\r
+# Blau\r
+00000011111111111111111111111100000011111111100000000000111100000011110000001111000001111100000111110000011111000001111100000111110000011111000001111100000111110000011111000001111100000111110000011111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111100000111111111111111111111111100000111110000011111000001111111111000000000011111000001111100000111111111000000111100000011110000001111000000000001111000000111100000011111111100000000000111111111000000111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111000000111111111111111111111111000000111111111000000000011111000001111100000111110000011111000001111100000111110000011111000001111100000111110000011111000001111100000111110000011111000001111100000111111111111111111111\r
+# Hoch\r
+0000011111111111111111111111110000011111111110000000000111110000011111000001111100000111100000011110000001111000000111100000011110000001111000000111100000011110000001111000000111100000011110000001111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111100000011111111111111111111111100000111111111100000000001111100000111110000011111111110000011111000001111100000111110000011111000001111100000000001111100000111110000011111111110000000000111111111100000111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111100000111111111111111111111111100000111111111100000000001111100000111110000011111111110000011111000001111100000111110000011111000001111000000000001111000000111100000011111111100000000000111111111000000111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111000000111111111111111111111111000000111111111000000000001111000000111100000011110000001111000001111100000111110000011111000001111100000111110000011111000001111100000111110000011111000001111100000111111111111111111\r
+# Links\r
+00000111111111111111111111111100000111111111100000000001111100000111110000011111000001111100000111110000011111000001111100000111110000011111000001111100000111110000011111000001111100000111110000011111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111000000111111111111111111111111000000111100000011110000001111000000111100000011111111100000000000111111111000000111100000011110000011111000000000011111000001111100000111111111100000000001111111111000001111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111000000111111111111111111111111000001111111111000000000011111000001111100000111110000011111000001111100000111110000011111000001111100000111110000011111000001111100000111110000011111000001111100000111111111111111111111\r
+# OK\r
+0000001111111111111111111111110000001111111110000000000011110000001111000000111100000011110000001111000000111100000011110000001111000001111100000111110000011111000001111100000111110000011111000001111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111110000011111111111111111111111110000011111111110000011111000001111100000111110000000000111110000011111111110000011111000001111100000111110000000000111100000011110000001111111110000000000011111111100000011111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111110000011111111111111111111111100000011111111100000011110000001111000000111100000000000111100000011111111100000011110000001111000000111100000000000111100000011110000001111111110000000000111111111100000111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111100000011111111111111111111111100000111111111100000000001111100000111110000011111000001111100000111110000011111000001111100000111110000011111000001111100000111110000011111000001111100000111110000011111111111111111\r
+# Rechts\r
+0000011111111111111111111111110000011111111110000000000111110000011111000001111100000111110000011110000001111000000111100000011110000001111000000111100000011110000001111000000111100000011110000001111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111100000011111111111111111111111100000111111111100000000001111100000111110000011111111110000000000111111111100000111110000011111000001111100000000001111100000111110000011111111110000000000111111111100000111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111100000111111111111111111111111100000111111111100000000001111100000111110000011111111110000000000111111111100000111110000011111000001111100000000001111000000111100000011111111100000000000111111111000000111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111000000111111111111111111111111000000111111111000000000001111000000111100000011110000001111000000111100000111110000011111000001111100000111110000011111000001111100000111110000011111000001111100000111111111111111111\r
+# Runter\r
+0000001111111111111111111111110000011111111110000000000111110000011111000001111100000111110000011111000001111100000111110000011111000001111100000111110000011111000001111100000111110000011111000001111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111100000011111111111111111111111110000011110000001111000000111100000011110000001111111110000001111000000111100000011110000001111000000111100000000000111100000011110000001111111110000000000011111111100000111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111100000011111111111111111111111100000011110000001111000000111100000111110000011111111110000011111000001111100000111110000011111000001111100000000001111100000111110000011111111110000000000111111111100000111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111100000111111111111111111111111100000111111111100000000001111100000111110000011111000001111100000111110000011111000001111100000111100000011110000001111000000111100000011110000001111000000111100000011111111111111111\r
+# Lauter\r
+0000001111111111111111111111110000011111111110000000000111110000011111000001111100000111110000011111000001111100000111110000011111000001111100000111110000011111000001111100000111110000011111000001111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111100000011111111111111111111111100000011111111100000000000111100000011111111100000000000111111111000000111100000011110000001111000000111100000000001111100000111110000011111111110000000000111111111100000111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111100000011111111111111111111111100000111111111100000000001111100000111111111100000000001111111111000001111100000111110000011111000001111100000000001111100000111110000011111111110000000000111111111100000111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111100000111111111111111111111111100000111111111100000000001111100000111110000011111000001111000000111100000011110000001111000000111100000011110000001111000000111100000011110000001111000000111100000011111111111111111\r
+# Leiser\r
+0000011111111111111111111111110000011111111110000000000111110000011111000001111100000111110000011111000001111100000111110000011111000001111100000111110000011111000001111100000111110000011111000001111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111100000011111111111111111111111100000011110000001111000000111100000011111111100000000000111111111000000111100000111110000011111000001111100000000001111100000111110000011111111110000000000111111111100000111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111100000011111111111111111111111100000111110000011111000001111100000111111111100000000001111111111000001111100000111110000011111000001111100000000001111100000111110000011111111110000000000111111111100000111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111100000111111111111111111111111100000111111111100000000001111000000111100000011110000001111000000111100000011110000001111000000111100000011110000001111000000111100000011110000001111000000111100000011111111111111111\r
+# Mute\r
+0000011111111111111111111111110000011111111110000000000111110000011111000001111100000111110000011111000001111100000111110000011111000001111100000111110000011111000001111100000111110000011110000001111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111100000011111111111111111111111100000011111111100000011110000001111000000000001111111110000000000011111111100000111110000011111000001111100000000001111100000111110000011111111110000000000111111111100000111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111100000011111111111111111111111100000111111111100000111110000011111000000000011111111110000000000111111111100000111110000011111000001111100000000001111100000111110000011111111110000000000111111111100000111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111000000111111111111111111111111100000111111111000000000001111000000111100000011110000001111000000111100000011110000001111000000111100000011110000001111000000111100000011110000001111000000111100000111111111111111111\r
+# Info\r
+0000001111111111111111111111110000011111111110000000000111110000011111000001111100000111110000011111000001111100000111110000011111000001111100000111110000011111000001111100000111110000011111000001111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111100000011111111111111111111111110000011111111100000000000111111111000000111100000011110000001111000000111100000000000111111111000000111100000000000111100000011110000001111111110000000000011111111100000111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111100000011111111111111111111111100000011111111100000000000111111111000000111100000111110000011111000001111100000000001111111111000001111100000000001111100000111110000011111111110000000000111111111100000111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111100000111111111111111111111111100000111111111100000000001111100000111110000011111000001111100000111110000011111000001111100000111110000011111000001111000000111100000011110000001111000000111100000011111111111111111\r

diff --git a/IR-Data/Nokia.txt b/IR-Data/Nokia.txt
new file mode 100644 (file)
index 0000000..346559d
--- /dev/null
+++ b/IR-Data/Nokia.txt
@@ -0,0 +1 @@
+0000001111111111111111111111110000001111111110000000000111110000011111000001111100000111110000011111000001111100000111110000011111000001111100000111110000011111000001111100000111110000011111000001111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111100000111111111111111111111111100000111110000011111111110000011111000001111100000111110000011111000001111100000111110000011111000001111100000000001111100000111110000011111000001111100000111111111100000111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111000000111111111111111111111111000000111111111000000000011111000001111100000111110000011111000001111100000111110000011111000001111100000111110000011111000001111100000111110000011111000001111100000111111111111111111111\r

diff --git a/IR-Data/test-suite.sh b/IR-Data/test-suite.sh
index 5891ae64d4fc40c8daf0a18ad104a9db05cc5119..f4b192ade4c3dce0bdd90b13a8f1861dc9821b36 100644 (file)
--- a/IR-Data/test-suite.sh
+++ b/IR-Data/test-suite.sh
@@ -1,10 +1,24 @@
 #! /bin/sh\r
 #! /bin/sh\r

+#----------------------------------------------------------------------------\r
+# test suite for IRMP\r
+#\r
+# usage:\r
+#\r
+#        ./test-suite.sh\r
+#\r
+# Copyright (c) 2010 Frank Meyer - frank(at)fli4l.de\r
+#\r
+# $Id: test-suite.sh,v 1.6 2010/05/25 14:44:41 fm Exp $\r
+#----------------------------------------------------------------------------\r
+\r

 for j in                            \\r
 for j in                            \\r

+    Dbox.txt                        \\r

     DK_Digital.txt                  \\r
     Grundig_TP715.txt               \\r
     Grundig_TP715_SatTV.txt         \\r
     Grundig_TP715_Video.txt         \\r
     Matsushita.txt                  \\r
     DK_Digital.txt                  \\r
     Grundig_TP715.txt               \\r
     Grundig_TP715_SatTV.txt         \\r
     Grundig_TP715_Video.txt         \\r
     Matsushita.txt                  \\r

+    Nokia.txt                       \\r

     Panasonic-Blue-Ray.txt          \\r
     RC5-Taste.txt                   \\r
     Samsung_DVD_Rec_00062C.txt      \\r
     Panasonic-Blue-Ray.txt          \\r
     RC5-Taste.txt                   \\r
     Samsung_DVD_Rec_00062C.txt      \\r

diff --git a/README.txt b/README.txt
index b6bab6a1b89267e7737c7fa47b2f837ed76c4aa2..ef53ab816a208759845fc8d7ed2c0d18d55af493 100644 (file)
--- a/README.txt
+++ b/README.txt
@@ -1,8 +1,8 @@
 IRMP - Infrared Multi Protocol Decoder\r
 --------------------------------------\r
 \r
 IRMP - Infrared Multi Protocol Decoder\r
 --------------------------------------\r
 \r

-Version IRMP:  1.3.1  17.05.2010\r
-Version IRSND: 1.3.1  17.05.2010\r
+Version IRMP:  1.4.0  26.05.2010\r
+Version IRSND: 1.4.0  26.05.2010\r

 \r
 Dokumentation:\r
  \r
 \r
 Dokumentation:\r
  \r

diff --git a/irmp.c b/irmp.c
index f4e2ef7c628db18348106dfa06143eb494b26ffe..74aa156a06b50898d0587d50de7e6ca3cbc706ab 100644 (file)
--- a/irmp.c
+++ b/irmp.c
@@ -3,7 +3,7 @@
  *\r
  * Copyright (c) 2009-2010 Frank Meyer - frank(at)fli4l.de\r
  *\r
  *\r
  * Copyright (c) 2009-2010 Frank Meyer - frank(at)fli4l.de\r
  *\r

- * $Id: irmp.c,v 1.25 2010/05/17 10:31:43 fm Exp $\r
+ * $Id: irmp.c,v 1.31 2010/05/26 08:34:30 fm Exp $\r

  *\r
  * ATMEGA88 @ 8 MHz\r
  *\r
  *\r
  * ATMEGA88 @ 8 MHz\r
  *\r


@@ -23,7 +23,8 @@
  * NUBERT     - Nubert Subwoofer System\r
  * B&O        - Bang & Olufsen\r
  * PANASONIC  - Panasonic (older, yet not implemented)\r
  * NUBERT     - Nubert Subwoofer System\r
  * B&O        - Bang & Olufsen\r
  * PANASONIC  - Panasonic (older, yet not implemented)\r

- * Grundig    - Grundig\r
+ * GRUNDIG    - Grundig\r
+ * NOKIA      - Nokia\r

  *\r
  *---------------------------------------------------------------------------------------------------------------------------------------------------\r
  *\r
  *\r
  *---------------------------------------------------------------------------------------------------------------------------------------------------\r
  *\r


@@ -209,14 +210,16 @@
  *\r
  *---------------------------------------------------------------------------------------------------------------------------------------------------\r
  *\r
  *\r
  *---------------------------------------------------------------------------------------------------------------------------------------------------\r
  *\r

- *   Grundig\r
+ *   GRUNDIG\r

  *   -------\r
  *\r
  *   -------\r
  *\r

- *   frame:  1 start packet + n info packets + 1 stop packet\r
- *   packet: 1 pre bit + 1 start bit + 9 data bits + no stop bit\r
- *   data of start packet:   9 x 1\r
- *   data of info  packet:   9 command bits\r
- *   data of stop  packet:   9 x 1\r
+ *   packet:  1 start frame + 19,968ms pause + N info frames + 117,76ms pause + 1 stop frame\r
+ *   frame: 1 pre bit + 1 start bit + 9 data bits + no stop bit\r
+ *   pause between info frames: 117,76ms\r
+ *\r
+ *   data of start frame:   9 x 1\r
+ *   data of info  frame:   9 command bits\r
+ *   data of stop  frame:   9 x 1\r

  *\r
  *   pre bit:              start bit           data "0":            data "1":\r
  *   ------____________    ------______        ______------         ------______             \r
  *\r
  *   pre bit:              start bit           data "0":            data "1":\r
  *   ------____________    ------______        ______------         ------______             \r


@@ -224,6 +227,14 @@
  *\r
  *---------------------------------------------------------------------------------------------------------------------------------------------------\r
  *\r
  *\r
  *---------------------------------------------------------------------------------------------------------------------------------------------------\r
  *\r

+ *   NOKIA:\r
+ *   ------\r
+ *\r
+ *   Timing similar to Grundig, but 16 data bits:\r
+ *   frame: 1 pre bit + 1 start bit + 8 command bits + 8 address bits + no stop bit\r
+ *\r
+ *---------------------------------------------------------------------------------------------------------------------------------------------------\r
+ *\r

  *   PANASONIC (older protocol, yet not implemented, see also MATSUSHITA, timing very similar)\r
  *   -----------------------------------------------------------------------------------------\r
  *\r
  *   PANASONIC (older protocol, yet not implemented, see also MATSUSHITA, timing very similar)\r
  *   -----------------------------------------------------------------------------------------\r
  *\r


@@ -304,9 +315,15 @@ typedef unsigned int16  uint16_t;
 #include "irmp.h"\r
 #include "irmpconfig.h"\r
 \r
 #include "irmp.h"\r
 #include "irmpconfig.h"\r
 \r

+#if IRMP_SUPPORT_GRUNDIG_PROTOCOL == 1 || IRMP_SUPPORT_NOKIA_PROTOCOL == 1\r
+#define IRMP_SUPPORT_GRUNDIG_OR_NOKIA_PROTOCOL  1\r
+#else\r
+#define IRMP_SUPPORT_GRUNDIG_OR_NOKIA_PROTOCOL  0\r
+#endif\r
+\r

 #define IRMP_TIMEOUT_TIME                       16500.0e-6                    // timeout after 16.5 ms darkness\r
 #define IRMP_TIMEOUT_LEN                        (uint8_t)(F_INTERRUPTS * IRMP_TIMEOUT_TIME + 0.5)\r
 #define IRMP_TIMEOUT_TIME                       16500.0e-6                    // timeout after 16.5 ms darkness\r
 #define IRMP_TIMEOUT_LEN                        (uint8_t)(F_INTERRUPTS * IRMP_TIMEOUT_TIME + 0.5)\r

-#define IRMP_REPETITION_TIME                    (uint16_t)(F_INTERRUPTS * 100.0e-3 + 0.5)  // autodetect key repetition within 100 msec\r
+#define IRMP_KEY_REPETITION_LEN                 (uint16_t)(F_INTERRUPTS * 150.0e-3 + 0.5)  // autodetect key repetition within 150 msec\r

 \r
 #define MIN_TOLERANCE_00                        1.0                           // -0%\r
 #define MAX_TOLERANCE_00                        1.0                           // +0%\r
 \r
 #define MIN_TOLERANCE_00                        1.0                           // -0%\r
 #define MAX_TOLERANCE_00                        1.0                           // +0%\r


@@ -403,10 +420,10 @@ typedef unsigned int16  uint16_t;
 #define RECS80_0_PAUSE_LEN_MIN                  ((uint8_t)(F_INTERRUPTS * RECS80_0_PAUSE_TIME * MIN_TOLERANCE_10 + 0.5) - 1)\r
 #define RECS80_0_PAUSE_LEN_MAX                  ((uint8_t)(F_INTERRUPTS * RECS80_0_PAUSE_TIME * MAX_TOLERANCE_10 + 0.5) + 1)\r
 \r
 #define RECS80_0_PAUSE_LEN_MIN                  ((uint8_t)(F_INTERRUPTS * RECS80_0_PAUSE_TIME * MIN_TOLERANCE_10 + 0.5) - 1)\r
 #define RECS80_0_PAUSE_LEN_MAX                  ((uint8_t)(F_INTERRUPTS * RECS80_0_PAUSE_TIME * MAX_TOLERANCE_10 + 0.5) + 1)\r
 \r

-#define RC5_START_BIT_LEN_MIN                   ((uint8_t)(F_INTERRUPTS * RC5_BIT_TIME * MIN_TOLERANCE_20 + 0.5) - 1)\r
-#define RC5_START_BIT_LEN_MAX                   ((uint8_t)(F_INTERRUPTS * RC5_BIT_TIME * MAX_TOLERANCE_20 + 0.5) + 1)\r
-#define RC5_BIT_LEN_MIN                         ((uint8_t)(F_INTERRUPTS * RC5_BIT_TIME * MIN_TOLERANCE_20 + 0.5) - 1)\r
-#define RC5_BIT_LEN_MAX                         ((uint8_t)(F_INTERRUPTS * RC5_BIT_TIME * MAX_TOLERANCE_20 + 0.5) + 1)\r
+#define RC5_START_BIT_LEN_MIN                   ((uint8_t)(F_INTERRUPTS * RC5_BIT_TIME * MIN_TOLERANCE_10 + 0.5) - 1)\r
+#define RC5_START_BIT_LEN_MAX                   ((uint8_t)(F_INTERRUPTS * RC5_BIT_TIME * MAX_TOLERANCE_10 + 0.5) + 1)\r
+#define RC5_BIT_LEN_MIN                         ((uint8_t)(F_INTERRUPTS * RC5_BIT_TIME * MIN_TOLERANCE_10 + 0.5) - 1)\r
+#define RC5_BIT_LEN_MAX                         ((uint8_t)(F_INTERRUPTS * RC5_BIT_TIME * MAX_TOLERANCE_10 + 0.5) + 1)\r

 \r
 #define DENON_PULSE_LEN_MIN                     ((uint8_t)(F_INTERRUPTS * DENON_PULSE_TIME * MIN_TOLERANCE_20 + 0.5) - 1)\r
 #define DENON_PULSE_LEN_MAX                     ((uint8_t)(F_INTERRUPTS * DENON_PULSE_TIME * MAX_TOLERANCE_20 + 0.5) + 1)\r
 \r
 #define DENON_PULSE_LEN_MIN                     ((uint8_t)(F_INTERRUPTS * DENON_PULSE_TIME * MIN_TOLERANCE_20 + 0.5) - 1)\r
 #define DENON_PULSE_LEN_MAX                     ((uint8_t)(F_INTERRUPTS * DENON_PULSE_TIME * MAX_TOLERANCE_20 + 0.5) + 1)\r


@@ -475,14 +492,14 @@ typedef unsigned int16  uint16_t;
 #define BANG_OLUFSEN_TRAILER_BIT_PAUSE_LEN_MIN  ((uint8_t)(F_INTERRUPTS * BANG_OLUFSEN_TRAILER_BIT_PAUSE_TIME * MIN_TOLERANCE_05 + 0.5) - 1)\r
 #define BANG_OLUFSEN_TRAILER_BIT_PAUSE_LEN_MAX  ((uint8_t)(F_INTERRUPTS * BANG_OLUFSEN_TRAILER_BIT_PAUSE_TIME * MAX_TOLERANCE_05 + 0.5) + 1)\r
 \r
 #define BANG_OLUFSEN_TRAILER_BIT_PAUSE_LEN_MIN  ((uint8_t)(F_INTERRUPTS * BANG_OLUFSEN_TRAILER_BIT_PAUSE_TIME * MIN_TOLERANCE_05 + 0.5) - 1)\r
 #define BANG_OLUFSEN_TRAILER_BIT_PAUSE_LEN_MAX  ((uint8_t)(F_INTERRUPTS * BANG_OLUFSEN_TRAILER_BIT_PAUSE_TIME * MAX_TOLERANCE_05 + 0.5) + 1)\r
 \r

-#define GRUNDIG_START_BIT_LEN_MIN               ((uint8_t)(F_INTERRUPTS * GRUNDIG_BIT_TIME * MIN_TOLERANCE_20 + 0.5) - 1)\r
-#define GRUNDIG_START_BIT_LEN_MAX               ((uint8_t)(F_INTERRUPTS * GRUNDIG_BIT_TIME * MAX_TOLERANCE_20 + 0.5) + 1)\r
-#define GRUNDIG_BIT_LEN_MIN                     ((uint8_t)(F_INTERRUPTS * GRUNDIG_BIT_TIME * MIN_TOLERANCE_20 + 0.5) - 1)\r
-#define GRUNDIG_BIT_LEN_MAX                     ((uint8_t)(F_INTERRUPTS * GRUNDIG_BIT_TIME * MAX_TOLERANCE_20 + 0.5) + 1)\r
-#define GRUNDIG_PRE_PAUSE_LEN_MIN               ((uint8_t)(F_INTERRUPTS * GRUNDIG_PRE_PAUSE_TIME * MIN_TOLERANCE_20 + 0.5) + 1)\r
-#define GRUNDIG_PRE_PAUSE_LEN_MAX               ((uint8_t)(F_INTERRUPTS * GRUNDIG_PRE_PAUSE_TIME * MAX_TOLERANCE_20 + 0.5) + 1)\r
+#define GRUNDIG_OR_NOKIA_START_BIT_LEN_MIN               ((uint8_t)(F_INTERRUPTS * GRUNDIG_OR_NOKIA_BIT_TIME * MIN_TOLERANCE_20 + 0.5) - 1)\r
+#define GRUNDIG_OR_NOKIA_START_BIT_LEN_MAX               ((uint8_t)(F_INTERRUPTS * GRUNDIG_OR_NOKIA_BIT_TIME * MAX_TOLERANCE_20 + 0.5) + 1)\r
+#define GRUNDIG_OR_NOKIA_BIT_LEN_MIN                     ((uint8_t)(F_INTERRUPTS * GRUNDIG_OR_NOKIA_BIT_TIME * MIN_TOLERANCE_20 + 0.5) - 1)\r
+#define GRUNDIG_OR_NOKIA_BIT_LEN_MAX                     ((uint8_t)(F_INTERRUPTS * GRUNDIG_OR_NOKIA_BIT_TIME * MAX_TOLERANCE_20 + 0.5) + 1)\r
+#define GRUNDIG_OR_NOKIA_PRE_PAUSE_LEN_MIN               ((uint8_t)(F_INTERRUPTS * GRUNDIG_OR_NOKIA_PRE_PAUSE_TIME * MIN_TOLERANCE_20 + 0.5) + 1)\r
+#define GRUNDIG_OR_NOKIA_PRE_PAUSE_LEN_MAX               ((uint8_t)(F_INTERRUPTS * GRUNDIG_OR_NOKIA_PRE_PAUSE_TIME * MAX_TOLERANCE_20 + 0.5) + 1)\r

 \r
 \r

-#define AUTO_REPETITION_LEN                     (uint16_t)(F_INTERRUPTS * AUTO_REPETITION_TIME + 0.5)       // use uint16_t!\r
+#define AUTO_FRAME_REPETITION_LEN               (uint16_t)(F_INTERRUPTS * AUTO_FRAME_REPETITION_TIME + 0.5)       // use uint16_t!\r

 \r
 #ifdef DEBUG\r
 #define DEBUG_PUTCHAR(a)                        { if (! silent) { putchar (a);          } }\r
 \r
 #ifdef DEBUG\r
 #define DEBUG_PUTCHAR(a)                        { if (! silent) { putchar (a);          } }\r


@@ -495,28 +512,17 @@ static int time_counter;
 #endif\r
 \r
 #if IRMP_LOGGING == 1\r
 #endif\r
 \r
 #if IRMP_LOGGING == 1\r

-#define irmp_logIsr(x)                          irmp_logIr((x) ? 1:0)\r

 #define UART_BAUD                               9600L\r
 \r
 // calculate real baud rate:\r
 #define UBRR_VAL                                ((F_CPU + UART_BAUD * 8) / (UART_BAUD * 16) - 1)    // round\r
 #define BAUD_REAL                               (F_CPU / (16 * (UBRR_VAL + 1)))                     // real baudrate\r
 #define UART_BAUD                               9600L\r
 \r
 // calculate real baud rate:\r
 #define UBRR_VAL                                ((F_CPU + UART_BAUD * 8) / (UART_BAUD * 16) - 1)    // round\r
 #define BAUD_REAL                               (F_CPU / (16 * (UBRR_VAL + 1)))                     // real baudrate\r

+#define BAUD_ERROR                              ((BAUD_REAL * 1000) / UART_BAUD)                    // error in promille\r

 \r
 \r

-#ifdef CODEVISION\r
-#if ((BAUD_REAL * 1000) / UART_BAUD - 1000) > 10\r
-#  error Error of baud rate of RS232 UARTx is more than 1%. That is too high!\r
-#endif\r
-\r
-#else // not CODEVISION\r
-\r
-#define BAUD_ERROR                              ((BAUD_REAL * 1000) / UART_BAUD - 1000)             // error in promille\r
-\r
-#if ((BAUD_ERROR > 10) || (-BAUD_ERROR < 10))\r
+#if ((BAUD_ERROR < 990) || (BAUD_ERROR > 1010))\r

 #  error Error of baud rate of RS232 UARTx is more than 1%. That is too high!\r
 #endif\r
 \r
 #  error Error of baud rate of RS232 UARTx is more than 1%. That is too high!\r
 #endif\r
 \r

-#endif // CODEVISION\r
-\r

 /*---------------------------------------------------------------------------------------------------------------------------------------------------\r
  *  Initialize  UART\r
  *  @details  Initializes UART\r
 /*---------------------------------------------------------------------------------------------------------------------------------------------------\r
  *  Initialize  UART\r
  *  @details  Initializes UART\r


@@ -551,59 +557,62 @@ irmp_uart_putc (unsigned char ch)
  *  Log IR signal\r
  *---------------------------------------------------------------------------------------------------------------------------------------------------\r
  */\r
  *  Log IR signal\r
  *---------------------------------------------------------------------------------------------------------------------------------------------------\r
  */\r

-#define c_startcycles                     2                                 // min count of zeros before start of logging\r
-#define c_endBits                      1000                                 // log buffer size\r
-#define c_datalen                       700                                 // number of sequenced highbits to detect end\r
+\r
+#define STARTCYCLES                       2                                 // min count of zeros before start of logging\r
+#define ENDBITS                        1000                                 // number of sequenced highbits to detect end\r
+#define DATALEN                         700                                 // log buffer size\r

 \r
 static void\r
 \r
 static void\r

-irmp_logIr (uint8_t val)\r
+irmp_log (uint8_t val)\r

 {\r
 {\r

-    static uint8_t  s_data[c_datalen];                                      // logging buffer\r
-    static uint16_t s_dataIdx;                                              // number of written bits\r
-    static uint8_t  s_startcycles;                                          // current number of start-zeros\r
-    static uint16_t s_ctr;                                                  // counts sequenced highbits - to detect end\r
+    static uint8_t  buf[DATALEN];                                           // logging buffer\r
+    static uint16_t buf_idx;                                                // number of written bits\r
+    static uint8_t  startcycles;                                            // current number of start-zeros\r
+    static uint16_t cnt;                                                    // counts sequenced highbits - to detect end\r

 \r
 \r

-    if ((val == 0) && (s_startcycles < c_startcycles) && !s_dataIdx)        // prevent that single random zeros init logging\r
+    if (! val && (startcycles < STARTCYCLES) && !buf_idx)                   // prevent that single random zeros init logging\r

     {\r
     {\r

-        ++s_startcycles;\r
+        startcycles++;\r

     }\r
     else\r
     {\r
     }\r
     else\r
     {\r

-        s_startcycles = 0;\r
+        startcycles = 0;\r

 \r
 \r

-        if (    (val == 0)                                                  // start or continue logging on "0"\r
-            || ((val == 1) && (s_dataIdx != 0)))                            // "1" cannot init logging\r
+        if (! val || (val && buf_idx != 0))                                 // start or continue logging on "0", "1" cannot init logging\r

         {\r
         {\r

-            if (val)\r
-            {                                                               // set or clear bit in bitarray\r
-                s_data[(s_dataIdx / 8)] |=  (1<<(s_dataIdx % 8));\r
-            }\r
-            else\r
-            {\r
-                s_data[(s_dataIdx / 8)] &= ~(1<<(s_dataIdx % 8));\r
-            }\r
+            if (buf_idx < DATALEN * 8)                                      // index in range?\r
+            {                                                               // yes\r
+                if (val)\r
+                {\r
+                    buf[(buf_idx / 8)] |=  (1<<(buf_idx % 8));              // set bit\r
+                }\r
+                else\r
+                {\r
+                    buf[(buf_idx / 8)] &= ~(1<<(buf_idx % 8));              // reset bit\r
+                }\r

 \r
 \r

-            ++s_dataIdx;\r
+                buf_idx++;\r
+            }\r

 \r
             if (val)\r
             {                                                               // if high received then look at log-stop condition\r
 \r
             if (val)\r
             {                                                               // if high received then look at log-stop condition\r

-                ++s_ctr;\r
+                cnt++;\r

 \r
 \r

-                if (s_ctr > c_endBits)\r
-                {                                                           // if stop condition (200 sequenced ones) meets, output on uart\r
+                if (cnt > ENDBITS)\r
+                {                                                           // if stop condition is true, output on uart\r

                     uint16_t i;\r
 \r
                     uint16_t i;\r
 \r

-                    for (i = 0; i < c_startcycles; ++i)\r
+                    for (i = 0; i < STARTCYCLES; i++)\r

                     {\r
                         irmp_uart_putc ('0');                               // the ignored starting zeros\r
                     }\r
 \r
                     {\r
                         irmp_uart_putc ('0');                               // the ignored starting zeros\r
                     }\r
 \r

-                    for (i = 0;i < (s_dataIdx - c_endBits + 20) / 8; ++i)   // transform bitset into uart chars\r
+                    for (i = 0; i < (buf_idx - ENDBITS + 20) / 8; i++)      // transform bitset into uart chars\r

                     {\r
                     {\r

-                        uint8_t d = s_data[i];\r
+                        uint8_t d = buf[i];\r

                         uint8_t j;\r
 \r
                         uint8_t j;\r
 \r

-                        for (j = 0;j<8;++j)\r
+                        for (j = 0; j < 8; j++)\r

                         {\r
                             irmp_uart_putc ((d & 1) + '0');\r
                             d >>= 1;\r
                         {\r
                             irmp_uart_putc ((d & 1) + '0');\r
                             d >>= 1;\r


@@ -611,19 +620,19 @@ irmp_logIr (uint8_t val)
                     }\r
 \r
                     irmp_uart_putc ('\n');\r
                     }\r
 \r
                     irmp_uart_putc ('\n');\r

-                    s_dataIdx = 0;\r
+                    buf_idx = 0;\r

                 }\r
             }\r
             else\r
             {\r
                 }\r
             }\r
             else\r
             {\r

-                s_ctr = 0;\r
+                cnt = 0;\r

             }\r
         }\r
     }\r
 }\r
 \r
 #else\r
             }\r
         }\r
     }\r
 }\r
 \r
 #else\r

-#define irmp_logIsr(x)\r
+#define irmp_log(val)\r

 #endif\r
 \r
 typedef struct\r
 #endif\r
 \r
 typedef struct\r


@@ -650,22 +659,22 @@ typedef struct
 \r
 static PROGMEM IRMP_PARAMETER sircs_param =\r
 {\r
 \r
 static PROGMEM IRMP_PARAMETER sircs_param =\r
 {\r

-    IRMP_SIRCS_PROTOCOL,\r
-    SIRCS_1_PULSE_LEN_MIN,\r
-    SIRCS_1_PULSE_LEN_MAX,\r
-    SIRCS_PAUSE_LEN_MIN,\r
-    SIRCS_PAUSE_LEN_MAX,\r
-    SIRCS_0_PULSE_LEN_MIN,\r
-    SIRCS_0_PULSE_LEN_MAX,\r
-    SIRCS_PAUSE_LEN_MIN,\r
-    SIRCS_PAUSE_LEN_MAX,\r
-    SIRCS_ADDRESS_OFFSET,\r
-    SIRCS_ADDRESS_OFFSET + SIRCS_ADDRESS_LEN,\r
-    SIRCS_COMMAND_OFFSET,\r
-    SIRCS_COMMAND_OFFSET + SIRCS_COMMAND_LEN,\r
-    SIRCS_COMPLETE_DATA_LEN,\r
-    SIRCS_STOP_BIT,\r
-    SIRCS_LSB\r
+    IRMP_SIRCS_PROTOCOL,                                                // protocol:        ir protocol\r
+    SIRCS_1_PULSE_LEN_MIN,                                              // pulse_1_len_min: minimum length of pulse with bit value 1\r
+    SIRCS_1_PULSE_LEN_MAX,                                              // pulse_1_len_max: maximum length of pulse with bit value 1\r
+    SIRCS_PAUSE_LEN_MIN,                                                // pause_1_len_min: minimum length of pause with bit value 1\r
+    SIRCS_PAUSE_LEN_MAX,                                                // pause_1_len_max: maximum length of pause with bit value 1\r
+    SIRCS_0_PULSE_LEN_MIN,                                              // pulse_0_len_min: minimum length of pulse with bit value 0\r
+    SIRCS_0_PULSE_LEN_MAX,                                              // pulse_0_len_max: maximum length of pulse with bit value 0\r
+    SIRCS_PAUSE_LEN_MIN,                                                // pause_0_len_min: minimum length of pause with bit value 0\r
+    SIRCS_PAUSE_LEN_MAX,                                                // pause_0_len_max: maximum length of pause with bit value 0\r
+    SIRCS_ADDRESS_OFFSET,                                               // address_offset:  address offset\r
+    SIRCS_ADDRESS_OFFSET + SIRCS_ADDRESS_LEN,                           // address_end:     end of address\r
+    SIRCS_COMMAND_OFFSET,                                               // command_offset:  command offset\r
+    SIRCS_COMMAND_OFFSET + SIRCS_COMMAND_LEN,                           // command_end:     end of command\r
+    SIRCS_COMPLETE_DATA_LEN,                                            // complete_len:    complete length of frame\r
+    SIRCS_STOP_BIT,                                                     // stop_bit:        flag: frame has stop bit\r
+    SIRCS_LSB                                                           // lsb_first:       flag: LSB first\r

 };\r
 \r
 #endif\r
 };\r
 \r
 #endif\r


@@ -674,42 +683,42 @@ static PROGMEM IRMP_PARAMETER sircs_param =
 \r
 static PROGMEM IRMP_PARAMETER nec_param =\r
 {\r
 \r
 static PROGMEM IRMP_PARAMETER nec_param =\r
 {\r

-    IRMP_NEC_PROTOCOL,\r
-    NEC_PULSE_LEN_MIN,\r
-    NEC_PULSE_LEN_MAX,\r
-    NEC_1_PAUSE_LEN_MIN,\r
-    NEC_1_PAUSE_LEN_MAX,\r
-    NEC_PULSE_LEN_MIN,\r
-    NEC_PULSE_LEN_MAX,\r
-    NEC_0_PAUSE_LEN_MIN,\r
-    NEC_0_PAUSE_LEN_MAX,\r
-    NEC_ADDRESS_OFFSET,\r
-    NEC_ADDRESS_OFFSET + NEC_ADDRESS_LEN,\r
-    NEC_COMMAND_OFFSET,\r
-    NEC_COMMAND_OFFSET + NEC_COMMAND_LEN,\r
-    NEC_COMPLETE_DATA_LEN,\r
-    NEC_STOP_BIT,\r
-    NEC_LSB\r
+    IRMP_NEC_PROTOCOL,                                                  // protocol:        ir protocol\r
+    NEC_PULSE_LEN_MIN,                                                  // pulse_1_len_min: minimum length of pulse with bit value 1\r
+    NEC_PULSE_LEN_MAX,                                                  // pulse_1_len_max: maximum length of pulse with bit value 1\r
+    NEC_1_PAUSE_LEN_MIN,                                                // pause_1_len_min: minimum length of pause with bit value 1\r
+    NEC_1_PAUSE_LEN_MAX,                                                // pause_1_len_max: maximum length of pause with bit value 1\r
+    NEC_PULSE_LEN_MIN,                                                  // pulse_0_len_min: minimum length of pulse with bit value 0\r
+    NEC_PULSE_LEN_MAX,                                                  // pulse_0_len_max: maximum length of pulse with bit value 0\r
+    NEC_0_PAUSE_LEN_MIN,                                                // pause_0_len_min: minimum length of pause with bit value 0\r
+    NEC_0_PAUSE_LEN_MAX,                                                // pause_0_len_max: maximum length of pause with bit value 0\r
+    NEC_ADDRESS_OFFSET,                                                 // address_offset:  address offset\r
+    NEC_ADDRESS_OFFSET + NEC_ADDRESS_LEN,                               // address_end:     end of address\r
+    NEC_COMMAND_OFFSET,                                                 // command_offset:  command offset\r
+    NEC_COMMAND_OFFSET + NEC_COMMAND_LEN,                               // command_end:     end of command\r
+    NEC_COMPLETE_DATA_LEN,                                              // complete_len:    complete length of frame\r
+    NEC_STOP_BIT,                                                       // stop_bit:        flag: frame has stop bit\r
+    NEC_LSB                                                             // lsb_first:       flag: LSB first\r

 };\r
 \r
 static PROGMEM IRMP_PARAMETER nec_rep_param =\r
 {\r
 };\r
 \r
 static PROGMEM IRMP_PARAMETER nec_rep_param =\r
 {\r

-    IRMP_NEC_PROTOCOL,\r
-    NEC_PULSE_LEN_MIN,\r
-    NEC_PULSE_LEN_MAX,\r
-    NEC_1_PAUSE_LEN_MIN,\r
-    NEC_1_PAUSE_LEN_MAX,\r
-    NEC_PULSE_LEN_MIN,\r
-    NEC_PULSE_LEN_MAX,\r
-    NEC_0_PAUSE_LEN_MIN,\r
-    NEC_0_PAUSE_LEN_MAX,\r
-    0,\r
-    0,\r
-    0,\r
-    0,\r
-    0,\r
-    NEC_STOP_BIT,\r
-    NEC_LSB\r
+    IRMP_NEC_PROTOCOL,                                                  // protocol:        ir protocol\r
+    NEC_PULSE_LEN_MIN,                                                  // pulse_1_len_min: minimum length of pulse with bit value 1\r
+    NEC_PULSE_LEN_MAX,                                                  // pulse_1_len_max: maximum length of pulse with bit value 1\r
+    NEC_1_PAUSE_LEN_MIN,                                                // pause_1_len_min: minimum length of pause with bit value 1\r
+    NEC_1_PAUSE_LEN_MAX,                                                // pause_1_len_max: maximum length of pause with bit value 1\r
+    NEC_PULSE_LEN_MIN,                                                  // pulse_0_len_min: minimum length of pulse with bit value 0\r
+    NEC_PULSE_LEN_MAX,                                                  // pulse_0_len_max: maximum length of pulse with bit value 0\r
+    NEC_0_PAUSE_LEN_MIN,                                                // pause_0_len_min: minimum length of pause with bit value 0\r
+    NEC_0_PAUSE_LEN_MAX,                                                // pause_0_len_max: maximum length of pause with bit value 0\r
+    0,                                                                  // address_offset:  address offset\r
+    0,                                                                  // address_end:     end of address\r
+    0,                                                                  // command_offset:  command offset\r
+    0,                                                                  // command_end:     end of command\r
+    0,                                                                  // complete_len:    complete length of frame\r
+    NEC_STOP_BIT,                                                       // stop_bit:        flag: frame has stop bit\r
+    NEC_LSB                                                             // lsb_first:       flag: LSB first\r

 };\r
 \r
 #endif\r
 };\r
 \r
 #endif\r


@@ -718,22 +727,22 @@ static PROGMEM IRMP_PARAMETER nec_rep_param =
 \r
 static PROGMEM IRMP_PARAMETER samsung_param =\r
 {\r
 \r
 static PROGMEM IRMP_PARAMETER samsung_param =\r
 {\r

-    IRMP_SAMSUNG_PROTOCOL,\r
-    SAMSUNG_PULSE_LEN_MIN,\r
-    SAMSUNG_PULSE_LEN_MAX,\r
-    SAMSUNG_1_PAUSE_LEN_MIN,\r
-    SAMSUNG_1_PAUSE_LEN_MAX,\r
-    SAMSUNG_PULSE_LEN_MIN,\r
-    SAMSUNG_PULSE_LEN_MAX,\r
-    SAMSUNG_0_PAUSE_LEN_MIN,\r
-    SAMSUNG_0_PAUSE_LEN_MAX,\r
-    SAMSUNG_ADDRESS_OFFSET,\r
-    SAMSUNG_ADDRESS_OFFSET + SAMSUNG_ADDRESS_LEN,\r
-    SAMSUNG_COMMAND_OFFSET,\r
-    SAMSUNG_COMMAND_OFFSET + SAMSUNG_COMMAND_LEN,\r
-    SAMSUNG_COMPLETE_DATA_LEN,\r
-    SAMSUNG_STOP_BIT,\r
-    SAMSUNG_LSB\r
+    IRMP_SAMSUNG_PROTOCOL,                                              // protocol:        ir protocol\r
+    SAMSUNG_PULSE_LEN_MIN,                                              // pulse_1_len_min: minimum length of pulse with bit value 1\r
+    SAMSUNG_PULSE_LEN_MAX,                                              // pulse_1_len_max: maximum length of pulse with bit value 1\r
+    SAMSUNG_1_PAUSE_LEN_MIN,                                            // pause_1_len_min: minimum length of pause with bit value 1\r
+    SAMSUNG_1_PAUSE_LEN_MAX,                                            // pause_1_len_max: maximum length of pause with bit value 1\r
+    SAMSUNG_PULSE_LEN_MIN,                                              // pulse_0_len_min: minimum length of pulse with bit value 0\r
+    SAMSUNG_PULSE_LEN_MAX,                                              // pulse_0_len_max: maximum length of pulse with bit value 0\r
+    SAMSUNG_0_PAUSE_LEN_MIN,                                            // pause_0_len_min: minimum length of pause with bit value 0\r
+    SAMSUNG_0_PAUSE_LEN_MAX,                                            // pause_0_len_max: maximum length of pause with bit value 0\r
+    SAMSUNG_ADDRESS_OFFSET,                                             // address_offset:  address offset\r
+    SAMSUNG_ADDRESS_OFFSET + SAMSUNG_ADDRESS_LEN,                       // address_end:     end of address\r
+    SAMSUNG_COMMAND_OFFSET,                                             // command_offset:  command offset\r
+    SAMSUNG_COMMAND_OFFSET + SAMSUNG_COMMAND_LEN,                       // command_end:     end of command\r
+    SAMSUNG_COMPLETE_DATA_LEN,                                          // complete_len:    complete length of frame\r
+    SAMSUNG_STOP_BIT,                                                   // stop_bit:        flag: frame has stop bit\r
+    SAMSUNG_LSB                                                         // lsb_first:       flag: LSB first\r

 };\r
 \r
 #endif\r
 };\r
 \r
 #endif\r


@@ -742,22 +751,22 @@ static PROGMEM IRMP_PARAMETER samsung_param =
 \r
 static PROGMEM IRMP_PARAMETER matsushita_param =\r
 {\r
 \r
 static PROGMEM IRMP_PARAMETER matsushita_param =\r
 {\r

-    IRMP_MATSUSHITA_PROTOCOL,\r
-    MATSUSHITA_PULSE_LEN_MIN,\r
-    MATSUSHITA_PULSE_LEN_MAX,\r
-    MATSUSHITA_1_PAUSE_LEN_MIN,\r
-    MATSUSHITA_1_PAUSE_LEN_MAX,\r
-    MATSUSHITA_PULSE_LEN_MIN,\r
-    MATSUSHITA_PULSE_LEN_MAX,\r
-    MATSUSHITA_0_PAUSE_LEN_MIN,\r
-    MATSUSHITA_0_PAUSE_LEN_MAX,\r
-    MATSUSHITA_ADDRESS_OFFSET,\r
-    MATSUSHITA_ADDRESS_OFFSET + MATSUSHITA_ADDRESS_LEN,\r
-    MATSUSHITA_COMMAND_OFFSET,\r
-    MATSUSHITA_COMMAND_OFFSET + MATSUSHITA_COMMAND_LEN,\r
-    MATSUSHITA_COMPLETE_DATA_LEN,\r
-    MATSUSHITA_STOP_BIT,\r
-    MATSUSHITA_LSB\r
+    IRMP_MATSUSHITA_PROTOCOL,                                           // protocol:        ir protocol\r
+    MATSUSHITA_PULSE_LEN_MIN,                                           // pulse_1_len_min: minimum length of pulse with bit value 1\r
+    MATSUSHITA_PULSE_LEN_MAX,                                           // pulse_1_len_max: maximum length of pulse with bit value 1\r
+    MATSUSHITA_1_PAUSE_LEN_MIN,                                         // pause_1_len_min: minimum length of pause with bit value 1\r
+    MATSUSHITA_1_PAUSE_LEN_MAX,                                         // pause_1_len_max: maximum length of pause with bit value 1\r
+    MATSUSHITA_PULSE_LEN_MIN,                                           // pulse_0_len_min: minimum length of pulse with bit value 0\r
+    MATSUSHITA_PULSE_LEN_MAX,                                           // pulse_0_len_max: maximum length of pulse with bit value 0\r
+    MATSUSHITA_0_PAUSE_LEN_MIN,                                         // pause_0_len_min: minimum length of pause with bit value 0\r
+    MATSUSHITA_0_PAUSE_LEN_MAX,                                         // pause_0_len_max: maximum length of pause with bit value 0\r
+    MATSUSHITA_ADDRESS_OFFSET,                                          // address_offset:  address offset\r
+    MATSUSHITA_ADDRESS_OFFSET + MATSUSHITA_ADDRESS_LEN,                 // address_end:     end of address\r
+    MATSUSHITA_COMMAND_OFFSET,                                          // command_offset:  command offset\r
+    MATSUSHITA_COMMAND_OFFSET + MATSUSHITA_COMMAND_LEN,                 // command_end:     end of command\r
+    MATSUSHITA_COMPLETE_DATA_LEN,                                       // complete_len:    complete length of frame\r
+    MATSUSHITA_STOP_BIT,                                                // stop_bit:        flag: frame has stop bit\r
+    MATSUSHITA_LSB                                                      // lsb_first:       flag: LSB first\r

 };\r
 \r
 #endif\r
 };\r
 \r
 #endif\r


@@ -766,22 +775,22 @@ static PROGMEM IRMP_PARAMETER matsushita_param =
 \r
 static PROGMEM IRMP_PARAMETER kaseikyo_param =\r
 {\r
 \r
 static PROGMEM IRMP_PARAMETER kaseikyo_param =\r
 {\r

-    IRMP_KASEIKYO_PROTOCOL,\r
-    KASEIKYO_PULSE_LEN_MIN,\r
-    KASEIKYO_PULSE_LEN_MAX,\r
-    KASEIKYO_1_PAUSE_LEN_MIN,\r
-    KASEIKYO_1_PAUSE_LEN_MAX,\r
-    KASEIKYO_PULSE_LEN_MIN,\r
-    KASEIKYO_PULSE_LEN_MAX,\r
-    KASEIKYO_0_PAUSE_LEN_MIN,\r
-    KASEIKYO_0_PAUSE_LEN_MAX,\r
-    KASEIKYO_ADDRESS_OFFSET,\r
-    KASEIKYO_ADDRESS_OFFSET + KASEIKYO_ADDRESS_LEN,\r
-    KASEIKYO_COMMAND_OFFSET,\r
-    KASEIKYO_COMMAND_OFFSET + KASEIKYO_COMMAND_LEN,\r
-    KASEIKYO_COMPLETE_DATA_LEN,\r
-    KASEIKYO_STOP_BIT,\r
-    KASEIKYO_LSB\r
+    IRMP_KASEIKYO_PROTOCOL,                                             // protocol:        ir protocol\r
+    KASEIKYO_PULSE_LEN_MIN,                                             // pulse_1_len_min: minimum length of pulse with bit value 1\r
+    KASEIKYO_PULSE_LEN_MAX,                                             // pulse_1_len_max: maximum length of pulse with bit value 1\r
+    KASEIKYO_1_PAUSE_LEN_MIN,                                           // pause_1_len_min: minimum length of pause with bit value 1\r
+    KASEIKYO_1_PAUSE_LEN_MAX,                                           // pause_1_len_max: maximum length of pause with bit value 1\r
+    KASEIKYO_PULSE_LEN_MIN,                                             // pulse_0_len_min: minimum length of pulse with bit value 0\r
+    KASEIKYO_PULSE_LEN_MAX,                                             // pulse_0_len_max: maximum length of pulse with bit value 0\r
+    KASEIKYO_0_PAUSE_LEN_MIN,                                           // pause_0_len_min: minimum length of pause with bit value 0\r
+    KASEIKYO_0_PAUSE_LEN_MAX,                                           // pause_0_len_max: maximum length of pause with bit value 0\r
+    KASEIKYO_ADDRESS_OFFSET,                                            // address_offset:  address offset\r
+    KASEIKYO_ADDRESS_OFFSET + KASEIKYO_ADDRESS_LEN,                     // address_end:     end of address\r
+    KASEIKYO_COMMAND_OFFSET,                                            // command_offset:  command offset\r
+    KASEIKYO_COMMAND_OFFSET + KASEIKYO_COMMAND_LEN,                     // command_end:     end of command\r
+    KASEIKYO_COMPLETE_DATA_LEN,                                         // complete_len:    complete length of frame\r
+    KASEIKYO_STOP_BIT,                                                  // stop_bit:        flag: frame has stop bit\r
+    KASEIKYO_LSB                                                        // lsb_first:       flag: LSB first\r

 };\r
 \r
 #endif\r
 };\r
 \r
 #endif\r


@@ -790,22 +799,22 @@ static PROGMEM IRMP_PARAMETER kaseikyo_param =
 \r
 static PROGMEM IRMP_PARAMETER recs80_param =\r
 {\r
 \r
 static PROGMEM IRMP_PARAMETER recs80_param =\r
 {\r

-    IRMP_RECS80_PROTOCOL,\r
-    RECS80_PULSE_LEN_MIN,\r
-    RECS80_PULSE_LEN_MAX,\r
-    RECS80_1_PAUSE_LEN_MIN,\r
-    RECS80_1_PAUSE_LEN_MAX,\r
-    RECS80_PULSE_LEN_MIN,\r
-    RECS80_PULSE_LEN_MAX,\r
-    RECS80_0_PAUSE_LEN_MIN,\r
-    RECS80_0_PAUSE_LEN_MAX,\r
-    RECS80_ADDRESS_OFFSET,\r
-    RECS80_ADDRESS_OFFSET + RECS80_ADDRESS_LEN,\r
-    RECS80_COMMAND_OFFSET,\r
-    RECS80_COMMAND_OFFSET + RECS80_COMMAND_LEN,\r
-    RECS80_COMPLETE_DATA_LEN,\r
-    RECS80_STOP_BIT,\r
-    RECS80_LSB\r
+    IRMP_RECS80_PROTOCOL,                                               // protocol:        ir protocol\r
+    RECS80_PULSE_LEN_MIN,                                               // pulse_1_len_min: minimum length of pulse with bit value 1\r
+    RECS80_PULSE_LEN_MAX,                                               // pulse_1_len_max: maximum length of pulse with bit value 1\r
+    RECS80_1_PAUSE_LEN_MIN,                                             // pause_1_len_min: minimum length of pause with bit value 1\r
+    RECS80_1_PAUSE_LEN_MAX,                                             // pause_1_len_max: maximum length of pause with bit value 1\r
+    RECS80_PULSE_LEN_MIN,                                               // pulse_0_len_min: minimum length of pulse with bit value 0\r
+    RECS80_PULSE_LEN_MAX,                                               // pulse_0_len_max: maximum length of pulse with bit value 0\r
+    RECS80_0_PAUSE_LEN_MIN,                                             // pause_0_len_min: minimum length of pause with bit value 0\r
+    RECS80_0_PAUSE_LEN_MAX,                                             // pause_0_len_max: maximum length of pause with bit value 0\r
+    RECS80_ADDRESS_OFFSET,                                              // address_offset:  address offset\r
+    RECS80_ADDRESS_OFFSET + RECS80_ADDRESS_LEN,                         // address_end:     end of address\r
+    RECS80_COMMAND_OFFSET,                                              // command_offset:  command offset\r
+    RECS80_COMMAND_OFFSET + RECS80_COMMAND_LEN,                         // command_end:     end of command\r
+    RECS80_COMPLETE_DATA_LEN,                                           // complete_len:    complete length of frame\r
+    RECS80_STOP_BIT,                                                    // stop_bit:        flag: frame has stop bit\r
+    RECS80_LSB                                                          // lsb_first:       flag: LSB first\r

 };\r
 \r
 #endif\r
 };\r
 \r
 #endif\r


@@ -814,22 +823,22 @@ static PROGMEM IRMP_PARAMETER recs80_param =
 \r
 static PROGMEM IRMP_PARAMETER rc5_param =\r
 {\r
 \r
 static PROGMEM IRMP_PARAMETER rc5_param =\r
 {\r

-    IRMP_RC5_PROTOCOL,\r
-    RC5_BIT_LEN_MIN,\r
-    RC5_BIT_LEN_MAX,\r
-    RC5_BIT_LEN_MIN,\r
-    RC5_BIT_LEN_MAX,\r
-    1,                                // tricky: use this as stop bit length\r
-    1,\r
-    1,\r
-    1,\r
-    RC5_ADDRESS_OFFSET,\r
-    RC5_ADDRESS_OFFSET + RC5_ADDRESS_LEN,\r
-    RC5_COMMAND_OFFSET,\r
-    RC5_COMMAND_OFFSET + RC5_COMMAND_LEN,\r
-    RC5_COMPLETE_DATA_LEN,\r
-    RC5_STOP_BIT,\r
-    RC5_LSB\r
+    IRMP_RC5_PROTOCOL,                                                  // protocol:        ir protocol\r
+    RC5_BIT_LEN_MIN,                                                    // pulse_1_len_min: minimum length of pulse with bit value 1\r
+    RC5_BIT_LEN_MAX,                                                    // pulse_1_len_max: maximum length of pulse with bit value 1\r
+    RC5_BIT_LEN_MIN,                                                    // pause_1_len_min: minimum length of pause with bit value 1\r
+    RC5_BIT_LEN_MAX,                                                    // pause_1_len_max: maximum length of pause with bit value 1\r
+    1,  // tricky: use this as stop bit length                          // pulse_0_len_min: minimum length of pulse with bit value 0\r
+    1,                                                                  // pulse_0_len_max: maximum length of pulse with bit value 0\r
+    1,                                                                  // pause_0_len_min: minimum length of pause with bit value 0\r
+    1,                                                                  // pause_0_len_max: maximum length of pause with bit value 0\r
+    RC5_ADDRESS_OFFSET,                                                 // address_offset:  address offset\r
+    RC5_ADDRESS_OFFSET + RC5_ADDRESS_LEN,                               // address_end:     end of address\r
+    RC5_COMMAND_OFFSET,                                                 // command_offset:  command offset\r
+    RC5_COMMAND_OFFSET + RC5_COMMAND_LEN,                               // command_end:     end of command\r
+    RC5_COMPLETE_DATA_LEN,                                              // complete_len:    complete length of frame\r
+    RC5_STOP_BIT,                                                       // stop_bit:        flag: frame has stop bit\r
+    RC5_LSB                                                             // lsb_first:       flag: LSB first\r

 };\r
 \r
 #endif\r
 };\r
 \r
 #endif\r


@@ -838,22 +847,22 @@ static PROGMEM IRMP_PARAMETER rc5_param =
 \r
 static PROGMEM IRMP_PARAMETER denon_param =\r
 {\r
 \r
 static PROGMEM IRMP_PARAMETER denon_param =\r
 {\r

-    IRMP_DENON_PROTOCOL,\r
-    DENON_PULSE_LEN_MIN,\r
-    DENON_PULSE_LEN_MAX,\r
-    DENON_1_PAUSE_LEN_MIN,\r
-    DENON_1_PAUSE_LEN_MAX,\r
-    DENON_PULSE_LEN_MIN,\r
-    DENON_PULSE_LEN_MAX,\r
-    DENON_0_PAUSE_LEN_MIN,\r
-    DENON_0_PAUSE_LEN_MAX,\r
-    DENON_ADDRESS_OFFSET,\r
-    DENON_ADDRESS_OFFSET + DENON_ADDRESS_LEN,\r
-    DENON_COMMAND_OFFSET,\r
-    DENON_COMMAND_OFFSET + DENON_COMMAND_LEN,\r
-    DENON_COMPLETE_DATA_LEN,\r
-    DENON_STOP_BIT,\r
-    DENON_LSB\r
+    IRMP_DENON_PROTOCOL,                                                // protocol:        ir protocol\r
+    DENON_PULSE_LEN_MIN,                                                // pulse_1_len_min: minimum length of pulse with bit value 1\r
+    DENON_PULSE_LEN_MAX,                                                // pulse_1_len_max: maximum length of pulse with bit value 1\r
+    DENON_1_PAUSE_LEN_MIN,                                              // pause_1_len_min: minimum length of pause with bit value 1\r
+    DENON_1_PAUSE_LEN_MAX,                                              // pause_1_len_max: maximum length of pause with bit value 1\r
+    DENON_PULSE_LEN_MIN,                                                // pulse_0_len_min: minimum length of pulse with bit value 0\r
+    DENON_PULSE_LEN_MAX,                                                // pulse_0_len_max: maximum length of pulse with bit value 0\r
+    DENON_0_PAUSE_LEN_MIN,                                              // pause_0_len_min: minimum length of pause with bit value 0\r
+    DENON_0_PAUSE_LEN_MAX,                                              // pause_0_len_max: maximum length of pause with bit value 0\r
+    DENON_ADDRESS_OFFSET,                                               // address_offset:  address offset\r
+    DENON_ADDRESS_OFFSET + DENON_ADDRESS_LEN,                           // address_end:     end of address\r
+    DENON_COMMAND_OFFSET,                                               // command_offset:  command offset\r
+    DENON_COMMAND_OFFSET + DENON_COMMAND_LEN,                           // command_end:     end of command\r
+    DENON_COMPLETE_DATA_LEN,                                            // complete_len:    complete length of frame\r
+    DENON_STOP_BIT,                                                     // stop_bit:        flag: frame has stop bit\r
+    DENON_LSB                                                           // lsb_first:       flag: LSB first\r

 };\r
 \r
 #endif\r
 };\r
 \r
 #endif\r


@@ -862,22 +871,22 @@ static PROGMEM IRMP_PARAMETER denon_param =
 \r
 static PROGMEM IRMP_PARAMETER rc6_param =\r
 {\r
 \r
 static PROGMEM IRMP_PARAMETER rc6_param =\r
 {\r

-    IRMP_RC6_PROTOCOL,\r
-    RC6_BIT_LEN_MIN,\r
-    RC6_BIT_LEN_MAX,\r
-    RC6_BIT_LEN_MIN,\r
-    RC6_BIT_LEN_MAX,\r
-    1,                                // tricky: use this as stop bit length\r
-    1,\r
-    1,\r
-    1,\r
-    RC6_ADDRESS_OFFSET,\r
-    RC6_ADDRESS_OFFSET + RC6_ADDRESS_LEN,\r
-    RC6_COMMAND_OFFSET,\r
-    RC6_COMMAND_OFFSET + RC6_COMMAND_LEN,\r
-    RC6_COMPLETE_DATA_LEN_SHORT,\r
-    RC6_STOP_BIT,\r
-    RC6_LSB\r
+    IRMP_RC6_PROTOCOL,                                                  // protocol:        ir protocol\r
+    RC6_BIT_LEN_MIN,                                                    // pulse_1_len_min: minimum length of pulse with bit value 1\r
+    RC6_BIT_LEN_MAX,                                                    // pulse_1_len_max: maximum length of pulse with bit value 1\r
+    RC6_BIT_LEN_MIN,                                                    // pause_1_len_min: minimum length of pause with bit value 1\r
+    RC6_BIT_LEN_MAX,                                                    // pause_1_len_max: maximum length of pause with bit value 1\r
+    1,  // tricky: use this as stop bit length                          // pulse_0_len_min: minimum length of pulse with bit value 0\r
+    1,                                                                  // pulse_0_len_max: maximum length of pulse with bit value 0\r
+    1,                                                                  // pause_0_len_min: minimum length of pause with bit value 0\r
+    1,                                                                  // pause_0_len_max: maximum length of pause with bit value 0\r
+    RC6_ADDRESS_OFFSET,                                                 // address_offset:  address offset\r
+    RC6_ADDRESS_OFFSET + RC6_ADDRESS_LEN,                               // address_end:     end of address\r
+    RC6_COMMAND_OFFSET,                                                 // command_offset:  command offset\r
+    RC6_COMMAND_OFFSET + RC6_COMMAND_LEN,                               // command_end:     end of command\r
+    RC6_COMPLETE_DATA_LEN_SHORT,                                        // complete_len:    complete length of frame\r
+    RC6_STOP_BIT,                                                       // stop_bit:        flag: frame has stop bit\r
+    RC6_LSB                                                             // lsb_first:       flag: LSB first\r

 };\r
 \r
 #endif\r
 };\r
 \r
 #endif\r


@@ -886,22 +895,22 @@ static PROGMEM IRMP_PARAMETER rc6_param =
 \r
 static PROGMEM IRMP_PARAMETER recs80ext_param =\r
 {\r
 \r
 static PROGMEM IRMP_PARAMETER recs80ext_param =\r
 {\r

-    IRMP_RECS80EXT_PROTOCOL,\r
-    RECS80EXT_PULSE_LEN_MIN,\r
-    RECS80EXT_PULSE_LEN_MAX,\r
-    RECS80EXT_1_PAUSE_LEN_MIN,\r
-    RECS80EXT_1_PAUSE_LEN_MAX,\r
-    RECS80EXT_PULSE_LEN_MIN,\r
-    RECS80EXT_PULSE_LEN_MAX,\r
-    RECS80EXT_0_PAUSE_LEN_MIN,\r
-    RECS80EXT_0_PAUSE_LEN_MAX,\r
-    RECS80EXT_ADDRESS_OFFSET,\r
-    RECS80EXT_ADDRESS_OFFSET + RECS80EXT_ADDRESS_LEN,\r
-    RECS80EXT_COMMAND_OFFSET,\r
-    RECS80EXT_COMMAND_OFFSET + RECS80EXT_COMMAND_LEN,\r
-    RECS80EXT_COMPLETE_DATA_LEN,\r
-    RECS80EXT_STOP_BIT,\r
-    RECS80EXT_LSB\r
+    IRMP_RECS80EXT_PROTOCOL,                                            // protocol:        ir protocol\r
+    RECS80EXT_PULSE_LEN_MIN,                                            // pulse_1_len_min: minimum length of pulse with bit value 1\r
+    RECS80EXT_PULSE_LEN_MAX,                                            // pulse_1_len_max: maximum length of pulse with bit value 1\r
+    RECS80EXT_1_PAUSE_LEN_MIN,                                          // pause_1_len_min: minimum length of pause with bit value 1\r
+    RECS80EXT_1_PAUSE_LEN_MAX,                                          // pause_1_len_max: maximum length of pause with bit value 1\r
+    RECS80EXT_PULSE_LEN_MIN,                                            // pulse_0_len_min: minimum length of pulse with bit value 0\r
+    RECS80EXT_PULSE_LEN_MAX,                                            // pulse_0_len_max: maximum length of pulse with bit value 0\r
+    RECS80EXT_0_PAUSE_LEN_MIN,                                          // pause_0_len_min: minimum length of pause with bit value 0\r
+    RECS80EXT_0_PAUSE_LEN_MAX,                                          // pause_0_len_max: maximum length of pause with bit value 0\r
+    RECS80EXT_ADDRESS_OFFSET,                                           // address_offset:  address offset\r
+    RECS80EXT_ADDRESS_OFFSET + RECS80EXT_ADDRESS_LEN,                   // address_end:     end of address\r
+    RECS80EXT_COMMAND_OFFSET,                                           // command_offset:  command offset\r
+    RECS80EXT_COMMAND_OFFSET + RECS80EXT_COMMAND_LEN,                   // command_end:     end of command\r
+    RECS80EXT_COMPLETE_DATA_LEN,                                        // complete_len:    complete length of frame\r
+    RECS80EXT_STOP_BIT,                                                 // stop_bit:        flag: frame has stop bit\r
+    RECS80EXT_LSB                                                       // lsb_first:       flag: LSB first\r

 };\r
 \r
 #endif\r
 };\r
 \r
 #endif\r


@@ -910,22 +919,22 @@ static PROGMEM IRMP_PARAMETER recs80ext_param =
 \r
 static PROGMEM IRMP_PARAMETER nubert_param =\r
 {\r
 \r
 static PROGMEM IRMP_PARAMETER nubert_param =\r
 {\r

-    IRMP_NUBERT_PROTOCOL,\r
-    NUBERT_1_PULSE_LEN_MIN,\r
-    NUBERT_1_PULSE_LEN_MAX,\r
-    NUBERT_1_PAUSE_LEN_MIN,\r
-    NUBERT_1_PAUSE_LEN_MAX,\r
-    NUBERT_0_PULSE_LEN_MIN,\r
-    NUBERT_0_PULSE_LEN_MAX,\r
-    NUBERT_0_PAUSE_LEN_MIN,\r
-    NUBERT_0_PAUSE_LEN_MAX,\r
-    NUBERT_ADDRESS_OFFSET,\r
-    NUBERT_ADDRESS_OFFSET + NUBERT_ADDRESS_LEN,\r
-    NUBERT_COMMAND_OFFSET,\r
-    NUBERT_COMMAND_OFFSET + NUBERT_COMMAND_LEN,\r
-    NUBERT_COMPLETE_DATA_LEN,\r
-    NUBERT_STOP_BIT,\r
-    NUBERT_LSB\r
+    IRMP_NUBERT_PROTOCOL,                                               // protocol:        ir protocol\r
+    NUBERT_1_PULSE_LEN_MIN,                                             // pulse_1_len_min: minimum length of pulse with bit value 1\r
+    NUBERT_1_PULSE_LEN_MAX,                                             // pulse_1_len_max: maximum length of pulse with bit value 1\r
+    NUBERT_1_PAUSE_LEN_MIN,                                             // pause_1_len_min: minimum length of pause with bit value 1\r
+    NUBERT_1_PAUSE_LEN_MAX,                                             // pause_1_len_max: maximum length of pause with bit value 1\r
+    NUBERT_0_PULSE_LEN_MIN,                                             // pulse_0_len_min: minimum length of pulse with bit value 0\r
+    NUBERT_0_PULSE_LEN_MAX,                                             // pulse_0_len_max: maximum length of pulse with bit value 0\r
+    NUBERT_0_PAUSE_LEN_MIN,                                             // pause_0_len_min: minimum length of pause with bit value 0\r
+    NUBERT_0_PAUSE_LEN_MAX,                                             // pause_0_len_max: maximum length of pause with bit value 0\r
+    NUBERT_ADDRESS_OFFSET,                                              // address_offset:  address offset\r
+    NUBERT_ADDRESS_OFFSET + NUBERT_ADDRESS_LEN,                         // address_end:     end of address\r
+    NUBERT_COMMAND_OFFSET,                                              // command_offset:  command offset\r
+    NUBERT_COMMAND_OFFSET + NUBERT_COMMAND_LEN,                         // command_end:     end of command\r
+    NUBERT_COMPLETE_DATA_LEN,                                           // complete_len:    complete length of frame\r
+    NUBERT_STOP_BIT,                                                    // stop_bit:        flag: frame has stop bit\r
+    NUBERT_LSB                                                          // lsb_first:       flag: LSB first\r

 };\r
 \r
 #endif\r
 };\r
 \r
 #endif\r


@@ -934,58 +943,58 @@ static PROGMEM IRMP_PARAMETER nubert_param =
 \r
 static PROGMEM IRMP_PARAMETER bang_olufsen_param =\r
 {\r
 \r
 static PROGMEM IRMP_PARAMETER bang_olufsen_param =\r
 {\r

-    IRMP_BANG_OLUFSEN_PROTOCOL,\r
-    BANG_OLUFSEN_PULSE_LEN_MIN,\r
-    BANG_OLUFSEN_PULSE_LEN_MAX,\r
-    BANG_OLUFSEN_1_PAUSE_LEN_MIN,\r
-    BANG_OLUFSEN_1_PAUSE_LEN_MAX,\r
-    BANG_OLUFSEN_PULSE_LEN_MIN,\r
-    BANG_OLUFSEN_PULSE_LEN_MAX,\r
-    BANG_OLUFSEN_0_PAUSE_LEN_MIN,\r
-    BANG_OLUFSEN_0_PAUSE_LEN_MAX,\r
-    BANG_OLUFSEN_ADDRESS_OFFSET,\r
-    BANG_OLUFSEN_ADDRESS_OFFSET + BANG_OLUFSEN_ADDRESS_LEN,\r
-    BANG_OLUFSEN_COMMAND_OFFSET,\r
-    BANG_OLUFSEN_COMMAND_OFFSET + BANG_OLUFSEN_COMMAND_LEN,\r
-    BANG_OLUFSEN_COMPLETE_DATA_LEN,\r
-    BANG_OLUFSEN_STOP_BIT,\r
-    BANG_OLUFSEN_LSB\r
+    IRMP_BANG_OLUFSEN_PROTOCOL,                                         // protocol:        ir protocol\r
+    BANG_OLUFSEN_PULSE_LEN_MIN,                                         // pulse_1_len_min: minimum length of pulse with bit value 1\r
+    BANG_OLUFSEN_PULSE_LEN_MAX,                                         // pulse_1_len_max: maximum length of pulse with bit value 1\r
+    BANG_OLUFSEN_1_PAUSE_LEN_MIN,                                       // pause_1_len_min: minimum length of pause with bit value 1\r
+    BANG_OLUFSEN_1_PAUSE_LEN_MAX,                                       // pause_1_len_max: maximum length of pause with bit value 1\r
+    BANG_OLUFSEN_PULSE_LEN_MIN,                                         // pulse_0_len_min: minimum length of pulse with bit value 0\r
+    BANG_OLUFSEN_PULSE_LEN_MAX,                                         // pulse_0_len_max: maximum length of pulse with bit value 0\r
+    BANG_OLUFSEN_0_PAUSE_LEN_MIN,                                       // pause_0_len_min: minimum length of pause with bit value 0\r
+    BANG_OLUFSEN_0_PAUSE_LEN_MAX,                                       // pause_0_len_max: maximum length of pause with bit value 0\r
+    BANG_OLUFSEN_ADDRESS_OFFSET,                                        // address_offset:  address offset\r
+    BANG_OLUFSEN_ADDRESS_OFFSET + BANG_OLUFSEN_ADDRESS_LEN,             // address_end:     end of address\r
+    BANG_OLUFSEN_COMMAND_OFFSET,                                        // command_offset:  command offset\r
+    BANG_OLUFSEN_COMMAND_OFFSET + BANG_OLUFSEN_COMMAND_LEN,             // command_end:     end of command\r
+    BANG_OLUFSEN_COMPLETE_DATA_LEN,                                     // complete_len:    complete length of frame\r
+    BANG_OLUFSEN_STOP_BIT,                                              // stop_bit:        flag: frame has stop bit\r
+    BANG_OLUFSEN_LSB                                                    // lsb_first:       flag: LSB first\r

 };\r
 \r
 #endif\r
 \r
 };\r
 \r
 #endif\r
 \r

-#if IRMP_SUPPORT_GRUNDIG_PROTOCOL == 1\r
+#if IRMP_SUPPORT_GRUNDIG_OR_NOKIA_PROTOCOL == 1\r

 \r
 static PROGMEM IRMP_PARAMETER grundig_param =\r
 {\r
 \r
 static PROGMEM IRMP_PARAMETER grundig_param =\r
 {\r

-    IRMP_GRUNDIG_PROTOCOL,\r
-    GRUNDIG_BIT_LEN_MIN,\r
-    GRUNDIG_BIT_LEN_MAX,\r
-    GRUNDIG_BIT_LEN_MIN,\r
-    GRUNDIG_BIT_LEN_MAX,\r
-    1,                                // tricky: use this as stop bit length\r
-    1,\r
-    1,\r
-    1,\r
-    GRUNDIG_ADDRESS_OFFSET,\r
-    GRUNDIG_ADDRESS_OFFSET + GRUNDIG_ADDRESS_LEN,\r
-    GRUNDIG_COMMAND_OFFSET,\r
-    GRUNDIG_COMMAND_OFFSET + GRUNDIG_COMMAND_LEN,\r
-    GRUNDIG_COMPLETE_DATA_LEN,\r
-    GRUNDIG_STOP_BIT,\r
-    GRUNDIG_LSB\r
+    IRMP_GRUNDIG_PROTOCOL,                                              // protocol:        ir protocol\r
+    GRUNDIG_OR_NOKIA_BIT_LEN_MIN,                                       // pulse_1_len_min: minimum length of pulse with bit value 1\r
+    GRUNDIG_OR_NOKIA_BIT_LEN_MAX,                                       // pulse_1_len_max: maximum length of pulse with bit value 1\r
+    GRUNDIG_OR_NOKIA_BIT_LEN_MIN,                                       // pause_1_len_min: minimum length of pause with bit value 1\r
+    GRUNDIG_OR_NOKIA_BIT_LEN_MAX,                                       // pause_1_len_max: maximum length of pause with bit value 1\r
+    1,  // tricky: use this as stop bit length                          // pulse_0_len_min: minimum length of pulse with bit value 0\r
+    1,                                                                  // pulse_0_len_max: maximum length of pulse with bit value 0\r
+    1,                                                                  // pause_0_len_min: minimum length of pause with bit value 0\r
+    1,                                                                  // pause_0_len_max: maximum length of pause with bit value 0\r
+    GRUNDIG_ADDRESS_OFFSET,                                             // address_offset:  address offset\r
+    GRUNDIG_ADDRESS_OFFSET + GRUNDIG_ADDRESS_LEN,                       // address_end:     end of address\r
+    GRUNDIG_COMMAND_OFFSET,                                             // command_offset:  command offset\r
+    GRUNDIG_COMMAND_OFFSET + GRUNDIG_COMMAND_LEN + 1,                   // command_end:     end of command (USE 1 bit MORE to STORE NOKIA DATA!)\r
+    NOKIA_COMPLETE_DATA_LEN,                                            // complete_len:    complete length of frame, here: NOKIA instead of GRUNDIG!\r
+    GRUNDIG_OR_NOKIA_STOP_BIT,                                          // stop_bit:        flag: frame has stop bit\r
+    GRUNDIG_OR_NOKIA_LSB                                                // lsb_first:       flag: LSB first\r

 };\r
 \r
 #endif\r
 \r
 };\r
 \r
 #endif\r
 \r

-static uint8_t                              irmp_bit;                                           // current bit position\r
+static uint8_t                              irmp_bit;                   // current bit position\r

 static IRMP_PARAMETER                       irmp_param;\r
 \r
 static volatile uint8_t                     irmp_ir_detected;\r
 static volatile uint8_t                     irmp_protocol;\r
 static volatile uint16_t                    irmp_address;\r
 static volatile uint16_t                    irmp_command;\r
 static IRMP_PARAMETER                       irmp_param;\r
 \r
 static volatile uint8_t                     irmp_ir_detected;\r
 static volatile uint8_t                     irmp_protocol;\r
 static volatile uint16_t                    irmp_address;\r
 static volatile uint16_t                    irmp_command;\r

-static volatile uint16_t                    irmp_id;                                            // only used for SAMSUNG protocol\r
+static volatile uint16_t                    irmp_id;                    // only used for SAMSUNG protocol\r

 static volatile uint8_t                     irmp_flags;\r
 \r
 #ifdef DEBUG\r
 static volatile uint8_t                     irmp_flags;\r
 \r
 #ifdef DEBUG\r


@@ -1002,8 +1011,8 @@ void
 irmp_init (void)\r
 {\r
 #ifndef PIC_CCS_COMPILER\r
 irmp_init (void)\r
 {\r
 #ifndef PIC_CCS_COMPILER\r

-    IRMP_PORT &= ~(1<<IRMP_BIT);                                                                  // deactivate pullup\r
-    IRMP_DDR &= ~(1<<IRMP_BIT);                                                                   // set pin to input\r
+    IRMP_PORT &= ~(1<<IRMP_BIT);                                        // deactivate pullup\r
+    IRMP_DDR &= ~(1<<IRMP_BIT);                                         // set pin to input\r

 #endif // PIC_CCS_COMPILER\r
 \r
 #if IRMP_LOGGING == 1\r
 #endif // PIC_CCS_COMPILER\r
 \r
 #if IRMP_LOGGING == 1\r


@@ -1151,7 +1160,7 @@ irmp_ISR (void)
 #if IRMP_SUPPORT_RC5_PROTOCOL == 1 || IRMP_SUPPORT_RC6_PROTOCOL == 1\r
     static uint8_t    last_pause;                                               // last pause value\r
 #endif\r
 #if IRMP_SUPPORT_RC5_PROTOCOL == 1 || IRMP_SUPPORT_RC6_PROTOCOL == 1\r
     static uint8_t    last_pause;                                               // last pause value\r
 #endif\r

-#if IRMP_SUPPORT_RC5_PROTOCOL == 1 || IRMP_SUPPORT_RC6_PROTOCOL == 1 || IRMP_SUPPORT_BANG_OLUFSEN_PROTOCOL == 1\r
+#if IRMP_SUPPORT_RC5_PROTOCOL == 1 || IRMP_SUPPORT_RC6_PROTOCOL == 1 || IRMP_SUPPORT_BANG_OLUFSEN_PROTOCOL == 1 || IRMP_SUPPORT_GRUNDIG_OR_NOKIA_PROTOCOL == 1\r

     static uint8_t    last_value;                                               // last bit value\r
 #endif\r
     uint8_t           irmp_input;                                               // input value\r
     static uint8_t    last_value;                                               // last bit value\r
 #endif\r
     uint8_t           irmp_input;                                               // input value\r


@@ -1162,14 +1171,20 @@ irmp_ISR (void)
 \r
     irmp_input = input(IRMP_PIN);\r
 \r
 \r
     irmp_input = input(IRMP_PIN);\r
 \r

-    irmp_logIsr(irmp_input);                                                    // log ir signal, if IRMP_LOGGING defined\r
+    irmp_log(irmp_input);                                                       // log ir signal, if IRMP_LOGGING defined\r

 \r
     if (! irmp_ir_detected)                                                     // ir code already detected?\r
     {                                                                           // no...\r
         if (! irmp_start_bit_detected)                                          // start bit detected?\r
         {                                                                       // no...\r
 \r
     if (! irmp_ir_detected)                                                     // ir code already detected?\r
     {                                                                           // no...\r
         if (! irmp_start_bit_detected)                                          // start bit detected?\r
         {                                                                       // no...\r

-            if (!irmp_input)                                                    // receiving burst?\r
+            if (! irmp_input)                                                   // receiving burst?\r

             {                                                                   // yes...\r
             {                                                                   // yes...\r

+#ifdef DEBUG\r
+                if (! irmp_pulse_time)\r
+                {\r
+                    DEBUG_PRINTF("%8d [starting pulse]\n", time_counter);\r
+                }\r
+#endif\r

                 irmp_pulse_time++;                                              // increment counter\r
             }\r
             else\r
                 irmp_pulse_time++;                                              // increment counter\r
             }\r
             else\r


@@ -1397,19 +1412,19 @@ irmp_ISR (void)
                     else\r
 #endif // IRMP_SUPPORT_BANG_OLUFSEN_PROTOCOL == 1\r
 \r
                     else\r
 #endif // IRMP_SUPPORT_BANG_OLUFSEN_PROTOCOL == 1\r
 \r

-#if IRMP_SUPPORT_GRUNDIG_PROTOCOL == 1\r
-                    if (irmp_pulse_time >= GRUNDIG_START_BIT_LEN_MIN && irmp_pulse_time <= GRUNDIG_START_BIT_LEN_MAX &&\r
-                        irmp_pause_time >= GRUNDIG_PRE_PAUSE_LEN_MIN && irmp_pause_time <= GRUNDIG_PRE_PAUSE_LEN_MAX)\r
+#if IRMP_SUPPORT_GRUNDIG_OR_NOKIA_PROTOCOL == 1\r
+                    if (irmp_pulse_time >= GRUNDIG_OR_NOKIA_START_BIT_LEN_MIN && irmp_pulse_time <= GRUNDIG_OR_NOKIA_START_BIT_LEN_MAX &&\r
+                        irmp_pause_time >= GRUNDIG_OR_NOKIA_PRE_PAUSE_LEN_MIN && irmp_pause_time <= GRUNDIG_OR_NOKIA_PRE_PAUSE_LEN_MAX)\r

                     {                                                           // it's GRUNDIG\r
                         DEBUG_PRINTF ("protocol = GRUNDIG, pre bit timings: pulse: %3d - %3d, pause: %3d - %3d\n",\r
                     {                                                           // it's GRUNDIG\r
                         DEBUG_PRINTF ("protocol = GRUNDIG, pre bit timings: pulse: %3d - %3d, pause: %3d - %3d\n",\r

-                                        GRUNDIG_START_BIT_LEN_MIN, GRUNDIG_START_BIT_LEN_MAX,\r
-                                        GRUNDIG_PRE_PAUSE_LEN_MIN, GRUNDIG_PRE_PAUSE_LEN_MAX);\r
+                                        GRUNDIG_OR_NOKIA_START_BIT_LEN_MIN, GRUNDIG_OR_NOKIA_START_BIT_LEN_MAX,\r
+                                        GRUNDIG_OR_NOKIA_PRE_PAUSE_LEN_MIN, GRUNDIG_OR_NOKIA_PRE_PAUSE_LEN_MAX);\r

                         irmp_param_p = (IRMP_PARAMETER *) &grundig_param;\r
                         last_pause = irmp_pause_time;\r
                         last_value  = 1;\r
                     }\r
                     else\r
                         irmp_param_p = (IRMP_PARAMETER *) &grundig_param;\r
                         last_pause = irmp_pause_time;\r
                         last_value  = 1;\r
                     }\r
                     else\r

-#endif // IRMP_SUPPORT_GRUNDIG_PROTOCOL == 1\r
+#endif // IRMP_SUPPORT_GRUNDIG_OR_NOKIA_PROTOCOL == 1\r

 \r
                     {\r
                         DEBUG_PRINTF ("protocol = UNKNOWN\n");\r
 \r
                     {\r
                         DEBUG_PRINTF ("protocol = UNKNOWN\n");\r


@@ -1469,10 +1484,10 @@ irmp_ISR (void)
                     else\r
 #endif // IRMP_SUPPORT_RC5_PROTOCOL == 1\r
 \r
                     else\r
 #endif // IRMP_SUPPORT_RC5_PROTOCOL == 1\r
 \r

-#if IRMP_SUPPORT_GRUNDIG_PROTOCOL == 1\r
-                    if (irmp_param.protocol == IRMP_GRUNDIG_PROTOCOL)\r
+#if IRMP_SUPPORT_GRUNDIG_OR_NOKIA_PROTOCOL == 1\r
+                    if (irmp_param.protocol == IRMP_GRUNDIG_PROTOCOL || irmp_param.protocol == IRMP_NOKIA_PROTOCOL)\r

                     {\r
                     {\r

-                        if (irmp_pause_time > GRUNDIG_START_BIT_LEN_MAX && irmp_pause_time <= 2 * GRUNDIG_START_BIT_LEN_MAX)\r
+                        if (irmp_pause_time > GRUNDIG_OR_NOKIA_START_BIT_LEN_MAX && irmp_pause_time <= 2 * GRUNDIG_OR_NOKIA_START_BIT_LEN_MAX)\r

                         {\r
                           DEBUG_PRINTF ("%8d [bit %2d: pulse = %3d, pause = %3d] ", time_counter, irmp_bit, irmp_pulse_time, irmp_pause_time);\r
                           DEBUG_PUTCHAR ('0');\r
                         {\r
                           DEBUG_PRINTF ("%8d [bit %2d: pulse = %3d, pause = %3d] ", time_counter, irmp_bit, irmp_pulse_time, irmp_pause_time);\r
                           DEBUG_PUTCHAR ('0');\r


@@ -1488,7 +1503,7 @@ irmp_ISR (void)
                         }\r
                     }\r
                     else\r
                         }\r
                     }\r
                     else\r

-#endif // IRMP_SUPPORT_GRUNDIG_PROTOCOL == 1\r
+#endif // IRMP_SUPPORT_GRUNDIG_OR_NOKIA_PROTOCOL == 1\r

 \r
 #if IRMP_SUPPORT_DENON_PROTOCOL == 1\r
                     if (irmp_param.protocol == IRMP_DENON_PROTOCOL)\r
 \r
 #if IRMP_SUPPORT_DENON_PROTOCOL == 1\r
                     if (irmp_param.protocol == IRMP_DENON_PROTOCOL)\r


@@ -1526,7 +1541,10 @@ irmp_ISR (void)
                         if (irmp_pulse_time >= irmp_param.pulse_0_len_min && irmp_pulse_time <= irmp_param.pulse_0_len_max)\r
                         {\r
 #ifdef DEBUG\r
                         if (irmp_pulse_time >= irmp_param.pulse_0_len_min && irmp_pulse_time <= irmp_param.pulse_0_len_max)\r
                         {\r
 #ifdef DEBUG\r

-                            if (irmp_param.protocol != IRMP_RC5_PROTOCOL)\r
+                            if (irmp_param.protocol != IRMP_RC5_PROTOCOL &&\r
+                                irmp_param.protocol != IRMP_RC6_PROTOCOL &&\r
+                                irmp_param.protocol != IRMP_GRUNDIG_PROTOCOL &&\r
+                                irmp_param.protocol != IRMP_NOKIA_PROTOCOL)\r

                             {\r
                                 DEBUG_PRINTF ("stop bit detected\n");\r
                             }\r
                             {\r
                                 DEBUG_PRINTF ("stop bit detected\n");\r
                             }\r


@@ -1578,10 +1596,39 @@ irmp_ISR (void)
 #endif\r
 #if IRMP_SUPPORT_GRUNDIG_PROTOCOL == 1\r
                         if (irmp_param.protocol == IRMP_GRUNDIG_PROTOCOL &&\r
 #endif\r
 #if IRMP_SUPPORT_GRUNDIG_PROTOCOL == 1\r
                         if (irmp_param.protocol == IRMP_GRUNDIG_PROTOCOL &&\r

-                            irmp_pause_time > 2 * GRUNDIG_BIT_LEN_MAX && irmp_bit >= GRUNDIG_COMPLETE_DATA_LEN - 2 && !irmp_param.stop_bit)\r
-                        {                                                       // special rc5 decoder\r
-                            got_light = TRUE;                                   // this is a lie, but generates a stop bit ;-)\r
-                            irmp_param.stop_bit = TRUE;                         // set flag\r
+                            irmp_pause_time > 2 * GRUNDIG_OR_NOKIA_BIT_LEN_MAX && irmp_bit >= GRUNDIG_COMPLETE_DATA_LEN - 2 && !irmp_param.stop_bit)\r
+                        {                                                           // special Grundig/Nokia decoder\r
+                            irmp_param.complete_len = GRUNDIG_COMPLETE_DATA_LEN;    // correct complete len\r
+                            got_light = TRUE;                                       // this is a lie, but generates a stop bit ;-)\r
+                            irmp_param.stop_bit = TRUE;                             // set flag\r
+                        }\r
+                        else\r
+#endif\r
+#if IRMP_SUPPORT_NOKIA_PROTOCOL == 1\r
+                        if (irmp_param.protocol == IRMP_GRUNDIG_PROTOCOL &&\r
+                            irmp_bit >= GRUNDIG_COMPLETE_DATA_LEN)\r
+                        {\r
+                            DEBUG_PRINTF ("Switching to NOKIA protocol\n");\r
+                            irmp_param.protocol         = IRMP_NOKIA_PROTOCOL;      // change protocol\r
+                            irmp_param.address_offset   = NOKIA_ADDRESS_OFFSET;\r
+                            irmp_param.address_end      = NOKIA_ADDRESS_OFFSET + NOKIA_ADDRESS_LEN;\r
+                            irmp_param.command_offset   = NOKIA_COMMAND_OFFSET;\r
+                            irmp_param.command_end      = NOKIA_COMMAND_OFFSET + NOKIA_COMMAND_LEN;\r
+\r
+                            if (irmp_tmp_command & 0x300)\r
+                            {\r
+                                irmp_tmp_address = (irmp_tmp_command >> 8);\r
+                                irmp_tmp_command &= 0xFF;\r
+                            }\r
+                        }\r
+                        else\r
+#endif\r
+#if IRMP_SUPPORT_NOKIA_PROTOCOL == 1\r
+                        if (irmp_param.protocol == IRMP_NOKIA_PROTOCOL &&\r
+                            irmp_pause_time > 2 * GRUNDIG_OR_NOKIA_BIT_LEN_MAX && irmp_bit >= NOKIA_COMPLETE_DATA_LEN - 2 && !irmp_param.stop_bit)\r
+                        {                                                           // special Grundig/Nokia decoder\r
+                            got_light = TRUE;                                       // this is a lie, but generates a stop bit ;-)\r
+                            irmp_param.stop_bit = TRUE;                             // set flag\r

                         }\r
                         else\r
 #endif\r
                         }\r
                         else\r
 #endif\r


@@ -1649,10 +1696,11 @@ irmp_ISR (void)
                     else\r
 #endif\r
 \r
                     else\r
 #endif\r
 \r

-#if IRMP_SUPPORT_GRUNDIG_PROTOCOL == 1\r
-                    if (irmp_param.protocol == IRMP_GRUNDIG_PROTOCOL)               // special Grundig decoder\r
+#if IRMP_SUPPORT_GRUNDIG_OR_NOKIA_PROTOCOL == 1\r
+                    if (irmp_param.protocol == IRMP_GRUNDIG_PROTOCOL ||             // special Grundig decoder\r
+                        irmp_param.protocol == IRMP_NOKIA_PROTOCOL)                 // special Nokia decoder\r

                     {\r
                     {\r

-                        if (irmp_pulse_time > GRUNDIG_BIT_LEN_MAX && irmp_pulse_time <= 2 * GRUNDIG_BIT_LEN_MAX)\r
+                        if (irmp_pulse_time > GRUNDIG_OR_NOKIA_BIT_LEN_MAX && irmp_pulse_time <= 2 * GRUNDIG_OR_NOKIA_BIT_LEN_MAX)\r

                         {\r
                             DEBUG_PUTCHAR ('0');\r
                             irmp_store_bit (0);\r
                         {\r
                             DEBUG_PUTCHAR ('0');\r
                             irmp_store_bit (0);\r


@@ -1662,11 +1710,11 @@ irmp_ISR (void)
                             last_value = 1;\r
                         }\r
 \r
                             last_value = 1;\r
                         }\r
 \r

-                        else // if (irmp_pulse_time >= GRUNDIG_BIT_LEN_MIN && irmp_pulse_time <= GRUNDIG_BIT_LEN_MAX)\r
+                        else // if (irmp_pulse_time >= GRUNDIG_BIT_LEN_MIN && irmp_pulse_time <= GRUNDIG_OR_NOKIA_BIT_LEN_MAX)\r

                         {\r
                             uint8_t grundig_value;\r
 \r
                         {\r
                             uint8_t grundig_value;\r
 \r

-                            if (last_pause > GRUNDIG_BIT_LEN_MAX && last_pause <= 2 * GRUNDIG_BIT_LEN_MAX)\r
+                            if (last_pause > GRUNDIG_OR_NOKIA_BIT_LEN_MAX && last_pause <= 2 * GRUNDIG_OR_NOKIA_BIT_LEN_MAX)\r

                             {\r
                                 grundig_value = last_value ? 0 : 1;\r
                                 last_value  = grundig_value;\r
                             {\r
                                 grundig_value = last_value ? 0 : 1;\r
                                 last_value  = grundig_value;\r


@@ -1810,7 +1858,7 @@ irmp_ISR (void)
                                     irmp_bit++;\r
                                 }\r
                                 else\r
                                     irmp_bit++;\r
                                 }\r
                                 else\r

-                                {                                                       // timing incorrect!\r
+                                {                                                   // timing incorrect!\r

                                     DEBUG_PRINTF ("error 3a B&O: timing not correct: data bit %d,  pulse: %d, pause: %d\n", irmp_bit, irmp_pulse_time, irmp_pause_time);\r
                                     irmp_start_bit_detected = 0;                    // reset flags and wait for next start bit\r
                                     irmp_pause_time         = 0;\r
                                     DEBUG_PRINTF ("error 3a B&O: timing not correct: data bit %d,  pulse: %d, pause: %d\n", irmp_bit, irmp_pulse_time, irmp_pause_time);\r
                                     irmp_start_bit_detected = 0;                    // reset flags and wait for next start bit\r
                                     irmp_pause_time         = 0;\r


@@ -1903,7 +1951,7 @@ irmp_ISR (void)
             }\r
             else\r
             {                                                                       // counting the pulse length ...\r
             }\r
             else\r
             {                                                                       // counting the pulse length ...\r

-                if (!irmp_input)                                                    // still light?\r
+                if (! irmp_input)                                                   // still light?\r

                 {                                                                   // yes...\r
                     irmp_pulse_time++;                                              // increment counter\r
                 }\r
                 {                                                                   // yes...\r
                     irmp_pulse_time++;                                              // increment counter\r
                 }\r


@@ -1916,7 +1964,7 @@ irmp_ISR (void)
 \r
             if (irmp_bit == irmp_param.complete_len && irmp_param.stop_bit == 0)    // enough bits received?\r
             {\r
 \r
             if (irmp_bit == irmp_param.complete_len && irmp_param.stop_bit == 0)    // enough bits received?\r
             {\r

-                if (last_irmp_command == irmp_tmp_command && repetition_counter < AUTO_REPETITION_LEN)\r
+                if (last_irmp_command == irmp_tmp_command && repetition_counter < AUTO_FRAME_REPETITION_LEN)\r

                 {\r
                     repetition_frame_number++;\r
                 }\r
                 {\r
                     repetition_frame_number++;\r
                 }\r


@@ -1930,7 +1978,7 @@ irmp_ISR (void)
                 if (irmp_param.protocol == IRMP_SIRCS_PROTOCOL && (repetition_frame_number == 1 || repetition_frame_number == 2))\r
                 {\r
                     DEBUG_PRINTF ("code skipped: SIRCS auto repetition frame #%d, counter = %d, auto repetition len = %d\n",\r
                 if (irmp_param.protocol == IRMP_SIRCS_PROTOCOL && (repetition_frame_number == 1 || repetition_frame_number == 2))\r
                 {\r
                     DEBUG_PRINTF ("code skipped: SIRCS auto repetition frame #%d, counter = %d, auto repetition len = %d\n",\r

-                                    repetition_frame_number + 1, repetition_counter, AUTO_REPETITION_LEN);\r
+                                    repetition_frame_number + 1, repetition_counter, AUTO_FRAME_REPETITION_LEN);\r

                     repetition_counter = 0;\r
                 }\r
                 else\r
                     repetition_counter = 0;\r
                 }\r
                 else\r


@@ -1941,18 +1989,18 @@ irmp_ISR (void)
                 if (irmp_param.protocol == IRMP_SAMSUNG32_PROTOCOL && (repetition_frame_number & 0x01))\r
                 {\r
                     DEBUG_PRINTF ("code skipped: SAMSUNG32 auto repetition frame #%d, counter = %d, auto repetition len = %d\n",\r
                 if (irmp_param.protocol == IRMP_SAMSUNG32_PROTOCOL && (repetition_frame_number & 0x01))\r
                 {\r
                     DEBUG_PRINTF ("code skipped: SAMSUNG32 auto repetition frame #%d, counter = %d, auto repetition len = %d\n",\r

-                                    repetition_frame_number + 1, repetition_counter, AUTO_REPETITION_LEN);\r
+                                    repetition_frame_number + 1, repetition_counter, AUTO_FRAME_REPETITION_LEN);\r

                     repetition_counter = 0;\r
                 }\r
                 else\r
 #endif\r
 \r
 #if IRMP_SUPPORT_NUBERT_PROTOCOL == 1\r
                     repetition_counter = 0;\r
                 }\r
                 else\r
 #endif\r
 \r
 #if IRMP_SUPPORT_NUBERT_PROTOCOL == 1\r

-                // if NUBERT protocol and the code will be repeated within 50 ms, we will ignore it.\r
+                // if NUBERT protocol and the code will be repeated within 50 ms, we will ignore every 2nd frame\r

                 if (irmp_param.protocol == IRMP_NUBERT_PROTOCOL && (repetition_frame_number & 0x01))\r
                 {\r
                     DEBUG_PRINTF ("code skipped: NUBERT auto repetition frame #%d, counter = %d, auto repetition len = %d\n",\r
                 if (irmp_param.protocol == IRMP_NUBERT_PROTOCOL && (repetition_frame_number & 0x01))\r
                 {\r
                     DEBUG_PRINTF ("code skipped: NUBERT auto repetition frame #%d, counter = %d, auto repetition len = %d\n",\r

-                                    repetition_frame_number + 1, repetition_counter, AUTO_REPETITION_LEN);\r
+                                    repetition_frame_number + 1, repetition_counter, AUTO_FRAME_REPETITION_LEN);\r

                     repetition_counter = 0;\r
                 }\r
                 else\r
                     repetition_counter = 0;\r
                 }\r
                 else\r


@@ -1984,14 +2032,22 @@ irmp_ISR (void)
 #endif // IRMP_SUPPORT_DENON_PROTOCOL\r
 \r
 #if IRMP_SUPPORT_GRUNDIG_PROTOCOL == 1\r
 #endif // IRMP_SUPPORT_DENON_PROTOCOL\r
 \r
 #if IRMP_SUPPORT_GRUNDIG_PROTOCOL == 1\r

-                    if (irmp_param.protocol == IRMP_GRUNDIG_PROTOCOL && irmp_tmp_command == 0x01ff)     // only start frame?\r
-                    {\r
-                        DEBUG_PRINTF ("Detected start frame, ignoring it\n");\r
+                    if (irmp_param.protocol == IRMP_GRUNDIG_PROTOCOL && irmp_tmp_command == 0x01ff)\r
+                    {                                                               // Grundig start frame?\r
+                        DEBUG_PRINTF ("Detected GRUNDIG start frame, ignoring it\n");\r

                         irmp_ir_detected = FALSE;\r
                         irmp_ir_detected = FALSE;\r

-                        // last_irmp_grundig_command = irmp_tmp_command;\r

                     }\r
                     else\r
                     }\r
                     else\r

-#endif // IRMP_SUPPORT_DENON_PROTOCOL\r
+#endif // IRMP_SUPPORT_GRUNDIG_PROTOCOL\r
+\r
+#if IRMP_SUPPORT_NOKIA_PROTOCOL == 1\r
+                    if (irmp_param.protocol == IRMP_NOKIA_PROTOCOL && irmp_tmp_address == 0x00ff && irmp_tmp_command == 0x00fe)\r
+                    {                                                               // Nokia start frame?\r
+                        DEBUG_PRINTF ("Detected NOKIA start frame, ignoring it\n");\r
+                        irmp_ir_detected = FALSE;\r
+                    }\r
+                    else\r
+#endif // IRMP_SUPPORT_NOKIA_PROTOCOL\r

                     {\r
 #if IRMP_SUPPORT_NEC_PROTOCOL == 1\r
                         if (irmp_param.protocol == IRMP_NEC_PROTOCOL && irmp_bit == 0)  // repetition frame\r
                     {\r
 #if IRMP_SUPPORT_NEC_PROTOCOL == 1\r
                         if (irmp_param.protocol == IRMP_NEC_PROTOCOL && irmp_bit == 0)  // repetition frame\r


@@ -2022,7 +2078,7 @@ irmp_ISR (void)
                 {\r
                     if (last_irmp_command == irmp_command &&\r
                         last_irmp_address == irmp_address &&\r
                 {\r
                     if (last_irmp_command == irmp_command &&\r
                         last_irmp_address == irmp_address &&\r

-                        repetition_counter < IRMP_REPETITION_TIME)\r
+                        repetition_counter < IRMP_KEY_REPETITION_LEN)\r

                     {\r
                         irmp_flags |= IRMP_FLAG_REPETITION;\r
                     }\r
                     {\r
                         irmp_flags |= IRMP_FLAG_REPETITION;\r
                     }\r


@@ -2049,7 +2105,7 @@ irmp_ISR (void)
 // Compile it under linux with:\r
 // cc irmp.c -o irmp\r
 //\r
 // Compile it under linux with:\r
 // cc irmp.c -o irmp\r
 //\r

-// usage: ./irmp [-v|-s|-a] < file\r
+// usage: ./irmp [-v|-s|-a|-p] < file\r

 \r
 static void\r
 print_timings (void)\r
 \r
 static void\r
 print_timings (void)\r


@@ -2088,8 +2144,8 @@ print_timings (void)
             BANG_OLUFSEN_START_BIT3_PULSE_LEN_MIN, BANG_OLUFSEN_START_BIT3_PULSE_LEN_MAX, BANG_OLUFSEN_START_BIT3_PAUSE_LEN_MIN, BANG_OLUFSEN_START_BIT3_PAUSE_LEN_MAX);\r
     printf ("BANG_OLUFSEN   4               %3d - %3d           %3d - %3d\n",\r
             BANG_OLUFSEN_START_BIT4_PULSE_LEN_MIN, BANG_OLUFSEN_START_BIT4_PULSE_LEN_MAX, BANG_OLUFSEN_START_BIT4_PAUSE_LEN_MIN, BANG_OLUFSEN_START_BIT4_PAUSE_LEN_MAX);\r
             BANG_OLUFSEN_START_BIT3_PULSE_LEN_MIN, BANG_OLUFSEN_START_BIT3_PULSE_LEN_MAX, BANG_OLUFSEN_START_BIT3_PAUSE_LEN_MIN, BANG_OLUFSEN_START_BIT3_PAUSE_LEN_MAX);\r
     printf ("BANG_OLUFSEN   4               %3d - %3d           %3d - %3d\n",\r
             BANG_OLUFSEN_START_BIT4_PULSE_LEN_MIN, BANG_OLUFSEN_START_BIT4_PULSE_LEN_MAX, BANG_OLUFSEN_START_BIT4_PAUSE_LEN_MIN, BANG_OLUFSEN_START_BIT4_PAUSE_LEN_MAX);\r

-    printf ("GRUNDIG        1               %3d - %3d           %3d - %3d\n",\r
-            GRUNDIG_START_BIT_LEN_MIN, GRUNDIG_START_BIT_LEN_MAX, GRUNDIG_PRE_PAUSE_LEN_MIN, GRUNDIG_PRE_PAUSE_LEN_MAX);\r
+    printf ("GRUNDIG/NOKIA  1               %3d - %3d           %3d - %3d\n",\r
+            GRUNDIG_OR_NOKIA_START_BIT_LEN_MIN, GRUNDIG_OR_NOKIA_START_BIT_LEN_MAX, GRUNDIG_OR_NOKIA_PRE_PAUSE_LEN_MIN, GRUNDIG_OR_NOKIA_PRE_PAUSE_LEN_MAX);\r

 }\r
 \r
 int\r
 }\r
 \r
 int\r


@@ -2313,7 +2369,7 @@ main (int argc, char ** argv)
 \r
             while ((ch = getchar()) != '\n' && ch != EOF)\r
             {\r
 \r
             while ((ch = getchar()) != '\n' && ch != EOF)\r
             {\r

-                if (ch != '\r')                                                     // ignore CR in DOS/Windows files\r
+                if (ch != '\r')                                                         // ignore CR in DOS/Windows files\r

                 {\r
                     putchar (ch);\r
                 }\r
                 {\r
                     putchar (ch);\r
                 }\r

diff --git a/irmp.exe b/irmp.exe
index 9dc5f4b6e4c9a251ad59c31f14e0bc463668b0c6..66afcf9d52b6ecb934874c86179c48a2d22f96a0 100644 (file)
Binary files a/irmp.exe and b/irmp.exe differ

diff --git a/irmp.h b/irmp.h
index 4233a6ff8eb9442821f79d167e7ffaa450051578..03430a2c7ddc95777b24c09c26059ef862f7e963 100644 (file)
--- a/irmp.h
+++ b/irmp.h
@@ -3,7 +3,7 @@
  *\r
  * Copyright (c) 2009-2010 Frank Meyer - frank(at)fli4l.de\r
  *\r
  *\r
  * Copyright (c) 2009-2010 Frank Meyer - frank(at)fli4l.de\r
  *\r

- * $Id: irmp.h,v 1.15 2010/05/17 10:31:43 fm Exp $\r
+ * $Id: irmp.h,v 1.18 2010/05/26 08:34:30 fm Exp $\r

  *\r
  * ATMEGA88 @ 8 MHz\r
  *\r
  *\r
  * ATMEGA88 @ 8 MHz\r
  *\r


@@ -41,14 +41,15 @@ extern "C"
 #define IRMP_NUBERT_PROTOCOL                    13                            // Nubert\r
 #define IRMP_BANG_OLUFSEN_PROTOCOL              14                            // Bang & Olufsen\r
 #define IRMP_GRUNDIG_PROTOCOL                   15                            // Grundig\r
 #define IRMP_NUBERT_PROTOCOL                    13                            // Nubert\r
 #define IRMP_BANG_OLUFSEN_PROTOCOL              14                            // Bang & Olufsen\r
 #define IRMP_GRUNDIG_PROTOCOL                   15                            // Grundig\r

+#define IRMP_NOKIA_PROTOCOL                     16                            // Nokia\r

 \r
 #define SIRCS_START_BIT_PULSE_TIME              2400.0e-6                     // 2400 usec pulse\r
 #define SIRCS_START_BIT_PAUSE_TIME               600.0e-6                     //  600 usec pause\r
 #define SIRCS_1_PULSE_TIME                      1200.0e-6                     // 1200 usec pulse\r
 #define SIRCS_0_PULSE_TIME                       600.0e-6                     //  600 usec pulse\r
 #define SIRCS_PAUSE_TIME                         600.0e-6                     //  600 usec pause\r
 \r
 #define SIRCS_START_BIT_PULSE_TIME              2400.0e-6                     // 2400 usec pulse\r
 #define SIRCS_START_BIT_PAUSE_TIME               600.0e-6                     //  600 usec pause\r
 #define SIRCS_1_PULSE_TIME                      1200.0e-6                     // 1200 usec pulse\r
 #define SIRCS_0_PULSE_TIME                       600.0e-6                     //  600 usec pulse\r
 #define SIRCS_PAUSE_TIME                         600.0e-6                     //  600 usec pause\r

-#define SIRCS_REPETITION_CNT                    3                             // SIRCS sends each frame 3 times\r
-#define SIRCS_REPETITION_TIME                     25.0e-3                     // repetition after 25ms\r
+#define SIRCS_FRAMES                            3                             // SIRCS sends each frame 3 times\r
+#define SIRCS_FRAME_REPETITION_TIME               25.0e-3                     // repetition after 25ms\r

 #define SIRCS_ADDRESS_OFFSET                    15                            // skip 15 bits\r
 #define SIRCS_ADDRESS_LEN                       5                             // read up to 5 address bits\r
 #define SIRCS_COMMAND_OFFSET                    0                             // skip 0 bits\r
 #define SIRCS_ADDRESS_OFFSET                    15                            // skip 15 bits\r
 #define SIRCS_ADDRESS_LEN                       5                             // read up to 5 address bits\r
 #define SIRCS_COMMAND_OFFSET                    0                             // skip 0 bits\r


@@ -90,8 +91,8 @@ extern "C"
 #define SAMSUNG32_COMMAND_OFFSET                16                            // skip 16 bits\r
 #define SAMSUNG32_COMMAND_LEN                   16                            // read 16 command bits\r
 #define SAMSUNG32_COMPLETE_DATA_LEN             32                            // complete length\r
 #define SAMSUNG32_COMMAND_OFFSET                16                            // skip 16 bits\r
 #define SAMSUNG32_COMMAND_LEN                   16                            // read 16 command bits\r
 #define SAMSUNG32_COMPLETE_DATA_LEN             32                            // complete length\r

-#define SAMSUNG32_REPETITION_CNT                2                             // SAMSUNG32 sends each frame 2 times\r
-#define SAMSUNG32_REPETITION_TIME               47.0e-3                       // repetition after 47 ms\r
+#define SAMSUNG32_FRAMES                        2                             // SAMSUNG32 sends each frame 2 times\r
+#define SAMSUNG32_FRAME_REPETITION_TIME         47.0e-3                       // repetition after 47 ms\r

 \r
 #define MATSUSHITA_START_BIT_PULSE_TIME         3488.0e-6                     // 3488 usec pulse\r
 #define MATSUSHITA_START_BIT_PAUSE_TIME         3488.0e-6                     // 3488 usec pause\r
 \r
 #define MATSUSHITA_START_BIT_PULSE_TIME         3488.0e-6                     // 3488 usec pulse\r
 #define MATSUSHITA_START_BIT_PAUSE_TIME         3488.0e-6                     // 3488 usec pause\r


@@ -144,8 +145,8 @@ extern "C"
 #define DENON_PULSE_TIME                        275.0e-6                      //  275 usec pulse\r
 #define DENON_1_PAUSE_TIME                      1900.0e-6                     // 1900 usec pause\r
 #define DENON_0_PAUSE_TIME                      1050.0e-6                     // 1050 usec pause\r
 #define DENON_PULSE_TIME                        275.0e-6                      //  275 usec pulse\r
 #define DENON_1_PAUSE_TIME                      1900.0e-6                     // 1900 usec pause\r
 #define DENON_0_PAUSE_TIME                      1050.0e-6                     // 1050 usec pause\r

-#define DENON_REPETITION_CNT                    2                             // DENON sends each frame 2 times\r
-#define DENON_REPETITION_TIME                     65.0e-3                     // inverted repetition after 65ms\r
+#define DENON_FRAMES                            2                             // DENON sends each frame 2 times\r
+#define DENON_FRAME_REPETITION_TIME               65.0e-3                     // inverted repetition after 65ms\r

 #define DENON_ADDRESS_OFFSET                    0                             // skip 0 bits\r
 #define DENON_ADDRESS_LEN                       5                             // read 5 address bits\r
 #define DENON_COMMAND_OFFSET                    5                             // skip 5\r
 #define DENON_ADDRESS_OFFSET                    0                             // skip 0 bits\r
 #define DENON_ADDRESS_LEN                       5                             // read 5 address bits\r
 #define DENON_COMMAND_OFFSET                    5                             // skip 5\r


@@ -186,8 +187,8 @@ extern "C"
 #define NUBERT_1_PAUSE_TIME                      340.0e-6                     //  340 usec pause\r
 #define NUBERT_0_PULSE_TIME                      500.0e-6                     //  500 usec pulse\r
 #define NUBERT_0_PAUSE_TIME                     1300.0e-6                     // 1300 usec pause\r
 #define NUBERT_1_PAUSE_TIME                      340.0e-6                     //  340 usec pause\r
 #define NUBERT_0_PULSE_TIME                      500.0e-6                     //  500 usec pulse\r
 #define NUBERT_0_PAUSE_TIME                     1300.0e-6                     // 1300 usec pause\r

-#define NUBERT_REPETITION_CNT                   2                             // Nubert sends 2 frames\r
-#define NUBERT_REPETITION_TIME                  35.0e-3                       // repetition after 35ms\r
+#define NUBERT_FRAMES                           2                             // Nubert sends 2 frames\r
+#define NUBERT_FRAME_REPETITION_TIME            35.0e-3                       // repetition after 35ms\r

 #define NUBERT_ADDRESS_OFFSET                   0                             // skip 0 bits\r
 #define NUBERT_ADDRESS_LEN                      0                             // read 0 address bits\r
 #define NUBERT_COMMAND_OFFSET                   0                             // skip 0 bits\r
 #define NUBERT_ADDRESS_OFFSET                   0                             // skip 0 bits\r
 #define NUBERT_ADDRESS_LEN                      0                             // read 0 address bits\r
 #define NUBERT_COMMAND_OFFSET                   0                             // skip 0 bits\r


@@ -217,19 +218,28 @@ extern "C"
 #define BANG_OLUFSEN_STOP_BIT                   1                             // has stop bit\r
 #define BANG_OLUFSEN_LSB                        0                             // MSB...LSB\r
 \r
 #define BANG_OLUFSEN_STOP_BIT                   1                             // has stop bit\r
 #define BANG_OLUFSEN_LSB                        0                             // MSB...LSB\r
 \r

-#define GRUNDIG_BIT_TIME                        528.0e-6                      // 528 usec pulse/pause\r
-#define GRUNDIG_PRE_PAUSE_TIME                  2639.0e-6                     // 2639 usec pause after pre bit\r
-#define GRUNDIG_REPETITION_CNT                  2                             // SIRCS sends each frame 3 times\r
-#define GRUNDIG_REPETITION_TIME                   20.0e-3                     // repetition after 20ms\r
-#define GRUNDIG_ADDRESS_OFFSET                  0                             // skip 2 bits (2nd start + 1 toggle)\r
-#define GRUNDIG_ADDRESS_LEN                     0                             // read 5 address bits\r
-#define GRUNDIG_COMMAND_OFFSET                  1                             // skip 2 bits (1 start bit)\r
+#define GRUNDIG_OR_NOKIA_BIT_TIME               528.0e-6                      // 528 usec pulse/pause\r
+#define GRUNDIG_OR_NOKIA_PRE_PAUSE_TIME         2639.0e-6                     // 2639 usec pause after pre bit\r
+#define GRUNDIG_OR_NOKIA_STOP_BIT               0                             // has no stop bit\r
+#define GRUNDIG_OR_NOKIA_LSB                    1                             // MSB...LSB\r
+\r
+#define GRUNDIG_FRAMES                          2                             // GRUNDIG sends each frame 1+1 times\r
+#define GRUNDIG_FRAME_REPETITION_TIME             20.0e-3                     // repetition after 20ms\r
+#define GRUNDIG_ADDRESS_OFFSET                  0                             // no address\r
+#define GRUNDIG_ADDRESS_LEN                     0                             // no address\r
+#define GRUNDIG_COMMAND_OFFSET                  1                             // skip 1 start bit\r

 #define GRUNDIG_COMMAND_LEN                     9                             // read 9 command bits\r
 #define GRUNDIG_COMPLETE_DATA_LEN               10                            // complete length: 1 start bit + 9 data bits\r
 #define GRUNDIG_COMMAND_LEN                     9                             // read 9 command bits\r
 #define GRUNDIG_COMPLETE_DATA_LEN               10                            // complete length: 1 start bit + 9 data bits\r

-#define GRUNDIG_STOP_BIT                        0                             // has no stop bit\r
-#define GRUNDIG_LSB                             1                             // MSB...LSB\r

 \r
 \r

-#define AUTO_REPETITION_TIME                    50.0e-3                       // SIRCS/SAMSUNG32/NUBERT: automatic repetition after 45-50ms\r
+#define NOKIA_FRAMES                            3                             // NOKIA sends each frame 1 + 1 + 1 times\r
+#define NOKIA_FRAME_REPETITION_TIME               20.0e-3                     // repetition after 20ms\r
+#define NOKIA_ADDRESS_OFFSET                    9                             // skip 9 bits (1 start bit + 8 data bits)\r
+#define NOKIA_ADDRESS_LEN                       8                             // 7 address bits\r
+#define NOKIA_COMMAND_OFFSET                    1                             // skip 1 bit (1 start bit)\r
+#define NOKIA_COMMAND_LEN                       8                             // read 8 command bits\r
+#define NOKIA_COMPLETE_DATA_LEN                 17                            // complete length: 1 start bit + 8 address bits + 8 command bits\r
+\r
+#define AUTO_FRAME_REPETITION_TIME              50.0e-3                       // SIRCS/SAMSUNG32/NUBERT: automatic repetition after 25-50ms\r

 \r
 #define TRUE                                    1\r
 #define FALSE                                   0\r
 \r
 #define TRUE                                    1\r
 #define FALSE                                   0\r

diff --git a/irmpconfig.h b/irmpconfig.h
index bc9d972705fb4c03e3a1a0bed7ad28a6b7285b6e..a22ebf250fdb9502affad7c247267aad9cf81617 100644 (file)
--- a/irmpconfig.h
+++ b/irmpconfig.h
@@ -3,7 +3,7 @@
  *\r
  * Copyright (c) 2010 Frank Meyer - frank(at)fli4l.de\r
  *\r
  *\r
  * Copyright (c) 2010 Frank Meyer - frank(at)fli4l.de\r
  *\r

- * $Id: irmpconfig.h,v 1.5 2010/05/15 17:56:24 fm Exp $\r
+ * $Id: irmpconfig.h,v 1.6 2010/05/25 14:45:39 fm Exp $\r

  *\r
  * ATMEGA88 @ 8 MHz\r
  *\r
  *\r
  * ATMEGA88 @ 8 MHz\r
  *\r


@@ -43,6 +43,7 @@
 #define IRMP_SUPPORT_NUBERT_PROTOCOL            1       // flag: support NUBERT                     uses  ~50 bytes\r
 #define IRMP_SUPPORT_BANG_OLUFSEN_PROTOCOL      1       // flag: support Bang & Olufsen             uses ~200 bytes\r
 #define IRMP_SUPPORT_GRUNDIG_PROTOCOL           1       // flag: support Grundig                    uses ~150 bytes\r
 #define IRMP_SUPPORT_NUBERT_PROTOCOL            1       // flag: support NUBERT                     uses  ~50 bytes\r
 #define IRMP_SUPPORT_BANG_OLUFSEN_PROTOCOL      1       // flag: support Bang & Olufsen             uses ~200 bytes\r
 #define IRMP_SUPPORT_GRUNDIG_PROTOCOL           1       // flag: support Grundig                    uses ~150 bytes\r

+#define IRMP_SUPPORT_NOKIA_PROTOCOL             1       // flag: support Nokia                      uses ~150 bytes\r

 \r
 /*---------------------------------------------------------------------------------------------------------------------------------------------------\r
  * Change hardware pin here:\r
 \r
 /*---------------------------------------------------------------------------------------------------------------------------------------------------\r
  * Change hardware pin here:\r

diff --git a/irsnd.c b/irsnd.c
index eb3e29f27bc15be393b846bf31096ac9d161c957..86cc94f9fe25e69db5ed258e68766ef67b016508 100644 (file)
--- a/irsnd.c
+++ b/irsnd.c
@@ -3,7 +3,7 @@
  *\r
  * Copyright (c) 2010 Frank Meyer - frank(at)fli4l.de\r
  *\r
  *\r
  * Copyright (c) 2010 Frank Meyer - frank(at)fli4l.de\r
  *\r

- * $Id: irsnd.c,v 1.10 2010/05/17 10:31:43 fm Exp $\r
+ * $Id: irsnd.c,v 1.12 2010/05/26 08:34:30 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
  *\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


@@ -56,7 +56,7 @@ typedef unsigned short    uint16_t;
 #define SIRCS_1_PULSE_LEN                       (uint8_t)(F_INTERRUPTS * SIRCS_1_PULSE_TIME + 0.5)\r
 #define SIRCS_0_PULSE_LEN                       (uint8_t)(F_INTERRUPTS * SIRCS_0_PULSE_TIME + 0.5)\r
 #define SIRCS_PAUSE_LEN                         (uint8_t)(F_INTERRUPTS * SIRCS_PAUSE_TIME + 0.5)\r
 #define SIRCS_1_PULSE_LEN                       (uint8_t)(F_INTERRUPTS * SIRCS_1_PULSE_TIME + 0.5)\r
 #define SIRCS_0_PULSE_LEN                       (uint8_t)(F_INTERRUPTS * SIRCS_0_PULSE_TIME + 0.5)\r
 #define SIRCS_PAUSE_LEN                         (uint8_t)(F_INTERRUPTS * SIRCS_PAUSE_TIME + 0.5)\r

-#define SIRCS_REPETITION_LEN                    (uint16_t)(F_INTERRUPTS * SIRCS_REPETITION_TIME + 0.5)              // use uint16_t!\r
+#define SIRCS_FRAME_REPETITION_LEN              (uint16_t)(F_INTERRUPTS * SIRCS_FRAME_REPETITION_TIME + 0.5)              // use uint16_t!\r

 \r
 #define NEC_START_BIT_PULSE_LEN                 (uint8_t)(F_INTERRUPTS * NEC_START_BIT_PULSE_TIME + 0.5)\r
 #define NEC_START_BIT_PAUSE_LEN                 (uint8_t)(F_INTERRUPTS * NEC_START_BIT_PAUSE_TIME + 0.5)\r
 \r
 #define NEC_START_BIT_PULSE_LEN                 (uint8_t)(F_INTERRUPTS * NEC_START_BIT_PULSE_TIME + 0.5)\r
 #define NEC_START_BIT_PAUSE_LEN                 (uint8_t)(F_INTERRUPTS * NEC_START_BIT_PAUSE_TIME + 0.5)\r


@@ -70,7 +70,7 @@ typedef unsigned short    uint16_t;
 #define SAMSUNG_1_PAUSE_LEN                     (uint8_t)(F_INTERRUPTS * SAMSUNG_1_PAUSE_TIME + 0.5)\r
 #define SAMSUNG_0_PAUSE_LEN                     (uint8_t)(F_INTERRUPTS * SAMSUNG_0_PAUSE_TIME + 0.5)\r
 \r
 #define SAMSUNG_1_PAUSE_LEN                     (uint8_t)(F_INTERRUPTS * SAMSUNG_1_PAUSE_TIME + 0.5)\r
 #define SAMSUNG_0_PAUSE_LEN                     (uint8_t)(F_INTERRUPTS * SAMSUNG_0_PAUSE_TIME + 0.5)\r
 \r

-#define SAMSUNG32_REPETITION_LEN                (uint16_t)(F_INTERRUPTS * SAMSUNG32_REPETITION_TIME + 0.5)          // use uint16_t!\r
+#define SAMSUNG32_FRAME_REPETITION_LEN          (uint16_t)(F_INTERRUPTS * SAMSUNG32_FRAME_REPETITION_TIME + 0.5)          // use uint16_t!\r

 \r
 #define MATSUSHITA_START_BIT_PULSE_LEN          (uint8_t)(F_INTERRUPTS * MATSUSHITA_START_BIT_PULSE_TIME + 0.5)\r
 #define MATSUSHITA_START_BIT_PAUSE_LEN          (uint8_t)(F_INTERRUPTS * MATSUSHITA_START_BIT_PAUSE_TIME + 0.5)\r
 \r
 #define MATSUSHITA_START_BIT_PULSE_LEN          (uint8_t)(F_INTERRUPTS * MATSUSHITA_START_BIT_PULSE_TIME + 0.5)\r
 #define MATSUSHITA_START_BIT_PAUSE_LEN          (uint8_t)(F_INTERRUPTS * MATSUSHITA_START_BIT_PAUSE_TIME + 0.5)\r


@@ -95,7 +95,7 @@ typedef unsigned short    uint16_t;
 #define DENON_PULSE_LEN                         (uint8_t)(F_INTERRUPTS * DENON_PULSE_TIME + 0.5)\r
 #define DENON_1_PAUSE_LEN                       (uint8_t)(F_INTERRUPTS * DENON_1_PAUSE_TIME + 0.5)\r
 #define DENON_0_PAUSE_LEN                       (uint8_t)(F_INTERRUPTS * DENON_0_PAUSE_TIME + 0.5)\r
 #define DENON_PULSE_LEN                         (uint8_t)(F_INTERRUPTS * DENON_PULSE_TIME + 0.5)\r
 #define DENON_1_PAUSE_LEN                       (uint8_t)(F_INTERRUPTS * DENON_1_PAUSE_TIME + 0.5)\r
 #define DENON_0_PAUSE_LEN                       (uint8_t)(F_INTERRUPTS * DENON_0_PAUSE_TIME + 0.5)\r

-#define DENON_REPETITION_LEN                    (uint16_t)(F_INTERRUPTS * DENON_REPETITION_TIME + 0.5)       // use uint16_t!\r
+#define DENON_FRAME_REPETITION_LEN              (uint16_t)(F_INTERRUPTS * DENON_FRAME_REPETITION_TIME + 0.5)       // use uint16_t!\r

 \r
 #define RECS80EXT_START_BIT_PULSE_LEN           (uint8_t)(F_INTERRUPTS * RECS80EXT_START_BIT_PULSE_TIME + 0.5)\r
 #define RECS80EXT_START_BIT_PAUSE_LEN           (uint8_t)(F_INTERRUPTS * RECS80EXT_START_BIT_PAUSE_TIME + 0.5)\r
 \r
 #define RECS80EXT_START_BIT_PULSE_LEN           (uint8_t)(F_INTERRUPTS * RECS80EXT_START_BIT_PULSE_TIME + 0.5)\r
 #define RECS80EXT_START_BIT_PAUSE_LEN           (uint8_t)(F_INTERRUPTS * RECS80EXT_START_BIT_PAUSE_TIME + 0.5)\r


@@ -109,7 +109,7 @@ typedef unsigned short    uint16_t;
 #define NUBERT_1_PAUSE_LEN                      (uint8_t)(F_INTERRUPTS * NUBERT_1_PAUSE_TIME + 0.5)\r
 #define NUBERT_0_PULSE_LEN                      (uint8_t)(F_INTERRUPTS * NUBERT_0_PULSE_TIME + 0.5)\r
 #define NUBERT_0_PAUSE_LEN                      (uint8_t)(F_INTERRUPTS * NUBERT_0_PAUSE_TIME + 0.5)\r
 #define NUBERT_1_PAUSE_LEN                      (uint8_t)(F_INTERRUPTS * NUBERT_1_PAUSE_TIME + 0.5)\r
 #define NUBERT_0_PULSE_LEN                      (uint8_t)(F_INTERRUPTS * NUBERT_0_PULSE_TIME + 0.5)\r
 #define NUBERT_0_PAUSE_LEN                      (uint8_t)(F_INTERRUPTS * NUBERT_0_PAUSE_TIME + 0.5)\r

-#define NUBERT_REPETITION_LEN                   (uint16_t)(F_INTERRUPTS * NUBERT_REPETITION_TIME + 0.5)       // use uint16_t!\r
+#define NUBERT_FRAME_REPETITION_LEN             (uint16_t)(F_INTERRUPTS * NUBERT_FRAME_REPETITION_TIME + 0.5)       // use uint16_t!\r

 \r
 #define BANG_OLUFSEN_START_BIT1_PULSE_LEN       (uint8_t)(F_INTERRUPTS * BANG_OLUFSEN_START_BIT1_PULSE_TIME + 0.5)\r
 #define BANG_OLUFSEN_START_BIT1_PAUSE_LEN       (uint8_t)(F_INTERRUPTS * BANG_OLUFSEN_START_BIT1_PAUSE_TIME + 0.5)\r
 \r
 #define BANG_OLUFSEN_START_BIT1_PULSE_LEN       (uint8_t)(F_INTERRUPTS * BANG_OLUFSEN_START_BIT1_PULSE_TIME + 0.5)\r
 #define BANG_OLUFSEN_START_BIT1_PAUSE_LEN       (uint8_t)(F_INTERRUPTS * BANG_OLUFSEN_START_BIT1_PAUSE_TIME + 0.5)\r


@@ -123,9 +123,10 @@ typedef unsigned short    uint16_t;
 #define BANG_OLUFSEN_R_PAUSE_LEN                (uint8_t)(F_INTERRUPTS * BANG_OLUFSEN_R_PAUSE_TIME + 0.5)\r
 #define BANG_OLUFSEN_TRAILER_BIT_PAUSE_LEN      (uint8_t)(F_INTERRUPTS * BANG_OLUFSEN_TRAILER_BIT_PAUSE_TIME + 0.5)\r
 \r
 #define BANG_OLUFSEN_R_PAUSE_LEN                (uint8_t)(F_INTERRUPTS * BANG_OLUFSEN_R_PAUSE_TIME + 0.5)\r
 #define BANG_OLUFSEN_TRAILER_BIT_PAUSE_LEN      (uint8_t)(F_INTERRUPTS * BANG_OLUFSEN_TRAILER_BIT_PAUSE_TIME + 0.5)\r
 \r

-#define GRUNDIG_PRE_PAUSE_LEN                   (uint8_t)(F_INTERRUPTS * GRUNDIG_PRE_PAUSE_TIME + 0.5)\r
-#define GRUNDIG_BIT_LEN                         (uint8_t)(F_INTERRUPTS * GRUNDIG_BIT_TIME + 0.5)\r
-#define GRUNDIG_REPETITION_LEN                  (uint16_t)(F_INTERRUPTS * GRUNDIG_REPETITION_TIME + 0.5)       // use uint16_t!\r
+#define GRUNDIG_OR_NOKIA_PRE_PAUSE_LEN          (uint8_t)(F_INTERRUPTS * GRUNDIG_OR_NOKIA_PRE_PAUSE_TIME + 0.5)\r
+#define GRUNDIG_OR_NOKIA_BIT_LEN                (uint8_t)(F_INTERRUPTS * GRUNDIG_OR_NOKIA_BIT_TIME + 0.5)\r
+#define GRUNDIG_FRAME_REPETITION_LEN            (uint16_t)(F_INTERRUPTS * GRUNDIG_FRAME_REPETITION_TIME + 0.5)      // use uint16_t!\r
+#define NOKIA_FRAME_REPETITION_LEN              (uint16_t)(F_INTERRUPTS * NOKIA_FRAME_REPETITION_TIME + 0.5)        // use uint16_t!\r

 \r
 #define IRSND_FREQ_32_KHZ                       (uint8_t) ((F_CPU / 32000 / 2) - 1)\r
 #define IRSND_FREQ_36_KHZ                       (uint8_t) ((F_CPU / 36000 / 2) - 1)\r
 \r
 #define IRSND_FREQ_32_KHZ                       (uint8_t) ((F_CPU / 32000 / 2) - 1)\r
 #define IRSND_FREQ_36_KHZ                       (uint8_t) ((F_CPU / 36000 / 2) - 1)\r


@@ -136,7 +137,7 @@ typedef unsigned short    uint16_t;
 \r
 static volatile uint8_t                         irsnd_busy;\r
 static volatile uint8_t                         irsnd_protocol;\r
 \r
 static volatile uint8_t                         irsnd_busy;\r
 static volatile uint8_t                         irsnd_protocol;\r

-static volatile uint8_t                         irsnd_buffer[5];\r
+static volatile uint8_t                         irsnd_buffer[6];\r

 static volatile uint8_t                         irsnd_is_on = FALSE;\r
 \r
 /*---------------------------------------------------------------------------------------------------------------------------------------------------\r
 static volatile uint8_t                         irsnd_is_on = FALSE;\r
 \r
 /*---------------------------------------------------------------------------------------------------------------------------------------------------\r


@@ -387,10 +388,10 @@ irsnd_send_data (IRMP_DATA * irmp_data_p)
 #if IRSND_SUPPORT_DENON_PROTOCOL == 1\r
         case IRMP_DENON_PROTOCOL:\r
         {\r
 #if IRSND_SUPPORT_DENON_PROTOCOL == 1\r
         case IRMP_DENON_PROTOCOL:\r
         {\r

-            irsnd_buffer[0] = ((irmp_data_p->address & 0x1F) << 3) | ((irmp_data_p->command & 0x0380) >> 7);    // AAAAACCC\r
-            irsnd_buffer[1] = (irmp_data_p->command & 0x7F) << 1;                                               // CCCCCCC0\r
-            irsnd_buffer[2] = ((irmp_data_p->address & 0x1F) << 3) | (((~irmp_data_p->command) & 0x0380) >> 7); // AAAAACCC\r
-            irsnd_buffer[3] = (~(irmp_data_p->command) & 0x7F) << 1;                                            // CCCCCCC0\r
+            irsnd_buffer[0] = ((irmp_data_p->address & 0x1F) << 3) | ((irmp_data_p->command & 0x0380) >> 7);    // AAAAACCC (1st frame)\r
+            irsnd_buffer[1] = (irmp_data_p->command & 0x7F) << 1;                                               // CCCCCCC\r
+            irsnd_buffer[2] = ((irmp_data_p->address & 0x1F) << 3) | (((~irmp_data_p->command) & 0x0380) >> 7); // AAAAACCC (2nd frame)\r
+            irsnd_buffer[3] = (~(irmp_data_p->command) & 0x7F) << 1;                                            // CCCCCCC\r

             irsnd_busy      = TRUE;\r
             break;\r
         }\r
             irsnd_busy      = TRUE;\r
             break;\r
         }\r


@@ -419,10 +420,27 @@ irsnd_send_data (IRMP_DATA * irmp_data_p)
         {\r
             command = bitsrevervse (irmp_data_p->command, GRUNDIG_COMMAND_LEN);\r
 \r
         {\r
             command = bitsrevervse (irmp_data_p->command, GRUNDIG_COMMAND_LEN);\r
 \r

-            irsnd_buffer[0] = 0xFF;                                                                             // S1111111\r
-            irsnd_buffer[1] = 0xC0;                                                                             // 11000000\r
-            irsnd_buffer[2] = 0x80 | (command >> 2);                                                            // SCCCCCCC\r
-            irsnd_buffer[3] = (command << 6) & 0xC0;                                                            // CC000000\r
+            irsnd_buffer[0] = 0xFF;                                                                             // S1111111 (1st frame)\r
+            irsnd_buffer[1] = 0xC0;                                                                             // 11\r
+            irsnd_buffer[2] = 0x80 | (command >> 2);                                                            // SCCCCCCC (2nd frame)\r
+            irsnd_buffer[3] = (command << 6) & 0xC0;                                                            // CC\r
+\r
+            irsnd_busy      = TRUE;\r
+            break;\r
+        }\r
+#endif\r
+#if IRSND_SUPPORT_NOKIA_PROTOCOL == 1\r
+        case IRMP_NOKIA_PROTOCOL:\r
+        {\r
+            address = bitsrevervse (irmp_data_p->address, NOKIA_ADDRESS_LEN);\r
+            command = bitsrevervse (irmp_data_p->command, NOKIA_COMMAND_LEN);\r
+\r
+            irsnd_buffer[0] = 0xBF;                                                                             // S0111111 (1st + 3rd frame)\r
+            irsnd_buffer[1] = 0xFF;                                                                             // 11111111\r
+            irsnd_buffer[2] = 0x80;                                                                             // 1\r
+            irsnd_buffer[3] = 0x80 | command >> 1;                                                              // SCCCCCCC (2nd frame)\r
+            irsnd_buffer[4] = (command << 7) | (address >> 1);                                                  // CAAAAAAA\r
+            irsnd_buffer[5] = (address << 7);                                                                   // A\r

 \r
             irsnd_busy      = TRUE;\r
             break;\r
 \r
             irsnd_busy      = TRUE;\r
             break;\r


@@ -459,7 +477,7 @@ irsnd_ISR (void)
     static uint8_t  complete_data_len;\r
     static uint8_t  n_frames;                                                       // number of repetitions\r
     static uint8_t  frame_counter;                                                  // repetition counter\r
     static uint8_t  complete_data_len;\r
     static uint8_t  n_frames;                                                       // number of repetitions\r
     static uint8_t  frame_counter;                                                  // repetition counter\r

-    static uint16_t repetition_pause;                                               // pause before repetition, uint16_t!\r
+    static uint16_t repetition_pause_len;                                           // pause before repetition, uint16_t!\r

     static uint16_t repetition_pause_counter;                                       // pause before repetition, uint16_t!\r
 #if IRSND_SUPPORT_BANG_OLUFSEN_PROTOCOL == 1\r
     static uint8_t  last_bit_value;\r
     static uint16_t repetition_pause_counter;                                       // pause before repetition, uint16_t!\r
 #if IRSND_SUPPORT_BANG_OLUFSEN_PROTOCOL == 1\r
     static uint8_t  last_bit_value;\r


@@ -475,7 +493,7 @@ irsnd_ISR (void)
             {\r
                 repetition_pause_counter++;\r
 \r
             {\r
                 repetition_pause_counter++;\r
 \r

-                if (repetition_pause_counter >= repetition_pause)\r
+                if (repetition_pause_counter >= repetition_pause_len)\r

                 {\r
                     repetition_pause_counter = 0;\r
 \r
                 {\r
                     repetition_pause_counter = 0;\r
 \r


@@ -489,6 +507,19 @@ irsnd_ISR (void)
                         current_bit = 15;\r
                         complete_data_len   = 16 + GRUNDIG_COMPLETE_DATA_LEN;\r
                     }\r
                         current_bit = 15;\r
                         complete_data_len   = 16 + GRUNDIG_COMPLETE_DATA_LEN;\r
                     }\r

+                    else if (irsnd_protocol == IRMP_NOKIA_PROTOCOL)\r
+                    {\r
+                        if (frame_counter == 1)\r
+                        {\r
+                            current_bit = 23;\r
+                            complete_data_len   = 24 + NOKIA_COMPLETE_DATA_LEN;\r
+                        }\r
+                        else // if (frame_counter == 2)\r
+                        {\r
+                            current_bit = 0xFF;\r
+                            complete_data_len   = NOKIA_COMPLETE_DATA_LEN;\r
+                        }\r
+                    }\r

                 }\r
                 else\r
                 {\r
                 }\r
                 else\r
                 {\r


@@ -515,16 +546,16 @@ irsnd_ISR (void)
 #if IRSND_SUPPORT_SIRCS_PROTOCOL == 1\r
                     case IRMP_SIRCS_PROTOCOL:\r
                     {\r
 #if IRSND_SUPPORT_SIRCS_PROTOCOL == 1\r
                     case IRMP_SIRCS_PROTOCOL:\r
                     {\r

-                        startbit_pulse_len  = SIRCS_START_BIT_PULSE_LEN;\r
-                        startbit_pause_len  = SIRCS_START_BIT_PAUSE_LEN;\r
-                        pulse_1_len         = SIRCS_1_PULSE_LEN;\r
-                        pause_1_len         = SIRCS_PAUSE_LEN;\r
-                        pulse_0_len         = SIRCS_0_PULSE_LEN;\r
-                        pause_0_len         = SIRCS_PAUSE_LEN;\r
-                        has_stop_bit        = SIRCS_STOP_BIT;\r
-                        complete_data_len   = SIRCS_MINIMUM_DATA_LEN;\r
-                        n_frames            = SIRCS_REPETITION_CNT;                     // 3 frames\r
-                        repetition_pause    = SIRCS_REPETITION_LEN;                     // 25ms pause\r
+                        startbit_pulse_len      = SIRCS_START_BIT_PULSE_LEN;\r
+                        startbit_pause_len      = SIRCS_START_BIT_PAUSE_LEN;\r
+                        pulse_1_len             = SIRCS_1_PULSE_LEN;\r
+                        pause_1_len             = SIRCS_PAUSE_LEN;\r
+                        pulse_0_len             = SIRCS_0_PULSE_LEN;\r
+                        pause_0_len             = SIRCS_PAUSE_LEN;\r
+                        has_stop_bit            = SIRCS_STOP_BIT;\r
+                        complete_data_len       = SIRCS_MINIMUM_DATA_LEN;\r
+                        n_frames                = SIRCS_FRAMES;                             // 3 frames\r
+                        repetition_pause_len    = SIRCS_FRAME_REPETITION_LEN;               // 25ms pause\r

                         irsnd_set_freq (IRSND_FREQ_40_KHZ);\r
                         break;\r
                     }\r
                         irsnd_set_freq (IRSND_FREQ_40_KHZ);\r
                         break;\r
                     }\r


@@ -532,16 +563,16 @@ irsnd_ISR (void)
 #if IRSND_SUPPORT_NEC_PROTOCOL == 1\r
                     case IRMP_NEC_PROTOCOL:\r
                     {\r
 #if IRSND_SUPPORT_NEC_PROTOCOL == 1\r
                     case IRMP_NEC_PROTOCOL:\r
                     {\r

-                        startbit_pulse_len  = NEC_START_BIT_PULSE_LEN;\r
-                        startbit_pause_len  = NEC_START_BIT_PAUSE_LEN;\r
-                        pulse_1_len         = NEC_PULSE_LEN;\r
-                        pause_1_len         = NEC_1_PAUSE_LEN;\r
-                        pulse_0_len         = NEC_PULSE_LEN;\r
-                        pause_0_len         = NEC_0_PAUSE_LEN;\r
-                        has_stop_bit        = NEC_STOP_BIT;\r
-                        complete_data_len   = NEC_COMPLETE_DATA_LEN;\r
-                        n_frames            = 1;                                        // 1 frame\r
-                        repetition_pause    = 0;\r
+                        startbit_pulse_len      = NEC_START_BIT_PULSE_LEN;\r
+                        startbit_pause_len      = NEC_START_BIT_PAUSE_LEN;\r
+                        pulse_1_len             = NEC_PULSE_LEN;\r
+                        pause_1_len             = NEC_1_PAUSE_LEN;\r
+                        pulse_0_len             = NEC_PULSE_LEN;\r
+                        pause_0_len             = NEC_0_PAUSE_LEN;\r
+                        has_stop_bit            = NEC_STOP_BIT;\r
+                        complete_data_len       = NEC_COMPLETE_DATA_LEN;\r
+                        n_frames                = 1;                                        // 1 frame\r
+                        repetition_pause_len    = 0;\r

                         irsnd_set_freq (IRSND_FREQ_38_KHZ);\r
                         break;\r
                     }\r
                         irsnd_set_freq (IRSND_FREQ_38_KHZ);\r
                         break;\r
                     }\r


@@ -549,32 +580,32 @@ irsnd_ISR (void)
 #if IRSND_SUPPORT_SAMSUNG_PROTOCOL == 1\r
                     case IRMP_SAMSUNG_PROTOCOL:\r
                     {\r
 #if IRSND_SUPPORT_SAMSUNG_PROTOCOL == 1\r
                     case IRMP_SAMSUNG_PROTOCOL:\r
                     {\r

-                        startbit_pulse_len  = SAMSUNG_START_BIT_PULSE_LEN;\r
-                        startbit_pause_len  = SAMSUNG_START_BIT_PAUSE_LEN;\r
-                        pulse_1_len         = SAMSUNG_PULSE_LEN;\r
-                        pause_1_len         = SAMSUNG_1_PAUSE_LEN;\r
-                        pulse_0_len         = SAMSUNG_PULSE_LEN;\r
-                        pause_0_len         = SAMSUNG_0_PAUSE_LEN;\r
-                        has_stop_bit        = SAMSUNG_STOP_BIT;\r
-                        complete_data_len   = SAMSUNG_COMPLETE_DATA_LEN;\r
-                        n_frames            = 1;                                        // 1 frame\r
-                        repetition_pause    = 0;\r
+                        startbit_pulse_len      = SAMSUNG_START_BIT_PULSE_LEN;\r
+                        startbit_pause_len      = SAMSUNG_START_BIT_PAUSE_LEN;\r
+                        pulse_1_len             = SAMSUNG_PULSE_LEN;\r
+                        pause_1_len             = SAMSUNG_1_PAUSE_LEN;\r
+                        pulse_0_len             = SAMSUNG_PULSE_LEN;\r
+                        pause_0_len             = SAMSUNG_0_PAUSE_LEN;\r
+                        has_stop_bit            = SAMSUNG_STOP_BIT;\r
+                        complete_data_len       = SAMSUNG_COMPLETE_DATA_LEN;\r
+                        n_frames                = 1;                                        // 1 frame\r
+                        repetition_pause_len    = 0;\r

                         irsnd_set_freq (IRSND_FREQ_38_KHZ);\r
                         break;\r
                     }\r
 \r
                     case IRMP_SAMSUNG32_PROTOCOL:\r
                     {\r
                         irsnd_set_freq (IRSND_FREQ_38_KHZ);\r
                         break;\r
                     }\r
 \r
                     case IRMP_SAMSUNG32_PROTOCOL:\r
                     {\r

-                        startbit_pulse_len  = SAMSUNG_START_BIT_PULSE_LEN;\r
-                        startbit_pause_len  = SAMSUNG_START_BIT_PAUSE_LEN;\r
-                        pulse_1_len         = SAMSUNG_PULSE_LEN;\r
-                        pause_1_len         = SAMSUNG_1_PAUSE_LEN;\r
-                        pulse_0_len         = SAMSUNG_PULSE_LEN;\r
-                        pause_0_len         = SAMSUNG_0_PAUSE_LEN;\r
-                        has_stop_bit        = SAMSUNG_STOP_BIT;\r
-                        complete_data_len   = SAMSUNG32_COMPLETE_DATA_LEN;\r
-                        n_frames            = SAMSUNG32_REPETITION_CNT;                 // 2 frames\r
-                        repetition_pause    = SAMSUNG32_REPETITION_LEN;                 // 47 ms pause\r
+                        startbit_pulse_len      = SAMSUNG_START_BIT_PULSE_LEN;\r
+                        startbit_pause_len      = SAMSUNG_START_BIT_PAUSE_LEN;\r
+                        pulse_1_len             = SAMSUNG_PULSE_LEN;\r
+                        pause_1_len             = SAMSUNG_1_PAUSE_LEN;\r
+                        pulse_0_len             = SAMSUNG_PULSE_LEN;\r
+                        pause_0_len             = SAMSUNG_0_PAUSE_LEN;\r
+                        has_stop_bit            = SAMSUNG_STOP_BIT;\r
+                        complete_data_len       = SAMSUNG32_COMPLETE_DATA_LEN;\r
+                        n_frames                = SAMSUNG32_FRAMES;                         // 2 frames\r
+                        repetition_pause_len    = SAMSUNG32_FRAME_REPETITION_LEN;           // 47 ms pause\r

                         irsnd_set_freq (IRSND_FREQ_38_KHZ);\r
                         break;\r
                     }\r
                         irsnd_set_freq (IRSND_FREQ_38_KHZ);\r
                         break;\r
                     }\r


@@ -582,16 +613,16 @@ irsnd_ISR (void)
 #if IRSND_SUPPORT_MATSUSHITA_PROTOCOL == 1\r
                     case IRMP_MATSUSHITA_PROTOCOL:\r
                     {\r
 #if IRSND_SUPPORT_MATSUSHITA_PROTOCOL == 1\r
                     case IRMP_MATSUSHITA_PROTOCOL:\r
                     {\r

-                        startbit_pulse_len  = MATSUSHITA_START_BIT_PULSE_LEN;\r
-                        startbit_pause_len  = MATSUSHITA_START_BIT_PAUSE_LEN;\r
-                        pulse_1_len         = MATSUSHITA_PULSE_LEN;\r
-                        pause_1_len         = MATSUSHITA_1_PAUSE_LEN;\r
-                        pulse_0_len         = MATSUSHITA_PULSE_LEN;\r
-                        pause_0_len         = MATSUSHITA_0_PAUSE_LEN;\r
-                        has_stop_bit        = MATSUSHITA_STOP_BIT;\r
-                        complete_data_len   = MATSUSHITA_COMPLETE_DATA_LEN;\r
-                        n_frames            = 1;                                        // 1 frame\r
-                        repetition_pause    = 0;\r
+                        startbit_pulse_len      = MATSUSHITA_START_BIT_PULSE_LEN;\r
+                        startbit_pause_len      = MATSUSHITA_START_BIT_PAUSE_LEN;\r
+                        pulse_1_len             = MATSUSHITA_PULSE_LEN;\r
+                        pause_1_len             = MATSUSHITA_1_PAUSE_LEN;\r
+                        pulse_0_len             = MATSUSHITA_PULSE_LEN;\r
+                        pause_0_len             = MATSUSHITA_0_PAUSE_LEN;\r
+                        has_stop_bit            = MATSUSHITA_STOP_BIT;\r
+                        complete_data_len       = MATSUSHITA_COMPLETE_DATA_LEN;\r
+                        n_frames                = 1;                                        // 1 frame\r
+                        repetition_pause_len    = 0;\r

                         irsnd_set_freq (IRSND_FREQ_36_KHZ);\r
                         break;\r
                     }\r
                         irsnd_set_freq (IRSND_FREQ_36_KHZ);\r
                         break;\r
                     }\r


@@ -599,16 +630,16 @@ irsnd_ISR (void)
 #if IRSND_SUPPORT_RECS80_PROTOCOL == 1\r
                     case IRMP_RECS80_PROTOCOL:\r
                     {\r
 #if IRSND_SUPPORT_RECS80_PROTOCOL == 1\r
                     case IRMP_RECS80_PROTOCOL:\r
                     {\r

-                        startbit_pulse_len  = RECS80_START_BIT_PULSE_LEN;\r
-                        startbit_pause_len  = RECS80_START_BIT_PAUSE_LEN;\r
-                        pulse_1_len         = RECS80_PULSE_LEN;\r
-                        pause_1_len         = RECS80_1_PAUSE_LEN;\r
-                        pulse_0_len         = RECS80_PULSE_LEN;\r
-                        pause_0_len         = RECS80_0_PAUSE_LEN;\r
-                        has_stop_bit        = RECS80_STOP_BIT;\r
-                        complete_data_len   = RECS80_COMPLETE_DATA_LEN;\r
-                        n_frames            = 1;                                        // 1 frame\r
-                        repetition_pause    = 0;\r
+                        startbit_pulse_len      = RECS80_START_BIT_PULSE_LEN;\r
+                        startbit_pause_len      = RECS80_START_BIT_PAUSE_LEN;\r
+                        pulse_1_len             = RECS80_PULSE_LEN;\r
+                        pause_1_len             = RECS80_1_PAUSE_LEN;\r
+                        pulse_0_len             = RECS80_PULSE_LEN;\r
+                        pause_0_len             = RECS80_0_PAUSE_LEN;\r
+                        has_stop_bit            = RECS80_STOP_BIT;\r
+                        complete_data_len       = RECS80_COMPLETE_DATA_LEN;\r
+                        n_frames                = 1;                                        // 1 frame\r
+                        repetition_pause_len    = 0;\r

                         irsnd_set_freq (IRSND_FREQ_38_KHZ);\r
                         break;\r
                     }\r
                         irsnd_set_freq (IRSND_FREQ_38_KHZ);\r
                         break;\r
                     }\r


@@ -616,16 +647,16 @@ irsnd_ISR (void)
 #if IRSND_SUPPORT_RECS80EXT_PROTOCOL == 1\r
                     case IRMP_RECS80EXT_PROTOCOL:\r
                     {\r
 #if IRSND_SUPPORT_RECS80EXT_PROTOCOL == 1\r
                     case IRMP_RECS80EXT_PROTOCOL:\r
                     {\r

-                        startbit_pulse_len  = RECS80EXT_START_BIT_PULSE_LEN;\r
-                        startbit_pause_len  = RECS80EXT_START_BIT_PAUSE_LEN;\r
-                        pulse_1_len         = RECS80EXT_PULSE_LEN;\r
-                        pause_1_len         = RECS80EXT_1_PAUSE_LEN;\r
-                        pulse_0_len         = RECS80EXT_PULSE_LEN;\r
-                        pause_0_len         = RECS80EXT_0_PAUSE_LEN;\r
-                        has_stop_bit        = RECS80EXT_STOP_BIT;\r
-                        complete_data_len   = RECS80EXT_COMPLETE_DATA_LEN;\r
-                        n_frames            = 1;                                        // 1 frame\r
-                        repetition_pause    = 0;\r
+                        startbit_pulse_len      = RECS80EXT_START_BIT_PULSE_LEN;\r
+                        startbit_pause_len      = RECS80EXT_START_BIT_PAUSE_LEN;\r
+                        pulse_1_len             = RECS80EXT_PULSE_LEN;\r
+                        pause_1_len             = RECS80EXT_1_PAUSE_LEN;\r
+                        pulse_0_len             = RECS80EXT_PULSE_LEN;\r
+                        pause_0_len             = RECS80EXT_0_PAUSE_LEN;\r
+                        has_stop_bit            = RECS80EXT_STOP_BIT;\r
+                        complete_data_len       = RECS80EXT_COMPLETE_DATA_LEN;\r
+                        n_frames                = 1;                                        // 1 frame\r
+                        repetition_pause_len    = 0;\r

                         irsnd_set_freq (IRSND_FREQ_38_KHZ);\r
                         break;\r
                     }\r
                         irsnd_set_freq (IRSND_FREQ_38_KHZ);\r
                         break;\r
                     }\r


@@ -633,16 +664,16 @@ irsnd_ISR (void)
 #if IRSND_SUPPORT_RC5_PROTOCOL == 1\r
                     case IRMP_RC5_PROTOCOL:\r
                     {\r
 #if IRSND_SUPPORT_RC5_PROTOCOL == 1\r
                     case IRMP_RC5_PROTOCOL:\r
                     {\r

-                        startbit_pulse_len  = RC5_BIT_LEN;\r
-                        startbit_pause_len  = RC5_BIT_LEN;\r
-                        pulse_1_len         = RC5_BIT_LEN;\r
-                        pause_1_len         = RC5_BIT_LEN;\r
-                        pulse_0_len         = RC5_BIT_LEN;\r
-                        pause_0_len         = RC5_BIT_LEN;\r
-                        has_stop_bit        = RC5_STOP_BIT;\r
-                        complete_data_len   = RC5_COMPLETE_DATA_LEN;\r
-                        n_frames            = 1;                                        // 1 frame\r
-                        repetition_pause    = 0;\r
+                        startbit_pulse_len      = RC5_BIT_LEN;\r
+                        startbit_pause_len      = RC5_BIT_LEN;\r
+                        pulse_1_len             = RC5_BIT_LEN;\r
+                        pause_1_len             = RC5_BIT_LEN;\r
+                        pulse_0_len             = RC5_BIT_LEN;\r
+                        pause_0_len             = RC5_BIT_LEN;\r
+                        has_stop_bit            = RC5_STOP_BIT;\r
+                        complete_data_len       = RC5_COMPLETE_DATA_LEN;\r
+                        n_frames                = 1;                                        // 1 frame\r
+                        repetition_pause_len    = 0;\r

                         irsnd_set_freq (IRSND_FREQ_36_KHZ);\r
                         break;\r
                     }\r
                         irsnd_set_freq (IRSND_FREQ_36_KHZ);\r
                         break;\r
                     }\r


@@ -650,16 +681,16 @@ irsnd_ISR (void)
 #if IRSND_SUPPORT_DENON_PROTOCOL == 1\r
                     case IRMP_DENON_PROTOCOL:\r
                     {\r
 #if IRSND_SUPPORT_DENON_PROTOCOL == 1\r
                     case IRMP_DENON_PROTOCOL:\r
                     {\r

-                        startbit_pulse_len  = 0x00;\r
-                        startbit_pause_len  = 0x00;\r
-                        pulse_1_len         = DENON_PULSE_LEN;\r
-                        pause_1_len         = DENON_1_PAUSE_LEN;\r
-                        pulse_0_len         = DENON_PULSE_LEN;\r
-                        pause_0_len         = DENON_0_PAUSE_LEN;\r
-                        has_stop_bit        = DENON_STOP_BIT;\r
-                        complete_data_len   = DENON_COMPLETE_DATA_LEN;\r
-                        n_frames            = DENON_REPETITION_CNT;                     // 2 frames, 2nd with inverted command\r
-                        repetition_pause    = DENON_REPETITION_LEN;                     // 65 ms pause after 1st frame\r
+                        startbit_pulse_len      = 0x00;\r
+                        startbit_pause_len      = 0x00;\r
+                        pulse_1_len             = DENON_PULSE_LEN;\r
+                        pause_1_len             = DENON_1_PAUSE_LEN;\r
+                        pulse_0_len             = DENON_PULSE_LEN;\r
+                        pause_0_len             = DENON_0_PAUSE_LEN;\r
+                        has_stop_bit            = DENON_STOP_BIT;\r
+                        complete_data_len       = DENON_COMPLETE_DATA_LEN;\r
+                        n_frames                = DENON_FRAMES;                             // 2 frames, 2nd with inverted command\r
+                        repetition_pause_len    = DENON_FRAME_REPETITION_LEN;               // 65 ms pause after 1st frame\r

                         irsnd_set_freq (IRSND_FREQ_32_KHZ);\r
                         break;\r
                     }\r
                         irsnd_set_freq (IRSND_FREQ_32_KHZ);\r
                         break;\r
                     }\r


@@ -667,16 +698,16 @@ irsnd_ISR (void)
 #if IRSND_SUPPORT_NUBERT_PROTOCOL == 1\r
                     case IRMP_NUBERT_PROTOCOL:\r
                     {\r
 #if IRSND_SUPPORT_NUBERT_PROTOCOL == 1\r
                     case IRMP_NUBERT_PROTOCOL:\r
                     {\r

-                        startbit_pulse_len  = NUBERT_START_BIT_PULSE_LEN;\r
-                        startbit_pause_len  = NUBERT_START_BIT_PAUSE_LEN;\r
-                        pulse_1_len         = NUBERT_1_PULSE_LEN;\r
-                        pause_1_len         = NUBERT_1_PAUSE_LEN;\r
-                        pulse_0_len         = NUBERT_0_PULSE_LEN;\r
-                        pause_0_len         = NUBERT_0_PAUSE_LEN;\r
-                        has_stop_bit        = NUBERT_STOP_BIT;\r
-                        complete_data_len   = NUBERT_COMPLETE_DATA_LEN;\r
-                        n_frames            = NUBERT_REPETITION_CNT;                    // 2 frames\r
-                        repetition_pause    = NUBERT_REPETITION_LEN;                    // 35 ms pause\r
+                        startbit_pulse_len      = NUBERT_START_BIT_PULSE_LEN;\r
+                        startbit_pause_len      = NUBERT_START_BIT_PAUSE_LEN;\r
+                        pulse_1_len             = NUBERT_1_PULSE_LEN;\r
+                        pause_1_len             = NUBERT_1_PAUSE_LEN;\r
+                        pulse_0_len             = NUBERT_0_PULSE_LEN;\r
+                        pause_0_len             = NUBERT_0_PAUSE_LEN;\r
+                        has_stop_bit            = NUBERT_STOP_BIT;\r
+                        complete_data_len       = NUBERT_COMPLETE_DATA_LEN;\r
+                        n_frames                = NUBERT_FRAMES;                            // 2 frames\r
+                        repetition_pause_len    = NUBERT_FRAME_REPETITION_LEN;              // 35 ms pause\r

                         irsnd_set_freq (IRSND_FREQ_36_KHZ);\r
                         break;\r
                     }\r
                         irsnd_set_freq (IRSND_FREQ_36_KHZ);\r
                         break;\r
                     }\r


@@ -684,17 +715,17 @@ irsnd_ISR (void)
 #if IRSND_SUPPORT_BANG_OLUFSEN_PROTOCOL == 1\r
                     case IRMP_BANG_OLUFSEN_PROTOCOL:\r
                     {\r
 #if IRSND_SUPPORT_BANG_OLUFSEN_PROTOCOL == 1\r
                     case IRMP_BANG_OLUFSEN_PROTOCOL:\r
                     {\r

-                        startbit_pulse_len  = BANG_OLUFSEN_START_BIT1_PULSE_LEN;\r
-                        startbit_pause_len  = BANG_OLUFSEN_START_BIT1_PAUSE_LEN;\r
-                        pulse_1_len         = BANG_OLUFSEN_PULSE_LEN;\r
-                        pause_1_len         = BANG_OLUFSEN_1_PAUSE_LEN;\r
-                        pulse_0_len         = BANG_OLUFSEN_PULSE_LEN;\r
-                        pause_0_len         = BANG_OLUFSEN_0_PAUSE_LEN;\r
-                        has_stop_bit        = BANG_OLUFSEN_STOP_BIT;\r
-                        complete_data_len   = BANG_OLUFSEN_COMPLETE_DATA_LEN;\r
-                        n_frames            = 1;                                        // 1 frame\r
-                        repetition_pause    = 0;\r
-                        last_bit_value      = 0;\r
+                        startbit_pulse_len      = BANG_OLUFSEN_START_BIT1_PULSE_LEN;\r
+                        startbit_pause_len      = BANG_OLUFSEN_START_BIT1_PAUSE_LEN;\r
+                        pulse_1_len             = BANG_OLUFSEN_PULSE_LEN;\r
+                        pause_1_len             = BANG_OLUFSEN_1_PAUSE_LEN;\r
+                        pulse_0_len             = BANG_OLUFSEN_PULSE_LEN;\r
+                        pause_0_len             = BANG_OLUFSEN_0_PAUSE_LEN;\r
+                        has_stop_bit            = BANG_OLUFSEN_STOP_BIT;\r
+                        complete_data_len       = BANG_OLUFSEN_COMPLETE_DATA_LEN;\r
+                        n_frames                = 1;                                        // 1 frame\r
+                        repetition_pause_len    = 0;\r
+                        last_bit_value          = 0;\r

                         irsnd_set_freq (IRSND_FREQ_455_KHZ);\r
                         break;\r
                     }\r
                         irsnd_set_freq (IRSND_FREQ_455_KHZ);\r
                         break;\r
                     }\r


@@ -702,17 +733,34 @@ irsnd_ISR (void)
 #if IRSND_SUPPORT_GRUNDIG_PROTOCOL == 1\r
                     case IRMP_GRUNDIG_PROTOCOL:\r
                     {\r
 #if IRSND_SUPPORT_GRUNDIG_PROTOCOL == 1\r
                     case IRMP_GRUNDIG_PROTOCOL:\r
                     {\r

-                        startbit_pulse_len  = GRUNDIG_BIT_LEN;\r
-                        startbit_pause_len  = GRUNDIG_PRE_PAUSE_LEN;\r
-                        pulse_1_len         = GRUNDIG_BIT_LEN;\r
-                        pause_1_len         = GRUNDIG_BIT_LEN;\r
-                        pulse_0_len         = GRUNDIG_BIT_LEN;\r
-                        pause_0_len         = GRUNDIG_BIT_LEN;\r
-                        has_stop_bit        = GRUNDIG_STOP_BIT;\r
-                        complete_data_len   = GRUNDIG_COMPLETE_DATA_LEN;\r
-                        n_frames            = GRUNDIG_REPETITION_CNT;           // 2 frames\r
-                        repetition_pause    = GRUNDIG_REPETITION_LEN;           // 20msec pause\r
-                        irsnd_set_freq (IRSND_FREQ_36_KHZ);\r
+                        startbit_pulse_len      = GRUNDIG_OR_NOKIA_BIT_LEN;\r
+                        startbit_pause_len      = GRUNDIG_OR_NOKIA_PRE_PAUSE_LEN;\r
+                        pulse_1_len             = GRUNDIG_OR_NOKIA_BIT_LEN;\r
+                        pause_1_len             = GRUNDIG_OR_NOKIA_BIT_LEN;\r
+                        pulse_0_len             = GRUNDIG_OR_NOKIA_BIT_LEN;\r
+                        pause_0_len             = GRUNDIG_OR_NOKIA_BIT_LEN;\r
+                        has_stop_bit            = GRUNDIG_OR_NOKIA_STOP_BIT;\r
+                        complete_data_len       = GRUNDIG_COMPLETE_DATA_LEN;\r
+                        n_frames                = GRUNDIG_FRAMES;                   // 2 frames\r
+                        repetition_pause_len    = GRUNDIG_FRAME_REPETITION_LEN;     // 20msec pause\r
+                        irsnd_set_freq (IRSND_FREQ_38_KHZ);\r
+                        break;\r
+                    }\r
+#endif\r
+#if IRSND_SUPPORT_NOKIA_PROTOCOL == 1\r
+                    case IRMP_NOKIA_PROTOCOL:\r
+                    {\r
+                        startbit_pulse_len      = GRUNDIG_OR_NOKIA_BIT_LEN;\r
+                        startbit_pause_len      = GRUNDIG_OR_NOKIA_PRE_PAUSE_LEN;\r
+                        pulse_1_len             = GRUNDIG_OR_NOKIA_BIT_LEN;\r
+                        pause_1_len             = GRUNDIG_OR_NOKIA_BIT_LEN;\r
+                        pulse_0_len             = GRUNDIG_OR_NOKIA_BIT_LEN;\r
+                        pause_0_len             = GRUNDIG_OR_NOKIA_BIT_LEN;\r
+                        has_stop_bit            = GRUNDIG_OR_NOKIA_STOP_BIT;\r
+                        complete_data_len       = NOKIA_COMPLETE_DATA_LEN;\r
+                        n_frames                = NOKIA_FRAMES;                   // 2 frames\r
+                        repetition_pause_len    = NOKIA_FRAME_REPETITION_LEN;     // 20msec pause\r
+                        irsnd_set_freq (IRSND_FREQ_38_KHZ);\r

                         break;\r
                     }\r
 #endif\r
                         break;\r
                     }\r
 #endif\r


@@ -980,12 +1028,15 @@ irsnd_ISR (void)
                 }\r
 #endif // IRSND_SUPPORT_RC5_PROTOCOL\r
 \r
                 }\r
 #endif // IRSND_SUPPORT_RC5_PROTOCOL\r
 \r

-#if IRSND_SUPPORT_GRUNDIG_PROTOCOL == 1\r
+#if IRSND_SUPPORT_GRUNDIG_PROTOCOL == 1 || IRSND_SUPPORT_NOKIA_PROTOCOL == 1\r

                 case IRMP_GRUNDIG_PROTOCOL:\r
                 case IRMP_GRUNDIG_PROTOCOL:\r

+                case IRMP_NOKIA_PROTOCOL:\r

                 {\r
                     uint8_t next_bit = FALSE;\r
 \r
                 {\r
                     uint8_t next_bit = FALSE;\r
 \r

-                    if (current_bit == 0xFF || current_bit == 15)                         // start bit of 1st or 2nd frame\r
+                    if (current_bit == 0xFF ||                                                                  // start bit of 1st frame\r
+                        (irsnd_protocol == IRMP_GRUNDIG_PROTOCOL && current_bit == 15) ||                       // start bit of 2nd frame (Grundig)\r
+                        (irsnd_protocol == IRMP_NOKIA_PROTOCOL && (current_bit == 23 || current_bit == 47)))    // start bit of 2nd/3rd frame (Nokia)\r

                     {\r
                         if (pulse_counter == 0)\r
                         {\r
                     {\r
                         if (pulse_counter == 0)\r
                         {\r


@@ -1024,7 +1075,7 @@ irsnd_ISR (void)
 \r
                         if (first_pulse)\r
                         {\r
 \r
                         if (first_pulse)\r
                         {\r

-                            if (pulse_counter < GRUNDIG_BIT_LEN)\r
+                            if (pulse_counter < GRUNDIG_OR_NOKIA_BIT_LEN)\r

                             {\r
                                 if (pulse_counter == 0)\r
                                 {\r
                             {\r
                                 if (pulse_counter == 0)\r
                                 {\r


@@ -1032,7 +1083,7 @@ irsnd_ISR (void)
                                 }\r
                                 pulse_counter++;\r
                             }\r
                                 }\r
                                 pulse_counter++;\r
                             }\r

-                            else if (pause_counter < GRUNDIG_BIT_LEN)\r
+                            else if (pause_counter < GRUNDIG_OR_NOKIA_BIT_LEN)\r

                             {\r
                                 if (pause_counter == 0)\r
                                 {\r
                             {\r
                                 if (pause_counter == 0)\r
                                 {\r


@@ -1047,7 +1098,7 @@ irsnd_ISR (void)
                         }\r
                         else\r
                         {\r
                         }\r
                         else\r
                         {\r

-                            if (pause_counter < GRUNDIG_BIT_LEN)\r
+                            if (pause_counter < GRUNDIG_OR_NOKIA_BIT_LEN)\r

                             {\r
                                 if (pause_counter == 0)\r
                                 {\r
                             {\r
                                 if (pause_counter == 0)\r
                                 {\r


@@ -1055,7 +1106,7 @@ irsnd_ISR (void)
                                 }\r
                                 pause_counter++;\r
                             }\r
                                 }\r
                                 pause_counter++;\r
                             }\r

-                            else if (pulse_counter < GRUNDIG_BIT_LEN)\r
+                            else if (pulse_counter < GRUNDIG_OR_NOKIA_BIT_LEN)\r

                             {\r
                                 if (pulse_counter == 0)\r
                                 {\r
                             {\r
                                 if (pulse_counter == 0)\r
                                 {\r


@@ -1094,7 +1145,7 @@ irsnd_ISR (void)
                     }\r
                     break;\r
                 }\r
                     }\r
                     break;\r
                 }\r

-#endif // IRSND_SUPPORT_GRUNDIG_PROTOCOL\r
+#endif // IRSND_SUPPORT_GRUNDIG_PROTOCOL || IRSND_SUPPORT_NOKIA_PROTOCOL\r

 \r
                 default:\r
                 {\r
 \r
                 default:\r
                 {\r

diff --git a/irsnd.exe b/irsnd.exe
index 5bce0d73e4606cfaff8cae55630e45ff989a7ebb..e265b359fd60ea0f2423b6519709e9eb4c2ee4a6 100644 (file)
Binary files a/irsnd.exe and b/irsnd.exe differ

diff --git a/irsndconfig.h b/irsndconfig.h
index 81772bf1ed901f6f2071b72d7076d4081763cd8e..f08506e7e52abfeb651f26e8162ea0f13248b332 100644 (file)
--- a/irsndconfig.h
+++ b/irsndconfig.h
@@ -3,7 +3,7 @@
  *\r
  * Copyright (c) 2010 Frank Meyer - frank(at)fli4l.de\r
  *\r
  *\r
  * Copyright (c) 2010 Frank Meyer - frank(at)fli4l.de\r
  *\r

- * $Id: irsndconfig.h,v 1.2 2010/05/17 10:31:43 fm Exp $\r
+ * $Id: irsndconfig.h,v 1.3 2010/05/26 08:34:30 fm Exp $\r

  *\r
  * ATMEGA88 @ 8 MHz\r
  *\r
  *\r
  * ATMEGA88 @ 8 MHz\r
  *\r


@@ -34,6 +34,7 @@
 #define IRSND_SUPPORT_NUBERT_PROTOCOL           1       // flag: support NUBERT                 uses ~100 bytes\r
 #define IRSND_SUPPORT_BANG_OLUFSEN_PROTOCOL     1       // flag: support Bang&Olufsen           uses ~250 bytes\r
 #define IRSND_SUPPORT_GRUNDIG_PROTOCOL          1       // flag: support Grundig                uses ~250 bytes\r
 #define IRSND_SUPPORT_NUBERT_PROTOCOL           1       // flag: support NUBERT                 uses ~100 bytes\r
 #define IRSND_SUPPORT_BANG_OLUFSEN_PROTOCOL     1       // flag: support Bang&Olufsen           uses ~250 bytes\r
 #define IRSND_SUPPORT_GRUNDIG_PROTOCOL          1       // flag: support Grundig                uses ~250 bytes\r

+#define IRSND_SUPPORT_NOKIA_PROTOCOL            1       // flag: support Nokia                  uses ~150 bytes\r

 \r
 \r
 /*---------------------------------------------------------------------------------------------------------------------------------------------------\r
 \r
 \r
 /*---------------------------------------------------------------------------------------------------------------------------------------------------\r