Skip to content

Commit 2d30d0f

Browse files
authored
Merge pull request #9762 from vmedcy/psoc6-target-updates
PSOC6: update the psoc6pdl and HAL to the latest version
2 parents 4b83fe1 + 06354bf commit 2d30d0f

File tree

105 files changed

+3362
-3253
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

105 files changed

+3362
-3253
lines changed

features/FEATURE_BLE/targets/TARGET_Cypress/TARGET_CYW43XXX/HCIDriver.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,10 @@ class HCIDriver : public cordio::CordioHCIDriver {
7575

7676
virtual void do_initialize()
7777
{
78-
79-
Cy_GPIO_Clr(BT_DEVICE_WAKE_PORT, BT_DEVICE_WAKE_PIN);
78+
bt_device_wake = 0;
8079
wait_ms(500);
8180

82-
Cy_GPIO_Set(BT_POWER_PORT, BT_POWER_PIN);
81+
bt_power = 1;
8382
wait_ms(500);
8483
}
8584

targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CY8CKIT_062_4343W/GeneratedSource/cycfg.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,5 @@ void init_cycfg_all(void)
3030
init_cycfg_peripherals();
3131
init_cycfg_pins();
3232
init_cycfg_platform();
33-
init_cycfg_connectivity();
33+
init_cycfg_routing();
3434
}

targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CY8CKIT_062_4343W/GeneratedSource/cycfg.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ extern "C" {
3434
#include "cycfg_peripherals.h"
3535
#include "cycfg_pins.h"
3636
#include "cycfg_platform.h"
37-
#include "cycfg_connectivity.h"
37+
#include "cycfg_routing.h"
3838

3939
void init_cycfg_all(void);
4040

targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CY8CKIT_062_4343W/GeneratedSource/cycfg_peripherals.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
#include "cy_mcwdt.h"
3636
#include "cy_rtc.h"
3737
#include "cy_tcpwm_pwm.h"
38-
#include "cycfg_connectivity.h"
38+
#include "cycfg_routing.h"
3939
#include "cy_usbfs_dev_drv.h"
4040

4141
#if defined(__cplusplus)

targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CY8CKIT_062_4343W/GeneratedSource/cycfg_pins.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
#include "cycfg_notices.h"
2929
#include "cy_gpio.h"
30-
#include "cycfg_connectivity.h"
30+
#include "cycfg_routing.h"
3131

3232
#if defined(__cplusplus)
3333
extern "C" {
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* File Name: cycfg_connectivity.c
2+
* File Name: cycfg_routing.c
33
*
44
* Description:
55
* Establishes all necessary connections between hardware elements.
@@ -22,11 +22,11 @@
2222
* limitations under the License.
2323
********************************************************************************/
2424

25-
#include "cycfg_connectivity.h"
25+
#include "cycfg_routing.h"
2626

2727
#include "cy_device_headers.h"
2828

29-
void init_cycfg_connectivity(void)
29+
void init_cycfg_routing(void)
3030
{
3131
HSIOM->AMUX_SPLIT_CTL[2] = HSIOM_V2_AMUX_SPLIT_CTL_SWITCH_AA_SL_Msk |
3232
HSIOM_V2_AMUX_SPLIT_CTL_SWITCH_AA_SR_Msk |
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* File Name: cycfg_connectivity.h
2+
* File Name: cycfg_routing.h
33
*
44
* Description:
55
* Establishes all necessary connections between hardware elements.
@@ -22,16 +22,16 @@
2222
* limitations under the License.
2323
********************************************************************************/
2424

25-
#if !defined(CYCFG_CONNECTIVITY_H)
26-
#define CYCFG_CONNECTIVITY_H
25+
#if !defined(CYCFG_ROUTING_H)
26+
#define CYCFG_ROUTING_H
2727

2828
#if defined(__cplusplus)
2929
extern "C" {
3030
#endif
3131

3232
#include "cycfg_notices.h"
33-
void init_cycfg_connectivity(void);
34-
33+
void init_cycfg_routing(void);
34+
#define init_cycfg_connectivity() init_cycfg_routing()
3535
#define ioss_0_port_11_pin_1_HSIOM P11_1_TCPWM1_LINE_COMPL1
3636
#define ioss_0_port_11_pin_2_HSIOM P11_2_SMIF_SPI_SELECT0
3737
#define ioss_0_port_11_pin_3_HSIOM P11_3_SMIF_SPI_DATA3
@@ -73,4 +73,4 @@ void init_cycfg_connectivity(void);
7373
#endif
7474

7575

76-
#endif /* CYCFG_CONNECTIVITY_H */
76+
#endif /* CYCFG_ROUTING_H */

targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CY8CKIT_062_BLE/GeneratedSource/cycfg.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,5 @@ void init_cycfg_all(void)
3030
init_cycfg_peripherals();
3131
init_cycfg_pins();
3232
init_cycfg_platform();
33-
init_cycfg_connectivity();
33+
init_cycfg_routing();
3434
}

targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CY8CKIT_062_BLE/GeneratedSource/cycfg.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ extern "C" {
3434
#include "cycfg_peripherals.h"
3535
#include "cycfg_pins.h"
3636
#include "cycfg_platform.h"
37-
#include "cycfg_connectivity.h"
37+
#include "cycfg_routing.h"
3838

3939
void init_cycfg_all(void);
4040

targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CY8CKIT_062_BLE/GeneratedSource/cycfg_pins.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
#include "cycfg_notices.h"
2929
#include "cy_gpio.h"
30-
#include "cycfg_connectivity.h"
30+
#include "cycfg_routing.h"
3131

3232
#if defined(__cplusplus)
3333
extern "C" {

0 commit comments

Comments
 (0)