This commit is contained in:
Lubos Petrovic
2020-12-20 15:52:38 +01:00
parent e8b0b10be0
commit 33d021dd77
12 changed files with 12 additions and 49 deletions

View File

@@ -1,5 +1,4 @@
#ifndef BOARD320_240_CPP #pragma once
#define BOARD320_240_CPP
#include <SD.h> #include <SD.h>
#include <FS.h> #include <FS.h>
@@ -30,7 +29,6 @@ void Board320_240::initBoard() {
getLocalTime(&now, 0); getLocalTime(&now, 0);
liveData->params.chargingStartTime = liveData->params.currentTime = mktime(&now); liveData->params.chargingStartTime = liveData->params.currentTime = mktime(&now);
// Init display // Init display
Serial.println("Init tft display"); Serial.println("Init tft display");
tft.begin(); tft.begin();
@@ -1456,5 +1454,3 @@ void Board320_240::syncGPS() {
settimeofday(&now, NULL); settimeofday(&now, NULL);
} }
} }
#endif // BOARD320_240_CPP

View File

@@ -1,5 +1,4 @@
#ifndef BOARD320_240_H #pragma once
#define BOARD320_240_H
// TFT COMMON // TFT COMMON
#define LOAD_GLCD // Font 1. Original Adafruit 8 pixel font needs ~1820 bytes in FLASH #define LOAD_GLCD // Font 1. Original Adafruit 8 pixel font needs ~1820 bytes in FLASH
@@ -77,5 +76,3 @@ class Board320_240 : public BoardInterface {
void loadTestData(); void loadTestData();
// //
}; };
#endif // BOARD320_240_H

View File

@@ -1,5 +1,4 @@
#ifndef BOARDINTERFACE_CPP #pragma once
#define BOARDINTERFACE_CPP
#define ARDUINOJSON_USE_LONG_LONG 1 #define ARDUINOJSON_USE_LONG_LONG 1
@@ -329,5 +328,3 @@ bool BoardInterface::serializeParamsToJson(File file, bool inclApiKey) {
serializeJson(jsonData, Serial); serializeJson(jsonData, Serial);
serializeJson(jsonData, file); serializeJson(jsonData, file);
} }
#endif // BOARDINTERFACE_CPP

View File

@@ -1,5 +1,4 @@
#ifndef BOARDINTERFACE_H #pragma once
#define BOARDINTERFACE_H
#include <FS.h> #include <FS.h>
#include "LiveData.h" #include "LiveData.h"
@@ -50,5 +49,3 @@ class BoardInterface {
virtual void sdcardToggleRecording()=0; virtual void sdcardToggleRecording()=0;
bool serializeParamsToJson(File file, bool inclApiKey = false); bool serializeParamsToJson(File file, bool inclApiKey = false);
}; };
#endif // BOARDINTERFACE_H

View File

@@ -1,5 +1,4 @@
#ifndef BOARDM5STACKCORE_CPP #pragma once
#define BOARDM5STACKCORE_CPP
#include "BoardInterface.h" #include "BoardInterface.h"
#include "Board320_240.h" #include "Board320_240.h"
@@ -34,5 +33,3 @@ void BoardM5stackCore::mainLoop() {
Board320_240::mainLoop(); Board320_240::mainLoop();
} }
#endif // BOARDM5STACKCORE_CPP

View File

@@ -1,5 +1,4 @@
#ifndef BOARDM5STACKCORE_H #pragma once
#define BOARDM5STACKCORE_H
// Setup for m5stack core // Setup for m5stack core
#define USER_SETUP_LOADED 1 #define USER_SETUP_LOADED 1
@@ -42,5 +41,3 @@ class BoardM5stackCore : public Board320_240 {
void initBoard() override; void initBoard() override;
void mainLoop() override; void mainLoop() override;
}; };
#endif // BOARDM5STACKCORE_H

View File

@@ -1,5 +1,4 @@
#ifndef BOARDTTGOT4V13_CPP #pragma once
#define BOARDTTGOT4V13_CPP
#include "BoardInterface.h" #include "BoardInterface.h"
#include "Board320_240.h" #include "Board320_240.h"
@@ -22,5 +21,3 @@ void BoardTtgoT4v13::initBoard() {
Board320_240::initBoard(); Board320_240::initBoard();
} }
#endif // BOARDTTGOT4V13_CPP

View File

@@ -1,5 +1,4 @@
#ifndef CARHYUNDAIIONIQ_CPP #pragma once
#define CARHYUNDAIIONIQ_CPP
#include "CarHyundaiIoniq.h" #include "CarHyundaiIoniq.h"
@@ -377,5 +376,3 @@ void CarHyundaiIoniq::loadTestData() {
*/ */
} }
#endif //CARHYUNDAIIONIQ_CPP

View File

@@ -1,5 +1,4 @@
#ifndef CARHYUNDAIIONIQ_H #pragma once
#define CARHYUNDAIIONIQ_H
#include "CarInterface.h" #include "CarInterface.h"
@@ -12,5 +11,3 @@ class CarHyundaiIoniq : public CarInterface {
void parseRowMerged() override; void parseRowMerged() override;
void loadTestData() override; void loadTestData() override;
}; };
#endif

View File

@@ -1,5 +1,4 @@
#ifndef CARKIADEBUGOBD2_H #pragma once
#define CARKIADEBUGOBD2_H
#include "CarInterface.h" #include "CarInterface.h"
@@ -12,5 +11,3 @@ class CarKiaDebugObd2 : public CarInterface {
void parseRowMerged() override; void parseRowMerged() override;
void loadTestData() override; void loadTestData() override;
}; };
#endif // CARKIADEBUGOBD2_H

View File

@@ -1,5 +1,4 @@
#ifndef CARKIAENIRO_H #pragma once
#define CARKIAENIRO_H
#include "CarInterface.h" #include "CarInterface.h"
@@ -12,5 +11,3 @@ class CarKiaEniro : public CarInterface {
void parseRowMerged() override; void parseRowMerged() override;
void loadTestData() override; void loadTestData() override;
}; };
#endif // CARKIAENIRO_H

View File

@@ -1,5 +1,4 @@
#ifndef CARKIANIROPHEV_H #pragma once
#define CARKIANIROPHEV_H
#include "CarInterface.h" #include "CarInterface.h"
@@ -12,5 +11,3 @@ class CarKiaNiroPhev: public CarInterface {
void parseRowMerged() override; void parseRowMerged() override;
void loadTestData() override; void loadTestData() override;
}; };
#endif