Crash_Override/ESP32_ChinaDieselHeater_Control
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Tidied Repeating timer icon

Browse source
This commit is contained in:
Ray Jones 2019-09-08 11:56:22 +10:00
parent fa36236948
commit 3a810d6eea
4 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
Bootload/AfterburnerV3.1.2.bin
View file

Binary file not shown.

5
src/OLED/ScreenHeader.cpp
View file

@ -332,9 +332,10 @@ CScreenHeader::showTimers()
int nextTimer = CTimerManager::getNextTimer(); // timer ID and repeat flag info of next scheduled timer
if(nextTimer) {
int xPos = X_TIMER_ICON;
_drawBitmap(xPos, Y_TIMER_ICON, TimerIconInfo);
if(nextTimer & 0x80)
_drawBitmap(xPos-3, Y_TIMER_ICON, verticalRepeatIconInfo);
_drawBitmap(xPos, Y_TIMER_ICON, TimerIconRptInfo);
else
_drawBitmap(xPos, Y_TIMER_ICON, TimerIconInfo);
if(_hdrDetail) {
sTimer timerInfo;
char msg[8];

16
src/OLED/fonts/Icons.cpp
View file

@ -501,6 +501,22 @@ const uint8_t timerIcon [] PROGMEM = {
};
const BITMAP_INFO TimerIconInfo(15, 11, timerIcon);
// 'timer', 15x15px
const uint8_t timerIconRpt [] PROGMEM = {
0x07, 0xc0, // #####
0x09, 0x20, // # # #
0x11, 0x10, // # # #
0x21, 0x08, // # # #
0x21, 0x08, // # # #
0x21, 0xE8, // # #### #
0x20, 0x08, // # #
0x3E, 0x08, // ##### #
0x30, 0x10, // ## #
0x28, 0x20, // # # #
0x27, 0xc0, // # #####
};
const BITMAP_INFO TimerIconRptInfo(15, 11, timerIconRpt);
// 'large timer', 15x15px
const uint8_t largeTimerIcon[] PROGMEM =
{

1
src/OLED/fonts/Icons.h
View file

@ -73,6 +73,7 @@ extern const BITMAP_INFO RepeatIconInfo;
extern const BITMAP_INFO TimerId1IconInfo;
extern const BITMAP_INFO TimerId2IconInfo;
extern const BITMAP_INFO TimerIconInfo;
extern const BITMAP_INFO TimerIconRptInfo;
extern const BITMAP_INFO verticalRepeatIconInfo;
extern const BITMAP_INFO LargeTimerIconInfo;
extern const BITMAP_INFO VerticalLargeRepeatIconInfo;