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

Unfinished button calibration

Browse Source
This commit is contained in:
CommanderRedYT
2022-10-07 00:07:53 +02:00
parent 2bc1625fab
commit bc9a0c396c
9 changed files with 233 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
main/CMakeLists.txt
View File

@ -529,8 +529,6 @@ idf_component_register(
${dependencies}
)
add_library(bobbyboardcomputer ${BOBBY_SOURCES} ${BOBBY_HEADERS})
execute_process(COMMAND git rev-parse HEAD
OUTPUT_VARIABLE GIT_REV ERROR_QUIET
)

4
main/displays/buttoncalibratedisplay.cpp
View File

@ -17,7 +17,7 @@ namespace {
constexpr const char TAG[] = "BUTTON";
} // namespace
/*
std::string ButtonCalibrateDisplay::text() const
{
return "Button calibrate";
@ -220,4 +220,4 @@ void ButtonCalibrateDisplay::buttonReleased(espgui::Button button)
{
//Base::buttonReleased(button);
}
*/

4
main/displays/buttoncalibratedisplay.h
View File

@ -9,7 +9,7 @@
#include "modeinterface.h"
#include "modes/ignoreinputmode.h"
/*
class ButtonCalibrateDisplay : public espgui::DisplayWithTitle
{
using Base = espgui::DisplayWithTitle;
@ -52,4 +52,4 @@ private:
bool m_finished;
};
*/

10
main/displays/lockscreen.cpp
View File

