Add display flip option
This commit is contained in:
@@ -262,5 +262,8 @@ struct QuickActionExtra2Accessor : public NewSettingsAccessor<BobbyQuickActions>
|
|||||||
struct QuickActionExtra3Accessor : public NewSettingsAccessor<BobbyQuickActions> { ConfigWrapper<BobbyQuickActions> &getConfig() const override { return configs.quickActionExtra3; } };
|
struct QuickActionExtra3Accessor : public NewSettingsAccessor<BobbyQuickActions> { ConfigWrapper<BobbyQuickActions> &getConfig() const override { return configs.quickActionExtra3; } };
|
||||||
struct QuickActionExtra4Accessor : public NewSettingsAccessor<BobbyQuickActions> { ConfigWrapper<BobbyQuickActions> &getConfig() const override { return configs.quickActionExtra4; } };
|
struct QuickActionExtra4Accessor : public NewSettingsAccessor<BobbyQuickActions> { ConfigWrapper<BobbyQuickActions> &getConfig() const override { return configs.quickActionExtra4; } };
|
||||||
|
|
||||||
|
// boardcomputer-hardware
|
||||||
|
struct FlipScreenAccessor : public NewSettingsAccessor<bool> { ConfigWrapper<bool> &getConfig() const override { return configs.boardcomputerHardware.flipScreen; } };
|
||||||
|
|
||||||
// Other
|
// Other
|
||||||
struct AnhaengerIdAccessor : public NewSettingsAccessor<uint16_t> { ConfigWrapper<uint16_t> &getConfig() const override { return configs.anhaenger_id; } };
|
struct AnhaengerIdAccessor : public NewSettingsAccessor<uint16_t> { ConfigWrapper<uint16_t> &getConfig() const override { return configs.anhaenger_id; } };
|
||||||
|
@@ -10,17 +10,19 @@
|
|||||||
#include <textwithvaluehelper.h>
|
#include <textwithvaluehelper.h>
|
||||||
|
|
||||||
// local includes
|
// local includes
|
||||||
#include "displays/bobbychangevaluedisplay.h"
|
|
||||||
#include "utils.h"
|
|
||||||
#include "icons/lock.h"
|
|
||||||
#include "accessors/settingsaccessors.h"
|
#include "accessors/settingsaccessors.h"
|
||||||
#include "displays/menus/lockscreensettingsmenu.h"
|
#include "bobbycheckbox.h"
|
||||||
#include "displays/potiscalibratedisplay.h"
|
#include "displays/bobbychangevaluedisplay.h"
|
||||||
#include "displays/menus/timersmenu.h"
|
|
||||||
#include "displays/menus/settingsmenu.h"
|
|
||||||
#include "displays/buttoncalibratedisplay.h"
|
#include "displays/buttoncalibratedisplay.h"
|
||||||
#include "displays/menus/extrabuttoncalibratemenu.h"
|
#include "displays/menus/extrabuttoncalibratemenu.h"
|
||||||
|
#include "displays/menus/lockscreensettingsmenu.h"
|
||||||
|
#include "displays/menus/settingsmenu.h"
|
||||||
#include "displays/menus/setupquickactionsmenu.h"
|
#include "displays/menus/setupquickactionsmenu.h"
|
||||||
|
#include "displays/menus/timersmenu.h"
|
||||||
|
#include "displays/potiscalibratedisplay.h"
|
||||||
|
#include "icons/lock.h"
|
||||||
|
#include "utils.h"
|
||||||
|
|
||||||
#ifdef FEATURE_JOYSTICK
|
#ifdef FEATURE_JOYSTICK
|
||||||
#include "displays/joystickdebugdisplay.h"
|
#include "displays/joystickdebugdisplay.h"
|
||||||
#endif
|
#endif
|
||||||
@@ -35,6 +37,7 @@ constexpr char TEXT_POTISCALIBRATE[] = "Potis Calibrate";
|
|||||||
#ifdef FEATURE_JOYSTICK
|
#ifdef FEATURE_JOYSTICK
|
||||||
constexpr char TEXT_JOYSTICK[] = "Debug Joystick";
|
constexpr char TEXT_JOYSTICK[] = "Debug Joystick";
|
||||||
#endif
|
#endif
|
||||||
|
constexpr char TEXT_FLIPDISPLAY[] = "Flip Display";
|
||||||
constexpr char TEXT_SAMPLECOUNT[] = "sampleCount";
|
constexpr char TEXT_SAMPLECOUNT[] = "sampleCount";
|
||||||
constexpr char TEXT_GASMIN[] = "gasMin";
|
constexpr char TEXT_GASMIN[] = "gasMin";
|
||||||
constexpr char TEXT_GASMAX[] = "gasMax";
|
constexpr char TEXT_GASMAX[] = "gasMax";
|
||||||
@@ -200,6 +203,7 @@ BoardcomputerHardwareSettingsMenu::BoardcomputerHardwareSettingsMenu()
|
|||||||
#ifdef FEATURE_JOYSTICK
|
#ifdef FEATURE_JOYSTICK
|
||||||
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_JOYSTICK>, PushScreenAction<JoystickDebugDisplay>>>();
|
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_JOYSTICK>, PushScreenAction<JoystickDebugDisplay>>>();
|
||||||
#endif
|
#endif
|
||||||
|
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_FLIPDISPLAY>, BobbyCheckbox, FlipScreenAccessor>>();
|
||||||
constructMenuItem<makeComponent<MenuItem, TextWithValueHelper<TEXT_SAMPLECOUNT, SampleCountAccessor>, PushScreenAction<SampleCountChangeScreen>>>();
|
constructMenuItem<makeComponent<MenuItem, TextWithValueHelper<TEXT_SAMPLECOUNT, SampleCountAccessor>, PushScreenAction<SampleCountChangeScreen>>>();
|
||||||
constructMenuItem<makeComponent<MenuItem, TextWithValueHelper<TEXT_GASMIN, GasMinAccessor>, PushScreenAction<GasMinChangeScreen>>>();
|
constructMenuItem<makeComponent<MenuItem, TextWithValueHelper<TEXT_GASMIN, GasMinAccessor>, PushScreenAction<GasMinChangeScreen>>>();
|
||||||
constructMenuItem<makeComponent<MenuItem, TextWithValueHelper<TEXT_GASMAX, GasMaxAccessor>, PushScreenAction<GasMaxChangeScreen>>>();
|
constructMenuItem<makeComponent<MenuItem, TextWithValueHelper<TEXT_GASMAX, GasMaxAccessor>, PushScreenAction<GasMaxChangeScreen>>>();
|
||||||
|
@@ -365,6 +365,7 @@ public:
|
|||||||
ConfigWrapperLegacy<int16_t> cloudSendRate {1, DoReset, {}, "cloudSendRate" };
|
ConfigWrapperLegacy<int16_t> cloudSendRate {1, DoReset, {}, "cloudSendRate" };
|
||||||
ConfigWrapperLegacy<int16_t> udpSendRateMs {65, DoReset, {}, "udpSendRate" };
|
ConfigWrapperLegacy<int16_t> udpSendRateMs {65, DoReset, {}, "udpSendRate" };
|
||||||
} timersSettings;
|
} timersSettings;
|
||||||
|
ConfigWrapperLegacy<bool> flipScreen {false, DoReset, {}, "flipScreen" };
|
||||||
} boardcomputerHardware;
|
} boardcomputerHardware;
|
||||||
|
|
||||||
struct {
|
struct {
|
||||||
@@ -711,6 +712,8 @@ public:
|
|||||||
x(boardcomputerHardware.timersSettings.cloudSendRate) \
|
x(boardcomputerHardware.timersSettings.cloudSendRate) \
|
||||||
x(boardcomputerHardware.timersSettings.udpSendRateMs) \
|
x(boardcomputerHardware.timersSettings.udpSendRateMs) \
|
||||||
\
|
\
|
||||||
|
x(boardcomputerHardware.flipScreen) \
|
||||||
|
\
|
||||||
x(cloudSettings.cloudEnabled) \
|
x(cloudSettings.cloudEnabled) \
|
||||||
x(cloudSettings.cloudTransmitTimeout) \
|
x(cloudSettings.cloudTransmitTimeout) \
|
||||||
x(cloudSettings.cloudKey) \
|
x(cloudSettings.cloudKey) \
|
||||||
|
@@ -15,10 +15,12 @@ Label bootLabel{32, 250};
|
|||||||
|
|
||||||
void initScreen()
|
void initScreen()
|
||||||
{
|
{
|
||||||
|
// vertical screen
|
||||||
tft.init();
|
tft.init();
|
||||||
tft.fillScreen(TFT_WHITE);
|
tft.fillScreen(TFT_WHITE);
|
||||||
tft.setTextColor(TFT_BLACK, TFT_WHITE);
|
tft.setTextColor(TFT_BLACK, TFT_WHITE);
|
||||||
tft.setTextFont(4);
|
tft.setTextFont(4);
|
||||||
|
tft.setRotation(configs.boardcomputerHardware.flipScreen.value() ? 2 : 0);
|
||||||
espgui::tft.setSwapBytes(true);
|
espgui::tft.setSwapBytes(true);
|
||||||
tft.pushImage(0, 40, bobbyicons::logo.WIDTH, bobbyicons::logo.HEIGHT, bobbyicons::logo.buffer);
|
tft.pushImage(0, 40, bobbyicons::logo.WIDTH, bobbyicons::logo.HEIGHT, bobbyicons::logo.buffer);
|
||||||
espgui::tft.setSwapBytes(false);
|
espgui::tft.setSwapBytes(false);
|
||||||
@@ -42,6 +44,13 @@ void updateDisplay()
|
|||||||
changeScreenCallback = {};
|
changeScreenCallback = {};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (tft.getRotation() != (configs.boardcomputerHardware.flipScreen.value() ? 2 : 0))
|
||||||
|
{
|
||||||
|
tft.setRotation(configs.boardcomputerHardware.flipScreen.value() ? 2 : 0);
|
||||||
|
if (currentDisplay)
|
||||||
|
currentDisplay->initScreen();
|
||||||
|
}
|
||||||
|
|
||||||
if (const int8_t rawButton = rawButtonRequest.load(); rawButton != -1 && currentDisplay)
|
if (const int8_t rawButton = rawButtonRequest.load(); rawButton != -1 && currentDisplay)
|
||||||
{
|
{
|
||||||
currentDisplay->rawButtonPressed(rawButton);
|
currentDisplay->rawButtonPressed(rawButton);
|
||||||
|
Reference in New Issue
Block a user