From 6e128a341bb9d0764305ed9afd63c10ad3ab4492 Mon Sep 17 00:00:00 2001 From: rusefi Date: Sun, 26 Jan 2020 13:58:47 -0500 Subject: [PATCH] code style --- firmware/controllers/obd2.h | 4 +--- firmware/controllers/settings.h | 4 +--- firmware/global.h | 5 +---- firmware/hw_layer/hip9011.h | 5 ++--- firmware/hw_layer/hip9011_logic.h | 4 +--- firmware/rusefi.h | 4 +--- 6 files changed, 7 insertions(+), 19 deletions(-) diff --git a/firmware/controllers/obd2.h b/firmware/controllers/obd2.h index 65179f711b..0117488ba9 100644 --- a/firmware/controllers/obd2.h +++ b/firmware/controllers/obd2.h @@ -5,8 +5,7 @@ * @author Andrey Belomutskiy, (c) 2012-2020 */ -#ifndef CONTROLLERS_OBD2_H_ -#define CONTROLLERS_OBD2_H_ +#pragma once #include "global.h" @@ -41,4 +40,3 @@ void obdOnCanPacketRx(CANRxFrame *rx); #endif /* HAL_USE_CAN */ -#endif /* CONTROLLERS_OBD2_H_ */ diff --git a/firmware/controllers/settings.h b/firmware/controllers/settings.h index aa6f9e4fd9..7bc736427c 100644 --- a/firmware/controllers/settings.h +++ b/firmware/controllers/settings.h @@ -6,8 +6,7 @@ * @author Andrey Belomutskiy, (c) 2012-2020 */ -#ifndef SETTINGS_H_ -#define SETTINGS_H_ +#pragma once #include "engine.h" @@ -23,4 +22,3 @@ void setEngineType(int value); */ const char* getConfigurationName(engine_type_e engineType); -#endif /* SETTINGS_H_ */ diff --git a/firmware/global.h b/firmware/global.h index c8a4f94f9d..732c9c02ae 100644 --- a/firmware/global.h +++ b/firmware/global.h @@ -12,8 +12,7 @@ * @author Andrey Belomutskiy, (c) 2012-2020 */ -#ifndef GLOBAL_H_ -#define GLOBAL_H_ +#pragma once // todo: remove this from here and rely on os_access.h. unfortunately hal.h includes ch.h :( #include @@ -120,5 +119,3 @@ void unlockAnyContext(void); } #endif -#endif /* GLOBAL_H_ */ - diff --git a/firmware/hw_layer/hip9011.h b/firmware/hw_layer/hip9011.h index e337071b87..badd527780 100644 --- a/firmware/hw_layer/hip9011.h +++ b/firmware/hw_layer/hip9011.h @@ -6,8 +6,7 @@ * @author Andrey Belomutskiy, (c) 2012-2020 */ -#ifndef HIP9011_H_ -#define HIP9011_H_ +#pragma once // 0b01110001 @@ -28,4 +27,4 @@ void setPrescalerAndSDO(int value); void setKnockThresh(float value); void setMaxKnockSubDeg(int value); -#endif /* HIP9011_H_ */ + diff --git a/firmware/hw_layer/hip9011_logic.h b/firmware/hw_layer/hip9011_logic.h index c40bbb85ea..c906a574c1 100644 --- a/firmware/hw_layer/hip9011_logic.h +++ b/firmware/hw_layer/hip9011_logic.h @@ -5,8 +5,7 @@ * @author Andrey Belomutskiy, (c) 2012-2020 */ -#ifndef HW_LAYER_HIP9011_LOGIC_H_ -#define HW_LAYER_HIP9011_LOGIC_H_ +#pragma once #include "efifeatures.h" #include "rusefi_enums.h" @@ -115,4 +114,3 @@ int getHip9011GainIndex(DEFINE_HIP_PARAMS); #define _8MHZ_PRESCALER 6 -#endif /* HW_LAYER_HIP9011_LOGIC_H_ */ diff --git a/firmware/rusefi.h b/firmware/rusefi.h index d730e3e477..1406b29f5a 100644 --- a/firmware/rusefi.h +++ b/firmware/rusefi.h @@ -5,10 +5,8 @@ * @author Andrey Belomutskiy, (c) 2012-2020 */ -#ifndef RUSEFI_H_ -#define RUSEFI_H_ +#pragma once void runRusEfi(void); void rebootNow(void); -#endif /* RUSEFI_H_ */