1
0
Fork 0
mirror of https://github.com/iNavFlight/inav.git synced 2025-07-24 00:35:34 +03:00

Merge branch 'jaffadog-master'

This commit is contained in:
Dominic Clifton 2015-12-13 00:11:20 +01:00
commit f5ed208b1a
4 changed files with 6 additions and 4 deletions

View file

@ -118,8 +118,8 @@ void useRcControlsConfig(modeActivationCondition_t *modeActivationConditions, es
#error "Flash page count not defined for target."
#endif
#if FLASH_SIZE <= 128
#define FLASH_TO_RESERVE_FOR_CONFIG 0x800
#if FLASH_SIZE <= 64
#define FLASH_TO_RESERVE_FOR_CONFIG 0x0800
#else
#define FLASH_TO_RESERVE_FOR_CONFIG 0x1000
#endif

View file

@ -171,6 +171,8 @@
#define GPS
#define GTUNE
#define LED_STRIP
#define LED_STRIP_TIMER TIM3

View file

@ -12,7 +12,7 @@
/* Specify the memory areas. */
MEMORY
{
FLASH (rx) : ORIGIN = 0x08000000, LENGTH = 126K /* last 2kb used for config storage */
FLASH (rx) : ORIGIN = 0x08000000, LENGTH = 124K /* last 4kb used for config storage */
RAM (xrw) : ORIGIN = 0x20000000, LENGTH = 20K
MEMORY_B1 (rx) : ORIGIN = 0x60000000, LENGTH = 0K
}

View file

@ -12,7 +12,7 @@
/* Specify the memory areas. */
MEMORY
{
FLASH (rx) : ORIGIN = 0x08000000, LENGTH = 126K /* last 2kb used for config storage */
FLASH (rx) : ORIGIN = 0x08000000, LENGTH = 124K /* last 4kb used for config storage */
RAM (xrw) : ORIGIN = 0x20000000, LENGTH = 40K
MEMORY_B1 (rx) : ORIGIN = 0x60000000, LENGTH = 0K
}