Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Infineon] Code Cleanup and Fix for Build Clean #22982

Merged
merged 1 commit into from
Sep 30, 2022
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
[Infineon] Code Cleanup and Fix for Build Clean
dey-r committed Sep 30, 2022
commit 32b307aa5a1f62b4d86226cfdb1a6eb63425c84d
1 change: 0 additions & 1 deletion examples/lock-app/infineon/psoc6/src/AppTask.cpp
Original file line number Diff line number Diff line change
@@ -21,7 +21,6 @@
#include "AppEvent.h"
#include "ButtonHandler.h"
#include "LEDWidget.h"
#include "qrcodegen.h"
#include <app-common/zap-generated/af-structs.h>
#include <app-common/zap-generated/attribute-id.h>
#include <app-common/zap-generated/attribute-type.h>
3 changes: 2 additions & 1 deletion scripts/build/build/__init__.py
Original file line number Diff line number Diff line change
@@ -68,7 +68,8 @@ def Build(self):
def CleanOutputDirectories(self):
for builder in self.builders:
logging.warn('Cleaning %s', builder.output_dir)
shutil.rmtree(builder.output_dir)
if os.path.exists(builder.output_dir):
shutil.rmtree(builder.output_dir)

# any generated output was cleaned
self.completed_steps.discard(BuildSteps.GENERATED)
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@
#include <lib/support/logging/CHIPLogging.h>

#include "DeviceNetworkProvisioningDelegateImpl.h"
#include "platform/Infineon/PSOC6/P6Utils.h"
#include <platform/Infineon/PSOC6/P6Utils.h>

namespace chip {
namespace DeviceLayer {
3 changes: 2 additions & 1 deletion src/platform/Infineon/PSOC6/DiagnosticDataProviderImpl.cpp
Original file line number Diff line number Diff line change
@@ -250,7 +250,8 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetWiFiVersion(uint8_t & wiFiVersion)
whd_security_t security;
cy_rslt_t result = CY_RSLT_SUCCESS;

if (whd_wifi_get_ap_info(whd_ifs[CY_WCM_INTERFACE_TYPE_STA], &bss_info, &security) != CY_RSLT_SUCCESS)
result = whd_wifi_get_ap_info(whd_ifs[CY_WCM_INTERFACE_TYPE_STA], &bss_info, &security);
if (result != CY_RSLT_SUCCESS)
{
ChipLogError(DeviceLayer, "whd_wifi_get_ap_info failed: %d", (int) result);
SuccessOrExit(CHIP_ERROR_INTERNAL);