add display turning

close #61
pull/74/head
Peter Buchegger 2021-02-10 22:37:18 +01:00
rodzic b7b8884594
commit 8cf0c67683
7 zmienionych plików z 17 dodań i 2 usunięć

Wyświetl plik

@ -35,7 +35,8 @@
{
"always_on": true,
"timeout":10,
"overwrite_pin":0
"overwrite_pin":0,
"turn180": true
},
"ftp":
{

Wyświetl plik

@ -25,6 +25,11 @@ void Display::setup(std::shared_ptr<BoardConfig> boardConfig)
_disp->display(&bitmap);
}
void Display::turn180()
{
_disp->flipScreenVertically();
}
void Display::update()
{
if(_statusFrame->isPrio())

Wyświetl plik

@ -32,6 +32,7 @@ public:
~Display() {}
void setup(std::shared_ptr<BoardConfig> boardConfig);
void turn180();
void update();
void addFrame(std::shared_ptr<DisplayFrame> frame);

Wyświetl plik

@ -1,5 +1,6 @@
#include <logger.h>
#include <TimeLib.h>
#include "project_configuration.h"
#include "TaskDisplay.h"
DisplayTask::DisplayTask()
@ -14,6 +15,10 @@ DisplayTask::~DisplayTask()
bool DisplayTask::setup(std::shared_ptr<Configuration> config, std::shared_ptr<BoardConfig> boardConfig)
{
Display::instance().setup(boardConfig);
if(config->display.turn180)
{
Display::instance().turn180();
}
std::shared_ptr<StatusFrame> statusFrame = std::shared_ptr<StatusFrame>(new StatusFrame(TaskManager::instance().getTasks()));
Display::instance().setStatusFrame(statusFrame);
_stateInfo = "";

Wyświetl plik

@ -37,6 +37,7 @@ std::shared_ptr<Configuration> ProjectConfigurationManagement::readProjectConfig
conf->display.alwaysOn = data["display"]["always_on"] | true;
conf->display.timeout = data["display"]["timeout"] | 10;
conf->display.overwritePin = data["display"]["overwrite_pin"] | 0;
conf->display.turn180 = data["display"]["turn180"] | true;
conf->ftp.active = data["ftp"]["active"] | false;
JsonArray users = data["ftp"]["user"].as<JsonArray>();
@ -89,6 +90,7 @@ void ProjectConfigurationManagement::writeProjectConfiguration(std::shared_ptr<C
data["display"]["always_on"] = conf->display.alwaysOn;
data["display"]["timeout"] = conf->display.timeout;
data["display"]["overwrite_pin"] = conf->display.overwritePin;
data["display"]["turn180"] = conf->display.turn180;
data["ftp"]["active"] = conf->ftp.active;
JsonArray users = data["ftp"].createNestedArray("user");
for(Configuration::Ftp::User u : conf->ftp.users)

Wyświetl plik

@ -59,11 +59,12 @@ public:
class Display
{
public:
Display() : alwaysOn(true), timeout(10), overwritePin(0) {}
Display() : alwaysOn(true), timeout(10), overwritePin(0), turn180(true) {}
bool alwaysOn;
int timeout;
int overwritePin;
bool turn180;
};
class Ftp