diff --git a/radio/src/audio_arm.h b/radio/src/audio_arm.h index 16d94d2f8..aac9b4d75 100644 --- a/radio/src/audio_arm.h +++ b/radio/src/audio_arm.h @@ -34,8 +34,8 @@ * */ -#ifndef audio_h -#define audio_h +#ifndef _AUDIO_ARM_H_ +#define _AUDIO_ARM_H_ #include #include "ff.h" @@ -403,4 +403,4 @@ void referenceModelAudioFiles(); bool isAudioFileReferenced(uint32_t i, char * filename/*at least AUDIO_FILENAME_MAXLEN+1 long*/); -#endif +#endif // _AUDIO_ARM_H_ diff --git a/radio/src/audio_avr.h b/radio/src/audio_avr.h index 9724e1106..bb31d1cf6 100644 --- a/radio/src/audio_avr.h +++ b/radio/src/audio_avr.h @@ -34,8 +34,8 @@ * */ -#ifndef audio_h -#define audio_h +#ifndef _AUDIO_AVR_H_ +#define _AUDIO_AVR_H_ #if defined(PCBSTD) #define speakerOn() buzzerOn() @@ -165,4 +165,4 @@ void audioDefevent(uint8_t e); #define PLAY_MODEL_NAME() #define START_SILENCE_PERIOD() -#endif +#endif // _AUDIO_AVR_H_ diff --git a/radio/src/bin_allocator.h b/radio/src/bin_allocator.h index bfb1b7a97..7cc684fd2 100644 --- a/radio/src/bin_allocator.h +++ b/radio/src/bin_allocator.h @@ -1,5 +1,5 @@ -#ifndef binallocator_h -#define binallocator_h +#ifndef _BIN_ALLOCATOR_H_ +#define _BIN_ALLOCATOR_H_ #include "debug.h" @@ -75,4 +75,4 @@ extern BinAllocator_slots2 slots2; void *bin_l_alloc (void *ud, void *ptr, size_t osize, size_t nsize); #endif //#if defined(USE_BIN_ALLOCATOR) -#endif //binallocator_h +#endif // _BIN_ALLOCATOR_H_ diff --git a/radio/src/buzzer.h b/radio/src/buzzer.h index 8bb0b8463..a85627ff7 100644 --- a/radio/src/buzzer.h +++ b/radio/src/buzzer.h @@ -34,8 +34,8 @@ * */ -#ifndef BUZZER_H -#define BUZZER_H +#ifndef _BUZZER_H_ +#define _BUZZER_H_ #if defined(BUZZER) extern uint8_t g_beepCnt; @@ -189,4 +189,4 @@ inline void BUZZER_HEARTBEAT() #endif // BUZZER #endif // CPUARM -#endif +#endif // _BUZZER_H_ diff --git a/radio/src/debug.h b/radio/src/debug.h index a0c67e3f4..44d47101c 100644 --- a/radio/src/debug.h +++ b/radio/src/debug.h @@ -34,8 +34,8 @@ * */ -#ifndef debug_h -#define debug_h +#ifndef _DEBUG_H_ +#define _DEBUG_H_ #include #include "rtc.h" @@ -170,5 +170,5 @@ void dumpTraceBuffer(); #endif -#endif // #ifndef debug_h +#endif // _DEBUG_H_ diff --git a/radio/src/fifo.h b/radio/src/fifo.h index 312877bda..859d04798 100644 --- a/radio/src/fifo.h +++ b/radio/src/fifo.h @@ -34,8 +34,8 @@ * */ -#ifndef _FIFO_H_ -#define _FIFO_H_ +#ifndef _FIFO_H_ +#define _FIFO_H_ template class Fifo @@ -90,4 +90,4 @@ class Fifo volatile uint32_t ridx; }; -#endif // _FIFO_H_ +#endif // _FIFO_H_ diff --git a/radio/src/fonts.h b/radio/src/fonts.h index 6bba1021a..b43dedf62 100644 --- a/radio/src/fonts.h +++ b/radio/src/fonts.h @@ -34,8 +34,8 @@ * */ -#ifndef fonts_h -#define fonts_h +#ifndef _FONTS_H_ +#define _FONTS_H_ #if defined(COLORLCD) @@ -64,4 +64,4 @@ extern const pm_uchar font_4x6_extra[]; #endif -#endif +#endif // _FONTS_H_ diff --git a/radio/src/gui/9x/lcd.h b/radio/src/gui/9x/lcd.h index 473c679f8..3fd44406d 100644 --- a/radio/src/gui/9x/lcd.h +++ b/radio/src/gui/9x/lcd.h @@ -34,8 +34,8 @@ * */ -#ifndef _LCD_H -#define _LCD_H +#ifndef _LCD_H_ +#define _LCD_H_ #define LCD_W 128 #define LCD_H 64 @@ -273,4 +273,4 @@ uint8_t lcdRefresh_ST7920(uint8_t full); #define BLINK_ON_PHASE (g_blinkTmr10ms & (1<<6)) #endif -#endif +#endif // _LCD_H_ diff --git a/radio/src/gui/9x/view_mavlink.h b/radio/src/gui/9x/view_mavlink.h index e73706252..b67d2d1ed 100644 --- a/radio/src/gui/9x/view_mavlink.h +++ b/radio/src/gui/9x/view_mavlink.h @@ -96,4 +96,4 @@ enum menuMavlinkSetupItems { //! \brief Menu index varible, initialized on info menu. uint8_t MAVLINK_menu = MENU_INFO; -#endif +#endif // _VIEW_MAVLINK_H_ diff --git a/radio/src/haptic.h b/radio/src/haptic.h index ac7783540..f20e88dbd 100644 --- a/radio/src/haptic.h +++ b/radio/src/haptic.h @@ -34,8 +34,8 @@ * */ -#ifndef haptic_h -#define haptic_h +#ifndef _HAPTIC_H_ +#define _HAPTIC_H_ #define HAPTIC_QUEUE_LENGTH 4 @@ -90,4 +90,4 @@ extern hapticQueue haptic; #define HAPTIC_HEARTBEAT() haptic.heartbeat() -#endif // haptic_h +#endif // _HAPTIC_H_ diff --git a/radio/src/keys.h b/radio/src/keys.h index d3322fa39..70b8d3094 100644 --- a/radio/src/keys.h +++ b/radio/src/keys.h @@ -34,8 +34,8 @@ * */ -#ifndef _KEYS_H_ -#define _KEYS_H_ +#ifndef _KEYS_H_ +#define _KEYS_H_ enum EnumKeys { #if defined(PCBHORUS) @@ -289,4 +289,4 @@ void killEvents(uint8_t enuk); uint8_t keyDown(); -#endif // _KEYS_H_ +#endif // _KEYS_H_ diff --git a/radio/src/myeeprom.h b/radio/src/myeeprom.h index 1302a4ea8..11b6d8468 100644 --- a/radio/src/myeeprom.h +++ b/radio/src/myeeprom.h @@ -34,8 +34,8 @@ * */ -#ifndef myeeprom_h -#define myeeprom_h +#ifndef _MYEEPROM_H_ +#define _MYEEPROM_H_ #include @@ -2358,4 +2358,4 @@ extern ModelData g_model; #define TOTAL_EEPROM_USAGE (sizeof(ModelData)*MAX_MODELS + sizeof(EEGeneral)) -#endif +#endif // _MYEEPROM_H_ diff --git a/radio/src/opentx.h b/radio/src/opentx.h index 795c83400..d554d36d5 100644 --- a/radio/src/opentx.h +++ b/radio/src/opentx.h @@ -34,8 +34,8 @@ * */ -#ifndef opentx_h -#define opentx_h +#ifndef _OPENTX_H_ +#define _OPENTX_H_ #include #include @@ -1738,4 +1738,4 @@ extern Clipboard clipboard; extern uint16_t s_anaFilt[NUMBER_ANALOG]; #endif -#endif +#endif // _OPENTX_H_ diff --git a/radio/src/pgmtypes.h b/radio/src/pgmtypes.h index b2dca0e03..af1ae8eb0 100644 --- a/radio/src/pgmtypes.h +++ b/radio/src/pgmtypes.h @@ -34,8 +34,8 @@ * */ -#ifndef __PGMTYPES__ -#define __PGMTYPES__ +#ifndef _PGMTYPES_H_ +#define _PGMTYPES_H_ /* this is workaround for g++ bug: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=34734 */ #if (((__GNUC__ * 1000) + __GNUC_MINOR__) * 1000 + __GNUC_PATCHLEVEL__) < 4006002 @@ -73,5 +73,5 @@ typedef uint16_t pm_uint16_t; typedef int32_t pm_int32_t; typedef uint32_t pm_uint32_t; -#endif /* __PGMTYPES__ */ +#endif // _PGMTYPES_H_ diff --git a/radio/src/pulses/pulses.h b/radio/src/pulses/pulses.h index 9c7ef11f2..5bf240d46 100644 --- a/radio/src/pulses/pulses.h +++ b/radio/src/pulses/pulses.h @@ -34,8 +34,8 @@ * */ -#ifndef PULSES_COMMON_H -#define PULSES_COMMON_H +#ifndef _PULSES_H_ +#define _PULSES_H_ enum ModuleFlag { @@ -90,4 +90,4 @@ enum ModuleFlag #include "pulses_avr.h" #endif -#endif +#endif // _PULSES_H_ diff --git a/radio/src/pulses/pulses_arm.h b/radio/src/pulses/pulses_arm.h index 821f61f87..0187c2959 100644 --- a/radio/src/pulses/pulses_arm.h +++ b/radio/src/pulses/pulses_arm.h @@ -34,8 +34,8 @@ * */ -#ifndef pulses_arm_h -#define pulses_arm_h +#ifndef _PULSES_ARM_H_ +#define _PULSES_ARM_H_ #if NUM_MODULES == 2 #define MODULES_INIT(...) __VA_ARGS__, __VA_ARGS__ @@ -144,4 +144,4 @@ inline void SEND_FAILSAFE_1S() failsafeCounter[i] = 100; } -#endif +#endif // _PULSES_ARM_H_ diff --git a/radio/src/pulses/pulses_avr.h b/radio/src/pulses/pulses_avr.h index 18fcd25ec..682894752 100644 --- a/radio/src/pulses/pulses_avr.h +++ b/radio/src/pulses/pulses_avr.h @@ -34,8 +34,8 @@ * */ -#ifndef pulses_avr_h -#define pulses_avr_h +#ifndef _PULSES_AVR_H_ +#define _PULSES_AVR_H_ extern uint8_t s_current_protocol[1]; extern uint8_t s_pulses_paused; @@ -60,5 +60,5 @@ void DSM2_Done(); #define SEND_FAILSAFE_NOW() #define SEND_FAILSAFE_1S() -#endif +#endif // _PULSES_AVR_H_ /*eof*/ diff --git a/radio/src/pwr.h b/radio/src/pwr.h index a8ed7a0c8..e511ce459 100644 --- a/radio/src/pwr.h +++ b/radio/src/pwr.h @@ -34,8 +34,8 @@ * */ -#ifndef pwr_h -#define pwr_h +#ifndef _PWR_H_ +#define _PWR_H_ enum PowerState { e_power_on, @@ -45,4 +45,4 @@ enum PowerState { e_power_press, }; -#endif +#endif // _PWR_H_ diff --git a/radio/src/rtc.h b/radio/src/rtc.h index 9f549e082..2a77f4762 100644 --- a/radio/src/rtc.h +++ b/radio/src/rtc.h @@ -34,8 +34,8 @@ * */ -#ifndef RTC_H -#define RTC_H +#ifndef _RTC_H_ +#define _RTC_H_ #include @@ -71,4 +71,4 @@ gtime_t gmktime (struct gtm *tm); } #endif -#endif +#endif // _RTC_H_ diff --git a/radio/src/sdcard.h b/radio/src/sdcard.h index 003b81b94..62a8ccbfb 100644 --- a/radio/src/sdcard.h +++ b/radio/src/sdcard.h @@ -112,5 +112,5 @@ const char * sdCopyFile(const char * srcFilename, const char * srcDir, const cha #define LIST_NONE_SD_FILE 1 bool sdListFiles(const char * path, const char * extension, const uint8_t maxlen, const char * selection, uint8_t flags=0); -#endif +#endif // _SDCARD_H_ diff --git a/radio/src/serial.h b/radio/src/serial.h index 9d887512b..f5d753274 100644 --- a/radio/src/serial.h +++ b/radio/src/serial.h @@ -34,8 +34,8 @@ * */ -#ifndef _SERIAL_H_ -#define _SERIAL_H_ +#ifndef _SERIAL_H_ +#define _SERIAL_H_ #ifdef __cplusplus extern "C" { @@ -51,5 +51,5 @@ void serialCrlf(); #define serialPrint(...) do { serialPrintf(__VA_ARGS__); serialCrlf(); } while(0) -#endif // _SERIAL_H_ +#endif // _SERIAL_H_ diff --git a/radio/src/storage/eeprom_raw.h b/radio/src/storage/eeprom_raw.h index 83baf38e5..24795e3ad 100644 --- a/radio/src/storage/eeprom_raw.h +++ b/radio/src/storage/eeprom_raw.h @@ -34,8 +34,8 @@ * */ -#ifndef eeprom_arm_h -#define eeprom_arm_h +#ifndef _EEPROM_RAW_H_ +#define _EEPROM_RAW_H_ #include #include @@ -81,4 +81,4 @@ void eepromWriteProcess(); void eepromWriteWait(EepromWriteState state = EEPROM_IDLE); bool eepromOpen(); -#endif +#endif // _EEPROM_RAW_H_ diff --git a/radio/src/storage/eeprom_rlc.h b/radio/src/storage/eeprom_rlc.h index 9c28e50fd..252f2b5ce 100644 --- a/radio/src/storage/eeprom_rlc.h +++ b/radio/src/storage/eeprom_rlc.h @@ -284,4 +284,4 @@ inline bool isEepromStart(const void * buffer) } #endif -#endif +#endif // _EEPROM_RLC_H_ diff --git a/radio/src/storage/sdcard_raw.h b/radio/src/storage/sdcard_raw.h index 647653744..bd9c6aeca 100644 --- a/radio/src/storage/sdcard_raw.h +++ b/radio/src/storage/sdcard_raw.h @@ -63,6 +63,6 @@ const char * storageRemoveCategory(int category); bool storageReadNextCategory(StorageModelsList * storage, char * line, int maxlen); bool storageSeekCategory(StorageModelsList * storage, int category); -#endif +#endif // _SDCARD_RAW_H_ diff --git a/radio/src/storage/storage.h b/radio/src/storage/storage.h index 71af54093..fa844af26 100644 --- a/radio/src/storage/storage.h +++ b/radio/src/storage/storage.h @@ -73,4 +73,4 @@ void postModelLoad(bool newModel); #include "sdcard_raw.h" #endif -#endif +#endif // _STORAGE_H_ diff --git a/radio/src/targets/9x/board_stock.h b/radio/src/targets/9x/board_stock.h index abc50468e..9da873777 100644 --- a/radio/src/targets/9x/board_stock.h +++ b/radio/src/targets/9x/board_stock.h @@ -34,8 +34,8 @@ * */ -#ifndef board_stock_h -#define board_stock_h +#ifndef _BOARD_STOCK_H_ +#define _BOARD_STOCK_H_ #include "../common_avr/board_avr.h" @@ -250,4 +250,4 @@ void rotencPoll(); #define eepromReadBlock(a, b, c) eeprom_read_block(a, (const void *)b, c) #endif -#endif +#endif // _BOARD_STOCK_H_ diff --git a/radio/src/targets/common_avr/serial_driver.h b/radio/src/targets/common_avr/serial_driver.h index a3089d691..48bd4fb8f 100644 --- a/radio/src/targets/common_avr/serial_driver.h +++ b/radio/src/targets/common_avr/serial_driver.h @@ -14,8 +14,8 @@ * */ -#ifndef _SERIAL_H_ -#define _SERIAL_H_ +#ifndef _SERIAL_DRIVER_H_ +#define _SERIAL_DRIVER_H_ typedef enum serial_tx_state_ { TX_STATE_EMPTY = 0, // @@ -56,4 +56,4 @@ extern void SERIAL_send_uart_bytes(uint8_t * buf, uint16_t len); void SERIAL_startTX(void); #define IS_TX_BUSY (serialTxState!=TX_STATE_EMPTY) -#endif +#endif // _SERIAL_DRIVER_H_ diff --git a/radio/src/targets/gruvin9x/board_gruvin9x.h b/radio/src/targets/gruvin9x/board_gruvin9x.h index b7b93cd5b..4f9e5bbd5 100644 --- a/radio/src/targets/gruvin9x/board_gruvin9x.h +++ b/radio/src/targets/gruvin9x/board_gruvin9x.h @@ -34,8 +34,8 @@ * */ -#ifndef board_gruvin9x_h -#define board_gruvin9x_h +#ifndef _BOARD_GRUVIN9X_H_ +#define _BOARD_GRUVIN9X_H_ #include "../common_avr/board_avr.h" @@ -182,4 +182,4 @@ void pwrOff(); #define eepromReadBlock(a, b, c) eeprom_read_block(a, (const void *)b, c) #endif -#endif +#endif // _BOARD_GRUVIN9X_H_ diff --git a/radio/src/targets/horus/board_horus.h b/radio/src/targets/horus/board_horus.h index 5dee90b35..ee053b6d6 100644 --- a/radio/src/targets/horus/board_horus.h +++ b/radio/src/targets/horus/board_horus.h @@ -34,8 +34,8 @@ * */ -#ifndef _BOARD_FLAMENCO_H_ -#define _BOARD_FLAMENCO_H_ +#ifndef _BOARD_HORUS_H_ +#define _BOARD_HORUS_H_ #include "stddef.h" @@ -330,4 +330,4 @@ void usbJoystickUpdate(void); void checkTrainerSettings(void); -#endif +#endif // _BOARD_HORUS_H_ diff --git a/radio/src/targets/horus/hal.h b/radio/src/targets/horus/hal.h index aff6f574e..f84429d57 100644 --- a/radio/src/targets/horus/hal.h +++ b/radio/src/targets/horus/hal.h @@ -1,5 +1,5 @@ -#ifndef _HAL_ -#define _HAL_ +#ifndef _HAL_H_ +#define _HAL_H_ // Keys #define KEYS_RCC_AHB1Periph_GPIO (RCC_AHB1Periph_GPIOB | RCC_AHB1Periph_GPIOC | RCC_AHB1Periph_GPIOD | RCC_AHB1Periph_GPIOE | RCC_AHB1Periph_GPIOG | RCC_AHB1Periph_GPIOH | RCC_AHB1Periph_GPIOI | RCC_AHB1Periph_GPIOJ) @@ -249,4 +249,4 @@ #define TIMER_2MHz_APB1Periph RCC_APB1Periph_TIM7 #define TIMER_2MHz_TIMER TIM7 -#endif +#endif // _HAL_H_ diff --git a/radio/src/targets/horus/sdio_sd.h b/radio/src/targets/horus/sdio_sd.h index e4c188aa2..9c69ff2a3 100644 --- a/radio/src/targets/horus/sdio_sd.h +++ b/radio/src/targets/horus/sdio_sd.h @@ -27,8 +27,8 @@ */ /* Define to prevent recursive inclusion -------------------------------------*/ -#ifndef __SDIO_SD_H -#define __SDIO_SD_H +#ifndef _SDIO_SD_H_ +#define _SDIO_SD_H_ #include "../horus/board_horus.h" @@ -388,7 +388,7 @@ SD_Error SD_WaitWriteOperation(void); extern SD_CardInfo SDCardInfo; -#endif /* __STM32F4_DISCOVERY_SDIO_SD_H */ +#endif // _SDIO_SD_H_ /** * @} */ diff --git a/radio/src/targets/horus/usb_conf.h b/radio/src/targets/horus/usb_conf.h index 7e02211c4..9a2082a4a 100644 --- a/radio/src/targets/horus/usb_conf.h +++ b/radio/src/targets/horus/usb_conf.h @@ -26,8 +26,8 @@ */ /* Define to prevent recursive inclusion -------------------------------------*/ -#ifndef __USB_CONF__H__ -#define __USB_CONF__H__ +#ifndef _USB_CONF_H_ +#define _USB_CONF_H_ #include "STM32F4xx_DSP_StdPeriph_Lib_V1.4.0/Libraries/CMSIS/Device/ST/STM32F4xx/Include/stm32f4xx.h" @@ -165,7 +165,7 @@ #endif /* __CC_ARM */ #endif -#endif //__USB_CONF__H__ +#endif // _USB_CONF_H_ /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/radio/src/targets/horus/usbd_conf.h b/radio/src/targets/horus/usbd_conf.h index 909919e41..720f82738 100644 --- a/radio/src/targets/horus/usbd_conf.h +++ b/radio/src/targets/horus/usbd_conf.h @@ -26,8 +26,8 @@ */ /* Define to prevent recursive inclusion -------------------------------------*/ -#ifndef __USBD_CONF__H__ -#define __USBD_CONF__H__ +#ifndef _USBD_CONF_H_ +#define _USBD_CONF_H_ /* Includes ------------------------------------------------------------------*/ #include "../horus/usb_conf.h" @@ -64,7 +64,7 @@ #define APP_RX_DATA_SIZE 512 // USB serial port output buffer. TODO: tune this buffer size /* Total size of IN buffer: APP_RX_DATA_SIZE*8/MAX_BAUDARATE*1000 should be > CDC_IN_FRAME_INTERVAL */ #define APP_FOPS VCP_fops -#endif //__USBD_CONF__H__ +#endif // _USBD_CONF_H_ /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/radio/src/targets/horus/usbd_desc.h b/radio/src/targets/horus/usbd_desc.h index 537f69b14..50d286d53 100644 --- a/radio/src/targets/horus/usbd_desc.h +++ b/radio/src/targets/horus/usbd_desc.h @@ -27,8 +27,8 @@ /* Define to prevent recursive inclusion -------------------------------------*/ -#ifndef __USB_DESC_H -#define __USB_DESC_H +#ifndef _USBD_DESC_H_ +#define _USBD_DESC_H_ /* Includes ------------------------------------------------------------------*/ #include "usb_core.h" @@ -109,7 +109,7 @@ uint8_t * USBD_USR_USRStringDesc (uint8_t speed, uint8_t idx , uint16_t *len * @} */ -#endif /* __USBD_DESC_H */ +#endif // _USBD_DESC_H_ /** * @} diff --git a/radio/src/targets/mega2560/board_mega2560.h b/radio/src/targets/mega2560/board_mega2560.h index 4b8cad5f7..34e20efe7 100644 --- a/radio/src/targets/mega2560/board_mega2560.h +++ b/radio/src/targets/mega2560/board_mega2560.h @@ -35,8 +35,8 @@ * */ -#ifndef board_mega2560_h -#define board_mega2560_h +#ifndef _BOARD_MEGA2560_H_ +#define _BOARD_MEGA2560_H_ #include "../common_avr/board_avr.h" @@ -178,4 +178,4 @@ void pwrOff(); #define eepromReadBlock(a, b, c) eeprom_read_block(a, (const void *)b, c) #endif -#endif +#endif // _BOARD_MEGA2560_H_ diff --git a/radio/src/targets/simu/simpgmspace.h b/radio/src/targets/simu/simpgmspace.h index 936ff29cd..01d578dd3 100644 --- a/radio/src/targets/simu/simpgmspace.h +++ b/radio/src/targets/simu/simpgmspace.h @@ -34,8 +34,8 @@ * */ -#ifndef simpgmspace_h -#define simpgmspace_h +#ifndef _SIMPGMSPACE_H_ +#define _SIMPGMSPACE_H_ extern int g_snapshot_idx; @@ -453,4 +453,4 @@ extern char simuSdDirectory[1024]; #define sd_card_ready() (true) #define sdMounted() (true) -#endif +#endif // _SIMPGMSPACE_H_ diff --git a/radio/src/targets/sky9x/AT91SAM3S2.h b/radio/src/targets/sky9x/AT91SAM3S2.h index 2cbe67d42..bebbe5a5c 100644 --- a/radio/src/targets/sky9x/AT91SAM3S2.h +++ b/radio/src/targets/sky9x/AT91SAM3S2.h @@ -31,8 +31,8 @@ /* Generated by : AT91 SW Application Group */ /* Generated on : 2009-10-26 */ -#ifndef AT91SAM3S_H -#define AT91SAM3S_H +#ifndef _AT91SAM3S2_H_ +#define _AT91SAM3S2_H_ /** \addtogroup AT91SAM3S_definitions AT91SAM3S definitions This file defines all structures and symbols for AT91SAM3S: @@ -7013,4 +7013,4 @@ typedef struct { /*@}*/ -#endif /* AT91SAM3S_H */ +#endif // _AT91SAM3S2_H_ diff --git a/radio/src/targets/sky9x/AT91SAM3S4.h b/radio/src/targets/sky9x/AT91SAM3S4.h index 63fc2918a..2d91af934 100644 --- a/radio/src/targets/sky9x/AT91SAM3S4.h +++ b/radio/src/targets/sky9x/AT91SAM3S4.h @@ -31,8 +31,8 @@ /* Generated by : AT91 SW Application Group */ /* Generated on : 2009-10-26 */ -#ifndef AT91SAM3S_H -#define AT91SAM3S_H +#ifndef _AT91SAM3S4_H_ +#define _AT91SAM3S4_H_ /** \addtogroup AT91SAM3S_definitions AT91SAM3S definitions This file defines all structures and symbols for AT91SAM3S: @@ -7116,4 +7116,4 @@ typedef struct { /*@}*/ -#endif /* AT91SAM3S_H */ +#endif // _AT91SAM3S4_H_ diff --git a/radio/src/targets/sky9x/Media.h b/radio/src/targets/sky9x/Media.h index 866bd3cfd..1667a1c92 100644 --- a/radio/src/targets/sky9x/Media.h +++ b/radio/src/targets/sky9x/Media.h @@ -45,8 +45,8 @@ /// //------------------------------------------------------------------------------ -#ifndef MEDIA_H -#define MEDIA_H +#ifndef _MEDIA_H_ +#define _MEDIA_H_ //------------------------------------------------------------------------------ // Definitions @@ -284,5 +284,5 @@ static inline void MED_Handler(Media *media) extern void MED_HandleAll(Media *medias, unsigned char numMedias); -#endif // _MEDIA_H +#endif // _MEDIA_H_ diff --git a/radio/src/targets/sky9x/audio_driver.h b/radio/src/targets/sky9x/audio_driver.h index 18b50a883..e55cd156e 100644 --- a/radio/src/targets/sky9x/audio_driver.h +++ b/radio/src/targets/sky9x/audio_driver.h @@ -34,8 +34,8 @@ * */ -#ifndef _AUDIO_DRIVER_H_ -#define _AUDIO_DRIVER_H_ +#ifndef _AUDIO_DRIVER_H_ +#define _AUDIO_DRIVER_H_ void audioInit( void ) ; void audioEnd( void ) ; @@ -59,4 +59,4 @@ extern const int8_t volumeScale[]; void setVolume(uint8_t volume); -#endif // _AUDIO_DRIVER_H_ +#endif // _AUDIO_DRIVER_H_ diff --git a/radio/src/targets/sky9x/board.h b/radio/src/targets/sky9x/board.h index a07c40755..1239bc510 100644 --- a/radio/src/targets/sky9x/board.h +++ b/radio/src/targets/sky9x/board.h @@ -36,8 +36,8 @@ // TODO merge this file with board_sky9x.h -#ifndef board_h -#define board_h +#ifndef _BOARD_H_ +#define _BOARD_H_ #include @@ -650,4 +650,4 @@ struct t_serial_tx volatile uint16_t ready ; }; -#endif +#endif // _BOARD_H_ diff --git a/radio/src/targets/sky9x/board_sky9x.h b/radio/src/targets/sky9x/board_sky9x.h index ca630745f..d66c5d2e5 100644 --- a/radio/src/targets/sky9x/board_sky9x.h +++ b/radio/src/targets/sky9x/board_sky9x.h @@ -34,8 +34,8 @@ * */ -#ifndef board_sky9x_h -#define board_sky9x_h +#ifndef _BOARD_SKY9X_H_ +#define _BOARD_SKY9X_H_ #include #include "board.h" @@ -308,4 +308,4 @@ void telemetryTransmitBuffer(uint8_t * buffer, uint32_t size); void serial2TelemetryInit(unsigned int protocol); bool telemetrySecondPortReceive(uint8_t & data); -#endif +#endif // _BOARD_SKY9X_H_ diff --git a/radio/src/targets/sky9x/chip.h b/radio/src/targets/sky9x/chip.h index d216db6d1..1956753ac 100644 --- a/radio/src/targets/sky9x/chip.h +++ b/radio/src/targets/sky9x/chip.h @@ -39,8 +39,8 @@ /// -# For misc, see "AT91SAM3S4 - Misc". //------------------------------------------------------------------------------ -#ifndef CHIP_H -#define CHIP_H +#ifndef _CHIP_H_ +#define _CHIP_H_ //------------------------------------------------------------------------------ // Headers @@ -126,5 +126,5 @@ //Misc -#endif //#ifndef CHIP_H +#endif // _CHIP_H_ diff --git a/radio/src/targets/sky9x/core_cm3.h b/radio/src/targets/sky9x/core_cm3.h index 1c07effab..7c14edfe1 100644 --- a/radio/src/targets/sky9x/core_cm3.h +++ b/radio/src/targets/sky9x/core_cm3.h @@ -21,8 +21,8 @@ * ******************************************************************************/ -#ifndef __CM3_CORE_H__ -#define __CM3_CORE_H__ +#ifndef _CORE_CM3_H_ +#define _CORE_CM3_H_ /** @addtogroup CMSIS_CM3_core_LintCinfiguration CMSIS CM3 Core Lint Configuration * @@ -1813,6 +1813,6 @@ static __INLINE int ITM_CheckChar (void) { /*@}*/ /* end of group CMSIS_CM3_core_definitions */ -#endif /* __CM3_CORE_H__ */ +#endif // _CORE_CM3_H_ /*lint -restore */ diff --git a/radio/src/targets/taranis/aspi.h b/radio/src/targets/taranis/aspi.h index ac96d9f1b..330c3f1c0 100644 --- a/radio/src/targets/taranis/aspi.h +++ b/radio/src/targets/taranis/aspi.h @@ -8,8 +8,8 @@ * * ****************************************************************************** */ -#ifndef _ASPI_H_ -#define _ASPI_H_ +#ifndef _ASPI_H_ +#define _ASPI_H_ #if defined(__cplusplus) && !defined(SIMU) extern "C" { @@ -39,5 +39,5 @@ void AspiData(u8 Para_data); } #endif -#endif +#endif // _ASPI_H_ diff --git a/radio/src/targets/taranis/board_taranis.h b/radio/src/targets/taranis/board_taranis.h index ad6936509..51bd7e539 100644 --- a/radio/src/targets/taranis/board_taranis.h +++ b/radio/src/targets/taranis/board_taranis.h @@ -34,8 +34,8 @@ * */ -#ifndef _BOARD_TARANIS_H_ -#define _BOARD_TARANIS_H_ +#ifndef _BOARD_TARANIS_H_ +#define _BOARD_TARANIS_H_ #include "stddef.h" @@ -400,4 +400,4 @@ void usbJoystickUpdate(void); extern uint8_t currentTrainerMode; void checkTrainerSettings(void); -#endif +#endif // _BOARD_TARANIS_H_ diff --git a/radio/src/targets/taranis/hal.h b/radio/src/targets/taranis/hal.h index 5746e657c..9491399f1 100644 --- a/radio/src/targets/taranis/hal.h +++ b/radio/src/targets/taranis/hal.h @@ -1,5 +1,5 @@ -#ifndef _HAL_ -#define _HAL_ +#ifndef _HAL_H_ +#define _HAL_H_ // Keys #define KEYS_GPIO_REG_MENU GPIOD->IDR @@ -567,4 +567,4 @@ #define TIMER_2MHz_APB1Periph RCC_APB1Periph_TIM7 #define TIMER_2MHz_TIMER TIM7 -#endif +#endif // _HAL_H_ diff --git a/radio/src/targets/taranis/usb_conf.h b/radio/src/targets/taranis/usb_conf.h index a84c15bba..f67672053 100644 --- a/radio/src/targets/taranis/usb_conf.h +++ b/radio/src/targets/taranis/usb_conf.h @@ -26,8 +26,8 @@ */ /* Define to prevent recursive inclusion -------------------------------------*/ -#ifndef __USB_CONF__H__ -#define __USB_CONF__H__ +#ifndef _USB_CONF_H_ +#define _USB_CONF_H_ #if defined(REV9E) #include "STM32F4xx_DSP_StdPeriph_Lib_V1.4.0/Libraries/CMSIS/Device/ST/STM32F4xx/Include/stm32f4xx.h" @@ -169,7 +169,7 @@ #endif /* __CC_ARM */ #endif -#endif //__USB_CONF__H__ +#endif // _USB_CONF_H_ /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/radio/src/targets/taranis/usbd_conf.h b/radio/src/targets/taranis/usbd_conf.h index 557973a26..a7bba78da 100644 --- a/radio/src/targets/taranis/usbd_conf.h +++ b/radio/src/targets/taranis/usbd_conf.h @@ -26,8 +26,8 @@ */ /* Define to prevent recursive inclusion -------------------------------------*/ -#ifndef __USBD_CONF__H__ -#define __USBD_CONF__H__ +#ifndef _USBD_CONF_H_ +#define _USBD_CONF_H_ /* Includes ------------------------------------------------------------------*/ #include "usb_conf.h" @@ -64,7 +64,7 @@ #define APP_RX_DATA_SIZE 512 // USB serial port output buffer. TODO: tune this buffer size /* Total size of IN buffer: APP_RX_DATA_SIZE*8/MAX_BAUDARATE*1000 should be > CDC_IN_FRAME_INTERVAL */ #define APP_FOPS VCP_fops -#endif //__USBD_CONF__H__ +#endif // _USBD_CONF_H_ /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/radio/src/targets/taranis/usbd_desc.h b/radio/src/targets/taranis/usbd_desc.h index 537f69b14..50d286d53 100644 --- a/radio/src/targets/taranis/usbd_desc.h +++ b/radio/src/targets/taranis/usbd_desc.h @@ -27,8 +27,8 @@ /* Define to prevent recursive inclusion -------------------------------------*/ -#ifndef __USB_DESC_H -#define __USB_DESC_H +#ifndef _USBD_DESC_H_ +#define _USBD_DESC_H_ /* Includes ------------------------------------------------------------------*/ #include "usb_core.h" @@ -109,7 +109,7 @@ uint8_t * USBD_USR_USRStringDesc (uint8_t speed, uint8_t idx , uint16_t *len * @} */ -#endif /* __USBD_DESC_H */ +#endif // _USBD_DESC_H_ /** * @} diff --git a/radio/src/tasks_arm.h b/radio/src/tasks_arm.h index 8bd8c0c98..2d8142a82 100644 --- a/radio/src/tasks_arm.h +++ b/radio/src/tasks_arm.h @@ -34,8 +34,8 @@ * */ -#ifndef _TASKS_ARM_H_ -#define _TASKS_ARM_H_ +#ifndef _TASKS_ARM_H_ +#define _TASKS_ARM_H_ #if !defined(SIMU) extern "C" { @@ -89,4 +89,4 @@ extern TaskStack audioStack; void tasksStart(); -#endif // _TASKS_ARM_H_ +#endif // _TASKS_ARM_H_ diff --git a/radio/src/telemetry/ardupilot.h b/radio/src/telemetry/ardupilot.h index 6d2e76d05..375f7383f 100644 --- a/radio/src/telemetry/ardupilot.h +++ b/radio/src/telemetry/ardupilot.h @@ -34,10 +34,10 @@ * */ -#ifndef ardupilot_h -#define ardupilot_h +#ifndef _ARDUPILOT_H_ +#define _ARDUPILOT_H_ void ARDUPILOT_Init(void); void ARDUPILOT_EnableRXD (void); void menuTelemetryArduPilot(uint8_t event); -#endif +#endif // _ARDUPILOT_H_ diff --git a/radio/src/telemetry/frsky.h b/radio/src/telemetry/frsky.h index c44ede300..ca71a465f 100644 --- a/radio/src/telemetry/frsky.h +++ b/radio/src/telemetry/frsky.h @@ -34,8 +34,8 @@ * */ -#ifndef FRSKY_H -#define FRSKY_H +#ifndef _FRSKY_H_ +#define _FRSKY_H_ #include @@ -569,4 +569,4 @@ void processSerialData(uint8_t data); #define MODEL_TELEMETRY_PROTOCOL() g_model.telemetryProtocol #endif -#endif +#endif // _FRSKY_H_ diff --git a/radio/src/telemetry/jeti.h b/radio/src/telemetry/jeti.h index ff2291b05..7085d3ae3 100644 --- a/radio/src/telemetry/jeti.h +++ b/radio/src/telemetry/jeti.h @@ -34,8 +34,8 @@ * */ -#ifndef jeti_h -#define jeti_h +#ifndef _JETI_H_ +#define _JETI_H_ #define JETI_KEY_LEFT 0x70 #define JETI_KEY_RIGHT 0xe0 @@ -52,5 +52,5 @@ void JETI_DisableTXD (void); void telemetryInterrupt10ms(); void menuTelemetryJeti(uint8_t event); -#endif +#endif // _JETI_H_ diff --git a/radio/src/telemetry/mavlink.h b/radio/src/telemetry/mavlink.h index 63ae2f661..a7da8c48f 100644 --- a/radio/src/telemetry/mavlink.h +++ b/radio/src/telemetry/mavlink.h @@ -36,8 +36,8 @@ * Mavlink include file */ -#ifndef _MAVLINK_H_ -#define _MAVLINK_H_ +#ifndef _MAVLINK_H_ +#define _MAVLINK_H_ #define MAVLINK_USE_CONVENIENCE_FUNCTIONS #define MAVLINK_COMM_NUM_BUFFERS 1 @@ -332,5 +332,5 @@ inline uint8_t getPrecisMavlinParamsValue(uint8_t idx) { void lcd_outdezFloat(uint8_t x, uint8_t y, float val, uint8_t precis, uint8_t mode); #endif -#endif +#endif // _MAVLINK_H_ diff --git a/radio/src/telemetry/nmea.h b/radio/src/telemetry/nmea.h index 48559f3ef..78164001d 100644 --- a/radio/src/telemetry/nmea.h +++ b/radio/src/telemetry/nmea.h @@ -34,12 +34,12 @@ * */ -#ifndef nmea_h -#define nmea_h +#ifndef _NMEA_H_ +#define _NMEA_H_ void NMEA_Init(void); void NMEA_EnableRXD (void); void menuTelemetryNMEA(uint8_t event); -#endif +#endif // _NMEA_H_ diff --git a/radio/src/telemetry/telemetry.h b/radio/src/telemetry/telemetry.h index 37b8f559d..0b8fb6ca0 100644 --- a/radio/src/telemetry/telemetry.h +++ b/radio/src/telemetry/telemetry.h @@ -34,8 +34,8 @@ * */ -#ifndef TELEMETRY_H -#define TELEMETRY_H +#ifndef _TELEMETRY_H_ +#define _TELEMETRY_H_ extern Fifo<512> telemetryFifo; @@ -200,4 +200,4 @@ void frskyDSetDefault(int index, uint16_t id); #define IS_DISTANCE_UNIT(unit) ((unit) == UNIT_METERS || (unit) == UNIT_FEET) #define IS_SPEED_UNIT(unit) ((unit) >= UNIT_KTS && (unit) <= UNIT_MPH) -#endif +#endif // _TELEMETRY_H_ diff --git a/radio/src/templates.h b/radio/src/templates.h index 4de55eddf..ff498f6f4 100644 --- a/radio/src/templates.h +++ b/radio/src/templates.h @@ -53,8 +53,8 @@ * */ -#ifndef TEMPLATES_H_ -#define TEMPLATES_H_ +#ifndef _TEMPLATES_H_ +#define _TEMPLATES_H_ #include @@ -92,6 +92,6 @@ void clearMixes(); void clearCurves(); void applyTemplate(uint8_t idx); -#endif //TEMPLATES_H +#endif // _TEMPLATES_H_ diff --git a/radio/src/timers.h b/radio/src/timers.h index 7edd776eb..304d0f0d2 100644 --- a/radio/src/timers.h +++ b/radio/src/timers.h @@ -80,4 +80,4 @@ void timerSet(int idx, int val); void evalTimers(int16_t throttle, uint8_t tick10ms); -#endif +#endif // _TIMERS_H_ diff --git a/radio/src/translations.h b/radio/src/translations.h index ace86963f..563290b0f 100644 --- a/radio/src/translations.h +++ b/radio/src/translations.h @@ -34,8 +34,8 @@ * */ -#ifndef translations_h -#define translations_h +#ifndef _TRANSLATIONS_H_ +#define _TRANSLATIONS_H_ #if defined(TRANSLATIONS_FR) #include "translations/fr.h" @@ -974,4 +974,4 @@ extern const pm_char STR_BLCOLOR[]; #define CHR_HOUR TR_CHR_HOUR #define CHR_INPUT TR_CHR_INPUT -#endif +#endif // _TRANSLATIONS_H_