Skip to content

Commit 613b497

Browse files
fpistmfpistm
committed
Apply AStyle code formatting
Same code style definition than the Arduino_Core_STM32. Signed-off-by: Frederic.Pillon <[email protected]>
1 parent 1ded8cf commit 613b497

File tree

10 files changed

+494
-527
lines changed

10 files changed

+494
-527
lines changed

‎src/SD.cpp

Lines changed: 225 additions & 254 deletions
Large diffs are not rendered by default.

‎src/STM32SD.h

Lines changed: 56 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -31,68 +31,71 @@ uint8_t const LS_SIZE = 2;
3131
uint8_t const LS_R = 4;
3232

3333
class File {
34-
public:
35-
File(void);
36-
File(const char* name);
37-
virtual size_t write(uint8_t);
38-
virtual size_t write(const uint8_t *buf, size_t size);
39-
virtual size_t write(const char *buf, size_t size);
40-
41-
virtual int read();
42-
virtual int peek();
43-
virtual int available();
44-
virtual void flush();
45-
int read(void* buf, size_t len);
46-
uint8_t seek(uint32_t pos);
47-
uint32_t position();
48-
uint32_t size();
49-
void close();
50-
operator bool();
51-
52-
char* name(void);
53-
char* fullname(void) {return _name;};
54-
uint8_t isDirectory();
55-
File openNextFile(uint8_t mode = FILE_READ);
56-
void rewindDirectory(void);
57-
58-
virtual size_t print(const char* data);
59-
virtual size_t println();
60-
virtual size_t println(const char* data);
61-
virtual size_t println(String& data);
62-
63-
// Print to Serial line
64-
void ls(uint8_t flags, uint8_t indent = 0);
65-
static void printFatDate(uint16_t fatDate);
66-
static void printFatTime(uint16_t fatTime);
67-
static void printTwoDigits(uint8_t v);
68-
69-
70-
char *_name = NULL; //file or dir name
71-
FIL* _fil = NULL; // underlying file object structure pointer
72-
DIR _dir = {}; // init all fields to 0
34+
public:
35+
File(void);
36+
File(const char *name);
37+
virtual size_t write(uint8_t);
38+
virtual size_t write(const uint8_t *buf, size_t size);
39+
virtual size_t write(const char *buf, size_t size);
40+
41+
virtual int read();
42+
virtual int peek();
43+
virtual int available();
44+
virtual void flush();
45+
int read(void *buf, size_t len);
46+
uint8_t seek(uint32_t pos);
47+
uint32_t position();
48+
uint32_t size();
49+
void close();
50+
operator bool();
51+
52+
char *name(void);
53+
char *fullname(void)
54+
{
55+
return _name;
56+
};
57+
uint8_t isDirectory();
58+
File openNextFile(uint8_t mode = FILE_READ);
59+
void rewindDirectory(void);
60+
61+
virtual size_t print(const char *data);
62+
virtual size_t println();
63+
virtual size_t println(const char *data);
64+
virtual size_t println(String &data);
65+
66+
// Print to Serial line
67+
void ls(uint8_t flags, uint8_t indent = 0);
68+
static void printFatDate(uint16_t fatDate);
69+
static void printFatTime(uint16_t fatTime);
70+
static void printTwoDigits(uint8_t v);
71+
72+
73+
char *_name = NULL; //file or dir name
74+
FIL *_fil = NULL; // underlying file object structure pointer
75+
DIR _dir = {}; // init all fields to 0
7376

7477
};
7578

7679
class SDClass {
7780

78-
public:
81+
public:
7982

80-
/* Initialize the SD peripheral */
81-
uint8_t begin(uint32_t cspin = SD_DETECT_NONE);
82-
static File open(const char *filepath, uint8_t mode);
83-
static File open(const char *filepath);
84-
static uint8_t exists(const char *filepath);
85-
static uint8_t mkdir(const char *filepath);
86-
static uint8_t remove(const char *filepath);
87-
static uint8_t rmdir(const char *filepath);
83+
/* Initialize the SD peripheral */
84+
uint8_t begin(uint32_t cspin = SD_DETECT_NONE);
85+
static File open(const char *filepath, uint8_t mode);
86+
static File open(const char *filepath);
87+
static uint8_t exists(const char *filepath);
88+
static uint8_t mkdir(const char *filepath);
89+
static uint8_t remove(const char *filepath);
90+
static uint8_t rmdir(const char *filepath);
8891

89-
File openRoot(void);
92+
File openRoot(void);
9093

91-
friend class File;
94+
friend class File;
9295

93-
private:
94-
Sd2Card _card;
95-
SdFatFs _fatFs;
96+
private:
97+
Sd2Card _card;
98+
SdFatFs _fatFs;
9699

97100
};
98101

