Skip to content

Commit

Permalink
Merge remote-tracking branch 'remotes/upstream/main' into fix/gh-761
Browse files Browse the repository at this point in the history
  • Loading branch information
Jake-Carter committed Nov 29, 2023
2 parents 81837cc + 2203af7 commit c24e810
Show file tree
Hide file tree
Showing 8,842 changed files with 301,514 additions and 1,731,108 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 1 addition & 1 deletion Documentation/build.py
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ class CommonExampleInfo(ExampleInfo):
print(f.name)
if (f.name != "README.md"): shutil.copy(f, here) # Workaround for https://github.com/mkdocs/mkdocs/issues/3313

(here / "Libraries" / "CLI").mkdir(exist_ok=True)
(here / "Libraries" / "CLI").mkdir(exist_ok=True, parents=True)
shutil.copy(Path("Libraries") / "CLI" / "README.md", here / "Libraries" / "CLI" / "README.md") # TODO: Less hard-coded way of pulling these in

# String replace "##__EXAMPLES_LIST__##" with autogenerated tables
Expand Down
4 changes: 3 additions & 1 deletion Examples/MAX32520/AES/.vscode/flash.gdb
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
define flash_m4
set architecture armv7e-m
set remotetimeout 10
target remote | openocd -c "gdb_port pipe;log_output flash.log" -s $arg0/scripts -f interface/$arg1 -f target/$arg2 -c "init; reset halt"
load
compare-sections
Expand All @@ -8,8 +9,9 @@ end

define flash_m4_run
set architecture armv7e-m
set remotetimeout 10
target remote | openocd -c "gdb_port pipe;log_output flash.log" -s $arg0/scripts -f interface/$arg1 -f target/$arg2 -c "init; reset halt"
load
compare-sections
monitor resume
end
end
2 changes: 1 addition & 1 deletion Examples/MAX32520/AES/.vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"terminal.integrated.env.windows": {
"Path":"${config:OCD_path};${config:ARM_GCC_path}/bin;${config:xPack_GCC_path}/bin;${config:Make_path};${config:MSYS_path}/usr/bin;${env:PATH}",
"Path":"${config:OCD_path};${config:ARM_GCC_path}/bin;${config:xPack_GCC_path}/bin;${config:MSYS_path}/usr/bin;${config:Make_path};${env:PATH}",
"MAXIM_PATH":"${config:MAXIM_PATH}"
},
"terminal.integrated.defaultProfile.windows": "Command Prompt",
Expand Down
24 changes: 21 additions & 3 deletions Examples/MAX32520/AES/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
################################################################################
# Copyright (C) 2023 Maxim Integrated Products, Inc., All Rights Reserved.
###############################################################################
#
# Copyright (C) 2022-2023 Maxim Integrated Products, Inc., All Rights Reserved.
# (now owned by Analog Devices, Inc.)
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
Expand Down Expand Up @@ -29,7 +31,23 @@
# property whatsoever. Maxim Integrated Products, Inc. retains all
# ownership rights.
#
###############################################################################
##############################################################################
#
# Copyright 2023 Analog Devices, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
##############################################################################

