Skip to content

Commit caa4279

Browse files
author
Cruz Monrreal
authored
Merge pull request #8023 from SiliconLabs/hotfix/nanostack-default-interface
Hotfix for PR #7778 on Silicon Labs targets
2 parents ab882c3 + 0e7eda0 commit caa4279

File tree

6 files changed

+36
-4
lines changed

6 files changed

+36
-4
lines changed

‎features/nanostack/sal-stack-nanostack/mbed_lib.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@
1313
},
1414
"NCS36510": {
1515
"nanostack.configuration": "lowpan_router"
16+
},
17+
"TB_SENSE_12": {
18+
"nanostack.configuration": "lowpan_router"
1619
}
1720
}
1821
}

‎features/nanostack/targets/TARGET_Silicon_Labs/TARGET_SL_RAIL/NanostackRfPhyEfr32.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1275,3 +1275,9 @@ static void radioEventHandler(RAIL_Handle_t railHandle,
12751275
}
12761276
while (events != 0);
12771277
}
1278+
1279+
NanostackRfPhy &NanostackRfPhy::get_default_instance()
1280+
{
1281+
static NanostackRfPhyEfr32 rf_phy;
1282+
return rf_phy;
1283+
}

‎features/netsocket/mbed_lib.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@
3636
},
3737
"NCS36510": {
3838
"nsapi.default-mesh-type": "LOWPAN"
39+
},
40+
"TB_SENSE_12": {
41+
"nsapi.default-mesh-type": "LOWPAN"
3942
}
4043
}
4144
}

‎targets/targets.json

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3443,7 +3443,7 @@
34433443
},
34443444
"EFR32MG1_BRD4150": {
34453445
"inherits": ["EFR32MG1P132F256GM48"],
3446-
"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"],
3446+
"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"],
34473447
"forced_reset_timeout": 2,
34483448
"config": {
34493449
"hf_clock_src": {
@@ -3482,11 +3482,14 @@
34823482
"macro_name": "EFM_BC_EN"
34833483
}
34843484
},
3485+
"overrides": {
3486+
"network-default-interface-type": "MESH"
3487+
},
34853488
"public": false
34863489
},
34873490
"TB_SENSE_1": {
34883491
"inherits": ["EFR32MG1P233F256GM48"],
3489-
"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"],
3492+
"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"],
34903493
"forced_reset_timeout": 5,
34913494
"config": {
34923495
"hf_clock_src": {
@@ -3519,6 +3522,9 @@
35193522
"value": "cmuHFRCOFreq_32M0Hz",
35203523
"macro_name": "HFRCO_FREQUENCY_ENUM"
35213524
}
3525+
},
3526+
"overrides": {
3527+
"network-default-interface-type": "MESH"
35223528
}
35233529
},
35243530
"EFM32PG12B500F1024GL125": {
@@ -3588,7 +3594,7 @@
35883594
"TB_SENSE_12": {
35893595
"inherits": ["EFR32MG12P332F1024GL125"],
35903596
"device_name": "EFR32MG12P332F1024GL125",
3591-
"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"],
3597+
"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"],
35923598
"forced_reset_timeout": 5,
35933599
"config": {
35943600
"hf_clock_src": {
@@ -3621,6 +3627,9 @@
36213627
"value": "cmuHFRCOFreq_32M0Hz",
36223628
"macro_name": "HFRCO_FREQUENCY_ENUM"
36233629
}
3630+
},
3631+
"overrides": {
3632+
"network-default-interface-type": "MESH"
36243633
}
36253634
},
36263635
"EFM32GG11B820F2048GL192": {
@@ -3680,6 +3689,9 @@
36803689
"value": "PG13",
36813690
"macro_name": "QSPI_FLASH_EN"
36823691
}
3692+
},
3693+
"overrides": {
3694+
"network-default-interface-type": "ETHERNET"
36833695
}
36843696
},
36853697
"WIZWIKI_W7500": {

‎tools/test_configs/target_configs.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,5 +46,13 @@
4646
"KW24D": {
4747
"default_test_configuration": "NO_NETWORK",
4848
"test_configurations": ["6LOWPAN_HOST", "6LOWPAN_ROUTER", "THREAD_END_DEVICE", "THREAD_ROUTER"]
49+
},
50+
"TB_SENSE_12": {
51+
"default_test_configuration": "NO_NETWORK",
52+
"test_configurations": ["6LOWPAN_HOST", "6LOWPAN_ROUTER", "THREAD_END_DEVICE", "THREAD_ROUTER"]
53+
},
54+
"TB_SENSE_1": {
55+
"default_test_configuration": "NO_NETWORK",
56+
"test_configurations": ["6LOWPAN_HOST", "6LOWPAN_ROUTER", "THREAD_END_DEVICE", "THREAD_ROUTER"]
4957
}
5058
}

‎tools/toolchains/iar.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ def get_compile_options(self, defines, includes, for_asm=False):
167167
opts = ['-D%s' % d for d in defines]
168168
if for_asm:
169169
config_macros = self.config.get_config_data_macros()
170-
macros_cmd = ['"-D%s"' % d.replace('"', '').replace('//','/\/') for d in config_macros]
170+
macros_cmd = ['"-D%s"' % d for d in config_macros if not '"' in d]
171171
if self.RESPONSE_FILES:
172172
via_file = self.make_option_file(
173173
macros_cmd, "asm_macros_{}.xcl")

0 commit comments

Comments
 (0)