sv/IronOS
1
0
Fork 0
forked from me/IronOS
Code Pull Requests Activity

Fixing up TS80P Build (#1429)

Browse Source 
* Silence wchart warning + go back to simple size limiter

Going from smart linker file to basic #defines to make things just easier to debug

* 2 deg c increments for NTC table

* Update cmsis_gcc.h

* Drop special linker

* Update portmacro.h

* Update Makefile
This commit is contained in:
Ben V. Brown
2022-10-20 18:06:05 +11:00
committed by GitHub
parent 82f49b5f50
commit 1a3d6ba219
9 changed files with 20 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/Core/BSP/MHP30/flash.c
View File

@@ -10,14 +10,15 @@
#include "stm32f1xx_hal.h"
#include "string.h"
static uint16_t settings_page[512] __attribute__((section(".settings_page")));
#define SETTINGS_START_PAGE (0x08000000 + (127 * 1024))
uint8_t flash_save_buffer(const uint8_t *buffer, const uint16_t length) {
FLASH_EraseInitTypeDef pEraseInit;
pEraseInit.TypeErase = FLASH_TYPEERASE_PAGES;
pEraseInit.Banks = FLASH_BANK_1;
pEraseInit.NbPages = 1;
pEraseInit.PageAddress = (uint32_t)settings_page;
pEraseInit.PageAddress = (uint32_t)SETTINGS_START_PAGE;
uint32_t failingAddress = 0;
resetWatchdog();
__HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_EOP | FLASH_FLAG_WRPERR | FLASH_FLAG_PGERR | FLASH_FLAG_BSY);
@@ -32,13 +33,10 @@ uint8_t flash_save_buffer(const uint8_t *buffer, const uint16_t length) {
HAL_FLASH_Unlock();
for (uint16_t i = 0; i < (length / 2); i++) {
resetWatchdog();
HAL_FLASH_Program(FLASH_TYPEPROGRAM_HALFWORD, (uint32_t)&settings_page[i], data[i]);
HAL_FLASH_Program(FLASH_TYPEPROGRAM_HALFWORD, SETTINGS_START_PAGE+ (i*sizeof(uint32_t)), data[i]);
}
HAL_FLASH_Lock();
return 1;
}
void flash_read_buffer(uint8_t *buffer, const uint16_t length) {
memset(buffer, 0, length);
memcpy(buffer, settings_page, length);
}
void flash_read_buffer(uint8_t *buffer, const uint16_t length) { memcpy(buffer, (uint8_t*)SETTINGS_START_PAGE, length); }

11
source/Core/BSP/MHP30/stm32f103.ld
View File

@@ -116,17 +116,6 @@ SECTIONS
_edata = .; /* define a global symbol at data end */
} >RAM AT> ROM
.logo_page (NOLOAD) :
{
. = ABSOLUTE(__FLASH_END_ADDR__ - 2048);
KEEP (*(.logo_page*))
} > ROM
.settings_page (NOLOAD) :
{
. = ABSOLUTE(__FLASH_END_ADDR__ - 1024);
KEEP (*(.settings_page*))
} > ROM
.bss :
{