@@ -73,52 +73,52 @@ extern WiFiClass WiFi;
73
73
void SpiDrv::begin ()
74
74
{
75
75
#ifdef ARDUINO_SAMD_MKRVIDOR4000
76
- FPGA.begin ();
76
+ FPGA.begin ();
77
77
#endif
78
78
79
79
#ifdef SPIWIFI_SS
80
- SLAVESELECT = SPIWIFI_SS;
80
+ SLAVESELECT = SPIWIFI_SS;
81
81
#endif
82
82
83
83
#ifdef SPIWIFI_ACK
84
- SLAVEREADY = SPIWIFI_ACK;
84
+ SLAVEREADY = SPIWIFI_ACK;
85
85
#endif
86
86
87
87
#ifdef SPIWIFI_RESET
88
- SLAVERESET = (uint8_t )SPIWIFI_RESET;
88
+ SLAVERESET = (uint8_t )SPIWIFI_RESET;
89
89
#endif
90
90
91
91
#ifdef ARDUINO_SAMD_MKRVIDOR4000
92
- inverted_reset = false ;
92
+ inverted_reset = false ;
93
93
#else
94
- if (SLAVERESET > PINS_COUNT) {
94
+ if (SLAVERESET > PINS_COUNT) {
95
95
inverted_reset = true ;
96
96
SLAVERESET = ~SLAVERESET;
97
- }
97
+ }
98
98
#endif
99
99
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);
104
104
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 );
111
111
112
- digitalWrite (NINA_GPIO0, LOW);
113
- pinMode (NINA_GPIOIRQ, INPUT);
112
+ digitalWrite (NINA_GPIO0, LOW);
113
+ pinMode (NINA_GPIOIRQ, INPUT);
114
114
115
- SPIWIFI.begin ();
115
+ SPIWIFI.begin ();
116
116
117
117
#ifdef _DEBUG_
118
- INIT_TRIGGER ()
118
+ INIT_TRIGGER ()
119
119
#endif
120
120
121
- initialized = true ;
121
+ initialized = true ;
122
122
}
123
123
124
124
void SpiDrv::end () {
@@ -165,8 +165,8 @@ int SpiDrv::waitSpiChar(unsigned char waitChar)
165
165
_readChar = readChar (); // get data byte
166
166
if (_readChar == ERR_CMD)
167
167
{
168
- WARN (" Err cmd received\n " );
169
- return -1 ;
168
+ WARN (" Err cmd received\n " );
169
+ return -1 ;
170
170
}
171
171
}while ((timeout-- > 0 ) && (_readChar != waitChar));
172
172
return (_readChar == waitChar);
@@ -199,7 +199,7 @@ char SpiDrv::readChar()
199
199
#define CHECK_DATA (check, x ) \
200
200
if (!readAndCheckChar(check, &x)) \
201
201
{ \
202
- TOGGLE_TRIGGER () \
202
+ TOGGLE_TRIGGER () \
203
203
WARN (" Reply error" ); \
204
204
INFO2 (check, (uint8_t )x); \
205
205
return 0 ; \
@@ -252,12 +252,12 @@ int SpiDrv::waitResponseCmd(uint8_t cmd, uint8_t numParam, uint8_t* param, uint8
252
252
// Get Params data
253
253
// param[ii] = spiTransfer(DUMMY_DATA);
254
254
getParam (¶m[ii]);
255
- }
256
- }
255
+ }
256
+ }
257
257
258
258
readAndCheckChar (END_CMD, &_data);
259
- }
260
-
259
+ }
260
+
261
261
return 1 ;
262
262
}
263
263
/*
@@ -277,12 +277,12 @@ int SpiDrv::waitResponse(uint8_t cmd, uint8_t numParam, uint8_t* param, uint16_t
277
277
{
278
278
// Get Params data
279
279
param[ii] = spiTransfer(DUMMY_DATA);
280
- }
281
- }
280
+ }
281
+ }
282
282
283
283
readAndCheckChar(END_CMD, &_data);
284
- }
285
-
284
+ }
285
+
286
286
return 1;
287
287
}
288
288
*/
@@ -298,18 +298,18 @@ int SpiDrv::waitResponseData16(uint8_t cmd, uint8_t* param, uint16_t* param_len)
298
298
299
299
uint8_t numParam = readChar ();
300
300
if (numParam != 0 )
301
- {
301
+ {
302
302
readParamLen16 (param_len);
303
303
for (ii=0 ; ii<(*param_len); ++ii)
304
304
{
305
305
// Get Params data
306
306
param[ii] = spiTransfer (DUMMY_DATA);
307
- }
308
- }
307
+ }
308
+ }
309
309
310
310
readAndCheckChar (END_CMD, &_data);
311
- }
312
-
311
+ }
312
+
313
313
return 1 ;
314
314
}
315
315
@@ -324,18 +324,18 @@ int SpiDrv::waitResponseData8(uint8_t cmd, uint8_t* param, uint8_t* param_len)
324
324
325
325
uint8_t numParam = readChar ();
326
326
if (numParam != 0 )
327
- {
327
+ {
328
328
readParamLen8 (param_len);
329
329
for (ii=0 ; ii<(*param_len); ++ii)
330
330
{
331
331
// Get Params data
332
332
param[ii] = spiTransfer (DUMMY_DATA);
333
- }
334
- }
333
+ }
334
+ }
335
335
336
336
readAndCheckChar (END_CMD, &_data);
337
- }
338
-
337
+ }
338
+
339
339
return 1 ;
340
340
}
341
341
@@ -351,15 +351,15 @@ int SpiDrv::waitResponseParams(uint8_t cmd, uint8_t numParam, tParam* params)
351
351
352
352
uint8_t _numParam = readChar ();
353
353
if (_numParam != 0 )
354
- {
354
+ {
355
355
for (i=0 ; i<_numParam; ++i)
356
356
{
357
357
params[i].paramLen = readParamLen8 ();
358
358
for (ii=0 ; ii<params[i].paramLen ; ++ii)
359
359
{
360
360
// Get Params data
361
361
params[i].param [ii] = spiTransfer (DUMMY_DATA);
362
- }
362
+ }
363
363
}
364
364
} else
365
365
{
@@ -374,7 +374,7 @@ int SpiDrv::waitResponseParams(uint8_t cmd, uint8_t numParam, tParam* params)
374
374
}
375
375
376
376
readAndCheckChar (END_CMD, &_data);
377
- }
377
+ }
378
378
return 1 ;
379
379
}
380
380
@@ -405,7 +405,7 @@ int SpiDrv::waitResponse(uint8_t cmd, tParam* params, uint8_t* numParamRead, uin
405
405
{
406
406
// Get Params data
407
407
params[i].param[ii] = spiTransfer(DUMMY_DATA);
408
- }
408
+ }
409
409
}
410
410
} else
411
411
{
@@ -414,7 +414,7 @@ int SpiDrv::waitResponse(uint8_t cmd, tParam* params, uint8_t* numParamRead, uin
414
414
return 0;
415
415
}
416
416
readAndCheckChar(END_CMD, &_data);
417
- }
417
+ }
418
418
return 1;
419
419
}
420
420
*/
@@ -444,7 +444,7 @@ int SpiDrv::waitResponse(uint8_t cmd, uint8_t* numParamRead, uint8_t** params, u
444
444
{
445
445
for (i=0 ; i<numParam; ++i)
446
446
{
447
- uint8_t paramLen = readParamLen8 ();
447
+ uint8_t paramLen = readParamLen8 ();
448
448
for (ii=0 ; ii<paramLen; ++ii)
449
449
{
450
450
// ssid[ii] = spiTransfer(DUMMY_DATA);
0 commit comments