From 5df04affd6e159167dbeb01e8f40a6bb3cf726bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9a=20Saviot?= Date: Fri, 12 Apr 2019 11:33:22 +0200 Subject: [PATCH] [ion/n0100] Fix DFU --- ion/src/device/shared/drivers/flash.cpp | 4 ++-- ion/src/device/shared/drivers/flash.h | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/ion/src/device/shared/drivers/flash.cpp b/ion/src/device/shared/drivers/flash.cpp index dbd36e71f..2ae24eb97 100644 --- a/ion/src/device/shared/drivers/flash.cpp +++ b/ion/src/device/shared/drivers/flash.cpp @@ -213,7 +213,7 @@ static void flash_memcpy(uint8_t * destination, uint8_t * source, size_t length) } int SectorAtAddress(uint32_t address) { - for (int i=0; i= Config::SectorAddresses[i] && address < Config::SectorAddresses[i+1]) { return i; } @@ -231,7 +231,7 @@ void MassErase() { } void EraseSector(int i) { - assert(i >= 0 && i < NumberOfSectors); + assert(i >= 0 && i < Config::NumberOfSectors); open(); FLASH.CR()->setSNB(i); FLASH.CR()->setSER(true); diff --git a/ion/src/device/shared/drivers/flash.h b/ion/src/device/shared/drivers/flash.h index 25935c989..ebb3ffc4f 100644 --- a/ion/src/device/shared/drivers/flash.h +++ b/ion/src/device/shared/drivers/flash.h @@ -10,7 +10,6 @@ namespace Flash { void MassErase(); -constexpr int NumberOfSectors = 4; int SectorAtAddress(uint32_t address); void EraseSector(int i);