Added new ledstrip menu and icon

This commit is contained in:
CommanderRedYT
2021-10-22 00:35:21 +02:00
committed by 0xFEEDC0DE64
parent 4ae7390d45
commit 88a32fc2ba
8 changed files with 1067 additions and 0 deletions

BIN
icons/bobbycar.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

View File

@ -116,6 +116,7 @@ set(headers
displays/menus/invertmenu.h displays/menus/invertmenu.h
displays/menus/larsmmodesettingsmenu.h displays/menus/larsmmodesettingsmenu.h
displays/menus/ledstripmenu.h displays/menus/ledstripmenu.h
displays/menus/ledstripcolorsmenu.h
displays/menus/ledstripselectanimationmenu.h displays/menus/ledstripselectanimationmenu.h
displays/menus/ledstripselectblinkmenu.h displays/menus/ledstripselectblinkmenu.h
displays/menus/limitssettingsmenu.h displays/menus/limitssettingsmenu.h
@ -152,6 +153,7 @@ set(headers
icons/battery.h icons/battery.h
icons/bluetooth.h icons/bluetooth.h
icons/bms.h icons/bms.h
icons/bobbycar.h
icons/buzzer.h icons/buzzer.h
icons/close.h icons/close.h
icons/demos.h icons/demos.h
@ -329,6 +331,7 @@ set(sources
icons/battery.cpp icons/battery.cpp
icons/bluetooth.cpp icons/bluetooth.cpp
icons/bms.cpp icons/bms.cpp
icons/bobbycar.cpp
icons/buzzer.cpp icons/buzzer.cpp
icons/close.cpp icons/close.cpp
icons/demos.cpp icons/demos.cpp

View File

@ -0,0 +1,45 @@
#pragma once
#include <TFT_eSPI.h>
// Local includes
#include "menudisplay.h"
#include "utils.h"
#include "menuitem.h"
#include "ledstrip.h"
#include "icons/back.h"
#include "icons/bobbycar.h"
#include "texts.h"
#include "actions/dummyaction.h"
#include "actions/switchscreenaction.h"
using namespace espgui;
namespace {
class LedstripMenu;
}
namespace {
class LedstripColorsMenu :
public MenuDisplay,
public StaticText<TEXT_LEDSTRIPCOLORMENU>,
public BackActionInterface<SwitchScreenAction<LedstripMenu>>
{
using Base = MenuDisplay;
public:
void redraw() override;
LedstripColorsMenu()
{
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, SwitchScreenAction<LedstripMenu>, StaticMenuItemIcon<&espgui::icons::back>>>();
}
};
void LedstripColorsMenu::redraw()
{
Base::redraw();
tft.setSwapBytes(true);
tft.pushImage(70, 80, bobbyicons::bobbycar.WIDTH, bobbyicons::bobbycar.HEIGHT, bobbyicons::bobbycar.buffer);
tft.setSwapBytes(false);
}
} // Namespace

View File

@ -19,6 +19,7 @@
// forward declares // forward declares
namespace { namespace {
class MainWindow; class MainWindow;
class LedstripColorsMenu;
} // namespace } // namespace
using namespace espgui; using namespace espgui;
@ -108,6 +109,7 @@ class LedstripMenu :
public: public:
LedstripMenu() LedstripMenu()
{ {
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_LEDSTRIPCOLORMENU>, SwitchScreenAction<LedstripColorsMenu>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_LEDANIMATION>, ToggleBoolAction, CheckboxIcon, EnableLedAnimationAccessor>>(); constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_LEDANIMATION>, ToggleBoolAction, CheckboxIcon, EnableLedAnimationAccessor>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BRAKELIGHTS>, ToggleBoolAction, CheckboxIcon, EnableBrakeLightsAccessor>>(); constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BRAKELIGHTS>, ToggleBoolAction, CheckboxIcon, EnableBrakeLightsAccessor>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BLINKBEEP>, ToggleBoolAction, CheckboxIcon, EnableBeepWhenBlinkAccessor>>(); constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BLINKBEEP>, ToggleBoolAction, CheckboxIcon, EnableBeepWhenBlinkAccessor>>();

1006
main/icons/bobbycar.cpp Normal file

File diff suppressed because it is too large Load Diff

7
main/icons/bobbycar.h Normal file
View File

@ -0,0 +1,7 @@
#pragma once
#include "icon.h"
namespace bobbyicons {
extern const espgui::Icon<100, 160> bobbycar;
} // namespace bobbyicons

View File

@ -61,6 +61,7 @@ using namespace std::chrono_literals;
#include "displays/menus/mainmenu.h" #include "displays/menus/mainmenu.h"
#include "displays/menus/tempomatmodesettingsmenu.h" #include "displays/menus/tempomatmodesettingsmenu.h"
#include "displays/menus/modessettingsmenu.h" #include "displays/menus/modessettingsmenu.h"
#include "displays/menus/ledstripcolorsmenu.h"
#ifdef FEATURE_MOSFETS #ifdef FEATURE_MOSFETS
#include "displays/menus/mosfetsmenu.h" #include "displays/menus/mosfetsmenu.h"
#endif #endif

View File

@ -489,6 +489,9 @@ constexpr char TEXT_OTA_NOCONNECTION[] = "E:No internet.";
constexpr char TEXT_OTA_WAITFORRESPONSE[] = "Wait for response..."; constexpr char TEXT_OTA_WAITFORRESPONSE[] = "Wait for response...";
constexpr char TEXT_REDOWNLOAD[] = "Reload list"; constexpr char TEXT_REDOWNLOAD[] = "Reload list";
//LedstripColorMenu
constexpr char TEXT_LEDSTRIPCOLORMENU[] = "Customize Ledstrip";
#ifdef FEATURE_CAN #ifdef FEATURE_CAN
constexpr char TEXT_POWERSUPPLY[] = "Powersupply"; constexpr char TEXT_POWERSUPPLY[] = "Powersupply";
#endif #endif