From b84971cc6a735cfa6e4f425c4a0eb220290e118a Mon Sep 17 00:00:00 2001 From: rusefi Date: Tue, 18 Feb 2020 08:16:19 -0500 Subject: [PATCH] code style & pleasing LGTM --- firmware/config/engines/daihatsu.h | 2 ++ firmware/hw_layer/AdcConfiguration.h | 5 ++--- firmware/hw_layer/adc_external.h | 4 +--- firmware/hw_layer/adc_inputs.h | 4 +--- firmware/hw_layer/backup_ram.h | 4 +--- firmware/hw_layer/digital_input_exti.h | 2 ++ firmware/hw_layer/flash.h | 5 ++--- firmware/hw_layer/hardware.h | 4 +--- firmware/hw_layer/hip9011.h | 1 - firmware/hw_layer/io_pins.h | 4 +--- firmware/hw_layer/max31855.h | 4 +--- firmware/hw_layer/mc33816.h | 4 +--- firmware/hw_layer/mc33816_data.h | 4 +--- firmware/hw_layer/mcp3208.h | 4 +--- firmware/hw_layer/pwm_generator.h | 4 +--- firmware/hw_layer/rtc_helper.h | 5 +---- firmware/hw_layer/servo.h | 5 ++--- 17 files changed, 21 insertions(+), 44 deletions(-) diff --git a/firmware/config/engines/daihatsu.h b/firmware/config/engines/daihatsu.h index b7726fecab..d1aea0c9d0 100644 --- a/firmware/config/engines/daihatsu.h +++ b/firmware/config/engines/daihatsu.h @@ -5,6 +5,8 @@ * @author Andrey Belomutskiy, (c) 2012-2020 */ +#pragma once + #include "engine_configuration.h" void setDaihatsu(DECLARE_CONFIG_PARAMETER_SIGNATURE); diff --git a/firmware/hw_layer/AdcConfiguration.h b/firmware/hw_layer/AdcConfiguration.h index e63486e19c..a9829c251f 100644 --- a/firmware/hw_layer/AdcConfiguration.h +++ b/firmware/hw_layer/AdcConfiguration.h @@ -4,8 +4,8 @@ * @date May 3, 2014 * @author Andrey Belomutskiy, (c) 2012-2020 */ -#ifndef ADCCONFIGURATION_H_ -#define ADCCONFIGURATION_H_ + +#pragma once #if HAL_USE_ADC @@ -54,4 +54,3 @@ private: #endif /* HAL_USE_ADC */ -#endif /* ADCCONFIGURATION_H_ */ diff --git a/firmware/hw_layer/adc_external.h b/firmware/hw_layer/adc_external.h index 647fdd712e..663d608e1f 100644 --- a/firmware/hw_layer/adc_external.h +++ b/firmware/hw_layer/adc_external.h @@ -7,8 +7,7 @@ * @author Andrey Belomutskiy, (c) 2012-2020 */ -#ifndef ADC_EXTERNAL_H_ -#define ADC_EXTERNAL_H_ +#pragma once #include "mcp3208.h" @@ -16,4 +15,3 @@ #define adcToVoltsDivided(adc) (5.0f / 4095 * adc) #define getVoltageDivided(msg, channel) (channel == EFI_ADC_NONE ? 66.66 : adcToVoltsDivided(getAdcValue(msg, channel))) -#endif /* ADC_EXTERNAL_H_ */ diff --git a/firmware/hw_layer/adc_inputs.h b/firmware/hw_layer/adc_inputs.h index 08c06bbcde..6bf231b9a4 100644 --- a/firmware/hw_layer/adc_inputs.h +++ b/firmware/hw_layer/adc_inputs.h @@ -6,8 +6,7 @@ * @author Andrey Belomutskiy, (c) 2012-2020 */ -#ifndef ADC_INPUTS_H_ -#define ADC_INPUTS_H_ +#pragma once #include "global.h" #include "adc_math.h" @@ -52,4 +51,3 @@ void removeChannel(const char *name, adc_channel_e setting); #define getAdcValue(msg, channel) 0 #endif /* HAL_USE_ADC */ -#endif /* ADC_INPUTS_H_ */ diff --git a/firmware/hw_layer/backup_ram.h b/firmware/hw_layer/backup_ram.h index 7392cc55b4..f9839305bc 100644 --- a/firmware/hw_layer/backup_ram.h +++ b/firmware/hw_layer/backup_ram.h @@ -5,8 +5,7 @@ * @date Dec 19, 2017 */ -#ifndef BACKUP_RAM_H_ -#define BACKUP_RAM_H_ +#pragma once #include "global.h" #include "efi_gpio.h" @@ -43,4 +42,3 @@ uint32_t backupRamLoad(backup_ram_e idx); // use backup-power RTC registers (non-volatile memory) to store the data void backupRamSave(backup_ram_e idx, uint32_t value); -#endif /* BACKUP_RAM_H_ */ diff --git a/firmware/hw_layer/digital_input_exti.h b/firmware/hw_layer/digital_input_exti.h index 643eb4876a..6d4ab49f07 100644 --- a/firmware/hw_layer/digital_input_exti.h +++ b/firmware/hw_layer/digital_input_exti.h @@ -5,6 +5,8 @@ * @author Andrey Belomutskiy, (c) 2012-2020 */ +#pragma once + #include "digital_input.h" #if HAL_USE_PAL diff --git a/firmware/hw_layer/flash.h b/firmware/hw_layer/flash.h index f5a15dd87c..91e3494b7e 100644 --- a/firmware/hw_layer/flash.h +++ b/firmware/hw_layer/flash.h @@ -2,8 +2,8 @@ * @file flash.h * */ -#ifndef FLASH_H -#define FLASH_H + +#pragma once #include "global.h" @@ -165,4 +165,3 @@ int flashWrite(flashaddr_t address, const char* buffer, size_t size); } #endif /* __cplusplus */ -#endif /* FLASH_H */ diff --git a/firmware/hw_layer/hardware.h b/firmware/hw_layer/hardware.h index 6f13ac80dd..a7acd7028f 100644 --- a/firmware/hw_layer/hardware.h +++ b/firmware/hw_layer/hardware.h @@ -5,8 +5,7 @@ * @author Andrey Belomutskiy, (c) 2012-2020 */ -#ifndef HARDWARE_H_ -#define HARDWARE_H_ +#pragma once #include "global.h" @@ -56,4 +55,3 @@ void setBor(int borValue); #endif /* __cplusplus */ -#endif /* HARDWARE_H_ */ diff --git a/firmware/hw_layer/hip9011.h b/firmware/hw_layer/hip9011.h index badd527780..218687d706 100644 --- a/firmware/hw_layer/hip9011.h +++ b/firmware/hw_layer/hip9011.h @@ -8,7 +8,6 @@ #pragma once - // 0b01110001 #define SET_ADVANCED_MODE 0x71 diff --git a/firmware/hw_layer/io_pins.h b/firmware/hw_layer/io_pins.h index 65bb2f9b9b..c991cb6bce 100644 --- a/firmware/hw_layer/io_pins.h +++ b/firmware/hw_layer/io_pins.h @@ -6,8 +6,7 @@ * @author Andrey Belomutskiy, (c) 2012-2020 */ -#ifndef IO_PINS_H_ -#define IO_PINS_H_ +#pragma once #include "global.h" @@ -63,4 +62,3 @@ EXTERNC void efiIcuStart(const char *msg, ICUDriver *icup, const ICUConfig *conf #endif /* HAL_USE_ICU */ #endif /* EFI_GPIO_HARDWARE */ -#endif /* IO_PINS_H_ */ diff --git a/firmware/hw_layer/max31855.h b/firmware/hw_layer/max31855.h index 508515a601..7dcd43ff0d 100644 --- a/firmware/hw_layer/max31855.h +++ b/firmware/hw_layer/max31855.h @@ -5,8 +5,7 @@ * @author Andrey Belomutskiy, (c) 2012-2020 */ -#ifndef MAX31855_H_ -#define MAX31855_H_ +#pragma once #include "global.h" #include "engine_configuration.h" @@ -17,4 +16,3 @@ void initMax31855(Logging *sharedLogger, spi_device_e device, egt_cs_array_t max uint16_t getEgtValue(int egtChannel); -#endif /* MAX31855_H_ */ diff --git a/firmware/hw_layer/mc33816.h b/firmware/hw_layer/mc33816.h index 72a0cdfde2..ee5bfd0f98 100644 --- a/firmware/hw_layer/mc33816.h +++ b/firmware/hw_layer/mc33816.h @@ -5,8 +5,7 @@ * @author Andrey Belomutskiy, (c) 2012-2020 */ -#ifndef HW_LAYER_MC33816_H_ -#define HW_LAYER_MC33816_H_ +#pragma once const int MAX_SPI_MODE_A_TRANSFER_SIZE = 31; //max size for register config transfer @@ -25,4 +24,3 @@ enum { void initMc33816(void); -#endif /* HW_LAYER_MC33816_H_ */ diff --git a/firmware/hw_layer/mc33816_data.h b/firmware/hw_layer/mc33816_data.h index ddbed415d1..7a62faaa32 100644 --- a/firmware/hw_layer/mc33816_data.h +++ b/firmware/hw_layer/mc33816_data.h @@ -5,8 +5,7 @@ * @author Andrey Belomutskiy, (c) 2012-2020 */ -#ifndef HW_LAYER_MC33816_DATA_H_ -#define HW_LAYER_MC33816_DATA_H_ +#pragma once extern const unsigned short MC33816_code_RAM1[62]; // CODE RAM CH 1 extern const unsigned short MC33816_code_RAM2[43]; // CODE RAM CH 2 @@ -17,4 +16,3 @@ extern const unsigned short MC33816_ch2_config[19]; // CH 2 configurations extern const unsigned short MC33816_io_config[44]; // IO configurations extern const unsigned short MC33816_diag_config[44]; // diag configurations -#endif /* HW_LAYER_MC33816_DATA_H_ */ diff --git a/firmware/hw_layer/mcp3208.h b/firmware/hw_layer/mcp3208.h index addd62b123..1ae5d93923 100644 --- a/firmware/hw_layer/mcp3208.h +++ b/firmware/hw_layer/mcp3208.h @@ -13,8 +13,7 @@ * */ -#ifndef MCP3208_H_ -#define MCP3208_H_ +#pragma once #include "global.h" @@ -43,4 +42,3 @@ int getMcp3208adc(int channel); #endif /* EFI_MCP_3208 */ -#endif /* MCP3208_H_ */ diff --git a/firmware/hw_layer/pwm_generator.h b/firmware/hw_layer/pwm_generator.h index ef290ace31..47c07129a0 100644 --- a/firmware/hw_layer/pwm_generator.h +++ b/firmware/hw_layer/pwm_generator.h @@ -5,8 +5,7 @@ * @author Andrey Belomutskiy, (c) 2012-2020 */ -#ifndef PWM_GENERATOR_H_ -#define PWM_GENERATOR_H_ +#pragma once #include "global.h" #include "pwm_generator_logic.h" @@ -23,4 +22,3 @@ void initPwmGenerator(void); */ void applyPinState(int stateIndex, PwmConfig* state) /* pwm_gen_callback */; -#endif /* PWM_GENERATOR_H_ */ diff --git a/firmware/hw_layer/rtc_helper.h b/firmware/hw_layer/rtc_helper.h index 27667161da..2902cf5838 100644 --- a/firmware/hw_layer/rtc_helper.h +++ b/firmware/hw_layer/rtc_helper.h @@ -6,8 +6,7 @@ * @author Andrey Belomutskiy, (c) 2012-2020 */ -#ifndef RTC_HELPER_H_ -#define RTC_HELPER_H_ +#pragma once void printDateTime(void); void setDateTime(const char *strDate); @@ -16,5 +15,3 @@ void date_set_tm(struct tm *); void date_get_tm(struct tm *); void dateToString(char *buffer); bool dateToStringShort(char *lcd_str); - -#endif /* RTC_HELPER_H_ */ diff --git a/firmware/hw_layer/servo.h b/firmware/hw_layer/servo.h index 161598f6c7..e1da3e235b 100644 --- a/firmware/hw_layer/servo.h +++ b/firmware/hw_layer/servo.h @@ -4,11 +4,10 @@ * @date Jan 3, 2015 * @author Andrey Belomutskiy, (c) 2012-2020 */ -#ifndef HW_LAYER_SERVO_H_ -#define HW_LAYER_SERVO_H_ + +#pragma once #include "global.h" void initServo(void); -#endif /* HW_LAYER_SERVO_H_ */