Merge pull request ARMmbed#11646 from kyle-cypress/pr/bt-wake-swap

Fix swapped BT pins on CYW943012P6EVB-01
hugueskamba · Oct 16, 2019 · 8c86052 · 8c86052
2 parents 58fe0ba + 4619f92
commit 8c86052
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 49 deletions.
diff --git a/...ET_PSOC6/TARGET_CYW943012P6EVB_01/COMPONENT_BSP_DESIGN_MODUS/GeneratedSource/cycfg_pins.c b/...ET_PSOC6/TARGET_CYW943012P6EVB_01/COMPONENT_BSP_DESIGN_MODUS/GeneratedSource/cycfg_pins.c
@@ -936,11 +936,11 @@ const cy_stc_gpio_pin_config_t CYBSP_BT_REG_ON_config =
  .channel_num = CYBSP_BT_REG_ON_PIN,
  };
 #endif //defined (CY_USING_HAL)
-const cy_stc_gpio_pin_config_t CYBSP_BT_HOST_WAKE_config = 
+const cy_stc_gpio_pin_config_t CYBSP_BT_DEVICE_WAKE_config = 
 {
  .outVal = 0,
- .driveMode = CY_GPIO_DM_HIGHZ,
- .hsiom = CYBSP_BT_HOST_WAKE_HSIOM,
+ .driveMode = CY_GPIO_DM_STRONG_IN_OFF,
+ .hsiom = CYBSP_BT_DEVICE_WAKE_HSIOM,
  .intEdge = CY_GPIO_INTR_DISABLE,
  .intMask = 0UL,
  .vtrip = CY_GPIO_VTRIP_CMOS,
@@ -953,18 +953,18 @@ const cy_stc_gpio_pin_config_t CYBSP_BT_HOST_WAKE_config =
  .vohSel = 0UL,
 };
 #if defined (CY_USING_HAL)
- const cyhal_resource_inst_t CYBSP_BT_HOST_WAKE_obj = 
+ const cyhal_resource_inst_t CYBSP_BT_DEVICE_WAKE_obj = 
  {
  .type = CYHAL_RSC_GPIO,
- .block_num = CYBSP_BT_HOST_WAKE_PORT_NUM,
- .channel_num = CYBSP_BT_HOST_WAKE_PIN,
+ .block_num = CYBSP_BT_DEVICE_WAKE_PORT_NUM,
+ .channel_num = CYBSP_BT_DEVICE_WAKE_PIN,
  };
 #endif //defined (CY_USING_HAL)
-const cy_stc_gpio_pin_config_t CYBSP_BT_DEVICE_WAKE_config = 
+const cy_stc_gpio_pin_config_t CYBSP_BT_HOST_WAKE_config = 
 {
  .outVal = 0,
- .driveMode = CY_GPIO_DM_STRONG_IN_OFF,
- .hsiom = CYBSP_BT_DEVICE_WAKE_HSIOM,
+ .driveMode = CY_GPIO_DM_HIGHZ,
+ .hsiom = CYBSP_BT_HOST_WAKE_HSIOM,
  .intEdge = CY_GPIO_INTR_DISABLE,
  .intMask = 0UL,
  .vtrip = CY_GPIO_VTRIP_CMOS,
@@ -977,11 +977,11 @@ const cy_stc_gpio_pin_config_t CYBSP_BT_DEVICE_WAKE_config =
  .vohSel = 0UL,
 };
 #if defined (CY_USING_HAL)
- const cyhal_resource_inst_t CYBSP_BT_DEVICE_WAKE_obj = 
+ const cyhal_resource_inst_t CYBSP_BT_HOST_WAKE_obj = 
  {
  .type = CYHAL_RSC_GPIO,
- .block_num = CYBSP_BT_DEVICE_WAKE_PORT_NUM,
- .channel_num = CYBSP_BT_DEVICE_WAKE_PIN,
+ .block_num = CYBSP_BT_HOST_WAKE_PORT_NUM,
+ .channel_num = CYBSP_BT_HOST_WAKE_PIN,
  };
 #endif //defined (CY_USING_HAL)
 const cy_stc_gpio_pin_config_t CYBSP_BT_RST_config = 

