lora-aprs/LoRa_APRS_iGate
1
0
Fork 0
mirror of https://github.com/lora-aprs/LoRa_APRS_iGate.git synced 2026-02-24 16:44:36 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

remove smart pointer in Display

Browse source
This commit is contained in:
Peter Buchegger 2021-05-21 22:22:50 +02:00
parent 6ab6da3a8a
commit d96e6cebc1
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/Display/Display.cpp
View file

@ -18,7 +18,7 @@ void Display::setup(BoardConfig const *const boardConfig) {
digitalWrite(boardConfig->OledReset, HIGH);
}
Wire.begin(boardConfig->OledSda, boardConfig->OledScl);
_disp = std::shared_ptr<OLEDDisplay>(new SSD1306(&Wire, boardConfig->OledAddr));
_disp = new SSD1306(&Wire, boardConfig->OledAddr);
Bitmap bitmap(_disp->getWidth(), _disp->getHeight());
_disp->display(&bitmap);
@ -47,7 +47,7 @@ void Display::update() {
if (_frames.size() > 0) {
std::shared_ptr<DisplayFrame> frame = *_frames.begin();
Bitmap bitmap(_disp.get());
Bitmap bitmap(_disp);
frame->drawStatusPage(bitmap);
_disp->display(&bitmap);
@ -60,7 +60,7 @@ void Display::update() {
}
} else {
if (_disp->isDisplayOn()) {
Bitmap bitmap(_disp.get());
Bitmap bitmap(_disp);
_statusFrame->drawStatusPage(bitmap);
_disp->display(&bitmap);
@ -88,7 +88,7 @@ void Display::setStatusFrame(std::shared_ptr<StatusFrame> frame) {
}
void Display::showSpashScreen(String firmwareTitle, String version) {
Bitmap bitmap(_disp.get());
Bitmap bitmap(_disp);
bitmap.drawString(0, 10, firmwareTitle);
bitmap.drawString(0, 20, version);
bitmap.drawString(0, 35, "by Peter Buchegger");
@ -97,7 +97,7 @@ void Display::showSpashScreen(String firmwareTitle, String version) {
}
void Display::showStatusScreen(String header, String text) {
Bitmap bitmap(_disp.get());
Bitmap bitmap(_disp);
bitmap.drawString(0, 0, header);
bitmap.drawStringLF(0, 10, text);
_disp->display(&bitmap);

2
lib/Display/Display.h
View file

@ -42,7 +42,7 @@ public:
void addFrame(std::shared_ptr<DisplayFrame> frame);
private:
std::shared_ptr<OLEDDisplay> _disp;
OLEDDisplay *_disp;
Timer _displayFrameRate;
std::shared_ptr<StatusFrame> _statusFrame;

4
src/LoRa_APRS_iGate.cpp
View file

@ -66,8 +66,8 @@ void setup() {
boardConfig = finder.searchBoardConfig();
if (boardConfig == 0) {
logPrintlnE("Board config not set and search failed!");
while (true) {
}
while (true)
;
}
userConfig.board = boardConfig->Name;
confmg.writeConfiguration(userConfig);