# ** Readme! **
# Don't edit this file! This is the core Makefile for a MaximSDK
Expand Down
20 changes: 19 additions & 1 deletion Examples/MAX32520/AES/main.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
/******************************************************************************
* Copyright (C) 2023 Maxim Integrated Products, Inc., All Rights Reserved.
*
* Copyright (C) 2022-2023 Maxim Integrated Products, Inc., All Rights Reserved.
* (now owned by Analog Devices, Inc.)
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
Expand Down Expand Up @@ -29,6 +31,22 @@
* property whatsoever. Maxim Integrated Products, Inc. retains all
* ownership rights.
*
******************************************************************************
*
* Copyright 2023 Analog Devices, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
******************************************************************************/

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuildCommandParser" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser" keep-relative-paths="false" name="CDT GCC Build Output Parser" parameter="${PREFIX}(g?cc)|([gc]\+\+)|(clang)" prefer-non-shared="true"/>
<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="true" env-hash="-99955491804503126" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${GCC_PREFIX}gcc ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot; -DARM_MATH_CM4 -D__FPU_PRESENT -DSEMIHOSTING -DMXC_ASSERT_ENABLE -DARM_MATH_CM4 " prefer-non-shared="true">
<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="true" env-hash="-99955491804503126" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${GCC_PREFIX}gcc ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot; -DMXC_ASSERT_ENABLE -DARM_MATH_CM4 " prefer-non-shared="true">
<language-scope id="org.eclipse.cdt.core.gcc"/>
<language-scope id="org.eclipse.cdt.core.g++"/>
</provider>
Expand Down
4 changes: 3 additions & 1 deletion Examples/MAX32520/ARM-DSP/arm_bayes_example/.vscode/flash.gdb
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
define flash_m4
set architecture armv7e-m
set remotetimeout 10
target remote | openocd -c "gdb_port pipe;log_output flash.log" -s $arg0/scripts -f interface/$arg1 -f target/$arg2 -c "init; reset halt"
load
compare-sections
Expand All @@ -8,8 +9,9 @@ end

