Merge remote-tracking branch 'upstram/master' into mueller_tcPacketBase

2020-07-06 12:22:22 +02:00
parent ca10020f19 3cd946fef8
commit f654c4b33e
54 changed files with 2008 additions and 1408 deletions
--- a/tmtcpacket/pus/TmPacketStored.cpp
+++ b/tmtcpacket/pus/TmPacketStored.cpp
@ -81,7 +81,7 @@ void TmPacketStored::deletePacket() {
 void TmPacketStored::setStoreAddress(store_address_t setAddress) {
 	storeAddress = setAddress;
 	const uint8_t* temp_data = NULL;
-	uint32_t temp_size;
+	size_t temp_size;
 	if (!checkAndSetStore()) {
 		return;
 	}