From 0cd35f3fde9a56d51d4fadb157a1d83af6bec299 Mon Sep 17 00:00:00 2001 From: willem oldemans Date: Fri, 2 Oct 2020 11:07:54 +0200 Subject: [PATCH] moved serial feedback to DEBUG --- radio.cpp | 55 +++++++++++++++++++++++++++++++++++-------------------- radio.h | 2 ++ 2 files changed, 37 insertions(+), 20 deletions(-) diff --git a/radio.cpp b/radio.cpp index ca2fd4d..cb74e07 100644 --- a/radio.cpp +++ b/radio.cpp @@ -15,9 +15,16 @@ RcData* getDataptr( void ) void radio_c::begin( ) { -if (!RadioManager.init()) + if (!RadioManager.init()) { + #ifdef DEBUG Serial.println("init failed"); + #endif + open = false; + } + else + { + open = true; } } @@ -32,21 +39,27 @@ bool radio_c::transmitData( void ) uint8_t from; if (RadioManager.recvfromAckTimeout(buf, &len, 2000, &from)) { - Serial.print("got reply from : 0x"); - Serial.print(from, HEX); - Serial.print(": "); - Serial.println((char*)buf); + #ifdef DEBUG + Serial.print("got reply from : 0x"); + Serial.print(from, HEX); + Serial.print(": "); + Serial.println((char*)buf); + #endif return true; } else { - Serial.println("No reply, is nrf24_reliable_datagram_server running?"); + #ifdef DEBUG + Serial.println("No reply, is nrf24_reliable_datagram_server running?"); + #endif return false; } } else { - Serial.println("sending failed"); + #ifdef DEBUG + Serial.println("sending failed"); + #endif return false; } } @@ -66,7 +79,7 @@ bool radio_c::receiveData( void ) if(!data->setRcData(buf)) { #ifdef DEBUG - Serial.println("package inclompete") + Serial.println("package inclompete") #endif return false; } @@ -74,7 +87,7 @@ bool radio_c::receiveData( void ) if (!RadioManager.sendtoWait(data->getReturnData(), sizeof(data->getReturnData()), from)) { #ifdef DEBUG - Serial.println("sendtoWait failed"); + Serial.println("sendtoWait failed"); #endif return false; } @@ -85,7 +98,7 @@ bool radio_c::receiveData( void ) { data->setfailsafe(); #ifdef DEBUG - Serial.println("No Radio Available - Check Transmitter!"); + Serial.println("No Radio Available - Check Transmitter!"); #endif return false; } @@ -106,16 +119,18 @@ void sendSerialCommands( void ) if (millis() - lastSerialTime > 20) { // Send the data every 20ms lastSerialTime = millis(); - Serial.print('<'); // Start marker - Serial.println(data->axis1); - Serial.println(data->axis2); - Serial.println(data->axis3); - Serial.println(data->axis4); - Serial.println(data->pot); - Serial.println(data->momentary1); - Serial.println(data->momentary2); - Serial.println(data->getfailsafe()); - Serial.print('>'); // End marker + #ifdef DEBUG + Serial.print('<'); // Start marker + Serial.println(data->axis1); + Serial.println(data->axis2); + Serial.println(data->axis3); + Serial.println(data->axis4); + Serial.println(data->pot); + Serial.println(data->momentary1); + Serial.println(data->momentary2); + Serial.println(data->getfailsafe()); + Serial.print('>'); // End marker + #endif } } diff --git a/radio.h b/radio.h index ec92ba7..cd2e3c4 100644 --- a/radio.h +++ b/radio.h @@ -156,6 +156,8 @@ class radio_c unsigned long lastRecvTime; + bool open = false; + public: radio_c(int address, int CE, int CSN) :RadioDriver(CE, CSN), RadioManager(RadioDriver, address) {}; void begin( void );