diff --git a/Board320_240.cpp b/Board320_240.cpp index 2c1270e..9dc9d5b 100644 --- a/Board320_240.cpp +++ b/Board320_240.cpp @@ -1,5 +1,3 @@ -#pragma once - #include #include #include diff --git a/BoardInterface.cpp b/BoardInterface.cpp index 2fc04ce..2c6ae2d 100644 --- a/BoardInterface.cpp +++ b/BoardInterface.cpp @@ -1,5 +1,3 @@ -#pragma once - #define ARDUINOJSON_USE_LONG_LONG 1 #include diff --git a/BoardM5stackCore.cpp b/BoardM5stackCore.cpp index e8bf6f8..e41afd0 100644 --- a/BoardM5stackCore.cpp +++ b/BoardM5stackCore.cpp @@ -1,5 +1,3 @@ -#pragma once - #include "BoardInterface.h" #include "Board320_240.h" #include "BoardM5stackCore.h" diff --git a/BoardTtgoT4v13.cpp b/BoardTtgoT4v13.cpp index 3d90adb..97bf82b 100644 --- a/BoardTtgoT4v13.cpp +++ b/BoardTtgoT4v13.cpp @@ -1,5 +1,3 @@ -#pragma once - #include "BoardInterface.h" #include "Board320_240.h" #include "BoardTtgoT4v13.h" diff --git a/CarHyundaiIoniq.cpp b/CarHyundaiIoniq.cpp index 2b53ecb..89a50a0 100644 --- a/CarHyundaiIoniq.cpp +++ b/CarHyundaiIoniq.cpp @@ -1,5 +1,3 @@ -#pragma once - #include "CarHyundaiIoniq.h" #define commandQueueCountHyundaiIoniq 25 diff --git a/CarInterface.cpp b/CarInterface.cpp index da557df..3787cee 100644 --- a/CarInterface.cpp +++ b/CarInterface.cpp @@ -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 diff --git a/CarKiaDebugObd2.cpp b/CarKiaDebugObd2.cpp index 8b76ae3..091d897 100644 --- a/CarKiaDebugObd2.cpp +++ b/CarKiaDebugObd2.cpp @@ -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 diff --git a/CarKiaEniro.cpp b/CarKiaEniro.cpp index 012622d..9b03389 100644 --- a/CarKiaEniro.cpp +++ b/CarKiaEniro.cpp @@ -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 diff --git a/CarKiaNiroPhev.cpp b/CarKiaNiroPhev.cpp index 414f255..aee5971 100644 --- a/CarKiaNiroPhev.cpp +++ b/CarKiaNiroPhev.cpp @@ -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 diff --git a/CarRenaultZoe.cpp b/CarRenaultZoe.cpp index b6d52e9..e6ad4fe 100644 --- a/CarRenaultZoe.cpp +++ b/CarRenaultZoe.cpp @@ -1,6 +1,3 @@ -#ifndef CARRENAULTZOE_CPP -#define CARRENAULTZOE_CPP - #include #include #include @@ -519,5 +516,3 @@ void CarRenaultZoe::loadTestData() { liveData->params.soc10time[0] = liveData->params.soc10time[1] + 900; */ } - -#endif // CARRENAULTZOE_CPP diff --git a/CarRenaultZoe.h b/CarRenaultZoe.h index 75458c3..dae1cc9 100644 --- a/CarRenaultZoe.h +++ b/CarRenaultZoe.h @@ -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 diff --git a/CommInterface.cpp b/CommInterface.cpp index 1e0c64f..53171f4 100644 --- a/CommInterface.cpp +++ b/CommInterface.cpp @@ -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 diff --git a/CommInterface.h b/CommInterface.h index d3c77ae..bcae2bf 100644 --- a/CommInterface.h +++ b/CommInterface.h @@ -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 diff --git a/CommObd2Ble4.cpp b/CommObd2Ble4.cpp index 87176c7..c084d74 100644 --- a/CommObd2Ble4.cpp +++ b/CommObd2Ble4.cpp @@ -1,6 +1,3 @@ -#ifndef COMMOBD2BLE4_CPP -#define COMMOBD2BLE4_CPP - #include #include "CommObd2Ble4.h" #include "BoardInterface.h" @@ -428,5 +425,3 @@ bool CommObd2Ble4::parseRowMerged() { return true; } - -#endif // COMMOBD2BLE4_CPP diff --git a/CommObd2Ble4.h b/CommObd2Ble4.h index 12e7683..555e068 100644 --- a/CommObd2Ble4.h +++ b/CommObd2Ble4.h @@ -1,5 +1,4 @@ -#ifndef COMMOBD2BLE4_H -#define COMMOBD2BLE4_H +#pragma once #include #include "LiveData.h" @@ -21,5 +20,3 @@ class CommObd2Ble4 : public CommInterface { bool parseRow(); bool parseRowMerged(); }; - -#endif // COMMOBD2BLE4_H diff --git a/CommObd2Can.cpp b/CommObd2Can.cpp index 60a97fb..91c1219 100644 --- a/CommObd2Can.cpp +++ b/CommObd2Can.cpp @@ -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 diff --git a/CommObd2Can.h b/CommObd2Can.h index a908274..231851f 100644 --- a/CommObd2Can.h +++ b/CommObd2Can.h @@ -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 diff --git a/LiveData.cpp b/LiveData.cpp index 0e178cd..51cc5e9 100644 --- a/LiveData.cpp +++ b/LiveData.cpp @@ -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 diff --git a/LiveData.h b/LiveData.h index d7de466..ef377ab 100644 --- a/LiveData.h +++ b/LiveData.h @@ -1,6 +1,4 @@ - -#ifndef LIVEDATA_H -#define LIVEDATA_H +#pragma once #include #include @@ -242,5 +240,3 @@ class LiveData { float bar2pressure(float inBar); }; -// -#endif // LIVEDATA_H diff --git a/config.h b/config.h index e821f1c..76f1dd4 100644 --- a/config.h +++ b/config.h @@ -1,5 +1,4 @@ -#ifndef CONFIG_H -#define CONFIG_H +#pragma once #include @@ -102,4 +101,3 @@ typedef struct { #define MENU_SDCARD_REC 3044 // -#endif // CONFIG_H diff --git a/menu.h b/menu.h index 6b85df4..022eaac 100644 --- a/menu.h +++ b/menu.h @@ -1,4 +1,4 @@ - +#pragma once #include "config.h";