From 0abfc20e6bbfd69673e0a7ff0858a812069856e3 Mon Sep 17 00:00:00 2001
From: user2684 <you@example.com>
Date: Fri, 31 Mar 2017 12:29:26 +0200
Subject: [PATCH] Add debug messages before and after activating the radio #25
---
NodeManagerTemplate/NodeManager.cpp | 17 +++++++++--------
NodeManagerTemplate/NodeManager.h | 4 ++--
NodeManagerTemplate/config.h | 4 ++--
3 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/NodeManagerTemplate/NodeManager.cpp b/NodeManagerTemplate/NodeManager.cpp
index 227ed07..d904266 100644
--- a/NodeManagerTemplate/NodeManager.cpp
+++ b/NodeManagerTemplate/NodeManager.cpp
@@ -13,6 +13,7 @@ const char* AWAKE = "AWAKE";
const char* REBOOT = "REBOOT";
const char* CLEAR = "CLEAR";
const char* WAKEUP = "WAKEUP";
+const char* STARTED = "STARTED";
/***************************************
PowerManager
@@ -21,7 +22,7 @@ const char* WAKEUP = "WAKEUP";
// set the vcc and ground pin the sensor is connected to
void PowerManager::setPowerPins(int ground_pin, int vcc_pin, long wait) {
#if DEBUG == 1
- Serial.print("POWER G=");
+ Serial.print("PWR G=");
Serial.print(ground_pin);
Serial.print(" V=");
Serial.println(vcc_pin);
@@ -964,13 +965,6 @@ void NodeManager::setSleepBetweenSend(int value) {
// register a sensor to this manager
int NodeManager::registerSensor(int sensor_type, int pin, int child_id) {
- #if DEBUG == 1
- if (_startup) {
- Serial.print("NodeManager v");
- Serial.println(VERSION);
- _startup = false;
- }
- #endif
// get a child_id if not provided by the user
if (child_id < 0) child_id = _getAvailableChildId();
// based on the given sensor type instantiate the appropriate class
@@ -1095,6 +1089,10 @@ Sensor* NodeManager::get(int child_id) {
// setup NodeManager
void NodeManager::before() {
+ #if DEBUG == 1
+ Serial.print("NodeManager v");
+ Serial.println(VERSION);
+ #endif
if (_reboot_pin > -1) {
#if DEBUG == 1
Serial.print("REB P=");
@@ -1157,6 +1155,9 @@ void NodeManager::before() {
// present NodeManager and its sensors
void NodeManager::presentation() {
+ #if DEBUG == 1
+ Serial.println("RADIO OK");
+ #endif
// present the service as a custom sensor to the controller
#if DEBUG == 1
Serial.print("PRES I=");
diff --git a/NodeManagerTemplate/NodeManager.h b/NodeManagerTemplate/NodeManager.h
index def4712..71213ce 100644
--- a/NodeManagerTemplate/NodeManager.h
+++ b/NodeManagerTemplate/NodeManager.h
@@ -41,7 +41,7 @@
#define EEPROM_SLEEP_UNIT 4
// define NodeManager version
-#define VERSION 1.2
+#define VERSION 1.3
/************************************
* Include user defined configuration settings
@@ -196,6 +196,7 @@
// include MySensors libraries
#include <core/MySensorsCore.h>
#include <core/MyHwAVR.h>
+//#include <core/MyHwATMega328.h>
// include third party libraries
#if MODULE_DHT == 1
@@ -665,7 +666,6 @@ class NodeManager {
void _sleep();
int _getAvailableChildId();
int _getInterruptInitialValue(int mode);
- bool _startup = true;
};
#endif
diff --git a/NodeManagerTemplate/config.h b/NodeManagerTemplate/config.h
index 32e5296..f68717d 100644
--- a/NodeManagerTemplate/config.h
+++ b/NodeManagerTemplate/config.h
@@ -13,10 +13,10 @@
*/
#define MY_BAUD_RATE 9800
//#define MY_DEBUG
-//#define MY_NODE_ID 100
+#define MY_NODE_ID 100
#define MY_RADIO_NRF24
-//#define MY_RF24_ENABLE_ENCRYPTION
+#define MY_RF24_ENABLE_ENCRYPTION
//#define MY_RF24_CHANNEL 76
//#define MY_RADIO_RFM69
--
GitLab