Skip to content

Commit a18f77d

Browse files
config: tools: Rename psoc to psoc6.
Signed-off-by: Ramya Subramanyam <[email protected]>
1 parent 8ec7c8f commit a18f77d

File tree

6 files changed

+12
-13
lines changed

6 files changed

+12
-13
lines changed

Makefile

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

44

55

6-
FQBN ?= infineon:psoc:cy8ckit_062s2_ai
6+
FQBN ?= infineon:psoc6:cy8ckit_062s2_ai
77
TARGET ?= test_interrupts_single
88

99

config/project.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,26 @@
11
build:
2-
build-psoc-cy8ckit_062s2_ai:
2+
build-psoc6-cy8ckit_062s2_ai:
33
description: Compiling test_digitalio_single.cpp for PSOC6 platform
44
target: test_digitalio_single
5-
fqbn: infineon:psoc:cy8ckit_062s2_ai
5+
fqbn: infineon:psoc6:cy8ckit_062s2_ai
66

77
check:
88
check-clang-tidy:
99
description: clang-tidy check sources
1010
tool: clang-tidy
11-
command: tools/code_checks/run_clang_tidy.sh ./cores/psoc/*
11+
command: tools/code_checks/run_clang_tidy.sh ./cores/psoc6/* ./libraries/*
1212

1313
check-cppcheck:
1414
description: cppcheck check sources
1515
tool: cppcheck
16-
command: tools/code_checks/run_cppcheck.sh ./cores/psoc/* -Iextras/arduino-core-api/api -Ivariants/CY8CKIT-062S2-AI/mtb-bsp -Iextras/mtb-libs/core-lib/include --suppress=*:extras/arduino-core-api/api/* --suppress=*:variants/CY8CKIT-062S2-AI/mtb-bsp/* --suppress=*:extras/mtb-libs/core-lib/include/*
16+
command: tools/code_checks/run_cppcheck.sh ./cores/psoc6/* ./libraries/*
17+
| -I extras/arduino-core-api/api/ -I variants/CY8CKIT-062S2-AI/mtb-bsp -I extras/mtb-libs/core-lib/include
18+
| --suppress=*:extras/arduino-core-api/api/* --suppress=*:variants/CY8CKIT-062S2-AI/mtb-bsp/* --suppress=*:extras/mtb-libs/core-lib/include/*
1719

1820
clang-format:
1921
description: clang-tidy check sources
2022
tool: clang-format
21-
command: tools/code_checks/run_clang_format.sh ./cores/psoc/* ./libraries/*
23+
command: tools/code_checks/run_clang_format.sh ./cores/psoc6/* ./libraries/*
2224

2325
black-format:
2426
description: clang-tidy check sources

config/user.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ check:
55
- black-format
66

77
build:
8-
- build-psoc-cy8ckit_062s2_ai
8+
- build-psoc6-cy8ckit_062s2_ai

tools/code_checks/run_clang_tidy.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,6 @@ for pattern in $*; do
112112
for file in $file_list; do
113113
file_base=`basename $file`
114114

115-
# echo "$unbuffer clang-tidy $checks $config_file $export_fixes $extra_arg $fix $header_filter $quiet $system_headers $use_color $warnings_as_errors $file -- 2>&1 | tee $output_dir/$file_prefix.$file_base.log"
116115
$unbuffer clang-tidy $checks $config_file $export_fixes $extra_arg $fix $header_filter $quiet $system_headers $use_color $warnings_as_errors $file -- $excludes $includes 2>&1 | tee $output_dir/$file_prefix.$file_base.log
117116

118117
fileReturnValue=${PIPESTATUS[0]}

tools/code_checks/run_cppcheck.sh

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ fi
9696

9797
if [ ! -d "$output_dir" ]; then
9898
mkdir -p $output_dir/html-report
99+
mkdir -p $output_dir/build
99100
fi
100101

101102

@@ -120,14 +121,11 @@ echo "use-shell-color : $use_shell_color"
120121
echo ""
121122

122123

123-
# echo "cppcheck $addon --check-level=$check_level $enable --error-exitcode=$error_exitcode $exitcode_suppressions $file_filter $file_list --inconclusive \
124-
# --max-configs=$max_configs --std=$std $suppress --xml 2> $output_dir/cppcheck-errors.xml $* | tee $output_dir/$file_prefix.log"
125-
126124
returnValue=0
127125

128126

129127
$unbuffer cppcheck $addon $check_level $enable $error_exitcode $excludes $exitcode_suppressions $file_filter $file_list $includes $inconclusive \
130-
$max_configs $std $suppress $suppressions_list --xml --output-file=$output_dir/$file_prefix-errors.xml $* 2>&1 | tee $output_dir/$file_prefix.log
128+
$max_configs $std $suppress $suppressions_list --cppcheck-build-dir=$output_dir/build -j4 --xml --output-file=$output_dir/$file_prefix-errors.xml $* 2>&1 | tee $output_dir/$file_prefix.log
131129
returnValue=${PIPESTATUS[0]}
132130

133131
echo "" | tee -a $output_dir/$file_prefix.log

tools/verifygitlog.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ulimit -n 1024
1313
# commit formatting
1414

1515
function ci_commit_formatting_run {
16-
git remote add upstream https://github.com/Infineon/arduino-core-psoc.git
16+
git remote add upstream https://github.com/Infineon/arduino-core-psoc6.git
1717
git fetch --depth=100 upstream main
1818
# If the common ancestor commit hasn't been found, fetch more.
1919
git merge-base upstream/main HEAD || git fetch upstream main

0 commit comments

Comments
 (0)