diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2019-05-29 12:08:10 +0300 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2019-05-29 12:08:10 +0300 |
| commit | 6792c8f8769eec18cfee8ccf80a09887c48b8b6a (patch) | |
| tree | eb67c141d40ea34b4446bd6724ec77fc13385852 /Software/Embedded_SW/Embedded/Common | |
| parent | 9ae8d0e95a199dbf6be4597b0e08717d4d0754f2 (diff) | |
| parent | 405096b3d489f4ea7b50b1d5db7d32241251b8d7 (diff) | |
| download | Tango-6792c8f8769eec18cfee8ccf80a09887c48b8b6a.tar.gz Tango-6792c8f8769eec18cfee8ccf80a09887c48b8b6a.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango
Diffstat (limited to 'Software/Embedded_SW/Embedded/Common')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c | 1 | ||||
| -rw-r--r-- | Software/Embedded_SW/Embedded/Common/SW_Info/SW_Info.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c b/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c index 68500ac88..6c0262f66 100644 --- a/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c +++ b/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c @@ -35,6 +35,7 @@ #include "third_party/fatfs/src/diskio.h" #include "drivers/Flash_Memory/Flash_Memory.h" #include "drivers/Flash_Memory/fatfs/ff.h" +#include "drivers/FPGA/FPGA_GPIO/FPGA_GPIO.h" #include "third_party/fatfs/src/ffconf.h" diff --git a/Software/Embedded_SW/Embedded/Common/SW_Info/SW_Info.c b/Software/Embedded_SW/Embedded/Common/SW_Info/SW_Info.c index b2590abab..bee894585 100644 --- a/Software/Embedded_SW/Embedded/Common/SW_Info/SW_Info.c +++ b/Software/Embedded_SW/Embedded/Common/SW_Info/SW_Info.c @@ -20,7 +20,7 @@ typedef struct } TangoVersion_t; -TangoVersion_t _gTangoVersion = {1,4,0,2}; +TangoVersion_t _gTangoVersion = {1,4,0,3}; #define BUILD_DATE __DATE__ char Dat[50] = BUILD_DATE; char _gTangoName [MAX_STRING_LEN] = "Tango01 ";//d |