Skip to content

Commit 16d2120

Browse files
author
Alon Nof
authored
Merge branch 'master' into TARGET_MTB_MTS_DRAGONFLY
2 parents 96dd2a2 + 10aac9f commit 16d2120

File tree

11 files changed

+1726
-225
lines changed

11 files changed

+1726
-225
lines changed

README.md

Lines changed: 17 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Simon Hughes
55

66
20170329
77

8-
Version 0.1.1
8+
Version 0.1.2
99

1010

1111
# Executive Summary
@@ -192,38 +192,10 @@ The following is an example of the `mbed_lib.json` file available in the reposit
192192

193193
{
194194
"config": {
195-
"UART_RX": "D0",
196-
"UART_TX": "D1",
197-
"DIO_0": "D0",
198-
"DIO_1": "D1",
199-
"DIO_2": "D2",
200-
"DIO_3": "D3",
201-
"DIO_4": "D4",
202-
"DIO_5": "D5",
203-
"DIO_6": "D6",
204-
"DIO_7": "D7",
205-
"DIO_8": "D8",
206-
"DIO_9": "D9",
207195
"SPI_CS": "D10",
208196
"SPI_MOSI": "D11",
209197
"SPI_MISO": "D12",
210198
"SPI_CLK": "D13",
211-
"I2C_SDA": "D14",
212-
"I2C_SCL": "D15",
213-
"I2C_TEMP_ADDR":"0x90",
214-
"I2C_EEPROM_ADDR":"0xA0",
215-
"AIN_0": "A0",
216-
"AIN_1": "A1",
217-
"AIN_2": "A2",
218-
"AIN_3": "A3",
219-
"AIN_4": "A4",
220-
"AIN_5": "A5",
221-
"AOUT" : "A5",
222-
"PWM_0": "D3",
223-
"PWM_1": "D5",
224-
"PWM_2": "D6",
225-
"PWM_3": "D9",
226-
"DEBUG_MSG": 0,
227199
"DEVICE_SPI": 1,
228200
"FSFAT_SDCARD_INSTALLED": 1
229201
},
@@ -234,30 +206,6 @@ The following is an example of the `mbed_lib.json` file available in the reposit
234206
"SPI_CLK": "SPI_SCK",
235207
"SPI_CS": "SPI_CS"
236208
},
237-
"K20D50M": {
238-
"SPI_MOSI": "PTD2",
239-
"SPI_MISO": "PTD3",
240-
"SPI_CLK": "PTD1",
241-
"SPI_CS": "PTC2"
242-
},
243-
"KL22F": {
244-
"SPI_MOSI": "PTD6",
245-
"SPI_MISO": "PTD7",
246-
"SPI_CLK": "PTD5",
247-
"SPI_CS": "PTD4"
248-
},
249-
"KL25Z": {
250-
"SPI_MOSI": "PTD2",
251-
"SPI_MISO": "PTD3",
252-
"SPI_CLK": "PTD1",
253-
"SPI_CS": "PTD0"
254-
},
255-
"KL43Z": {
256-
"SPI_MOSI": "PTD6",
257-
"SPI_MISO": "PTD7",
258-
"SPI_CLK": "PTD5",
259-
"SPI_CS": "PTD4"
260-
},
261209
"KL46Z": {
262210
"SPI_MOSI": "PTD6",
263211
"SPI_MISO": "PTD7",
@@ -269,44 +217,7 @@ The following is an example of the `mbed_lib.json` file available in the reposit
269217
"SPI_MISO": "PTE1",
270218
"SPI_CLK": "PTE2",
271219
"SPI_CS": "PTE4"
272-
},
273-
"K66F": {
274-
"SPI_MOSI": "PTE3",
275-
"SPI_MISO": "PTE1",
276-
"SPI_CLK": "PTE2",
277-
"SPI_CS": "PTE4"
278-
},
279-
"LPC11U37H_401": {
280-
"SPI_MOSI": "SDMOSI",
281-
"SPI_MISO": "SDMISO",
282-
"SPI_CLK": "SDSCLK",
283-
"SPI_CS": "SDSSEL"
284-
},
285-
"LPC2368": {
286-
"SPI_MOSI": "p11",
287-
"SPI_MISO": "p12",
288-
"SPI_CLK": "p13",
289-
"SPI_CS": "p14"
290-
},
291-
"NUCLEO_L031K6": {
292-
"SPI_MOSI": "SPI_MOSI",
293-
"SPI_MISO": "SPI_MISO",
294-
"SPI_CLK": "SPI_SCK",
295-
"SPI_CS": "SPI_CS"
296-
},
297-
"nRF51822": {
298-
"SPI_MOSI": "p12",
299-
"SPI_MISO": "p13",
300-
"SPI_CLK": "p15",
301-
"SPI_CS": "p14"
302-
},
303-
"RZ_A1H": {
304-
"SPI_MOSI": "P8_5",
305-
"SPI_MISO": "P8_6",
306-
"SPI_CLK": "P8_3",
307-
"SPI_CS": "P8_4"
308220
}
309-
}
310221
}
311222

