Commit 0abfc20e authored by user2684's avatar user2684
Browse files

Add debug messages before and after activating the radio #25

parent 899059e2
...@@ -13,6 +13,7 @@ const char* AWAKE = "AWAKE"; ...@@ -13,6 +13,7 @@ const char* AWAKE = "AWAKE";
const char* REBOOT = "REBOOT"; const char* REBOOT = "REBOOT";
const char* CLEAR = "CLEAR"; const char* CLEAR = "CLEAR";
const char* WAKEUP = "WAKEUP"; const char* WAKEUP = "WAKEUP";
const char* STARTED = "STARTED";
/*************************************** /***************************************
PowerManager PowerManager
...@@ -21,7 +22,7 @@ const char* WAKEUP = "WAKEUP"; ...@@ -21,7 +22,7 @@ const char* WAKEUP = "WAKEUP";
// set the vcc and ground pin the sensor is connected to // set the vcc and ground pin the sensor is connected to
void PowerManager::setPowerPins(int ground_pin, int vcc_pin, long wait) { void PowerManager::setPowerPins(int ground_pin, int vcc_pin, long wait) {
#if DEBUG == 1 #if DEBUG == 1
Serial.print("POWER G="); Serial.print("PWR G=");
Serial.print(ground_pin); Serial.print(ground_pin);
Serial.print(" V="); Serial.print(" V=");
Serial.println(vcc_pin); Serial.println(vcc_pin);
...@@ -964,13 +965,6 @@ void NodeManager::setSleepBetweenSend(int value) { ...@@ -964,13 +965,6 @@ void NodeManager::setSleepBetweenSend(int value) {
// register a sensor to this manager // register a sensor to this manager
int NodeManager::registerSensor(int sensor_type, int pin, int child_id) { 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 // get a child_id if not provided by the user
if (child_id < 0) child_id = _getAvailableChildId(); if (child_id < 0) child_id = _getAvailableChildId();
// based on the given sensor type instantiate the appropriate class // based on the given sensor type instantiate the appropriate class
...@@ -1095,6 +1089,10 @@ Sensor* NodeManager::get(int child_id) { ...@@ -1095,6 +1089,10 @@ Sensor* NodeManager::get(int child_id) {
// setup NodeManager // setup NodeManager
void NodeManager::before() { void NodeManager::before() {
#if DEBUG == 1
Serial.print("NodeManager v");
Serial.println(VERSION);
#endif
if (_reboot_pin > -1) { if (_reboot_pin > -1) {
#if DEBUG == 1 #if DEBUG == 1
Serial.print("REB P="); Serial.print("REB P=");
...@@ -1157,6 +1155,9 @@ void NodeManager::before() { ...@@ -1157,6 +1155,9 @@ void NodeManager::before() {
// present NodeManager and its sensors // present NodeManager and its sensors
void NodeManager::presentation() { void NodeManager::presentation() {
#if DEBUG == 1
Serial.println("RADIO OK");
#endif
// present the service as a custom sensor to the controller // present the service as a custom sensor to the controller
#if DEBUG == 1 #if DEBUG == 1
Serial.print("PRES I="); Serial.print("PRES I=");
......
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
#define EEPROM_SLEEP_UNIT 4 #define EEPROM_SLEEP_UNIT 4
// define NodeManager version // define NodeManager version
#define VERSION 1.2 #define VERSION 1.3
/************************************ /************************************
* Include user defined configuration settings * Include user defined configuration settings
...@@ -196,6 +196,7 @@ ...@@ -196,6 +196,7 @@
// include MySensors libraries // include MySensors libraries
#include <core/MySensorsCore.h> #include <core/MySensorsCore.h>
#include <core/MyHwAVR.h> #include <core/MyHwAVR.h>
//#include <core/MyHwATMega328.h>
// include third party libraries // include third party libraries
#if MODULE_DHT == 1 #if MODULE_DHT == 1
...@@ -665,7 +666,6 @@ class NodeManager { ...@@ -665,7 +666,6 @@ class NodeManager {
void _sleep(); void _sleep();
int _getAvailableChildId(); int _getAvailableChildId();
int _getInterruptInitialValue(int mode); int _getInterruptInitialValue(int mode);
bool _startup = true;
}; };
#endif #endif
...@@ -13,10 +13,10 @@ ...@@ -13,10 +13,10 @@
*/ */
#define MY_BAUD_RATE 9800 #define MY_BAUD_RATE 9800
//#define MY_DEBUG //#define MY_DEBUG
//#define MY_NODE_ID 100 #define MY_NODE_ID 100
#define MY_RADIO_NRF24 #define MY_RADIO_NRF24
//#define MY_RF24_ENABLE_ENCRYPTION #define MY_RF24_ENABLE_ENCRYPTION
//#define MY_RF24_CHANNEL 76 //#define MY_RF24_CHANNEL 76
//#define MY_RADIO_RFM69 //#define MY_RADIO_RFM69
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment