fix mick compile
This commit is contained in:
@ -9,6 +9,7 @@
|
|||||||
using namespace espgui;
|
using namespace espgui;
|
||||||
|
|
||||||
namespace {
|
namespace {
|
||||||
|
#ifdef FEATURE_LEDSTRIP
|
||||||
template<int16_t type>
|
template<int16_t type>
|
||||||
class LedStripSetAnimationAction : public virtual ActionInterface
|
class LedStripSetAnimationAction : public virtual ActionInterface
|
||||||
{
|
{
|
||||||
@ -35,4 +36,5 @@ public:
|
|||||||
void triggered() override { animation_type = LEDSTRIP_ANIMATION_TYPE_SPEEDSYNCANIMATION; }
|
void triggered() override { animation_type = LEDSTRIP_ANIMATION_TYPE_SPEEDSYNCANIMATION; }
|
||||||
};
|
};
|
||||||
*/
|
*/
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
@ -8,6 +8,7 @@
|
|||||||
|
|
||||||
using namespace espgui;
|
using namespace espgui;
|
||||||
|
|
||||||
|
#ifdef FEATURE_LEDSTRIP
|
||||||
namespace {
|
namespace {
|
||||||
class LedstripAnimationBlinkNoneAction : public virtual ActionInterface
|
class LedstripAnimationBlinkNoneAction : public virtual ActionInterface
|
||||||
{
|
{
|
||||||
@ -49,3 +50,4 @@ public:
|
|||||||
void triggered() override { blinkAnimation = LEDSTRIP_OVERWRITE_BLINKBOTH; }
|
void triggered() override { blinkAnimation = LEDSTRIP_OVERWRITE_BLINKBOTH; }
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
@ -16,6 +16,7 @@
|
|||||||
// esp-idf
|
// esp-idf
|
||||||
#include "esp_http_client.h"
|
#include "esp_http_client.h"
|
||||||
|
|
||||||
|
#ifdef FEATURE_OTA
|
||||||
namespace {
|
namespace {
|
||||||
void buildMenuFromJson(std::string json);
|
void buildMenuFromJson(std::string json);
|
||||||
void buildMenuRequestError(std::string error);
|
void buildMenuRequestError(std::string error);
|
||||||
@ -191,3 +192,4 @@ namespace {
|
|||||||
return request_running;
|
return request_running;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
@ -22,6 +22,7 @@
|
|||||||
#include "globals.h"
|
#include "globals.h"
|
||||||
#include "displays/menus/ledstripmenu.h"
|
#include "displays/menus/ledstripmenu.h"
|
||||||
|
|
||||||
|
#ifdef FEATURE_LEDSTRIP
|
||||||
int8_t selected_side = 7;
|
int8_t selected_side = 7;
|
||||||
int8_t selected_color;
|
int8_t selected_color;
|
||||||
bool state_select_color{false};
|
bool state_select_color{false};
|
||||||
@ -238,3 +239,4 @@ void LedstripColorsDisplay::drawSide(Bobbycar_Side side, unsigned int color)
|
|||||||
}
|
}
|
||||||
// espgui::tft.fillCircle(espgui::tft.width() / 2, 140, 100, TFT_BLACK);
|
// espgui::tft.fillCircle(espgui::tft.width() / 2, 140, 100, TFT_BLACK);
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
@ -10,6 +10,7 @@
|
|||||||
// local includes
|
// local includes
|
||||||
#include "ledstrip.h"
|
#include "ledstrip.h"
|
||||||
|
|
||||||
|
#ifdef FEATURE_LEDSTRIP
|
||||||
extern int8_t selected_side;
|
extern int8_t selected_side;
|
||||||
extern int8_t selected_color;
|
extern int8_t selected_color;
|
||||||
extern bool state_select_color;
|
extern bool state_select_color;
|
||||||
@ -38,3 +39,4 @@ public:
|
|||||||
private:
|
private:
|
||||||
bool already_drew_circle{false};
|
bool already_drew_circle{false};
|
||||||
};
|
};
|
||||||
|
#endif
|
||||||
|
@ -16,6 +16,7 @@
|
|||||||
#include "cloud.h"
|
#include "cloud.h"
|
||||||
#include "displays/menus/settingsmenu.h"
|
#include "displays/menus/settingsmenu.h"
|
||||||
|
|
||||||
|
#ifdef FEATURE_CLOUD
|
||||||
namespace {
|
namespace {
|
||||||
using CloudTransmitTimeoutChangeScreen = espgui::makeComponent<
|
using CloudTransmitTimeoutChangeScreen = espgui::makeComponent<
|
||||||
espgui::ChangeValueDisplay<int16_t>,
|
espgui::ChangeValueDisplay<int16_t>,
|
||||||
@ -70,3 +71,4 @@ void CloudSettingsMenu::back()
|
|||||||
{
|
{
|
||||||
switchScreen<SettingsMenu>();
|
switchScreen<SettingsMenu>();
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
@ -14,6 +14,7 @@
|
|||||||
#include "ledstrip.h"
|
#include "ledstrip.h"
|
||||||
#include "ledstripdefines.h"
|
#include "ledstripdefines.h"
|
||||||
|
|
||||||
|
#ifdef FEATURE_LEDSTRIP
|
||||||
class currentSelectedAnimationText : public virtual TextInterface { public: std::string text() const override {
|
class currentSelectedAnimationText : public virtual TextInterface { public: std::string text() const override {
|
||||||
switch (animation_type) {
|
switch (animation_type) {
|
||||||
case LEDSTRIP_ANIMATION_TYPE_DEFAULTRAINBOW:
|
case LEDSTRIP_ANIMATION_TYPE_DEFAULTRAINBOW:
|
||||||
@ -51,3 +52,4 @@ namespace {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
} // Namespace
|
} // Namespace
|
||||||
|
#endif
|
||||||
|
@ -13,6 +13,7 @@
|
|||||||
#include "actions/switchscreenaction.h"
|
#include "actions/switchscreenaction.h"
|
||||||
#include "ledstripdefines.h"
|
#include "ledstripdefines.h"
|
||||||
|
|
||||||
|
#ifdef FEATURE_LEDSTRIP
|
||||||
class currentSelectedBlinkAnimationText : public virtual TextInterface { public: std::string text() const override {
|
class currentSelectedBlinkAnimationText : public virtual TextInterface { public: std::string text() const override {
|
||||||
switch (blinkAnimation) {
|
switch (blinkAnimation) {
|
||||||
case LEDSTRIP_OVERWRITE_BLINKLEFT:
|
case LEDSTRIP_OVERWRITE_BLINKLEFT:
|
||||||
@ -56,3 +57,4 @@ namespace {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
} // Namespace
|
} // Namespace
|
||||||
|
#endif
|
||||||
|
@ -16,6 +16,7 @@
|
|||||||
#include "displays/menus/selectbuildservermenu.h"
|
#include "displays/menus/selectbuildservermenu.h"
|
||||||
#include "displays/menus/mainmenu.h"
|
#include "displays/menus/mainmenu.h"
|
||||||
|
|
||||||
|
#ifdef FEATURE_OTA
|
||||||
namespace {
|
namespace {
|
||||||
|
|
||||||
class RedownloadJsonAction : public virtual espgui::ActionInterface
|
class RedownloadJsonAction : public virtual espgui::ActionInterface
|
||||||
@ -44,3 +45,4 @@ void OtaMenu::back()
|
|||||||
{
|
{
|
||||||
switchScreen<MainMenu>();
|
switchScreen<MainMenu>();
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
@ -10,6 +10,7 @@
|
|||||||
// local includes
|
// local includes
|
||||||
#include "displays/menus/settingsmenu.h"
|
#include "displays/menus/settingsmenu.h"
|
||||||
|
|
||||||
|
#ifdef FEATURE_OTA
|
||||||
namespace {
|
namespace {
|
||||||
class BuildserverMenuItem : public espgui::MenuItem
|
class BuildserverMenuItem : public espgui::MenuItem
|
||||||
{
|
{
|
||||||
@ -69,3 +70,4 @@ void SelectBuildServerMenu::back()
|
|||||||
{
|
{
|
||||||
espgui::switchScreen<SettingsMenu>();
|
espgui::switchScreen<SettingsMenu>();
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
@ -11,6 +11,7 @@
|
|||||||
#include "globals.h"
|
#include "globals.h"
|
||||||
#include "buildserver.h"
|
#include "buildserver.h"
|
||||||
|
|
||||||
|
#ifdef FEATURE_OTA
|
||||||
class SelectBuildServerMenu :
|
class SelectBuildServerMenu :
|
||||||
public espgui::MenuDisplay,
|
public espgui::MenuDisplay,
|
||||||
public espgui::StaticText<TEXT_SELECTBUILDSERVERMENU>
|
public espgui::StaticText<TEXT_SELECTBUILDSERVERMENU>
|
||||||
@ -20,3 +21,4 @@ public:
|
|||||||
|
|
||||||
void back() override;
|
void back() override;
|
||||||
};
|
};
|
||||||
|
#endif
|
||||||
|
@ -20,6 +20,7 @@
|
|||||||
|
|
||||||
using namespace espgui;
|
using namespace espgui;
|
||||||
|
|
||||||
|
#ifdef FEATURE_OTA
|
||||||
namespace {
|
namespace {
|
||||||
|
|
||||||
// ToDo: if (request_failed) => MESSAGE("An error occurred")
|
// ToDo: if (request_failed) => MESSAGE("An error occurred")
|
||||||
@ -147,3 +148,4 @@ void SelectBuildMenu::buildMenuRequestError(std::string error)
|
|||||||
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, SwitchScreenAction<OtaMenu>, StaticMenuItemIcon<&espgui::icons::back>>>();
|
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, SwitchScreenAction<OtaMenu>, StaticMenuItemIcon<&espgui::icons::back>>>();
|
||||||
}
|
}
|
||||||
} // namespace
|
} // namespace
|
||||||
|
#endif
|
||||||
|
Reference in New Issue
Block a user