new images

Started a README

README.md

@@ -0,0 +1,3 @@
+Homegrown CAN/OW based home automation.
+
+https://wiebel.org/CANNode/

src/CANNode.cpp

@@ -2,9 +2,9 @@
 
 // -------------------------------------------------------------
 // CANNode for Teensy 3.1/3.2
-//
-// by wiebel
-//
+// GPLv2
+// by wiebel (c) 2015-2018 
+// github_push_test_01
 
 #include <Metro.h>
 #include <FlexCAN.h>

src/Node_1_def.h

@@ -1,4 +1,6 @@
-// Configuration
+#include "CANNode.h"
+
+// Node 01 - Dachstuhl
 #define NODE_ID 0x01
 
 // Misc

src/Node_2_def.h

@@ -1,5 +1,6 @@
 #include "CANNode.h"
-// Configuration
+
+// Node 02 - Werkstatt
 #define NODE_ID 0x02
 
 // Misc
@@ -30,7 +31,8 @@ static OW_switch_t switches[N_SWITCHES] PROGMEM={
 //  nick, addr[8], event_tag[pioA_FALL, pioA_RISE, pioB_FALL, pioB_RISE]
  { 255, { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, { 0, 0, 0, 0 } },
  { 21, { 0x12, 0x86, 0xB4, 0x54, 0x0, 0x0, 0x0, 0x5F }, { 23, 23, 37, 37 } }, // Flur
- { 22, { 0x12, 0x5E, 0xFF, 0x55, 0x0, 0x0, 0x0, 0x2C }, { 21, 21, 22, 22 } }, // WZ
+ { 22, { 0x12, 0xC7, 0x2F, 0xCF, 0x0, 0x0, 0x0, 0xAF }, { 22, 22, 21, 21 } }, // WZ
+// { 22, { 0x12, 0x5E, 0xFF, 0x55, 0x0, 0x0, 0x0, 0x2C }, { 21, 21, 22, 22 } }, // WZ
  { 0, { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, { 0, 0, 0, 0 } }
 };
 static uint8_t switches_state[N_SWITCHES];

src/Node_3_def.h

@@ -1,5 +1,6 @@
 #include "CANNode.h"
-// Configuration
+
+// Node 03 - Keller
 #define NODE_ID 0x03
 
 // Misc
@@ -34,8 +35,6 @@ static OW_switch_t switches[N_SWITCHES] PROGMEM={
  //{ 21, { 0x12, 0x86, 0xB4, 0x54, 0x0, 0x0, 0x0, 0x5F }, { 3, 3, 4, 4 } },
  { 22, { 0x12, 0x84, 0xAD, 0x4F, 0x0, 0x0, 0x0, 0x12 }, { 1, 1, 2, 2 } }, // EZ -> Küche
 // { 31, { 0x12, 0x88, 0xDD, 0x53, 0x0, 0x0, 0x0, 0x28 }, { 210, 211, 220, 221 } }, // Roldenschalter (A - UP, B - DOWN)
- { 23, { 0x12, 0x68, 0x31, 0x67, 0x0, 0x0, 0x0, 0xBC }, { 2, 2, 3, 3 } }, // Terrasse
- { 24, { 0x12, 0x88, 0xDD, 0x53, 0x0, 0x0, 0x0, 0x28 }, { 50, 51, 40, 41 } }, // Rolladen
 };
 static uint8_t switches_state[N_SWITCHES];
 static outputs_t outputs[N_OUTPUTS] PROGMEM={
@@ -46,8 +45,13 @@ static outputs_t outputs[N_OUTPUTS] PROGMEM={
   { GPIO, 22, 0, true },  	// 3
   { GPIO, 17, 0, true },  	// 4
   { GPIO, 16, 0, true },  	// 5
+<<<<<<< HEAD
+  { GPIO, 9,  255, true },   	// 6
+  { GPIO, 10, 0, true },  	// 7
+=======
   { GPIO, 19, 0, true },  	// 6
   { GPIO, 18, 0, true },  	// 7
+>>>>>>> led
   { NOP, 0xFF, 0, 0 }
 };
 static uint8_t outputs_state[N_OUTPUTS];
@@ -61,12 +65,8 @@ static event_t tx_events[N_EVENTS] PROGMEM={
 { 1, 0x03, 0x03, TOGGLE, 0x01},
 { 2, 0x03, 0x03, TOGGLE, 0x02},
 { 3, 0x03, 0x03, TOGGLE, 0x03},
-{ 40, 0x03, 0x03, OFF, 0x04},
-{ 41, 0x03, 0x03, OFF, 0x05},
-{ 41, 0x03, 0x03, ON, 0x04},
-{ 50, 0x03, 0x03, OFF, 0x05},
-{ 51, 0x03, 0x03, OFF, 0x04},
-{ 51, 0x03, 0x03, ON, 0x05},
+{ 4, 0x03, 0x03, TOGGLE, 0x04},
+{ 5, 0x03, 0x03, TOGGLE, 0x05},
 { 6, 0x03, 0x03, TOGGLE, 0x06},
 { 7, 0x03, 0x03, TOGGLE, 0x07},
 { 8, 0x03, 0x03, TOGGLE, 0x08},
@@ -104,19 +104,6 @@ static action_t action_map[N_ACTIONS] PROGMEM={
   {7, 6},
   {8, 7},
   {9, 0},{9, 1},{9, 2},{9, 3},{9, 4},{9, 5},{9, 6},{9, 7},
-  {101, 1},
-  {102, 2},
-  {103, 3},
-  {104, 4},
-  {105, 5},
-  {106, 6},
-  {107, 7},
-  {108, 8},
-  {109, 9},
-  {110, 10},
-  {111, 11},
-  {112, 12},
-  {113, 13},
   {210, 210},
   {211, 211},
   {220, 220},