312223
Note the following things about the `mbed_lib.json` file:
@@ -483,9 +394,13 @@ The build trace is quite extensive but on a successful build you should see the
483394
* K64F::GCC_ARM::MBED-OS-FEATURES-TESTS-FILESYSTEM-HEAP_BLOCK_DEVICE
484395
* K64F::GCC_ARM::MBED-OS-FEATURES-TESTS-FILESYSTEM-UTIL_BLOCK_DEVICE
485396
<trace removed>
397+
* K64F::GCC_ARM::SD-DRIVER-TESTS-BLOCK_DEVICE-BASIC
486398
* K64F::GCC_ARM::SD-DRIVER-TESTS-FILESYSTEM-BASIC
399+
* K64F::GCC_ARM::SD-DRIVER-TESTS-FILESYSTEM-DIRS
400+
* K64F::GCC_ARM::SD-DRIVER-TESTS-FILESYSTEM-FILES
487401
* K64F::GCC_ARM::SD-DRIVER-TESTS-FILESYSTEM-FOPEN
488-
* K64F::GCC_ARM::SD-DRIVER-TESTS-BLOCK_DEVICE-BASIC
402+
* K64F::GCC_ARM::SD-DRIVER-TESTS-FILESYSTEM-PARALLEL
403+
* K64F::GCC_ARM::SD-DRIVER-TESTS-FILESYSTEM-SEEK
489404

490405
Build skips:
491406
* K64F::GCC_ARM::MBED-OS-FEATURES-FEATURE_LWIP-TESTS-MBEDMICRO-NET-TCP_PACKET_PRESSURE
@@ -494,15 +409,23 @@ The build trace is quite extensive but on a successful build you should see the
494409

495410
Notice the following tests in the sd-driver tree are listed above:
496411

497-
- `K64F::GCC_ARM::SD-DRIVER-TESTS-FILESYSTEM-BASIC`
498-
- `K64F::GCC_ARM::SD-DRIVER-TESTS-FILESYSTEM-FOPEN`
499-
- `K64F::GCC_ARM::SD-DRIVER-TESTS-BLOCK_DEVICE-BASIC`
412+
- `SD-DRIVER-TESTS-BLOCK_DEVICE-BASIC`
413+
- `SD-DRIVER-TESTS-FILESYSTEM-BASIC`
414+
- `SD-DRIVER-TESTS-FILESYSTEM-DIRS`
415+
- `SD-DRIVER-TESTS-FILESYSTEM-FILES`
416+
- `SD-DRIVER-TESTS-FILESYSTEM-FOPEN`
417+
- `SD-DRIVER-TESTS-FILESYSTEM-PARALLEL`
418+
- `SD-DRIVER-TESTS-FILESYSTEM-SEEK`
500419

501420
The FAT32/SDCard test cases are at following locations in the source code tree:
502421

503422
/d/demo_area/ex_app1/sd-driver/TESTS/filesystem/basic/basic.cpp
504423
/d/demo_area/ex_app1/sd-driver/TESTS/filesystem/fopen/fopen.cpp
505424
/d/demo_area/ex_app1/sd-driver/TESTS/block_device/basic/basic.cpp
425+
/d/demo_area/ex_app1/sd-driver/TESTS/filesystem/dirs/main.cpp
426+
/d/demo_area/ex_app1/sd-driver/TESTS/filesystem/files/main.cpp
427+
/d/demo_area/ex_app1/sd-driver/TESTS/filesystem/parallel/main.cpp
428+
/d/demo_area/ex_app1/sd-driver/TESTS/filesystem/seek/main.cpp
506429

507430
#### <a name="settting-repos-to-compatible-versions"></a> Setting mbed-os/sd-driver Repositories To Compatible Versions
508431

0 commit comments

Comments
 (0)