‎src/Sd2Card.cpp

Lines changed: 25 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -37,58 +37,60 @@
3737
#include <Arduino.h>
3838
#include "Sd2Card.h"
3939

40-
uint8_t Sd2Card::init(uint32_t cspin) {
41-
if(cspin != SD_DETECT_NONE) {
42-
PinName p = digitalPinToPinName(cspin);
43-
if((p == NC) ||\
44-
BSP_SD_CSSet(set_GPIO_Port_Clock(STM_PORT(p)),
45-
STM_GPIO_PIN(p)) != MSD_OK) {
46-
return FALSE;
47-
}
48-
}
49-
if (BSP_SD_Init() == MSD_OK) {
50-
BSP_SD_GetCardInfo(&_SdCardInfo);
51-
return TRUE;
52-
}
53-
return FALSE;
40+
uint8_t Sd2Card::init(uint32_t cspin)
41+
{
42+
if (cspin != SD_DETECT_NONE) {
43+
PinName p = digitalPinToPinName(cspin);
44+
if ((p == NC) || \
45+
BSP_SD_CSSet(set_GPIO_Port_Clock(STM_PORT(p)),
46+
STM_GPIO_PIN(p)) != MSD_OK) {
47+
return FALSE;
48+
}
49+
}
50+
if (BSP_SD_Init() == MSD_OK) {
51+
BSP_SD_GetCardInfo(&_SdCardInfo);
52+
return TRUE;
53+
}
54+
return FALSE;
5455
}
5556

56-
uint8_t Sd2Card::type(void) const {
57+
uint8_t Sd2Card::type(void) const
58+
{
5759
uint8_t cardType = SD_CARD_TYPE_UKN;
5860
#ifndef STM32L1xx
5961
switch (_SdCardInfo.CardType) {
6062
case CARD_SDSC:
6163
switch (_SdCardInfo.CardVersion) {
6264
case CARD_V1_X:
6365
cardType = SD_CARD_TYPE_SD1;
64-
break;
66+
break;
6567
case CARD_V2_X:
6668
cardType = SD_CARD_TYPE_SD2;
67-
break;
69+
break;
6870
default:
6971
cardType = SD_CARD_TYPE_UKN;
7072
}
71-
break;
73+
break;
7274
case CARD_SDHC_SDXC:
7375
cardType = SD_CARD_TYPE_SDHC;
74-
break;
76+
break;
7577
case CARD_SECURED:
7678
cardType = SD_CARD_TYPE_SECURED;
77-
break;
79+
break;
7880
default:
7981
cardType = SD_CARD_TYPE_UKN;
8082
}
8183
#else /* STM32L1xx */
8284
switch (_SdCardInfo.CardType) {
8385
case STD_CAPACITY_SD_CARD_V1_1:
8486
cardType = SD_CARD_TYPE_SD1;
85-
break;
87+
break;
8688
case STD_CAPACITY_SD_CARD_V2_0:
8789
cardType = SD_CARD_TYPE_SD2;
88-
break;
90+
break;
8991
case HIGH_CAPACITY_SD_CARD:
9092
cardType = SD_CARD_TYPE_SDHC;
91-
break;
93+
break;
9294
default:
9395
cardType = SD_CARD_TYPE_UKN;
9496
}

‎src/Sd2Card.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,15 +54,15 @@
5454
#define SD_CARD_TYPE_SECURED 4
5555

5656
class Sd2Card {
57-
public:
57+
public:
5858

59-
uint8_t init(uint32_t cspin = SD_DETECT_NONE);
59+
uint8_t init(uint32_t cspin = SD_DETECT_NONE);
6060

61-
/** Return the card type: SD V1, SD V2 or SDHC */
62-
uint8_t type(void) const;
61+
/** Return the card type: SD V1, SD V2 or SDHC */
62+
uint8_t type(void) const;
6363

64-
private:
65-
SD_CardInfo _SdCardInfo;
64+
private:
65+
SD_CardInfo _SdCardInfo;
6666

6767
};
6868
#endif // sd2Card_h

‎src/SdFatFs.cpp

Lines changed: 21 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -37,32 +37,30 @@
3737
#include <Arduino.h>
3838
#include "SdFatFs.h"
3939

40-
uint8_t SdFatFs::init(void) {
40+
uint8_t SdFatFs::init(void)
41+
{
4142

42-
/*##-1- Link the SD disk I/O driver ########################################*/
43-
if(FATFS_LinkDriver(&SD_Driver, _SDPath) == 0)
44-
{
45-
/*##-2- Register the file system object to the FatFs module ##############*/
46-
if(f_mount(&_SDFatFs, (TCHAR const*)_SDPath, 1) == FR_OK)
47-
{
48-
/* FatFs Initialization done */
49-
return TRUE;
50-
}
51-
}
52-
return FALSE;
43+
/*##-1- Link the SD disk I/O driver ########################################*/
44+
if (FATFS_LinkDriver(&SD_Driver, _SDPath) == 0) {
45+
/*##-2- Register the file system object to the FatFs module ##############*/
46+
if (f_mount(&_SDFatFs, (TCHAR const *)_SDPath, 1) == FR_OK) {
47+
/* FatFs Initialization done */
48+
return TRUE;
49+
}
50+
}
51+
return FALSE;
5352
}
5453

5554
uint8_t SdFatFs::fatType(void)
5655
{
57-
switch (_SDFatFs.fs_type)
58-
{
59-
case FS_FAT12:
60-
return 12;
61-
case FS_FAT16:
62-
return 16;
63-
case FS_FAT32:
64-
return 32;
65-
default:
66-
return 0;
67-
}
56+
switch (_SDFatFs.fs_type) {
57+
case FS_FAT12:
58+
return 12;
59+
case FS_FAT16:
60+
return 16;
61+
case FS_FAT32:
62+
return 32;
63+
default:
64+
return 0;
65+
}
6866
}

‎src/SdFatFs.h

Lines changed: 36 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -47,48 +47,63 @@
4747
#define FILE_READ FA_READ
4848

4949
/** year part of FAT directory date field */
50-
static inline uint16_t FAT_YEAR(uint16_t fatDate) {
50+
static inline uint16_t FAT_YEAR(uint16_t fatDate)
51+
{
5152
return 1980 + (fatDate >> 9);
5253
}
5354
/** month part of FAT directory date field */
54-
static inline uint8_t FAT_MONTH(uint16_t fatDate) {
55+
static inline uint8_t FAT_MONTH(uint16_t fatDate)
56+
{
5557
return (fatDate >> 5) & 0XF;
5658
}
5759
/** day part of FAT directory date field */
58-
static inline uint8_t FAT_DAY(uint16_t fatDate) {
60+
static inline uint8_t FAT_DAY(uint16_t fatDate)
61+
{
5962
return fatDate & 0X1F;
6063
}
6164

6265
/** hour part of FAT directory time field */
63-
static inline uint8_t FAT_HOUR(uint16_t fatTime) {
66+
static inline uint8_t FAT_HOUR(uint16_t fatTime)
67+
{
6468
return fatTime >> 11;
6569
}
6670
/** minute part of FAT directory time field */
67-
static inline uint8_t FAT_MINUTE(uint16_t fatTime) {
68-
return(fatTime >> 5) & 0X3F;
71+
static inline uint8_t FAT_MINUTE(uint16_t fatTime)
72+
{
73+
return (fatTime >> 5) & 0X3F;
6974
}
7075
/** second part of FAT directory time field */
71-
static inline uint8_t FAT_SECOND(uint16_t fatTime) {
72-
return 2*(fatTime & 0X1F);
76+
static inline uint8_t FAT_SECOND(uint16_t fatTime)
77+
{
78+
return 2 * (fatTime & 0X1F);
7379
}
7480

7581
class SdFatFs {
76-
public:
82+
public:
7783

78-
uint8_t init(void);
84+
uint8_t init(void);
7985

80-
/** Return the FatFs type: 12, 16, 32 (0: unknown)*/
81-
uint8_t fatType(void);
86+
/** Return the FatFs type: 12, 16, 32 (0: unknown)*/
87+
uint8_t fatType(void);
8288

83-
// inline functions that return volume info
84-
/** \return The volume's cluster size in blocks. */
85-
uint8_t blocksPerCluster(void) const {return _SDFatFs.csize;}
86-
/** \return The total number of clusters in the volume. */
87-
uint32_t clusterCount(void) const {return (_SDFatFs.n_fatent -2);}
89+
// inline functions that return volume info
90+
/** \return The volume's cluster size in blocks. */
91+
uint8_t blocksPerCluster(void) const
92+
{
93+
return _SDFatFs.csize;
94+
}
95+
/** \return The total number of clusters in the volume. */
96+
uint32_t clusterCount(void) const
97+
{
98+
return (_SDFatFs.n_fatent - 2);
99+
}
88100

89-
char* getRoot(void) { return _SDPath;};
90-
private:
91-
FATFS _SDFatFs; /* File system object for SD disk logical drive */
92-
char _SDPath[4]; /* SD disk logical drive path */
101+
char *getRoot(void)
102+
{
103+
return _SDPath;
104+
};
105+
private:
106+
FATFS _SDFatFs; /* File system object for SD disk logical drive */
107+
char _SDPath[4]; /* SD disk logical drive path */
93108
};
94109
#endif // sdFatFs_h

0 commit comments

Comments
 (0)