From c7bc0d48d0017ac1effbc5ced4b505183987d454 Mon Sep 17 00:00:00 2001
From: kongr45gpen <electrovesta@gmail.com>
Date: Mon, 12 Nov 2018 01:45:50 +0200
Subject: [PATCH] Formatting
---
inc/Message.hpp | 281 ++++++++++++++++++++++++------------------------
src/main.cpp | 17 ++-
2 files changed, 149 insertions(+), 149 deletions(-)
diff --git a/inc/Message.hpp b/inc/Message.hpp
index afd32582..93bc12d0 100644
--- a/inc/Message.hpp
+++ b/inc/Message.hpp
@@ -10,155 +10,156 @@
*/
class Message {
public:
- enum PacketType {
- TM = 0, // Telemetry
- TC = 1 // Telecommand
- };
+ enum PacketType {
+ TM = 0, // Telemetry
+ TC = 1 // Telecommand
+ };
- // The service and message IDs are 8 bits (5.3.1b, 5.3.3.1d)
- uint8_t serviceType;
- uint8_t messageType;
+ // The service and message IDs are 8 bits (5.3.1b, 5.3.3.1d)
+ uint8_t serviceType;
+ uint8_t messageType;
- // As specified in CCSDS 133.0-B-1
- PacketType packetType;
+ // As specified in CCSDS 133.0-B-1 (TM or TC)
+ PacketType packetType;
- // Maximum value of 2047 (5.4.2.1c)
- uint16_t applicationId;
+ // Maximum value of 2047 (5.4.2.1c)
+ uint16_t applicationId;
- // 7.4.3.1b
- uint16_t messageTypeCounter = 0;
+ // 7.4.3.1b
+ uint16_t messageTypeCounter = 0;
- // TODO: Find out if we need more than 16 bits for this
- uint16_t dataSize = 0;
+ // TODO: Find out if we need more than 16 bits for this
+ uint16_t dataSize = 0;
- // Pointer to the contents of the message (excluding the PUS header)
- // We allocate this data statically, in order to make sure there is predictability in the
- // handling and storage of messages
- // TODO: Is it a good idea to not initialise this to 0?
- uint8_t data[ECSS_MAX_MESSAGE_SIZE] = { '\0' };
+ // Pointer to the contents of the message (excluding the PUS header)
+ // We allocate this data statically, in order to make sure there is predictability in the
+ // handling and storage of messages
+ // TODO: Is it a good idea to not initialise this to 0?
+ uint8_t data[ECSS_MAX_MESSAGE_SIZE] = {'\0'};
//private:
- uint8_t currentBit = 0;
-
- /**
- * Appends the least significant \p numBits from \p data to the message
- *
- * Note: data MUST NOT contain any information beyond the most significant \p numBits bits
- * @todo Error handling for failed asserts
- */
- void appendBits(uint8_t numBits, uint16_t data);
-
- /**
- * Appends 1 byte to the message
- */
- void appendByte(uint8_t value);
-
- /**
- * Appends 2 bytes to the message
- */
- void appendHalfword(uint16_t value);
-
- /**
- * Appends 4 bytes to the message
- */
- void appendWord(uint32_t value);
-
- /**
- * Appends \p size bytes to the message
- *
- * @param size The amount of byte to append
- * @param value An array containing at least \p size bytes
- * @todo See if more than uint8_t strings will be supported
- */
- void appendString(uint8_t size, const char * value);
+ uint8_t currentBit = 0;
+
+ /**
+ * Appends the least significant \p numBits from \p data to the message
+ *
+ * Note: data MUST NOT contain any information beyond the most significant \p numBits bits
+ * @todo Error handling for failed asserts
+ */
+ void appendBits(uint8_t numBits, uint16_t data);
+
+ /**
+ * Appends 1 byte to the message
+ */
+ void appendByte(uint8_t value);
+
+ /**
+ * Appends 2 bytes to the message
+ */
+ void appendHalfword(uint16_t value);
+
+ /**
+ * Appends 4 bytes to the message
+ */
+ void appendWord(uint32_t value);
+
+ /**
+ * Appends \p size bytes to the message
+ *
+ * @param size The amount of byte to append
+ * @param value An array containing at least \p size bytes
+ * @todo See if more than uint8_t strings will be supported
+ */
+ void appendString(uint8_t size, const char *value);
+
public:
- Message(uint8_t serviceType, uint8_t messageType, PacketType packetType,
- uint16_t applicationId);
-
- /**
- * Adds a single-byte boolean value to the end of the message
- *
- * PTC = 1, PFC = 0
- */
- void appendBoolean(bool value);
-
- /**
- * Adds an enumerated parameter consisting of an arbitrary number of bits to the end of the
- * message
- *
- * PTC = 1, PFC = \p bits
- */
- void appendEnumerated(uint8_t bits, uint32_t value);
-
- /**
- * Adds an enumerated parameter consisting of 1 byte to the end of the message
- *
- * PTC = 1, PFC = 8
- */
- void appendEnumerated(uint8_t value);
-
- /**
- * Adds an enumerated parameter consisting of 2 bytes to the end of the message
- *
- * PTC = 1, PFC = 16
- */
- void appendEnumerated(uint16_t value);
-
- /**
- * Adds an enumerated parameter consisting of 4 bytes to the end of the message
- *
- * PTC = 1, PFC = 32
- */
- void appendEnumerated(uint32_t value);
-
- /**
- * Adds a 1 byte unsigned integer to the end of the message
- *
- * PTC = 2, PFC = 4
- */
- void appendInteger(uint8_t value);
-
- /**
- * Adds a 2 byte unsigned integer to the end of the message
- *
- * PTC = 2, PFC = 8
- */
- void appendInteger(uint16_t value);
-
- /**
- * Adds a 4 byte unsigned integer to the end of the message
- *
- * PTC = 2, PFC = 14
- */
- void appendInteger(uint32_t value);
-
- /**
- * Adds a 1 byte signed integer to the end of the message
- *
- * PTC = 3, PFC = 4
- */
- void appendInteger(int8_t value);
-
- /**
- * Adds a 2 byte signed integer to the end of the message
- *
- * PTC = 3, PFC = 8
- */
- void appendInteger(int16_t value);
-
- /**
- * Adds a 4 byte signed integer to the end of the message
- *
- * PTC = 3, PFC = 14
- */
- void appendInteger(int32_t value);
-
- /**
- * Adds a 4-byte single-precision floating point number to the end of the message
- *
- * PTC = 5, PFC = 1
- */
- void appendReal(float value);
+ Message(uint8_t serviceType, uint8_t messageType, PacketType packetType,
+ uint16_t applicationId);
+
+ /**
+ * Adds a single-byte boolean value to the end of the message
+ *
+ * PTC = 1, PFC = 0
+ */
+ void appendBoolean(bool value);
+
+ /**
+ * Adds an enumerated parameter consisting of an arbitrary number of bits to the end of the
+ * message
+ *
+ * PTC = 1, PFC = \p bits
+ */
+ void appendEnumerated(uint8_t bits, uint32_t value);
+
+ /**
+ * Adds an enumerated parameter consisting of 1 byte to the end of the message
+ *
+ * PTC = 1, PFC = 8
+ */
+ void appendEnumerated(uint8_t value);
+
+ /**
+ * Adds an enumerated parameter consisting of 2 bytes to the end of the message
+ *
+ * PTC = 1, PFC = 16
+ */
+ void appendEnumerated(uint16_t value);
+
+ /**
+ * Adds an enumerated parameter consisting of 4 bytes to the end of the message
+ *
+ * PTC = 1, PFC = 32
+ */
+ void appendEnumerated(uint32_t value);
+
+ /**
+ * Adds a 1 byte unsigned integer to the end of the message
+ *
+ * PTC = 2, PFC = 4
+ */
+ void appendInteger(uint8_t value);
+
+ /**
+ * Adds a 2 byte unsigned integer to the end of the message
+ *
+ * PTC = 2, PFC = 8
+ */
+ void appendInteger(uint16_t value);
+
+ /**
+ * Adds a 4 byte unsigned integer to the end of the message
+ *
+ * PTC = 2, PFC = 14
+ */
+ void appendInteger(uint32_t value);
+
+ /**
+ * Adds a 1 byte signed integer to the end of the message
+ *
+ * PTC = 3, PFC = 4
+ */
+ void appendInteger(int8_t value);
+
+ /**
+ * Adds a 2 byte signed integer to the end of the message
+ *
+ * PTC = 3, PFC = 8
+ */
+ void appendInteger(int16_t value);
+
+ /**
+ * Adds a 4 byte signed integer to the end of the message
+ *
+ * PTC = 3, PFC = 14
+ */
+ void appendInteger(int32_t value);
+
+ /**
+ * Adds a 4-byte single-precision floating point number to the end of the message
+ *
+ * PTC = 5, PFC = 1
+ */
+ void appendReal(float value);
};
diff --git a/src/main.cpp b/src/main.cpp
index b799fe9c..617c15a9 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,17 +1,16 @@
#include <iostream>
-#include <cstring>
#include "Message.hpp"
int main() {
- Message packet = Message(0, 0, Message::TC, 1);
+ Message packet = Message(0, 0, Message::TC, 1);
- packet.appendString(5, "hello");
- packet.appendBits(15, 0x28a8);
- packet.appendBits(1, 1);
- packet.appendReal(5.7);
+ packet.appendString(5, "hello");
+ packet.appendBits(15, 0x28a8);
+ packet.appendBits(1, 1);
+ packet.appendReal(5.7);
- std::cout << "Hello, World!" << std::endl;
- std::cout << std::hex << packet.data << std::endl; // packet data must be 'helloQQ'
+ std::cout << "Hello, World!" << std::endl;
+ std::cout << std::hex << packet.data << std::endl; // packet data must be 'helloQQ'
// std::cout << *(reinterpret_cast<float*>(packet.data + 7)) << std::endl;
- return 0;
+ return 0;
}
--
GitLab