Skip to content

Commit b1fe60d

Browse files
codestyle unification
1 parent 36b71f5 commit b1fe60d

File tree

2 files changed

+60
-60
lines changed

2 files changed

+60
-60
lines changed

src/utility/spi_drv.cpp

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -73,52 +73,52 @@ extern WiFiClass WiFi;
7373
void SpiDrv::begin()
7474
{
7575
#ifdef ARDUINO_SAMD_MKRVIDOR4000
76-
FPGA.begin();
76+
FPGA.begin();
7777
#endif
7878

7979
#ifdef SPIWIFI_SS
80-
SLAVESELECT = SPIWIFI_SS;
80+
SLAVESELECT = SPIWIFI_SS;
8181
#endif
8282

8383
#ifdef SPIWIFI_ACK
84-
SLAVEREADY = SPIWIFI_ACK;
84+
SLAVEREADY = SPIWIFI_ACK;
8585
#endif
8686

8787
#ifdef SPIWIFI_RESET
88-
SLAVERESET = (uint8_t)SPIWIFI_RESET;
88+
SLAVERESET = (uint8_t)SPIWIFI_RESET;
8989
#endif
9090

9191
#ifdef ARDUINO_SAMD_MKRVIDOR4000
92-
inverted_reset = false;
92+
inverted_reset = false;
9393
#else
94-
if (SLAVERESET > PINS_COUNT) {
94+
if (SLAVERESET > PINS_COUNT) {
9595
inverted_reset = true;
9696
SLAVERESET = ~SLAVERESET;
97-
}
97+
}
9898
#endif
9999

100-
pinMode(SLAVESELECT, OUTPUT);
101-
pinMode(SLAVEREADY, INPUT);
102-
pinMode(SLAVERESET, OUTPUT);
103-
pinMode(NINA_GPIO0, OUTPUT);
100+
pinMode(SLAVESELECT, OUTPUT);
101+
pinMode(SLAVEREADY, INPUT);
102+
pinMode(SLAVERESET, OUTPUT);
103+
pinMode(NINA_GPIO0, OUTPUT);
104104

105-
digitalWrite(NINA_GPIO0, HIGH);
106-
digitalWrite(SLAVESELECT, HIGH);
107-
digitalWrite(SLAVERESET, inverted_reset ? HIGH : LOW);
108-
delay(10);
109-
digitalWrite(SLAVERESET, inverted_reset ? LOW : HIGH);
110-
delay(750);
105+
digitalWrite(NINA_GPIO0, HIGH);
106+
digitalWrite(SLAVESELECT, HIGH);
107+
digitalWrite(SLAVERESET, inverted_reset ? HIGH : LOW);
108+
delay(10);
109+
digitalWrite(SLAVERESET, inverted_reset ? LOW : HIGH);
110+
delay(750);
111111

112-
digitalWrite(NINA_GPIO0, LOW);
113-
pinMode(NINA_GPIOIRQ, INPUT);
112+
digitalWrite(NINA_GPIO0, LOW);
113+
pinMode(NINA_GPIOIRQ, INPUT);
114114

115-
SPIWIFI.begin();
115+
SPIWIFI.begin();
116116

117117
#ifdef _DEBUG_
118-
INIT_TRIGGER()
118+
INIT_TRIGGER()
119119
#endif
120120

121-
initialized = true;
121+
initialized = true;
122122
}
123123

124124
void SpiDrv::end() {
@@ -165,8 +165,8 @@ int SpiDrv::waitSpiChar(unsigned char waitChar)
165165
_readChar = readChar(); //get data byte
166166
if (_readChar == ERR_CMD)
167167
{
168-
WARN("Err cmd received\n");
169-
return -1;
168+
WARN("Err cmd received\n");
169+
return -1;
170170
}
171171
}while((timeout-- > 0) && (_readChar != waitChar));
172172
return (_readChar == waitChar);
@@ -199,7 +199,7 @@ char SpiDrv::readChar()
199199
#define CHECK_DATA(check, x) \
200200
if (!readAndCheckChar(check, &x)) \
201201
{ \
202-
TOGGLE_TRIGGER() \
202+
TOGGLE_TRIGGER() \
203203
WARN("Reply error"); \
204204
INFO2(check, (uint8_t)x); \
205205
return 0; \
@@ -252,12 +252,12 @@ int SpiDrv::waitResponseCmd(uint8_t cmd, uint8_t numParam, uint8_t* param, uint8
252252
// Get Params data
253253
//param[ii] = spiTransfer(DUMMY_DATA);
254254
getParam(&param[ii]);
255-
}
256-
}
255+
}
256+
}
257257

258258
readAndCheckChar(END_CMD, &_data);
259-
}
260-
259+
}
260+
261261
return 1;
262262
}
263263
/*
@@ -277,12 +277,12 @@ int SpiDrv::waitResponse(uint8_t cmd, uint8_t numParam, uint8_t* param, uint16_t
277277
{
278278
// Get Params data
279279
param[ii] = spiTransfer(DUMMY_DATA);
280-
}
281-
}
280+
}
281+
}
282282
283283
readAndCheckChar(END_CMD, &_data);
284-
}
285-
284+
}
285+
286286
return 1;
287287
}
288288
*/
@@ -298,18 +298,18 @@ int SpiDrv::waitResponseData16(uint8_t cmd, uint8_t* param, uint16_t* param_len)
298298

