Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-25 17:25:20 +03:00
Code Issues Wiki Activity

Prevent calls to presistent object functions for unsupported MCU (#8633)

Browse source 
Prevent calls to presistent object functions for unsupported MCU
This commit is contained in:
Michael Keller 2019-08-01 23:24:41 +12:00 • committed by GitHub
commit 3be994a880
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/main/common/time.c
View file

@ -266,6 +266,7 @@ bool rtcSetDateTime(dateTime_t *dt)
return rtcSet(&t); return rtcSet(&t);
} }
#if defined(USE_PERSISTENT_OBJECTS)
void rtcPersistWrite(int16_t offsetMinutes) void rtcPersistWrite(int16_t offsetMinutes)
{ {
rtcTime_t workTime; rtcTime_t workTime;
@ -292,5 +293,5 @@ bool rtcPersistRead(rtcTime_t *t)
return false; return false;
} }
} }
#endif #endif
#endif // USE_RTC_TIME

2
src/main/fc/init.c
View file

@ -443,7 +443,9 @@ void init(void)
if (bothButtonsHeld) { if (bothButtonsHeld) {
if (--secondsRemaining == 0) { if (--secondsRemaining == 0) {
resetEEPROM(); resetEEPROM();
#ifdef USE_PERSISTENT_OBJECTS
persistentObjectWrite(PERSISTENT_OBJECT_RESET_REASON, RESET_NONE); persistentObjectWrite(PERSISTENT_OBJECT_RESET_REASON, RESET_NONE);
#endif
systemReset(); systemReset();
} }
delay(1000); delay(1000);

2
src/main/target/common_post.h
View file

@ -254,7 +254,7 @@
#undef USE_USB_MSC #undef USE_USB_MSC
#endif #endif
#if (!defined(USE_FLASHFS) || !defined(USE_RTC_TIME) || !defined(USE_USB_MSC)) #if (!defined(USE_FLASHFS) || !defined(USE_RTC_TIME) || !defined(USE_USB_MSC) || !defined(USE_PERSISTENT_OBJECTS))
#undef USE_PERSISTENT_MSC_RTC #undef USE_PERSISTENT_MSC_RTC
#endif #endif

3
src/main/target/common_pre.h
View file

@ -65,6 +65,7 @@
#define USE_MCO #define USE_MCO
#define USE_DMA_SPEC #define USE_DMA_SPEC
#define USE_TIMER_MGMT #define USE_TIMER_MGMT
#define USE_PERSISTENT_OBJECTS
// Re-enable this after 4.0 has been released, and remove the define from STM32F4DISCOVERY // Re-enable this after 4.0 has been released, and remove the define from STM32F4DISCOVERY
//#define USE_SPI_TRANSACTION //#define USE_SPI_TRANSACTION
@ -93,6 +94,7 @@
#define USE_MCO #define USE_MCO
#define USE_DMA_SPEC #define USE_DMA_SPEC
#define USE_TIMER_MGMT #define USE_TIMER_MGMT
#define USE_PERSISTENT_OBJECTS
// Re-enable this after 4.0 has been released, and remove the define from STM32F4DISCOVERY // Re-enable this after 4.0 has been released, and remove the define from STM32F4DISCOVERY
//#define USE_SPI_TRANSACTION //#define USE_SPI_TRANSACTION
#endif // STM32F7 #endif // STM32F7
@ -106,6 +108,7 @@
#define USE_USB_CDC_HID #define USE_USB_CDC_HID
#define USE_DMA_SPEC #define USE_DMA_SPEC
#define USE_TIMER_MGMT #define USE_TIMER_MGMT
#define USE_PERSISTENT_OBJECTS
#endif #endif
#if defined(STM32F4) || defined(STM32F7) || defined(STM32H7) #if defined(STM32F4) || defined(STM32F7) || defined(STM32H7)