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

Revert "Merge pull request #372 from aughey/betaflight"

Browse source 
This reverts commit a6a5f50ffb, reversing
changes made to 9cc5503851.
This commit is contained in:
borisbstyle 2016-05-04 00:00:04 +02:00
parent a6a5f50ffb
commit 5ffb3b5068
6 changed files with 30 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/main/config/config.c
View file

@ -124,15 +124,8 @@ void useRcControlsConfig(modeActivationCondition_t *modeActivationConditions, es
#define FLASH_TO_RESERVE_FOR_CONFIG 0x1000
#endif
// use the last flash pages for storage
#ifdef CUSTOM_FLASH_MEMORY_ADDRESS
size_t custom_flash_memory_address = 0;
#define CONFIG_START_FLASH_ADDRESS (custom_flash_memory_address)
#else
// use the last flash pages for storage
#define CONFIG_START_FLASH_ADDRESS (0x08000000 + (uint32_t)((FLASH_PAGE_SIZE * FLASH_PAGE_COUNT) - FLASH_TO_RESERVE_FOR_CONFIG))
#endif
master_t masterConfig; // master config struct with data independent from profiles
profile_t *currentProfile;