define flash_m4_run
set architecture armv7e-m
set remotetimeout 10
target remote | openocd -c "gdb_port pipe;log_output flash.log" -s $arg0/scripts -f interface/$arg1 -f target/$arg2 -c "init; reset halt"
load
compare-sections
monitor resume
end
end
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"terminal.integrated.env.windows": {
"Path":"${config:OCD_path};${config:ARM_GCC_path}/bin;${config:xPack_GCC_path}/bin;${config:Make_path};${config:MSYS_path}/usr/bin;${env:PATH}",
"Path":"${config:OCD_path};${config:ARM_GCC_path}/bin;${config:xPack_GCC_path}/bin;${config:MSYS_path}/usr/bin;${config:Make_path};${env:PATH}",
"MAXIM_PATH":"${config:MAXIM_PATH}"
},
"terminal.integrated.defaultProfile.windows": "Command Prompt",
Expand Down Expand Up @@ -71,9 +71,7 @@
"${config:MAXIM_PATH}/Libraries/MiscDrivers"
],
"C_Cpp.default.defines": [
"ARM_MATH_CM4",
"__FPU_PRESENT",
"SEMIHOSTING"

],
"C_Cpp.default.forcedInclude": [
"${workspaceFolder}/build/project_defines.h"
Expand Down
24 changes: 21 additions & 3 deletions Examples/MAX32520/ARM-DSP/arm_bayes_example/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
################################################################################
# Copyright (C) 2023 Maxim Integrated Products, Inc., All Rights Reserved.
###############################################################################
#
# Copyright (C) 2022-2023 Maxim Integrated Products, Inc., All Rights Reserved.
# (now owned by Analog Devices, Inc.)
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
Expand Down Expand Up @@ -29,7 +31,23 @@
# property whatsoever. Maxim Integrated Products, Inc. retains all
# ownership rights.
#
###############################################################################
##############################################################################
#
# Copyright 2023 Analog Devices, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
##############################################################################

# ** Readme! **
# Don't edit this file! This is the core Makefile for a MaximSDK
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuildCommandParser" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser" keep-relative-paths="false" name="CDT GCC Build Output Parser" parameter="${PREFIX}(g?cc)|([gc]\+\+)|(clang)" prefer-non-shared="true"/>
<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="true" env-hash="-99955491804503126" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${GCC_PREFIX}gcc ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot; -DARM_MATH_CM4 -D__FPU_PRESENT -DSEMIHOSTING -DMXC_ASSERT_ENABLE -DARM_MATH_CM4 " prefer-non-shared="true">
<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="true" env-hash="-99955491804503126" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${GCC_PREFIX}gcc ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot; -DMXC_ASSERT_ENABLE -DARM_MATH_CM4 " prefer-non-shared="true">
<language-scope id="org.eclipse.cdt.core.gcc"/>
<language-scope id="org.eclipse.cdt.core.g++"/>
</provider>
Expand Down
4 changes: 3 additions & 1 deletion Examples/MAX32520/ARM-DSP/arm_class_marks_example/.vscode/flash.gdb
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
define flash_m4
set architecture armv7e-m
set remotetimeout 10
target remote | openocd -c "gdb_port pipe;log_output flash.log" -s $arg0/scripts -f interface/$arg1 -f target/$arg2 -c "init; reset halt"
load
compare-sections
Expand All @@ -8,8 +9,9 @@ end

define flash_m4_run
set architecture armv7e-m
set remotetimeout 10
target remote | openocd -c "gdb_port pipe;log_output flash.log" -s $arg0/scripts -f interface/$arg1 -f target/$arg2 -c "init; reset halt"
load
compare-sections
monitor resume
end
end
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"terminal.integrated.env.windows": {
"Path":"${config:OCD_path};${config:ARM_GCC_path}/bin;${config:xPack_GCC_path}/bin;${config:Make_path};${config:MSYS_path}/usr/bin;${env:PATH}",
"Path":"${config:OCD_path};${config:ARM_GCC_path}/bin;${config:xPack_GCC_path}/bin;${config:MSYS_path}/usr/bin;${config:Make_path};${env:PATH}",
"MAXIM_PATH":"${config:MAXIM_PATH}"
},
"terminal.integrated.defaultProfile.windows": "Command Prompt",
Expand Down Expand Up @@ -71,9 +71,7 @@
"${config:MAXIM_PATH}/Libraries/MiscDrivers"
],
"C_Cpp.default.defines": [
"ARM_MATH_CM4",
"__FPU_PRESENT",
"SEMIHOSTING"

],
"C_Cpp.default.forcedInclude": [
"${workspaceFolder}/build/project_defines.h"
Expand Down
24 changes: 21 additions & 3 deletions Examples/MAX32520/ARM-DSP/arm_class_marks_example/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
################################################################################
# Copyright (C) 2023 Maxim Integrated Products, Inc., All Rights Reserved.
###############################################################################
#
# Copyright (C) 2022-2023 Maxim Integrated Products, Inc., All Rights Reserved.
# (now owned by Analog Devices, Inc.)
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
Expand Down Expand Up @@ -29,7 +31,23 @@
# property whatsoever. Maxim Integrated Products, Inc. retains all
# ownership rights.
#
###############################################################################
##############################################################################
#
# Copyright 2023 Analog Devices, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
##############################################################################

# ** Readme! **
# Don't edit this file! This is the core Makefile for a MaximSDK
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuildCommandParser" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser" keep-relative-paths="false" name="CDT GCC Build Output Parser" parameter="${PREFIX}(g?cc)|([gc]\+\+)|(clang)" prefer-non-shared="true"/>
<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="true" env-hash="-99955491804503126" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${GCC_PREFIX}gcc ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot; -DARM_MATH_CM4 -D__FPU_PRESENT -DSEMIHOSTING -DMXC_ASSERT_ENABLE -DARM_MATH_CM4 " prefer-non-shared="true">
<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="true" env-hash="-99955491804503126" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${GCC_PREFIX}gcc ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot; -DMXC_ASSERT_ENABLE -DARM_MATH_CM4 " prefer-non-shared="true">
<language-scope id="org.eclipse.cdt.core.gcc"/>
<language-scope id="org.eclipse.cdt.core.g++"/>
</provider>
Expand Down
4 changes: 3 additions & 1 deletion Examples/MAX32520/ARM-DSP/arm_convolution_example/.vscode/flash.gdb
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
define flash_m4
set architecture armv7e-m
set remotetimeout 10
target remote | openocd -c "gdb_port pipe;log_output flash.log" -s $arg0/scripts -f interface/$arg1 -f target/$arg2 -c "init; reset halt"
load
compare-sections
Expand All @@ -8,8 +9,9 @@ end

define flash_m4_run
set architecture armv7e-m
set remotetimeout 10
target remote | openocd -c "gdb_port pipe;log_output flash.log" -s $arg0/scripts -f interface/$arg1 -f target/$arg2 -c "init; reset halt"
load
compare-sections
monitor resume
end
end
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"terminal.integrated.env.windows": {
"Path":"${config:OCD_path};${config:ARM_GCC_path}/bin;${config:xPack_GCC_path}/bin;${config:Make_path};${config:MSYS_path}/usr/bin;${env:PATH}",
"Path":"${config:OCD_path};${config:ARM_GCC_path}/bin;${config:xPack_GCC_path}/bin;${config:MSYS_path}/usr/bin;${config:Make_path};${env:PATH}",
"MAXIM_PATH":"${config:MAXIM_PATH}"
},
"terminal.integrated.defaultProfile.windows": "Command Prompt",
Expand Down Expand Up @@ -71,9 +71,7 @@
"${config:MAXIM_PATH}/Libraries/MiscDrivers"
],
"C_Cpp.default.defines": [
"ARM_MATH_CM4",
"__FPU_PRESENT",
"SEMIHOSTING"

],
"C_Cpp.default.forcedInclude": [
"${workspaceFolder}/build/project_defines.h"
Expand Down
24 changes: 21 additions & 3 deletions Examples/MAX32520/ARM-DSP/arm_convolution_example/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
################################################################################
# Copyright (C) 2023 Maxim Integrated Products, Inc., All Rights Reserved.
###############################################################################
#
# Copyright (C) 2022-2023 Maxim Integrated Products, Inc., All Rights Reserved.
# (now owned by Analog Devices, Inc.)
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
Expand Down Expand Up @@ -29,7 +31,23 @@
# property whatsoever. Maxim Integrated Products, Inc. retains all
# ownership rights.
#
###############################################################################
##############################################################################
#
# Copyright 2023 Analog Devices, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
##############################################################################

# ** Readme! **
# Don't edit this file! This is the core Makefile for a MaximSDK
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuildCommandParser" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser" keep-relative-paths="false" name="CDT GCC Build Output Parser" parameter="${PREFIX}(g?cc)|([gc]\+\+)|(clang)" prefer-non-shared="true"/>
<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="true" env-hash="-99955491804503126" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${GCC_PREFIX}gcc ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot; -DARM_MATH_CM4 -D__FPU_PRESENT -DSEMIHOSTING -DMXC_ASSERT_ENABLE -DARM_MATH_CM4 " prefer-non-shared="true">
<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="true" env-hash="-99955491804503126" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${GCC_PREFIX}gcc ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot; -DMXC_ASSERT_ENABLE -DARM_MATH_CM4 " prefer-non-shared="true">
<language-scope id="org.eclipse.cdt.core.gcc"/>
<language-scope id="org.eclipse.cdt.core.g++"/>
</provider>
Expand Down
4 changes: 3 additions & 1 deletion Examples/MAX32520/ARM-DSP/arm_dotproduct_example_f32/.vscode/flash.gdb
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
define flash_m4
set architecture armv7e-m
set remotetimeout 10
target remote | openocd -c "gdb_port pipe;log_output flash.log" -s $arg0/scripts -f interface/$arg1 -f target/$arg2 -c "init; reset halt"
load
compare-sections
Expand All @@ -8,8 +9,9 @@ end

define flash_m4_run
set architecture armv7e-m
set remotetimeout 10
target remote | openocd -c "gdb_port pipe;log_output flash.log" -s $arg0/scripts -f interface/$arg1 -f target/$arg2 -c "init; reset halt"
load
compare-sections
monitor resume
end
end
Loading

0 comments on commit c24e810

Please sign in to comment.