aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Embedded_SW
diff options
context:
space:
mode:
authorShlomo Hecht <shlomo@twine-s.com>2019-04-29 14:11:03 +0300
committerShlomo Hecht <shlomo@twine-s.com>2019-04-29 14:11:03 +0300
commit06caa0e07f268c2208d2c1e2d5cfd177ac33f593 (patch)
treef959e666f878c9181adf61bd8234151f50b99450 /Software/Embedded_SW
parentfd7196c48de7ca02e9461b08022bb5538b0ec42e (diff)
parent1dab3b805eca0db8fe0a71ef43c9b63ace109a72 (diff)
downloadTango-06caa0e07f268c2208d2c1e2d5cfd177ac33f593.tar.gz
Tango-06caa0e07f268c2208d2c1e2d5cfd177ac33f593.zip
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Embedded_SW')
-rw-r--r--Software/Embedded_SW/Embedded/Drivers/flash_ram/FlashProgram.h11
1 files changed, 6 insertions, 5 deletions
diff --git a/Software/Embedded_SW/Embedded/Drivers/flash_ram/FlashProgram.h b/Software/Embedded_SW/Embedded/Drivers/flash_ram/FlashProgram.h
index 3ffc5ad73..b920bf47f 100644
--- a/Software/Embedded_SW/Embedded/Drivers/flash_ram/FlashProgram.h
+++ b/Software/Embedded_SW/Embedded/Drivers/flash_ram/FlashProgram.h
@@ -10,11 +10,12 @@
#define FLASH_RAM_BASE 0x000D0000
-#define MOTOR_MAP_IN_FLASH FLASH_RAM_BASE+0X0000
-#define ALARM_MAP_IN_FLASH FLASH_RAM_BASE+0X2000
-#define JOB_MAP_IN_FLASH FLASH_RAM_BASE+0X4000
-#define GENHWCFG_MAP_IN_FLASH FLASH_RAM_BASE+0X10000
-#define OTHER_MAP_IN_FLASH FLASH_RAM_BASE+0X12000
+#define MOTOR_MAP_IN_FLASH (FLASH_RAM_BASE + 0X0000 )
+#define ALARM_MAP_IN_FLASH (FLASH_RAM_BASE + 0X2000 )
+#define JOB_MAP_IN_FLASH (FLASH_RAM_BASE + 0X4000 )
+#define GENHWCFG_MAP_IN_FLASH (FLASH_RAM_BASE + 0X10000)
+#define OTHER_MAP_IN_FLASH (FLASH_RAM_BASE + 0X12000)
+
#define FLASH_SIZE 0X30000
//*****************************************************************************