libs/rc-radio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

moved serial feedback to DEBUG

Browse Source
This commit is contained in:
willem oldemans
2020-10-02 11:07:54 +02:00
parent 8294950b63
commit 0cd35f3fde
2 changed files with 37 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
radio.cpp
View File

@@ -15,9 +15,16 @@ RcData* getDataptr( void )
void radio_c::begin( ) void radio_c::begin( )
{ {
if (!RadioManager.init()) if (!RadioManager.init())
{ {
#ifdef DEBUG
Serial.println("init failed"); Serial.println("init failed");
#endif
open = false;
}
else
{
open = true;
} }
} }
@@ -32,21 +39,27 @@ bool radio_c::transmitData( void )
uint8_t from; uint8_t from;
if (RadioManager.recvfromAckTimeout(buf, &len, 2000, &from)) if (RadioManager.recvfromAckTimeout(buf, &len, 2000, &from))
{ {
Serial.print("got reply from : 0x"); #ifdef DEBUG
Serial.print(from, HEX); Serial.print("got reply from : 0x");
Serial.print(": "); Serial.print(from, HEX);
Serial.println((char*)buf); Serial.print(": ");
Serial.println((char*)buf);
#endif
return true; return true;
} }
else 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; return false;
} }
} }
else else
{ {
Serial.println("sending failed"); #ifdef DEBUG
Serial.println("sending failed");
#endif
return false; return false;
} }
} }
@@ -66,7 +79,7 @@ bool radio_c::receiveData( void )
if(!data->setRcData(buf)) if(!data->setRcData(buf))
{ {
#ifdef DEBUG #ifdef DEBUG
Serial.println("package inclompete") Serial.println("package inclompete")
#endif #endif
return false; return false;
} }
@@ -74,7 +87,7 @@ bool radio_c::receiveData( void )
if (!RadioManager.sendtoWait(data->getReturnData(), sizeof(data->getReturnData()), from)) if (!RadioManager.sendtoWait(data->getReturnData(), sizeof(data->getReturnData()), from))
{ {
#ifdef DEBUG #ifdef DEBUG
Serial.println("sendtoWait failed"); Serial.println("sendtoWait failed");
#endif #endif
return false; return false;
} }
@@ -85,7 +98,7 @@ bool radio_c::receiveData( void )
{ {
data->setfailsafe(); data->setfailsafe();
#ifdef DEBUG #ifdef DEBUG
Serial.println("No Radio Available - Check Transmitter!"); Serial.println("No Radio Available - Check Transmitter!");
#endif #endif
return false; return false;
} }
@@ -106,16 +119,18 @@ void sendSerialCommands( void )
if (millis() - lastSerialTime > 20) { // Send the data every 20ms if (millis() - lastSerialTime > 20) { // Send the data every 20ms
lastSerialTime = millis(); lastSerialTime = millis();
Serial.print('<'); // Start marker #ifdef DEBUG
Serial.println(data->axis1); Serial.print('<'); // Start marker
Serial.println(data->axis2); Serial.println(data->axis1);
Serial.println(data->axis3); Serial.println(data->axis2);
Serial.println(data->axis4); Serial.println(data->axis3);
Serial.println(data->pot); Serial.println(data->axis4);
Serial.println(data->momentary1); Serial.println(data->pot);
Serial.println(data->momentary2); Serial.println(data->momentary1);
Serial.println(data->getfailsafe()); Serial.println(data->momentary2);
Serial.print('>'); // End marker Serial.println(data->getfailsafe());
Serial.print('>'); // End marker
#endif
} }
} }

2
radio.h
View File

@@ -156,6 +156,8 @@ class radio_c
unsigned long lastRecvTime; unsigned long lastRecvTime;
bool open = false;
public: public:
radio_c(int address, int CE, int CSN) :RadioDriver(CE, CSN), RadioManager(RadioDriver, address) {}; radio_c(int address, int CE, int CSN) :RadioDriver(CE, CSN), RadioManager(RadioDriver, address) {};
void begin( void ); void begin( void );