From 0d1fb7d6c077855e54d088ff14fa6cba8a89d3d6 Mon Sep 17 00:00:00 2001
From: Grigoris Pavlakis <grigpavl@ece.auth.gr>
Date: Tue, 20 Nov 2018 02:09:25 +0200
Subject: [PATCH] Fix formatting
---
inc/Services/ParameterService.hpp | 11 +++++++----
src/Services/ParameterService.cpp | 10 +++++++---
src/main.cpp | 10 +++++-----
3 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/inc/Services/ParameterService.hpp b/inc/Services/ParameterService.hpp
index 36050f2e..3600f3d9 100644
--- a/inc/Services/ParameterService.hpp
+++ b/inc/Services/ParameterService.hpp
@@ -2,6 +2,7 @@
#define ECSS_SERVICES_PARAMETERSERVICE_HPP
#include "Service.hpp"
+
#define CONFIGLENGTH 5
/**
@@ -40,10 +41,12 @@ class ParameterService : public Service {
Parameter paramsList[CONFIGLENGTH]; // CONFIGLENGTH is just a dummy number for now, this should be statically set
- public:
- ParameterService();
- Message reportParameter(Message paramId);
- void setParamData(Message newParamValues);
+public:
+ ParameterService();
+
+ Message reportParameter(Message paramId);
+
+ void setParamData(Message newParamValues);
};
diff --git a/src/Services/ParameterService.cpp b/src/Services/ParameterService.cpp
index 798888d5..afe43749 100644
--- a/src/Services/ParameterService.cpp
+++ b/src/Services/ParameterService.cpp
@@ -1,8 +1,11 @@
#include "Services/ParameterService.hpp"
+
#define DEMOMODE
#ifdef DEMOMODE
+
#include <ctime>
+
#endif
ParameterService::ParameterService() {
@@ -23,10 +26,10 @@ ParameterService::ParameterService() {
// Test code, setting up one of the parameter fields
time_t currTime = time(nullptr);
- struct tm* today = localtime(&currTime);
+ struct tm *today = localtime(&currTime);
paramsList[2].paramId = 341; // random parameter ID
- paramsList[2].settingData = today -> tm_min; // the minute of the current hour
+ paramsList[2].settingData = today->tm_min; // the minute of the current hour
paramsList[2].ptc = 3; // unsigned int
paramsList[2].pfc = 14; // 32 bits
#endif
@@ -47,7 +50,8 @@ Message ParameterService::reportParameter(Message paramId) {
Message reqParam(20, 2, Message::TM, 1); // empty TM[20, 2] parameter report message
uint16_t reqParamId = paramId.readUint16(); // parameter ID must be accessed only once
- if (paramId.packetType == Message::TC && paramId.serviceType == 20 && paramId.messageType == 1) {
+ if (paramId.packetType == Message::TC && paramId.serviceType == 20 &&
+ paramId.messageType == 1) {
for (int i = 0; i < CONFIGLENGTH; i++) {
diff --git a/src/main.cpp b/src/main.cpp
index 5551553b..c27f8cc6 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -17,7 +17,8 @@ int main() {
char string[6];
packet.readString(string, 5);
- std::cout << "Word: " << string << " " << packet.readBits(15) << packet.readBits(1) << std::endl;
+ std::cout << "Word: " << string << " " << packet.readBits(15) << packet.readBits(1)
+ << std::endl;
std::cout << packet.readFloat() << " " << std::dec << packet.readSint32() << std::endl;
// ST[17] test
@@ -34,11 +35,10 @@ int main() {
sentPacket.appendUint16(341); //the packet sent contains the ID of the desired parameter
Message returnedPacket = paramService.reportParameter(sentPacket);
- uint16_t id = returnedPacket.readUint16();
- uint32_t val = returnedPacket.readUint32();
+ std::cout << "Parameter ID: " << std::dec << returnedPacket.readUint16() << std::endl
+ << "Parameter value: " << std::dec << returnedPacket.readUint32() << std::endl;
+
- std::cout << "Parameter ID: " << std::dec << id << std::endl; //set
- std::cout << "Parameter value: " << std::dec << val << std::endl;
return 0;
}
--
GitLab