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

Avoid using flash size register on STM31F103 since some chips are

Browse source 
manufactured incorrectly.  Fixes #71.
This commit is contained in:
Dominic Clifton 2014-09-14 16:15:10 +01:00
parent e3ea15f3dc
commit 3ef769bf7b
2 changed files with 10 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -70,6 +70,7 @@ void mixerUseConfigs(servoParam_t *servoConfToUse, flight3DConfig_t *flight3DCon
#define FLASH_TO_RESERVE_FOR_CONFIG 0x800 #define FLASH_TO_RESERVE_FOR_CONFIG 0x800
#ifndef FLASH_PAGE_COUNT
#ifdef STM32F303xC #ifdef STM32F303xC
#define FLASH_PAGE_COUNT 128 #define FLASH_PAGE_COUNT 128
#define FLASH_PAGE_SIZE ((uint16_t)0x800) #define FLASH_PAGE_SIZE ((uint16_t)0x800)
@ -84,13 +85,14 @@ void mixerUseConfigs(servoParam_t *servoConfToUse, flight3DConfig_t *flight3DCon
#define FLASH_PAGE_COUNT 128 #define FLASH_PAGE_COUNT 128
#define FLASH_PAGE_SIZE ((uint16_t)0x800) #define FLASH_PAGE_SIZE ((uint16_t)0x800)
#endif #endif
#endif
#ifndef FLASH_PAGE_COUNT #if !defined(FLASH_PAGE_COUNT) || !defined(FLASH_PAGE_SIZE)
#error "Flash page count not defined for target." #error "Flash page count not defined for target."
#endif #endif
// use the last flash pages for storage // use the last flash pages for storage
static uint32_t flashWriteAddress = (0x08000000 + (uint32_t)((FLASH_PAGE_SIZE * FLASH_PAGE_COUNT) - FLASH_TO_RESERVE_FOR_CONFIG)); #define CONFIG_START_FLASH_ADDRESS (0x08000000 + (uint32_t)((FLASH_PAGE_SIZE * FLASH_PAGE_COUNT) - FLASH_TO_RESERVE_FOR_CONFIG))
master_t masterConfig; // master config struct with data independent from profiles master_t masterConfig; // master config struct with data independent from profiles
profile_t *currentProfile; // profile config struct profile_t *currentProfile; // profile config struct
@ -389,7 +391,7 @@ static uint8_t calculateChecksum(const uint8_t *data, uint32_t length)
static bool isEEPROMContentValid(void) static bool isEEPROMContentValid(void)
{ {
const master_t *temp = (const master_t *) flashWriteAddress; const master_t *temp = (const master_t *) CONFIG_START_FLASH_ADDRESS;
uint8_t checksum = 0; uint8_t checksum = 0;
// check version number // check version number
@ -523,15 +525,6 @@ void validateAndFixConfig(void)
void initEEPROM(void) void initEEPROM(void)
{ {
#if defined(STM32F10X)
#define FLASH_SIZE_REGISTER 0x1FFFF7E0
const uint32_t flashSizeInKB = *((uint32_t *)FLASH_SIZE_REGISTER) & 0xFFFF;
// calculate write address based on contents of Flash size register. Use last 2 kbytes for storage
flashWriteAddress = 0x08000000 + (FLASH_PAGE_SIZE * (flashSizeInKB - 2));
#endif
} }
void readEEPROM(void) void readEEPROM(void)
@ -541,7 +534,7 @@ void readEEPROM(void)
failureMode(10); failureMode(10);
// Read flash // Read flash
memcpy(&masterConfig, (char *) flashWriteAddress, sizeof(master_t)); memcpy(&masterConfig, (char *) CONFIG_START_FLASH_ADDRESS, sizeof(master_t));
// Copy current profile // Copy current profile
if (masterConfig.current_profile_index > 2) // sanity check if (masterConfig.current_profile_index > 2) // sanity check
masterConfig.current_profile_index = 0; masterConfig.current_profile_index = 0;
@ -587,13 +580,13 @@ void writeEEPROM(void)
#endif #endif
for (wordOffset = 0; wordOffset < sizeof(master_t); wordOffset += 4) { for (wordOffset = 0; wordOffset < sizeof(master_t); wordOffset += 4) {
if (wordOffset % FLASH_PAGE_SIZE == 0) { if (wordOffset % FLASH_PAGE_SIZE == 0) {
status = FLASH_ErasePage(flashWriteAddress + wordOffset); status = FLASH_ErasePage(CONFIG_START_FLASH_ADDRESS + wordOffset);
if (status != FLASH_COMPLETE) { if (status != FLASH_COMPLETE) {
break; break;
} }
} }
status = FLASH_ProgramWord(flashWriteAddress + wordOffset, status = FLASH_ProgramWord(CONFIG_START_FLASH_ADDRESS + wordOffset,
*(uint32_t *) ((char *) &masterConfig + wordOffset)); *(uint32_t *) ((char *) &masterConfig + wordOffset));
if (status != FLASH_COMPLETE) { if (status != FLASH_COMPLETE) {
break; break;

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

@ -17,6 +17,8 @@
#pragma once #pragma once
#define FLASH_PAGE_COUNT 128
#define FLASH_PAGE_SIZE ((uint16_t)0x400)
#define LED0_GPIO GPIOC #define LED0_GPIO GPIOC
#define LED0_PIN Pin_13 // PC13 (LED) #define LED0_PIN Pin_13 // PC13 (LED)