diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2020-11-02 20:13:27 +0200 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2020-11-02 20:13:27 +0200 |
| commit | 2a8d3d38bd80fe011f8e6921742574b2ff71fa72 (patch) | |
| tree | c1d2dd4c52d0e255039ed561363741df875155e7 /Software/Embedded_SW/Embedded/Common | |
| parent | f0905c07b9b5bc33aa9bad914ca799cf1e8a920c (diff) | |
| download | Tango-2a8d3d38bd80fe011f8e6921742574b2ff71fa72.tar.gz Tango-2a8d3d38bd80fe011f8e6921742574b2ff71fa72.zip | |
warning removed!
Diffstat (limited to 'Software/Embedded_SW/Embedded/Common')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c | 2 | ||||
| -rw-r--r-- | Software/Embedded_SW/Embedded/Common/Utilities/RFIDTagHandling.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c b/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c index b59194af6..76c2fe9f2 100644 --- a/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c +++ b/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c @@ -726,7 +726,7 @@ uint32_t GetFilesRequestFunc(MessageContainer* requestContainer) usnprintf(&FullPath[i], 50, "%s%s", request->path, fno[i]->fname); else usnprintf(&FullPath[i], 50, "%s%s%s", request->path,"/", fno[i]->fname); - Data[i].fullpath = &FullPath[i]; + Data[i].fullpath = &FullPath[i][0]; } response.n_items = NumOfFiles; diff --git a/Software/Embedded_SW/Embedded/Common/Utilities/RFIDTagHandling.c b/Software/Embedded_SW/Embedded/Common/Utilities/RFIDTagHandling.c index 7bc1c2e54..6d15afc6a 100644 --- a/Software/Embedded_SW/Embedded/Common/Utilities/RFIDTagHandling.c +++ b/Software/Embedded_SW/Embedded/Common/Utilities/RFIDTagHandling.c @@ -191,7 +191,7 @@ CartridgeTagContent * NFCTag_Tag2PPC(NFCTag_t *Tag) PpcTag->has_fillsysid = true; PpcTag->fillsysid = Tag->fillingSystem; PpcTag->has_inkcategory = true; - PpcTag->inkcategory = Tag->catagory; + PpcTag->inkcategory = Tag->catagory[0]<<8+Tag->catagory[1]; PpcTag->has_type_rev = true; PpcTag->type_rev = Tag->type; PpcTag->has_cartridgesize = true; |