diff --git a/...ET_PSOC6/TARGET_CYW943012P6EVB_01/COMPONENT_BSP_DESIGN_MODUS/GeneratedSource/cycfg_pins.h b/...ET_PSOC6/TARGET_CYW943012P6EVB_01/COMPONENT_BSP_DESIGN_MODUS/GeneratedSource/cycfg_pins.h
@@ -948,53 +948,53 @@ extern "C" {
 #if defined (CY_USING_HAL)
  #define CYBSP_BT_REG_ON_HAL_DRIVEMODE CYHAL_GPIO_DRIVE_OPENDRAINDRIVESHIGH
 #endif //defined (CY_USING_HAL)
-#define CYBSP_BT_HOST_WAKE_ENABLED 1U
-#define CYBSP_BT_HOST_WAKE_PORT GPIO_PRT3
-#define CYBSP_BT_HOST_WAKE_PORT_NUM 3U
-#define CYBSP_BT_HOST_WAKE_PIN 5U
-#define CYBSP_BT_HOST_WAKE_NUM 5U
-#define CYBSP_BT_HOST_WAKE_DRIVEMODE CY_GPIO_DM_HIGHZ
-#define CYBSP_BT_HOST_WAKE_INIT_DRIVESTATE 0
+#define CYBSP_BT_DEVICE_WAKE_ENABLED 1U
+#define CYBSP_BT_DEVICE_WAKE_PORT GPIO_PRT3
+#define CYBSP_BT_DEVICE_WAKE_PORT_NUM 3U
+#define CYBSP_BT_DEVICE_WAKE_PIN 5U
+#define CYBSP_BT_DEVICE_WAKE_NUM 5U
+#define CYBSP_BT_DEVICE_WAKE_DRIVEMODE CY_GPIO_DM_STRONG_IN_OFF
+#define CYBSP_BT_DEVICE_WAKE_INIT_DRIVESTATE 0
 #ifndef ioss_0_port_3_pin_5_HSIOM
  #define ioss_0_port_3_pin_5_HSIOM HSIOM_SEL_GPIO
 #endif
-#define CYBSP_BT_HOST_WAKE_HSIOM ioss_0_port_3_pin_5_HSIOM
-#define CYBSP_BT_HOST_WAKE_IRQ ioss_interrupts_gpio_3_IRQn
+#define CYBSP_BT_DEVICE_WAKE_HSIOM ioss_0_port_3_pin_5_HSIOM
+#define CYBSP_BT_DEVICE_WAKE_IRQ ioss_interrupts_gpio_3_IRQn
 #if defined (CY_USING_HAL)
- #define CYBSP_BT_HOST_WAKE_HAL_PORT_PIN P3_5
+ #define CYBSP_BT_DEVICE_WAKE_HAL_PORT_PIN P3_5
 #endif //defined (CY_USING_HAL)
 #if defined (CY_USING_HAL)
- #define CYBSP_BT_HOST_WAKE_HAL_IRQ CYHAL_GPIO_IRQ_NONE
+ #define CYBSP_BT_DEVICE_WAKE_HAL_IRQ CYHAL_GPIO_IRQ_NONE
 #endif //defined (CY_USING_HAL)
 #if defined (CY_USING_HAL)
- #define CYBSP_BT_HOST_WAKE_HAL_DIR CYHAL_GPIO_DIR_INPUT 
+ #define CYBSP_BT_DEVICE_WAKE_HAL_DIR CYHAL_GPIO_DIR_OUTPUT 
 #endif //defined (CY_USING_HAL)
 #if defined (CY_USING_HAL)
- #define CYBSP_BT_HOST_WAKE_HAL_DRIVEMODE CYHAL_GPIO_DRIVE_NONE
+ #define CYBSP_BT_DEVICE_WAKE_HAL_DRIVEMODE CYHAL_GPIO_DRIVE_STRONG
 #endif //defined (CY_USING_HAL)
-#define CYBSP_BT_DEVICE_WAKE_ENABLED 1U
-#define CYBSP_BT_DEVICE_WAKE_PORT GPIO_PRT4
-#define CYBSP_BT_DEVICE_WAKE_PORT_NUM 4U
-#define CYBSP_BT_DEVICE_WAKE_PIN 0U
-#define CYBSP_BT_DEVICE_WAKE_NUM 0U
-#define CYBSP_BT_DEVICE_WAKE_DRIVEMODE CY_GPIO_DM_STRONG_IN_OFF
-#define CYBSP_BT_DEVICE_WAKE_INIT_DRIVESTATE 0
+#define CYBSP_BT_HOST_WAKE_ENABLED 1U
+#define CYBSP_BT_HOST_WAKE_PORT GPIO_PRT4
+#define CYBSP_BT_HOST_WAKE_PORT_NUM 4U
+#define CYBSP_BT_HOST_WAKE_PIN 0U
+#define CYBSP_BT_HOST_WAKE_NUM 0U
+#define CYBSP_BT_HOST_WAKE_DRIVEMODE CY_GPIO_DM_HIGHZ
+#define CYBSP_BT_HOST_WAKE_INIT_DRIVESTATE 0
 #ifndef ioss_0_port_4_pin_0_HSIOM
  #define ioss_0_port_4_pin_0_HSIOM HSIOM_SEL_GPIO
 #endif
-#define CYBSP_BT_DEVICE_WAKE_HSIOM ioss_0_port_4_pin_0_HSIOM
-#define CYBSP_BT_DEVICE_WAKE_IRQ ioss_interrupts_gpio_4_IRQn
+#define CYBSP_BT_HOST_WAKE_HSIOM ioss_0_port_4_pin_0_HSIOM
+#define CYBSP_BT_HOST_WAKE_IRQ ioss_interrupts_gpio_4_IRQn
 #if defined (CY_USING_HAL)
- #define CYBSP_BT_DEVICE_WAKE_HAL_PORT_PIN P4_0
+ #define CYBSP_BT_HOST_WAKE_HAL_PORT_PIN P4_0
 #endif //defined (CY_USING_HAL)
 #if defined (CY_USING_HAL)
- #define CYBSP_BT_DEVICE_WAKE_HAL_IRQ CYHAL_GPIO_IRQ_NONE
+ #define CYBSP_BT_HOST_WAKE_HAL_IRQ CYHAL_GPIO_IRQ_NONE
 #endif //defined (CY_USING_HAL)
 #if defined (CY_USING_HAL)
- #define CYBSP_BT_DEVICE_WAKE_HAL_DIR CYHAL_GPIO_DIR_OUTPUT 
+ #define CYBSP_BT_HOST_WAKE_HAL_DIR CYHAL_GPIO_DIR_INPUT 
 #endif //defined (CY_USING_HAL)
 #if defined (CY_USING_HAL)
- #define CYBSP_BT_DEVICE_WAKE_HAL_DRIVEMODE CYHAL_GPIO_DRIVE_STRONG
+ #define CYBSP_BT_HOST_WAKE_HAL_DRIVEMODE CYHAL_GPIO_DRIVE_NONE
 #endif //defined (CY_USING_HAL)
 #define CYBSP_BT_RST_ENABLED 1U
 #define CYBSP_BT_RST_PORT GPIO_PRT4
@@ -1653,14 +1653,14 @@ extern const cy_stc_gpio_pin_config_t CYBSP_BT_REG_ON_config;
 #if defined (CY_USING_HAL)
  extern const cyhal_resource_inst_t CYBSP_BT_REG_ON_obj;
 #endif //defined (CY_USING_HAL)
-extern const cy_stc_gpio_pin_config_t CYBSP_BT_HOST_WAKE_config;
-#if defined (CY_USING_HAL)
- extern const cyhal_resource_inst_t CYBSP_BT_HOST_WAKE_obj;
-#endif //defined (CY_USING_HAL)
 extern const cy_stc_gpio_pin_config_t CYBSP_BT_DEVICE_WAKE_config;
 #if defined (CY_USING_HAL)
  extern const cyhal_resource_inst_t CYBSP_BT_DEVICE_WAKE_obj;
 #endif //defined (CY_USING_HAL)
+extern const cy_stc_gpio_pin_config_t CYBSP_BT_HOST_WAKE_config;
+#if defined (CY_USING_HAL)
+ extern const cyhal_resource_inst_t CYBSP_BT_HOST_WAKE_obj;
+#endif //defined (CY_USING_HAL)
 extern const cy_stc_gpio_pin_config_t CYBSP_BT_RST_config;
 #if defined (CY_USING_HAL)
  extern const cyhal_resource_inst_t CYBSP_BT_RST_obj;

diff --git a/...GET_Cypress/TARGET_PSOC6/TARGET_CYW943012P6EVB_01/COMPONENT_BSP_DESIGN_MODUS/design.modus b/...GET_Cypress/TARGET_PSOC6/TARGET_CYW943012P6EVB_01/COMPONENT_BSP_DESIGN_MODUS/design.modus
@@ -424,8 +424,8 @@
  <Param id="sioOutputBuffer" value="true"/>
  <Param id="inFlash" value="true"/>
  </Block>
- <Block location="ioss[0].port[3].pin[5]" alias="CYBSP_BT_HOST_WAKE" template="mxs40pin" version="1.1">
- <Param id="DriveModes" value="CY_GPIO_DM_HIGHZ"/>
+ <Block location="ioss[0].port[3].pin[5]" alias="CYBSP_BT_DEVICE_WAKE" template="mxs40pin" version="1.1">
+ <Param id="DriveModes" value="CY_GPIO_DM_STRONG_IN_OFF"/>
  <Param id="initialState" value="0"/>
  <Param id="vtrip" value="CY_GPIO_VTRIP_CMOS"/>
  <Param id="isrTrigger" value="CY_GPIO_INTR_DISABLE"/>
@@ -434,8 +434,8 @@
  <Param id="sioOutputBuffer" value="true"/>
  <Param id="inFlash" value="true"/>
  </Block>
- <Block location="ioss[0].port[4].pin[0]" alias="CYBSP_BT_DEVICE_WAKE" template="mxs40pin" version="1.1">
- <Param id="DriveModes" value="CY_GPIO_DM_STRONG_IN_OFF"/>
+ <Block location="ioss[0].port[4].pin[0]" alias="CYBSP_BT_HOST_WAKE" template="mxs40pin" version="1.1">
+ <Param id="DriveModes" value="CY_GPIO_DM_HIGHZ"/>
  <Param id="initialState" value="0"/>
  <Param id="vtrip" value="CY_GPIO_VTRIP_CMOS"/>
  <Param id="isrTrigger" value="CY_GPIO_INTR_DISABLE"/>

diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CYW943012P6EVB_01/cybsp_types.h b/targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CYW943012P6EVB_01/cybsp_types.h
@@ -127,10 +127,10 @@ extern "C" {
 
 /** Pin: BT Power */
 #define CYBSP_BT_POWER (P3_4)
-/** Pin: BT Host Wakeup */
-#define CYBSP_BT_HOST_WAKE (P3_5)
 /** Pin: BT Device Wakeup */
-#define CYBSP_BT_DEVICE_WAKE (P4_0)
+#define CYBSP_BT_DEVICE_WAKE (P3_5)
+/** Pin: BT Host Wakeup */
+#define CYBSP_BT_HOST_WAKE (P4_0)
 
 /** Pin: UART RX */
 #define CYBSP_DEBUG_UART_RX (P13_0)