Skip to content

Commit 9d19d1b

Browse files
committed
Add brain hz
1 parent 709448d commit 9d19d1b

File tree

3 files changed

+12
-1
lines changed

3 files changed

+12
-1
lines changed

exercises/static/exercises/follow_line/cpp_template/ros2_humble/Frequency.hpp

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
#include <chrono>
55
#include <iostream>
66
#include <thread>
7+
#include <bits/stdc++.h>
78

89
using namespace std;
910

@@ -17,6 +18,7 @@ class Frequency
1718
Frequency(/* args */);
1819
~Frequency();
1920

21+
static int rate;
2022
void tick(int ideal_cycle);
2123
};
2224

@@ -45,11 +47,18 @@ void Frequency::tick(int ideal_cycle = 50)
4547

4648
if (iter_ms < ideal_ms)
4749
{
50+
rate = round(1000 / ideal_ms.count());
4851
this_thread::sleep_for(chrono::milliseconds(ideal_ms - iter_ms));
4952
}
53+
else
54+
{
55+
rate = round(1000 / iter_ms.count());
56+
}
5057

5158
last_time = now;
5259
return;
5360
}
5461

62+
int Frequency::rate = 0;
63+
5564
#endif

exercises/static/exercises/follow_line/cpp_template/ros2_humble/WebGUI.hpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
#include "opencv2/opencv.hpp"
1515
#include "json.hpp"
1616
#include "HAL.hpp"
17+
#include "Frequency.hpp"
1718
#include "Lap.hpp"
1819
#include <utility>
1920
#include <iomanip>
@@ -203,7 +204,7 @@ class session : public std::enable_shared_from_this<session>
203204
std::stringstream stream;
204205
stream << std::fixed << std::setprecision(2) << rtf;
205206
std::string rtf_str = stream.str();
206-
const json j = json{{"map", map.dump()}, {"image", WebGUI::img_payload}, {"lap", lap_->getLapTime()}, {"brain", 20}, {"gui", 20}, {"rtf", rtf_str}, {"fps", -1}, {"lat", -1}};
207+
const json j = json{{"map", map.dump()}, {"image", WebGUI::img_payload}, {"lap", lap_->getLapTime()}, {"brain", Frequency::rate}, {"gui", 20}, {"rtf", rtf_str}, {"fps", -1}, {"lat", -1}};
207208
auto const text = j.dump();
208209

209210
// Close the WebSocket connection

react_frontend/src/components/buttons/PlayPause.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ const PlayPauseButton = ({
106106
console.log("App paused correctly!");
107107
return;
108108
} catch (e: unknown) {
109+
setLoading(false);
109110
if (e instanceof Error) {
110111
console.error("Error pausing app: " + e.message);
111112
error("Error pausing app: " + e.message);

0 commit comments

Comments
 (0)