This commit is contained in:
Lubos Petrovic
2020-12-20 16:07:13 +01:00
parent 33d021dd77
commit d1b0422c5e
21 changed files with 7 additions and 82 deletions

View File

@@ -1,5 +1,3 @@
#pragma once
#include <SD.h>
#include <FS.h>
#include <analogWrite.h>

View File

@@ -1,5 +1,3 @@
#pragma once
#define ARDUINOJSON_USE_LONG_LONG 1
#include <ArduinoJson.h>

View File

@@ -1,5 +1,3 @@
#pragma once
#include "BoardInterface.h"
#include "Board320_240.h"
#include "BoardM5stackCore.h"

View File

@@ -1,5 +1,3 @@
#pragma once
#include "BoardInterface.h"
#include "Board320_240.h"
#include "BoardTtgoT4v13.h"

View File

@@ -1,5 +1,3 @@
#pragma once
#include "CarHyundaiIoniq.h"
#define commandQueueCountHyundaiIoniq 25

View File

@@ -1,6 +1,3 @@
#ifndef CARINTERFACE_CPP
#define CARINTERFACE_CPP
#include "CarInterface.h"
#include "LiveData.h"
@@ -19,5 +16,3 @@ void CarInterface::parseRowMerged() {
void CarInterface::loadTestData() {
}
#endif // CARINTERFACE_CPP

View File

@@ -1,6 +1,3 @@
#ifndef CARKIADEBUGOBD2_CPP
#define CARKIADEBUGOBD2_CPP
#include "CarKiaDebugObd2.h"
#define commandQueueCountDebugObd2Kia 256
@@ -516,5 +513,3 @@ void CarKiaDebugObd2::loadTestData() {
liveData->params.soc10time[0] = liveData->params.soc10time[1] + 900;
}
#endif // CARKIADEBUGOBD2_CPP

View File

@@ -1,6 +1,3 @@
#ifndef CARKIAENIRO_CPP
#define CARKIAENIRO_CPP
/*
* eNiro/Kona chargings limits depending on battery temperature (min.value of 01-04 battery module)
>= 35°C BMS allows max 180A
@@ -455,4 +452,3 @@ void CarKiaEniro::loadTestData() {
}
#endif // CARKIAENIRO_CPP

View File

@@ -1,6 +1,3 @@
#ifndef CARKIANIROPHEV_CPP
#define CARKIANIROPHEV_CPP
#include "CarKiaNiroPhev.h"
#define commandQueueCountKiaNiroPhev 25
@@ -376,5 +373,3 @@ void CarKiaNiroPhev::loadTestData() {
*/
}
#endif //CARKIANIROPHEV_CPP

View File

@@ -1,6 +1,3 @@
#ifndef CARRENAULTZOE_CPP
#define CARRENAULTZOE_CPP
#include <Arduino.h>
#include <stdint.h>
#include <WString.h>
@@ -519,5 +516,3 @@ void CarRenaultZoe::loadTestData() {
liveData->params.soc10time[0] = liveData->params.soc10time[1] + 900;
*/
}
#endif // CARRENAULTZOE_CPP

View File

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

View File

@@ -1,6 +1,3 @@
#ifndef COMMINTERFACE_CPP
#define COMMINTERFACE_CPP
#include "CommInterface.h"
#include "BoardInterface.h"
//#include "CarInterface.h"
@@ -10,5 +7,3 @@ void CommInterface::initComm(LiveData* pLiveData, BoardInterface* pBoard) {
liveData = pLiveData;
board = pBoard;
}
#endif // COMMINTERFACE_CPP

View File

@@ -1,5 +1,4 @@
#ifndef COMMINTERFACE_H
#define COMMINTERFACE_H
#pragma once
#include "LiveData.h"
//#include "BoardInterface.h"
@@ -20,5 +19,3 @@ class CommInterface {
virtual void scanDevices() = 0;
virtual void mainLoop() = 0;
};
#endif // COMMINTERFACE_H

View File

@@ -1,6 +1,3 @@
#ifndef COMMOBD2BLE4_CPP
#define COMMOBD2BLE4_CPP
#include <BLEDevice.h>
#include "CommObd2Ble4.h"
#include "BoardInterface.h"
@@ -428,5 +425,3 @@ bool CommObd2Ble4::parseRowMerged() {
return true;
}
#endif // COMMOBD2BLE4_CPP

View File

@@ -1,5 +1,4 @@
#ifndef COMMOBD2BLE4_H
#define COMMOBD2BLE4_H
#pragma once
#include <BLEDevice.h>
#include "LiveData.h"
@@ -21,5 +20,3 @@ class CommObd2Ble4 : public CommInterface {
bool parseRow();
bool parseRowMerged();
};
#endif // COMMOBD2BLE4_H

View File

@@ -1,6 +1,3 @@
#ifndef COMMINTERFACE_CPP
#define COMMINTERFACE_CPP
#include "CommObd2Can.h"
#include "BoardInterface.h"
#include "LiveData.h"
@@ -37,5 +34,3 @@ void CommObd2Can::scanDevices() {
void CommObd2Can::mainLoop() {
}
#endif // COMMINTERFACE_CPP

View File

@@ -1,5 +1,4 @@
#ifndef COMMOBD2CAN_H
#define COMMOBD2CAN_H
#pragma once
#include "LiveData.h"
#include "CommInterface.h"
@@ -20,4 +19,3 @@ class CommObd2Can : public CommInterface {
bool parseRowMerged(); */
};
#endif // COMMOBD2CAN_H

View File

@@ -1,7 +1,3 @@
#ifndef LIVEDATA_CPP
#define LIVEDATA_CPP
#include "LiveData.h"
#include "menu.h"
@@ -186,8 +182,3 @@ float LiveData::bar2pressure(float inBar) {
return (settings.pressureUnit == 'b') ? inBar : inBar * 14.503773800722;
}
//
#endif // LIVEDATA_CPP

View File

@@ -1,6 +1,4 @@
#ifndef LIVEDATA_H
#define LIVEDATA_H
#pragma once
#include <Arduino.h>
#include <stdint.h>
@@ -242,5 +240,3 @@ class LiveData {
float bar2pressure(float inBar);
};
//
#endif // LIVEDATA_H

View File

@@ -1,5 +1,4 @@
#ifndef CONFIG_H
#define CONFIG_H
#pragma once
#include <BLEDevice.h>
@@ -102,4 +101,3 @@ typedef struct {
#define MENU_SDCARD_REC 3044
//
#endif // CONFIG_H

2
menu.h
View File

@@ -1,4 +1,4 @@
#pragma once
#include "config.h";