From 8b40a6d36ed21b562094a0a1dd62d24de61d4f4d Mon Sep 17 00:00:00 2001
From: wiebel <git@wiebel.org>
Date: Fri, 2 Jun 2017 23:25:30 +0200
Subject: [PATCH] latest

---
 src/CANNode.h    | 4 ----
 src/Node_1_def.h | 4 ++--
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/CANNode.h b/src/CANNode.h
index 3fb600f..8f78b25 100644
--- a/src/CANNode.h
+++ b/src/CANNode.h
@@ -51,7 +51,3 @@ typedef struct outputs_t {
   bool invert;
 } outputs_t;
 #endif
-<<<<<<< HEAD
-// mirror test 02 
-=======
->>>>>>> parent of f052826... mirror test
diff --git a/src/Node_1_def.h b/src/Node_1_def.h
index a463988..fc296de 100644
--- a/src/Node_1_def.h
+++ b/src/Node_1_def.h
@@ -29,9 +29,9 @@ static OW_switch_t switches[N_SWITCHES] PROGMEM={
 //  nick, addr[8], event_tag[sw1, sw2]
  { 255, { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, { 0, 0, 0, 0 } },
  { 201, { 0x12, 0x5b, 0x27, 0x50, 0x0, 0x0, 0x0, 0x26 }, { 1, 11, 2, 12 } }, //  Flur -> Bad
-// { 202, { 0x12, 0xF7, 0x95, 0x4F, 0x0, 0x0, 0x0, 0x69 }, { 3, 4 } },
+ { 202, { 0x12, 0xF7, 0x95, 0x4F, 0x0, 0x0, 0x0, 0x69 }, { 9, 9, 7, 7 } }, // Treppe Unten
 // { 203, { 0x12, 0x68, 0x31, 0x67, 0x0, 0x0, 0x0, 0xBC }, { 5, 6 } },
- { 204, { 0x12, 0x5E, 0xFF, 0x55, 0x0, 0x0, 0x0, 0x2C }, { 9, 9, 7, 7 } }, // Treppe Unten
+// { 204, { 0x12, 0x5E, 0xFF, 0x55, 0x0, 0x0, 0x0, 0x2C }, { 9, 9, 7, 7 } }, // Treppe Unten (def)
  { 205, { 0x12, 0x7B, 0x44, 0x4D, 0x0, 0x0, 0x0, 0x6A }, { 3, 3, 7, 7 } }, // Treppe Oben
  { 101, { 0x12, 0xC1, 0x4E, 0x67, 0x0, 0x0, 0x0, 0x74 }, { 3, 3, 0, 0 } }, // Flur -> Flur
  { 102, { 0x12, 0xA9, 0x97, 0x4F, 0x0, 0x0, 0x0, 0xD7 }, { 4, 4, 0, 0 } }, // Inka