From c96ae8e27b7f76bcc8bbacc50f351300e0532c43 Mon Sep 17 00:00:00 2001 From: Barduino Date: Mon, 24 Aug 2015 16:04:13 -0400 Subject: [PATCH 1/5] Minor Fixes and a sensors active --- .../examples/MockMySensors/MockMySensors.ino | 56 ++++++++++--------- 1 file changed, 29 insertions(+), 27 deletions(-) diff --git a/libraries/MySensors/examples/MockMySensors/MockMySensors.ino b/libraries/MySensors/examples/MockMySensors/MockMySensors.ino index 466fb29..809f9fe 100644 --- a/libraries/MySensors/examples/MockMySensors/MockMySensors.ino +++ b/libraries/MySensors/examples/MockMySensors/MockMySensors.ino @@ -44,37 +44,37 @@ // one at a time. #define ID_S_ARMED 0 // dummy to controll armed stated for several sensors #define ID_S_DOOR 1 -//#define ID_S_MOTION 2 -//#define ID_S_SMOKE 3 -//#define ID_S_LIGHT 4 -//#define ID_S_DIMMER 5 -//#define ID_S_COVER 6 -//#define ID_S_TEMP 7 -//#define ID_S_HUM 8 -//#define ID_S_BARO 9 -//#define ID_S_WIND 10 -//#define ID_S_RAIN 11 -//#define ID_S_UV 12 -//#define ID_S_WEIGHT 13 -//#define ID_S_POWER 14 -//#define ID_S_HEATER 15 -//#define ID_S_DISTANCE 16 -//#define ID_S_LIGHT_LEVEL 17 -//#define ID_S_LOCK 18 -//#define ID_S_IR 19 -//#define ID_S_WATER 20 -//#define ID_S_AIR_QUALITY 21 -//#define ID_S_DUST 22 -//#define ID_S_SCENE_CONTROLLER 23 -//#define ID_S_CUSTOM 99 +#define ID_S_MOTION 2 +#define ID_S_SMOKE 3 +#define ID_S_LIGHT 4 +#define ID_S_DIMMER 5 +#define ID_S_COVER 6 +#define ID_S_TEMP 7 +#define ID_S_HUM 8 +#define ID_S_BARO 9 +#define ID_S_WIND 10 +#define ID_S_RAIN 11 +#define ID_S_UV 12 +#define ID_S_WEIGHT 13 +#define ID_S_POWER 14 +#define ID_S_HEATER 15 +#define ID_S_DISTANCE 16 +#define ID_S_LIGHT_LEVEL 17 +#define ID_S_LOCK 18 +#define ID_S_IR 19 +#define ID_S_WATER 20 +#define ID_S_AIR_QUALITY 21 +#define ID_S_DUST 22 +#define ID_S_SCENE_CONTROLLER 23 +#define ID_S_CUSTOM 99 // Global Vars -unsigned long SLEEP_TIME = 180000; // Sleep time between reads (in milliseconds) +unsigned long SLEEP_TIME = 300000; // Sleep time between reads (in milliseconds) boolean metric = true; long randNumber; // Instanciate MySersors Gateway -MyTransportNRF24 transport(RF24_CE_PIN, RF24_CS_PIN, RF24_PA_LEVEL_GW); +MyTransportNRF24 transport(RF24_CE_PIN, RF24_CS_PIN, RF24_PA_LEVEL); //MyTransportRFM69 transport; // Message signing driver (signer needed if MY_SIGNING_FEATURE is turned on in MyConfig.h) @@ -309,7 +309,7 @@ void setup() #endif #ifdef ID_S_TEMP - Serial.println(" S_TMEP"); + Serial.println(" S_TEMP"); gw.present(ID_S_TEMP,S_TEMP); gw.wait(SHORT_WAIT); #endif @@ -924,6 +924,7 @@ void incomingMessage(const MyMessage &message) { Serial.print(message.sensor); Serial.print(", New status: "); Serial.println((isArmed ? "Armed":"Disarmed" )); + motion();//temp ack break; #endif @@ -934,7 +935,7 @@ void incomingMessage(const MyMessage &message) { Serial.print(message.sensor); Serial.print(", New status: "); Serial.println((isLightOn ? "On":"Off")); - light(); + light(); // temp ack break; #endif @@ -1004,6 +1005,7 @@ void incomingMessage(const MyMessage &message) { Serial.print(message.sensor); Serial.print(", New status: "); Serial.println(message.getBool()?"Locked":"Unlocked"); + lock(); //temp ack break; #endif From 628e90b15f4ab441b4cddf30949678345eafaa26 Mon Sep 17 00:00:00 2001 From: Barduino Date: Mon, 24 Aug 2015 16:59:34 -0400 Subject: [PATCH 2/5] Minor fixes --- .../MySensors/examples/MockMySensors/MockMySensors.ino | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/MySensors/examples/MockMySensors/MockMySensors.ino b/libraries/MySensors/examples/MockMySensors/MockMySensors.ino index 809f9fe..9bc37ff 100644 --- a/libraries/MySensors/examples/MockMySensors/MockMySensors.ino +++ b/libraries/MySensors/examples/MockMySensors/MockMySensors.ino @@ -48,7 +48,7 @@ #define ID_S_SMOKE 3 #define ID_S_LIGHT 4 #define ID_S_DIMMER 5 -#define ID_S_COVER 6 +//#define ID_S_COVER 6 #define ID_S_TEMP 7 #define ID_S_HUM 8 #define ID_S_BARO 9 @@ -65,7 +65,7 @@ #define ID_S_WATER 20 #define ID_S_AIR_QUALITY 21 #define ID_S_DUST 22 -#define ID_S_SCENE_CONTROLLER 23 +//#define ID_S_SCENE_CONTROLLER 23 #define ID_S_CUSTOM 99 // Global Vars @@ -649,7 +649,7 @@ void cover(){ if (coverVal == "V_UP"){ Serial.println("Opening"); gw.send(msg_S_COVER_U.set(V_UP)); - }else if (coverVal == "V_DONW"){ + }else if (coverVal == "V_DOWN"){ Serial.println("Closing"); gw.send(msg_S_COVER_D.set(V_DOWN)); }else{ From 8166bbaf95e4a12637fe649f3a8b053ef93138ce Mon Sep 17 00:00:00 2001 From: Barduino Date: Tue, 25 Aug 2015 09:44:42 -0400 Subject: [PATCH 3/5] Minor Fixes Most Sensor comment out --- .../examples/MockMySensors/MockMySensors.ino | 46 +++++++++---------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/libraries/MySensors/examples/MockMySensors/MockMySensors.ino b/libraries/MySensors/examples/MockMySensors/MockMySensors.ino index 9bc37ff..d27770e 100644 --- a/libraries/MySensors/examples/MockMySensors/MockMySensors.ino +++ b/libraries/MySensors/examples/MockMySensors/MockMySensors.ino @@ -45,28 +45,28 @@ #define ID_S_ARMED 0 // dummy to controll armed stated for several sensors #define ID_S_DOOR 1 #define ID_S_MOTION 2 -#define ID_S_SMOKE 3 -#define ID_S_LIGHT 4 -#define ID_S_DIMMER 5 +//#define ID_S_SMOKE 3 +//#define ID_S_LIGHT 4 +//#define ID_S_DIMMER 5 //#define ID_S_COVER 6 -#define ID_S_TEMP 7 -#define ID_S_HUM 8 -#define ID_S_BARO 9 -#define ID_S_WIND 10 -#define ID_S_RAIN 11 -#define ID_S_UV 12 -#define ID_S_WEIGHT 13 -#define ID_S_POWER 14 -#define ID_S_HEATER 15 -#define ID_S_DISTANCE 16 -#define ID_S_LIGHT_LEVEL 17 -#define ID_S_LOCK 18 -#define ID_S_IR 19 -#define ID_S_WATER 20 -#define ID_S_AIR_QUALITY 21 -#define ID_S_DUST 22 +//#define ID_S_TEMP 7 +//#define ID_S_HUM 8 +//#define ID_S_BARO 9 +//#define ID_S_WIND 10 +//#define ID_S_RAIN 11 +//#define ID_S_UV 12 +//#define ID_S_WEIGHT 13 +//#define ID_S_POWER 14 +//#define ID_S_HEATER 15 +//#define ID_S_DISTANCE 16 +//#define ID_S_LIGHT_LEVEL 17 +//#define ID_S_LOCK 18 +//#define ID_S_IR 19 +//#define ID_S_WATER 20 +//#define ID_S_AIR_QUALITY 21 +//#define ID_S_DUST 22 //#define ID_S_SCENE_CONTROLLER 23 -#define ID_S_CUSTOM 99 +//#define ID_S_CUSTOM 99 // Global Vars unsigned long SLEEP_TIME = 300000; // Sleep time between reads (in milliseconds) @@ -130,7 +130,7 @@ MyHwATMega328 hw; MyMessage msg_S_COVER_U(ID_S_COVER,V_UP); MyMessage msg_S_COVER_D(ID_S_COVER,V_DOWN); MyMessage msg_S_COVER_S(ID_S_COVER,V_STOP); - const char* coverVal = "V_STOP"; + const char* coverVal = "V_STOP"; //compiler warnings #endif #ifdef ID_S_TEMP @@ -216,7 +216,7 @@ MyHwATMega328 hw; MyMessage msg_S_SCENE_CONTROLLER_ON(ID_S_SCENE_CONTROLLER,V_SCENE_ON); MyMessage msg_S_SCENE_CONTROLLER_OF(ID_S_SCENE_CONTROLLER,V_SCENE_OFF); // not sure if scene controller sends int or chars - // betting on ints as Touch Display Scen by Hek + // betting on ints as Touch Display Scen by Hek // compiler warnings char *scenes[] = { "All off", "Good Morning", @@ -686,7 +686,7 @@ void hum(){ void baro(){ const char *weather[] = {"stable","sunny","cloudy","unstable","thunderstorm","unknown"}; - long pressure = map(randNumber,1,100,87000,108600); + long pressure = map(randNumber,1,100,870,1086);// hPa? int forecast = map(randNumber,1,100,0,5); Serial.print("Atmosferic Pressure is: " ); From cce5209368d3606168635fbe0bed58743e66acee Mon Sep 17 00:00:00 2001 From: Barduino Date: Tue, 25 Aug 2015 10:32:06 -0400 Subject: [PATCH 4/5] Minor Fixes Only Door and Armed Active --- libraries/MySensors/examples/MockMySensors/MockMySensors.ino | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/MySensors/examples/MockMySensors/MockMySensors.ino b/libraries/MySensors/examples/MockMySensors/MockMySensors.ino index d27770e..c599aab 100644 --- a/libraries/MySensors/examples/MockMySensors/MockMySensors.ino +++ b/libraries/MySensors/examples/MockMySensors/MockMySensors.ino @@ -44,7 +44,7 @@ // one at a time. #define ID_S_ARMED 0 // dummy to controll armed stated for several sensors #define ID_S_DOOR 1 -#define ID_S_MOTION 2 +//#define ID_S_MOTION 2 //#define ID_S_SMOKE 3 //#define ID_S_LIGHT 4 //#define ID_S_DIMMER 5 @@ -924,7 +924,7 @@ void incomingMessage(const MyMessage &message) { Serial.print(message.sensor); Serial.print(", New status: "); Serial.println((isArmed ? "Armed":"Disarmed" )); - motion();//temp ack + door();//temp ack break; #endif From 875875ab388dc68eee6f4c4dc0bcdd765491d020 Mon Sep 17 00:00:00 2001 From: Barduino Date: Tue, 25 Aug 2015 10:36:53 -0400 Subject: [PATCH 5/5] Minor Changes --- libraries/MySensors/examples/MockMySensors/MockMySensors.ino | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/MySensors/examples/MockMySensors/MockMySensors.ino b/libraries/MySensors/examples/MockMySensors/MockMySensors.ino index c599aab..9510270 100644 --- a/libraries/MySensors/examples/MockMySensors/MockMySensors.ino +++ b/libraries/MySensors/examples/MockMySensors/MockMySensors.ino @@ -924,7 +924,7 @@ void incomingMessage(const MyMessage &message) { Serial.print(message.sensor); Serial.print(", New status: "); Serial.println((isArmed ? "Armed":"Disarmed" )); - door();//temp ack + door();//temp ack for door break; #endif