@ -106,10 +106,7 @@ void Lockscreen::redraw()
{
if (isValid1stPin(m_numbers))
{
if (!gas || !brems || *gas > 200.f || *brems > 200.f)
espgui::switchScreen<PotisCalibrateDisplay>(true);
else
espgui::popScreen();
espgui::popScreen();
#ifdef LOCKSCREEN_PLUGIN
#include LOCKSCREEN_PLUGIN
LOCKSCREEN_PLUGIN_FIXES_1
@ -118,10 +115,7 @@ LOCKSCREEN_PLUGIN_FIXES_1
}
else if(isValid2ndPin(m_numbers))
{
if (!gas || !brems || *gas > 200.f || *brems > 200.f)
espgui::switchScreen<PotisCalibrateDisplay>(true);
else
espgui::popScreen();
espgui::popScreen();
#ifdef LOCKSCREEN_PLUGIN_FIXES_2
LOCKSCREEN_PLUGIN_FIXES_2
#endif

5
main/displays/menus/boardcomputerhardwaresettingsmenu.cpp
View File

@ -19,6 +19,7 @@
#include "displays/menus/setupquickactionsmenu.h"
#include "displays/menus/timersmenu.h"
#include "displays/potiscalibratedisplay.h"
#include "displays/setupdisplay.h"
#include "icons/lock.h"
#ifdef FEATURE_JOYSTICK
@ -192,12 +193,12 @@ using namespace espgui;
BoardcomputerHardwareSettingsMenu::BoardcomputerHardwareSettingsMenu()
{
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_LOCKSCREENSETTINGS>, PushScreenAction<LockscreenSettingsMenu>, StaticMenuItemIcon<&bobbyicons::lock>>>();
// constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BUTTONCALIBRATE>, PushScreenAction<ButtonCalibrateDisplay>>>();
constructMenuItem<makeComponentArgs<MenuItem, PushSetupDisplayAction, StaticText<TEXT_BUTTONCALIBRATE>>>(SetupStep::BASIC_BUTTONS, true);
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_EXTRABUTTONCALIBRATE>, PushScreenAction<ExtraButtonCalibrateMenu>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_QUICKACTIONS>, PushScreenAction<SetupQuickActionsMenu>>>();
constructMenuItem<makeComponent<MenuItem, GasText, DisabledColor, StaticFont<2>, DummyAction>>();
constructMenuItem<makeComponent<MenuItem, BremsText, DisabledColor, StaticFont<2>, DummyAction>>();
// constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_POTISCALIBRATE>, PushScreenAction<PotisCalibrateDisplay>>>();
constructMenuItem<makeComponentArgs<MenuItem, PushSetupDisplayAction, StaticText<TEXT_POTISCALIBRATE>>>(SetupStep::CALIBRATE_POTIS, true);
#ifdef FEATURE_JOYSTICK
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_JOYSTICK>, PushScreenAction<JoystickDebugDisplay>>>();
#endif

3
main/displays/potiscalibratedisplay.cpp
View File

@ -16,7 +16,7 @@ namespace {
constexpr char TEXT_CALIBRATE[] = "Potis Calibrate";
} // namespace
/*
std::string PotisCalibrateDisplay::text() const
{
return TEXT_CALIBRATE;
@ -321,3 +321,4 @@ void PotisCalibrateDisplay::copyToSettings()
configs.write_config(configs.bremsMin, m_bremsMin);
configs.write_config(configs.bremsMax, m_bremsMax);
}
*/

3
main/displays/potiscalibratedisplay.h
View File

@ -16,7 +16,7 @@
#include "modeinterface.h"
#include "modes/ignoreinputmode.h"
/*
class PotisCalibrateDisplay : public BobbyDisplayWithTitle
{
using Base = BobbyDisplayWithTitle;
@ -91,3 +91,4 @@ private:
;
std::optional<float> m_gas, m_brems;
};
*/

171
main/displays/setupdisplay.cpp
View File

@ -6,17 +6,31 @@
// 3rdparty lib includes
#include <tftinstance.h>
// local includes
#include "globals.h"
using namespace espgui;
using namespace std::chrono_literals;
namespace setupdisplay {
constexpr char const InformationText[] = "Congratulations on your new\nbobbycar! This guide will help\nyou through initial setup,\ncalibrate everything and\nget you ready!";
constexpr char const ButtonText[] = "Please press the highlighted\n buttons!";
} // setupdisplay
namespace {
constexpr const char * const TAG = "SETUPDISPLAY";
} // namespace
void SetupDisplay::start()
{
Base::start();
m_menu_opened_timestamp = espchrono::millis_clock::now();
m_oldMode = currentMode;
currentMode = &m_mode;
m_lastButton = std::nullopt;
m_button_cal_status = setupdisplay::LEFT;
m_button_cal_finished = false;
}
void SetupDisplay::initScreen()
@ -27,15 +41,22 @@ void SetupDisplay::initScreen()
void SetupDisplay::update()
{
Base::update();
switch(m_current_setupStep)
{
case SetupStep::BASIC_BUTTONS:
break;
default:;
}
}
void SetupDisplay::redraw()
{
Base::redraw();
if (m_current_setupStep != m_last_setupStep || initialRender)
if (m_current_setupStep != m_last_setupStep || m_initialRender)
{
initialRender = false;
m_initialRender = false;
m_last_setupStep = m_current_setupStep;
switch(m_current_setupStep)
@ -44,7 +65,9 @@ void SetupDisplay::redraw()
drawLargeText(setupdisplay::InformationText);
break;
case SetupStep::BASIC_BUTTONS:
clearLargeText();
clearArea();
drawLargeText(setupdisplay::ButtonText);
drawButtons(m_button_cal_status);
break;
case SetupStep::CALIBRATE_POTIS:
break;
@ -70,13 +93,99 @@ void SetupDisplay::redraw()
void SetupDisplay::stop()
{
Base::stop();
if (currentMode == &m_mode)
{
// to avoid crash after deconstruction
m_mode.stop();
lastMode = nullptr;
currentMode = m_oldMode;
}
}
void SetupDisplay::buttonPressed(espgui::Button button)
{
if (m_current_setupStep == SetupStep::BASIC_BUTTONS)
{
return;
}
Base::buttonPressed(button);
}
void SetupDisplay::buttonReleased(espgui::Button button)
{
if (m_current_setupStep == SetupStep::BASIC_BUTTONS)
{
return;
}
Base::buttonReleased(button);
}
void SetupDisplay::rawButtonPressed(uint8_t button)
{
Base::rawButtonPressed(button);
if (m_current_setupStep != SetupStep::BASIC_BUTTONS)
{
return;
}
if (m_button_cal_status == setupdisplay::FINISHED)
{
if (button == m_rightButton)
{
ESP_LOGI(TAG, "correct button");
m_button_cal_finished = true;
}
else
ESP_LOGI(TAG, "wrong button");
}
else if (!m_lastButton || *m_lastButton != button)
m_lastButton = button;
else
{
switch (m_button_cal_status)
{
case setupdisplay::LEFT:
m_leftButton = button;
m_lastButton = std::nullopt;
m_button_cal_status = setupdisplay::RIGHT;
break;
case setupdisplay::RIGHT:
m_rightButton = button;
m_lastButton = std::nullopt;
m_button_cal_status = setupdisplay::UP;
break;
case setupdisplay::UP:
m_upButton = button;
m_lastButton = std::nullopt;
m_button_cal_status = setupdisplay::DOWN;
break;
case setupdisplay::DOWN:
m_downButton = button;
m_lastButton = std::nullopt;
m_button_cal_status = setupdisplay::FINISHED;
break;
case setupdisplay::FINISHED:;
}
}
drawButtons(m_button_cal_status);
}
void SetupDisplay::saveButtons()
{
}
void SetupDisplay::rawButtonReleased(uint8_t button)
{
// Base::rawButtonReleased(button);
}
std::string SetupDisplay::text() const
{
switch (m_current_setupStep)
@ -164,7 +273,61 @@ void SetupDisplay::nextStep()
ESP_LOGI("SetupDisplay", "nextStep after (%s)", toString(m_current_setupStep).c_str());
}
void SetupDisplay::clearLargeText()
void SetupDisplay::clearArea()
{
tft.fillRect(0, 50, tft.width(), tft.height()-50, TFT_BLACK);
}
void SetupDisplay::drawButtons(setupdisplay::CurrentButton button)
{
const int16_t x_mid = tft.width() / 2;
const int16_t y_mid = tft.height() / 2;
const auto offset = 40;
const auto radius = 15;
const auto subtract = 2;
const auto up_x = x_mid;
const auto up_y = y_mid - offset;
const auto down_x = x_mid;
const auto down_y = y_mid + offset;
const auto left_x = x_mid - offset;
const auto left_y = y_mid;
const auto right_x = x_mid + offset;
const auto right_y = y_mid;
tft.fillCircle(up_x, up_y, radius-subtract, TFT_BLACK);
tft.fillCircle(down_x, down_y, radius-subtract, TFT_BLACK);
tft.fillCircle(left_x, left_y, radius-subtract, TFT_BLACK);
tft.fillCircle(right_x, right_y, radius-subtract, TFT_BLACK);
tft.drawCircle(up_x, up_y, radius, TFT_WHITE);
tft.drawCircle(down_x, down_y, radius, TFT_WHITE);
tft.drawCircle(left_x, left_y, radius, TFT_WHITE);
tft.drawCircle(right_x, right_y, radius, TFT_WHITE);
switch(button)
{
case setupdisplay::UP:
tft.fillCircle(up_x, up_y, radius-subtract, m_lastButton ? TFT_YELLOW : TFT_WHITE);
break;
case setupdisplay::DOWN:
tft.fillCircle(down_x, down_y, radius-subtract, m_lastButton ? TFT_YELLOW : TFT_WHITE);
break;
case setupdisplay::LEFT:
tft.fillCircle(left_x, left_y, radius-subtract, m_lastButton ? TFT_YELLOW : TFT_WHITE);
break;
case setupdisplay::RIGHT:
tft.fillCircle(right_x, right_y, radius-subtract, m_lastButton ? TFT_YELLOW : TFT_WHITE);
break;
default:;
}
if (m_button_cal_status == setupdisplay::FINISHED)
{
tft.fillCircle(right_x, right_y, radius-subtract, TFT_GREEN);
}
}

57
main/displays/setupdisplay.h
View File

@ -2,13 +2,18 @@
// system includes
#include <string_view>
#include <optional>
// 3rdparty lib includes
#include <actioninterface.h>
#include <espchrono.h>
#include <screenmanager.h>
// local includes
#include "bobbydisplaywithtitle.h"
#include "bobbytypesafeenum.h"
#include "modeinterface.h"
#include "modes/ignoreinputmode.h"
#define SetupStepValues(x) \
x(INFORMATION) \
@ -22,13 +27,25 @@
DECLARE_BOBBYTYPESAFE_ENUM(SetupStep, : uint8_t, SetupStepValues);
namespace setupdisplay {
enum CurrentButton : int8_t
{
UP,
DOWN,
LEFT,
RIGHT,
FINISHED
};
}
class SetupDisplay : public BobbyDisplayWithTitle
{
using Base = BobbyDisplayWithTitle;
public:
explicit SetupDisplay(SetupStep initialStep = SetupStep::INFORMATION) :
explicit SetupDisplay(SetupStep initialStep = SetupStep::INFORMATION, bool early_return = false) :
m_current_setupStep{initialStep},
m_last_setupStep{initialStep}
m_last_setupStep{initialStep},
m_early_return{early_return}
{}
void start() override;
@ -37,16 +54,48 @@ public:
void update() override;
void stop() override;
void rawButtonPressed(uint8_t button) override;
void rawButtonReleased(uint8_t button) override;
void buttonPressed(espgui::Button button) override;
void buttonReleased(espgui::Button button) override;
std::string text() const override;
private:
SetupStep m_current_setupStep;
SetupStep m_last_setupStep;
espchrono::millis_clock::time_point m_menu_opened_timestamp;
bool initialRender{true};
bool m_initialRender{true};
const bool m_early_return;
static void drawLargeText(const std::string&& text);
static void clearLargeText();
static void clearArea();
void drawButtons(setupdisplay::CurrentButton button);
void nextStep();
// button calibration
ModeInterface *m_oldMode;
IgnoreInputMode m_mode{0, bobbycar::protocol::ControlType::FieldOrientedControl, bobbycar::protocol::ControlMode::Torque};
std::optional<uint8_t> m_lastButton;
setupdisplay::CurrentButton m_button_cal_status;
uint8_t m_leftButton, m_rightButton, m_upButton, m_downButton;
bool m_button_cal_finished;
void saveButtons();
};
class PushSetupDisplayAction : public virtual espgui::ActionInterface {
public:
explicit PushSetupDisplayAction(SetupStep setupStep, bool early_return = false) :
m_setupStep{setupStep},
m_early_return{early_return}
{}
void triggered() override
{
espgui::pushScreen<SetupDisplay>(m_setupStep, m_early_return);
}
private:
const SetupStep m_setupStep;
const bool m_early_return;
};