859419639d
Added Access Point determination for OLED reporting of mode/IP address, now auto shows AP on icon Fixed latency issue when switching thermo/fixed mode in Screen3
91 lines
2.3 KiB
C++
91 lines
2.3 KiB
C++
/*
|
|
* This file is part of the "bluetoothheater" distribution
|
|
* (https://gitlab.com/mrjones.id.au/bluetoothheater)
|
|
*
|
|
* Copyright (C) 2018 Ray Jones <ray@mrjones.id.au>
|
|
*
|
|
* This program is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation, either version 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
*
|
|
*/
|
|
|
|
#include "128x64OLED.h"
|
|
#include "KeyPad.h"
|
|
#include "helpers.h"
|
|
#include "Screen4.h"
|
|
#include "BTCWifi.h"
|
|
#include "Tahoma8.h"
|
|
#include "FranklinGothic.h"
|
|
#include "Arial.h"
|
|
|
|
///////////////////////////////////////////////////////////////////////////
|
|
//
|
|
// CScreen4
|
|
//
|
|
// This screen presents sundry information
|
|
// eg WiFi status
|
|
//
|
|
///////////////////////////////////////////////////////////////////////////
|
|
|
|
|
|
CScreen4::CScreen4(C128x64_OLED& display, CScreenManager& mgr) : CScreenHeader(display, mgr)
|
|
{
|
|
}
|
|
|
|
|
|
void
|
|
CScreen4::show()
|
|
{
|
|
CScreenHeader::show();
|
|
|
|
// CTransientFont tmp(_display, &tahoma_8ptFontInfo);
|
|
// CTransientFont tmp(_display, &franklinGothicMediumCond_8ptFontInfo);
|
|
// CTransientFont tmp(_display, &arial_8ptFontInfo);
|
|
|
|
int yPos = 16;
|
|
if(isWifiConnected() || isWifiAP()) {
|
|
if(isWifiAP()) {
|
|
_printInverted(0, yPos, " WiFi Access Point ", true);
|
|
}
|
|
else {
|
|
_printInverted(0, yPos, " WiFi Client ", true);
|
|
}
|
|
yPos += _display.textHeight() + 2;
|
|
_drawMenuText(0, yPos, "IP addr.");
|
|
_drawMenuText(_display.width(), yPos, getWifiAddrStr(), false, eRightJustify);
|
|
}
|
|
else {
|
|
_printInverted(0, yPos, " WiFi Inactive ", true);
|
|
}
|
|
}
|
|
|
|
|
|
void
|
|
CScreen4::keyHandler(uint8_t event)
|
|
{
|
|
if(event & keyPressed) {
|
|
// press CENTRE
|
|
if(event & key_Centre) {
|
|
return;
|
|
}
|
|
// press LEFT
|
|
if(event & key_Left) {
|
|
_ScreenManager.prevScreen();
|
|
}
|
|
// press RIGHT
|
|
if(event & key_Right) {
|
|
_ScreenManager.nextScreen();
|
|
}
|
|
}
|
|
}
|
|
|