Merge branch 'development' into dev-raspberrypi

2016-08-16 13:46:29 -03:00
parent 211afb17c4 b7ae549a04
commit 2713a362fe
56 changed files with 191 additions and 166 deletions
@@ -210,9 +210,10 @@ MyMessage& MyMessage::setDestination(uint8_t _destination) {

 // Set payload
 MyMessage& MyMessage::set(void* value, uint8_t length) {
+	uint8_t payloadLength = value == NULL ? 0 : min(length, (uint8_t)MAX_PAYLOAD);
+	miSetLength(payloadLength); 
 	miSetPayloadType(P_CUSTOM);
-	miSetLength(length);
-	memcpy(data, value, min(length, (uint8_t)MAX_PAYLOAD));
+	memcpy(data, value, payloadLength);
 	return *this;
 }