From 48c5cdced47897934d8473a3097181d0e9ca8b4c Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Mon, 2 Aug 2010 08:53:23 +0000 Subject: Hide the PROGMEM attribute from Doxygen, as it appears to confuse the parser in some situations. --- Projects/AVRISP-MKII/Doxygen.conf | 3 ++- Projects/AVRISP-MKII/Lib/ISP/ISPTarget.c | 10 ++++++++-- Projects/Benito/Doxygen.conf | 3 ++- Projects/LEDNotifier/Doxygen.conf | 3 ++- Projects/Magstripe/Doxygen.conf | 3 ++- Projects/MissileLauncher/Doxygen.conf | 3 ++- Projects/RelayBoard/Doxygen.conf | 3 ++- Projects/TempDataLogger/Doxygen.conf | 3 ++- Projects/USBtoSerial/Doxygen.conf | 3 ++- Projects/Webserver/Doxygen.conf | 3 ++- Projects/XPLAINBridge/Doxygen.conf | 3 ++- 11 files changed, 28 insertions(+), 12 deletions(-) (limited to 'Projects') diff --git a/Projects/AVRISP-MKII/Doxygen.conf b/Projects/AVRISP-MKII/Doxygen.conf index 3ebf34f41..f144b070a 100644 --- a/Projects/AVRISP-MKII/Doxygen.conf +++ b/Projects/AVRISP-MKII/Doxygen.conf @@ -1307,7 +1307,8 @@ INCLUDE_FILE_PATTERNS = # undefined via #undef or recursively expanded use the := operator # instead of the = operator. -PREDEFINED = __DOXYGEN__ +PREDEFINED = __DOXYGEN__ \ + PROGMEM # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then # this tag can be used to specify a list of macro names that should be expanded. diff --git a/Projects/AVRISP-MKII/Lib/ISP/ISPTarget.c b/Projects/AVRISP-MKII/Lib/ISP/ISPTarget.c index 47ce43bca..55d65511e 100644 --- a/Projects/AVRISP-MKII/Lib/ISP/ISPTarget.c +++ b/Projects/AVRISP-MKII/Lib/ISP/ISPTarget.c @@ -37,7 +37,10 @@ #if defined(ENABLE_ISP_PROTOCOL) || defined(__DOXYGEN__) -/** List of hardware SPI prescaler masks for possible AVRStudio ISP programming speeds. */ +/** List of hardware SPI prescaler masks for possible AVRStudio ISP programming speeds. + * + * \hideinitializer + */ static uint8_t SPIMaskFromSCKDuration[] PROGMEM = { #if (F_CPU == 8000000) @@ -61,7 +64,10 @@ static uint8_t SPIMaskFromSCKDuration[] PROGMEM = #endif }; -/** Lookup table to convert the slower ISP speeds into a compare value for the software SPI driver. */ +/** Lookup table to convert the slower ISP speeds into a compare value for the software SPI driver. + * + * \hideinitializer + */ static uint16_t TimerCompareFromSCKDuration[] PROGMEM = { TIMER_COMP(96386), TIMER_COMP(89888), TIMER_COMP(84211), TIMER_COMP(79208), TIMER_COMP(74767), diff --git a/Projects/Benito/Doxygen.conf b/Projects/Benito/Doxygen.conf index 91f52863f..f91698b1d 100644 --- a/Projects/Benito/Doxygen.conf +++ b/Projects/Benito/Doxygen.conf @@ -1307,7 +1307,8 @@ INCLUDE_FILE_PATTERNS = # undefined via #undef or recursively expanded use the := operator # instead of the = operator. -PREDEFINED = __DOXYGEN__ +PREDEFINED = __DOXYGEN__ \ + PROGMEM # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then # this tag can be used to specify a list of macro names that should be expanded. diff --git a/Projects/LEDNotifier/Doxygen.conf b/Projects/LEDNotifier/Doxygen.conf index 86a996a23..51612de79 100644 --- a/Projects/LEDNotifier/Doxygen.conf +++ b/Projects/LEDNotifier/Doxygen.conf @@ -1307,7 +1307,8 @@ INCLUDE_FILE_PATTERNS = # undefined via #undef or recursively expanded use the := operator # instead of the = operator. -PREDEFINED = __DOXYGEN__ +PREDEFINED = __DOXYGEN__ \ + PROGMEM # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then # this tag can be used to specify a list of macro names that should be expanded. diff --git a/Projects/Magstripe/Doxygen.conf b/Projects/Magstripe/Doxygen.conf index 5eb68a6e6..690b1605a 100644 --- a/Projects/Magstripe/Doxygen.conf +++ b/Projects/Magstripe/Doxygen.conf @@ -1307,7 +1307,8 @@ INCLUDE_FILE_PATTERNS = # undefined via #undef or recursively expanded use the := operator # instead of the = operator. -PREDEFINED = __DOXYGEN__ +PREDEFINED = __DOXYGEN__ \ + PROGMEM # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then # this tag can be used to specify a list of macro names that should be expanded. diff --git a/Projects/MissileLauncher/Doxygen.conf b/Projects/MissileLauncher/Doxygen.conf index dce478d5e..c935d9538 100644 --- a/Projects/MissileLauncher/Doxygen.conf +++ b/Projects/MissileLauncher/Doxygen.conf @@ -1307,7 +1307,8 @@ INCLUDE_FILE_PATTERNS = # undefined via #undef or recursively expanded use the := operator # instead of the = operator. -PREDEFINED = __DOXYGEN__ +PREDEFINED = __DOXYGEN__ \ + PROGMEM # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then # this tag can be used to specify a list of macro names that should be expanded. diff --git a/Projects/RelayBoard/Doxygen.conf b/Projects/RelayBoard/Doxygen.conf index 4d202c3e9..a3c25e12a 100644 --- a/Projects/RelayBoard/Doxygen.conf +++ b/Projects/RelayBoard/Doxygen.conf @@ -1307,7 +1307,8 @@ INCLUDE_FILE_PATTERNS = # undefined via #undef or recursively expanded use the := operator # instead of the = operator. -PREDEFINED = __DOXYGEN__ +PREDEFINED = __DOXYGEN__ \ + PROGMEM # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then # this tag can be used to specify a list of macro names that should be expanded. diff --git a/Projects/TempDataLogger/Doxygen.conf b/Projects/TempDataLogger/Doxygen.conf index 4fddb9652..5570e1366 100644 --- a/Projects/TempDataLogger/Doxygen.conf +++ b/Projects/TempDataLogger/Doxygen.conf @@ -1307,7 +1307,8 @@ INCLUDE_FILE_PATTERNS = # undefined via #undef or recursively expanded use the := operator # instead of the = operator. -PREDEFINED = __DOXYGEN__ +PREDEFINED = __DOXYGEN__ \ + PROGMEM # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then # this tag can be used to specify a list of macro names that should be expanded. diff --git a/Projects/USBtoSerial/Doxygen.conf b/Projects/USBtoSerial/Doxygen.conf index 2ba2055d3..02ab2f7d4 100644 --- a/Projects/USBtoSerial/Doxygen.conf +++ b/Projects/USBtoSerial/Doxygen.conf @@ -1307,7 +1307,8 @@ INCLUDE_FILE_PATTERNS = # undefined via #undef or recursively expanded use the := operator # instead of the = operator. -PREDEFINED = __DOXYGEN__ +PREDEFINED = __DOXYGEN__ \ + PROGMEM # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then # this tag can be used to specify a list of macro names that should be expanded. diff --git a/Projects/Webserver/Doxygen.conf b/Projects/Webserver/Doxygen.conf index 63607e5b0..d52351870 100644 --- a/Projects/Webserver/Doxygen.conf +++ b/Projects/Webserver/Doxygen.conf @@ -1307,7 +1307,8 @@ INCLUDE_FILE_PATTERNS = # undefined via #undef or recursively expanded use the := operator # instead of the = operator. -PREDEFINED = __DOXYGEN__ +PREDEFINED = __DOXYGEN__ \ + PROGMEM # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then # this tag can be used to specify a list of macro names that should be expanded. diff --git a/Projects/XPLAINBridge/Doxygen.conf b/Projects/XPLAINBridge/Doxygen.conf index 78eb2ff96..376fbe7f1 100644 --- a/Projects/XPLAINBridge/Doxygen.conf +++ b/Projects/XPLAINBridge/Doxygen.conf @@ -1307,7 +1307,8 @@ INCLUDE_FILE_PATTERNS = # undefined via #undef or recursively expanded use the := operator # instead of the = operator. -PREDEFINED = __DOXYGEN__ +PREDEFINED = __DOXYGEN__ \ + PROGMEM # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then # this tag can be used to specify a list of macro names that should be expanded. -- cgit v1.2.3