Now Using pgmspace.h instead of progmem.h. Removed a couple of compiler warnigns.
This commit is contained in:
@@ -176,7 +176,6 @@ void Sensor::buildMsg(uint8_t from, uint8_t to, uint8_t childId, uint8_t message
|
|||||||
|
|
||||||
|
|
||||||
boolean Sensor::sendData(uint8_t from, uint8_t to, uint8_t childId, uint8_t messageType, uint8_t type, const char *data, uint8_t length, boolean binary) {
|
boolean Sensor::sendData(uint8_t from, uint8_t to, uint8_t childId, uint8_t messageType, uint8_t type, const char *data, uint8_t length, boolean binary) {
|
||||||
bool ok = false;
|
|
||||||
if (length < sizeof(msg.data)) {
|
if (length < sizeof(msg.data)) {
|
||||||
buildMsg(from, to, childId, messageType, type, data, length, binary);
|
buildMsg(from, to, childId, messageType, type, data, length, binary);
|
||||||
return send(msg,length);
|
return send(msg,length);
|
||||||
@@ -222,7 +221,7 @@ boolean Sensor::sendWrite(uint8_t dest, message_s message, int length) {
|
|||||||
|
|
||||||
bool ok = true;
|
bool ok = true;
|
||||||
bool broadcast = message.header.messageType == M_INTERNAL && message.header.type == I_PING;
|
bool broadcast = message.header.messageType == M_INTERNAL && message.header.type == I_PING;
|
||||||
int retry = WRITE_RETRY;
|
// int retry = WRITE_RETRY;
|
||||||
RF24::stopListening();
|
RF24::stopListening();
|
||||||
RF24::openWritingPipe(TO_ADDR(dest));
|
RF24::openWritingPipe(TO_ADDR(dest));
|
||||||
RF24::write(&message, min(MAX_MESSAGE_LENGTH, sizeof(message.header) + length), broadcast);
|
RF24::write(&message, min(MAX_MESSAGE_LENGTH, sizeof(message.header) + length), broadcast);
|
||||||
@@ -244,8 +243,12 @@ boolean Sensor::sendWrite(uint8_t dest, message_s message, int length) {
|
|||||||
if ( !timeout && RF24::getDynamicPayloadSize()==sizeof(uint8_t)) {
|
if ( !timeout && RF24::getDynamicPayloadSize()==sizeof(uint8_t)) {
|
||||||
uint8_t idest;
|
uint8_t idest;
|
||||||
RF24::read( &idest, sizeof(uint8_t));
|
RF24::read( &idest, sizeof(uint8_t));
|
||||||
if (dest != idest) { ok == false; }
|
if (dest != idest) {
|
||||||
} else { ok = false; }
|
ok = false;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
ok = false;
|
||||||
|
}
|
||||||
//--------------------
|
//--------------------
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -19,7 +19,7 @@
|
|||||||
#include <stddef.h>
|
#include <stddef.h>
|
||||||
#include <SPI.h>
|
#include <SPI.h>
|
||||||
#include <EEPROM.h>
|
#include <EEPROM.h>
|
||||||
#include <avr/progmem.h>
|
#include <avr/pgmspace.h>
|
||||||
#include <stdarg.h>
|
#include <stdarg.h>
|
||||||
|
|
||||||
//#define DEBUG
|
//#define DEBUG
|
||||||
|
|||||||
Reference in New Issue
Block a user