aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Embedded_SW/Embedded/Drivers/flash_ram
diff options
context:
space:
mode:
authorShlomo Hecht <shlomo@twine-s.com>2020-10-19 17:15:51 +0300
committerShlomo Hecht <shlomo@twine-s.com>2020-10-19 17:15:51 +0300
commitd158d2e52229c221d1d475ced6b1ff048d6519ad (patch)
treeacd1b09d50ce9c6356b17fe73a02ceec66279178 /Software/Embedded_SW/Embedded/Drivers/flash_ram
parentb732167cbc51f0b19447d67687af5c514cf4f65a (diff)
downloadTango-d158d2e52229c221d1d475ced6b1ff048d6519ad.tar.gz
Tango-d158d2e52229c221d1d475ced6b1ff048d6519ad.zip
change RAM FLASH SIZE and location. some progress on the machine
Diffstat (limited to 'Software/Embedded_SW/Embedded/Drivers/flash_ram')
-rw-r--r--Software/Embedded_SW/Embedded/Drivers/flash_ram/FlashProgram.c9
-rw-r--r--Software/Embedded_SW/Embedded/Drivers/flash_ram/FlashProgram.h24
2 files changed, 21 insertions, 12 deletions
diff --git a/Software/Embedded_SW/Embedded/Drivers/flash_ram/FlashProgram.c b/Software/Embedded_SW/Embedded/Drivers/flash_ram/FlashProgram.c
index c1a5bcc9f..10f65db1d 100644
--- a/Software/Embedded_SW/Embedded/Drivers/flash_ram/FlashProgram.c
+++ b/Software/Embedded_SW/Embedded/Drivers/flash_ram/FlashProgram.c
@@ -131,10 +131,19 @@ uint32_t ReadAppAndProgram(uint32_t ui32FlashStart,uint32_t ui32FileSize,void* b
//
return(1);
}
+int base_flashErased = false;
uint32_t EraseFlashSection(uint32_t ui32FlashStart)
{
volatile uint32_t ui32Idx = ui32FlashStart;
uint32_t status;
+ if (ui32FlashStart<GENHWCFG_SECTION_FLASH)
+ {
+ if (base_flashErased == true)
+ return ERROR;
+ else
+ base_flashErased = true; //once in a run
+
+ }
#ifdef FLASH_DEBUG
Address[RxIndex] = ui32FlashStart;
Size[RxIndex] = ui32FileSize;
diff --git a/Software/Embedded_SW/Embedded/Drivers/flash_ram/FlashProgram.h b/Software/Embedded_SW/Embedded/Drivers/flash_ram/FlashProgram.h
index 983c3954c..655a980db 100644
--- a/Software/Embedded_SW/Embedded/Drivers/flash_ram/FlashProgram.h
+++ b/Software/Embedded_SW/Embedded/Drivers/flash_ram/FlashProgram.h
@@ -8,23 +8,23 @@
#ifndef DRIVERS_FLASH_RAM_FLASHPROGRAM_H_
#define DRIVERS_FLASH_RAM_FLASHPROGRAM_H_
-#define FLASH_RAM_BASE 0x000F0000
+#define FLASH_RAM_BASE 0x000F8000
-#define EMBEDDED_PARAMETERS_SECTION_FLASH (FLASH_RAM_BASE + 0X0000 )
-#define PROCESS_PARAMETERS_SECTION_FLASH (FLASH_RAM_BASE + 0X0000 )
+#define EMBEDDED_PARAMETERS_SECTION_FLASH (FLASH_RAM_BASE + 0X0000 ) //512
+#define PROCESS_PARAMETERS_SECTION_FLASH (FLASH_RAM_BASE + 0X0000 )//512
#define DANCERS_SECTION_FLASH (FLASH_RAM_BASE + 0X0000)
-#define DISPENSERS_SECTION_FLASH (FLASH_RAM_BASE + 0X4000)
-#define ALARM_SECTION_FLASH (FLASH_RAM_BASE + 0XC000 )
-#define GENHWCFG_SECTION_FLASH (FLASH_RAM_BASE + 0X8000)
+#define DISPENSERS_SECTION_FLASH (FLASH_RAM_BASE + 0X0000)
+#define GENHWCFG_SECTION_FLASH (FLASH_RAM_BASE + 0X2000)
+#define ALARM_SECTION_FLASH (FLASH_RAM_BASE + 0X4000 )
#define EMBEDDED_PARAMETERS_MAP_IN_FLASH (FLASH_RAM_BASE + 0X0000 )
-#define PROCESS_PARAMETERS_MAP_IN_FLASH (FLASH_RAM_BASE + 0X0400 )
-#define DANCERS_MAP_IN_FLASH (FLASH_RAM_BASE + 0X0500)
-#define DISPENSERS_MAP_IN_FLASH (FLASH_RAM_BASE + 0X4000)
-#define ALARM_MAP_IN_FLASH (FLASH_RAM_BASE + 0XC000 )
-#define GENHWCFG_MAP_IN_FLASH (FLASH_RAM_BASE + 0X8000)
+#define PROCESS_PARAMETERS_MAP_IN_FLASH (FLASH_RAM_BASE + 0X0200 )
+#define DANCERS_MAP_IN_FLASH (FLASH_RAM_BASE + 0X0400)
+#define DISPENSERS_MAP_IN_FLASH (FLASH_RAM_BASE + 0X500)
+#define GENHWCFG_MAP_IN_FLASH (FLASH_RAM_BASE + 0X2000)
+#define ALARM_MAP_IN_FLASH (FLASH_RAM_BASE + 0X4000 )
-#define FLASH_SIZE 0X10000
+#define FLASH_SIZE 0X8000
//*****************************************************************************
//