299299
uint8_t numParam = readChar();
300300
if (numParam != 0)
301-
{
301+
{
302302
readParamLen16(param_len);
303303
for (ii=0; ii<(*param_len); ++ii)
304304
{
305305
// Get Params data
306306
param[ii] = spiTransfer(DUMMY_DATA);
307-
}
308-
}
307+
}
308+
}
309309

310310
readAndCheckChar(END_CMD, &_data);
311-
}
312-
311+
}
312+
313313
return 1;
314314
}
315315

@@ -324,18 +324,18 @@ int SpiDrv::waitResponseData8(uint8_t cmd, uint8_t* param, uint8_t* param_len)
324324

325325
uint8_t numParam = readChar();
326326
if (numParam != 0)
327-
{
327+
{
328328
readParamLen8(param_len);
329329
for (ii=0; ii<(*param_len); ++ii)
330330
{
331331
// Get Params data
332332
param[ii] = spiTransfer(DUMMY_DATA);
333-
}
334-
}
333+
}
334+
}
335335

336336
readAndCheckChar(END_CMD, &_data);
337-
}
338-
337+
}
338+
339339
return 1;
340340
}
341341

@@ -351,15 +351,15 @@ int SpiDrv::waitResponseParams(uint8_t cmd, uint8_t numParam, tParam* params)
351351

352352
uint8_t _numParam = readChar();
353353
if (_numParam != 0)
354-
{
354+
{
355355
for (i=0; i<_numParam; ++i)
356356
{
357357
params[i].paramLen = readParamLen8();
358358
for (ii=0; ii<params[i].paramLen; ++ii)
359359
{
360360
// Get Params data
361361
params[i].param[ii] = spiTransfer(DUMMY_DATA);
362-
}
362+
}
363363
}
364364
} else
365365
{
@@ -374,7 +374,7 @@ int SpiDrv::waitResponseParams(uint8_t cmd, uint8_t numParam, tParam* params)
374374
}
375375

376376
readAndCheckChar(END_CMD, &_data);
377-
}
377+
}
378378
return 1;
379379
}
380380

@@ -405,7 +405,7 @@ int SpiDrv::waitResponse(uint8_t cmd, tParam* params, uint8_t* numParamRead, uin
405405
{
406406
// Get Params data
407407
params[i].param[ii] = spiTransfer(DUMMY_DATA);
408-
}
408+
}
409409
}
410410
} else
411411
{
@@ -414,7 +414,7 @@ int SpiDrv::waitResponse(uint8_t cmd, tParam* params, uint8_t* numParamRead, uin
414414
return 0;
415415
}
416416
readAndCheckChar(END_CMD, &_data);
417-
}
417+
}
418418
return 1;
419419
}
420420
*/
@@ -444,7 +444,7 @@ int SpiDrv::waitResponse(uint8_t cmd, uint8_t* numParamRead, uint8_t** params, u
444444
{
445445
for (i=0; i<numParam; ++i)
446446
{
447-
uint8_t paramLen = readParamLen8();
447+
uint8_t paramLen = readParamLen8();
448448
for (ii=0; ii<paramLen; ++ii)
449449
{
450450
//ssid[ii] = spiTransfer(DUMMY_DATA);

src/utility/spi_drv.h

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -50,35 +50,35 @@ class SpiDrv
5050
static void begin();
5151

5252
static void end();
53-
53+
5454
static void spiDriverInit();
55-
55+
5656
static void spiSlaveSelect();
57-
57+
5858
static void spiSlaveDeselect();
59-
59+
6060
static char spiTransfer(volatile char data);
6161

6262
static void waitForSlaveReady(bool const feed_watchdog = false);
6363

6464
//static int waitSpiChar(char waitChar, char* readChar);
6565

6666
static int waitSpiChar(unsigned char waitChar);
67-
67+
6868
static int readAndCheckChar(char checkChar, char* readChar);
6969

7070
static char readChar();
7171

7272
static int waitResponseParams(uint8_t cmd, uint8_t numParam, tParam* params);
73-
73+
7474
static int waitResponseCmd(uint8_t cmd, uint8_t numParam, uint8_t* param, uint8_t* param_len);
7575

7676
static int waitResponseData8(uint8_t cmd, uint8_t* param, uint8_t* param_len);
77-
77+
7878
static int waitResponseData16(uint8_t cmd, uint8_t* param, uint16_t* param_len);
79-
/*
79+
/*
8080
static int waitResponse(uint8_t cmd, tParam* params, uint8_t* numParamRead, uint8_t maxNumParams);
81-
81+
8282
static int waitResponse(uint8_t cmd, uint8_t numParam, uint8_t* param, uint16_t* param_len);
8383
*/
8484
static int waitResponse(uint8_t cmd, uint8_t* numParamRead, uint8_t** params, uint8_t maxNumParams);
@@ -98,11 +98,11 @@ class SpiDrv
9898
static void sendBuffer(uint8_t* param, uint16_t param_len, uint8_t lastParam = NO_LAST_PARAM);
9999

100100
static void sendParam(uint16_t param, uint8_t lastParam = NO_LAST_PARAM);
101-
101+
102102
static void sendCmd(uint8_t cmd, uint8_t numParam);
103103

104104
static int available();
105-
};
105+
};
106106

107107
extern SpiDrv spiDrv;
108108

0 commit comments

Comments
 (0)