Merge remote-tracking branch 'upstream/development' into mueller/master
This commit is contained in:
commit
77aaf81cf6
|
@ -16,13 +16,41 @@
|
||||||
#cmakedefine FSFW_ADD_MONITORING
|
#cmakedefine FSFW_ADD_MONITORING
|
||||||
#cmakedefine FSFW_ADD_SGP4_PROPAGATOR
|
#cmakedefine FSFW_ADD_SGP4_PROPAGATOR
|
||||||
|
|
||||||
|
// FSFW core defines
|
||||||
|
|
||||||
|
#ifndef FSFW_CPP_OSTREAM_ENABLED
|
||||||
|
#define FSFW_CPP_OSTREAM_ENABLED 1
|
||||||
|
#endif /* FSFW_CPP_OSTREAM_ENABLED */
|
||||||
|
|
||||||
|
#ifndef FSFW_VERBOSE_LEVEL
|
||||||
|
#define FSFW_VERBOSE_LEVEL 1
|
||||||
|
#endif /* FSFW_VERBOSE_LEVEL */
|
||||||
|
|
||||||
|
#ifndef FSFW_USE_REALTIME_FOR_LINUX
|
||||||
|
#define FSFW_USE_REALTIME_FOR_LINUX 0
|
||||||
|
#endif /* FSFW_USE_REALTIME_FOR_LINUX */
|
||||||
|
|
||||||
|
#ifndef FSFW_NO_C99_IO
|
||||||
|
#define FSFW_NO_C99_IO 0
|
||||||
|
#endif /* FSFW_NO_C99_IO */
|
||||||
|
|
||||||
|
#ifndef FSFW_USE_PUS_C_TELEMETRY
|
||||||
|
#define FSFW_USE_PUS_C_TELEMETRY 1
|
||||||
|
#endif /* FSFW_USE_PUS_C_TELEMETRY */
|
||||||
|
|
||||||
|
#ifndef FSFW_USE_PUS_C_TELECOMMANDS
|
||||||
|
#define FSFW_USE_PUS_C_TELECOMMANDS 1
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifndef FSFW_TCP_RECV_WIRETAPPING_ENABLED
|
#ifndef FSFW_TCP_RECV_WIRETAPPING_ENABLED
|
||||||
#define FSFW_TCP_RECV_WIRETAPPING_ENABLED 0
|
#define FSFW_TCP_RECV_WIRETAPPING_ENABLED 0
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
// FSFW HAL defines
|
||||||
|
|
||||||
// Can be used for low-level debugging of the SPI bus
|
// Can be used for low-level debugging of the SPI bus
|
||||||
#ifndef FSFW_HAL_SPI_WIRETAPPING
|
#ifndef FSFW_HAL_SPI_WIRETAPPING
|
||||||
#define FSFW_HAL_SPI_WIRETAPPING 0
|
#define FSFW_HAL_SPI_WIRETAPPING 0
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef FSFW_HAL_L3GD20_GYRO_DEBUG
|
#ifndef FSFW_HAL_L3GD20_GYRO_DEBUG
|
||||||
|
|
|
@ -3,8 +3,8 @@
|
||||||
|
|
||||||
const char* const FSFW_VERSION_NAME = "ASTP";
|
const char* const FSFW_VERSION_NAME = "ASTP";
|
||||||
|
|
||||||
#define FSFW_VERSION 1
|
#define FSFW_VERSION 2
|
||||||
#define FSFW_SUBVERSION 2
|
#define FSFW_SUBVERSION 0
|
||||||
#define FSFW_REVISION 0
|
#define FSFW_REVISION 0
|
||||||
|
|
||||||
#endif /* FSFW_VERSION_H_ */
|
#endif /* FSFW_VERSION_H_ */
|
||||||
|
|
|
@ -13,7 +13,6 @@ target_sources(${LIB_FSFW_NAME}
|
||||||
QueueFactory.cpp
|
QueueFactory.cpp
|
||||||
SemaphoreFactory.cpp
|
SemaphoreFactory.cpp
|
||||||
TaskFactory.cpp
|
TaskFactory.cpp
|
||||||
Timer.cpp
|
|
||||||
tcpipHelpers.cpp
|
tcpipHelpers.cpp
|
||||||
unixUtility.cpp
|
unixUtility.cpp
|
||||||
CommandExecutor.cpp
|
CommandExecutor.cpp
|
||||||
|
|
|
@ -6,16 +6,14 @@ Countdown::Countdown(uint32_t initialTimeout): timeout(initialTimeout) {
|
||||||
Countdown::~Countdown() {
|
Countdown::~Countdown() {
|
||||||
}
|
}
|
||||||
|
|
||||||
ReturnValue_t Countdown::setTimeout(uint32_t miliseconds) {
|
ReturnValue_t Countdown::setTimeout(uint32_t milliseconds) {
|
||||||
ReturnValue_t return_value = Clock::getUptime( &startTime );
|
ReturnValue_t returnValue = Clock::getUptime( &startTime );
|
||||||
timeout = miliseconds;
|
timeout = milliseconds;
|
||||||
return return_value;
|
return returnValue;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool Countdown::hasTimedOut() const {
|
bool Countdown::hasTimedOut() const {
|
||||||
uint32_t current_time;
|
if ( uint32_t( this->getCurrentTime() - startTime) >= timeout) {
|
||||||
Clock::getUptime( ¤t_time );
|
|
||||||
if ( uint32_t(current_time - startTime) >= timeout) {
|
|
||||||
return true;
|
return true;
|
||||||
} else {
|
} else {
|
||||||
return false;
|
return false;
|
||||||
|
@ -31,7 +29,23 @@ ReturnValue_t Countdown::resetTimer() {
|
||||||
}
|
}
|
||||||
|
|
||||||
void Countdown::timeOut() {
|
void Countdown::timeOut() {
|
||||||
uint32_t current_time;
|
startTime = this->getCurrentTime() - timeout;
|
||||||
Clock::getUptime( ¤t_time );
|
}
|
||||||
startTime= current_time - timeout;
|
|
||||||
|
uint32_t Countdown::getRemainingMillis() const {
|
||||||
|
// We fetch the time before the if-statement
|
||||||
|
// to be sure that the return is in
|
||||||
|
// range 0 <= number <= timeout
|
||||||
|
uint32_t currentTime = this->getCurrentTime();
|
||||||
|
if (this->hasTimedOut()){
|
||||||
|
return 0;
|
||||||
|
}else{
|
||||||
|
return (startTime + timeout) - currentTime;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
uint32_t Countdown::getCurrentTime() const {
|
||||||
|
uint32_t currentTime;
|
||||||
|
Clock::getUptime( ¤tTime );
|
||||||
|
return currentTime;
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,28 +4,77 @@
|
||||||
#include "Clock.h"
|
#include "Clock.h"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief This file defines the Countdown class.
|
*
|
||||||
* @author baetz
|
* Countdown keeps track of a timespan.
|
||||||
|
*
|
||||||
|
* Countdown::resetTimer restarts the timer.
|
||||||
|
* Countdown::setTimeout sets a new countdown duration and resets.
|
||||||
|
*
|
||||||
|
* Can be checked with Countdown::hasTimedOut or
|
||||||
|
* Countdown::isBusy.
|
||||||
|
*
|
||||||
|
* Countdown::timeOut will force the timer to time out.
|
||||||
|
*
|
||||||
*/
|
*/
|
||||||
class Countdown {
|
class Countdown {
|
||||||
public:
|
public:
|
||||||
uint32_t timeout;
|
/**
|
||||||
|
* Constructor which sets the countdown duration in milliseconds
|
||||||
|
*
|
||||||
|
* It does not start the countdown!
|
||||||
|
* Call resetTimer or setTimeout before usage!
|
||||||
|
* Otherwise a call to hasTimedOut might return True.
|
||||||
|
*
|
||||||
|
* @param initialTimeout Countdown duration in milliseconds
|
||||||
|
*/
|
||||||
Countdown(uint32_t initialTimeout = 0);
|
Countdown(uint32_t initialTimeout = 0);
|
||||||
~Countdown();
|
~Countdown();
|
||||||
ReturnValue_t setTimeout(uint32_t miliseconds);
|
/**
|
||||||
|
* Call to set a new countdown duration.
|
||||||
|
*
|
||||||
|
* Resets the countdown!
|
||||||
|
*
|
||||||
|
* @param milliseconds new countdown duration in milliseconds
|
||||||
|
* @return Returnvalue from Clock::getUptime
|
||||||
|
*/
|
||||||
|
ReturnValue_t setTimeout(uint32_t milliseconds);
|
||||||
|
/**
|
||||||
|
* Returns true if the countdown duration has passed.
|
||||||
|
*
|
||||||
|
* @return True if the countdown has passed
|
||||||
|
* False if it is still running
|
||||||
|
*/
|
||||||
bool hasTimedOut() const;
|
bool hasTimedOut() const;
|
||||||
|
/**
|
||||||
|
* Complementary to hasTimedOut.
|
||||||
|
*
|
||||||
|
* @return True if the countdown is till running
|
||||||
|
* False if it is still running
|
||||||
|
*/
|
||||||
bool isBusy() const;
|
bool isBusy() const;
|
||||||
|
/**
|
||||||
//!< Use last set timeout value and restart timer.
|
* Uses last set timeout value and restarts timer.
|
||||||
|
*/
|
||||||
ReturnValue_t resetTimer();
|
ReturnValue_t resetTimer();
|
||||||
|
/**
|
||||||
//!< Make hasTimedOut() return true
|
* Returns the remaining milliseconds (0 if timeout)
|
||||||
|
*/
|
||||||
|
uint32_t getRemainingMillis() const;
|
||||||
|
/**
|
||||||
|
* Makes hasTimedOut() return true
|
||||||
|
*/
|
||||||
void timeOut();
|
void timeOut();
|
||||||
|
/**
|
||||||
|
* Internal countdown duration in milliseconds
|
||||||
|
*/
|
||||||
|
uint32_t timeout;
|
||||||
private:
|
private:
|
||||||
|
/**
|
||||||
|
* Last time the timer was started (uptime)
|
||||||
|
*/
|
||||||
uint32_t startTime = 0;
|
uint32_t startTime = 0;
|
||||||
|
|
||||||
|
uint32_t getCurrentTime() const;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif /* FSFW_TIMEMANAGER_COUNTDOWN_H_ */
|
#endif /* FSFW_TIMEMANAGER_COUNTDOWN_H_ */
|
||||||
|
|
|
@ -24,4 +24,5 @@ add_subdirectory(serialize)
|
||||||
add_subdirectory(datapoollocal)
|
add_subdirectory(datapoollocal)
|
||||||
add_subdirectory(storagemanager)
|
add_subdirectory(storagemanager)
|
||||||
add_subdirectory(globalfunctions)
|
add_subdirectory(globalfunctions)
|
||||||
|
add_subdirectory(timemanager)
|
||||||
add_subdirectory(tmtcpacket)
|
add_subdirectory(tmtcpacket)
|
||||||
|
|
3
tests/src/fsfw_tests/unit/timemanager/CMakeLists.txt
Normal file
3
tests/src/fsfw_tests/unit/timemanager/CMakeLists.txt
Normal file
|
@ -0,0 +1,3 @@
|
||||||
|
target_sources(${TARGET_NAME} PRIVATE
|
||||||
|
TestCountdown.cpp
|
||||||
|
)
|
27
tests/src/fsfw_tests/unit/timemanager/TestCountdown.cpp
Normal file
27
tests/src/fsfw_tests/unit/timemanager/TestCountdown.cpp
Normal file
|
@ -0,0 +1,27 @@
|
||||||
|
#include "fsfw_tests/unit/CatchDefinitions.h"
|
||||||
|
#include <fsfw/timemanager/Countdown.h>
|
||||||
|
#include <catch2/catch_test_macros.hpp>
|
||||||
|
|
||||||
|
|
||||||
|
TEST_CASE( "Countdown Tests", "[TestCountdown]") {
|
||||||
|
INFO("Countdown Tests");
|
||||||
|
Countdown count(20);
|
||||||
|
REQUIRE(count.timeout == 20);
|
||||||
|
REQUIRE(count.setTimeout(100) == static_cast<uint16_t>(HasReturnvaluesIF::RETURN_OK));
|
||||||
|
REQUIRE(count.timeout == 100);
|
||||||
|
REQUIRE(count.setTimeout(150) == static_cast<uint16_t>(HasReturnvaluesIF::RETURN_OK));
|
||||||
|
REQUIRE(count.isBusy());
|
||||||
|
REQUIRE(not count.hasTimedOut());
|
||||||
|
uint32_t number = count.getRemainingMillis();
|
||||||
|
REQUIRE(number > 0);
|
||||||
|
bool blocked = false;
|
||||||
|
while(not count.hasTimedOut()){
|
||||||
|
blocked = true;
|
||||||
|
};
|
||||||
|
REQUIRE(blocked);
|
||||||
|
number = count.getRemainingMillis();
|
||||||
|
REQUIRE(number==0);
|
||||||
|
count.resetTimer();
|
||||||
|
REQUIRE(not count.hasTimedOut());
|
||||||
|
REQUIRE(count.isBusy());
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user