From 4eaf014fc2aa4b75472c84ec69a635a27c1f3b70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20=C4=8Cejchan?= Date: Thu, 5 Sep 2024 16:10:50 +0200 Subject: [PATCH] Belt tuning: Results show hotfix BFW-6029 --- src/common/feature/belt_tuning/belt_tuning_wizard.cpp | 2 +- src/gui/wizard/screen_belt_tuning_wizard.cpp | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/common/feature/belt_tuning/belt_tuning_wizard.cpp b/src/common/feature/belt_tuning/belt_tuning_wizard.cpp index 1a20c4ecb0..bd14a27f8b 100644 --- a/src/common/feature/belt_tuning/belt_tuning_wizard.cpp +++ b/src/common/feature/belt_tuning/belt_tuning_wizard.cpp @@ -160,7 +160,7 @@ class FSMBeltTuning final { void phase_results_init(const Meta::InitCallbackArgs &) { fsm_.change_data(fsm::serialize_data(BeltTuningWizardResultsData { .frequency = static_cast(result_->resonant_frequency_hz), - .tension = static_cast(result_->tension_force_n * BeltTuningWizardResultsData::tension_mult), + .tension = static_cast(std::clamp(result_->tension_force_n * BeltTuningWizardResultsData::tension_mult, 0, 255)), .belt_system = config_.belt_system, })); } diff --git a/src/gui/wizard/screen_belt_tuning_wizard.cpp b/src/gui/wizard/screen_belt_tuning_wizard.cpp index 1e15eae841..031ff83c49 100644 --- a/src/gui/wizard/screen_belt_tuning_wizard.cpp +++ b/src/gui/wizard/screen_belt_tuning_wizard.cpp @@ -179,6 +179,8 @@ class FrameResults : public FramePrompt { std::array target_str; _("Target").copyToRAM(target_str); info.SetText(string_view_utf8::MakeCPUFLASH("%.1f N (%i Hz)\n\n%s: %.1f +- %.1f N").formatted(info_params, tension, (int)data.frequency, target_str.data(), params.target_tension_force_n, params.target_tension_force_dev_n)); + info.Invalidate(); // Annoying reference comparison in SetText + graph.set_data(screen.graph_data); }