ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Hotfix for PR #7778 

TB_SENSE_12 would have been left behind by the changes in #7778. This commit implements the changes in mbed to allow targets to provide a default network interface for Silicon Labs targets.
pull/8023/head
Steven 2018-09-06 21:49:06 +02:00 committed by Steven Cooreman
parent 3d94fb889b
commit 9a0fc98bdc
5 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
features/nanostack/sal-stack-nanostack/mbed_lib.json
View File

@ -13,6 +13,9 @@
}, },
"NCS36510": { "NCS36510": {
"nanostack.configuration": "lowpan_router" "nanostack.configuration": "lowpan_router"
},
"TB_SENSE_12": {
"nanostack.configuration": "lowpan_router"
} }
} }
} }

6
features/nanostack/targets/TARGET_Silicon_Labs/TARGET_SL_RAIL/NanostackRfPhyEfr32.cpp
View File

@ -1275,3 +1275,9 @@ static void radioEventHandler(RAIL_Handle_t railHandle,
} }
while (events != 0); while (events != 0);
} }
NanostackRfPhy &NanostackRfPhy::get_default_instance()
{
static NanostackRfPhyEfr32 rf_phy;
return rf_phy;
}

3
features/netsocket/mbed_lib.json
View File

@ -36,6 +36,9 @@
}, },
"NCS36510": { "NCS36510": {
"nsapi.default-mesh-type": "LOWPAN" "nsapi.default-mesh-type": "LOWPAN"
},
"TB_SENSE_12": {
"nsapi.default-mesh-type": "LOWPAN"
} }
} }
} }

18
targets/targets.json
View File

@ -3443,7 +3443,7 @@
}, },
"EFR32MG1_BRD4150": { "EFR32MG1_BRD4150": {
"inherits": ["EFR32MG1P132F256GM48"], "inherits": ["EFR32MG1P132F256GM48"],
"device_has": ["ANALOGIN", "CRC", "I2C", "I2CSLAVE", "I2C_ASYNCH", "INTERRUPTIN", "LPTICKER", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_ASYNCH", "SLEEP", "SPI", "SPISLAVE", "SPI_ASYNCH", "STDIO_MESSAGES", "USTICKER", "FLASH"], "device_has": ["802_15_4_PHY", "ANALOGIN", "CRC", "I2C", "I2CSLAVE", "I2C_ASYNCH", "INTERRUPTIN", "LPTICKER", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_ASYNCH", "SLEEP", "SPI", "SPISLAVE", "SPI_ASYNCH", "STDIO_MESSAGES", "USTICKER", "FLASH"],
"forced_reset_timeout": 2, "forced_reset_timeout": 2,
"config": { "config": {
"hf_clock_src": { "hf_clock_src": {
@ -3482,11 +3482,14 @@
"macro_name": "EFM_BC_EN" "macro_name": "EFM_BC_EN"
} }
}, },
"overrides": {
"network-default-interface-type": "MESH"
},
"public": false "public": false
}, },
"TB_SENSE_1": { "TB_SENSE_1": {
"inherits": ["EFR32MG1P233F256GM48"], "inherits": ["EFR32MG1P233F256GM48"],
"device_has": ["ANALOGIN", "CRC", "I2C", "I2CSLAVE", "I2C_ASYNCH", "INTERRUPTIN", "LPTICKER", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_ASYNCH", "SLEEP", "SPI", "SPISLAVE", "SPI_ASYNCH", "STDIO_MESSAGES", "USTICKER", "FLASH"], "device_has": ["802_15_4_PHY", "ANALOGIN", "CRC", "I2C", "I2CSLAVE", "I2C_ASYNCH", "INTERRUPTIN", "LPTICKER", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_ASYNCH", "SLEEP", "SPI", "SPISLAVE", "SPI_ASYNCH", "STDIO_MESSAGES", "USTICKER", "FLASH"],
"forced_reset_timeout": 5, "forced_reset_timeout": 5,
"config": { "config": {
"hf_clock_src": { "hf_clock_src": {
@ -3519,6 +3522,9 @@
"value": "cmuHFRCOFreq_32M0Hz", "value": "cmuHFRCOFreq_32M0Hz",
"macro_name": "HFRCO_FREQUENCY_ENUM" "macro_name": "HFRCO_FREQUENCY_ENUM"
} }
},
"overrides": {
"network-default-interface-type": "MESH"
} }
}, },
"EFM32PG12B500F1024GL125": { "EFM32PG12B500F1024GL125": {
@ -3588,7 +3594,7 @@
"TB_SENSE_12": { "TB_SENSE_12": {
"inherits": ["EFR32MG12P332F1024GL125"], "inherits": ["EFR32MG12P332F1024GL125"],
"device_name": "EFR32MG12P332F1024GL125", "device_name": "EFR32MG12P332F1024GL125",
"device_has": ["ANALOGIN", "CRC", "I2C", "I2CSLAVE", "I2C_ASYNCH", "INTERRUPTIN", "LPTICKER", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_ASYNCH", "SLEEP", "SPI", "SPISLAVE", "SPI_ASYNCH", "STDIO_MESSAGES", "USTICKER", "TRNG", "FLASH"], "device_has": ["802_15_4_PHY", "ANALOGIN", "CRC", "I2C", "I2CSLAVE", "I2C_ASYNCH", "INTERRUPTIN", "LPTICKER", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_ASYNCH", "SLEEP", "SPI", "SPISLAVE", "SPI_ASYNCH", "STDIO_MESSAGES", "USTICKER", "TRNG", "FLASH"],
"forced_reset_timeout": 5, "forced_reset_timeout": 5,
"config": { "config": {
"hf_clock_src": { "hf_clock_src": {
@ -3621,6 +3627,9 @@
"value": "cmuHFRCOFreq_32M0Hz", "value": "cmuHFRCOFreq_32M0Hz",
"macro_name": "HFRCO_FREQUENCY_ENUM" "macro_name": "HFRCO_FREQUENCY_ENUM"
} }
},
"overrides": {
"network-default-interface-type": "MESH"
} }
}, },
"EFM32GG11B820F2048GL192": { "EFM32GG11B820F2048GL192": {
@ -3680,6 +3689,9 @@
"value": "PG13", "value": "PG13",
"macro_name": "QSPI_FLASH_EN" "macro_name": "QSPI_FLASH_EN"
} }
},
"overrides": {
"network-default-interface-type": "ETHERNET"
} }
}, },
"WIZWIKI_W7500": { "WIZWIKI_W7500": {

4
tools/test_configs/target_configs.json
View File

@ -46,5 +46,9 @@
"KW24D": { "KW24D": {
"default_test_configuration": "NO_NETWORK", "default_test_configuration": "NO_NETWORK",
"test_configurations": ["6LOWPAN_HOST", "6LOWPAN_ROUTER", "THREAD_END_DEVICE", "THREAD_ROUTER"] "test_configurations": ["6LOWPAN_HOST", "6LOWPAN_ROUTER", "THREAD_END_DEVICE", "THREAD_ROUTER"]
},
"TB_SENSE_12": {
"default_test_configuration": "NO_NETWORK",
"test_configurations": ["6LOWPAN_HOST", "6LOWPAN_ROUTER", "THREAD_END_DEVICE", "THREAD_ROUTER"]
} }
} }