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.

Sign up for GitHub

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

chore(Other): Sync release branch with main #1202

Merged
merged 5 commits into from
Oct 9, 2024
Merged

chore(Other): Sync release branch with main #1202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6000c61
Merge pull request #919 from Jake-Carter/release
lorne-maxim Feb 13, 2024
b20b398
Merge pull request #926 from analogdevicesinc/main
lorne-maxim Feb 19, 2024
f8d2e36
chore(Other): Merge `main` into `release` for September 2024 Release …
sihyung-maxim Sep 26, 2024
07b1c0e
Merge branch 'release' into release-main
sihyung-maxim Oct 1, 2024
7b81d79
Merge branch 'main' into release-main
sihyung-maxim Oct 8, 2024
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
1 change: 0 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,3 @@ mxc_version.h
mxc_version.mk
Packetcraft-ADI
packetcraft-adi

1 change: 0 additions & 1 deletion Libraries/CMSIS/Device/Maxim/GCC/gcc.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ endif
endif
endif


ifneq "$(wildcard $(MAXIM_PATH)/Libraries/CMSIS/Device/Maxim/GCC/mxc_version.mk)" ""
include $(MAXIM_PATH)/Libraries/CMSIS/Device/Maxim/GCC/mxc_version.mk
endif
Expand Down
2 changes: 2 additions & 0 deletions Libraries/Cordio/controller/sources/ble/lhci/lhci_cmd_vs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
* Copyright (c) 2013-2019 Arm Ltd. All Rights Reserved.
*
* Copyright (c) 2019-2020 Packetcraft, Inc.
*
* Portions Copyright (c) 2024 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.
Expand Down
2 changes: 2 additions & 0 deletions Libraries/Cordio/controller/sources/ble/lhci/lhci_int.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
* Copyright (c) 2013-2019 Arm Ltd. All Rights Reserved.
*
* Copyright (c) 2019-2020 Packetcraft, Inc.
*
* Portions Copyright (c) 2024 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.
Expand Down
5 changes: 2 additions & 3 deletions Libraries/Cordio/platform/include/pal_bb.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
* Copyright (c) 2016-2019 Arm Ltd. All Rights Reserved.
*
* Copyright (c) 2019-2020 Packetcraft, Inc.
*
* Portions Copyright (c) 2024 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.
Expand Down Expand Up @@ -172,7 +174,6 @@ typedef struct {
} PalBbPhyVersion_t;



/**************************************************************************************************
Function Declarations
**************************************************************************************************/
Expand Down Expand Up @@ -346,8 +347,6 @@ static inline bool PalBbIsValidPrbsType(uint8_t maybeType)
default:
return false;
}


}

/*! \} */ /* PAL_BB */
Expand Down
Loading