projects/evDash
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:nickn17/evDash

Browse Source
This commit is contained in:
Martin Kolací
2020-12-28 13:18:44 +01:00
parent b6d0696534 0aad680410
commit 4d15945735
3 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Board320_240.cpp
View File

@@ -1286,7 +1286,7 @@ void Board320_240::redrawScreen() {
// SDCARD recording // SDCARD recording
/*liveData->params.sdcardRecording*/ /*liveData->params.sdcardRecording*/
if (liveData->settings.sdcardEnabled == 1) { if (liveData->settings.sdcardEnabled == 1 && (liveData->params.mainLoopCounter & 1) == 1) {
spr.fillCircle((displayScreen == SCREEN_SPEED || displayScreenAutoMode == SCREEN_SPEED) ? 140 : 310, 10, 4, TFT_BLACK); spr.fillCircle((displayScreen == SCREEN_SPEED || displayScreenAutoMode == SCREEN_SPEED) ? 140 : 310, 10, 4, TFT_BLACK);
spr.fillCircle((displayScreen == SCREEN_SPEED || displayScreenAutoMode == SCREEN_SPEED) ? 140 : 310, 10, 3, spr.fillCircle((displayScreen == SCREEN_SPEED || displayScreenAutoMode == SCREEN_SPEED) ? 140 : 310, 10, 3,
(liveData->params.sdcardInit == 1) ? (liveData->params.sdcardInit == 1) ?
@@ -1354,6 +1354,8 @@ void Board320_240::loadTestData() {
*/ */
void Board320_240::mainLoop() { void Board320_240::mainLoop() {
liveData->params.mainLoopCounter++;
/////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////
// Handle buttons // Handle buttons
// MIDDLE - menu select // MIDDLE - menu select

1
LiveData.cpp
View File

@@ -15,6 +15,7 @@ void debug(String msg, uint8_t debugLevel) {
*/ */
void LiveData::initParams() { void LiveData::initParams() {
params.mainLoopCounter = 0;
// SIM // SIM
params.lastDataSent = 0; params.lastDataSent = 0;
params.sim800l_enabled = false; params.sim800l_enabled = false;

1
LiveData.h
View File

@@ -45,6 +45,7 @@ typedef struct {
// System // System
time_t currentTime; time_t currentTime;
time_t chargingStartTime; time_t chargingStartTime;
uint32_t mainLoopCounter;
// SIM // SIM
time_t lastDataSent; time_t lastDataSent;
bool sim800l_enabled; bool sim800l_enabled;