Final tidy of code following installation of new sensor, more comments added prior to submission

Dependencies:   mbed

Committer:
legstar85
Date:
Fri Jan 21 22:33:32 2022 +0000
Revision:
14:3e9991fe64e5
Addition of new menu option, start of coding for writing Temp data to SD card

Who changed what in which revision?

UserRevisionLine numberNew contents of line
legstar85 14:3e9991fe64e5 1 /* mbed Microcontroller Library
legstar85 14:3e9991fe64e5 2 * Copyright (c) 2006-2012 ARM Limited
legstar85 14:3e9991fe64e5 3 *
legstar85 14:3e9991fe64e5 4 * Permission is hereby granted, free of charge, to any person obtaining a copy
legstar85 14:3e9991fe64e5 5 * of this software and associated documentation files (the "Software"), to deal
legstar85 14:3e9991fe64e5 6 * in the Software without restriction, including without limitation the rights
legstar85 14:3e9991fe64e5 7 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
legstar85 14:3e9991fe64e5 8 * copies of the Software, and to permit persons to whom the Software is
legstar85 14:3e9991fe64e5 9 * furnished to do so, subject to the following conditions:
legstar85 14:3e9991fe64e5 10 *
legstar85 14:3e9991fe64e5 11 * The above copyright notice and this permission notice shall be included in
legstar85 14:3e9991fe64e5 12 * all copies or substantial portions of the Software.
legstar85 14:3e9991fe64e5 13 *
legstar85 14:3e9991fe64e5 14 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
legstar85 14:3e9991fe64e5 15 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
legstar85 14:3e9991fe64e5 16 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
legstar85 14:3e9991fe64e5 17 * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
legstar85 14:3e9991fe64e5 18 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
legstar85 14:3e9991fe64e5 19 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
legstar85 14:3e9991fe64e5 20 * SOFTWARE.
legstar85 14:3e9991fe64e5 21 */
legstar85 14:3e9991fe64e5 22 #include <string.h>
legstar85 14:3e9991fe64e5 23 #include "ff.h"
legstar85 14:3e9991fe64e5 24 #include "FATDirHandle.h"
legstar85 14:3e9991fe64e5 25
legstar85 14:3e9991fe64e5 26 using namespace mbed;
legstar85 14:3e9991fe64e5 27
legstar85 14:3e9991fe64e5 28 FATDirHandle::FATDirHandle(const FATFS_DIR &the_dir) {
legstar85 14:3e9991fe64e5 29 dir = the_dir;
legstar85 14:3e9991fe64e5 30 }
legstar85 14:3e9991fe64e5 31
legstar85 14:3e9991fe64e5 32 int FATDirHandle::closedir() {
legstar85 14:3e9991fe64e5 33 int retval = f_closedir(&dir);
legstar85 14:3e9991fe64e5 34 delete this;
legstar85 14:3e9991fe64e5 35 return retval;
legstar85 14:3e9991fe64e5 36 }
legstar85 14:3e9991fe64e5 37
legstar85 14:3e9991fe64e5 38 struct dirent *FATDirHandle::readdir() {
legstar85 14:3e9991fe64e5 39 FILINFO finfo;
legstar85 14:3e9991fe64e5 40
legstar85 14:3e9991fe64e5 41 #if _USE_LFN
legstar85 14:3e9991fe64e5 42 finfo.lfname = cur_entry.d_name;
legstar85 14:3e9991fe64e5 43 finfo.lfsize = sizeof(cur_entry.d_name);
legstar85 14:3e9991fe64e5 44 #endif // _USE_LFN
legstar85 14:3e9991fe64e5 45
legstar85 14:3e9991fe64e5 46 FRESULT res = f_readdir(&dir, &finfo);
legstar85 14:3e9991fe64e5 47
legstar85 14:3e9991fe64e5 48 #if _USE_LFN
legstar85 14:3e9991fe64e5 49 if(res != 0 || finfo.fname[0]==0) {
legstar85 14:3e9991fe64e5 50 return NULL;
legstar85 14:3e9991fe64e5 51 } else {
legstar85 14:3e9991fe64e5 52 if(cur_entry.d_name[0]==0) {
legstar85 14:3e9991fe64e5 53 // No long filename so use short filename.
legstar85 14:3e9991fe64e5 54 memcpy(cur_entry.d_name, finfo.fname, sizeof(finfo.fname));
legstar85 14:3e9991fe64e5 55 }
legstar85 14:3e9991fe64e5 56 return &cur_entry;
legstar85 14:3e9991fe64e5 57 }
legstar85 14:3e9991fe64e5 58 #else
legstar85 14:3e9991fe64e5 59 if(res != 0 || finfo.fname[0]==0) {
legstar85 14:3e9991fe64e5 60 return NULL;
legstar85 14:3e9991fe64e5 61 } else {
legstar85 14:3e9991fe64e5 62 memcpy(cur_entry.d_name, finfo.fname, sizeof(finfo.fname));
legstar85 14:3e9991fe64e5 63 return &cur_entry;
legstar85 14:3e9991fe64e5 64 }
legstar85 14:3e9991fe64e5 65 #endif /* _USE_LFN */
legstar85 14:3e9991fe64e5 66 }
legstar85 14:3e9991fe64e5 67
legstar85 14:3e9991fe64e5 68 void FATDirHandle::rewinddir() {
legstar85 14:3e9991fe64e5 69 dir.index = 0;
legstar85 14:3e9991fe64e5 70 }
legstar85 14:3e9991fe64e5 71
legstar85 14:3e9991fe64e5 72 off_t FATDirHandle::telldir() {
legstar85 14:3e9991fe64e5 73 return dir.index;
legstar85 14:3e9991fe64e5 74 }
legstar85 14:3e9991fe64e5 75
legstar85 14:3e9991fe64e5 76 void FATDirHandle::seekdir(off_t location) {
legstar85 14:3e9991fe64e5 77 dir.index = location;
legstar85 14:3e9991fe64e5 78 }
legstar85 14:3e9991fe64e5 79
legstar85 14:3e9991fe64e5 80 ssize_t FATDirHandle::read(struct dirent *ent) {
legstar85 14:3e9991fe64e5 81 struct dirent *temp = readdir();
legstar85 14:3e9991fe64e5 82 if (!temp) {
legstar85 14:3e9991fe64e5 83 return 0;
legstar85 14:3e9991fe64e5 84 }
legstar85 14:3e9991fe64e5 85
legstar85 14:3e9991fe64e5 86 memcpy(ent, temp, sizeof(*ent));
legstar85 14:3e9991fe64e5 87 return 1;
legstar85 14:3e9991fe64e5 88 }
legstar85 14:3e9991fe64e5 89
legstar85 14:3e9991fe64e5 90