Skip to content

Commit 8c86052

Browse files
0xc01700xc0170
authored
Merge pull request #11646 from kyle-cypress/pr/bt-wake-swap
Fix swapped BT pins on CYW943012P6EVB-01
2 parents 58fe0ba + 4619f92 commit 8c86052

File tree

4 files changed

+49
-49
lines changed

4 files changed

+49
-49
lines changed

‎targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CYW943012P6EVB_01/COMPONENT_BSP_DESIGN_MODUS/GeneratedSource/cycfg_pins.c

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -936,11 +936,11 @@ const cy_stc_gpio_pin_config_t CYBSP_BT_REG_ON_config =
936936
.channel_num = CYBSP_BT_REG_ON_PIN,
937937
};
938938
#endif //defined (CY_USING_HAL)
939-
const cy_stc_gpio_pin_config_t CYBSP_BT_HOST_WAKE_config =
939+
const cy_stc_gpio_pin_config_t CYBSP_BT_DEVICE_WAKE_config =
940940
{
941941
.outVal = 0,
942-
.driveMode = CY_GPIO_DM_HIGHZ,
943-
.hsiom = CYBSP_BT_HOST_WAKE_HSIOM,
942+
.driveMode = CY_GPIO_DM_STRONG_IN_OFF,
943+
.hsiom = CYBSP_BT_DEVICE_WAKE_HSIOM,
944944
.intEdge = CY_GPIO_INTR_DISABLE,
945945
.intMask = 0UL,
946946
.vtrip = CY_GPIO_VTRIP_CMOS,
@@ -953,18 +953,18 @@ const cy_stc_gpio_pin_config_t CYBSP_BT_HOST_WAKE_config =
953953
.vohSel = 0UL,
954954
};
955955
#if defined (CY_USING_HAL)
956-
const cyhal_resource_inst_t CYBSP_BT_HOST_WAKE_obj =
956+
const cyhal_resource_inst_t CYBSP_BT_DEVICE_WAKE_obj =
957957
{
958958
.type = CYHAL_RSC_GPIO,
959-
.block_num = CYBSP_BT_HOST_WAKE_PORT_NUM,
960-
.channel_num = CYBSP_BT_HOST_WAKE_PIN,
959+
.block_num = CYBSP_BT_DEVICE_WAKE_PORT_NUM,
960+
.channel_num = CYBSP_BT_DEVICE_WAKE_PIN,
961961
};
962962
#endif //defined (CY_USING_HAL)
963-
const cy_stc_gpio_pin_config_t CYBSP_BT_DEVICE_WAKE_config =
963+
const cy_stc_gpio_pin_config_t CYBSP_BT_HOST_WAKE_config =
964964
{
965965
.outVal = 0,
966-
.driveMode = CY_GPIO_DM_STRONG_IN_OFF,
967-
.hsiom = CYBSP_BT_DEVICE_WAKE_HSIOM,
966+
.driveMode = CY_GPIO_DM_HIGHZ,
967+
.hsiom = CYBSP_BT_HOST_WAKE_HSIOM,
968968
.intEdge = CY_GPIO_INTR_DISABLE,
969969
.intMask = 0UL,
970970
.vtrip = CY_GPIO_VTRIP_CMOS,
@@ -977,11 +977,11 @@ const cy_stc_gpio_pin_config_t CYBSP_BT_DEVICE_WAKE_config =
977977
.vohSel = 0UL,
978978
};
979979
#if defined (CY_USING_HAL)
980-
const cyhal_resource_inst_t CYBSP_BT_DEVICE_WAKE_obj =
980+
const cyhal_resource_inst_t CYBSP_BT_HOST_WAKE_obj =
981981
{
982982
.type = CYHAL_RSC_GPIO,
983-
.block_num = CYBSP_BT_DEVICE_WAKE_PORT_NUM,
984-
.channel_num = CYBSP_BT_DEVICE_WAKE_PIN,
983+
.block_num = CYBSP_BT_HOST_WAKE_PORT_NUM,
984+
.channel_num = CYBSP_BT_HOST_WAKE_PIN,
985985
};
986986
#endif //defined (CY_USING_HAL)
987987
const cy_stc_gpio_pin_config_t CYBSP_BT_RST_config =

