feedc0de/bobbycar-boardcomputer-firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix formatting

Browse Source
This commit is contained in:
Peter Poetzi
2022-10-08 16:01:28 +02:00
parent a0b678de9d
commit 25593f803b
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
main/displays/measurementdisplay.cpp
View File

@@ -41,8 +41,6 @@ namespace {
} }
}; };
class MeasurementDisplayItem : public MenuItem { class MeasurementDisplayItem : public MenuItem {
public: public:
MeasurementDisplayItem(const MeasurementDisplay::Result result) : m_result{result} {} MeasurementDisplayItem(const MeasurementDisplay::Result result) : m_result{result} {}
@@ -62,10 +60,10 @@ namespace {
std::string MeasurementDisplayItem::text() const std::string MeasurementDisplayItem::text() const
{ {
if(showAcceleration){ if (showAcceleration) {
return fmt::format("{}: {}ms {:.2f}m/s² ", m_result.speed, m_result.time.count(), return fmt::format("{}: {}ms {:.2f}m/s² ", m_result.speed, m_result.time.count(),
m_result.speed / (m_result.time.count() * 1e-3)); m_result.speed / (m_result.time.count() * 1e-3));
}else{ } else {
return fmt::format("{}: {}ms {:.2f}m ", m_result.speed, m_result.time.count(), m_result.distance); return fmt::format("{}: {}ms {:.2f}m ", m_result.speed, m_result.time.count(), m_result.distance);
} }
} }
@@ -81,7 +79,6 @@ namespace {
>; >;
} // namespace } // namespace
MeasurementDisplay::MeasurementDisplay() { MeasurementDisplay::MeasurementDisplay() {
clearMeasurements(); clearMeasurements();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_INTERVAL>, PushScreenAction<MeasurementIntervalChangeScreen>>>(); constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_INTERVAL>, PushScreenAction<MeasurementIntervalChangeScreen>>>();

2
main/newsettings.h
View File

@@ -454,8 +454,6 @@ public:
ConfigWrapperLegacy<uint8_t> measurementInterval{1, DoReset, {}, "measurementiv" }; ConfigWrapperLegacy<uint8_t> measurementInterval{1, DoReset, {}, "measurementiv" };
} measurementMode; } measurementMode;
struct { struct {
ConfigWrapperLegacy<HandbremseMode> mode {HandbremseMode::MOSFETS_OFF, DoReset, {}, "handBremsM" }; ConfigWrapperLegacy<HandbremseMode> mode {HandbremseMode::MOSFETS_OFF, DoReset, {}, "handBremsM" };
ConfigWrapperLegacy<uint16_t> triggerTimeout {10, DoReset, {}, "handBremsT" }; ConfigWrapperLegacy<uint16_t> triggerTimeout {10, DoReset, {}, "handBremsT" };