lora-aprs/LoRa_APRS_iGate
1
0
Fork 0
mirror of https://github.com/lora-aprs/LoRa_APRS_iGate.git synced 2026-04-06 15:05:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

add clang-format and format all source files

Browse source
This commit is contained in:
Peter Buchegger 2021-03-12 23:21:45 +01:00
parent fd4e34bb6c
commit ff25ad4696
41 changed files with 1664 additions and 1808 deletions
Download patch file Download diff file Expand all files Collapse all files

165
lib/Display/Display.cpp
View file

@ -1,116 +1,97 @@
#include <logger.h>
#include "Display.h"
#include <TaskManager.h>
#include <logger.h>
Display::Display()
: _disp(0), _statusFrame(0), _displayOff(false)
{
Display::Display() : _disp(0), _statusFrame(0), _displayOff(false) {
}
void Display::setup(std::shared_ptr<BoardConfig> boardConfig)
{
if(boardConfig->OledReset != 0)
{
pinMode(boardConfig->OledReset, OUTPUT);
digitalWrite(boardConfig->OledReset, HIGH);
delay(1);
digitalWrite(boardConfig->OledReset, LOW);
delay(10);
digitalWrite(boardConfig->OledReset, HIGH);
}
Wire.begin(boardConfig->OledSda, boardConfig->OledScl);
_disp = std::shared_ptr<OLEDDisplay>(new SSD1306(&Wire, boardConfig->OledAddr));
Bitmap bitmap(_disp->getWidth(), _disp->getHeight());
_disp->display(&bitmap);
_displayTimeout.setTimeout(10);
_frameTimeout.setTimeout(15);
void Display::setup(std::shared_ptr<BoardConfig> boardConfig) {
if (boardConfig->OledReset != 0) {
pinMode(boardConfig->OledReset, OUTPUT);
digitalWrite(boardConfig->OledReset, HIGH);
delay(1);
digitalWrite(boardConfig->OledReset, LOW);
delay(10);
digitalWrite(boardConfig->OledReset, HIGH);
}
Wire.begin(boardConfig->OledSda, boardConfig->OledScl);
_disp = std::shared_ptr<OLEDDisplay>(new SSD1306(&Wire, boardConfig->OledAddr));
Bitmap bitmap(_disp->getWidth(), _disp->getHeight());
_disp->display(&bitmap);
_displayTimeout.setTimeout(10);
_frameTimeout.setTimeout(15);
}
void Display::turn180()
{
_disp->flipScreenVertically();
void Display::turn180() {
_disp->flipScreenVertically();
}
void Display::update()
{
if(_frameTimeout.check())
{
if(_statusFrame->isPrio())
{
Bitmap bitmap(_disp.get());
_statusFrame->drawStatusPage(bitmap);
activateDisplay();
_disp->display(&bitmap);
return;
}
void Display::update() {
if (_frameTimeout.check()) {
if (_statusFrame->isPrio()) {
Bitmap bitmap(_disp.get());
_statusFrame->drawStatusPage(bitmap);
activateDisplay();
_disp->display(&bitmap);
return;
}
if(_frames.size() > 0)
{
std::shared_ptr<DisplayFrame> frame = *_frames.begin();
Bitmap bitmap(_disp.get());
frame->drawStatusPage(bitmap);
activateDisplay();
_disp->display(&bitmap);
_frames.pop_front();
_frameTimeout.start();
return;
}
if (_frames.size() > 0) {
std::shared_ptr<DisplayFrame> frame = *_frames.begin();
Bitmap bitmap(_disp.get());
frame->drawStatusPage(bitmap);
activateDisplay();
_disp->display(&bitmap);
_frames.pop_front();
_frameTimeout.start();
return;
}
if(!_displayOff && !_displayTimeout.isActive())
{
Bitmap bitmap(_disp.get());
_statusFrame->drawStatusPage(bitmap);
activateDisplay();
_disp->display(&bitmap);
_displayTimeout.start();
}
if(_displayTimeout.check())
{
deactivateDisplay();
_displayTimeout.reset();
}
}
if (!_displayOff && !_displayTimeout.isActive()) {
Bitmap bitmap(_disp.get());
_statusFrame->drawStatusPage(bitmap);
activateDisplay();
_disp->display(&bitmap);
_displayTimeout.start();
}
if (_displayTimeout.check()) {
deactivateDisplay();
_displayTimeout.reset();
}
}
}
void Display::addFrame(std::shared_ptr<DisplayFrame> frame)
{
_frames.push_back(frame);
void Display::addFrame(std::shared_ptr<DisplayFrame> frame) {
_frames.push_back(frame);
}
void Display::setStatusFrame(std::shared_ptr<StatusFrame> frame)
{
_statusFrame = frame;
void Display::setStatusFrame(std::shared_ptr<StatusFrame> frame) {
_statusFrame = frame;
}
void Display::showSpashScreen(String firmwareTitle, String version)
{
Bitmap bitmap(_disp.get());
bitmap.drawString( 0, 10, firmwareTitle);
bitmap.drawString( 0, 20, version);
bitmap.drawString( 0, 35, "by Peter Buchegger");
bitmap.drawString(30, 45, "OE5BPA");
_disp->display(&bitmap);
void Display::showSpashScreen(String firmwareTitle, String version) {
Bitmap bitmap(_disp.get());
bitmap.drawString(0, 10, firmwareTitle);
bitmap.drawString(0, 20, version);
bitmap.drawString(0, 35, "by Peter Buchegger");
bitmap.drawString(30, 45, "OE5BPA");
_disp->display(&bitmap);
}
void Display::activateDisplay()
{
if(_displayOff)
{
_disp->displayOn();
_displayOff = false;
}
void Display::activateDisplay() {
if (_displayOff) {
_disp->displayOn();
_displayOff = false;
}
}
void Display::deactivateDisplay()
{
_disp->displayOff();
_displayOff = true;
void Display::deactivateDisplay() {
_disp->displayOff();
_displayOff = true;
}
void TextFrame::drawStatusPage(Bitmap & bitmap)
{
bitmap.drawString(0, 0, _header);
bitmap.drawStringLF(0, 10, _text);
void TextFrame::drawStatusPage(Bitmap &bitmap) {
bitmap.drawString(0, 0, _header);
bitmap.drawStringLF(0, 10, _text);
}