‎targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CYW943012P6EVB_01/COMPONENT_BSP_DESIGN_MODUS/GeneratedSource/cycfg_pins.h

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -948,53 +948,53 @@ extern "C" {
948948
#if defined (CY_USING_HAL)
949949
#define CYBSP_BT_REG_ON_HAL_DRIVEMODE CYHAL_GPIO_DRIVE_OPENDRAINDRIVESHIGH
950950
#endif //defined (CY_USING_HAL)
951-
#define CYBSP_BT_HOST_WAKE_ENABLED 1U
952-
#define CYBSP_BT_HOST_WAKE_PORT GPIO_PRT3
953-
#define CYBSP_BT_HOST_WAKE_PORT_NUM 3U
954-
#define CYBSP_BT_HOST_WAKE_PIN 5U
955-
#define CYBSP_BT_HOST_WAKE_NUM 5U
956-
#define CYBSP_BT_HOST_WAKE_DRIVEMODE CY_GPIO_DM_HIGHZ
957-
#define CYBSP_BT_HOST_WAKE_INIT_DRIVESTATE 0
951+
#define CYBSP_BT_DEVICE_WAKE_ENABLED 1U
952+
#define CYBSP_BT_DEVICE_WAKE_PORT GPIO_PRT3
953+
#define CYBSP_BT_DEVICE_WAKE_PORT_NUM 3U
954+
#define CYBSP_BT_DEVICE_WAKE_PIN 5U
955+
#define CYBSP_BT_DEVICE_WAKE_NUM 5U
956+
#define CYBSP_BT_DEVICE_WAKE_DRIVEMODE CY_GPIO_DM_STRONG_IN_OFF
957+
#define CYBSP_BT_DEVICE_WAKE_INIT_DRIVESTATE 0
958958
#ifndef ioss_0_port_3_pin_5_HSIOM
959959
#define ioss_0_port_3_pin_5_HSIOM HSIOM_SEL_GPIO
960960
#endif
961-
#define CYBSP_BT_HOST_WAKE_HSIOM ioss_0_port_3_pin_5_HSIOM
962-
#define CYBSP_BT_HOST_WAKE_IRQ ioss_interrupts_gpio_3_IRQn
961+
#define CYBSP_BT_DEVICE_WAKE_HSIOM ioss_0_port_3_pin_5_HSIOM
962+
#define CYBSP_BT_DEVICE_WAKE_IRQ ioss_interrupts_gpio_3_IRQn
963963
#if defined (CY_USING_HAL)
964-
#define CYBSP_BT_HOST_WAKE_HAL_PORT_PIN P3_5
964+
#define CYBSP_BT_DEVICE_WAKE_HAL_PORT_PIN P3_5
965965
#endif //defined (CY_USING_HAL)
966966
#if defined (CY_USING_HAL)
967-
#define CYBSP_BT_HOST_WAKE_HAL_IRQ CYHAL_GPIO_IRQ_NONE
967+
#define CYBSP_BT_DEVICE_WAKE_HAL_IRQ CYHAL_GPIO_IRQ_NONE
968968
#endif //defined (CY_USING_HAL)
969969
#if defined (CY_USING_HAL)
970-
#define CYBSP_BT_HOST_WAKE_HAL_DIR CYHAL_GPIO_DIR_INPUT
970+
#define CYBSP_BT_DEVICE_WAKE_HAL_DIR CYHAL_GPIO_DIR_OUTPUT
971971
#endif //defined (CY_USING_HAL)
972972
#if defined (CY_USING_HAL)
973-
#define CYBSP_BT_HOST_WAKE_HAL_DRIVEMODE CYHAL_GPIO_DRIVE_NONE
973+
#define CYBSP_BT_DEVICE_WAKE_HAL_DRIVEMODE CYHAL_GPIO_DRIVE_STRONG
974974
#endif //defined (CY_USING_HAL)
975-
#define CYBSP_BT_DEVICE_WAKE_ENABLED 1U
976-
#define CYBSP_BT_DEVICE_WAKE_PORT GPIO_PRT4
977-
#define CYBSP_BT_DEVICE_WAKE_PORT_NUM 4U
978-
#define CYBSP_BT_DEVICE_WAKE_PIN 0U
979-
#define CYBSP_BT_DEVICE_WAKE_NUM 0U
980-
#define CYBSP_BT_DEVICE_WAKE_DRIVEMODE CY_GPIO_DM_STRONG_IN_OFF
981-
#define CYBSP_BT_DEVICE_WAKE_INIT_DRIVESTATE 0
975+
#define CYBSP_BT_HOST_WAKE_ENABLED 1U
976+
#define CYBSP_BT_HOST_WAKE_PORT GPIO_PRT4
977+
#define CYBSP_BT_HOST_WAKE_PORT_NUM 4U
978+
#define CYBSP_BT_HOST_WAKE_PIN 0U
979+
#define CYBSP_BT_HOST_WAKE_NUM 0U
980+
#define CYBSP_BT_HOST_WAKE_DRIVEMODE CY_GPIO_DM_HIGHZ
981+
#define CYBSP_BT_HOST_WAKE_INIT_DRIVESTATE 0
982982
#ifndef ioss_0_port_4_pin_0_HSIOM
983983
#define ioss_0_port_4_pin_0_HSIOM HSIOM_SEL_GPIO
984984
#endif
985-
#define CYBSP_BT_DEVICE_WAKE_HSIOM ioss_0_port_4_pin_0_HSIOM
986-
#define CYBSP_BT_DEVICE_WAKE_IRQ ioss_interrupts_gpio_4_IRQn
985+
#define CYBSP_BT_HOST_WAKE_HSIOM ioss_0_port_4_pin_0_HSIOM
986+
#define CYBSP_BT_HOST_WAKE_IRQ ioss_interrupts_gpio_4_IRQn
987987
#if defined (CY_USING_HAL)
988-
#define CYBSP_BT_DEVICE_WAKE_HAL_PORT_PIN P4_0
988+
#define CYBSP_BT_HOST_WAKE_HAL_PORT_PIN P4_0
989989
#endif //defined (CY_USING_HAL)
990990
#if defined (CY_USING_HAL)
991-
#define CYBSP_BT_DEVICE_WAKE_HAL_IRQ CYHAL_GPIO_IRQ_NONE
991+
#define CYBSP_BT_HOST_WAKE_HAL_IRQ CYHAL_GPIO_IRQ_NONE
992992
#endif //defined (CY_USING_HAL)
993993
#if defined (CY_USING_HAL)
994-
#define CYBSP_BT_DEVICE_WAKE_HAL_DIR CYHAL_GPIO_DIR_OUTPUT
994+
#define CYBSP_BT_HOST_WAKE_HAL_DIR CYHAL_GPIO_DIR_INPUT
995995
#endif //defined (CY_USING_HAL)
996996
#if defined (CY_USING_HAL)
997-
#define CYBSP_BT_DEVICE_WAKE_HAL_DRIVEMODE CYHAL_GPIO_DRIVE_STRONG
997+
#define CYBSP_BT_HOST_WAKE_HAL_DRIVEMODE CYHAL_GPIO_DRIVE_NONE
998998
#endif //defined (CY_USING_HAL)
999999
#define CYBSP_BT_RST_ENABLED 1U
10001000
#define CYBSP_BT_RST_PORT GPIO_PRT4
@@ -1653,14 +1653,14 @@ extern const cy_stc_gpio_pin_config_t CYBSP_BT_REG_ON_config;
16531653
#if defined (CY_USING_HAL)
16541654
extern const cyhal_resource_inst_t CYBSP_BT_REG_ON_obj;
16551655
#endif //defined (CY_USING_HAL)
1656-
extern const cy_stc_gpio_pin_config_t CYBSP_BT_HOST_WAKE_config;
1657-
#if defined (CY_USING_HAL)
1658-
extern const cyhal_resource_inst_t CYBSP_BT_HOST_WAKE_obj;
1659-
#endif //defined (CY_USING_HAL)
16601656
extern const cy_stc_gpio_pin_config_t CYBSP_BT_DEVICE_WAKE_config;
16611657
#if defined (CY_USING_HAL)
16621658
extern const cyhal_resource_inst_t CYBSP_BT_DEVICE_WAKE_obj;
16631659
#endif //defined (CY_USING_HAL)
1660+
extern const cy_stc_gpio_pin_config_t CYBSP_BT_HOST_WAKE_config;
1661+
#if defined (CY_USING_HAL)
1662+
extern const cyhal_resource_inst_t CYBSP_BT_HOST_WAKE_obj;
1663+
#endif //defined (CY_USING_HAL)
16641664
extern const cy_stc_gpio_pin_config_t CYBSP_BT_RST_config;
16651665
#if defined (CY_USING_HAL)
16661666
extern const cyhal_resource_inst_t CYBSP_BT_RST_obj;

‎targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CYW943012P6EVB_01/COMPONENT_BSP_DESIGN_MODUS/design.modus

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -424,8 +424,8 @@
424424
<Param id="sioOutputBuffer" value="true"/>
425425
<Param id="inFlash" value="true"/>
426426
</Block>
427-
<Block location="ioss[0].port[3].pin[5]" alias="CYBSP_BT_HOST_WAKE" template="mxs40pin" version="1.1">
428-
<Param id="DriveModes" value="CY_GPIO_DM_HIGHZ"/>
427+
<Block location="ioss[0].port[3].pin[5]" alias="CYBSP_BT_DEVICE_WAKE" template="mxs40pin" version="1.1">
428+
<Param id="DriveModes" value="CY_GPIO_DM_STRONG_IN_OFF"/>
429429
<Param id="initialState" value="0"/>
430430
<Param id="vtrip" value="CY_GPIO_VTRIP_CMOS"/>
431431
<Param id="isrTrigger" value="CY_GPIO_INTR_DISABLE"/>
@@ -434,8 +434,8 @@
434434
<Param id="sioOutputBuffer" value="true"/>
435435
<Param id="inFlash" value="true"/>
436436
</Block>
437-
<Block location="ioss[0].port[4].pin[0]" alias="CYBSP_BT_DEVICE_WAKE" template="mxs40pin" version="1.1">
438-
<Param id="DriveModes" value="CY_GPIO_DM_STRONG_IN_OFF"/>
437+
<Block location="ioss[0].port[4].pin[0]" alias="CYBSP_BT_HOST_WAKE" template="mxs40pin" version="1.1">
438+
<Param id="DriveModes" value="CY_GPIO_DM_HIGHZ"/>
439439
<Param id="initialState" value="0"/>
440440
<Param id="vtrip" value="CY_GPIO_VTRIP_CMOS"/>
441441
<Param id="isrTrigger" value="CY_GPIO_INTR_DISABLE"/>

‎targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CYW943012P6EVB_01/cybsp_types.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,10 +127,10 @@ extern "C" {
127127

128128
/** Pin: BT Power */
129129
#define CYBSP_BT_POWER (P3_4)
130-
/** Pin: BT Host Wakeup */
131-
#define CYBSP_BT_HOST_WAKE (P3_5)
132130
/** Pin: BT Device Wakeup */
133-
#define CYBSP_BT_DEVICE_WAKE (P4_0)
131+
#define CYBSP_BT_DEVICE_WAKE (P3_5)
132+
/** Pin: BT Host Wakeup */
133+
#define CYBSP_BT_HOST_WAKE (P4_0)
134134

135135
/** Pin: UART RX */
136136
#define CYBSP_DEBUG_UART_RX (P13_0)

0 commit comments

Comments
 (0)