Skip to content

Commit a3a4c78

Browse files
0xc01700xc0170
authored
Merge pull request #2070 from akselsm/efm32-update
[EFM32] Update HAL implementation
2 parents 1216d80 + a81fdc4 commit a3a4c78

File tree

13 files changed

+713
-290
lines changed

13 files changed

+713
-290
lines changed

‎hal/targets.json

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1581,7 +1581,8 @@
15811581
"extra_labels": ["Silicon_Labs", "EFM32"],
15821582
"supported_toolchains": ["GCC_ARM", "ARM", "uARM"],
15831583
"progen": {"target": "efm32gg-stk"},
1584-
"device_has": ["ANALOGIN", "ANALOGOUT", "ERROR_PATTERN", "I2C", "I2CSLAVE", "I2C_ASYNCH", "INTERRUPTIN", "LOWPOWERTIMER", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_ASYNCH", "SLEEP", "SPI", "SPISLAVE", "SPI_ASYNCH", "STDIO_MESSAGES"]
1584+
"device_has": ["ANALOGIN", "ANALOGOUT", "ERROR_PATTERN", "I2C", "I2CSLAVE", "I2C_ASYNCH", "INTERRUPTIN", "LOWPOWERTIMER", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_ASYNCH", "SLEEP", "SPI", "SPISLAVE", "SPI_ASYNCH", "STDIO_MESSAGES"],
1585+
"forced_reset_timeout": 2
15851586
},
15861587
"EFM32LG_STK3600": {
15871588
"inherits": ["Target"],
@@ -1590,7 +1591,8 @@
15901591
"extra_labels": ["Silicon_Labs", "EFM32"],
15911592
"supported_toolchains": ["GCC_ARM", "ARM", "uARM"],
15921593
"progen": {"target": "efm32lg-stk"},
1593-
"device_has": ["ANALOGIN", "ANALOGOUT", "ERROR_PATTERN", "I2C", "I2CSLAVE", "I2C_ASYNCH", "INTERRUPTIN", "LOWPOWERTIMER", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_ASYNCH", "SLEEP", "SPI", "SPISLAVE", "SPI_ASYNCH", "STDIO_MESSAGES"]
1594+
"device_has": ["ANALOGIN", "ANALOGOUT", "ERROR_PATTERN", "I2C", "I2CSLAVE", "I2C_ASYNCH", "INTERRUPTIN", "LOWPOWERTIMER", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_ASYNCH", "SLEEP", "SPI", "SPISLAVE", "SPI_ASYNCH", "STDIO_MESSAGES"],
1595+
"forced_reset_timeout": 2
15941596
},
15951597
"EFM32WG_STK3800": {
15961598
"inherits": ["Target"],
@@ -1599,7 +1601,8 @@
15991601
"extra_labels": ["Silicon_Labs", "EFM32"],
16001602
"supported_toolchains": ["GCC_ARM", "ARM", "uARM"],
16011603
"progen": {"target": "efm32wg-stk"},
1602-
"device_has": ["ANALOGIN", "ANALOGOUT", "ERROR_PATTERN", "I2C", "I2CSLAVE", "I2C_ASYNCH", "INTERRUPTIN", "LOWPOWERTIMER", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_ASYNCH", "SLEEP", "SPI", "SPISLAVE", "SPI_ASYNCH", "STDIO_MESSAGES"]
1604+
"device_has": ["ANALOGIN", "ANALOGOUT", "ERROR_PATTERN", "I2C", "I2CSLAVE", "I2C_ASYNCH", "INTERRUPTIN", "LOWPOWERTIMER", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_ASYNCH", "SLEEP", "SPI", "SPISLAVE", "SPI_ASYNCH", "STDIO_MESSAGES"],
1605+
"forced_reset_timeout": 2
16031606
},
16041607
"EFM32ZG_STK3200": {
16051608
"inherits": ["Target"],
@@ -1612,7 +1615,8 @@
16121615
"target": "efm32zg-stk"
16131616
},
16141617
"device_has": ["ANALOGIN", "ERROR_PATTERN", "I2C", "I2CSLAVE", "I2C_ASYNCH", "INTERRUPTIN", "LOWPOWERTIMER", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_ASYNCH", "SLEEP", "SPI", "SPISLAVE", "SPI_ASYNCH", "STDIO_MESSAGES"],
1615-
"default_build": "small"
1618+
"default_build": "small",
1619+
"forced_reset_timeout": 2
16161620
},
16171621
"EFM32HG_STK3400": {
16181622
"inherits": ["Target"],
@@ -1625,7 +1629,8 @@
16251629
"target": "efm32hg-stk"
16261630
},
16271631
"device_has": ["ANALOGIN", "ERROR_PATTERN", "I2C", "I2CSLAVE", "I2C_ASYNCH", "INTERRUPTIN", "LOWPOWERTIMER", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_ASYNCH", "SLEEP", "SPI", "SPISLAVE", "SPI_ASYNCH", "STDIO_MESSAGES"],
1628-
"default_build": "small"
1632+
"default_build": "small",
1633+
"forced_reset_timeout": 2
16291634
},
16301635
"EFM32PG_STK3401": {
16311636
"inherits": ["Target"],
@@ -1634,7 +1639,8 @@
16341639
"extra_labels": ["Silicon_Labs", "EFM32"],
16351640
"supported_toolchains": ["GCC_ARM", "ARM", "uARM", "IAR"],
16361641
"progen": {"target": "efm32pg-stk"},
1637-
"device_has": ["ANALOGIN", "ERROR_PATTERN", "I2C", "I2CSLAVE", "I2C_ASYNCH", "INTERRUPTIN", "LOWPOWERTIMER", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_ASYNCH", "SLEEP", "SPI", "SPISLAVE", "SPI_ASYNCH", "STDIO_MESSAGES"]
1642+
"device_has": ["ANALOGIN", "ERROR_PATTERN", "I2C", "I2CSLAVE", "I2C_ASYNCH", "INTERRUPTIN", "LOWPOWERTIMER", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_ASYNCH", "SLEEP", "SPI", "SPISLAVE", "SPI_ASYNCH", "STDIO_MESSAGES"],
1643+
"forced_reset_timeout": 2
16381644
},
16391645
"WIZWIKI_W7500": {
16401646
"supported_form_factors": ["ARDUINO"],

‎hal/targets/hal/TARGET_Silicon_Labs/TARGET_EFM32/TARGET_EFM32GG_STK3700/PeripheralPins.c

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,15 @@ const PinMap PinMap_I2C_SDA[] = {
8686

8787
/************PWM***************/
8888
const PinMap PinMap_PWM[] = {
89-
{PA12, PWM_CH0, 0},
90-
{PA13, PWM_CH1, 0},
91-
{PA14, PWM_CH2, 0},
89+
{PA8, PWM_CH0, 0},
90+
{PA9, PWM_CH1, 0},
91+
{PA10, PWM_CH2, 0},
92+
{PA12, PWM_CH0, 1},
93+
{PA13, PWM_CH1, 1},
94+
{PA14, PWM_CH2, 1},
95+
{PC8, PWM_CH0, 2},
96+
{PC9, PWM_CH1, 2},
97+
{PC10, PWM_CH2, 2},
9298
{NC , NC , 0}
9399
};
94100

‎hal/targets/hal/TARGET_Silicon_Labs/TARGET_EFM32/TARGET_EFM32HG_STK3400/PeripheralPins.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,9 @@ const PinMap PinMap_PWM[] = {
6262
{PA0, PWM_CH0, 0},
6363
{PA1, PWM_CH1, 0},
6464
{PA2, PWM_CH2, 0},
65+
{PF0, PWM_CH0, 5},
66+
{PF1, PWM_CH1, 5},
67+
{PF2, PWM_CH2, 5},
6568
{NC , NC , NC}
6669
};
6770

‎hal/targets/hal/TARGET_Silicon_Labs/TARGET_EFM32/TARGET_EFM32LG_STK3600/PeripheralPins.c

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,15 @@ const PinMap PinMap_I2C_SDA[] = {
8686

8787
/************PWM***************/
8888
const PinMap PinMap_PWM[] = {
89-
{PA12, PWM_CH0, 0},
90-
{PA13, PWM_CH1, 0},
91-
{PA14, PWM_CH2, 0},
89+
{PA8, PWM_CH0, 0},
90+
{PA9, PWM_CH1, 0},
91+
{PA10, PWM_CH2, 0},
92+
{PA12, PWM_CH0, 1},
93+
{PA13, PWM_CH1, 1},
94+
{PA14, PWM_CH2, 1},
95+
{PC8, PWM_CH0, 2},
96+
{PC9, PWM_CH1, 2},
97+
{PC10, PWM_CH2, 2},
9298
{NC , NC , 0}
9399
};
94100

‎hal/targets/hal/TARGET_Silicon_Labs/TARGET_EFM32/TARGET_EFM32WG_STK3800/PeripheralPins.c

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,15 @@ const PinMap PinMap_I2C_SDA[] = {
8686

8787
/************PWM***************/
8888
const PinMap PinMap_PWM[] = {
89-
{PA12, PWM_CH0, 0},
90-
{PA13, PWM_CH1, 0},
91-
{PA14, PWM_CH2, 0},
89+
{PA8, PWM_CH0, 0},
90+
{PA9, PWM_CH1, 0},
91+
{PA10, PWM_CH2, 0},
92+
{PA12, PWM_CH0, 1},
93+
{PA13, PWM_CH1, 1},
94+
{PA14, PWM_CH2, 1},
95+
{PC8, PWM_CH0, 2},
96+
{PC9, PWM_CH1, 2},
97+
{PC10, PWM_CH2, 2},
9298
{NC , NC , 0}
9399
};
94100

0 commit comments

Comments
 (0)