2e25ad3da4
Replaced ` with clean degree symbol in standard font & arial 8 Removed temp offset from fuel cal screen GUI alignment tweaks to avoid cutoffs Better handling of single DS18B20 with BME280 Added bounds limits to Exponential Mean Sorted inheritance from CSensor properly
249 lines
4.9 KiB
C++
249 lines
4.9 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/>.
|
|
*
|
|
*/
|
|
|
|
|
|
///////////////////////////////////////////////////////////////////////////
|
|
//
|
|
// CPasswordScreen
|
|
//
|
|
// This class allows a password entry page to pop up
|
|
//
|
|
///////////////////////////////////////////////////////////////////////////
|
|
|
|
#include "PasswordScreen.h"
|
|
#include "KeyPad.h"
|
|
#include "../Utility/macros.h"
|
|
#include "../Utility/NVStorage.h"
|
|
#include "fonts/Arial.h"
|
|
|
|
long CPasswordScreen::__Expiry = 0;
|
|
|
|
CPasswordScreen::CPasswordScreen(C128x64_OLED& display, CScreenManager& mgr) : CScreenHeader(display, mgr)
|
|
{
|
|
_initUI();
|
|
}
|
|
|
|
void
|
|
CPasswordScreen::onSelect()
|
|
{
|
|
CScreenHeader::onSelect();
|
|
_initUI();
|
|
}
|
|
|
|
void
|
|
CPasswordScreen::__initPassword(bool get)
|
|
{
|
|
_bGetPassword = get && (__Expiry == 0);
|
|
_bPasswordOK = false;
|
|
_bPasswordOK |= __Expiry != 0;
|
|
_PWcol = 0;
|
|
// reset PW digits
|
|
for(int i= 0; i < 4; i++)
|
|
_PWdig[i] = -1;
|
|
}
|
|
|
|
void
|
|
CPasswordScreen::_initUI()
|
|
{
|
|
__initPassword(false);
|
|
|
|
_SaveTime = 0;
|
|
}
|
|
|
|
void
|
|
CPasswordScreen::_getPassword()
|
|
{
|
|
__initPassword(true);
|
|
|
|
_ScreenManager.reqUpdate();
|
|
}
|
|
|
|
bool
|
|
CPasswordScreen::show()
|
|
{
|
|
CPasswordScreen::animate(); // precautionary, in case derived class forgets to call
|
|
|
|
if(_SaveTime) {
|
|
_display.clearDisplay();
|
|
_showStoringMessage();
|
|
return true;
|
|
}
|
|
else if(_bGetPassword) {
|
|
if(!_bPasswordOK) {
|
|
_display.clearDisplay();
|
|
_showPassword();
|
|
return true;
|
|
}
|
|
}
|
|
return false;
|
|
}
|
|
|
|
bool
|
|
CPasswordScreen::animate()
|
|
{
|
|
if(_SaveTime) {
|
|
long tDelta = millis() - _SaveTime;
|
|
if(tDelta > 0) {
|
|
_SaveTime = 0;
|
|
_ScreenManager.reqUpdate();
|
|
}
|
|
}
|
|
return false;
|
|
}
|
|
|
|
bool
|
|
CPasswordScreen::_busy()
|
|
{
|
|
return _SaveTime != 0;
|
|
}
|
|
|
|
void
|
|
CPasswordScreen::_holdPassword()
|
|
{
|
|
if(NVstore.getUserSettings().holdPassword)
|
|
__Expiry = millis() + 24 * 60 * 60 * 1000; // 24 hours
|
|
else
|
|
__Expiry = 0;
|
|
}
|
|
|
|
bool
|
|
CPasswordScreen::isPasswordBusy()
|
|
{
|
|
// return (_SaveTime != 0) || _bGetPassword;
|
|
if(__Expiry)
|
|
return false;
|
|
|
|
return _busy() || _bGetPassword;
|
|
}
|
|
|
|
bool
|
|
CPasswordScreen::keyHandler(uint8_t event)
|
|
{
|
|
if(_bGetPassword) {
|
|
|
|
if(_bPasswordOK) {
|
|
_bGetPassword = false;
|
|
return true;
|
|
}
|
|
|
|
if(event & keyPressed) {
|
|
|
|
// press CENTRE
|
|
if(event & key_Centre) {
|
|
// match "1688"
|
|
if((_PWdig[0] == 1) &&
|
|
(_PWdig[1] == 6) &&
|
|
(_PWdig[2] == 8) &&
|
|
(_PWdig[3] == 8)) {
|
|
_bPasswordOK = true;
|
|
_holdPassword();
|
|
}
|
|
|
|
_bGetPassword = false;
|
|
// reset PW digits
|
|
for(int i= 0; i < 4; i++)
|
|
_PWdig[i] = -1;
|
|
|
|
}
|
|
|
|
// press LEFT
|
|
if(event & key_Left) {
|
|
_PWcol--;
|
|
LOWERLIMIT(_PWcol, 0);
|
|
}
|
|
|
|
// press RIGHT
|
|
if(event & key_Right) {
|
|
_PWcol++;
|
|
UPPERLIMIT(_PWcol, 5);
|
|
}
|
|
|
|
// press UP
|
|
if(event & key_Up) {
|
|
_PWdig[_PWcol]++;
|
|
WRAPUPPERLIMIT(_PWdig[_PWcol], 9, 0);
|
|
}
|
|
|
|
// press DOWN
|
|
if(event & key_Down) {
|
|
_PWdig[_PWcol]--;
|
|
WRAPLOWERLIMIT(_PWdig[_PWcol], 0, 9);
|
|
}
|
|
_ScreenManager.reqUpdate();
|
|
}
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
bool
|
|
CPasswordScreen::_showPassword()
|
|
{
|
|
if(_bGetPassword) {
|
|
_showTitle("Enter password");
|
|
|
|
// determine metrics of character sizing
|
|
CTransientFont AF(_display, &arialBlack_12ptFontInfo);
|
|
|
|
CRect extents;
|
|
_display.getTextExtents("8", extents);
|
|
int charWidth = extents.width;
|
|
_display.getTextExtents(" ", extents);
|
|
|
|
for(int idx =0 ; idx < 4; idx++) {
|
|
|
|
extents.xPos = _display.xCentre() - (2 - idx) * (charWidth * 1.5);
|
|
extents.yPos = 30;
|
|
|
|
char str[8];
|
|
|
|
if(_PWdig[idx] < 0) {
|
|
strcpy(str, "-");
|
|
}
|
|
else {
|
|
sprintf(str, "%d", _PWdig[idx]);
|
|
}
|
|
_printMenuText(extents.xPos, extents.yPos, str, _PWcol == idx);
|
|
}
|
|
}
|
|
return _bGetPassword;
|
|
}
|
|
|
|
void
|
|
CPasswordScreen::_enableStoringMessage()
|
|
{
|
|
_SaveTime = millis() + 1500;
|
|
_ScreenManager.reqUpdate();
|
|
}
|
|
|
|
|
|
bool CPasswordScreen::_isPasswordOK()
|
|
{
|
|
if(__Expiry) {
|
|
long tDelta = millis() - __Expiry;
|
|
if(tDelta > 0) {
|
|
__Expiry = 0;
|
|
_bPasswordOK = false;
|
|
}
|
|
}
|
|
return __Expiry != 0 || _bPasswordOK;
|
|
};
|