Klagarge/BikeComputer
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Activity

Merge branch 'develop' into FIX/init-dec_order
Some checks failed
Build test application / build-cli-v1 (debug, DISCO_H747I, tests-bike-computer-bike-system) (push) Failing after 2s
Details
Build test application / build-cli-v1 (debug, DISCO_H747I, tests-bike-computer-sensor-device) (push) Failing after 3s
Details
Build test application / build-cli-v1 (debug, DISCO_H747I, tests-bike-computer-speedometer) (push) Failing after 3s
Details

Browse Source
This commit is contained in:
Rémi Heredero 2024-12-31 09:32:08 +01:00 committed by GitHub
commit 5a85e1da8d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
static_scheduling/bike_system.cpp
View File

@ -235,17 +235,12 @@ void BikeSystem::resetTask() {
_taskLogger.logPeriodAndExecutionTime( _taskLogger.logPeriodAndExecutionTime(
_timer, advembsof::TaskLogger::kResetTaskIndex, taskStartTime); _timer, advembsof::TaskLogger::kResetTaskIndex, taskStartTime);
} }
void BikeSystem::temperatureTask() { void BikeSystem::temperatureTask() {
auto taskStartTime = _timer.elapsed_time(); auto taskStartTime = _timer.elapsed_time();
tr_warn("Tick1 %" PRIu64, _timer.elapsed_time().count());
// no need to protect access to data members (single threaded) // no need to protect access to data members (single threaded)
_currentTemperature = _sensorDevice.readTemperature(); _currentTemperature = _sensorDevice.readTemperature();
tr_warn("Tick2 %" PRIu64, _timer.elapsed_time().count());
ThisThread::sleep_for(std::chrono::duration_cast<std::chrono::milliseconds>( ThisThread::sleep_for(std::chrono::duration_cast<std::chrono::milliseconds>(
kTemperatureTaskComputationTime - (_timer.elapsed_time() - taskStartTime))); kTemperatureTaskComputationTime - (_timer.elapsed_time() - taskStartTime)));

4
static_scheduling_with_event/bike_system.cpp
View File

@ -62,7 +62,7 @@ static constexpr std::chrono::milliseconds kDisplayTask2ComputationTime = 100ms;
static constexpr std::chrono::milliseconds kCPUTaskPeriod = 1600ms; static constexpr std::chrono::milliseconds kCPUTaskPeriod = 1600ms;
static constexpr std::chrono::milliseconds kCPUTaskDelay = 1200ms; static constexpr std::chrono::milliseconds kCPUTaskDelay = 1200ms;
static constexpr std::chrono::milliseconds kCPUTaskComputationTime = 100ms; static constexpr std::chrono::milliseconds kCPUTaskComputationTime = 100ms;
BikeSystem::BikeSystem() BikeSystem::BikeSystem()
: _gearDevice(), : _gearDevice(),
_pedalDevice(), _pedalDevice(),
@ -178,7 +178,7 @@ void BikeSystem::speedDistanceTask() {
_taskLogger.logPeriodAndExecutionTime( _taskLogger.logPeriodAndExecutionTime(
_timer, advembsof::TaskLogger::kSpeedTaskIndex, taskStartTime); _timer, advembsof::TaskLogger::kSpeedTaskIndex, taskStartTime);
} }
void BikeSystem::displayTask1() { void BikeSystem::displayTask1() {
auto taskStartTime = _timer.elapsed_time(); auto taskStartTime = _timer.elapsed_time();